dan/Nertivia-Client
1
0
Fork 0
mirror of https://github.com/danbulant/Nertivia-Client synced 2026-07-05 19:10:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

organised files

Browse source
This commit is contained in:
supertiger1234 2019-04-23 10:56:30 +01:00
parent 3a75b4e337
commit c412035733
23 changed files with 129 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
babel.config.js
View file

@ -1,5 +1,12 @@
module.exports = {
presets: [ module.exports = function (api) {
'@vue/app' api.cache(true);
]
} const presets = [ '@vue/app' ];
const plugins = [ '@babel/plugin-syntax-dynamic-import'];
return {
presets,
plugins
};
}

58
package-lock.json generated
View file

@ -374,9 +374,9 @@
} }
}, },
"@babel/plugin-syntax-dynamic-import": { "@babel/plugin-syntax-dynamic-import": {
"version": "7.0.0", "version": "7.2.0",
"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.0.0.tgz", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz",
"integrity": "sha512-Gt9xNyRrCHCiyX/ZxDGOcBnlJl0I3IWicpZRC4CdC0P5a/I07Ya2OAMEBU+J7GmRFVmIetqEYRko6QYRuKOESw==", "integrity": "sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/helper-plugin-utils": "^7.0.0" "@babel/helper-plugin-utils": "^7.0.0"
@ -1892,7 +1892,7 @@
}, },
"util": { "util": {
"version": "0.10.3", "version": "0.10.3",
"resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz",
"integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
"dev": true, "dev": true,
"requires": { "requires": {
@ -1915,7 +1915,7 @@
}, },
"async": { "async": {
"version": "1.5.2", "version": "1.5.2",
"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", "resolved": "http://registry.npmjs.org/async/-/async-1.5.2.tgz",
"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
"dev": true "dev": true
}, },
@ -2385,7 +2385,7 @@
}, },
"browserify-aes": { "browserify-aes": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
"dev": true, "dev": true,
"requires": { "requires": {
@ -2422,7 +2422,7 @@
}, },
"browserify-rsa": { "browserify-rsa": {
"version": "4.0.1", "version": "4.0.1",
"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
"integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
"dev": true, "dev": true,
"requires": { "requires": {
@ -2467,7 +2467,7 @@
}, },
"buffer": { "buffer": {
"version": "4.9.1", "version": "4.9.1",
"resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
"integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
"dev": true, "dev": true,
"requires": { "requires": {
@ -2508,7 +2508,7 @@
}, },
"cacache": { "cacache": {
"version": "10.0.4", "version": "10.0.4",
"resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", "resolved": "http://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
"integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
"dev": true, "dev": true,
"requires": { "requires": {
@ -3174,7 +3174,7 @@
}, },
"create-hash": { "create-hash": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
"dev": true, "dev": true,
"requires": { "requires": {
@ -3187,7 +3187,7 @@
}, },
"create-hmac": { "create-hmac": {
"version": "1.1.7", "version": "1.1.7",
"resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
"dev": true, "dev": true,
"requires": { "requires": {
@ -3233,7 +3233,7 @@
}, },
"css-color-names": { "css-color-names": {
"version": "0.0.4", "version": "0.0.4",
"resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", "resolved": "http://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
"integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=", "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
"dev": true "dev": true
}, },
@ -3323,7 +3323,7 @@
}, },
"jsesc": { "jsesc": {
"version": "0.5.0", "version": "0.5.0",
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
"integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
"dev": true "dev": true
}, },
@ -3340,7 +3340,7 @@
}, },
"regjsgen": { "regjsgen": {
"version": "0.2.0", "version": "0.2.0",
"resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
"integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
"dev": true "dev": true
}, },
@ -3643,7 +3643,7 @@
"dependencies": { "dependencies": {
"globby": { "globby": {
"version": "6.1.0", "version": "6.1.0",
"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
"dev": true, "dev": true,
"requires": { "requires": {
@ -3656,7 +3656,7 @@
"dependencies": { "dependencies": {
"pify": { "pify": {
"version": "2.3.0", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"dev": true "dev": true
} }
@ -3715,7 +3715,7 @@
}, },
"diffie-hellman": { "diffie-hellman": {
"version": "5.0.3", "version": "5.0.3",
"resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
"integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
"dev": true, "dev": true,
"requires": { "requires": {
@ -3841,7 +3841,7 @@
}, },
"duplexer": { "duplexer": {
"version": "0.1.1", "version": "0.1.1",
"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
"integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
"dev": true "dev": true
}, },
@ -4761,7 +4761,7 @@
}, },
"finalhandler": { "finalhandler": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", "resolved": "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
"integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
"dev": true, "dev": true,
"requires": { "requires": {
@ -5838,7 +5838,7 @@
}, },
"html-webpack-plugin": { "html-webpack-plugin": {
"version": "3.2.0", "version": "3.2.0",
"resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", "resolved": "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
"integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=", "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
"dev": true, "dev": true,
"requires": { "requires": {
@ -5853,7 +5853,7 @@
"dependencies": { "dependencies": {
"json5": { "json5": {
"version": "0.5.1", "version": "0.5.1",
"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
"dev": true "dev": true
}, },
@ -5906,7 +5906,7 @@
}, },
"http-errors": { "http-errors": {
"version": "1.6.3", "version": "1.6.3",
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
"dev": true, "dev": true,
"requires": { "requires": {
@ -6413,7 +6413,7 @@
}, },
"is-obj": { "is-obj": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
"dev": true "dev": true
}, },
@ -6981,7 +6981,7 @@
}, },
"media-typer": { "media-typer": {
"version": "0.3.0", "version": "0.3.0",
"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
"dev": true "dev": true
}, },
@ -8884,7 +8884,7 @@
}, },
"css-select": { "css-select": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", "resolved": "http://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
"integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
"dev": true, "dev": true,
"requires": { "requires": {
@ -8906,7 +8906,7 @@
}, },
"strip-ansi": { "strip-ansi": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true, "dev": true,
"requires": { "requires": {
@ -9340,7 +9340,7 @@
}, },
"sha.js": { "sha.js": {
"version": "2.4.11", "version": "2.4.11",
"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
"dev": true, "dev": true,
"requires": { "requires": {
@ -11215,7 +11215,7 @@
}, },
"strip-ansi": { "strip-ansi": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true, "dev": true,
"requires": { "requires": {
@ -11579,7 +11579,7 @@
}, },
"get-stream": { "get-stream": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
"dev": true "dev": true
}, },

1
package.json
View file

@ -28,6 +28,7 @@
"vuex": "^3.0.1" "vuex": "^3.0.1"
}, },
"devDependencies": { "devDependencies": {
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@vue/cli-plugin-babel": "^3.0.5", "@vue/cli-plugin-babel": "^3.0.5",
"@vue/cli-plugin-eslint": "^3.0.5", "@vue/cli-plugin-eslint": "^3.0.5",
"@vue/cli-service": "^3.6.0", "@vue/cli-service": "^3.6.0",

0
src/components/app/emojiPanel.vue → src/components/app/EmojiPanels/emojiPanel.vue
View file

0
src/components/app/emojiSuggestions.vue → src/components/app/EmojiPanels/emojiSuggestions.vue
View file

0
src/components/app/LeftPanel.vue → src/components/app/FriendsList.vue
View file

5
src/components/app/RightPanel.vue → src/components/app/MessagePanel.vue
View file

@ -99,12 +99,11 @@ import Message from "../../components/app/MessageTemplate.vue";
import Spinner from "@/components/Spinner.vue"; import Spinner from "@/components/Spinner.vue";
import TypingStatus from "@/components/app/TypingStatus.vue"; import TypingStatus from "@/components/app/TypingStatus.vue";
import uploadsQueue from "@/components/app/uploadsQueue.vue"; import uploadsQueue from "@/components/app/uploadsQueue.vue";
import emojiSuggestions from "@/components/app/emojiSuggestions.vue"; import emojiSuggestions from "@/components/app/EmojiPanels/emojiSuggestions.vue";
// import emojiPanel from "@/components/app/emojiPanel.vue";
import emojiParser from "@/utils/emojiParser.js"; import emojiParser from "@/utils/emojiParser.js";
import statuses from "@/utils/statuses"; import statuses from "@/utils/statuses";
const emojiPanel = () => import( '@/components/app/emojiPanel.vue' ); const emojiPanel = () => import( '@/components/app/EmojiPanels/emojiPanel.vue' );
export default { export default {
components: { components: {

14
src/components/app/Popouts.vue → src/components/app/Popouts/Popouts.vue
View file

@ -15,13 +15,13 @@
<script> <script>
//popouts //popouts
const userInformationPopout = () => import('@/components/app/userInformationPopout.vue'); const userInformationPopout = () => import('./Popouts/userInformationPopout.vue');
const Settings = () => import('@/components/app/Settings.vue'); const Settings = () => import('./Popouts/Settings.vue');
const TakeSurveyPopout = () => import('@/components/app/TakeSurveyPopout.vue'); const TakeSurveyPopout = () => import('./Popouts/TakeSurveyPopout.vue');
const uploadDialog = () => import('@/components/app/uploadDialog.vue'); const uploadDialog = () => import('./Popouts/uploadDialog.vue');
const GDriveLinkMenu = () => import('@/components/app/GDriveLinkMenu.vue'); const GDriveLinkMenu = () => import('./Popouts/GDriveLinkMenu.vue');
const imageLargePreview = () => import('@/components/app/imageLargePreview.vue'); const imageLargePreview = () => import('./Popouts/imageLargePreview.vue');
const DragDropFileUploadDialog = () => import('@/components/app/DragDropFileUploadDialog.vue'); const DragDropFileUploadDialog = () => import('./Popouts/DragDropFileUploadDialog.vue');

0
src/components/app/DragDropFileUploadDialog.vue → src/components/app/Popouts/Popouts/DragDropFileUploadDialog.vue
View file

4
src/components/app/GDriveLinkMenu.vue → src/components/app/Popouts/Popouts/GDriveLinkMenu.vue
View file

@ -108,7 +108,7 @@ export default {
background-size: 100%; background-size: 100%;
} }
.nertivia-img { .nertivia-img {
background-image: url(./../../assets/logo.png); background-image: url(./../../../../assets/logo.png);
border-radius: 50%; border-radius: 50%;
background-size: calc(100% + 34px); background-size: calc(100% + 34px);
box-shadow: 0px 0px 66px -4px rgba(69, 212, 255, 1); box-shadow: 0px 0px 66px -4px rgba(69, 212, 255, 1);
@ -120,7 +120,7 @@ export default {
user-select: none; user-select: none;
} }
.GDrive-img { .GDrive-img {
background-image: url(./../../assets/Google_Drive_logo.png); background-image: url(./../../../../assets/Google_Drive_logo.png);
} }
.buttons { .buttons {
margin: auto; margin: auto;

2
src/components/app/Settings.vue → src/components/app/Popouts/Popouts/Settings.vue
View file

@ -29,7 +29,7 @@
</template> </template>
<script> <script>
import { bus } from "../../main"; import { bus } from "@/main";
const MyProfile = () => import( './SettingsPanels/MyProfile.vue' ); const MyProfile = () => import( './SettingsPanels/MyProfile.vue' );

0
src/components/app/SettingsPanels/DropDownTemplate.vue → src/components/app/Popouts/Popouts/SettingsPanels/DropDownTemplate.vue
View file

0
src/components/app/SettingsPanels/ManageEmojis.vue → src/components/app/Popouts/Popouts/SettingsPanels/ManageEmojis.vue
View file

0
src/components/app/SettingsPanels/MessageDesign.vue → src/components/app/Popouts/Popouts/SettingsPanels/MessageDesign.vue
View file

2
src/components/app/SettingsPanels/MyProfile.vue → src/components/app/Popouts/Popouts/SettingsPanels/MyProfile.vue
View file

@ -49,7 +49,7 @@
<script> <script>
import ProfilePicture from "@/components/ProfilePictureTemplate.vue"; import ProfilePicture from "@/components/ProfilePictureTemplate.vue";
import Survey from "@/components/app/SettingsPanels/survey.vue"; import Survey from "./survey.vue";
import AvatarUpload from "@/services/AvatarUpload.js"; import AvatarUpload from "@/services/AvatarUpload.js";
import config from "@/config.js"; import config from "@/config.js";
import { bus } from "@/main"; import { bus } from "@/main";

2
src/components/app/SettingsPanels/survey.vue → src/components/app/Popouts/Popouts/SettingsPanels/survey.vue
View file

@ -58,7 +58,7 @@
<script> <script>
import surveyItems from "@/utils/surveyItems.js"; import surveyItems from "@/utils/surveyItems.js";
import DropDown from "@/components/app/SettingsPanels/DropDownTemplate.vue"; import DropDown from "./DropDownTemplate.vue";
import userService from "@/services/userService.js"; import userService from "@/services/userService.js";
export default { export default {
components: { DropDown }, components: { DropDown },

0
src/components/app/TakeSurveyPopout.vue → src/components/app/Popouts/Popouts/TakeSurveyPopout.vue
View file

0
src/components/app/imageLargePreview.vue → src/components/app/Popouts/Popouts/imageLargePreview.vue
View file

2
src/components/app/uploadDialog.vue → src/components/app/Popouts/Popouts/uploadDialog.vue
View file

@ -39,7 +39,7 @@
import filesize from "filesize"; import filesize from "filesize";
import emojiParser from "@/utils/emojiParser.js"; import emojiParser from "@/utils/emojiParser.js";
import messagesService from "@/services/messagesService"; import messagesService from "@/services/messagesService";
import { bus } from "../../main"; import { bus } from "@/main";
import {mapState} from 'vuex'; import {mapState} from 'vuex';
export default { export default {
props: ["file"], props: ["file"],

0
src/components/app/userInformationPopout.vue → src/components/app/Popouts/Popouts/userInformationPopout.vue
View file

66
src/components/app/Tabs/DirectMessage.vue Normal file
View file

@ -0,0 +1,66 @@
<template>
<div class="direct-message-tab">
<transition name="slidein">
<friends-list
class="left-panel"
v-click-outside="hideLeftPanel"
v-show="$mq === 'mobile' && showLeftPanel || $mq === 'desktop'"
/>
</transition>
<message-panel/>
</div>
</template>
<script>
import { bus } from "@/main";
import FriendsList from "@/components/app/FriendsList.vue";
import MessagePanel from "@/components/app/MessagePanel.vue";
export default {
components: {
FriendsList,
MessagePanel
},
data() {
return {
showLeftPanel: false
};
},
methods: {
hideLeftPanel(event) {
if (this.showLeftPanel) {
if (event.target.closest(".show-menu-button") == null) {
this.showLeftPanel = false;
}
}
}
},
mounted() {
bus.$on("toggleLeftMenu", () => {
this.showLeftPanel = !this.showLeftPanel;
});
bus.$on("closeLeftMenu", () => {
this.showLeftPanel = false;
});
}
};
</script>
<style scoped>
.slidein-enter-active,
.slidein-leave-active {
transition: 0.5s;
}
.slidein-enter, .slidein-leave-to /* .fade-leave-active below version 2.1.8 */ {
margin-left: -300px;
}
@media (max-width: 600px) {
.left-panel {
position: absolute;
top: 47px;
height: calc(100% - 47px);
background-color: rgba(39, 39, 39, 0.97);
}
}
</style>

0
src/components/app/News.vue → src/components/app/Tabs/News.vue
View file

47
src/views/App.vue
View file

@ -28,16 +28,7 @@
</div> </div>
<div class="panel-layout"> <div class="panel-layout">
<news v-if="currentTab == 0" /> <news v-if="currentTab == 0" />
<span class="direct-message-tab" v-if="currentTab == 1"> <direct-message v-if="currentTab == 1" />
<transition name="slidein">
<LeftPanel
class="left-panel"
v-click-outside="hideLeftPanel"
v-show="$mq === 'mobile' && showLeftPanel || $mq === 'desktop'"
></LeftPanel>
</transition>
<RightPanel/>
</span>
<div class="coming-soon" v-if="currentTab > 1"> <div class="coming-soon" v-if="currentTab > 1">
<div class="icon"><i class="material-icons">cached</i></div> <div class="icon"><i class="material-icons">cached</i></div>
<div class="text">Coming soon!</div> <div class="text">Coming soon!</div>
@ -51,21 +42,20 @@
<script> <script>
import { bus } from "../main"; import { bus } from "../main";
import Popouts from "@/components/app/Popouts.vue"; import Popouts from "@/components/app/Popouts/Popouts.vue";
import changelog from '@/utils/changelog.js'; import changelog from '@/utils/changelog.js';
import ConnectingScreen from "./../components/app/ConnectingScreen.vue"; import ConnectingScreen from "./../components/app/ConnectingScreen.vue";
const News = () => import('./../components/app/News.vue'); const News = () => import('./../components/app/Tabs/News.vue');
const LeftPanel = () => import('./../components/app/LeftPanel.vue'); const DirectMessage = () => import('./../components/app/Tabs/DirectMessage.vue');
const RightPanel = () => import('./../components/app/RightPanel.vue');
export default { export default {
name: "app", name: "app",
components: { components: {
LeftPanel, DirectMessage,
RightPanel,
ConnectingScreen, ConnectingScreen,
Popouts, Popouts,
News News
@ -73,18 +63,10 @@ export default {
data() { data() {
return { return {
currentTab: localStorage.getItem('currentTab') || 0, currentTab: localStorage.getItem('currentTab') || 0,
showLeftPanel: false,
title: "Nertivia" title: "Nertivia"
}; };
}, },
methods: { methods: {
hideLeftPanel(event) {
if (this.showLeftPanel) {
if (event.target.closest(".show-menu-button") == null) {
this.showLeftPanel = false;
}
}
},
switchTab(index) { switchTab(index) {
localStorage.setItem("currentTab", index); localStorage.setItem("currentTab", index);
this.currentTab = index; this.currentTab = index;
@ -99,14 +81,6 @@ export default {
localStorage.setItem('currentTab', 0) localStorage.setItem('currentTab', 0)
} }
localStorage.setItem('changelog-version-seen', changelog[0].version) localStorage.setItem('changelog-version-seen', changelog[0].version)
bus.$on("toggleLeftMenu", () => {
this.showLeftPanel = !this.showLeftPanel;
});
bus.$on("closeLeftMenu", () => {
this.showLeftPanel = false;
});
bus.$on("title:change", title => { bus.$on("title:change", title => {
this.title = title; this.title = title;
}); });
@ -209,15 +183,6 @@ export default {
.fade-enter, .fade-leave-to /* .fade-leave-active below version 2.1.8 */ { .fade-enter, .fade-leave-to /* .fade-leave-active below version 2.1.8 */ {
opacity: 0; opacity: 0;
} }
@media (max-width: 600px) {
.left-panel {
position: absolute;
top: 47px;
height: calc(100% - 47px);
background-color: rgba(39, 39, 39, 0.97);
}
}
@media (max-width: 470px) { @media (max-width: 470px) {
.tabs { .tabs {
height: 40px; height: 40px;