diff --git a/website/client/src/components/appFooter.vue b/website/client/src/components/appFooter.vue index f183442935..571738289b 100644 --- a/website/client/src/components/appFooter.vue +++ b/website/client/src/components/appFooter.vue @@ -49,11 +49,13 @@ target="_blank" >{{ $t('oldNews') }} +
  • {{ $t('presskit') }} diff --git a/website/client/src/components/static/merch.vue b/website/client/src/components/static/merch.vue deleted file mode 100644 index 44cef2e0ef..0000000000 --- a/website/client/src/components/static/merch.vue +++ /dev/null @@ -1,69 +0,0 @@ - - - diff --git a/website/client/src/router/index.js b/website/client/src/router/index.js index de33232be4..0f95cd54fd 100644 --- a/website/client/src/router/index.js +++ b/website/client/src/router/index.js @@ -18,7 +18,9 @@ const ContactPage = () => import(/* webpackChunkName: "static" */'@/components/s const FAQPage = () => import(/* webpackChunkName: "static" */'@/components/static/faq'); const FeaturesPage = () => import(/* webpackChunkName: "static" */'@/components/static/features'); const GroupPlansPage = () => import(/* webpackChunkName: "static" */'@/components/static/groupPlans'); -const MerchPage = () => import(/* webpackChunkName: "static" */'@/components/static/merch'); +// Commenting out merch page see +// https://github.com/HabitRPG/habitica/issues/12039 +// const MerchPage = () => import(/* webpackChunkName: "static" */'@/components/static/merch'); const NewsPage = () => import(/* webpackChunkName: "static" */'@/components/static/newStuff'); const OverviewPage = () => import(/* webpackChunkName: "static" */'@/components/static/overview'); const PressKitPage = () => import(/* webpackChunkName: "static" */'@/components/static/pressKit'); @@ -300,9 +302,11 @@ const router = new VueRouter({ { name: 'front', path: 'front', component: HomePage, meta: { requiresLogin: false }, }, - { - name: 'merch', path: 'merch', component: MerchPage, meta: { requiresLogin: false }, - }, + // Commenting out merch page see + // https://github.com/HabitRPG/habitica/issues/12039 + // { + // name: 'merch', path: 'merch', component: MerchPage, meta: { requiresLogin: false }, + // }, { name: 'news', path: 'new-stuff', component: NewsPage, meta: { requiresLogin: false }, },