From 42141f2423fe246c66e76ec1d498b50338ec7f01 Mon Sep 17 00:00:00 2001 From: "aaron@nanu-c.org" Date: Wed, 23 Feb 2022 20:47:58 +0100 Subject: [PATCH 1/7] [axolotl-web]: Add a default layout --- axolotl-web/package-lock.json | 15 + axolotl-web/package.json | 1 + axolotl-web/src/App.vue | 12 +- .../{Header.vue => LegacyHeader.vue} | 33 --- axolotl-web/src/layouts/Default.vue | 85 ++++++ axolotl-web/src/layouts/Legacy.vue | 27 ++ axolotl-web/src/main.js | 1 + axolotl-web/src/pages/About.vue | 70 ++--- axolotl-web/src/pages/ChatList.vue | 180 ++++++------ axolotl-web/src/pages/Contacts.vue | 154 +++++----- axolotl-web/src/pages/Debug.vue | 38 +-- axolotl-web/src/pages/DeviceList.vue | 58 ++-- axolotl-web/src/pages/EditGroup.vue | 96 +++--- axolotl-web/src/pages/MessageList.vue | 273 +++++++++--------- axolotl-web/src/pages/NewGroup.vue | 80 ++--- axolotl-web/src/pages/Password.vue | 36 +-- axolotl-web/src/pages/Register.vue | 80 ++--- axolotl-web/src/pages/SetPassword.vue | 140 ++++----- axolotl-web/src/pages/SetUsername.vue | 42 +-- axolotl-web/src/pages/Settings.vue | 98 ++++--- axolotl-web/src/pages/Verification.vue | 66 +++-- axolotl-web/src/router/router.js | 50 +++- 22 files changed, 911 insertions(+), 724 deletions(-) rename axolotl-web/src/components/{Header.vue => LegacyHeader.vue} (94%) create mode 100644 axolotl-web/src/layouts/Default.vue create mode 100644 axolotl-web/src/layouts/Legacy.vue diff --git a/axolotl-web/package-lock.json b/axolotl-web/package-lock.json index 1825af51f..a2cc77f95 100644 --- a/axolotl-web/package-lock.json +++ b/axolotl-web/package-lock.json @@ -12,6 +12,7 @@ "@fortawesome/fontawesome-svg-core": "^1.3.0", "@fortawesome/free-solid-svg-icons": "^6.0.0", "@fortawesome/vue-fontawesome": "^3.0.0-5", + "@popperjs/core": "^2.11.2", "bootstrap": "^5.1.3", "core-js": "^3.20.3", "file-saver": "^2.0.5", @@ -2042,6 +2043,15 @@ "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==", "dev": true }, + "node_modules/@popperjs/core": { + "version": "2.11.2", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.2.tgz", + "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/@sideway/address": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.3.tgz", @@ -15802,6 +15812,11 @@ "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==", "dev": true }, + "@popperjs/core": { + "version": "2.11.2", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.2.tgz", + "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA==" + }, "@sideway/address": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.3.tgz", diff --git a/axolotl-web/package.json b/axolotl-web/package.json index 523f8ea5c..92ebf4876 100644 --- a/axolotl-web/package.json +++ b/axolotl-web/package.json @@ -22,6 +22,7 @@ "@fortawesome/fontawesome-svg-core": "^1.3.0", "@fortawesome/free-solid-svg-icons": "^6.0.0", "@fortawesome/vue-fontawesome": "^3.0.0-5", + "@popperjs/core": "^2.11.2", "bootstrap": "^5.1.3", "core-js": "^3.20.3", "file-saver": "^2.0.5", diff --git a/axolotl-web/src/App.vue b/axolotl-web/src/App.vue index de00da93f..717e0e6bd 100644 --- a/axolotl-web/src/App.vue +++ b/axolotl-web/src/App.vue @@ -1,10 +1,7 @@ @@ -28,14 +25,12 @@ if (window.getCookie("darkMode") === "true") { } else { import("./assets/light.scss"); } -import {router} from "./router/router"; -import HeaderComp from "@/components/Header.vue"; +import { router } from "./router/router"; import ErrorModal from "@/components/ErrorModal.vue"; export default { name: "AxolotlWeb", components: { - HeaderComp, ErrorModal, }, data() { @@ -80,7 +75,6 @@ export default { html, body, #app { - height: 100%; font-family: "ubuntu"; display: flex; flex-direction: column; diff --git a/axolotl-web/src/components/Header.vue b/axolotl-web/src/components/LegacyHeader.vue similarity index 94% rename from axolotl-web/src/components/Header.vue rename to axolotl-web/src/components/LegacyHeader.vue index abd027301..3deeebaf4 100644 --- a/axolotl-web/src/components/Header.vue +++ b/axolotl-web/src/components/LegacyHeader.vue @@ -361,39 +361,6 @@ - -
-
- -
diff --git a/axolotl-web/src/layouts/Default.vue b/axolotl-web/src/layouts/Default.vue new file mode 100644 index 000000000..a8925b3d0 --- /dev/null +++ b/axolotl-web/src/layouts/Default.vue @@ -0,0 +1,85 @@ + + + \ No newline at end of file diff --git a/axolotl-web/src/layouts/Legacy.vue b/axolotl-web/src/layouts/Legacy.vue new file mode 100644 index 000000000..01c1a5ea7 --- /dev/null +++ b/axolotl-web/src/layouts/Legacy.vue @@ -0,0 +1,27 @@ + + + \ No newline at end of file diff --git a/axolotl-web/src/main.js b/axolotl-web/src/main.js index 57730d536..564f632ce 100644 --- a/axolotl-web/src/main.js +++ b/axolotl-web/src/main.js @@ -8,6 +8,7 @@ import translations from '../translations/translations.json' import { library } from '@fortawesome/fontawesome-svg-core' import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome' import linkifyHTML from 'linkify-html' +import "bootstrap"; import { faArrowDown, diff --git a/axolotl-web/src/pages/About.vue b/axolotl-web/src/pages/About.vue index a8737d16f..4a99a4830 100644 --- a/axolotl-web/src/pages/About.vue +++ b/axolotl-web/src/pages/About.vue @@ -1,39 +1,41 @@