From 0a59b8e85bc1c123b6152d5f1a0c5dc0583fd523 Mon Sep 17 00:00:00 2001 From: Keith Holliday Date: Thu, 20 Jul 2017 14:52:46 -0600 Subject: [PATCH] [WIP] New client challenges (#8842) * Added initial challenge pages * Added challenge item and find guilds page * Added challenge detail * Added challenge modals * Ported over challenge service code * Ported over challenge ctrl code * Added styles and column * Minor modal updates * Removed duplicate keys * Fixed casing --- .../svg/for-css/support-habitica-gems.svg | 115 ++++++++++ website/client/assets/svg/member-icon.svg | 3 + website/client/components/appMenu.vue | 2 +- .../components/challenges/challengeDetail.vue | 199 ++++++++++++++++++ .../components/challenges/challengeItem.vue | 178 ++++++++++++++++ .../components/challenges/challengeModal.vue | 160 ++++++++++++++ .../challenges/closeChallengeModal.vue | 104 +++++++++ .../components/challenges/findChallenges.vue | 89 ++++++++ .../client/components/challenges/index.vue | 19 ++ .../components/challenges/myChallenges.vue | 142 +++++++++++++ .../client/components/challenges/sidebar.vue | 156 ++++++++++++++ website/client/components/guilds/myGuilds.vue | 34 +-- website/client/router.js | 30 ++- website/client/store/actions/challenges.js | 75 +++++++ website/client/store/actions/index.js | 2 + website/common/locales/en/newClient.json | 24 ++- 16 files changed, 1312 insertions(+), 20 deletions(-) create mode 100644 website/client/assets/svg/for-css/support-habitica-gems.svg create mode 100644 website/client/assets/svg/member-icon.svg create mode 100644 website/client/components/challenges/challengeDetail.vue create mode 100644 website/client/components/challenges/challengeItem.vue create mode 100644 website/client/components/challenges/challengeModal.vue create mode 100644 website/client/components/challenges/closeChallengeModal.vue create mode 100644 website/client/components/challenges/findChallenges.vue create mode 100644 website/client/components/challenges/index.vue create mode 100644 website/client/components/challenges/myChallenges.vue create mode 100644 website/client/components/challenges/sidebar.vue create mode 100644 website/client/store/actions/challenges.js diff --git a/website/client/assets/svg/for-css/support-habitica-gems.svg b/website/client/assets/svg/for-css/support-habitica-gems.svg new file mode 100644 index 0000000000..bf2f8d8f28 --- /dev/null +++ b/website/client/assets/svg/for-css/support-habitica-gems.svg @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/website/client/assets/svg/member-icon.svg b/website/client/assets/svg/member-icon.svg new file mode 100644 index 0000000000..d7975d5ca5 --- /dev/null +++ b/website/client/assets/svg/member-icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/website/client/components/appMenu.vue b/website/client/components/appMenu.vue index 88e35a06f2..794aeee139 100644 --- a/website/client/components/appMenu.vue +++ b/website/client/components/appMenu.vue @@ -24,7 +24,7 @@ div router-link.dropdown-item(:to="{name: 'tavern'}") {{ $t('tavern') }} router-link.dropdown-item(:to="{name: 'myGuilds'}") {{ $t('myGuilds') }} router-link.dropdown-item(:to="{name: 'guildsDiscovery'}") {{ $t('guildsDiscovery') }} - router-link.nav-item(tag="li", :to="{name: 'challenges'}", exact) + router-link.nav-item(tag="li", :to="{name: 'myChallenges'}", exact) a.nav-link(v-once) {{ $t('challenges') }} router-link.nav-item.dropdown(tag="li", to="/help", :class="{'active': $route.path.startsWith('/help')}") a.nav-link(v-once) {{ $t('help') }} diff --git a/website/client/components/challenges/challengeDetail.vue b/website/client/components/challenges/challengeDetail.vue new file mode 100644 index 0000000000..589b387ec4 --- /dev/null +++ b/website/client/components/challenges/challengeDetail.vue @@ -0,0 +1,199 @@ + + + + + diff --git a/website/client/components/challenges/challengeItem.vue b/website/client/components/challenges/challengeItem.vue new file mode 100644 index 0000000000..04c9bfb8b9 --- /dev/null +++ b/website/client/components/challenges/challengeItem.vue @@ -0,0 +1,178 @@ + + + + + diff --git a/website/client/components/challenges/challengeModal.vue b/website/client/components/challenges/challengeModal.vue new file mode 100644 index 0000000000..1cfdb9e28b --- /dev/null +++ b/website/client/components/challenges/challengeModal.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/website/client/components/challenges/closeChallengeModal.vue b/website/client/components/challenges/closeChallengeModal.vue new file mode 100644 index 0000000000..b53e6ec3e1 --- /dev/null +++ b/website/client/components/challenges/closeChallengeModal.vue @@ -0,0 +1,104 @@ + + + + + diff --git a/website/client/components/challenges/findChallenges.vue b/website/client/components/challenges/findChallenges.vue new file mode 100644 index 0000000000..64e13479fe --- /dev/null +++ b/website/client/components/challenges/findChallenges.vue @@ -0,0 +1,89 @@ + + + + + diff --git a/website/client/components/challenges/index.vue b/website/client/components/challenges/index.vue new file mode 100644 index 0000000000..8a2588ca1b --- /dev/null +++ b/website/client/components/challenges/index.vue @@ -0,0 +1,19 @@ + + + diff --git a/website/client/components/challenges/myChallenges.vue b/website/client/components/challenges/myChallenges.vue new file mode 100644 index 0000000000..7ab1862c0e --- /dev/null +++ b/website/client/components/challenges/myChallenges.vue @@ -0,0 +1,142 @@ + + + + + diff --git a/website/client/components/challenges/sidebar.vue b/website/client/components/challenges/sidebar.vue new file mode 100644 index 0000000000..496251d24f --- /dev/null +++ b/website/client/components/challenges/sidebar.vue @@ -0,0 +1,156 @@ + + + diff --git a/website/client/components/guilds/myGuilds.vue b/website/client/components/guilds/myGuilds.vue index 13a834b53e..94ca7da8f8 100644 --- a/website/client/components/guilds/myGuilds.vue +++ b/website/client/components/guilds/myGuilds.vue @@ -24,26 +24,26 @@