From 982ceb87fa9014796b1b11a80c57ebc55da4badf Mon Sep 17 00:00:00 2001 From: Gijsdeman Date: Sun, 3 Nov 2024 20:07:36 +0100 Subject: [PATCH] feat(prettier): use shared GEWIS config --- .prettierrc.json | 8 --- .prettierrc.mjs | 8 +++ src/assets/preset.ts | 6 +- src/components/audio/ArtificialBeatDialog.vue | 10 +-- src/components/audit/AuditBlock.vue | 7 +- src/components/auth/DevSettings.vue | 2 +- src/components/handlers/AudioHandlerBlock.vue | 10 +-- src/components/handlers/LightHandlerBlock.vue | 2 +- .../LightsControllerItemComponent.vue | 18 ++--- .../handlers/ScreenHandlerBlock.vue | 8 +-- .../handlers/SubscriberItemContent.vue | 2 +- .../lights/effects/EffectHistoryCard.vue | 7 +- .../effects/LightsGroupToggleButton.vue | 4 +- src/components/lights/effects/SavedEffect.vue | 12 +--- .../effects/color/EffectBeatFadeOut.vue | 17 ++--- .../effects/color/EffectSingleFlood.vue | 4 +- .../lights/effects/color/EffectSparkle.vue | 4 +- .../effects/color/EffectStaticColor.vue | 24 ++----- .../lights/effects/color/EffectWave.vue | 4 +- .../effects/movement/EffectClassicRotate.vue | 4 +- .../effects/movement/EffectRandomPosition.vue | 4 +- .../effects/movement/EffectSearchLight.vue | 4 +- .../effects/movement/EffectTableRotate.vue | 4 +- .../effects/props/SelectorRatioSlider.vue | 9 +-- src/components/lights/fixtures/FixtureType.ts | 2 +- .../lights/scenes/SceneDeleteButton.vue | 2 +- src/components/modes/SubscribersDetails.vue | 10 +-- .../modes/centurion/InitializeCenturion.vue | 10 ++- .../modes/centurion/TapeDetails.vue | 8 +-- .../modes/centurion/TapeTimeline.vue | 4 +- .../modes/time-trail-race/PlayerRegister.vue | 4 +- .../modes/time-trail-race/PlayerScore.vue | 4 +- .../modes/time-trail-race/PlayerTimer.vue | 4 +- .../TimeTrailRaceInitialize.vue | 8 +-- .../time-trail-race/TimeTrailRaceStepper.vue | 12 ++-- src/components/poster/PosterCard.vue | 12 +--- src/components/prime/ConfirmWrapper.vue | 4 +- src/components/prime/StepperWrapper.vue | 4 +- src/components/shortcuts/ShortcutBlock.vue | 38 +++++------ src/layout/AppContainer.vue | 10 ++- src/layout/AppLayout.vue | 5 +- src/layout/AppMenu.vue | 20 +++--- src/layout/AppMenuItem.vue | 11 ++-- src/layout/AppTopbar.vue | 4 +- src/main.ts | 12 ++-- src/router/index.ts | 66 +++++++++---------- src/stores/audit.store.ts | 14 ++-- src/stores/auth.store.ts | 14 ++-- src/stores/color.store.ts | 6 +- src/stores/effects-controller.store.ts | 32 ++++----- src/stores/handlers.store.ts | 44 ++++++------- src/stores/layout.store.ts | 10 +-- src/stores/modes/centurion.store.ts | 30 ++++----- src/stores/modes/time-trail-race.store.ts | 48 +++++--------- src/stores/poster-store.ts | 14 ++-- src/stores/scene-controller.store.ts | 16 ++--- src/stores/socket.store.ts | 8 ++- src/stores/socket/currently-playing.store.ts | 6 +- src/stores/socket/music-beat.store.ts | 6 +- src/stores/subscriber.store.ts | 8 +-- src/utils/fetchInterceptor.ts | 2 +- src/utils/toastHandler.ts | 4 +- src/utils/validation-schema.ts | 4 +- src/views/Base/AuthView.vue | 10 +-- src/views/Lights/EffectsController.vue | 7 +- src/views/Lights/FixtureOverview.vue | 31 ++++----- src/views/Modes/TimeTrailRaceModeView.vue | 8 +-- src/views/Poster/PosterList.vue | 5 +- 68 files changed, 305 insertions(+), 458 deletions(-) delete mode 100644 .prettierrc.json create mode 100644 .prettierrc.mjs diff --git a/.prettierrc.json b/.prettierrc.json deleted file mode 100644 index e56064e..0000000 --- a/.prettierrc.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/prettierrc", - "semi": true, - "tabWidth": 2, - "singleQuote": true, - "printWidth": 100, - "trailingComma": "none" -} diff --git a/.prettierrc.mjs b/.prettierrc.mjs new file mode 100644 index 0000000..9295365 --- /dev/null +++ b/.prettierrc.mjs @@ -0,0 +1,8 @@ +import prettier from '@gewis/eslint-config/prettier.mjs'; + +/** + * @type {import("prettier").Config} + */ +export default { + ...prettier, +}; diff --git a/src/assets/preset.ts b/src/assets/preset.ts index cb2665d..0e7abba 100644 --- a/src/assets/preset.ts +++ b/src/assets/preset.ts @@ -14,7 +14,7 @@ export const AuraPreset = definePreset(Aura, { 700: '{rose.700}', 800: '{rose.800}', 900: '{rose.900}', - 950: '{rose.950}' - } - } + 950: '{rose.950}', + }, + }, }); diff --git a/src/components/audio/ArtificialBeatDialog.vue b/src/components/audio/ArtificialBeatDialog.vue index 7706a44..029bf79 100644 --- a/src/components/audio/ArtificialBeatDialog.vue +++ b/src/components/audio/ArtificialBeatDialog.vue @@ -16,9 +16,7 @@
-
+

