Skip to content

Commit 6f6027d

Browse files
authored
Remove Zoom banner and related files (#1404)
1 parent 9954f6c commit 6f6027d

File tree

7 files changed

+0
-181
lines changed

7 files changed

+0
-181
lines changed

frontend/src/definitions.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,6 @@ export enum MetricEvents {
306306
WaitingListEmailRemoved = 'apmt.signup.email-removed',
307307
}
308308

309-
export enum Dismissibles {
310-
BetaWarning = 'beta-warning'
311-
}
312-
313309
export default {
314310
AlertSchemes,
315311
AuthSchemes,
@@ -324,7 +320,6 @@ export default {
324320
ColourSchemes,
325321
DateFormatStrings,
326322
DEFAULT_SLOT_DURATION,
327-
Dismissibles,
328323
EventLocationType,
329324
ExternalConnectionProviders,
330325
FtueStep,

frontend/src/locales/de.json

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -523,21 +523,6 @@
523523
"reportBug": "Fehler melden",
524524
"shareMyLink": "Meinen Link teilen"
525525
},
526-
"notices": {
527-
"betaWarning": {
528-
"heading": "Da wir aktuell in der Beta-Phase sind, hier einige Tips um Probleme zu umgehen:",
529-
"linkText": {
530-
"connectedAccounts": "Verbundene Konten",
531-
"contactUs": "Kontaktformular",
532-
"matrixChannel": "Matrix Kanal"
533-
},
534-
"list": [
535-
"Überprüfe den Spam Ordner, da einige Emails dort landen könnten",
536-
"Falls Zoom Meetings nicht in der Kalender-Einladung auftauchen, bitte trenne die Verbindung im {connectedAccounts} Abschnitt der Einstellungen, und stelle sie erneut her",
537-
"Sollte es noch weitere Probleme geben, nutze das {contactUs}, oder kommt in unseren {matrixChannel}"
538-
]
539-
}
540-
},
541526
"placeholder": {
542527
"biWeeklyCafeDates": "Zweiwöchentliche Café-Treffen …",
543528
"bookingNotesPlaceholder": "Füge alle Notizen hinzu, die du mit deiner Antwort möchtest",

frontend/src/locales/en.json

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -526,21 +526,6 @@
526526
"reportBug": "Report Bug",
527527
"shareMyLink": "Share my link"
528528
},
529-
"notices": {
530-
"betaWarning": {
531-
"heading": "As we're currently in beta, we do have some issues we're dealing with:",
532-
"linkText": {
533-
"connectedAccounts": "Connected Accounts",
534-
"contactUs": "contact us",
535-
"matrixChannel": "Matrix Channel"
536-
},
537-
"list": [
538-
"Please check your spam folder as some emails might end up there",
539-
"If Zoom meetings don't appear in your appointment invite, please disconnect and reconnect your zoom account in the {connectedAccounts} section of the settings",
540-
"If you experience other issues, please use the {contactUs} form, or join us on our {matrixChannel}"
541-
]
542-
}
543-
},
544529
"placeholder": {
545530
"biWeeklyCafeDates": "Bi-weekly Café Dates…",
546531
"bookingNotesPlaceholder": "Add any notes you'd like to include with your reply",

frontend/src/models.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -296,14 +296,6 @@ export type UserConfig = {
296296
startOfWeek: number;
297297
};
298298

299-
/**
300-
* User activity as in the things they do within our application
301-
* Used to store the state of dismissables and such.
302-
*/
303-
export type UserActivity = {
304-
dismissedBetaWarning: boolean,
305-
};
306-
307299
export type Subscriber = {
308300
id?: number;
309301
username: string;

frontend/src/stores/user-activity-store.ts

Lines changed: 0 additions & 23 deletions
This file was deleted.

frontend/src/views/DashboardView/index.vue

Lines changed: 0 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,26 @@
11
<script setup lang="ts">
2-
import { Dismissibles } from '@/definitions';
32
import {
43
ref, inject, onMounted, computed,
54
} from 'vue';
6-
import { useI18n } from 'vue-i18n';
75
import { useRoute } from 'vue-router';
86
import { storeToRefs } from 'pinia';
97
import { dayjsKey, refreshKey } from '@/keys';
108
import { TimeFormatted } from '@/models';
11-
import { PrimaryButton, NoticeBar, NoticeBarTypes } from '@thunderbirdops/services-ui';
129
import QuickActionsSideBar from './components/QuickActionsSideBar.vue';
1310
import WeekPicker from './components/WeekPicker.vue';
1411
import UserCalendarSync from './components/UserCalendarSync.vue';
1512
import WeekCalendar from './components/WeekCalendar.vue';
1613
1714
// stores
1815
import { useCalendarStore } from '@/stores/calendar-store';
19-
import { useUserActivityStore } from '@/stores/user-activity-store';
2016
import { useAppointmentStore } from '@/stores/appointment-store';
2117
22-
const { t } = useI18n({ useScope: 'global' });
2318
const route = useRoute();
2419
const dj = inject(dayjsKey);
2520
const refresh = inject(refreshKey);
2621
27-
const userActivityStore = useUserActivityStore();
2822
const calendarStore = useCalendarStore();
2923
const appointmentStore = useAppointmentStore();
30-
const { data: userActivityData } = storeToRefs(userActivityStore);
3124
const { remoteEvents } = storeToRefs(calendarStore);
3225
const { pendingAppointments } = storeToRefs(appointmentStore);
3326
@@ -47,10 +40,6 @@ async function onDateChange(dateObj: TimeFormatted) {
4740
await calendarStore.getRemoteEvents(activeDate.value);
4841
};
4942
50-
function dismiss() {
51-
userActivityStore.dismiss(Dismissibles.BetaWarning);
52-
};
53-
5443
onMounted(async () => {
5544
// Don't actually load anything during the FTUE
5645
if (route.name === 'setup') {
@@ -69,41 +58,6 @@ export default {
6958
</script>
7059

7160
<template>
72-
<notice-bar :type="NoticeBarTypes.Info" id="beta-warning" v-if="!userActivityData.dismissedBetaWarning">
73-
<p>{{ t('notices.betaWarning.heading') }}</p>
74-
<ul>
75-
<li>{{ t('notices.betaWarning.list.0') }}</li>
76-
<li>
77-
<i18n-t keypath="notices.betaWarning.list.1">
78-
<template v-slot:connectedAccounts>
79-
<router-link class="underline" :to="{ path: '/settings/connectedAccounts' }" target="_blank">
80-
{{ t('notices.betaWarning.linkText.connectedAccounts') }}
81-
</router-link>
82-
</template>
83-
</i18n-t>
84-
</li>
85-
<li>
86-
<i18n-t keypath="notices.betaWarning.list.2">
87-
<template v-slot:contactUs>
88-
<router-link class="underline" :to="{ name: 'contact' }" target="_blank">
89-
{{ t('notices.betaWarning.linkText.contactUs') }}
90-
</router-link>
91-
</template>
92-
<template v-slot:matrixChannel>
93-
<a class="underline" href="https://matrix.to/#/#tb-services:mozilla.org" target="_blank">
94-
{{ t('notices.betaWarning.linkText.matrixChannel') }}
95-
</a>
96-
</template>
97-
</i18n-t>
98-
</li>
99-
</ul>
100-
<template #cta>
101-
<primary-button class="dismiss" size="small" @click="dismiss">
102-
{{ t('label.dismiss') }}
103-
</primary-button>
104-
</template>
105-
</notice-bar>
106-
10761
<div class="main-container">
10862
<quick-actions-side-bar />
10963

@@ -151,52 +105,7 @@ export default {
151105
gap: 2rem;
152106
}
153107
154-
#beta-warning {
155-
position: relative;
156-
/* The navbar provides margin already */
157-
margin-block-end: 2rem;
158-
159-
:deep(.icon) {
160-
top: 0.75rem;
161-
}
162-
163-
:deep(.body) {
164-
text-align: left;
165-
margin-left: 0.5rem;
166-
line-height: 1.5;
167-
168-
a {
169-
text-decoration: underline;
170-
}
171-
172-
ul {
173-
list-style: circle;
174-
margin-left: 1rem;
175-
font-weight: 400;
176-
}
177-
178-
.dismiss {
179-
margin: 1rem auto;
180-
}
181-
182-
.underline {
183-
text-decoration-line: underline;
184-
}
185-
}
186-
}
187-
188108
@media (--md) {
189-
#beta-warning {
190-
:deep(.body) {
191-
.dismiss {
192-
position: absolute;
193-
top: 0.75rem;
194-
right: 1rem;
195-
margin: 0;
196-
}
197-
}
198-
}
199-
200109
.main-container {
201110
flex-direction: row;
202111
gap: 2rem;

frontend/test/stores/user-activity-store.test.js

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)