Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

format code with prettier and rustfmt #1056

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 39 additions & 40 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,44 +15,44 @@ 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.

## Installation

Axolotl can be installed through different means.

| Package | Maintainer | Comment |
| ------- | ---------- | -------- |
| <a href='https://open-store.io/app/textsecure.nanuc'><img width='130' alt="Get it from the OpenStore" src="https://open-store.io/badges/en_US.png"></a> | nanu-c | For Ubuntu Touch |
| <a href='https://snapcraft.io/axolotl'><img width='130' alt="Get it from the Snap Store" src="https://snapcraft.io/static/images/badges/en/snap-store-black.svg"></a> | nanu-c | For Ubuntu desktop |
| <a href='https://flathub.org/apps/details/org.nanuc.Axolotl'><img width='130' alt='Download on Flathub' src='https://flathub.org/assets/badges/flathub-badge-en.png'/></a> | olof-nord | https://github.com/flathub/org.nanuc.Axolotl |
| <a href='https://github.com/nanu-c/axolotl/releases'><img alt="mobian version" src="https://img.shields.io/badge/axolotl-deb-%23A80030"></a> | nuehm-arno | https://github.com/nanu-c/axolotl/releases <br>(Debian package in the Assets section)|
| Package | Maintainer | Comment |
| -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ------------------------------------------------------------------------------------- |
| <a href='https://open-store.io/app/textsecure.nanuc'><img width='130' alt="Get it from the OpenStore" src="https://open-store.io/badges/en_US.png"></a> | nanu-c | For Ubuntu Touch |
| <a href='https://snapcraft.io/axolotl'><img width='130' alt="Get it from the Snap Store" src="https://snapcraft.io/static/images/badges/en/snap-store-black.svg"></a> | nanu-c | For Ubuntu desktop |
| <a href='https://flathub.org/apps/details/org.nanuc.Axolotl'><img width='130' alt='Download on Flathub' src='https://flathub.org/assets/badges/flathub-badge-en.png'/></a> | olof-nord | https://github.com/flathub/org.nanuc.Axolotl |
| <a href='https://github.com/nanu-c/axolotl/releases'><img alt="mobian version" src="https://img.shields.io/badge/axolotl-deb-%23A80030"></a> | nuehm-arno | https://github.com/nanu-c/axolotl/releases <br>(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

Expand All @@ -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
Expand All @@ -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:

Expand Down
4 changes: 2 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ We are currently only supporting the latest version of axolotl

## Reporting a Vulnerability

Please send an e-mail to [email protected] explaining the vulnerability.
Please send an e-mail to [email protected] 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.
54 changes: 25 additions & 29 deletions axolotl-web/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
},
],
};
6 changes: 2 additions & 4 deletions axolotl-web/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
module.exports = {
presets: [
'@vue/cli-plugin-babel/preset'
]
}
presets: ["@vue/cli-plugin-babel/preset"],
};
41 changes: 37 additions & 4 deletions axolotl-web/gettext.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
};
56 changes: 43 additions & 13 deletions axolotl-web/index.html
Original file line number Diff line number Diff line change
@@ -1,29 +1,59 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="/favicon.ico">
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
<link rel="icon" href="/favicon.ico" />
<title>axolotl-web</title>
<script type="module" src="/src/main.js"></script>
</head>
<body>
<div id="initial-loader" style="position: fixed; top:0; left: 0; bottom: 0; right: 0; z-index: 2000; background-color: #2090ea; display: flex; justify-content: center; align-items:center;">
<div
id="initial-loader"
style="
position: fixed;
top: 0;
left: 0;
bottom: 0;
right: 0;
z-index: 2000;
background-color: #2090ea;
display: flex;
justify-content: center;
align-items: center;
"
>
<!-- SVG by Sam Herbert (@sherb), for everyone. More @ http://goo.gl/7AJzbL -->
<svg width="38" height="38" viewBox="0 0 38 38" xmlns="http://www.w3.org/2000/svg" stroke="#fff">
<svg
width="38"
height="38"
viewBox="0 0 38 38"
xmlns="http://www.w3.org/2000/svg"
stroke="#fff"
>
<g fill="none" fill-rule="evenodd">
<g transform="translate(1 1)" stroke-width="2">
<circle stroke-opacity=".5" cx="18" cy="18" r="18"></circle>
<path d="M36 18c0-9.94-8.06-18-18-18">
<animateTransform attributeName="transform" type="rotate" from="0 18 18" to="360 18 18" dur="1s" repeatCount="indefinite"></animateTransform>
</path>
</g>
<g transform="translate(1 1)" stroke-width="2">
<circle stroke-opacity=".5" cx="18" cy="18" r="18"></circle>
<path d="M36 18c0-9.94-8.06-18-18-18">
<animateTransform
attributeName="transform"
type="rotate"
from="0 18 18"
to="360 18 18"
dur="1s"
repeatCount="indefinite"
></animateTransform>
</path>
</g>
</g>
</svg>
</div>
<noscript>
<strong>We're sorry but axolotl-web doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
<strong
>We're sorry but axolotl-web doesn't work properly without JavaScript enabled. Please enable
it to continue.</strong
>
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
Expand Down
2 changes: 1 addition & 1 deletion axolotl-web/src/assets/dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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";
2 changes: 1 addition & 1 deletion axolotl-web/src/assets/light.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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";
13 changes: 6 additions & 7 deletions axolotl-web/src/assets/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
body {
font-size: 14px;
}
Loading
Loading