krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

new client router changes: rename guild.vue to group.vue and GuildPage to GroupPage (#8957)

Browse Source 
* change challenge creation button to "Add Challenge Tasks"

* router changes: rename guild.vue to group.vue and GuildPage to GroupPage
This commit is contained in:
Alys
2017-08-21 08:49:47 +10:00
committed by GitHub
parent 876552b922
commit 2a2192e196
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/client/components/challenges/challengeModal.vue
View File

@@ -53,7 +53,7 @@
.col-12.text-center.submit-button-wrapper .col-12.text-center.submit-button-wrapper
.alert.alert-warning(v-if='insufficientGemsForTavernChallenge') .alert.alert-warning(v-if='insufficientGemsForTavernChallenge')
You do not have enough gems to create a Tavern challenge 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')}} button.btn.btn-primary(v-once, v-if='!creating', @click='updateChallenge()') {{$t('updateChallenge')}}
.col-12.text-center .col-12.text-center
p(v-once) {{$t('challengeMinimum')}} p(v-once) {{$t('challengeMinimum')}}

0
website/client/components/groups/guild.vue → website/client/components/groups/group.vue
View File

8
website/client/router.js
View File

@@ -68,7 +68,7 @@ const GuildIndex = () => import(/* webpackChunkName: "guilds" */ './components/g
const TavernPage = () => import(/* webpackChunkName: "guilds" */ './components/groups/tavern'); const TavernPage = () => import(/* webpackChunkName: "guilds" */ './components/groups/tavern');
const MyGuilds = () => import(/* webpackChunkName: "guilds" */ './components/groups/myGuilds'); const MyGuilds = () => import(/* webpackChunkName: "guilds" */ './components/groups/myGuilds');
const GuildsDiscoveryPage = () => import(/* webpackChunkName: "guilds" */ './components/groups/discovery'); 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'); const GroupPlansAppPage = () => import(/* webpackChunkName: "guilds" */ './components/groups/groupPlan');
// Group Plans // Group Plans
@@ -124,7 +124,7 @@ const router = new VueRouter({
{ name: 'time', path: 'time', component: TimeTravelersPage }, { 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: 'groupPlan', path: '/group-plans', component: GroupPlansAppPage },
{ {
name: 'groupPlanDetail', name: 'groupPlanDetail',
@@ -141,7 +141,7 @@ const router = new VueRouter({
{ {
name: 'groupPlanDetailInformation', name: 'groupPlanDetailInformation',
path: '/group-plans/:groupId/information', path: '/group-plans/:groupId/information',
component: GuildPage, component: GroupPage,
props: true, props: true,
}, },
], ],
@@ -164,7 +164,7 @@ const router = new VueRouter({
{ {
name: 'guild', name: 'guild',
path: 'guild/:groupId', path: 'guild/:groupId',
component: GuildPage, component: GroupPage,
props: true, props: true,
}, },
], ],

1
website/common/locales/en/challenge.json
View File

@@ -27,6 +27,7 @@
"notParticipating": "Not Participating", "notParticipating": "Not Participating",
"either": "Either", "either": "Either",
"createChallenge": "Create Challenge", "createChallenge": "Create Challenge",
"createChallengeAddTasks": "Add Challenge Tasks",
"discard": "Discard", "discard": "Discard",
"challengeTitle": "Challenge Title", "challengeTitle": "Challenge Title",
"challengeTag": "Tag Name", "challengeTag": "Tag Name",