diff --git a/README.md b/README.md index d0c9ee6d1..caced0da1 100644 --- a/README.md +++ b/README.md @@ -15,21 +15,21 @@ electron/qml WebEngineView container. ## Features - * Phone registration - * Contact discovery - * Direct messages - * Group messages *mostly* - * Photo, video, audio and contact attachments in both direct and group mode - * Preview for photo and audio attachments - * Storing conversations - * Encrypted message store - * Desktop client provisioning/syncing *partially* +- Phone registration +- Contact discovery +- Direct messages +- Group messages _mostly_ +- Photo, video, audio and contact attachments in both direct and group mode +- Preview for photo and audio attachments +- Storing conversations +- Encrypted message store +- Desktop client provisioning/syncing _partially_ ### Planned - * Push notifications - * Most settings that are available in the Android app - * Encrypted phone calls +- Push notifications +- Most settings that are available in the Android app +- Encrypted phone calls There are still bugs and UI/UX quirks. @@ -37,22 +37,22 @@ There are still bugs and UI/UX quirks. Axolotl can be installed through different means. -| Package | Maintainer | Comment | -| ------- | ---------- | -------- | -| Get it from the OpenStore | nanu-c | For Ubuntu Touch | -| Get it from the Snap Store | nanu-c | For Ubuntu desktop | -| Download on Flathub | olof-nord | https://github.com/flathub/org.nanuc.Axolotl | -| mobian version | nuehm-arno | https://github.com/nanu-c/axolotl/releases
(Debian package in the Assets section)| +| Package | Maintainer | Comment | +| -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ------------------------------------------------------------------------------------- | +| Get it from the OpenStore | nanu-c | For Ubuntu Touch | +| Get it from the Snap Store | nanu-c | For Ubuntu desktop | +| Download on Flathub | olof-nord | https://github.com/flathub/org.nanuc.Axolotl | +| mobian version | nuehm-arno | https://github.com/nanu-c/axolotl/releases
(Debian package in the Assets section) | ## Building To find out how to build from source and install yourself, please see below. -* with Clickable: see [here](docs/INSTALL.md#clickable). -* with Snap: see [here](docs/INSTALL.md#snap). -* with Flatpak: see [here](docs/INSTALL.md#flatpak). -* with AppImage: see [here](docs/INSTALL.md#appimage). -* for Mobian: see [here](docs/INSTALL.md#mobian-or-debian-arm64-systems). +- with Clickable: see [here](docs/INSTALL.md#clickable). +- with Snap: see [here](docs/INSTALL.md#snap). +- with Flatpak: see [here](docs/INSTALL.md#flatpak). +- with AppImage: see [here](docs/INSTALL.md#appimage). +- for Mobian: see [here](docs/INSTALL.md#mobian-or-debian-arm64-systems). ### Manually @@ -70,8 +70,7 @@ sudo apt install golang-go nodejs npm build-essential Then, install axolotl go and npm dependencies. -*Note: Make sure to install the latest **node lts** version from [https://nodejs.org/](https://nodejs.org/).* - +_Note: Make sure to install the latest **node lts** version from [https://nodejs.org/](https://nodejs.org/)._ ```shell make build-dependencies @@ -90,27 +89,27 @@ When setting up for the first time and maybe occasionally later you need to upda ## Run flags -* `-axolotlWebDir` Specify the directory to use for axolotl-web. Defaults to "./axolotl-web/dist". -* `-e` for either - `lorca`-> native chromium (has to be installed), - `ut` -> runs in the ut enviroment, - `me` -> qmlscene, - `server` -> just run the webserver. Defaults to run with `electron`. -* `-eDebug` show developer console in electron mode -* `-version` Print version info -* `-host` Set the host to run the webserver from. Defaults to localhost. -* `-port` Set the port to run the webserver from. Defaults to 9080. +- `-axolotlWebDir` Specify the directory to use for axolotl-web. Defaults to "./axolotl-web/dist". +- `-e` for either + `lorca`-> native chromium (has to be installed), + `ut` -> runs in the ut enviroment, + `me` -> qmlscene, + `server` -> just run the webserver. Defaults to run with `electron`. +- `-eDebug` show developer console in electron mode +- `-version` Print version info +- `-host` Set the host to run the webserver from. Defaults to localhost. +- `-port` Set the port to run the webserver from. Defaults to 9080. ## Environment variables -* `AXOLOTL_WEB_DIR` Specify the directory to use for axolotl-web. This is used by `axolotl` during startup. -* `AXOLOTL_GUI_DIR` Specifies the directory used for GUI specifications. This is used by `axolotl` only when in `qt` mode. +- `AXOLOTL_WEB_DIR` Specify the directory to use for axolotl-web. This is used by `axolotl` during startup. +- `AXOLOTL_GUI_DIR` Specifies the directory used for GUI specifications. This is used by `axolotl` only when in `qt` mode. ## Contributing -* Please fill issues here on github https://github.com/nanu-c/axolotl/issues -* Help translate Axolotl to your language(s). For information how to translate, please see [TRANSLATE.md](docs/TRANSLATE.md). -* Contribute code by making PR's (pull requests) +- Please fill issues here on github https://github.com/nanu-c/axolotl/issues +- Help translate Axolotl to your language(s). For information how to translate, please see [TRANSLATE.md](docs/TRANSLATE.md). +- Contribute code by making PR's (pull requests) If you contribute new strings, please: diff --git a/SECURITY.md b/SECURITY.md index e9d577ba5..69f6889df 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -6,7 +6,7 @@ We are currently only supporting the latest version of axolotl ## Reporting a Vulnerability -Please send an e-mail to aaron@nanu-c.org explaining the vulnerability. +Please send an e-mail to aaron@nanu-c.org explaining the vulnerability. We as the devleopers of axolotl do our best to our knowledge to avoid vulnerabilities but we also make mistakes. -Axolotl run only by volunteers, so don't expect much in exchange, expect for gratful thanks in change log :). +Axolotl run only by volunteers, so don't expect much in exchange, expect for gratful thanks in change log :). You can always ask for some axolotl stickers. diff --git a/axolotl-web/.eslintrc.js b/axolotl-web/.eslintrc.js index 1a0e6ae97..3e06bcbdc 100644 --- a/axolotl-web/.eslintrc.js +++ b/axolotl-web/.eslintrc.js @@ -5,45 +5,41 @@ module.exports = { es2021: true, }, - - extends: [ - 'plugin:vue/vue3-recommended', - ], + extends: ["plugin:vue/vue3-recommended"], rules: { - 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off', - 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', - 'comma-dangle': 'off', - 'class-methods-use-this': 'off', - 'import/no-unresolved': 'off', - 'import/extensions': 'off', - 'implicit-arrow-linebreak': 'off', - 'import/prefer-default-export': 'off', + "no-console": process.env.NODE_ENV === "production" ? "error" : "off", + "no-debugger": process.env.NODE_ENV === "production" ? "error" : "off", + "comma-dangle": "off", + "class-methods-use-this": "off", + "import/no-unresolved": "off", + "import/extensions": "off", + "implicit-arrow-linebreak": "off", + "import/prefer-default-export": "off", "vue/no-mutating-props": "off", "vue/singleline-html-element-content-newline": "off", "vue/max-attributes-per-line": "off", "vue/component-name-in-template-casing": "off", - "vue/html-self-closing": ["error", { - "html": { - "void": "any", - "normal": "always", - "component": "always" + "vue/html-self-closing": [ + "error", + { + html: { + void: "any", + normal: "always", + component: "always", + }, + svg: "always", + math: "always", }, - "svg": "always", - "math": "always" - }] - + ], }, overrides: [ { - files: [ - '**/__tests__/*.{j,t}s?(x)', - '**/tests/unit/**/*.spec.{j,t}s?(x)' - ], + files: ["**/__tests__/*.{j,t}s?(x)", "**/tests/unit/**/*.spec.{j,t}s?(x)"], env: { - mocha: true - } - } - ] + mocha: true, + }, + }, + ], }; diff --git a/axolotl-web/babel.config.js b/axolotl-web/babel.config.js index e9558405f..162a3ea97 100644 --- a/axolotl-web/babel.config.js +++ b/axolotl-web/babel.config.js @@ -1,5 +1,3 @@ module.exports = { - presets: [ - '@vue/cli-plugin-babel/preset' - ] -} + presets: ["@vue/cli-plugin-babel/preset"], +}; diff --git a/axolotl-web/gettext.config.js b/axolotl-web/gettext.config.js index 1031fab35..d00381e9b 100644 --- a/axolotl-web/gettext.config.js +++ b/axolotl-web/gettext.config.js @@ -11,12 +11,45 @@ module.exports = { potPath: "./textsecure.nanuc.pot", jsonPath: "../axolotl-web/translations/translations.json", locales: [ - "ar", "be", "bg", "cs", "da", "de", "el", "es", "fa", "fi", "fr", "hr", "hu", "in", - "it", "iw", "ja", "kn-rIN", "ko", "mk", "nb", "nl", "no", "pl", "pt-BR", "pt", "ro", "ru", - "sk", "sl", "sr", "sv", "ta", "tr", "vi", "zh-rCN" + "ar", + "be", + "bg", + "cs", + "da", + "de", + "el", + "es", + "fa", + "fi", + "fr", + "hr", + "hu", + "in", + "it", + "iw", + "ja", + "kn-rIN", + "ko", + "mk", + "nb", + "nl", + "no", + "pl", + "pt-BR", + "pt", + "ro", + "ru", + "sk", + "sl", + "sr", + "sv", + "ta", + "tr", + "vi", + "zh-rCN", ], flat: true, linguas: true, - silent: true + silent: true, }, }; diff --git a/axolotl-web/index.html b/axolotl-web/index.html index a14f0d73a..e26356aaf 100644 --- a/axolotl-web/index.html +++ b/axolotl-web/index.html @@ -1,29 +1,59 @@ - - - - + + + + axolotl-web -
+
- + - - - - - - + + + + + +
diff --git a/axolotl-web/src/assets/dark.scss b/axolotl-web/src/assets/dark.scss index e4afe5871..b32c12256 100644 --- a/axolotl-web/src/assets/dark.scss +++ b/axolotl-web/src/assets/dark.scss @@ -32,4 +32,4 @@ $sent-url: "check-circle-outline_dark.svg"; $delivered-url: "double-check_dark.svg"; $read-url: "double-check-filled_dark.svg"; -@import './style.scss'; +@import "./style.scss"; diff --git a/axolotl-web/src/assets/light.scss b/axolotl-web/src/assets/light.scss index 40a4e1ad0..be73a4436 100644 --- a/axolotl-web/src/assets/light.scss +++ b/axolotl-web/src/assets/light.scss @@ -21,4 +21,4 @@ $sent-url: "check-circle-outline.svg"; $delivered-url: "double-check.svg"; $read-url: "double-check-filled.svg"; -@import './style.scss'; +@import "./style.scss"; diff --git a/axolotl-web/src/assets/style.scss b/axolotl-web/src/assets/style.scss index ba5f4a8d3..fed317f06 100644 --- a/axolotl-web/src/assets/style.scss +++ b/axolotl-web/src/assets/style.scss @@ -99,14 +99,13 @@ $link-color: $primary; } @font-face { - font-family: 'ubuntu'; - src: url('fonts/ubuntu-r-webfont.woff2') format('woff2'), - url('fonts/ubuntu-r-webfont.woff') format('woff'); + font-family: "ubuntu"; + src: url("fonts/ubuntu-r-webfont.woff2") format("woff2"), + url("fonts/ubuntu-r-webfont.woff") format("woff"); font-weight: normal; font-style: normal; - } -body{ - font-size:14px; -} \ No newline at end of file +body { + font-size: 14px; +} diff --git a/axolotl-web/src/components/AddContactModal.vue b/axolotl-web/src/components/AddContactModal.vue index 6e6bdc6b2..0557cc858 100644 --- a/axolotl-web/src/components/AddContactModal.vue +++ b/axolotl-web/src/components/AddContactModal.vue @@ -13,17 +13,17 @@
- After adding a contact, it takes a few seconds for checking if the contact is registered with signal. + After adding a contact, it takes a few seconds for checking if the contact is + registered with signal.
- +
@@ -33,7 +33,7 @@ type="text" class="form-control" placeholder="+44..." - > + />
@@ -41,7 +41,7 @@ v-translate type="button" class="btn btn-primary" - @click="$emit('add', { name: name, phone: phone, uuid:uuid })" + @click="$emit('add', { name: name, phone: phone, uuid: uuid })" > Add @@ -58,12 +58,12 @@ export default { number: { type: String, required: false, - default: null + default: null, }, uuid: { type: String, required: false, - default: null + default: null, }, }, emits: ["close", "add"], @@ -77,7 +77,7 @@ export default { if (this.number) { this.phone = this.number; this.name = ""; - } + } }, }; diff --git a/axolotl-web/src/components/AddDeviceModal.vue b/axolotl-web/src/components/AddDeviceModal.vue index 269a29ed0..64db7ae9b 100644 --- a/axolotl-web/src/components/AddDeviceModal.vue +++ b/axolotl-web/src/components/AddDeviceModal.vue @@ -16,21 +16,11 @@
- +
-
diff --git a/axolotl-web/src/components/AddGroupMembersModal.vue b/axolotl-web/src/components/AddGroupMembersModal.vue index e12923659..a40938b2c 100644 --- a/axolotl-web/src/components/AddGroupMembersModal.vue +++ b/axolotl-web/src/components/AddGroupMembersModal.vue @@ -5,11 +5,7 @@
Add members
-
- - - - + + +
diff --git a/axolotl-web/src/components/ConfirmationModal.vue b/axolotl-web/src/components/ConfirmationModal.vue index 478c67390..79c72b2e0 100644 --- a/axolotl-web/src/components/ConfirmationModal.vue +++ b/axolotl-web/src/components/ConfirmationModal.vue @@ -11,12 +11,7 @@
{{ text }}
-
@@ -32,11 +27,11 @@ export default { props: { title: { type: String, - default: "" + default: "", }, text: { type: String, - default: "" + default: "", }, }, emits: ["close", "confirm"], diff --git a/axolotl-web/src/components/EditContactModal.vue b/axolotl-web/src/components/EditContactModal.vue index b8380b24a..cd4d1553e 100644 --- a/axolotl-web/src/components/EditContactModal.vue +++ b/axolotl-web/src/components/EditContactModal.vue @@ -20,7 +20,7 @@ type="text" class="form-control" placeholder="Enter name" - > + />
@@ -30,7 +30,7 @@ type="text" class="form-control" placeholder="+44..." - > + />
@@ -54,11 +54,11 @@ export default { props: { contact: { type: Object, - default: () => {} + default: () => {}, }, id: { type: String, - default: "" + default: "", }, }, emits: ["close", "save"], diff --git a/axolotl-web/src/components/ErrorModal.vue b/axolotl-web/src/components/ErrorModal.vue index fcda8246e..188f8bd66 100644 --- a/axolotl-web/src/components/ErrorModal.vue +++ b/axolotl-web/src/components/ErrorModal.vue @@ -3,40 +3,29 @@
-
- Error communicating with Signal servers -
+
Error communicating with Signal servers

- Axolotl encountered an error communicating with Signal servers. - Please try again. + Axolotl encountered an error communicating with Signal servers. Please try again.

If you're seeing that error multiple times, check the - status of Signal servers. If it's fine, then please tell us there is a problem by + status of Signal servers. If + it's fine, then please tell us there is a problem by opening an issue.

If you think that something is wrong on your side, you can - unregister and register again. - Be careful, - your encryption key will change and you will lose all your - messages + unregister and register again. Be careful, + your encryption key will change and you will lose all your messages if you choose to do that.

- +
@@ -55,9 +44,7 @@ export default { methods: { unregister() { if ( - confirm( - "You are about to lose all your messages, are you sure you want to unregister?" - ) + confirm("You are about to lose all your messages, are you sure you want to unregister?") ) { this.$store.dispatch("unregister"); location.reload(); diff --git a/axolotl-web/src/components/IdentityModal.vue b/axolotl-web/src/components/IdentityModal.vue index 29590ef43..23a11dd9b 100644 --- a/axolotl-web/src/components/IdentityModal.vue +++ b/axolotl-web/src/components/IdentityModal.vue @@ -88,7 +88,7 @@ export default { display: flex; } -.modal-title>div { +.modal-title > div { margin-left: 10px; } diff --git a/axolotl-web/src/components/ImportUnavailableModal.vue b/axolotl-web/src/components/ImportUnavailableModal.vue index 317d0bdc4..5066527ce 100644 --- a/axolotl-web/src/components/ImportUnavailableModal.vue +++ b/axolotl-web/src/components/ImportUnavailableModal.vue @@ -3,36 +3,28 @@
-
- Import contacts feature unavailable -
+
Import contacts feature unavailable
- We are sorry, but due to a change in the Signal protocol, automatic - import of contacts is currently unavailable. + We are sorry, but due to a change in the Signal protocol, automatic import of contacts + is currently unavailable.
- If you are really sure that the persons you want to text with have - Signal, you can manually add them using the "plus" action on that - page. + If you are really sure that the persons you want to text with have Signal, you can + manually add them using the "plus" action on that page.
- Be careful, if you add too many numbers which aren't Signal - accounts, you won't be able to add contacts anymore. + Be careful, if you add too many numbers which aren't Signal accounts, you won't be able + to add contacts anymore.
-
diff --git a/axolotl-web/src/components/ImportVcfModal.vue b/axolotl-web/src/components/ImportVcfModal.vue index 6e327892b..bce42d946 100644 --- a/axolotl-web/src/components/ImportVcfModal.vue +++ b/axolotl-web/src/components/ImportVcfModal.vue @@ -11,7 +11,12 @@
- Contacts can be added through a vcf contacts file. If an contact has multiple numbers, all of them will be added as separate contacts. + Contacts can be added through a vcf contacts file. If an contact has multiple + numbers, all of them will be added as separate contacts.
-
@@ -45,12 +45,12 @@ export default { number: { type: String, required: false, - default: null + default: null, }, uuid: { type: String, required: false, - default: null + default: null, }, }, emits: ["close", "add"], @@ -60,14 +60,12 @@ export default { name: "", }; }, - computed: mapState([ - "gui", - ]), + computed: mapState(["gui"]), mounted() { if (this.number) { this.phone = this.number; this.name = ""; - } + } }, methods: { readVcf(evt) { @@ -91,9 +89,8 @@ export default { this.showSettingsMenu = false; if (this.gui === "ut") { const result = window.prompt("refreshContacts"); - if (result !== "canceled") - this.$store.dispatch("refreshContacts", result); - this.$emit("close"); + if (result !== "canceled") this.$store.dispatch("refreshContacts", result); + this.$emit("close"); } else { this.showSettingsMenu = false; document.getElementById("addVcf").click(); diff --git a/axolotl-web/src/components/LegacyHeader.vue b/axolotl-web/src/components/LegacyHeader.vue index efec35972..45282de94 100644 --- a/axolotl-web/src/components/LegacyHeader.vue +++ b/axolotl-web/src/components/LegacyHeader.vue @@ -12,7 +12,11 @@
-
+
@@ -43,21 +44,14 @@
-
+
{{ sessionNames[currentChat.ID].Name }}
@@ -65,11 +59,7 @@
@@ -77,10 +67,7 @@
{{ currentChat.Tel }} @@ -112,8 +99,8 @@ - {{ humanifyTimePeriod(duration) }} - {{ humanifyTimePeriod(currentTime) }} / - {{ humanifyTimePeriod(duration) }} + {{ humanifyTimePeriod(currentTime) }} / {{ humanifyTimePeriod(duration) }}
{{ m.FileName ? m.FileName : m.File }} + >{{ m.FileName ? m.FileName : m.File }}
{{ humanifyTimePeriod(duration) }} - {{ humanifyTimePeriod(currentTime) }} / - {{ humanifyTimePeriod(duration) }} + {{ humanifyTimePeriod(currentTime) }} / {{ humanifyTimePeriod(duration) }}
@@ -188,25 +167,21 @@
Set timer for self-destructing messages
{{ humanifyTimePeriod(message.ExpireTimer) }}
-
- Unsupported message type: sticker -
+
Unsupported message type: sticker
- {{ - humanifyDateFromNow(message.SentAt) - }} + {{ humanifyDateFromNow(message.SentAt) }} {{ humanifyDate(message.SentAt) }}
@@ -287,9 +262,7 @@ export default { ) { const attachment = JSON.parse(this.message.Attachment); if (attachment && attachment.length > 0 && attachment[0].CType === 3) { - this.audio = new Audio( - "http://localhost:9080/attachments?file=" + attachment[0].File - ); + this.audio = new Audio("http://localhost:9080/attachments?file=" + attachment[0].File); var that = this; this.audio.onloadedmetadata = function () { that.duration = that.audio.duration.toFixed(2); diff --git a/axolotl-web/src/components/VerificationPinInput.vue b/axolotl-web/src/components/VerificationPinInput.vue index 8b3dfa282..8c0667eda 100644 --- a/axolotl-web/src/components/VerificationPinInput.vue +++ b/axolotl-web/src/components/VerificationPinInput.vue @@ -17,7 +17,7 @@ @paste="onPaste" @focus="newColor(index)" @blur="defaultColor(index)" - > + />
@@ -27,22 +27,22 @@ export default { props: { numberOfBoxes: { type: Number, - default: 6 + default: 6, }, position: { type: String, - default: "center" + default: "center", }, color: { type: String, - default: "" + default: "", }, clearInput: { type: Boolean, default: false, }, }, - emits:['input-value','enter','clearValue'], + emits: ["input-value", "enter", "clearValue"], data() { return { @@ -171,8 +171,7 @@ export default { return; } event.preventDefault(); - const code = - clipboardData.getData("Text") || clipboardData.getData("text/plain"); + const code = clipboardData.getData("Text") || clipboardData.getData("text/plain"); this.fillCode(code); this.emitInput(); }, @@ -184,8 +183,7 @@ export default { this.arraySize = parts; const last = code.length - 1; setTimeout(() => { - this.arraySize[last] = - this.arraySize[last] && this.arraySize[last].slice(0, 1); + this.arraySize[last] = this.arraySize[last] && this.arraySize[last].slice(0, 1); this.$forceUpdate(); this.$refs["otp" + (this.arraySize.length - 1)][0].focus(); }, 0); diff --git a/axolotl-web/src/helpers/uuidCheck.js b/axolotl-web/src/helpers/uuidCheck.js index 0b1d1c51f..2233aa734 100644 --- a/axolotl-web/src/helpers/uuidCheck.js +++ b/axolotl-web/src/helpers/uuidCheck.js @@ -1,6 +1,6 @@ const uuidV4Regex = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i; -const isValidV4UUID = uuid => uuidV4Regex.test(uuid); +const isValidV4UUID = (uuid) => uuidV4Regex.test(uuid); export const validateUUID = function (uuid) { - var result = isValidV4UUID(uuid) - return result -} + var result = isValidV4UUID(uuid); + return result; +}; diff --git a/axolotl-web/src/layouts/Default.vue b/axolotl-web/src/layouts/Default.vue index 5f35cb403..5c6f1b05c 100644 --- a/axolotl-web/src/layouts/Default.vue +++ b/axolotl-web/src/layouts/Default.vue @@ -4,11 +4,7 @@
-
@@ -80,4 +76,4 @@ export default { main { padding-top: 50px; } - \ No newline at end of file + diff --git a/axolotl-web/src/layouts/Legacy.vue b/axolotl-web/src/layouts/Legacy.vue index 01c1a5ea7..f91144339 100644 --- a/axolotl-web/src/layouts/Legacy.vue +++ b/axolotl-web/src/layouts/Legacy.vue @@ -24,4 +24,4 @@ export default { .legacy-layout { height: 100vh; } - \ No newline at end of file + diff --git a/axolotl-web/src/main.js b/axolotl-web/src/main.js index a81b2e6bd..3f4821757 100644 --- a/axolotl-web/src/main.js +++ b/axolotl-web/src/main.js @@ -1,14 +1,14 @@ -import { createApp } from 'vue' -import App from './App.vue' -import VueNativeSock from 'vue-native-websocket-vue3' -import store from './store/store' +import { createApp } from "vue"; +import App from "./App.vue"; +import VueNativeSock from "vue-native-websocket-vue3"; +import store from "./store/store"; import { router } from "./router/router"; import { createGettext } from "vue3-gettext"; -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 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, @@ -29,43 +29,53 @@ import { faUserFriends, faVolumeMute, faWrench, -} from '@fortawesome/free-solid-svg-icons' +} from "@fortawesome/free-solid-svg-icons"; -library.add(faArrowLeft, faEllipsisV, faPencilAlt, faPlus, faTrash, faPaperPlane, - faUserFriends, faTimes, faCheck, faVolumeMute, faHeart, faSearch, faArrowDown, - faMicrophone, faStopCircle, faPlay, faPause, faWrench - ) -const app = createApp(App) -app.component('FontAwesomeIcon', FontAwesomeIcon) +library.add( + faArrowLeft, + faEllipsisV, + faPencilAlt, + faPlus, + faTrash, + faPaperPlane, + faUserFriends, + faTimes, + faCheck, + faVolumeMute, + faHeart, + faSearch, + faArrowDown, + faMicrophone, + faStopCircle, + faPlay, + faPause, + faWrench +); +const app = createApp(App); +app.component("FontAwesomeIcon", FontAwesomeIcon); app.mixin({ methods: { linkify(content) { - return linkifyHTML( - content, - { - defaultProtocol: 'https', - rel: { - url: 'noopener noreferrer' - }, - target: { - url: '_blank' - }, - className: 'linkified', - ignoreTags: [ - 'script', - 'style' - ] - } - ); + return linkifyHTML(content, { + defaultProtocol: "https", + rel: { + url: "noopener noreferrer", + }, + target: { + url: "_blank", + }, + className: "linkified", + ignoreTags: ["script", "style"], + }); }, }, -}) +}); const gettext = createGettext({ defaultLanguage: "en", translations, }); app.use(gettext); -app.config.productionTip = false +app.config.productionTip = false; // set backend adress var websocketAdress = "ws://"; @@ -83,20 +93,18 @@ websocketAdress += "/ws"; // websocketAdress = 'ws://localhost:9080/ws'; // } // } -websocketAdress = 'ws://localhost:9080/ws'; +websocketAdress = "ws://localhost:9080/ws"; // initialise connection to the backend -app.use(VueNativeSock, websocketAdress, - { - store: store, - // format: 'json', - reconnection: true, // (Boolean) whether to reconnect automatically (false) - reconnectionAttempts: 5, // (Number) number of reconnection attempts before giving up (Infinity), - reconnectionDelay: 3000, // (Number) how long to initially wait before attempting a new (1000) } - } -) -app.use(store) -app.use(router) -app.mount('#app') +app.use(VueNativeSock, websocketAdress, { + store: store, + // format: 'json', + reconnection: true, // (Boolean) whether to reconnect automatically (false) + reconnectionAttempts: 5, // (Number) number of reconnection attempts before giving up (Infinity), + reconnectionDelay: 3000, // (Number) how long to initially wait before attempting a new (1000) } +}); +app.use(store); +app.use(router); +app.mount("#app"); -export default app +export default app; diff --git a/axolotl-web/src/pages/About.vue b/axolotl-web/src/pages/About.vue index f5507214c..eca8163c6 100644 --- a/axolotl-web/src/pages/About.vue +++ b/axolotl-web/src/pages/About.vue @@ -1,15 +1,14 @@