+
+
+
+
+
diff --git a/src/components/app/relationships/FriendsTemplate.vue b/src/components/app/relationships/FriendsTemplate.vue
index f964cda..3e86960 100644
--- a/src/components/app/relationships/FriendsTemplate.vue
+++ b/src/components/app/relationships/FriendsTemplate.vue
@@ -75,6 +75,11 @@ export default {
\ No newline at end of file
diff --git a/src/services/userService.js b/src/services/userService.js
index d4178dc..8af7164 100644
--- a/src/services/userService.js
+++ b/src/services/userService.js
@@ -4,7 +4,13 @@ export default {
get (uniqueID) {
return wrapper(instance().get(`user/${uniqueID}`))
},
+ getSurvey() {
+ return wrapper(instance().get('/user/survey'));
+ },
setSurvey(data) {
return wrapper(instance().put('/user/survey', data));
+ },
+ skipSurvey() {
+ return wrapper(instance().delete('/user/survey/skip'));
}
}
\ No newline at end of file
diff --git a/src/store/modules/popoutsModule.js b/src/store/modules/popoutsModule.js
index 35714cb..3eb395b 100644
--- a/src/store/modules/popoutsModule.js
+++ b/src/store/modules/popoutsModule.js
@@ -13,6 +13,7 @@ const state = {
userInformationPopoutID: null,
+ surveyPopout: false,
dragDropFileUploadDialog: false,
settings: false,
GDLinkMenu: false,
diff --git a/src/store/modules/socketIOModule.js b/src/store/modules/socketIOModule.js
index 1aac417..7a9c736 100644
--- a/src/store/modules/socketIOModule.js
+++ b/src/store/modules/socketIOModule.js
@@ -118,6 +118,9 @@ const actions = {
},
['socket_customEmoji:rename'](context, emoji) {
context.dispatch('settingsModule/renameCustomEmoji', emoji)
+ },
+ ['socket_survey:completed'](context) {
+ context.dispatch('surveyCompleted');
}
}
diff --git a/src/store/modules/userModule.js b/src/store/modules/userModule.js
index bde6331..77a8ea1 100644
--- a/src/store/modules/userModule.js
+++ b/src/store/modules/userModule.js
@@ -34,10 +34,16 @@ const actions = {
},
changeStatus(context, status) {
context.commit('changeStatus', status)
+ },
+ surveyCompleted(context) {
+ context.commit('surveyCompleted')
}
}
const mutations = {
+ surveyCompleted(context) {
+ Vue.set(state.user, "survey_completed", true)
+ },
changeAvatar(state, avatar) {
//changes my avatar
Vue.set(state.user, "avatar", avatar)
diff --git a/src/utils/changelog.js b/src/utils/changelog.js
index 39085e9..213ba2d 100644
--- a/src/utils/changelog.js
+++ b/src/utils/changelog.js
@@ -1,19 +1,19 @@
const config = [
{
version: 1,
- title: 'Make your own guild',
- shortTitle: 'Make your guild',
- date: '31/03/2019',
+ title: 'Profile Panel',
+ shortTitle: 'Profile Panel',
+ date: '21/04/2019',
headColor: "rgba(39, 14, 204, 0.77)",
new: [
- 'You can now make your own guild.',
"Tabs have been added at the top of the screen.",
"Added an option to display your messages on the right and other messages to the left.",
- "Added users information page which allows you to block, End friendship, message someone and view their information.",
- "Replaced 'Sending' and 'Sent' with icons."
+ "Added users information page which allows you to block (Block not implemented yet), End friendship, message someone and view their information.",
+ "Replaced 'Sending' and 'Sent' with icons.",
+ "Added a survey option to display your hobbies and age in your profile page."
],
fix: ["Some formatting issues with custom emojis have been fixed."],
- next: ['link previews.']
+ next: ['Make your own servers']
},
{
title: 'Custom emojis!',
diff --git a/src/utils/surveyItems.js b/src/utils/surveyItems.js
index 6ae0c2d..8df65c8 100644
--- a/src/utils/surveyItems.js
+++ b/src/utils/surveyItems.js
@@ -237,6 +237,7 @@ export default {
{ name: "Mayotte", emoji: "πΎπΉ", code: "AF" },
{ name: "South Africa", emoji: "πΏπ¦", code: "AF" },
{ name: "Zambia", emoji: "πΏπ²", code: "AF" },
- { name: "Zimbabwe", emoji: "πΏπΌ", code: "AF" }
+ { name: "Zimbabwe", emoji: "πΏπΌ", code: "AF" },
+ { emoji: "πΆ", name: "Rather not say" }
]
};
diff --git a/src/views/App.vue b/src/views/App.vue
index 1608e3c..bb36920 100644
--- a/src/views/App.vue
+++ b/src/views/App.vue
@@ -38,6 +38,10 @@
+
+
cached
+
Coming soon!
+