-
-
Online
+
+
+
+
+
+
Online
+
+
+
+
+
+
Away
+
+
+
+
+
+
Busy
+
+
+
+
+
+
Looking to play
+
+
+
+
+
+
Offline
+
-
-
Away
-
-
-
Busy
-
-
-
Looking to play
-
-
-
Offline
-
-
diff --git a/src/store/modules/popoutsModule/popoutsModule.js b/src/store/modules/popoutsModule/popoutsModule.js
index 3553e34..04a1afe 100644
--- a/src/store/modules/popoutsModule/popoutsModule.js
+++ b/src/store/modules/popoutsModule/popoutsModule.js
@@ -1,10 +1,8 @@
-import axios from 'axios'
-import Vue from 'vue'
-import {
- bus
-} from '@/main'
-import VueRouter from 'vue-router';
-import NotificationSounds from '@/utils/notificationSound';
+import axios from "axios";
+import Vue from "vue";
+import { bus } from "@/main";
+import VueRouter from "vue-router";
+import NotificationSounds from "@/utils/notificationSound";
const state = {
fileToUpload: null,
@@ -22,15 +20,15 @@ const state = {
GDLinkMenu: false,
addServer: false,
- genericMessage: null,
+ genericMessage: null,
- serverSettings:{
+ serverSettings: {
serverID: null,
index: null
- },
+ },
editMessage: null,
messageContextMenu: {
- messageID: null,
+ messageID: null,
message: null,
channelID: null,
uniqueID: null,
@@ -51,90 +49,99 @@ const state = {
serverID: null,
uniqueID: null,
creatorUniqueID: null,
- x: null,
- y: null,
+ x: null,
+ y: null
}
-
-
-}
+};
const getters = {
popouts(state) {
return state;
}
-}
+};
const actions = {
- setAllPopout({commit, state}, data) {
- commit('setAllPopout', {...state.allPopout, ...data})
+ setAllPopout({ commit, state }, data) {
+ commit("setAllPopout", { ...state.allPopout, ...data });
},
- setServerSettings({commit}, {serverID, index}){
- commit('setServerSettings', {serverID, index})
+ setServerSettings({ commit }, { serverID, index }) {
+ commit("setServerSettings", { serverID, index });
},
- setUserInformationPopout({commit}, id){
- commit('setUserInformationPopout', id)
+ setUserInformationPopout({ commit }, id) {
+ commit("setUserInformationPopout", id);
},
setPopoutVisibility(context, data) {
- context.commit('setPopoutVisibility', data)
+ context.commit("setPopoutVisibility", data);
},
setFile(context, file) {
- context.commit('setFileToUpload', file);
+ context.commit("setFileToUpload", file);
},
setImagePreviewURL(context, url) {
- context.commit('setImagePreviewURL', url);
+ context.commit("setImagePreviewURL", url);
},
setServerIDContextMenu(context, serverID) {
- context.commit('setServerIDContextMenu', serverID);
+ context.commit("setServerIDContextMenu", serverID);
},
setGenericMessage(context, message) {
- context.commit('setGenericMessage', message);
+ context.commit("setGenericMessage", message);
},
- setEditMessage(context, data){
- context.commit('setEditMessage', data)
+ setEditMessage(context, data) {
+ context.commit("setEditMessage", data);
},
- setMessageContext(context, {messageID, x, y, channelID, message, uniqueID}) {
- context.commit('setMessageContext', {messageID, x, y, channelID, message, uniqueID});
+ setMessageContext(
+ context,
+ { messageID, x, y, channelID, message, uniqueID, type }
+ ) {
+ context.commit("setMessageContext", {
+ messageID,
+ x,
+ y,
+ channelID,
+ message,
+ uniqueID,
+ type
+ });
},
- setServerMemberContext(context, {uniqueID, x, y, serverID}) {
- context.commit('setServerMemberContext', {uniqueID, x, y, serverID});
+ setServerMemberContext(context, { uniqueID, x, y, serverID }) {
+ context.commit("setServerMemberContext", { uniqueID, x, y, serverID });
}
-}
+};
const mutations = {
setAllPopout(state, data) {
- Vue.set(state, 'allPopout', data)
- },
+ Vue.set(state, "allPopout", data);
+ },
setServerMemberContext(state, data) {
- Vue.set(state, 'serverMemberContext', data);
+ Vue.set(state, "serverMemberContext", data);
},
setMessageContext(state, data) {
- Vue.set(state, 'messageContextMenu', data);
+ Vue.set(state, "messageContextMenu", data);
},
- setEditMessage(state, data){
- Vue.set(state, 'editMessage', data);
+ setEditMessage(state, data) {
+ Vue.set(state, "editMessage", data);
},
- setGenericMessage(state, message){
- Vue.set(state, 'genericMessage', message)
+ setGenericMessage(state, message) {
+ Vue.set(state, "genericMessage", message);
},
- setServerSettings(state, {serverID, index}){
- Vue.set(state, 'serverSettings', {serverID, index});
+ setServerSettings(state, { serverID, index }) {
+ Vue.set(state, "serverSettings", { serverID, index });
},
setUserInformationPopout(state, id) {
- Vue.set(state, 'userInformationPopoutID', id)
+ Vue.set(state, "userInformationPopoutID", id);
},
setPopoutVisibility(state, data) {
- Vue.set(state, data.name, data.visibility)
+ Vue.set(state, data.name, data.visibility);
},
setFileToUpload(state, file) {
- Vue.set(state, 'fileToUpload', file);
+ Vue.set(state, "fileToUpload", file);
},
setImagePreviewURL(state, url) {
- Vue.set(state, 'ImagePreviewURL', url);
+ Vue.set(state, "ImagePreviewURL", url);
},
setServerIDContextMenu(state, serverID) {
- Vue.set(state, 'serverIDContextMenu', serverID);
+ Vue.set(state, "serverIDContextMenu", serverID);
}
-}
+};
export default {
namespace: true,
@@ -142,4 +149,4 @@ export default {
getters,
actions,
mutations
-}
\ No newline at end of file
+};
diff --git a/src/utils/changelog.js b/src/utils/changelog.js
index 76f17e6..a39b4c9 100644
--- a/src/utils/changelog.js
+++ b/src/utils/changelog.js
@@ -1,44 +1,39 @@
-
- const prototype = {
- version: 4,
- title: "",
- shortTitle: "",
- date: "1/06/2019",
- headColor: "rgba(155, 244, 66, 0.77)",
- new: [
- "",
- "",
- ],
- next: [""]
- }
+const prototype = {
+ version: 4,
+ title: "",
+ shortTitle: "",
+ date: "1/06/2019",
+ headColor: "rgba(155, 244, 66, 0.77)",
+ new: ["", ""],
+ next: [""]
+};
const config = [
-
{
version: 7.8,
title: "Redesigns!",
shortTitle: "",
- date: "25/10/2019",
- headColor: "rgba(25, 130, 255, 0.77)",
+ date: "01/11/2019",
+ headColor: "#0c7b7f",
new: [
- 'Layout has been redesigned.',
- 'Added an option to mute notification sounds.',
- 'Last clicked channels should be remembered for each server.',
- 'You can now delete Join, Left and Ban messages from the chat.',
+ "Layout has been redesigned.",
+ "Added an option to mute notification sounds.",
+ "Last clicked channels should be remembered for each server.",
+ "You can now delete Join, Left and Ban messages from the chat.",
+ "Files not being uploaded? Try re-linking Google drive in the settings."
],
- next: ['Custom server banners.'],
+ next: ["Custom server banners."],
+ msg:
+ "Since this is a major re-design, there could be a lot of bugs. Please help me fix these bugs by sending me a message and I will give you a bug catcher badge in Nertivia. Thanks."
},
{
version: 7.6,
title: "👻Spooky bug fixes👻",
shortTitle: "",
date: "16/10/2019",
- new: [
- 'Better handled Google Drive linking.',
- '👻👻👻',
- ],
- fix: ['Spooked away a lot of bugs behind the scenes.'],
- msg: '👻'
+ new: ["Better handled Google Drive linking.", "👻👻👻"],
+ fix: ["Spooked away a lot of bugs behind the scenes."],
+ msg: "👻"
},
{
version: 7.5,
@@ -46,10 +41,13 @@ const config = [
shortTitle: "",
date: "09/10/2019",
new: [
- 'Design changes to some elements such as the tabs, Window controls and more.',
+ "Design changes to some elements such as the tabs, Window controls and more."
],
- fix: ['Fixed a bug where presence status would not show properly in the header.'],
- msg: 'I just want to say thanks to everyone who gave me feedback, it helps a lot! 😉 Native mobile app is coming soon!'
+ fix: [
+ "Fixed a bug where presence status would not show properly in the header."
+ ],
+ msg:
+ "I just want to say thanks to everyone who gave me feedback, it helps a lot! 😉 Native mobile app is coming soon!"
},
{
version: 7.4,
@@ -57,11 +55,11 @@ const config = [
shortTitle: "",
date: "03/10/2019",
new: [
- 'Added send message permission. You can use this to allow other people to not write in your channel such as the "rules" channel.',
+ 'Added send message permission. You can use this to allow other people to not write in your channel such as the "rules" channel.'
],
fix: [
- "Fixed a lot of bugs in our cache system. This means that messages should send faster!",
- ],
+ "Fixed a lot of bugs in our cache system. This means that messages should send faster!"
+ ]
},
{
version: 7.3,
@@ -69,12 +67,12 @@ const config = [
shortTitle: "",
date: "29/09/2019",
new: [
- 'You can now kick/back members of a server by right clicking on their names in the server members list.',
- 'Slightly changed message bubble design.'
+ "You can now kick/back members of a server by right clicking on their names in the server members list.",
+ "Slightly changed message bubble design."
],
fix: [
- "Fixed a bug where Join and Leave messages would not get notified when reloading client.",
- ],
+ "Fixed a bug where Join and Leave messages would not get notified when reloading client."
+ ]
},
{
version: 7.2,
@@ -85,7 +83,7 @@ const config = [
"Online and offline is now a category in the server members list.",
"Moved add server to the top of the servers list with new design.",
"Added Explore button to the top of the servers list."
- ],
+ ]
},
{
version: 7.1,
@@ -97,9 +95,9 @@ const config = [
"Swapped the changelog and the explore tab."
],
fix: [
- 'Fixed a bug where edit and delete buttons would show for all members.',
+ "Fixed a bug where edit and delete buttons would show for all members.",
'Fixed a bug where when clicking on "message" in the server tab, in someones profile, the tab wouldnt change to dm.'
- ],
+ ]
},
{
version: 7.0,
@@ -107,9 +105,8 @@ const config = [
shortTitle: "",
date: "13/09/2019",
new: [
- 'Nertivia app now starts up when you start your pc. You can change the behaviour in the settings.',
- ],
-
+ "Nertivia app now starts up when you start your pc. You can change the behaviour in the settings."
+ ]
},
{
version: 6.9,
@@ -117,26 +114,35 @@ const config = [
shortTitle: "",
date: "06/09/2019",
new: [
- 'Added filter options to public servers list. Verified servers will be the default filter. Servers will be verified by me (Fishie). If your server does not get verified, Join the official nertivia server and message me.',
- 'Added blur effect to user information popout for an experiment. (Only works in chrome and edge.) Blur effect may be added in more places in the future.'
+ "Added filter options to public servers list. Verified servers will be the default filter. Servers will be verified by me (Fishie). If your server does not get verified, Join the official nertivia server and message me.",
+ "Added blur effect to user information popout for an experiment. (Only works in chrome and edge.) Blur effect may be added in more places in the future."
],
- fix: ['Fixed a bug where when someone leaves the server, the whole members list would disappear for that server.', 'Fixed bugs with emoji sugestions panel.'],
+ fix: [
+ "Fixed a bug where when someone leaves the server, the whole members list would disappear for that server.",
+ "Fixed bugs with emoji sugestions panel."
+ ]
},
{
version: 6.8,
title: "Bug fixes",
shortTitle: "",
date: "02/09/2019",
- fix: ['You can no longer turn on popup notifications on mobile as it causes issues.'],
- msg: "Notice: If you don't receive real time notifications inside the app, log out, and in again to fix it."
+ fix: [
+ "You can no longer turn on popup notifications on mobile as it causes issues."
+ ],
+ msg:
+ "Notice: If you don't receive real time notifications inside the app, log out, and in again to fix it."
},
{
version: 6.7,
title: "New Explore tab!",
shortTitle: "",
date: "01/09/2019",
- new: ['You can now make your servers go public by posting them in the explore tab.', 'Some pop ups have been improved for mobile users.',],
- fix: ['Some bugs have been fixed.']
+ new: [
+ "You can now make your servers go public by posting them in the explore tab.",
+ "Some pop ups have been improved for mobile users."
+ ],
+ fix: ["Some bugs have been fixed."]
},
{
version: 6.6,
@@ -144,9 +150,7 @@ const config = [
shortTitle: "",
date: "29/08/2019",
new: ['Sneak peak of the new "Explore" tab :D (Unfinished)'],
- fix: [
- 'Improved backend code. This should improve performance.',
- ],
+ fix: ["Improved backend code. This should improve performance."]
},
{
version: 6.5,
@@ -154,9 +158,9 @@ const config = [
shortTitle: "",
date: "22/08/2019",
fix: [
- 'Fixed a bug where when being scrolled up, new messages would cause it to not load more.',
- 'Fixed a bug where scroll to bottom button wouldnt work'
- ],
+ "Fixed a bug where when being scrolled up, new messages would cause it to not load more.",
+ "Fixed a bug where scroll to bottom button wouldnt work"
+ ]
},
{
version: 6.4,
@@ -164,16 +168,18 @@ const config = [
shortTitle: "",
date: "19/08/2019",
new: [
- 'Scrolling up should be smoother now as messages below get unloaded.'
+ "Scrolling up should be smoother now as messages below get unloaded."
],
- msg: 'Known issue: When scrolled up and messages get unloaded below, new messages sent get appended at the bottom and messes up things D: going to fix asap.'
+ msg:
+ "Known issue: When scrolled up and messages get unloaded below, new messages sent get appended at the bottom and messes up things D: going to fix asap."
},
{
version: 6.3,
title: "Performance Improvements!",
shortTitle: "",
date: "18/08/2019",
- msg: "I finally managed to find out why the chat is choppy when scrolling. The rotated emote is the cause. In this update, emotes only appear when hovering over the profile picture."
+ msg:
+ "I finally managed to find out why the chat is choppy when scrolling. The rotated emote is the cause. In this update, emotes only appear when hovering over the profile picture."
},
{
@@ -181,9 +187,7 @@ const config = [
title: "Bug fixes",
shortTitle: "",
date: "17/08/2019",
- new: [
- "Added a copy button in the message context menu."
- ],
+ new: ["Added a copy button in the message context menu."],
fix: [
"Fixed bugs with textarea not resizing properly",
"Fixed a bug where message context menu would be not visible.",
@@ -211,10 +215,9 @@ const config = [
title: "Desktop app!",
shortTitle: "",
date: "11/08/2019",
- new: [
- "Desktop app is available to download!"
- ],
- msg: 'Download: https://github.com/supertiger1234/nertivia-desktop-app/releases'
+ new: ["Desktop app is available to download!"],
+ msg:
+ "Download: https://github.com/supertiger1234/nertivia-desktop-app/releases"
},
{
@@ -227,7 +230,8 @@ const config = [
"Fixed a bug where scrolling would be inverted for some devices.",
"Responsive images and embeds."
],
- msg: 'Notice: If your message history loads mid way, this is because of our new message scrolling down system. This will be fixed after you send few messages.'
+ msg:
+ "Notice: If your message history loads mid way, this is because of our new message scrolling down system. This will be fixed after you send few messages."
},
{
version: 5.8,
@@ -236,11 +240,11 @@ const config = [
date: "05/08/2019",
new: [
"Added more badges (Bug Catcher, Idea Queen)",
- "You can now change your password.",
+ "You can now change your password."
],
fix: [
"Fixed a bug where desktop notifications would show for your own messages.",
- "Fixed a bug where editing custom emojis would break.",
+ "Fixed a bug where editing custom emojis would break."
]
},
{
@@ -267,9 +271,7 @@ const config = [
"We have re-added syntax highlighting and also improved the performance of message formatting. (Thanks to Bree!)",
"Profile Setting has been re-designed. You can now edit your username, email and password!"
],
- fix: [
- 'Fixed some bugs with edit message',
- ],
+ fix: ["Fixed some bugs with edit message"]
},
{
version: 5.5,
@@ -277,8 +279,8 @@ const config = [
shortTitle: "",
date: "25/07/2019",
fix: [
- 'Removed codeblock highlighter due to some problems. Will be back in the future.',
- ],
+ "Removed codeblock highlighter due to some problems. Will be back in the future."
+ ]
},
{
@@ -287,15 +289,13 @@ const config = [
shortTitle: "",
date: "24/07/2019",
fix: [
- 'Fixed a bug where when pressing the up arrow key to edit while there is text in the text box, it would discard the message and edit.',
- 'Fixed a bug where when editing a message and going to a different tab, the message is still editing.',
- 'Fixed a bug where if an emoji is in the recents, and then removed in the settings, the emoji would stay in the recents.',
- 'Fixed bugs with html escape :scream:',
- ],
+ "Fixed a bug where when pressing the up arrow key to edit while there is text in the text box, it would discard the message and edit.",
+ "Fixed a bug where when editing a message and going to a different tab, the message is still editing.",
+ "Fixed a bug where if an emoji is in the recents, and then removed in the settings, the emoji would stay in the recents.",
+ "Fixed bugs with html escape :scream:"
+ ]
},
-
-
{
version: 5.3,
title: "Edit messages, More performance!",
@@ -306,17 +306,15 @@ const config = [
"Avatar and message pictures should now be disk cached.",
"Gif avatars will now only animate when being hovered. This will improve performance.",
"You can now click on embed images to get a full screen preview.",
- "Server channels now show a gray background when selected.",
-
+ "Server channels now show a gray background when selected."
],
fix: [
- 'Fixed a bug where when deleting a server channel, the notification would still stay.',
- 'Fixed a bug where when sending a message, the friend wouldnt go at the top in the recents list.',
- ],
- next: ["HTML channel for servers", "Change username, email and password."],
+ "Fixed a bug where when deleting a server channel, the notification would still stay.",
+ "Fixed a bug where when sending a message, the friend wouldnt go at the top in the recents list."
+ ],
+ next: ["HTML channel for servers", "Change username, email and password."]
},
-
-
+
{
version: 5.2,
title: "Delete messages, URL Embeds",
@@ -324,9 +322,9 @@ const config = [
date: "19/07/2019",
new: [
"You can now delete your own messages.",
- "URLs now show open graph embeds.",
+ "URLs now show open graph embeds."
],
- next: ["Edit messages."],
+ next: ["Edit messages."]
},
{
@@ -335,13 +333,12 @@ const config = [
shortTitle: "Change server avatar!",
date: "17/07/2019",
new: [
- "You can now change your server avatar from the server settings menu!",
+ "You can now change your server avatar from the server settings menu!"
],
- fix: ['Some bugs have been fixed.'],
- next: ["Not decided yet."],
+ fix: ["Some bugs have been fixed."],
+ next: ["Not decided yet."]
},
-
{
version: 5.0,
title: "Change server name and default server channel",
@@ -349,28 +346,12 @@ const config = [
date: "15/07/2019",
new: [
"You can now change the name of your server.",
- "You can now change the default channel to something else.",
+ "You can now change the default channel to something else."
],
- fix: ['Some bugs have been fixed.'],
- next: ["Change servers avatar."],
+ fix: ["Some bugs have been fixed."],
+ next: ["Change servers avatar."]
},
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{
version: 4.9,
title: "Color codeblocks and create multiple channels!",
@@ -382,8 +363,10 @@ const config = [
"The 'Recents' tab should now flash red when you get a notification.",
"Friends and Recents tabs position will be saved when visiting the site."
],
- fix: ['Fixed a bug where, when you are on the changelog or the server browser tab, the notifications get dismissed.'],
- next: ["more server settings"],
+ fix: [
+ "Fixed a bug where, when you are on the changelog or the server browser tab, the notifications get dismissed."
+ ],
+ next: ["more server settings"]
},
{
version: 4.8,
@@ -393,9 +376,11 @@ const config = [
new: [
"Nertivia has a new cat logo! (Thanks to Fullipsp for the design!)",
"You can now see online status of server members!",
- "You can now click on links that start with 'http'",
+ "You can now click on links that start with 'http'"
+ ],
+ fix: [
+ "Fixed a bug where when creating a server, a reload is required to show yourself in the server members list."
],
- fix: ['Fixed a bug where when creating a server, a reload is required to show yourself in the server members list.'],
next: ["Create multiple channels in a server."],
msg: `You might be wondering, where did the official Nertivia server go? Well, I accidentally deleted it :/ sorry. Here's the new one though!
http://nertivia.supertiger.tk/invites/Db3p5n`
},
@@ -404,14 +389,12 @@ const config = [
title: "Bug fixes",
shortTitle: "Bug fixes",
date: "24/06/2019",
- new: [
- "Emoji character limit expanded to 30 characters!"
- ],
+ new: ["Emoji character limit expanded to 30 characters!"],
fix: [
"Fixed a bug with the notification where it wouldn't dismiss on changing tabs.",
"Fixed a bug where unopened dms wouldn't show notifications on the tabs.",
"Fixed emoji character limit bypass.",
- "Emojis can now be inserted in firefox!",
+ "Emojis can now be inserted in firefox!"
],
next: ["Online status for server members list."]
},
@@ -425,7 +408,7 @@ const config = [
"Adjusted some padding with the tabs."
],
fix: [
- "Fixed a vulnerability where after leaving a server, you could still send messages.",
+ "Fixed a vulnerability where after leaving a server, you could still send messages."
],
next: ["Online status for server members list."]
},
@@ -434,14 +417,12 @@ const config = [
title: "Server bug fixes",
shortTitle: "Server bug fixes",
date: "03/06/2019",
- new: [
- "Notifications for servers has been added."
- ],
+ new: ["Notifications for servers has been added."],
fix: [
"Fixed notification bug where server notification are shown in dms.",
"When switching from server to direct message tab (and vice versa), the channels should now be separated.",
- 'You can now only create 30 invites per server.'
- ],
+ "You can now only create 30 invites per server."
+ ]
},
{
version: 4,
@@ -450,11 +431,10 @@ const config = [
date: "23/05/2019",
new: [
"You can now make servers! Note that this is in alpha stage which means that it's not complete and there could be a ton of bugs everywhere :c get reporting!",
- "Adjusted padding in some areas.",
+ "Adjusted padding in some areas."
],
next: ["Members list for servers"],
- msg:
- `
+ msg: `
Please note that this update could be unstable and could involve of resetting the database.
Join the official Nertivia server by clicking
@@ -474,9 +454,7 @@ color: #27a3ff;
"Padding and margin adjusted and small design changes throughout the app.",
"Added Oceania to the survey list."
],
- fix: [
- 'Fixed bugs with appearance settings not correctly working.'
- ],
+ fix: ["Fixed bugs with appearance settings not correctly working."],
next: ["Servers (If nothing else distracts me -_-)"]
},
{
diff --git a/src/views/404.vue b/src/views/404.vue
index 4069d92..d494c55 100644
--- a/src/views/404.vue
+++ b/src/views/404.vue
@@ -3,28 +3,18 @@
-
-
-
-
- Nothing exists here.
-
-
Go home
-
-
+
+
+
+ Nothing exists here.
+
+
Go home
+
+
-
@@ -34,15 +24,15 @@ export default {
components: { HeaderLogin },
data() {
return {
- visible: true,
+ visible: true
};
- },
-
+ }
};
@@ -71,20 +61,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;
@@ -96,31 +77,6 @@ html, body {
z-index: 9999;
padding-bottom: 100px;
}
-.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;
@@ -131,15 +87,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;
@@ -152,119 +109,9 @@ html, body {
align-items: center;
height: 60px;
}
-.box .title .material-icons {
- margin-right: 5px;
- font-size: 40px;
-}
+
.info {
text-align: center;
margin-bottom: 10px;
}
-form {
- display: flex;
- flex-direction: column;
- width: 100%;
-}
-.input {
- display: flex;
- flex-direction: column;
- margin: 10px;
- width: 80%;
- align-self: center;
- background: rgb(59, 59, 59);
- padding: 10px;
- border-radius: 10px;
-}
-.input-text {
- margin-bottom: 5px;
- margin-left: 3px;
-}
-input {
- outline: none;
- padding: 10px;
- border: solid 1px rgba(0, 0, 0, 0);
- background: none;
- border-radius: 5px;
- background: rgb(36, 36, 36);
- color: white;
-}
-.buttons {
- display: flex;
- align-items: center;
- align-content: center;
- justify-content: center;
- justify-items: center;
-}
-.button {
- padding: 10px;
- background: rgba(25, 151, 255, 0.699);
- border-radius: 5px;
- margin: 10px;
- margin-top: 10px;
- user-select: none;
- border: none;
- color: white;
- font-size: 17px;
- outline: none;
- transition: 0.2s;
- box-shadow: 3px 3px rgba(23, 112, 255, 0.479);
-}
-.button:hover {
- background: rgb(25, 151, 255);
-}
-.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 {
- background: rgba(70, 70, 70, 0.699);
-}
-.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;
-}
-.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;
-}
-.captcha {
- opacity: 0.7;
- transition: 0.3s;
-}
-.captcha:hover {
- opacity: 1;
-}
-.error {
- color: red;
-}
diff --git a/src/views/App.vue b/src/views/App.vue
index 458ab3e..0acb6bd 100644
--- a/src/views/App.vue
+++ b/src/views/App.vue
@@ -1,25 +1,24 @@
@@ -73,14 +72,13 @@ export default {
};
},
methods: {
-
- dismissNotification (channelID) {
+ dismissNotification(channelID) {
const notifications = this.$store.getters.notifications.find(function(e) {
- return e.channelID === channelID
- })
+ return e.channelID === channelID;
+ });
if (notifications && notifications.count >= 1 && document.hasFocus()) {
- this.$socket.emit('notification:dismiss', {channelID});
+ this.$socket.emit("notification:dismiss", { channelID });
}
},
switchChannel(isServer) {
@@ -88,56 +86,60 @@ export default {
const DMChannelID = this.$store.state.channelModule.DMChannelID;
if (isServer) {
- this.$store.dispatch('selectedChannelID', serverChannelID)
- const channel = this.$store.state.channelModule.channels[serverChannelID];
- this.$store.dispatch("setChannelName", channel ? channel.name : "")
- this.dismissNotification(serverChannelID)
+ this.$store.dispatch("selectedChannelID", serverChannelID);
+ const channel = this.$store.state.channelModule.channels[
+ serverChannelID
+ ];
+ this.$store.dispatch("setChannelName", channel ? channel.name : "");
+ this.dismissNotification(serverChannelID);
} else {
const channel = this.$store.state.channelModule.channels[DMChannelID];
- this.$store.dispatch("setChannelName", channel ? channel.recipients[0].username : "");
- this.$store.dispatch('selectedChannelID', DMChannelID)
- this.dismissNotification(DMChannelID)
+ this.$store.dispatch(
+ "setChannelName",
+ channel ? channel.recipients[0].username : ""
+ );
+ this.$store.dispatch("selectedChannelID", DMChannelID);
+ this.dismissNotification(DMChannelID);
}
-
},
switchTab(index) {
localStorage.setItem("currentTab", index);
- this.$store.dispatch('setCurrentTab', index)
- if (index == 1) { //1: direct message tab.
- this.switchChannel(false)
- } else if (index === 2) { //2: server tab
- this.switchChannel(true)
+ this.$store.dispatch("setCurrentTab", index);
+ if (index == 1) {
+ //1: direct message tab.
+ this.switchChannel(false);
+ } else if (index === 2) {
+ //2: server tab
+ this.switchChannel(true);
}
},
resizeEvent(dimensions) {
const width = dimensions.width;
const height = dimensions.height;
- this.$refs.app.style.height = height + 'px';
- this.$refs.app.style.width = width + 'px';
+ this.$refs.app.style.height = height + "px";
+ this.$refs.app.style.width = width + "px";
}
},
watch: {
getWindowWidth(dimensions) {
- this.resizeEvent(dimensions)
+ this.resizeEvent(dimensions);
}
},
mounted() {
-
const currentTab = localStorage.getItem("currentTab");
- if(currentTab) {
- this.$store.dispatch('setCurrentTab', parseInt(currentTab))
+ if (currentTab) {
+ this.$store.dispatch("setCurrentTab", parseInt(currentTab));
}
// check if changelog is updated
const seenVersion = localStorage.getItem("changelog-version-seen");
if (seenVersion && seenVersion < changelog[0].version) {
localStorage.setItem("currentTab", 3);
- this.$store.dispatch('setCurrentTab', 3)
+ this.$store.dispatch("setCurrentTab", 3);
}
localStorage.setItem("changelog-version-seen", changelog[0].version);
bus.$on("title:change", title => {
this.title = title;
});
-
},
computed: {
@@ -149,23 +151,31 @@ export default {
},
serverNotification() {
const notifications = this.$store.getters.notifications;
- const channels = this.$store.getters.channels
+ const channels = this.$store.getters.channels;
const notification = notifications.find(e => {
- return channels[e.channelID] && channels[e.channelID].server_id && e.channelID !== this.$store.getters.selectedChannelID
- })
+ return (
+ channels[e.channelID] &&
+ channels[e.channelID].server_id &&
+ e.channelID !== this.$store.getters.selectedChannelID
+ );
+ });
return notification;
},
DMNotification() {
const notifications = this.$store.getters.notifications;
- const channels = this.$store.getters.channels
+ const channels = this.$store.getters.channels;
const notification = notifications.find(e => {
- return channels[e.channelID] && !channels[e.channelID].server_id && e.channelID !== this.$store.getters.selectedChannelID
- })
+ return (
+ channels[e.channelID] &&
+ !channels[e.channelID].server_id &&
+ e.channelID !== this.$store.getters.selectedChannelID
+ );
+ });
// unopened dm
if (!notification) {
return notifications.find(e => {
- return !channels[e.channelID]
- })
+ return !channels[e.channelID];
+ });
}
return notification;
},
@@ -177,8 +187,11 @@ export default {
return result.find(friend => friend.status === 1);
},
getWindowWidth() {
- return {width: windowProperties.resizeWidth, height: windowProperties.resizeHeight};
- },
+ return {
+ width: windowProperties.resizeWidth,
+ height: windowProperties.resizeHeight
+ };
+ }
}
};
@@ -191,7 +204,7 @@ export default {
height: 100%;
}
-.notifyAnimation{
+.notifyAnimation {
animation: notifyAnime;
animation-duration: 1s;
animation-iteration-count: infinite;
@@ -204,22 +217,20 @@ export default {
width: 100%;
}
@keyframes notifyAnime {
- 0%{
+ 0% {
background: rgba(121, 3, 3, 0.541);
}
- 40%{
+ 40% {
background: rgba(255, 0, 0, 0.568);
}
- 60%{
+ 60% {
background: rgba(255, 0, 0, 0.568);
}
- 100%{
+ 100% {
background: rgba(121, 3, 3, 0.541);
}
}
-
-
.coming-soon {
display: flex;
align-items: center;
@@ -289,7 +300,7 @@ export default {
-webkit-app-region: no-drag;
cursor: pointer;
position: relative;
- border-right:solid 1px rgba(0, 0, 0, 0.5);
+ border-right: solid 1px rgba(0, 0, 0, 0.5);
}
.tab:hover {
@@ -301,8 +312,6 @@ export default {
color: white;
}
-
-
.tab .material-icons {
font-size: 15px;
vertical-align: -2px;
@@ -332,28 +341,21 @@ export default {
.fade-enter, .fade-leave-to /* .fade-leave-active below version 2.1.8 */ {
opacity: 0;
}
-
diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue
index 0969294..3bf1214 100644
--- a/src/views/LoginPage.vue
+++ b/src/views/LoginPage.vue
@@ -2,95 +2,50 @@
-
+
-
-
+
+
account_circle
Login
-
- Login to access Nertivia
-
-
-
-
@@ -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!
-
-
-
-
@@ -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;