Skip to content

Commit

Permalink
fix: update name case
Browse files Browse the repository at this point in the history
  • Loading branch information
Ethan-Chew committed Oct 24, 2023
1 parent 1cbe61f commit 658acda
Show file tree
Hide file tree
Showing 22 changed files with 293 additions and 298 deletions.
19 changes: 9 additions & 10 deletions components/admin/common/left-panel.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<script setup lang="ts">
import { f7Icon, f7List, f7ListItem, f7Page, f7Panel } from 'framework7-vue'
import type { Router } from 'framework7/types'
const props = defineProps<{
Expand Down Expand Up @@ -28,15 +27,15 @@ const menuLinks = [
</script>

<template>
<f7Panel left cover>
<f7Page>
<f7List menu-list strong-ios outline-ios>
<f7ListItem v-for="link in menuLinks" :key="link.path" :link="link.path" :selected="selectedPath === link.path" :title="link.title" @click="selectedPath = link.path">
<F7Panel left cover>
<F7Page>
<F7List menu-list strong-ios outline-ios>
<F7ListItem v-for="link in menuLinks" :key="link.path" :link="link.path" :selected="selectedPath === link.path" :title="link.title" @click="selectedPath = link.path">
<template #media>
<f7Icon :md="link.icon" />
<F7Icon :md="link.icon" />
</template>
</f7ListItem>
</f7List>
</f7Page>
</f7Panel>
</F7ListItem>
</F7List>
</F7Page>
</F7Panel>
</template>
5 changes: 2 additions & 3 deletions components/admin/event/page.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<script setup lang="ts">
import { f7Page } from 'framework7-vue'
</script>

<template>
<f7Page>
<F7Page>
event
</f7Page>
</F7Page>
</template>
2 changes: 1 addition & 1 deletion components/admin/home/create-event-popup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ async function handleSubmit() {
</UFormGroup>
</div>

<UButton v-if="!newEventId" type="submit" color="green" :loading="mutation.isLoading.value">
<UButton v-if="!newEventId" type="submit" color="green" :loading="mutation.isPending.value">
Create Event
</UButton>
<p v-if="!inputError">
Expand Down
19 changes: 9 additions & 10 deletions components/admin/home/page.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<script setup lang="ts">
import { f7Link, f7NavLeft, f7NavTitle, f7Navbar, f7Page } from 'framework7-vue'
import type { Router } from 'framework7/types'
const props = defineProps<{
Expand All @@ -16,21 +15,21 @@ const showForbidden = computed(() => {
</script>

<template>
<f7Page>
<f7Navbar>
<f7NavLeft v-if="!showForbidden">
<f7Link panel-open="left" icon-ios="f7:menu" icon-md="material:menu" />
</f7NavLeft>
<f7NavTitle>
<F7Page>
<F7Navbar>
<F7NavLeft v-if="!showForbidden">
<F7Link panel-open="left" icon-ios="f7:menu" icon-md="material:menu" />
</F7NavLeft>
<F7NavTitle>
SSTAA Admin
</f7NavTitle>
</f7Navbar>
</F7NavTitle>
</F7Navbar>

<LazyAdminHomeForbidden v-if="showForbidden" />

<template v-else>
<AdminCommonLeftPanel :route="props.f7route" />
<AdminHomeEventsTable />
</template>
</f7Page>
</F7Page>
</template>
2 changes: 1 addition & 1 deletion components/admin/home/update-event-popup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const state = reactive({
const changedEvent = ref<Partial<Event>>({})
const mutation = useMutation({
mutationFn: (id: string) => $api(`/api/event/${id}`, {
mutationFn: (id: string) => $api(`/api/event/${id}` as '/api/event/:id', {
method: 'PUT',
body: changedEvent.value,
}),
Expand Down
5 changes: 2 additions & 3 deletions components/admin/members/page.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<script setup lang="ts">
import { f7Page } from 'framework7-vue'
</script>

<template>
<f7Page>
<F7Page>
Imagine a page here
</f7Page>
</F7Page>
</template>
5 changes: 2 additions & 3 deletions components/admin/settings/page.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<script setup lang="ts">
import { f7Page } from 'framework7-vue'
</script>

<template>
<f7Page>
<F7Page>
Imagine a page here
</f7Page>
</F7Page>
</template>
17 changes: 8 additions & 9 deletions components/app/events/page.vue
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
<script setup lang="ts">
import { f7NavTitle, f7NavTitleLarge, f7Navbar, f7Page } from 'framework7-vue'
</script>

<template>
<f7Page>
<f7Navbar large transparent :sliding="false">
<f7NavTitle sliding>
<F7Page>
<F7Navbar large transparent :sliding="false">
<F7NavTitle sliding>
Events & Bookings
</f7NavTitle>
<f7NavTitleLarge>
</F7NavTitle>
<F7NavTitleLarge>
Events & Bookings
</f7NavTitleLarge>
</f7Navbar>
</f7Page>
</F7NavTitleLarge>
</F7Navbar>
</F7Page>
</template>
19 changes: 9 additions & 10 deletions components/app/home/membership-card.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<script setup lang="ts">
import { f7Card, f7CardContent, f7CardFooter, f7List, f7SkeletonBlock } from 'framework7-vue'
import type { User } from '~/shared/types'
const { data: user, isLoading: userIsLoading } = useUser()
Expand All @@ -15,12 +14,12 @@ const membershipGradient: Record<Exclude<User['memberType'], null>, string> = {

<template>
<div>
<f7List v-if="userIsLoading" inset class="h-64">
<f7SkeletonBlock class="rounded-md" effect="fade" height="100%" />
</f7List>
<F7List v-if="userIsLoading" inset class="h-64">
<F7SkeletonBlock class="rounded-md" effect="fade" height="100%" />
</F7List>

<f7Card v-else-if="user" class="m-0!">
<f7CardContent class="h-44 rounded-[16px]" valign="top" :class="membershipGradient[user.memberType!]">
<F7Card v-else-if="user" class="m-0!">
<F7CardContent class="h-44 rounded-[16px]" valign="top" :class="membershipGradient[user.memberType!]">
<div class="flex flex-col w-full h-full text-white dark:text-inherit">
<div class="flex flex-col flex-1">
<span class="font-bold text-3xl">
Expand All @@ -40,14 +39,14 @@ const membershipGradient: Record<Exclude<User['memberType'], null>, string> = {
</span>
</div>
</div>
</f7CardContent>
<f7CardFooter>
</F7CardContent>
<F7CardFooter>
<span>
<strong>Coming back?</strong>
<br>
<span>Tap on this card and present it to the security at the front gate.</span>
</span>
</f7CardFooter>
</f7Card>
</F7CardFooter>
</F7Card>
</div>
</template>
32 changes: 15 additions & 17 deletions components/app/home/news.vue
Original file line number Diff line number Diff line change
@@ -1,43 +1,41 @@
<script setup lang="ts">
import { f7BlockTitle, f7Button, f7Card, f7CardContent, f7CardFooter, f7CardHeader, f7List, f7SkeletonBlock } from 'framework7-vue'
const { data: news, isLoading: newsIsLoading } = useNewsArticles()
</script>

<template>
<div>
<f7BlockTitle large>
<F7BlockTitle large>
What's Happening
</f7BlockTitle>
</F7BlockTitle>

<div class="space-y-3">
<f7List v-if="newsIsLoading" inset>
<F7List v-if="newsIsLoading" inset>
<div class="space-y-3">
<f7SkeletonBlock v-for="n in 3" :key="n" class="rounded-md" effect="fade" height="10rem" />
<F7SkeletonBlock v-for="n in 3" :key="n" class="rounded-md" effect="fade" height="10rem" />
</div>
</f7List>
</F7List>
<template v-else-if="news">
<span v-if="news.length === 0" class="mt-4 opacity-80">
Nothing exciting is happening right now.
<br>
Check back later!
</span>
<f7Card v-for="article in news" :key="article.id" class="m-0!">
<f7CardHeader class="h-44 rounded-[16px]! overflow-hidden bg-center bg-cover relative" valign="bottom" :style="`background-image: url(${article.heroImageUrl})`">
<F7Card v-for="article in news" :key="article.id" class="m-0!">
<F7CardHeader class="h-44 rounded-[16px]! overflow-hidden bg-center bg-cover relative" valign="bottom" :style="`background-image: url(${article.heroImageUrl})`">
<div class="absolute inset-0 bg-gradient-to-b from-transparent dark:to-black/70 to-white/70" />
<span class="z-10 font-semibold">
{{ article.title }}
</span>
</f7CardHeader>
<f7CardContent>
</F7CardHeader>
<F7CardContent>
{{ article.description }}
</f7CardContent>
<f7CardFooter v-if="article.ctaTitle && article.ctaUrl">
<f7Button tonal :href="article.ctaUrl" external target="_blank">
</F7CardContent>
<F7CardFooter v-if="article.ctaTitle && article.ctaUrl">
<F7Button tonal :href="article.ctaUrl" external target="_blank">
{{ article.ctaTitle }}
</f7Button>
</f7CardFooter>
</f7Card>
</F7Button>
</F7CardFooter>
</F7Card>
</template>
</div>
</div>
Expand Down
9 changes: 4 additions & 5 deletions components/app/home/page.vue
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<script setup lang="ts">
import { f7List, f7Page } from 'framework7-vue'
</script>

<template>
<f7Page no-navbar>
<f7List class="space-y-8">
<F7Page no-navbar>
<F7List class="space-y-8">
<div>
<AppHomeMembershipCard />
</div>

<div>
<LazyAppHomeNews />
</div>
</f7List>
</f7Page>
</F7List>
</F7Page>
</template>
Loading

0 comments on commit 658acda

Please sign in to comment.