mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-17 22:57:21 +01:00
* delete merch.vue and all mentions of links to merch page * Added comments about why merch page is being deleted Co-authored-by: Kareen <kareenf@umich.edu>
This commit is contained in:
@@ -49,11 +49,13 @@
|
|||||||
target="_blank"
|
target="_blank"
|
||||||
>{{ $t('oldNews') }}</a>
|
>{{ $t('oldNews') }}</a>
|
||||||
</li>
|
</li>
|
||||||
|
<!-- Commenting out merch page see https://github.com/HabitRPG/habitica/issues/12039
|
||||||
<li>
|
<li>
|
||||||
<router-link to="/static/merch">
|
<router-link to="/static/merch">
|
||||||
{{ $t('merch') }}
|
{{ $t('merch') }}
|
||||||
</router-link>
|
</router-link>
|
||||||
</li>
|
</li>
|
||||||
|
-->
|
||||||
<li>
|
<li>
|
||||||
<router-link to="/static/press-kit">
|
<router-link to="/static/press-kit">
|
||||||
{{ $t('presskit') }}
|
{{ $t('presskit') }}
|
||||||
|
|||||||
@@ -1,69 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="container-fluid">
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-6 offset-3">
|
|
||||||
<h1>{{ $t('merch') }}</h1>
|
|
||||||
<!-- @TODO: Visual experience: Separate each
|
|
||||||
merch items with new line? Or to show items in a table?-->
|
|
||||||
<div
|
|
||||||
v-for="(merchant) in merchants"
|
|
||||||
:key="merchant.key"
|
|
||||||
class="col-lg-6 col-md-6 col-sm-12"
|
|
||||||
>
|
|
||||||
<div class="merch-block">
|
|
||||||
<img
|
|
||||||
v-if="merchant.logo"
|
|
||||||
:src="`/static/merch/${merchant.key}-logo.png`"
|
|
||||||
>
|
|
||||||
<h2 v-else>
|
|
||||||
{{ merchant.name }}
|
|
||||||
</h2>
|
|
||||||
<div>
|
|
||||||
<a
|
|
||||||
:href="merchant.link"
|
|
||||||
target="_blank"
|
|
||||||
>
|
|
||||||
<img
|
|
||||||
class="img-rendering-auto"
|
|
||||||
:src="`/static/merch/${merchant.key}.png`"
|
|
||||||
>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
<p>{{ $t('merch-' + merchant.key + '-summary') }}</p>
|
|
||||||
<a
|
|
||||||
class="btn btn-primary"
|
|
||||||
:href="merchant.link"
|
|
||||||
target="_blank"
|
|
||||||
>{{ $t('merch-' + merchant.key + '-goto') }}</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
export default {
|
|
||||||
data () {
|
|
||||||
return {
|
|
||||||
merchants: [
|
|
||||||
{
|
|
||||||
key: 'teespring', logo: true, name: 'Teespring', link: 'https://teespring.com/habitica-gryphon-t-shirt',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: 'teespring-eu', logo: true, name: 'Teespring (EU)', link: 'https://teespring.com/habitica-gryphon-t-shirt_eu',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: 'teespring-mug', logo: true, name: 'Teespring', link: 'https://teespring.com/shop/habitica-gryphon-mug',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: 'teespring-mug-eu', logo: true, name: 'Teespring (EU)', link: 'https://teespring.com/shop/habitica-hydration-mug-eu',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: 'stickermule', logo: true, name: 'Stickermule', link: 'https://www.stickermule.com/uk/marketplace/9317-habitica-gryphon-sticker',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
};
|
|
||||||
},
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
@@ -18,7 +18,9 @@ const ContactPage = () => import(/* webpackChunkName: "static" */'@/components/s
|
|||||||
const FAQPage = () => import(/* webpackChunkName: "static" */'@/components/static/faq');
|
const FAQPage = () => import(/* webpackChunkName: "static" */'@/components/static/faq');
|
||||||
const FeaturesPage = () => import(/* webpackChunkName: "static" */'@/components/static/features');
|
const FeaturesPage = () => import(/* webpackChunkName: "static" */'@/components/static/features');
|
||||||
const GroupPlansPage = () => import(/* webpackChunkName: "static" */'@/components/static/groupPlans');
|
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 NewsPage = () => import(/* webpackChunkName: "static" */'@/components/static/newStuff');
|
||||||
const OverviewPage = () => import(/* webpackChunkName: "static" */'@/components/static/overview');
|
const OverviewPage = () => import(/* webpackChunkName: "static" */'@/components/static/overview');
|
||||||
const PressKitPage = () => import(/* webpackChunkName: "static" */'@/components/static/pressKit');
|
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: 'front', path: 'front', component: HomePage, meta: { requiresLogin: false },
|
||||||
},
|
},
|
||||||
{
|
// Commenting out merch page see
|
||||||
name: 'merch', path: 'merch', component: MerchPage, meta: { requiresLogin: false },
|
// 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 },
|
name: 'news', path: 'new-stuff', component: NewsPage, meta: { requiresLogin: false },
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user