From 62338a5ddb84b87ff39fda1e30ad9fc1d56ded62 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Tue, 7 Jul 2020 09:42:03 +0200 Subject: [PATCH 01/13] Add onboarding page with first layout implementation --- client/src/App.vue | 2 + client/src/layouts/BlankLayout.vue | 14 +++++++ client/src/pages/onboarding.vue | 67 ++++++++++++++++++++++++++++++ client/src/router/index.js | 7 ++++ 4 files changed, 90 insertions(+) create mode 100644 client/src/layouts/BlankLayout.vue create mode 100644 client/src/pages/onboarding.vue diff --git a/client/src/App.vue b/client/src/App.vue index 21e500bd..acbc6700 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -20,6 +20,7 @@ import SimpleLayout from '@/layouts/SimpleLayout'; import FullScreenLayout from '@/layouts/FullScreenLayout'; import PublicLayout from '@/layouts/PublicLayout'; + import BlankLayout from '@/layouts/BlankLayout'; import Modal from '@/components/Modal'; import NewContentBlockWizard from '@/components/content-block-form/NewContentBlockWizard'; import EditContentBlockWizard from '@/components/content-block-form/EditContentBlockWizard'; @@ -48,6 +49,7 @@ SimpleLayout, FullScreenLayout, PublicLayout, + BlankLayout, Modal, NewContentBlockWizard, EditContentBlockWizard, diff --git a/client/src/layouts/BlankLayout.vue b/client/src/layouts/BlankLayout.vue new file mode 100644 index 00000000..b6652eaf --- /dev/null +++ b/client/src/layouts/BlankLayout.vue @@ -0,0 +1,14 @@ + + + diff --git a/client/src/pages/onboarding.vue b/client/src/pages/onboarding.vue new file mode 100644 index 00000000..06ca0f2b --- /dev/null +++ b/client/src/pages/onboarding.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/client/src/router/index.js b/client/src/router/index.js index 58f96b2e..d6438859 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -39,6 +39,7 @@ 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 store from '@/store/index'; @@ -192,6 +193,12 @@ const routes = [ component: news, name: 'news' }, + { + path: '/onboarding', + component: onboarding, + name: 'onboarding', + meta: {layout: 'blank'} + }, {path: '/styleguide', component: styleGuidePage}, {path: '*', component: p404} ]; From e6fe2397b7485240b1d1399151d614e311e35014 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Tue, 7 Jul 2020 15:49:01 +0200 Subject: [PATCH 02/13] Add onboarding sub-pages --- client/src/pages/onboarding.vue | 115 ++++++++++++++++++++++---- client/src/pages/onboarding/start.vue | 20 +++++ client/src/pages/onboarding/step1.vue | 12 +++ client/src/pages/onboarding/step2.vue | 8 ++ client/src/pages/onboarding/step3.vue | 8 ++ client/src/router/index.js | 50 ++++++++++- 6 files changed, 197 insertions(+), 16 deletions(-) create mode 100644 client/src/pages/onboarding/start.vue create mode 100644 client/src/pages/onboarding/step1.vue create mode 100644 client/src/pages/onboarding/step2.vue create mode 100644 client/src/pages/onboarding/step3.vue diff --git a/client/src/pages/onboarding.vue b/client/src/pages/onboarding.vue index 06ca0f2b..815e171d 100644 --- a/client/src/pages/onboarding.vue +++ b/client/src/pages/onboarding.vue @@ -1,52 +1,119 @@ - diff --git a/client/src/pages/onboarding/start.vue b/client/src/pages/onboarding/start.vue new file mode 100644 index 00000000..b01029df --- /dev/null +++ b/client/src/pages/onboarding/start.vue @@ -0,0 +1,20 @@ + + + diff --git a/client/src/pages/onboarding/step1.vue b/client/src/pages/onboarding/step1.vue new file mode 100644 index 00000000..9598bcf5 --- /dev/null +++ b/client/src/pages/onboarding/step1.vue @@ -0,0 +1,12 @@ + diff --git a/client/src/pages/onboarding/step2.vue b/client/src/pages/onboarding/step2.vue new file mode 100644 index 00000000..efe0c696 --- /dev/null +++ b/client/src/pages/onboarding/step2.vue @@ -0,0 +1,8 @@ + diff --git a/client/src/pages/onboarding/step3.vue b/client/src/pages/onboarding/step3.vue new file mode 100644 index 00000000..8e3aa6c8 --- /dev/null +++ b/client/src/pages/onboarding/step3.vue @@ -0,0 +1,8 @@ + diff --git a/client/src/router/index.js b/client/src/router/index.js index d6438859..b82ad6b8 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -40,9 +40,17 @@ 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 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: '/', @@ -197,7 +205,47 @@ const routes = [ path: '/onboarding', component: onboarding, name: 'onboarding', - meta: {layout: 'blank'} + 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: '*', component: p404} From 5778f9844820de779aec2ab8464a62195c59fce2 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Tue, 7 Jul 2020 16:27:18 +0200 Subject: [PATCH 03/13] Replace illustrations --- .../illustrations/ContentsIllustration.vue | 285 +++++---- .../illustrations/PortfolioIllustration.vue | 312 ++++----- .../illustrations/RoomsIllustration.vue | 603 ++++++++---------- client/src/pages/onboarding.vue | 7 +- 4 files changed, 585 insertions(+), 622 deletions(-) diff --git a/client/src/components/illustrations/ContentsIllustration.vue b/client/src/components/illustrations/ContentsIllustration.vue index f74c34c9..403af0b4 100644 --- a/client/src/components/illustrations/ContentsIllustration.vue +++ b/client/src/components/illustrations/ContentsIllustration.vue @@ -1,137 +1,158 @@ diff --git a/client/src/components/illustrations/PortfolioIllustration.vue b/client/src/components/illustrations/PortfolioIllustration.vue index 499ceeec..a041a90d 100644 --- a/client/src/components/illustrations/PortfolioIllustration.vue +++ b/client/src/components/illustrations/PortfolioIllustration.vue @@ -1,159 +1,165 @@