{{ getBpm() }} BPM

Tap to set BPM

@@ -50,11 +48,7 @@ diff --git a/src/components/handlers/AudioHandlerBlock.vue b/src/components/handlers/AudioHandlerBlock.vue index abb65be..db81926 100644 --- a/src/components/handlers/AudioHandlerBlock.vue +++ b/src/components/handlers/AudioHandlerBlock.vue @@ -6,18 +6,12 @@ >
diff --git a/src/components/handlers/LightHandlerBlock.vue b/src/components/handlers/LightHandlerBlock.vue index a853da3..ce84d02 100644 --- a/src/components/handlers/LightHandlerBlock.vue +++ b/src/components/handlers/LightHandlerBlock.vue @@ -22,6 +22,6 @@ const subscriberStore = storeToRefs(useSubscriberStore()); const controllers = computed(() => subscriberStore.lightsGroups.value .map((g) => g.controller) - .filter((c1, index, all) => index === all.findIndex((c2) => c1.id === c2.id)) + .filter((c1, index, all) => index === all.findIndex((c2) => c1.id === c2.id)), ); diff --git a/src/components/handlers/LightsControllerItemComponent.vue b/src/components/handlers/LightsControllerItemComponent.vue index 4e9462c..c248459 100644 --- a/src/components/handlers/LightsControllerItemComponent.vue +++ b/src/components/handlers/LightsControllerItemComponent.vue @@ -4,9 +4,7 @@ {{ controller.name }} -
+
@@ -14,15 +12,11 @@
@@ -44,9 +38,7 @@ const props = defineProps<{ }>(); const subscriberStore = storeToRefs(useSubscriberStore()); -const lightsGroups = subscriberStore.lightsGroups.value.filter( - (g) => g.controller.id === props.controller.id -); +const lightsGroups = subscriberStore.lightsGroups.value.filter((g) => g.controller.id === props.controller.id); const handlersStore = useHandlersStore(); const authStore = useAuthStore(); @@ -64,7 +56,7 @@ const connectedIcon = computed(() => { 'pi-sort-alt': connected.value, 'text-green-300': connected.value, 'pi-sort-alt-slash': !connected.value, - 'text-400': !connected.value + 'text-400': !connected.value, }; }); diff --git a/src/components/handlers/ScreenHandlerBlock.vue b/src/components/handlers/ScreenHandlerBlock.vue index ed1d68e..dc05396 100644 --- a/src/components/handlers/ScreenHandlerBlock.vue +++ b/src/components/handlers/ScreenHandlerBlock.vue @@ -6,16 +6,12 @@ >
diff --git a/src/components/handlers/SubscriberItemContent.vue b/src/components/handlers/SubscriberItemContent.vue index bfe56d7..37588d8 100644 --- a/src/components/handlers/SubscriberItemContent.vue +++ b/src/components/handlers/SubscriberItemContent.vue @@ -52,7 +52,7 @@ const connectedIcon = computed(() => { 'pi-sort-alt': connected.value, 'text-green-300': connected.value, 'pi-sort-alt-slash': !connected.value, - 'text-400': !connected.value + 'text-400': !connected.value, }; }); diff --git a/src/components/lights/effects/EffectHistoryCard.vue b/src/components/lights/effects/EffectHistoryCard.vue index 698a69a..93010d2 100644 --- a/src/components/lights/effects/EffectHistoryCard.vue +++ b/src/components/lights/effects/EffectHistoryCard.vue @@ -23,7 +23,7 @@ const props = defineProps<{ const store = useHandlersStore(); const lightGroups = props.effect.lightGroupIds.map((id: number) => - store.getRegisteredLights().find((g) => g.id === id) + store.getRegisteredLights().find((g) => g.id === id), ); const effectsControllerStore = useEffectsControllerStore(); @@ -32,10 +32,7 @@ const setEffect = () => { effectsControllerStore.setColorEffect(props.effect.colorEffect, props.effect.lightGroupIds); } if (props.effect.movementEffect !== undefined) { - effectsControllerStore.setMovementEffect( - props.effect.movementEffect, - props.effect.lightGroupIds - ); + effectsControllerStore.setMovementEffect(props.effect.movementEffect, props.effect.lightGroupIds); } }; diff --git a/src/components/lights/effects/LightsGroupToggleButton.vue b/src/components/lights/effects/LightsGroupToggleButton.vue index 3baaf4a..0922978 100644 --- a/src/components/lights/effects/LightsGroupToggleButton.vue +++ b/src/components/lights/effects/LightsGroupToggleButton.vue @@ -5,9 +5,7 @@
  • Pars: {{ lightsGroup.pars.length }}
  • -
  • - MH's: {{ lightsGroup.movingHeadRgbs.length + lightsGroup.movingHeadWheels.length }} -
  • +
  • MH's: {{ lightsGroup.movingHeadRgbs.length + lightsGroup.movingHeadWheels.length }}
