Refactor code

This commit is contained in:
Ramon Wenger 2021-03-15 13:06:03 +01:00
parent e800082ce2
commit c130219ed0
5 changed files with 126 additions and 101 deletions

View File

@ -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',
},
}
];

View File

@ -31,66 +31,24 @@ import oldClasses from '@/pages/oldClasses';
import createClass from '@/pages/createClass'; import createClass from '@/pages/createClass';
import showCode from '@/pages/showCode'; import showCode from '@/pages/showCode';
import news from '@/pages/news'; 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 moduleRoutes from './module.routes';
import portfolioRoutes from './portfolio.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'; 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 = [ const routes = [
{ {
path: '/', path: '/',
name: 'home', name: 'home',
component: start, 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, ...moduleRoutes,
{path: '/rooms', name: 'rooms', component: rooms, meta: {filter: true}}, ...authRoutes,
{path: '/new-room/', name: 'new-room', component: newRoom}, ...roomRoutes,
{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'},
},
{path: '/article/:slug', name: 'article', component: article, meta: {layout: 'simple'}}, {path: '/article/:slug', name: 'article', component: article, meta: {layout: 'simple'}},
{ {
path: '/instruments/', path: '/instruments/',
@ -127,15 +85,6 @@ const routes = [
props: true, props: true,
meta: {layout: 'simple'}, meta: {layout: 'simple'},
}, },
{
path: '/register',
component: registration,
name: 'registration',
meta: {
public: true,
layout: 'public',
},
},
{ {
path: '/check-email', path: '/check-email',
component: checkEmail, component: checkEmail,
@ -176,51 +125,7 @@ const routes = [
component: news, component: news,
name: 'news', name: 'news',
}, },
{ ...onboardingRoutes,
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',
},
},
],
},
{path: '/styleguide', component: styleGuidePage}, {path: '/styleguide', component: styleGuidePage},
{ {
path: '*', path: '*',

View File

@ -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';

View File

@ -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',
},
},
],
}
];

View File

@ -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'},
}
];