Skip to content

Initial aw-client-js support#62

Merged
johan-bjareholt merged 6 commits into
masterfrom
dev/aw-client-js
Apr 2, 2018
Merged

Initial aw-client-js support#62
johan-bjareholt merged 6 commits into
masterfrom
dev/aw-client-js

Conversation

@johan-bjareholt

Copy link
Copy Markdown
Member

Needs aw-client-js cloned to the root folder to work.

Needs the dev/axios branch of aw-client-js to work ActivityWatch/aw-client-js#2

@ErikBjare ErikBjare left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Except that one thing it looks good!

Comment thread src/views/Buckets.vue Outdated
getBucketInfo: function(bucket_id) {
$Bucket.get({"id": bucket_id}).then((response) => {
this.buckets[bucket_id] = response.json();
$Bucket.getBucket(bucket_id).then((response) => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Should be awclient.getBucket, same a couple of lines below.

@ErikBjare

ErikBjare commented Apr 1, 2018

Copy link
Copy Markdown
Member

Also:

  • Remove vue-resource from package.json
  • Update the aw-client-js submodule to the right commit

@johan-bjareholt
johan-bjareholt merged commit 2352a96 into master Apr 2, 2018
@ghost ghost removed the review label Apr 2, 2018
@johan-bjareholt
johan-bjareholt deleted the dev/aw-client-js branch April 2, 2018 19:20
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.

2 participants