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

Initial aw-client-js support #62

Merged
merged 6 commits into from Apr 2, 2018

Conversation

Projects
None yet
2 participants
@johan-bjareholt
Copy link
Member

johan-bjareholt commented Mar 28, 2018

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

@wafflebot wafflebot bot added the review label Mar 28, 2018

@johan-bjareholt johan-bjareholt requested a review from ErikBjare Mar 28, 2018

@ErikBjare ErikBjare referenced this pull request Apr 1, 2018

Merged

Added query explorer #64

3 of 4 tasks complete
@ErikBjare
Copy link
Member

ErikBjare left a comment

Except that one thing it looks good!

buckets = _.orderBy(buckets, [(b) => b.last_updated], ["desc"]);
this.buckets = buckets;
});
},
getBucketInfo: function(bucket_id) {
$Bucket.get({"id": bucket_id}).then((response) => {
this.buckets[bucket_id] = response.json();
$Bucket.getBucket(bucket_id).then((response) => {

This comment has been minimized.

@ErikBjare

ErikBjare Apr 1, 2018

Member

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

@ErikBjare

This comment has been minimized.

Copy link
Member

ErikBjare commented Apr 1, 2018

Also:

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

johan-bjareholt added some commits Apr 2, 2018

@johan-bjareholt johan-bjareholt merged commit 2352a96 into master Apr 2, 2018

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@wafflebot wafflebot bot removed the review label Apr 2, 2018

@johan-bjareholt johan-bjareholt deleted the dev/aw-client-js branch Apr 2, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment