From 099ea5b236d14167d762a7fbef48979a00b47c3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 27 Aug 2024 00:08:29 +0200 Subject: [PATCH 1/8] =?UTF-8?q?=E2=9E=95=20Add=20types=20for=20FTUE=20view?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/definitions.ts | 18 ++++---- frontend/src/stores/ftue-store.ts | 46 +++++++++---------- .../src/views/FirstTimeUserExperienceView.vue | 33 ++++++------- 3 files changed, 48 insertions(+), 49 deletions(-) diff --git a/frontend/src/definitions.ts b/frontend/src/definitions.ts index 67623574..0f34918c 100644 --- a/frontend/src/definitions.ts +++ b/frontend/src/definitions.ts @@ -243,17 +243,15 @@ export enum TableDataButtonType { /** * First Time User Experience Steps * Step amounts are 10-based to allow us flexibility in adding steps later. - * @enum - * @readonly */ -export const ftueStep = { - setupProfile: 10, +export enum FtueStep { + SetupProfile = 10, // Right now we only support Google calendars during ftue - googlePermissions: 20, - connectCalendars: 30, - setupSchedule: 40, - connectVideoConferencing: 50, - finish: 100, + GooglePermissions = 20, + ConnectCalendars = 30, + SetupSchedule = 40, + ConnectVideoConferencing = 50, + Finish = 100, }; /** @@ -318,7 +316,7 @@ export default { defaultSlotDuration, EventLocationType, ExternalConnectionProviders, - ftueStep, + FtueStep, InviteStatus, locationTypes, loginRedirectKey, diff --git a/frontend/src/stores/ftue-store.ts b/frontend/src/stores/ftue-store.ts index b606e6f5..49f20ac3 100644 --- a/frontend/src/stores/ftue-store.ts +++ b/frontend/src/stores/ftue-store.ts @@ -1,12 +1,12 @@ import { defineStore } from 'pinia'; -import { ref, computed, defineAsyncComponent } from 'vue'; +import { ref, computed } from 'vue'; import { useLocalStorage } from '@vueuse/core'; -import { ftueStep } from '@/definitions'; +import { FtueStep } from '@/definitions'; import { Fetch } from '@/models'; const initialObject = { // First step - step: ftueStep.setupProfile, + step: FtueStep.SetupProfile, }; // eslint-disable-next-line import/prefer-default-export @@ -20,40 +20,40 @@ export const useFTUEStore = defineStore('FTUE', () => { /** * State information for navigating the First Time User Experience * @type {{ - * previous: null|ftueStep, - * next: null|ftueStep, + * previous: null|FtueStep, + * next: null|FtueStep, * title: string, * }} */ const stepList = { - [ftueStep.setupProfile]: { + [FtueStep.SetupProfile]: { previous: null, - next: ftueStep.googlePermissions, + next: FtueStep.GooglePermissions, title: 'ftue.steps.setupProfile', }, - [ftueStep.googlePermissions]: { - previous: ftueStep.setupProfile, - next: ftueStep.connectCalendars, + [FtueStep.GooglePermissions]: { + previous: FtueStep.SetupProfile, + next: FtueStep.ConnectCalendars, title: 'ftue.steps.googlePermissions', }, - [ftueStep.connectCalendars]: { - previous: ftueStep.googlePermissions, - next: ftueStep.setupSchedule, + [FtueStep.ConnectCalendars]: { + previous: FtueStep.GooglePermissions, + next: FtueStep.SetupSchedule, title: 'ftue.steps.connectCalendars', }, - [ftueStep.setupSchedule]: { - previous: ftueStep.connectCalendars, - next: ftueStep.connectVideoConferencing, + [FtueStep.SetupSchedule]: { + previous: FtueStep.ConnectCalendars, + next: FtueStep.ConnectVideoConferencing, title: 'ftue.steps.setupSchedule', }, - [ftueStep.connectVideoConferencing]: { - previous: ftueStep.setupSchedule, - next: ftueStep.finish, + [FtueStep.ConnectVideoConferencing]: { + previous: FtueStep.SetupSchedule, + next: FtueStep.Finish, title: 'ftue.steps.connectVideo', }, - [ftueStep.finish]: { - previous: ftueStep.connectVideoConferencing, - next: ftueStep.finish, + [FtueStep.Finish]: { + previous: FtueStep.ConnectVideoConferencing, + next: FtueStep.Finish, title: 'ftue.steps.finish', }, }; @@ -89,7 +89,7 @@ export const useFTUEStore = defineStore('FTUE', () => { const currentStep = computed(() => data.value.step); const $reset = () => { - data.value.step = ftueStep.setupProfile; + data.value.step = FtueStep.SetupProfile; clearMessages(); }; diff --git a/frontend/src/views/FirstTimeUserExperienceView.vue b/frontend/src/views/FirstTimeUserExperienceView.vue index e6d0d790..224d6db9 100644 --- a/frontend/src/views/FirstTimeUserExperienceView.vue +++ b/frontend/src/views/FirstTimeUserExperienceView.vue @@ -1,9 +1,13 @@ - + + diff --git a/frontend/src/tbpro/elements/TextInput.vue b/frontend/src/tbpro/elements/TextInput.vue index f69c1928..64618cd7 100644 --- a/frontend/src/tbpro/elements/TextInput.vue +++ b/frontend/src/tbpro/elements/TextInput.vue @@ -17,14 +17,13 @@ const focus = () => { // component properties interface Props { name: string; - type: string; - placeholder: string; - required: boolean; - disabled: boolean; + type?: string; + placeholder?: string; + required?: boolean; + disabled?: boolean; }; withDefaults(defineProps(), { type: 'text', - text: 'test', placeholder: '', required: false, disabled: false, diff --git a/frontend/src/tbpro/elements/ToolTip.vue b/frontend/src/tbpro/elements/ToolTip.vue index ba4cb03f..00cb3629 100644 --- a/frontend/src/tbpro/elements/ToolTip.vue +++ b/frontend/src/tbpro/elements/ToolTip.vue @@ -19,8 +19,8 @@ import { TooltipPosition } from '@/definitions'; // component properties interface Props { - alt: string; - position: TooltipPosition; + alt?: string; + position?: TooltipPosition; }; withDefaults(defineProps(), { alt: '', From 7cae2b3907e120a13f0d9373426731052295169c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 29 Aug 2024 10:47:20 +0200 Subject: [PATCH 7/8] =?UTF-8?q?=F0=9F=94=A8=20Fix=20section=20order?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/DataTable.vue | 206 +++++++++--------- .../src/components/FTUE/ConnectCalendars.vue | 68 +++--- .../src/components/FTUE/SetupSchedule.vue | 102 ++++----- frontend/src/tbpro/elements/SyncCard.vue | 48 ++-- frontend/src/tbpro/elements/ToolTip.vue | 30 +-- 5 files changed, 227 insertions(+), 227 deletions(-) diff --git a/frontend/src/components/DataTable.vue b/frontend/src/components/DataTable.vue index 5ad0f197..85252ce9 100644 --- a/frontend/src/components/DataTable.vue +++ b/frontend/src/components/DataTable.vue @@ -1,106 +1,3 @@ - - + + diff --git a/frontend/src/components/FTUE/ConnectCalendars.vue b/frontend/src/components/FTUE/ConnectCalendars.vue index d194db11..290a0546 100644 --- a/frontend/src/components/FTUE/ConnectCalendars.vue +++ b/frontend/src/components/FTUE/ConnectCalendars.vue @@ -1,37 +1,3 @@ - - + +