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.

Sign up for GitHub

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

chore: add prettier and format project #100

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: add prettier and format project #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 2 additions & 7 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,10 @@ end_of_line = lf
trim_trailing_whitespace = true
charset = utf-8

# 2 spaces for JS, HTML and CSS/SASS
[*.{js,html,css,scss,sass,less}]
# 2 spaces for JS/JSON, HTML, CSS/SASS and Markdown
[*.{js,json,html,css,scss,sass,less,md}]
indent_size = 2

# 4 spaces for markdown
[*.md]
indent_size = 4
trim_trailing_whitespace = false

# Hard TAB for Makefile
[Makefile]
indent_style = tab
3 changes: 3 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ install:
update:
npm run build

format:
npm run format

clean:
rm -rf node_modules build
(cd aw-client-js; rm -rf node_modules)
Expand Down
12 changes: 6 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@

A cross-browser WebExtension that serves as a web browser watcher for [ActivityWatch][activitywatch].


## Usage

Install for your browser:

- [Chrome][chrome]
- ~~Firefox~~
- Due to Mozilla incompetency, the addon is no longer listed in the Mozilla Addons store (see [discussion #818][818]).
- ~~You can install the latest Mozilla-signed version [here][last-xpi].~~ (we are apparently not allowed to self-distribute this, see discussion linked above)
- You can also build from source, see [this comment][build-source-cmt] and instructions below.
- [Chrome][chrome]
- ~~Firefox~~
- Due to Mozilla incompetency, the addon is no longer listed in the Mozilla Addons store (see [discussion #818][818]).
- ~~You can install the latest Mozilla-signed version [here][last-xpi].~~ (we are apparently not allowed to self-distribute this, see discussion linked above)
- You can also build from source, see [this comment][build-source-cmt] and instructions below.

[activitywatch]: https://github.com/ActivityWatch/activitywatch
[firefox]: https://addons.mozilla.org/en-US/firefox/addon/aw-watcher-web/
Expand All @@ -26,6 +25,7 @@ Install for your browser:
### Firefox Enterprise Policy

Due to the issue mentioned above, a privacy notice has to be displayed to follow the Mozilla add-on policy. This can be pre-accepted by setting the following Firefox Enterprise Policy:

```json
{
"policies": {
Expand Down
5 changes: 1 addition & 4 deletions manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
},

"background": {
"scripts": [
"static/installed.js",
"out/app.js"
],
"scripts": ["static/installed.js", "out/app.js"],
"persistent": false
},

Expand Down
Loading