From c130219ed0447cc80701ec30d35f32b5c02b23d1 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Mon, 15 Mar 2021 13:06:03 +0100 Subject: [PATCH] Refactor code --- client/src/router/auth.routes.js | 43 ++++++++++ client/src/router/index.js | 107 ++----------------------- client/src/router/onboarding.names.js | 3 + client/src/router/onboarding.routes.js | 55 +++++++++++++ client/src/router/room.routes.js | 19 +++++ 5 files changed, 126 insertions(+), 101 deletions(-) create mode 100644 client/src/router/auth.routes.js create mode 100644 client/src/router/onboarding.names.js create mode 100644 client/src/router/onboarding.routes.js create mode 100644 client/src/router/room.routes.js diff --git a/client/src/router/auth.routes.js b/client/src/router/auth.routes.js new file mode 100644 index 00000000..77d89b47 --- /dev/null +++ b/client/src/router/auth.routes.js @@ -0,0 +1,43 @@ +import login from '@/pages/login'; +import hello from '@/pages/hello'; +import betaLogin from '@/pages/beta-login'; +import registration from '@/pages/registration'; + +export default [ + { + path: '/login', + name: 'login', + component: login, + meta: { + layout: 'public', + public: true, + }, + }, + { + path: '/hello', + name: 'hello', + component: hello, + meta: { + layout: 'public', + public: true, + }, + }, + { + path: '/beta-login', + name: 'betaLogin', + component: betaLogin, + meta: { + layout: 'public', + public: true, + }, + }, + { + path: '/register', + component: registration, + name: 'registration', + meta: { + public: true, + layout: 'public', + }, + } +]; diff --git a/client/src/router/index.js b/client/src/router/index.js index b1c58d2a..05d78171 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -31,66 +31,24 @@ import oldClasses from '@/pages/oldClasses'; import createClass from '@/pages/createClass'; import showCode from '@/pages/showCode'; import news from '@/pages/news'; -import onboarding from '@/pages/onboarding'; -import onboardingStart from '@/pages/onboarding/start'; -import onboardingStep1 from '@/pages/onboarding/step1'; -import onboardingStep2 from '@/pages/onboarding/step2'; -import onboardingStep3 from '@/pages/onboarding/step3'; import moduleRoutes from './module.routes'; import portfolioRoutes from './portfolio.routes'; +import onboardingRoutes from './onboarding.routes'; +import authRoutes from './auth.routes'; +import roomRoutes from './room.routes'; import store from '@/store/index'; -const ONBOARDING_STEP_1 = 'onboarding-step-1'; -const ONBOARDING_STEP_2 = 'onboarding-step-2'; -const ONBOARDING_STEP_3 = 'onboarding-step-3'; - const routes = [ { path: '/', name: 'home', component: start, }, - { - path: '/login', - name: 'login', - component: login, - meta: { - layout: 'public', - public: true, - }, - }, - { - path: '/hello', - name: 'hello', - component: hello, - meta: { - layout: 'public', - public: true, - }, - }, - { - path: '/beta-login', - name: 'betaLogin', - component: betaLogin, - meta: { - layout: 'public', - public: true, - }, - }, ...moduleRoutes, - {path: '/rooms', name: 'rooms', component: rooms, meta: {filter: true}}, - {path: '/new-room/', name: 'new-room', component: newRoom}, - {path: '/edit-room/:id', name: 'edit-room', component: editRoom, props: true}, - {path: '/room/:slug', name: 'room', component: room, props: true}, - { - path: '/module-room/:slug', - name: 'moduleRoom', - component: moduleRoom, - props: true, - meta: {layout: 'fullScreen'}, - }, + ...authRoutes, + ...roomRoutes, {path: '/article/:slug', name: 'article', component: article, meta: {layout: 'simple'}}, { path: '/instruments/', @@ -127,15 +85,6 @@ const routes = [ props: true, meta: {layout: 'simple'}, }, - { - path: '/register', - component: registration, - name: 'registration', - meta: { - public: true, - layout: 'public', - }, - }, { path: '/check-email', component: checkEmail, @@ -176,51 +125,7 @@ const routes = [ component: news, name: 'news', }, - { - path: '/onboarding', - component: onboarding, - children: [ - { - path: '', - component: onboardingStart, - name: 'onboarding-start', - meta: { - layout: 'blank', - next: ONBOARDING_STEP_1, - }, - }, - { - path: 'learning', - component: onboardingStep1, - name: ONBOARDING_STEP_1, - meta: { - layout: 'blank', - next: ONBOARDING_STEP_2, - illustration: 'contents', - }, - }, - { - path: 'collaboration', - component: onboardingStep2, - name: ONBOARDING_STEP_2, - meta: { - layout: 'blank', - next: ONBOARDING_STEP_3, - illustration: 'rooms', - }, - }, - { - path: 'portfolio', - component: onboardingStep3, - name: ONBOARDING_STEP_3, - meta: { - layout: 'blank', - next: 'home', - illustration: 'portfolio', - }, - }, - ], - }, + ...onboardingRoutes, {path: '/styleguide', component: styleGuidePage}, { path: '*', diff --git a/client/src/router/onboarding.names.js b/client/src/router/onboarding.names.js new file mode 100644 index 00000000..52f70bdf --- /dev/null +++ b/client/src/router/onboarding.names.js @@ -0,0 +1,3 @@ +export const ONBOARDING_STEP_1 = 'onboarding-step-1'; +export const ONBOARDING_STEP_2 = 'onboarding-step-2'; +export const ONBOARDING_STEP_3 = 'onboarding-step-3'; diff --git a/client/src/router/onboarding.routes.js b/client/src/router/onboarding.routes.js new file mode 100644 index 00000000..00fd4c04 --- /dev/null +++ b/client/src/router/onboarding.routes.js @@ -0,0 +1,55 @@ +import onboarding from '@/pages/onboarding'; +import onboardingStart from '@/pages/onboarding/start'; +import onboardingStep1 from '@/pages/onboarding/step1'; +import onboardingStep2 from '@/pages/onboarding/step2'; +import onboardingStep3 from '@/pages/onboarding/step3'; + +import {ONBOARDING_STEP_1, ONBOARDING_STEP_2, ONBOARDING_STEP_3} from '@/router/onboarding.names'; + +export default [ + { + path: '/onboarding', + component: onboarding, + children: [ + { + path: '', + component: onboardingStart, + name: 'onboarding-start', + meta: { + layout: 'blank', + next: ONBOARDING_STEP_1, + }, + }, + { + path: 'learning', + component: onboardingStep1, + name: ONBOARDING_STEP_1, + meta: { + layout: 'blank', + next: ONBOARDING_STEP_2, + illustration: 'contents', + }, + }, + { + path: 'collaboration', + component: onboardingStep2, + name: ONBOARDING_STEP_2, + meta: { + layout: 'blank', + next: ONBOARDING_STEP_3, + illustration: 'rooms', + }, + }, + { + path: 'portfolio', + component: onboardingStep3, + name: ONBOARDING_STEP_3, + meta: { + layout: 'blank', + next: 'home', + illustration: 'portfolio', + }, + }, + ], + } +]; diff --git a/client/src/router/room.routes.js b/client/src/router/room.routes.js new file mode 100644 index 00000000..22c5abf6 --- /dev/null +++ b/client/src/router/room.routes.js @@ -0,0 +1,19 @@ +import rooms from '@/pages/rooms'; +import newRoom from '@/pages/newRoom'; +import editRoom from '@/pages/editRoom'; +import room from '@/pages/room'; +import moduleRoom from '@/pages/module/moduleRoom'; + +export default [ + {path: '/rooms', name: 'rooms', component: rooms, meta: {filter: true}}, + {path: '/new-room/', name: 'new-room', component: newRoom}, + {path: '/edit-room/:id', name: 'edit-room', component: editRoom, props: true}, + {path: '/room/:slug', name: 'room', component: room, props: true}, + { + path: '/module-room/:slug', + name: 'moduleRoom', + component: moduleRoom, + props: true, + meta: {layout: 'fullScreen'}, + } +];