From b6a7d5b9c423f1bee1c08b2e7702f73c691a5850 Mon Sep 17 00:00:00 2001 From: Andrew Lalis Date: Thu, 19 Jan 2023 21:49:22 +0100 Subject: [PATCH] Added styling and gympage. --- gymboard-app/src/css/quasar.variables.scss | 14 ++--- gymboard-app/src/layouts/MainLayout.vue | 65 ++-------------------- gymboard-app/src/pages/GymPage.vue | 16 ++++++ gymboard-app/src/pages/IndexPage.vue | 42 ++------------ gymboard-app/src/router/routes.ts | 16 +++++- 5 files changed, 46 insertions(+), 107 deletions(-) create mode 100644 gymboard-app/src/pages/GymPage.vue diff --git a/gymboard-app/src/css/quasar.variables.scss b/gymboard-app/src/css/quasar.variables.scss index 3996ce1..9acbbcf 100644 --- a/gymboard-app/src/css/quasar.variables.scss +++ b/gymboard-app/src/css/quasar.variables.scss @@ -12,14 +12,14 @@ // to match your app's branding. // Tip: Use the "Theme Builder" on Quasar's documentation website. -$primary : #1976D2; -$secondary : #26A69A; -$accent : #9C27B0; +$primary : #171717; +$secondary : #575757; +$accent : #b60600; $dark : #1D1D1D; $dark-page : #121212; -$positive : #21BA45; -$negative : #C10015; -$info : #31CCEC; -$warning : #F2C037; +$positive : #41b65c; +$negative : #c0293b; +$info : #8bcfdd; +$warning : #eccb70; diff --git a/gymboard-app/src/layouts/MainLayout.vue b/gymboard-app/src/layouts/MainLayout.vue index 4c347c2..ed15bd4 100644 --- a/gymboard-app/src/layouts/MainLayout.vue +++ b/gymboard-app/src/layouts/MainLayout.vue @@ -12,10 +12,8 @@ /> - Quasar App + Gymboard - -
Quasar v{{ $q.version }}
@@ -28,14 +26,10 @@ - Essential Links + Pages - - + First Page + Second Page @@ -47,65 +41,14 @@ \ No newline at end of file diff --git a/gymboard-app/src/pages/IndexPage.vue b/gymboard-app/src/pages/IndexPage.vue index 32d41bb..25462dc 100644 --- a/gymboard-app/src/pages/IndexPage.vue +++ b/gymboard-app/src/pages/IndexPage.vue @@ -1,49 +1,17 @@ diff --git a/gymboard-app/src/router/routes.ts b/gymboard-app/src/router/routes.ts index 2d34fc1..2c26d3c 100644 --- a/gymboard-app/src/router/routes.ts +++ b/gymboard-app/src/router/routes.ts @@ -1,10 +1,22 @@ import { RouteRecordRaw } from 'vue-router'; +import MainLayout from 'layouts/MainLayout.vue'; +import IndexPage from 'pages/IndexPage.vue'; +import GymPage from 'pages/GymPage.vue'; const routes: RouteRecordRaw[] = [ { path: '/', - component: () => import('layouts/MainLayout.vue'), - children: [{ path: '', component: () => import('pages/IndexPage.vue') }], + component: MainLayout, + children: [ + { + path: '', + component: IndexPage + }, + { + path: 'gyms/:id', + component: GymPage + } + ], }, // Always leave this as last one,