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

feat: set server URL via env vars, and improvements to README #280

Merged
merged 4 commits into from
May 4, 2021

Conversation

iloveitaly
Copy link
Contributor

This allows for iterating on the webui with local production data. Added a note to the readme about to set this up.

This made tinkering with the UI code much easier for me.

Copy link
Member

@ErikBjare ErikBjare left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Neat, thanks!

Just a few comments/edits, but I'll make them myself and merge right after.

.eslintrc.json Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
src/util/awclient.js Outdated Show resolved Hide resolved
vue.config.js Outdated Show resolved Hide resolved
@ErikBjare ErikBjare changed the title Allow client URL to be customized Allow server URL to be customized May 4, 2021
@codecov
Copy link

codecov bot commented May 4, 2021

Codecov Report

Merging #280 (0bbfd8b) into master (4f2139b) will increase coverage by 0.04%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #280      +/-   ##
==========================================
+ Coverage   15.86%   15.91%   +0.04%     
==========================================
  Files          22       22              
  Lines        1065     1062       -3     
  Branches      109      110       +1     
==========================================
  Hits          169      169              
+ Misses        852      848       -4     
- Partials       44       45       +1     
Impacted Files Coverage Δ
src/util/awclient.js 0.00% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4f2139b...0bbfd8b. Read the comment docs.

@ErikBjare ErikBjare changed the title Allow server URL to be customized feat: set server URL via env vars, and improvements to README May 4, 2021
@ErikBjare ErikBjare merged commit 165ec2f into ActivityWatch:master May 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants