From 16b244d5c67a7516c7a1493036609784eec2283c Mon Sep 17 00:00:00 2001 From: Keith Holliday Date: Tue, 25 Jul 2017 08:24:40 -0600 Subject: [PATCH] New client random catchup (#8891) * 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 * Added initial chat component * Added copy as todo modal * Added sync * Added chat to groups * Fixed lint * Added notification service * Added tag services * Added notifications * Added hall * Added analytics * Added http interceptor * Added initial autocomplete * Added initial footer component * Began coding and designing footer * Added inital hall * Ported over inital group plan ctrl code * Added initial invite modal * Added initial member detail modal * Added initial notification menu * Ported over inital notification code * Fixed import line * Fixed autocomplete import casing --- website/client/app.vue | 6 + website/client/assets/svg/gryphon.svg | 2 +- website/client/components/appFooter.vue | 223 ++++++++++ website/client/components/appHeader.vue | 80 ++-- website/client/components/appMenu.vue | 9 +- .../client/components/chat/autoComplete.vue | 66 +++ .../{guilds => groups}/createPartyModal.vue | 0 .../{guilds => groups}/discovery.vue | 0 .../{guilds => groups}/groupFormModal.vue | 0 .../client/components/groups/groupPlan.vue | 192 +++++++++ .../components/{guilds => groups}/guild.vue | 10 +- .../components/{guilds => groups}/index.vue | 0 .../client/components/groups/inviteModal.vue | 147 +++++++ .../{guilds => groups}/membersModal.vue | 0 .../{guilds => groups}/myGuilds.vue | 0 .../{guilds => groups}/newPartyModal.jade | 0 .../{guilds => groups}/ownedQuestsModal.vue | 0 .../{guilds => groups}/publicGuildItem.vue | 0 .../components/{guilds => groups}/sidebar.vue | 0 .../{guilds => groups}/startQuestModal.vue | 0 .../components/{guilds => groups}/tavern.vue | 6 + website/client/components/hall/heroes.vue | 175 ++++++++ website/client/components/hall/index.vue | 19 + website/client/components/hall/patrons.vue | 53 +++ .../client/components/members/memberModal.vue | 143 +++++++ .../client/components/notificationMenu.vue | 198 +++++++++ website/client/components/notifications.vue | 401 ++++++++++++++++++ website/client/index.html | 40 +- website/client/main.js | 11 + website/client/merch/stickermule-logo.png | Bin 0 -> 4672 bytes website/client/merch/stickermule-logo.svg | 1 + website/client/merch/stickermule.png | Bin 0 -> 10586 bytes website/client/merch/teespring-eu-logo.png | Bin 0 -> 7630 bytes website/client/merch/teespring-eu.png | Bin 0 -> 313049 bytes website/client/merch/teespring-logo.png | Bin 0 -> 7630 bytes website/client/merch/teespring-logo.svg | 63 +++ .../client/merch/teespring-mug-eu-logo.png | Bin 0 -> 7630 bytes website/client/merch/teespring-mug-eu.png | Bin 0 -> 101280 bytes website/client/merch/teespring-mug-logo.png | Bin 0 -> 7630 bytes website/client/merch/teespring-mug.png | Bin 0 -> 108235 bytes website/client/merch/teespring.png | Bin 0 -> 403704 bytes website/client/mixins/analytics.js | 86 ++++ website/client/mixins/notifications.js | 124 ++++++ website/client/router.js | 27 +- website/client/store/actions/hall.js | 30 ++ website/client/store/actions/index.js | 6 + website/client/store/actions/notifications.js | 15 + website/client/store/actions/tags.js | 44 ++ website/common/locales/en/newClient.json | 3 +- 49 files changed, 2126 insertions(+), 54 deletions(-) create mode 100644 website/client/components/appFooter.vue create mode 100644 website/client/components/chat/autoComplete.vue rename website/client/components/{guilds => groups}/createPartyModal.vue (100%) rename website/client/components/{guilds => groups}/discovery.vue (100%) rename website/client/components/{guilds => groups}/groupFormModal.vue (100%) create mode 100644 website/client/components/groups/groupPlan.vue rename website/client/components/{guilds => groups}/guild.vue (98%) rename website/client/components/{guilds => groups}/index.vue (100%) create mode 100644 website/client/components/groups/inviteModal.vue rename website/client/components/{guilds => groups}/membersModal.vue (100%) rename website/client/components/{guilds => groups}/myGuilds.vue (100%) rename website/client/components/{guilds => groups}/newPartyModal.jade (100%) rename website/client/components/{guilds => groups}/ownedQuestsModal.vue (100%) rename website/client/components/{guilds => groups}/publicGuildItem.vue (100%) rename website/client/components/{guilds => groups}/sidebar.vue (100%) rename website/client/components/{guilds => groups}/startQuestModal.vue (100%) rename website/client/components/{guilds => groups}/tavern.vue (97%) create mode 100644 website/client/components/hall/heroes.vue create mode 100644 website/client/components/hall/index.vue create mode 100644 website/client/components/hall/patrons.vue create mode 100644 website/client/components/members/memberModal.vue create mode 100644 website/client/components/notificationMenu.vue create mode 100644 website/client/components/notifications.vue create mode 100644 website/client/merch/stickermule-logo.png create mode 100644 website/client/merch/stickermule-logo.svg create mode 100644 website/client/merch/stickermule.png create mode 100644 website/client/merch/teespring-eu-logo.png create mode 100644 website/client/merch/teespring-eu.png create mode 100644 website/client/merch/teespring-logo.png create mode 100644 website/client/merch/teespring-logo.svg create mode 100644 website/client/merch/teespring-mug-eu-logo.png create mode 100644 website/client/merch/teespring-mug-eu.png create mode 100644 website/client/merch/teespring-mug-logo.png create mode 100644 website/client/merch/teespring-mug.png create mode 100644 website/client/merch/teespring.png create mode 100644 website/client/mixins/analytics.js create mode 100644 website/client/mixins/notifications.js create mode 100644 website/client/store/actions/hall.js create mode 100644 website/client/store/actions/notifications.js create mode 100644 website/client/store/actions/tags.js diff --git a/website/client/app.vue b/website/client/app.vue index 2d0feaaf89..8162035946 100644 --- a/website/client/app.vue +++ b/website/client/app.vue @@ -5,15 +5,19 @@ #loading-screen.h-100.w-100.d-flex.justify-content-center.align-items-center(v-if="!isUserLoaded") p Loading... template(v-else) + notifications app-menu .container-fluid app-header router-view + app-footer diff --git a/website/client/components/appHeader.vue b/website/client/components/appHeader.vue index 352ad1086d..a4e9cf185c 100644 --- a/website/client/components/appHeader.vue +++ b/website/client/components/appHeader.vue @@ -24,59 +24,59 @@ diff --git a/website/client/components/guilds/createPartyModal.vue b/website/client/components/groups/createPartyModal.vue similarity index 100% rename from website/client/components/guilds/createPartyModal.vue rename to website/client/components/groups/createPartyModal.vue diff --git a/website/client/components/guilds/discovery.vue b/website/client/components/groups/discovery.vue similarity index 100% rename from website/client/components/guilds/discovery.vue rename to website/client/components/groups/discovery.vue diff --git a/website/client/components/guilds/groupFormModal.vue b/website/client/components/groups/groupFormModal.vue similarity index 100% rename from website/client/components/guilds/groupFormModal.vue rename to website/client/components/groups/groupFormModal.vue diff --git a/website/client/components/groups/groupPlan.vue b/website/client/components/groups/groupPlan.vue new file mode 100644 index 0000000000..856c1bf934 --- /dev/null +++ b/website/client/components/groups/groupPlan.vue @@ -0,0 +1,192 @@ + + + diff --git a/website/client/components/guilds/guild.vue b/website/client/components/groups/guild.vue similarity index 98% rename from website/client/components/guilds/guild.vue rename to website/client/components/groups/guild.vue index d3fa9270ee..54038efbf4 100644 --- a/website/client/components/guilds/guild.vue +++ b/website/client/components/groups/guild.vue @@ -1,6 +1,7 @@