diff --git a/website/client/components/chat/copyAsTodoModal.vue b/website/client/components/chat/copyAsTodoModal.vue index 92377d5eb0..18920445e7 100644 --- a/website/client/components/chat/copyAsTodoModal.vue +++ b/website/client/components/chat/copyAsTodoModal.vue @@ -46,7 +46,7 @@ export default { copyingMessage () { this.text = this.copyingMessage.text; let baseUrl = 'https://habitica.com'; - this.notes = `[${this.copyingMessage.user}](${baseUrl}/home/#?memberId=${this.copyingMessage.uuid}) wrote in [${this.groupName}](${baseUrl}/#/options/groups/${this.groupId})`; + this.notes = `[${this.copyingMessage.user}](${baseUrl}/static/home/#?memberId=${this.copyingMessage.uuid}) wrote in [${this.groupName}](${baseUrl}/#/options/groups/${this.groupId})`; }, }, methods: { diff --git a/website/client/components/settings/deleteModal.vue b/website/client/components/settings/deleteModal.vue index 10d47ffd67..2752f590e7 100644 --- a/website/client/components/settings/deleteModal.vue +++ b/website/client/components/settings/deleteModal.vue @@ -59,7 +59,7 @@ export default { }, }); localStorage.clear(); - window.location.href = '/home'; + window.location.href = '/static/home'; this.$root.$emit('hide::modal', 'reset'); }, }, diff --git a/website/client/components/static/app.vue b/website/client/components/static/app.vue index 6e4b41c55b..cfcf1fa02a 100644 --- a/website/client/components/static/app.vue +++ b/website/client/components/static/app.vue @@ -1,35 +1,11 @@ - - - - diff --git a/website/client/components/static/clearBrowserData.vue b/website/client/components/static/clearBrowserData.vue index 2652aed0fd..39c97cda76 100644 --- a/website/client/components/static/clearBrowserData.vue +++ b/website/client/components/static/clearBrowserData.vue @@ -1,43 +1,25 @@ - - diff --git a/website/client/components/static/faq.vue b/website/client/components/static/faq.vue index 568b37684a..58d007eb67 100644 --- a/website/client/components/static/faq.vue +++ b/website/client/components/static/faq.vue @@ -1,25 +1,16 @@ diff --git a/website/client/components/static/maintenanceInfo.vue b/website/client/components/static/maintenanceInfo.vue deleted file mode 100644 index 8093f1c976..0000000000 --- a/website/client/components/static/maintenanceInfo.vue +++ /dev/null @@ -1,46 +0,0 @@ - - - diff --git a/website/client/components/static/merch.vue b/website/client/components/static/merch.vue index 05c2c7efcd..fd62575558 100644 --- a/website/client/components/static/merch.vue +++ b/website/client/components/static/merch.vue @@ -1,41 +1,22 @@ - - diff --git a/website/client/components/static/staticWrapper.vue b/website/client/components/static/staticWrapper.vue new file mode 100644 index 0000000000..6f948c19a0 --- /dev/null +++ b/website/client/components/static/staticWrapper.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/website/client/components/static/terms.vue b/website/client/components/static/terms.vue index 0cc266f782..b5b52955a2 100644 --- a/website/client/components/static/terms.vue +++ b/website/client/components/static/terms.vue @@ -1,587 +1,568 @@ - - - - diff --git a/website/client/components/static/videos.vue b/website/client/components/static/videos.vue deleted file mode 100644 index d6e73aa4a1..0000000000 --- a/website/client/components/static/videos.vue +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/website/client/router.js b/website/client/router.js index 2eafb56f03..3ab5a48ec3 100644 --- a/website/client/router.js +++ b/website/client/router.js @@ -9,6 +9,7 @@ import * as Analytics from 'client/libs/analytics'; import ParentPage from './components/parentPage'; // Static Pages +const StaticWrapper = () => import(/* webpackChunkName: "static" */'./components/static/staticWrapper'); const AppPage = () => import(/* webpackChunkName: "static" */'./components/static/app'); const ClearBrowserDataPage = () => import(/* webpackChunkName: "static" */'./components/static/clearBrowserData'); const CommunityGuidelinesPage = () => import(/* webpackChunkName: "static" */'./components/static/communityGuidelines'); @@ -17,14 +18,11 @@ const FAQPage = () => import(/* webpackChunkName: "static" */'./components/stati const FeaturesPage = () => import(/* webpackChunkName: "static" */'./components/static/features'); const HomePage = () => import(/* webpackChunkName: "static" */'./components/static/home'); const GroupPlansPage = () => import(/* webpackChunkName: "static" */'./components/static/groupPlans'); -const MaintenancePage = () => import(/* webpackChunkName: "static" */'./components/static/maintenance'); -const MaintenanceInfoPage = () => import(/* webpackChunkName: "static" */'./components/static/maintenanceInfo'); const MerchPage = () => import(/* webpackChunkName: "static" */'./components/static/merch'); const OverviewPage = () => import(/* webpackChunkName: "static" */'./components/static/overview'); const PressKitPage = () => import(/* webpackChunkName: "static" */'./components/static/pressKit'); const PrivacyPage = () => import(/* webpackChunkName: "static" */'./components/static/privacy'); const TermsPage = () => import(/* webpackChunkName: "static" */'./components/static/terms'); -const VideosPage = () => import(/* webpackChunkName: "static" */'./components/static/videos'); const RegisterLogin = () => import(/* webpackChunkName: "auth" */'./components/auth/registerLogin'); @@ -100,7 +98,6 @@ const router = new VueRouter({ }, // requiresLogin is true by default, isStatic false routes: [ - { name: 'home', path: '/home', component: HomePage, meta: {requiresLogin: false} }, { name: 'register', path: '/register', component: RegisterLogin, meta: {requiresLogin: false} }, { name: 'login', path: '/login', component: RegisterLogin, meta: {requiresLogin: false} }, { name: 'tasks', path: '/', component: UserTasks }, @@ -239,7 +236,7 @@ const router = new VueRouter({ }, { path: '/static', - component: ParentPage, + component: StaticWrapper, children: [ { name: 'app', path: 'app', component: AppPage, meta: {requiresLogin: false}}, { name: 'clearBrowserData', path: 'clear-browser-data', component: ClearBrowserDataPage, meta: {requiresLogin: false}}, @@ -248,15 +245,13 @@ const router = new VueRouter({ { name: 'faq', path: 'faq', component: FAQPage, meta: {requiresLogin: false}}, { name: 'features', path: 'features', component: FeaturesPage, meta: {requiresLogin: false}}, { name: 'groupPlans', path: 'group-plans', component: GroupPlansPage, meta: {requiresLogin: false}}, - { name: 'maintenance', path: 'maintenance', component: MaintenancePage, meta: {requiresLogin: false}}, - { name: 'maintenance-info', path: 'maintenance-info', component: MaintenanceInfoPage, meta: {requiresLogin: false}}, + { name: 'home', path: 'home', component: HomePage, meta: {requiresLogin: false} }, { name: 'merch', path: 'merch', component: MerchPage, meta: {requiresLogin: false}}, { name: 'overview', path: 'overview', component: OverviewPage, meta: {requiresLogin: false}}, { name: 'plans', path: 'plans', component: GroupPlansPage, meta: {requiresLogin: false}}, { name: 'pressKit', path: 'press-kit', component: PressKitPage, meta: {requiresLogin: false}}, { name: 'privacy', path: 'privacy', component: PrivacyPage, meta: {requiresLogin: false}}, { name: 'terms', path: 'terms', component: TermsPage, meta: {requiresLogin: false}}, - { name: 'videos', path: 'videos', component: VideosPage, meta: {requiresLogin: false}}, ], }, {