cleaner layout
This commit is contained in:
@@ -4,13 +4,15 @@
|
|||||||
<Confirm/>
|
<Confirm/>
|
||||||
<Nav/>
|
<Nav/>
|
||||||
<v-main app>
|
<v-main app>
|
||||||
<div class="ml-1 mb-1 mt-1" v-if='showCohorts || showBack'>
|
<v-container fluid class='pa-0'>
|
||||||
<v-btn v-show='showBack' text color='primary' to='/'><v-icon v-text='mdiChevronLeft'/></v-btn>
|
<div v-if='showCohorts || showBack'>
|
||||||
<v-btn v-for='cohort in cohorts' text color='primary' :key='cohort.id' :to='`/g/${cohort.name}`'>{{cohort.name}}</v-btn>
|
<v-btn class='ml-2 mt-2' v-if='showBack' outlined color='primary' to='/'><v-icon v-text='mdiChevronLeft'></v-icon></v-btn>
|
||||||
</div>
|
<v-btn class='ml-2 mt-2' outlined v-for='cohort in cohorts' color='primary' :key='cohort.id' :to='`/g/${cohort.name}`'>{{cohort.name}}</v-btn>
|
||||||
<v-fade-transition hide-on-leave>
|
</div>
|
||||||
<nuxt />
|
<v-fade-transition hide-on-leave>
|
||||||
</v-fade-transition>
|
<nuxt />
|
||||||
|
</v-fade-transition>
|
||||||
|
</v-container>
|
||||||
</v-main>
|
</v-main>
|
||||||
<Footer/>
|
<Footer/>
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
<template lang='pug'>
|
<template lang='pug'>
|
||||||
v-container.p-4.text-center
|
v-container.pa-2.text-center
|
||||||
v-alert(v-if="error.statusCode === 404" type='error' :icon='mdiAlert') ¯\_(ツ)_/¯ {{error.message}}
|
v-alert(v-if="error.statusCode === 404" type='error' :icon='mdiAlert') ¯\_(ツ)_/¯ {{error.message}}
|
||||||
v-alert(v-else type='error' :icon='mdiAlert') An error occurred: {{error.message}}
|
v-alert.mb-2(v-else type='error' :icon='mdiAlert') An error occurred: {{error.message}}
|
||||||
nuxt-link(to='/')
|
nuxt-link(to='/')
|
||||||
v-btn Back to home
|
v-btn(outlined color='primary') Back to home
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<v-container id='home' fluid>
|
<v-container class='px-0' fluid>
|
||||||
|
|
||||||
<h1 class='d-block text-h3 font-weight-black text-center align-center text-uppercase mt-10 mb-12 mx-auto w-100 text-underline'><u>{{cohort}}</u></h1>
|
<h1 class='d-block text-h3 font-weight-black text-center align-center text-uppercase mt-10 mb-12 mx-auto w-100 text-underline'><u>{{cohort}}</u></h1>
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<template lang="pug">
|
<template lang="pug">
|
||||||
v-container#home(fluid)
|
v-container.pa-0
|
||||||
|
|
||||||
//- Announcements
|
//- Announcements
|
||||||
#announcements.mx-1.mt-1(v-if='announcements.length')
|
#announcements.ma-2(v-if='announcements.length')
|
||||||
Announcement(v-for='announcement in announcements' :key='`a_${announcement.id}`' :announcement='announcement')
|
Announcement(v-for='announcement in announcements' :key='`a_${announcement.id}`' :announcement='announcement')
|
||||||
|
|
||||||
//- Calendar and search bar
|
//- Calendar and search bar
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<v-container id='home' fluid>
|
<v-container class='px-0' fluid>
|
||||||
|
<h1 class='d-block text-h4 font-weight-black text-center text-uppercase mt-10 mx-auto w-100 text-underline'><u>{{place.name}}</u></h1>
|
||||||
<h1 class='d-block text-h4 font-weight-black text-center text-uppercase mt-5 mx-auto w-100 text-underline'><u>{{place.name}}</u></h1>
|
|
||||||
<span class="d-block text-subtitle text-center w-100 mb-14">{{place.address}}</span>
|
<span class="d-block text-subtitle text-center w-100 mb-14">{{place.address}}</span>
|
||||||
|
|
||||||
<!-- Events -->
|
<!-- Events -->
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<v-container id='home' fluid>
|
<v-container class='px-0' fluid>
|
||||||
|
|
||||||
<h1 class='d-block text-h3 font-weight-black text-center align-center text-uppercase mt-5 mb-16 mx-auto w-100 text-underline'><u>{{tag}}</u></h1>
|
<h1 class='d-block text-h3 font-weight-black text-center text-uppercase mt-10 mb-16 mx-auto w-100 text-underline'><u>{{tag}}</u></h1>
|
||||||
|
|
||||||
<!-- Events -->
|
<!-- Events -->
|
||||||
<div class="mb-2 mt-1 pl-1 pl-sm-2" id="events">
|
<div class="mb-2 mt-1 pl-1 pl-sm-2" id="events">
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ const cohortController = {
|
|||||||
const name = req.params.name
|
const name = req.params.name
|
||||||
|
|
||||||
const cohort = await Cohort.findOne({ where: { name } })
|
const cohort = await Cohort.findOne({ where: { name } })
|
||||||
if (!cohort) {
|
if (!cohort) {
|
||||||
return res.sendStatus(404)
|
return res.sendStatus(404)
|
||||||
}
|
}
|
||||||
const filters = await Filter.findAll({ where: { cohortId: cohort.id } })
|
const filters = await Filter.findAll({ where: { cohortId: cohort.id } })
|
||||||
|
|||||||
Reference in New Issue
Block a user