Skip to content

Commit

Permalink
Merge branch 'main' into stage
Browse files Browse the repository at this point in the history
  • Loading branch information
MelissaAutumn committed Nov 23, 2023
2 parents 35cd759 + 96a15b5 commit 4759207
Show file tree
Hide file tree
Showing 21 changed files with 448 additions and 65 deletions.
9 changes: 6 additions & 3 deletions frontend/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{{ siteNotificationStore.message }}
</site-notification>
<nav-bar :nav-items="navItems" />
<main class="mx-4 pt-24 lg:mx-8 min-h-full pb-24">
<main :class="{'mx-4 pt-24 lg:mx-8 min-h-full pb-24': !routeIsHome, 'pt-32': routeIsHome}">
<router-view
:calendars="calendars"
:appointments="appointments"
Expand All @@ -20,7 +20,7 @@
<!-- for home page and booking page -->
<template v-else-if="routeIsPublic">
<title-bar />
<main class="mx-4 pt-24 lg:mx-8 min-h-full pb-24">
<main class="min-h-full">
<router-view />
</main>
<footer-bar />
Expand Down Expand Up @@ -55,7 +55,7 @@ const siteNotificationStore = useSiteNotificationStore();
// handle auth and fetch
const auth = useAuth0();
const isAuthenticated = computed(() => auth.isAuthenticated.value);
const isAuthenticated = computed(() => auth?.isAuthenticated.value);
const call = createFetch({
baseUrl: apiUrl,
options: {
Expand Down Expand Up @@ -122,6 +122,9 @@ const appointments = ref([]);
const routeIsPublic = computed(
() => ["booking", "availability", "home"].includes(route.name)
);
const routeIsHome = computed(
() => ["home"].includes(route.name)
);
// check login state of current user first
const checkLogin = async () => {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/img/homepage-screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
59 changes: 59 additions & 0 deletions frontend/src/assets/svg/homepage-split-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 58 additions & 0 deletions frontend/src/assets/svg/homepage-split.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
55 changes: 55 additions & 0 deletions frontend/src/assets/svg/homepage-wave-bottom-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions frontend/src/assets/svg/homepage-wave-bottom.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions frontend/src/assets/svg/homepage-wave-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions frontend/src/assets/svg/homepage-wave.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions frontend/src/assets/svg/icon-wand.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 1 addition & 23 deletions frontend/src/components/FooterBar.vue
Original file line number Diff line number Diff line change
@@ -1,25 +1,3 @@
<template>
<footer class="
relative z-50 h-16 w-full -mt-16 px-4 shadow-lg border-t flex justify-between
bg-white dark:bg-gray-700 border-gray-300 dark:border-gray-600
">
<ul class="flex justify-center gap-8 w-full">
<li class="
flex text-base border-t-4 border-t-transparent transition-all ease-in-out
text-gray-600 dark:text-gray-300 hover:border-t-gray-200 dark:hover:border-t-gray-400
">
<router-link class="flex-center min-w-[120px]" :to="{ name: 'privacy' }" target="_blank">
Privacy
</router-link>
</li>
<li class="
flex text-base border-t-4 border-t-transparent transition-all ease-in-out
text-gray-600 dark:text-gray-300 hover:border-t-gray-200 dark:hover:border-t-gray-400
">
<router-link class="flex-center min-w-[120px]" :to="{ name: 'terms' }" target="_blank">
Legal
</router-link>
</li>
</ul>
</footer>
<!-- Empty for now! -->
</template>
52 changes: 52 additions & 0 deletions frontend/src/components/HomeFooter.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<template>
<section class="bg-gray-700 p-4 lg:p-8 flex flex-col">
<div class="flex-center mb-16">
<div class="flex gap-3 items-center">
<img class="h-8 mr-2 pl-4" src="/appointment_logo.svg" alt="Appointment Logo"/>
<div class="text-lg font-display tracking-[.25em] text-white uppercase">
Thunderbird Appointment
</div>
</div>
</div>
<div class="flex-center mb-0 mt-auto">
<ul class="flex justify-center w-full gap-16">
<li class="
flex text-base border-t-4 border-t-transparent transition-all ease-in-out
text-gray-300 dark:text-gray-300
">
<router-link class="flex-center" :to="{ name: 'privacy' }" target="_blank">
{{ $t('label.privacy') }}
</router-link>
</li>
<li class="
flex text-base border-t-4 border-t-transparent transition-all ease-in-out
text-gray-300 dark:text-gray-300
">
<router-link class="flex-center" :to="{ name: 'terms' }" target="_blank">
{{ $t('label.legal') }}
</router-link>
</li>
</ul>
</div>
<div class="flex-center mb-0 mt-8 text-gray-300 text-center">
<p class="md:w-1/2">
<i18n-t keypath="text.homepage.copywrite">
<template v-slot:mzlaLink>
<a class="underline underline-offset-2"
href="https://blog.thunderbird.net/2020/01/thunderbirds-new-home/"
>
{{ $t('text.homepage.mzlaLinkText') }}
</a>
</template>
<template v-slot:creativeCommonsLink>
<a class="underline underline-offset-2"
href="https://www.mozilla.org/en-US/foundation/licensing/website-content/"
>
{{ $t('text.homepage.creativeCommonsLinkText') }}
</a>
</template>
</i18n-t>
</p>
</div>
</section>
</template>
4 changes: 2 additions & 2 deletions frontend/src/components/ScheduleCreation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
<div class="font-medium mb-1 text-gray-500 dark:text-gray-300">
{{ t("label.availableDays") }}
</div>
<div class="grid grid-cols-2 grid-rows-4 grid-flow-col gap-2 bg-white p-4 rounded-lg">
<div class="grid grid-cols-2 grid-rows-4 grid-flow-col gap-2 bg-white dark:bg-gray-800 p-4 rounded-lg">
<label v-for="w in isoWeekdays" class="flex gap-2 items-center text-sm select-none cursor-pointer">
<input
type="checkbox"
Expand Down Expand Up @@ -259,7 +259,7 @@
/>
</label>
</div>
<div class="bg-white px-4 py-6 rounded-lg flex-center text-sm text-center">
<div class="bg-white dark:bg-gray-800 px-4 py-6 rounded-lg flex-center text-sm text-center">
<div>{{ t('text.recipientsCanScheduleBetween', { earliest: earliest, farthest: farthest }) }}</div>
</div>
</div>
Expand Down
Loading

0 comments on commit 4759207

Please sign in to comment.