From ec5263cbc02ba5e63ed830f01a0d2fb6aa59c83d Mon Sep 17 00:00:00 2001 From: supertiger Date: Fri, 22 Feb 2019 20:48:54 +0000 Subject: [PATCH 1/3] Added "withCredentials" line (for express sessions to work) --- src/services/Api.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/services/Api.js b/src/services/Api.js index 9217dae..ba400a2 100644 --- a/src/services/Api.js +++ b/src/services/Api.js @@ -3,7 +3,8 @@ import config from '@/config'; export const instance = () => { return axios.create({ - baseURL: config.domain + baseURL: config.domain, + withCredentials: true }) } From 15f7fc331d1fc5e0484458cfdd7ec933a3ebf784 Mon Sep 17 00:00:00 2001 From: supertiger Date: Fri, 22 Feb 2019 21:48:12 +0000 Subject: [PATCH 2/3] show link menu when clicking on edit avatar. --- src/components/app/GDriveLinkMenu.vue | 14 ++++---- .../app/SettingsPanels/MyProfile.vue | 9 ++++- src/store/index.js | 3 +- src/store/modules/settingsModule.js | 36 +++++++++++++++++++ src/store/modules/socketIOModule.js | 3 +- src/views/App.vue | 6 +++- 6 files changed, 61 insertions(+), 10 deletions(-) create mode 100644 src/store/modules/settingsModule.js diff --git a/src/components/app/GDriveLinkMenu.vue b/src/components/app/GDriveLinkMenu.vue index 323b866..9886879 100644 --- a/src/components/app/GDriveLinkMenu.vue +++ b/src/components/app/GDriveLinkMenu.vue @@ -2,7 +2,7 @@
- To upload files and images, You must link your Google Drive account with your Nertivia account. + To upload files, images or set avatars, You must link your Google Drive account with your Nertivia account.
@@ -22,7 +22,7 @@ left: 0; right: 0; background: rgba(0, 0, 0, 0.781); - z-index: 1; + z-index: 111111; display: flex; } .inner { @@ -30,16 +30,18 @@ height: 400px; width: 400px; background: rgb(32, 32, 32); - display: flex; - flex-direction: column; - color: white; - border-radius: 3px; + display: flex; + flex-direction: column; + color: white; + border-radius: 3px; } .text{ color: white; text-align: center; margin-top: 30px; font-size: 17px; + padding-left: 10px; + padding-right: 10px; } .images{ display: flex; diff --git a/src/components/app/SettingsPanels/MyProfile.vue b/src/components/app/SettingsPanels/MyProfile.vue index 84d6b02..1e96d4e 100644 --- a/src/components/app/SettingsPanels/MyProfile.vue +++ b/src/components/app/SettingsPanels/MyProfile.vue @@ -7,7 +7,7 @@
-
Edit Avatar
+
Edit Avatar
Change Password
Logout
@@ -28,6 +28,7 @@ + + diff --git a/src/components/app/MessageTemplate.vue b/src/components/app/MessageTemplate.vue index 85d024e..4478403 100644 --- a/src/components/app/MessageTemplate.vue +++ b/src/components/app/MessageTemplate.vue @@ -1,179 +1,284 @@ diff --git a/src/components/app/MyMiniInformation.vue b/src/components/app/MyMiniInformation.vue index 0a405fc..a22137d 100644 --- a/src/components/app/MyMiniInformation.vue +++ b/src/components/app/MyMiniInformation.vue @@ -50,7 +50,7 @@ export default { } }, openSettings() { - bus.$emit('openSettings'); + this.$store.dispatch('setPopoutVisibility', {name: 'settings', visibility: true}) } }, created() { diff --git a/src/components/app/Popouts.vue b/src/components/app/Popouts.vue new file mode 100644 index 0000000..5b148b7 --- /dev/null +++ b/src/components/app/Popouts.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/src/components/app/RightPanel.vue b/src/components/app/RightPanel.vue index 66da7c3..18f89ca 100644 --- a/src/components/app/RightPanel.vue +++ b/src/components/app/RightPanel.vue @@ -2,25 +2,54 @@
- - menu - + menu +
+
+ Welcome back, {{user.username}}! + {{channelName}}
-
Welcome back!{{channelName}}
- +
- + +
- +
- - + +
+ attach_file +
+ +
@@ -28,29 +57,33 @@
-
{{messageLength}}/5000
+
{{messageLength}}/5000
+ diff --git a/src/components/app/relationships/FriendsTemplate.vue b/src/components/app/relationships/FriendsTemplate.vue index eced4ec..9b0e946 100644 --- a/src/components/app/relationships/FriendsTemplate.vue +++ b/src/components/app/relationships/FriendsTemplate.vue @@ -42,6 +42,7 @@ export default { } this.$store.dispatch('selectedChannelID', this.$props.channelID); this.$store.dispatch('setChannelName', this.$props.username); + if (this.$store.getters.messages[this.$props.channelID]) return; if (this.$store.getters.channels[this.$props.channelID] && !this.$store.getters.messages[this.$props.channelID]) return this.getMessages(); const {ok, error, result} = await channelService.post(this.$props.channelID); if ( ok ) { diff --git a/src/components/app/uploadDialog.vue b/src/components/app/uploadDialog.vue new file mode 100644 index 0000000..ac8ad78 --- /dev/null +++ b/src/components/app/uploadDialog.vue @@ -0,0 +1,287 @@ + + + + + + diff --git a/src/components/app/uploadsQueue.vue b/src/components/app/uploadsQueue.vue new file mode 100644 index 0000000..8b8a35b --- /dev/null +++ b/src/components/app/uploadsQueue.vue @@ -0,0 +1,89 @@ + + + + + + diff --git a/src/components/homePage/LoggedIn.vue b/src/components/homePage/LoggedIn.vue index 88405c9..2421dac 100644 --- a/src/components/homePage/LoggedIn.vue +++ b/src/components/homePage/LoggedIn.vue @@ -1,6 +1,5 @@ diff --git a/src/views/GDriveCallback.vue b/src/views/GDriveCallback.vue new file mode 100644 index 0000000..24eaf1e --- /dev/null +++ b/src/views/GDriveCallback.vue @@ -0,0 +1,14 @@ + + + + diff --git a/src/views/HomePage.vue b/src/views/HomePage.vue index 2cb9dd5..659f759 100644 --- a/src/views/HomePage.vue +++ b/src/views/HomePage.vue @@ -312,7 +312,7 @@ button { margin-right: 0; margin-top: 0; height:calc(100% - 50px); - background-color: rgba(34, 34, 34, 0.877); + background-color: rgb(34, 34, 34); width: 0; overflow-x: hidden; transition: 0.5s ease;