diff --git a/src/Main.vue b/src/Main.vue index 163dff5..8a8e8d4 100644 --- a/src/Main.vue +++ b/src/Main.vue @@ -8,7 +8,6 @@ diff --git a/src/assets/graphics/HomeGraphics.png b/src/assets/graphics/HomeGraphics.png index 2da8c2c..3c69a79 100644 Binary files a/src/assets/graphics/HomeGraphics.png and b/src/assets/graphics/HomeGraphics.png differ diff --git a/src/assets/graphics/HomeGraphics2.png b/src/assets/graphics/HomeGraphics2.png deleted file mode 100644 index 2f4a027..0000000 Binary files a/src/assets/graphics/HomeGraphics2.png and /dev/null differ diff --git a/src/assets/halloween_background.jpg b/src/assets/halloween_background.jpg deleted file mode 100644 index 263e42e..0000000 Binary files a/src/assets/halloween_background.jpg and /dev/null differ diff --git a/src/assets/leftPanelBackground.jpg b/src/assets/leftPanelBackground.jpg new file mode 100644 index 0000000..c5656aa Binary files /dev/null and b/src/assets/leftPanelBackground.jpg differ diff --git a/src/components/app/FriendsList.vue b/src/components/app/FriendsList.vue index d1eed61..8f3749e 100644 --- a/src/components/app/FriendsList.vue +++ b/src/components/app/FriendsList.vue @@ -3,13 +3,16 @@
-
Friends
-
Recents
+
Recents
@@ -19,6 +22,7 @@
+
@@ -89,12 +93,15 @@ export default { diff --git a/src/components/app/MembersList.vue b/src/components/app/MembersList.vue index 3ad7510..6bdef5f 100644 --- a/src/components/app/MembersList.vue +++ b/src/components/app/MembersList.vue @@ -1,19 +1,17 @@ @@ -69,12 +99,12 @@ export default { changed: false, resetPassword: false, update: {}, - key: 0, + key: 0 }; }, methods: { inputEvent(name, event) { - this.$set(this.update, name, event.target.value) + this.$set(this.update, name, event.target.value); }, avatarChangeEvent(event) { if (!this.googleDriveLinked) { @@ -86,62 +116,77 @@ export default { } const file = event.target.files[0]; const _this = this; - const maxSize = 2092000; + const maxSize = 2092000; if (file.size > maxSize) { - return this.$store.dispatch('setGenericMessage', "Image is larger than 2MB") + return this.$store.dispatch( + "setGenericMessage", + "Image is larger than 2MB" + ); } event.target.value = ""; const allowedFormats = [".png", ".jpeg", ".gif", ".jpg"]; if (!allowedFormats.includes(path.extname(file.name).toLowerCase())) { - return this.$store.dispatch('setGenericMessage', "That file format is not allowed!"); + return this.$store.dispatch( + "setGenericMessage", + "That file format is not allowed!" + ); } let reader = new FileReader(); reader.readAsDataURL(file); - - reader.onload = function () { - _this.$set(_this.update, 'avatar', reader.result); + + reader.onload = function() { + _this.$set(_this.update, "avatar", reader.result); }; - reader.onerror = function (error) { - console.log('Error: ', error); - return this.$store.dispatch('setGenericMessage', "Something went wrong. Try again later.") + reader.onerror = function(error) { + console.log("Error: ", error); + return this.$store.dispatch( + "setGenericMessage", + "Something went wrong. Try again later." + ); }; }, async updateProfile() { if (this.requestSent) return; this.errors = null; this.requestSent = true; - const {ok, result, error} = await userService.update(this.update) + const { ok, result, error } = await userService.update(this.update); if (!ok) { if (error.response === undefined) { - this.errors = { message: 'Cant connect to server' } + this.errors = { message: "Cant connect to server" }; return; } const data = error.response.data; if (data.message) { - this.errors = [{msg: data.message}]; + this.errors = [{ msg: data.message }]; return; } this.errors = data.errors; } else { - this.$refs['passwordInput'].value = ""; - this.resetPassword = false - this.$set(this, 'update', {}) + this.$refs["passwordInput"].value = ""; + this.resetPassword = false; + this.$set(this, "update", {}); this.key = Math.random(); } this.requestSent = false; + }, + linkGoogleDrive() { + this.$store.dispatch("setPopoutVisibility", { + name: "GDLinkMenu", + visibility: true + }); } }, watch: { update(obj) { - if ( Object.keys(obj).length === 0 ){ - return this.changed = false + if (Object.keys(obj).length === 0) { + return (this.changed = false); } this.changed = true; } }, computed: { googleDriveLinked() { - return this.$store.getters['settingsModule/settings'].GDriveLinked + return this.$store.getters["settingsModule/settings"].GDriveLinked; }, avatar() { return config.domain + "/avatars/" + this.$store.getters.user.avatar; @@ -283,5 +328,4 @@ export default { text-align: center; } } - \ No newline at end of file diff --git a/src/components/app/Popouts/Popouts/messageContextMenu.vue b/src/components/app/Popouts/Popouts/messageContextMenu.vue index 646dfb8..3dc3848 100644 --- a/src/components/app/Popouts/Popouts/messageContextMenu.vue +++ b/src/components/app/Popouts/Popouts/messageContextMenu.vue @@ -1,27 +1,29 @@ @@ -125,5 +147,4 @@ export default { color: rgb(255, 59, 59); } } - diff --git a/src/components/app/Popouts/Popouts/userInformationPopout.vue b/src/components/app/Popouts/Popouts/userInformationPopout.vue index b9ddf69..6a6649d 100644 --- a/src/components/app/Popouts/Popouts/userInformationPopout.vue +++ b/src/components/app/Popouts/Popouts/userInformationPopout.vue @@ -1,67 +1,102 @@ diff --git a/src/components/app/ServerList.vue b/src/components/app/ServerList.vue index 42e4b96..a1e22f2 100644 --- a/src/components/app/ServerList.vue +++ b/src/components/app/ServerList.vue @@ -4,14 +4,18 @@
-
-
{{servers[selectedServerID].name}}
+
+
{{servers[selectedServerID].name}}
more_vert
+
@@ -48,25 +52,25 @@ export default { this.$store.dispatch("servers/setSelectedServerID", serverID); }, openExploreTab() { - this.$store.dispatch('setCurrentTab', 0) + this.$store.dispatch("setCurrentTab", 0); }, openServerContext(event) { const rect = event.target.getBoundingClientRect(); if (this.checkServerContextOpened) { - this.$store.dispatch('setAllPopout', { + this.$store.dispatch("setAllPopout", { show: false, type: null - }) + }); return; } - this.$store.dispatch('setAllPopout', { + this.$store.dispatch("setAllPopout", { show: true, - type: 'SERVER', + type: "SERVER", serverID: this.servers[this.selectedServerID].server_id, creatorUniqueID: this.servers[this.selectedServerID].creator.uniqueID, x: rect.left - 30, - y: rect.top + 35, - }) + y: rect.top + 35 + }); } }, computed: { @@ -95,13 +99,24 @@ export default { diff --git a/src/components/app/ServerTemplate/ChannelTemplate.vue b/src/components/app/ServerTemplate/ChannelTemplate.vue index 76281f4..ba0ea63 100644 --- a/src/components/app/ServerTemplate/ChannelTemplate.vue +++ b/src/components/app/ServerTemplate/ChannelTemplate.vue @@ -1,9 +1,10 @@ @@ -13,50 +14,47 @@ export default { computed: { hasNotifications() { const notifications = this.$store.getters.notifications; - const find = notifications.find(n => n.channelID === this.channelData.channelID) - return find + const find = notifications.find( + n => n.channelID === this.channelData.channelID + ); + return find; }, selectedChannelID() { return this.$store.getters.selectedChannelID; - }, + } } }; diff --git a/src/components/app/Tabs/DirectMessage.vue b/src/components/app/Tabs/DirectMessage.vue index 14824c5..2a8d6a1 100644 --- a/src/components/app/Tabs/DirectMessage.vue +++ b/src/components/app/Tabs/DirectMessage.vue @@ -7,7 +7,7 @@ class="left-panel" /> - +
@@ -53,7 +53,7 @@ export default { height: 100%; width: 100%; } -.left-panel{ +.left-panel { z-index: 2; } .slidein-enter-active, @@ -62,7 +62,7 @@ export default { } .slidein-enter, .slidein-leave-to /* .fade-leave-active below version 2.1.8 */ { /* margin-left: -300px; */ - transform: translateX(-300px) + transform: translateX(-300px); } @media (max-width: 600px) { .left-panel { @@ -70,7 +70,6 @@ export default { bottom: 0; height: calc(100% - 50px); z-index: 2; - backdrop-filter: blur(15px); } } diff --git a/src/components/app/Tabs/Explore.vue b/src/components/app/Tabs/Explore.vue index db0b8b8..f036156 100644 --- a/src/components/app/Tabs/Explore.vue +++ b/src/components/app/Tabs/Explore.vue @@ -72,7 +72,7 @@ import { bus } from "@/main"; import Servers from "./Explore/servers"; import ServerService from "@/services/ServerService"; -import Navigation from '@/components/app/Navigation'; +import Navigation from "@/components/app/Navigation"; export default { components: { Servers, Navigation }, data() { @@ -89,7 +89,7 @@ export default { nertiviaServerID: "6572915451527958528", nertiviaServerHide: localStorage.getItem("exploreTabNertiviaServerPromoHide") === "true", - donateHide: localStorage.getItem("exploreTabDonateHide") === "true", + donateHide: localStorage.getItem("exploreTabDonateHide") === "true" }; }, @@ -142,10 +142,13 @@ export default { .left-panel { display: flex; flex-direction: row; - background: rgba(0, 0, 0, 0.6); width: 300px; flex-shrink: 0; z-index: 2; + background-image: url("../../../assets/leftPanelBackground.jpg"); + background-repeat: no-repeat; + background-position: center; + background-size: cover; .content { display: flex; flex-direction: column; @@ -169,17 +172,17 @@ export default { cursor: pointer; transition: 0.3s; &:hover { - background: rgba(255, 255, 255, 0.07); + background: #08616b; } &.selected { - background: rgba(255, 255, 255, 0.13); + background: #064c55; } } } .header { display: flex; height: 100px; - background: rgba(0, 0, 0, 0.226); + background: #086974; user-select: none; flex-shrink: 0; .icon { @@ -213,7 +216,7 @@ export default { position: relative; } .description { - opacity: 0.7; + color: #b2d1d4; font-size: 14px; } } @@ -285,7 +288,6 @@ export default { flex-direction: column; width: 100%; height: 100%; - background: rgba(0, 0, 0, 0.39); color: white; .material-icons { font-size: 100px; @@ -293,7 +295,6 @@ export default { } .right-panel { - background: rgba(0, 0, 0, 0.65); .header { background: rgba(0, 0, 0, 0.448); padding: 10px; @@ -337,7 +338,6 @@ export default { position: absolute; bottom: 0; height: calc(100% - 44px); - backdrop-filter: blur(15px); z-index: 2; } } diff --git a/src/components/app/Tabs/Explore/searchHeader.vue b/src/components/app/Tabs/Explore/searchHeader.vue index 8016a19..6251b6e 100644 --- a/src/components/app/Tabs/Explore/searchHeader.vue +++ b/src/components/app/Tabs/Explore/searchHeader.vue @@ -54,23 +54,23 @@ export default { }; }, methods: { - param(){ + param() { const filter = this.filters[this.filterSelected]; - const sort = this.sortBys[this.sortSelected]; + const sort = this.sortBys[this.sortSelected]; const query = {}; !!filter.param && (query[filter.param] = filter.value); !!sort.param && (query[sort.param] = sort.value); - return '?' + qs.stringify(query); + return "?" + qs.stringify(query); } - }, - watch:{ + }, + watch: { filterSelected() { - this.$emit('params', this.param()) + this.$emit("params", this.param()); }, sortSelected() { - this.$emit('params', this.param()) + this.$emit("params", this.param()); } } }; @@ -79,7 +79,7 @@ export default { \ No newline at end of file diff --git a/src/components/app/Tabs/News.vue b/src/components/app/Tabs/News.vue index ca68169..ee525a9 100644 --- a/src/components/app/Tabs/News.vue +++ b/src/components/app/Tabs/News.vue @@ -65,7 +65,6 @@ export default { height: 100%; color: white; overflow: auto; - background: #0000005d; position: relative; } @@ -91,7 +90,7 @@ export default { } .heading { padding: 10px; - background: rgba(0, 0, 0, 0.555); + background: #071415; margin-bottom: 10px; } .information { @@ -102,7 +101,7 @@ export default { background: rgba(38, 139, 255, 0.87); } .change-log { - background: rgba(0, 0, 0, 0.561); + background: #0a1e20; overflow-y: auto; max-width: 700px; margin: auto; @@ -113,7 +112,6 @@ export default { height: 100%; overflow: hidden; overflow: auto; - } .plan-list { color: white; diff --git a/src/components/app/Tabs/Servers.vue b/src/components/app/Tabs/Servers.vue index b66fcb1..d858d59 100644 --- a/src/components/app/Tabs/Servers.vue +++ b/src/components/app/Tabs/Servers.vue @@ -66,18 +66,17 @@ export default { }, computed: { selectedServerID() { - return this.$store.getters['servers/selectedServerID']; - }, + return this.$store.getters["servers/selectedServerID"]; + } } }; diff --git a/src/components/app/messageEmbedTemplate.vue b/src/components/app/messageEmbedTemplate.vue index fd8d8a7..4e082fa 100644 --- a/src/components/app/messageEmbedTemplate.vue +++ b/src/components/app/messageEmbedTemplate.vue @@ -1,10 +1,18 @@ diff --git a/src/components/app/relationships/OfflineFriends.vue b/src/components/app/relationships/OfflineFriends.vue index da4cf1b..8f78307 100644 --- a/src/components/app/relationships/OfflineFriends.vue +++ b/src/components/app/relationships/OfflineFriends.vue @@ -1,19 +1,10 @@ @@ -111,13 +60,12 @@ import Recaptcha from "@/components/Recaptcha.vue"; import HeaderLogin from "@/components/HeaderLoginTemplate.vue"; import AuthenticationService from "@/services/AuthenticationService"; -import particlesJS from "@/components/ParticlesJS.vue"; const ElectronFrameButtons = () => import("@/components/ElectronJS/FrameButtons.vue"); export default { - components: { HeaderLogin, Recaptcha, particlesJS, ElectronFrameButtons }, + components: { HeaderLogin, Recaptcha, ElectronFrameButtons }, data() { return { isElectron: window && window.process && window.process.type, @@ -130,7 +78,6 @@ export default { otherError: "", captchaToken: "", - isDay: true, deactive: false }; }, @@ -142,9 +89,7 @@ export default { this.reCaptcha.alert = ""; this.otherError = ""; }, - isDayEvent(data) { - this.isDay = data; - }, + captchaSubmit(token) { this.captchaToken = token; this.login(); @@ -171,14 +116,14 @@ export default { this.visible = false; this.$store.dispatch("token", result.data.token); setTimeout(_ => { - const {to, id} = this.$route.query; + const { to, id } = this.$route.query; if (to) { - return window.location.href = `/${to}/${id}` + return (window.location.href = `/${to}/${id}`); } window.location.href = "/app"; }, 1000); } else { - this.showCaptcha = false + this.showCaptcha = false; this.deactive = false; this.captchaToken = null; this.$refs.recaptcha.resetRecaptcha(); @@ -206,7 +151,8 @@ export default { @@ -235,21 +181,12 @@ html, body { } } -/* .fade-up-enter-active, .fade-up-leave-active { - transition: .5s; - transition-delay: 0.5s -} -.fade-up-enter, .fade-up-leave-to /* .fade-leave-active { - opacity: 0; - transform: translateX(20px) -} */ - #app { display: flex; flex-direction: column; - transition: background 10s; color: white; - height: 100%; + height: 100%; + background: #173d42; } .app-content { display: flex; @@ -259,50 +196,26 @@ html, body { overflow: auto; z-index: 9999; } -.background { - position: fixed; - height: 100%; - width: 100%; - transition: background 10s; -} - -.night-background { - opacity: 0; - transition: 10s; - background: linear-gradient(to bottom, #000000 0%,#606060 100%) !important; -} -.day-background { - opacity: 1; - background: linear-gradient(to bottom, #165dc0 0%,#5482bf 100%); - z-index: -1 -} - -.night-background.chosen { - opacity: 1 !important; -} - -.night-background .particles { - opacity: 1; -} .content { display: flex; height: 100%; margin: 10px; - flex-shrink:0; + flex-shrink: 0; } .box { width: 100%; max-width: 400px; - background: rgba(44, 44, 44, 0.774); margin: auto; margin-top: 20px; - border-radius: 10px; display: flex; flex-direction: column; align-items: center; z-index: 9999; padding-bottom: 20px; + background-image: url("../assets/leftPanelBackground.jpg"); + background-position: center; + background-size: cover; } .box .title { text-align: center; @@ -334,9 +247,8 @@ form { margin: 10px; width: 80%; align-self: center; - background: rgb(59, 59, 59); + background: #074d57; padding: 10px; - border-radius: 10px; } .input-text { margin-bottom: 5px; @@ -345,10 +257,8 @@ form { input { outline: none; padding: 10px; - border: solid 1px rgba(0, 0, 0, 0); - background: none; - border-radius: 5px; - background: rgb(36, 36, 36); + border: none; + background: #03262b; color: white; } .buttons { @@ -361,7 +271,6 @@ input { .button { padding: 10px; background: rgba(25, 151, 255, 0.699); - border-radius: 5px; margin: 10px; margin-top: 10px; user-select: none; @@ -370,7 +279,7 @@ input { font-size: 17px; outline: none; transition: 0.2s; - box-shadow: 3px 3px rgba(23, 112, 255, 0.479); + cursor: pointer; } .button:hover { background: rgb(25, 151, 255); @@ -378,15 +287,9 @@ input { .button:focus { background: rgb(25, 151, 255); } -.button:active { - background: rgb(25, 151, 255); - transform: translate(3px, 3px); - box-shadow: 0px 0px rgba(0, 97, 207, 0.479); -} .button.deactive { background: rgba(70, 70, 70, 0.699); - box-shadow: 3px 3px rgba(0, 0, 0, 0.479); } .button.deactive :hover { @@ -395,15 +298,9 @@ input { .button.deactive :focus { background: rgba(70, 70, 70, 0.699); } -.button.deactive:active { - background: rgba(70, 70, 70, 0.699); - transform: translate(3px, 3px); - box-shadow: 0px 0px rgba(0, 0, 0, 0.479); -} .register-button { background: rgba(46, 204, 112, 0.67); - box-shadow: 3px 3px #0f7e3d; } .register-button.button:hover { background: #2ecc71; @@ -411,11 +308,6 @@ input { .register-button.button:focus { background: #2ecc71; } -.register-button.button:active { - background: #2ecc71; - transform: translate(3px, 3px); - box-shadow: 0px 0px #0f7e3d; -} .captcha-input { width: initial; diff --git a/src/views/RegisterPage.vue b/src/views/RegisterPage.vue index 5f13fcc..1848b33 100644 --- a/src/views/RegisterPage.vue +++ b/src/views/RegisterPage.vue @@ -2,108 +2,63 @@
- +
- -
+ +
account_circle Register
-
- Welcome, new user! I Hope you enjoy Nertivia! -
-
+
Welcome, new user! I Hope you enjoy Nertivia!
+
Email - - {{ email.alert }} + - {{ email.alert }}
- +
Username - - {{ username.alert }} + - {{ username.alert }}
+ />
Password - - {{ password.alert }} + - {{ password.alert }}
+ />
- {{ otherError }} + {{ otherError }}
- + >I'm already a user! +
-
+
-
- Beep Boop -
+
Beep Boop
- +
@@ -111,26 +66,18 @@
-
-
- -
-
-
@@ -242,20 +185,11 @@ html, body { } } -/* .fade-up-enter-active, .fade-up-leave-active { - transition: .5s; - transition-delay: 0.5s -} -.fade-up-enter, .fade-up-leave-to /* .fade-leave-active { - opacity: 0; - transform: translateX(20px) -} */ - #app { display: flex; flex-direction: column; - transition: background 10s; color: white; + background: #173d42; } .app-content { display: flex; @@ -265,31 +199,6 @@ html, body { overflow: auto; z-index: 9999; } -.background { - position: fixed; - height: 100%; - width: 100%; - transition: background 10s; -} - -.night-background { - opacity: 0; - transition: 10s; - background: linear-gradient(to bottom, #000000 0%,#606060 100%) !important; -} -.day-background { - opacity: 1; - background: linear-gradient(to bottom, #165dc0 0%,#5482bf 100%); - z-index: -1 -} - -.night-background.chosen { - opacity: 1 !important; -} - -.night-background .particles { - opacity: 1; -} .content { display: flex; @@ -300,15 +209,16 @@ html, body { .box { width: 100%; max-width: 400px; - background: rgba(44, 44, 44, 0.774); margin: auto; margin-top: 20px; - border-radius: 10px; display: flex; flex-direction: column; align-items: center; z-index: 9999; padding-bottom: 20px; + background-image: url("../assets/leftPanelBackground.jpg"); + background-position: center; + background-size: cover; } .box .title { text-align: center; @@ -340,9 +250,8 @@ form { margin: 10px; width: 80%; align-self: center; - background: rgb(59, 59, 59); + background: #074d57; padding: 10px; - border-radius: 10px; } .input-text { margin-bottom: 5px; @@ -351,10 +260,9 @@ form { input { outline: none; padding: 10px; - border: solid 1px rgba(0, 0, 0, 0); + border: none; background: none; - border-radius: 5px; - background: rgb(36, 36, 36); + background: #03262b; color: white; } .buttons { @@ -367,7 +275,6 @@ input { .button { padding: 10px; background: rgba(25, 151, 255, 0.699); - border-radius: 5px; margin: 10px; margin-top: 10px; user-select: none; @@ -376,7 +283,7 @@ input { font-size: 17px; outline: none; transition: 0.2s; - box-shadow: 3px 3px rgba(23, 112, 255, 0.479); + cursor: pointer; } .button:hover { background: rgb(25, 151, 255); @@ -384,15 +291,9 @@ input { .button:focus { background: rgb(25, 151, 255); } -.button:active { - background: rgb(25, 151, 255); - transform: translate(3px, 3px); - box-shadow: 0px 0px rgba(0, 97, 207, 0.479); -} .button.deactive { background: rgba(70, 70, 70, 0.699); - box-shadow: 3px 3px rgba(0, 0, 0, 0.479); } .button.deactive :hover { @@ -401,15 +302,9 @@ input { .button.deactive :focus { background: rgba(70, 70, 70, 0.699); } -.button.deactive:active { - background: rgba(70, 70, 70, 0.699); - transform: translate(3px, 3px); - box-shadow: 0px 0px rgba(0, 0, 0, 0.479); -} .register-button { background: rgba(46, 204, 112, 0.67); - box-shadow: 3px 3px #0f7e3d; } .register-button.button:hover { background: #2ecc71; @@ -417,11 +312,6 @@ input { .register-button.button:focus { background: #2ecc71; } -.register-button.button:active { - background: #2ecc71; - transform: translate(3px, 3px); - box-shadow: 0px 0px #0f7e3d; -} .captcha-input { width: initial;