diff --git a/src/components/lights/effects/SavedEffect.vue b/src/components/lights/effects/SavedEffect.vue index 1315d4b..7c43614 100644 --- a/src/components/lights/effects/SavedEffect.vue +++ b/src/components/lights/effects/SavedEffect.vue @@ -5,11 +5,7 @@
{{ effect.type }}
- +
@@ -18,11 +14,7 @@ diff --git a/src/components/lights/effects/color/EffectSingleFlood.vue b/src/components/lights/effects/color/EffectSingleFlood.vue index 75c2be0..6b72430 100644 --- a/src/components/lights/effects/color/EffectSingleFlood.vue +++ b/src/components/lights/effects/color/EffectSingleFlood.vue @@ -27,8 +27,8 @@ const handleAddEffect = () => { store.setColorEffect({ type: ColorEffects_SingleFlood.SINGLE_FLOOD, props: { - dimMilliseconds: dimMilliseconds.value - } + dimMilliseconds: dimMilliseconds.value, + }, }); }; diff --git a/src/components/lights/effects/color/EffectSparkle.vue b/src/components/lights/effects/color/EffectSparkle.vue index 5f457ed..f04bd70 100644 --- a/src/components/lights/effects/color/EffectSparkle.vue +++ b/src/components/lights/effects/color/EffectSparkle.vue @@ -53,8 +53,8 @@ const handleAddEffect = () => { colors: colors.value, ratio: ratio.value, dimDuration: dimDuration.value, - cycleTime: cycleTime.value - } + cycleTime: cycleTime.value, + }, }); }; diff --git a/src/components/lights/effects/color/EffectStaticColor.vue b/src/components/lights/effects/color/EffectStaticColor.vue index 8a2f5f0..ee63250 100644 --- a/src/components/lights/effects/color/EffectStaticColor.vue +++ b/src/components/lights/effects/color/EffectStaticColor.vue @@ -1,23 +1,9 @@