From 2a2192e1965b2b955a31ca2e755c7888d7b9d8c8 Mon Sep 17 00:00:00 2001 From: Alys Date: Mon, 21 Aug 2017 08:49:47 +1000 Subject: [PATCH] new client router changes: rename guild.vue to group.vue and GuildPage to GroupPage (#8957) * change challenge creation button to "Add Challenge Tasks" * router changes: rename guild.vue to group.vue and GuildPage to GroupPage --- website/client/components/challenges/challengeModal.vue | 2 +- website/client/components/groups/{guild.vue => group.vue} | 0 website/client/router.js | 8 ++++---- website/common/locales/en/challenge.json | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) rename website/client/components/groups/{guild.vue => group.vue} (100%) diff --git a/website/client/components/challenges/challengeModal.vue b/website/client/components/challenges/challengeModal.vue index 439ec11935..36179f14bf 100644 --- a/website/client/components/challenges/challengeModal.vue +++ b/website/client/components/challenges/challengeModal.vue @@ -53,7 +53,7 @@ .col-12.text-center.submit-button-wrapper .alert.alert-warning(v-if='insufficientGemsForTavernChallenge') You do not have enough gems to create a Tavern challenge - button.btn.btn-primary(v-once, v-if='creating', @click='createChallenge()') {{$t('createChallenge')}} + button.btn.btn-primary(v-once, v-if='creating', @click='createChallenge()') {{$t('createChallengeAddTasks')}} button.btn.btn-primary(v-once, v-if='!creating', @click='updateChallenge()') {{$t('updateChallenge')}} .col-12.text-center p(v-once) {{$t('challengeMinimum')}} diff --git a/website/client/components/groups/guild.vue b/website/client/components/groups/group.vue similarity index 100% rename from website/client/components/groups/guild.vue rename to website/client/components/groups/group.vue diff --git a/website/client/router.js b/website/client/router.js index bae098e77b..edb0789c61 100644 --- a/website/client/router.js +++ b/website/client/router.js @@ -68,7 +68,7 @@ const GuildIndex = () => import(/* webpackChunkName: "guilds" */ './components/g const TavernPage = () => import(/* webpackChunkName: "guilds" */ './components/groups/tavern'); const MyGuilds = () => import(/* webpackChunkName: "guilds" */ './components/groups/myGuilds'); const GuildsDiscoveryPage = () => import(/* webpackChunkName: "guilds" */ './components/groups/discovery'); -const GuildPage = () => import(/* webpackChunkName: "guilds" */ './components/groups/guild'); +const GroupPage = () => import(/* webpackChunkName: "guilds" */ './components/groups/group'); const GroupPlansAppPage = () => import(/* webpackChunkName: "guilds" */ './components/groups/groupPlan'); // Group Plans @@ -124,7 +124,7 @@ const router = new VueRouter({ { name: 'time', path: 'time', component: TimeTravelersPage }, ], }, - { name: 'party', path: '/party', component: GuildPage }, + { name: 'party', path: '/party', component: GroupPage }, { name: 'groupPlan', path: '/group-plans', component: GroupPlansAppPage }, { name: 'groupPlanDetail', @@ -141,7 +141,7 @@ const router = new VueRouter({ { name: 'groupPlanDetailInformation', path: '/group-plans/:groupId/information', - component: GuildPage, + component: GroupPage, props: true, }, ], @@ -164,7 +164,7 @@ const router = new VueRouter({ { name: 'guild', path: 'guild/:groupId', - component: GuildPage, + component: GroupPage, props: true, }, ], diff --git a/website/common/locales/en/challenge.json b/website/common/locales/en/challenge.json index 1b62224fe2..caac01e71f 100644 --- a/website/common/locales/en/challenge.json +++ b/website/common/locales/en/challenge.json @@ -27,6 +27,7 @@ "notParticipating": "Not Participating", "either": "Either", "createChallenge": "Create Challenge", + "createChallengeAddTasks": "Add Challenge Tasks", "discard": "Discard", "challengeTitle": "Challenge Title", "challengeTag": "Tag Name",