Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
5d89067
implemented basic classification visualization
ErikBjare Sep 21, 2019
9536e63
added prettierrc and ran it through some files
ErikBjare Sep 21, 2019
a4952ce
fixed category hierarchy bug
ErikBjare Sep 21, 2019
05f89db
comments and changed default classes
ErikBjare Sep 21, 2019
9e400b5
Merge branch 'master' into dev/classify
ErikBjare Sep 21, 2019
7effc78
massive refactor, split up ActivityDaily into subroutes/views
ErikBjare Oct 1, 2019
8ae6cd5
cleanup & refactoring
ErikBjare Oct 1, 2019
8aa2463
refactoring
ErikBjare Oct 1, 2019
199950d
created basic vuex store
ErikBjare Oct 1, 2019
3e51020
fixed ErrorBoundary component
ErikBjare Oct 1, 2019
314da26
added basic settings for editing classification rules
ErikBjare Oct 1, 2019
ba7ba26
improved classifier settings
ErikBjare Oct 1, 2019
3031ecd
fixed Summary view
ErikBjare Oct 1, 2019
5f2a26f
lots of changes: improved look of settings for categories (WIP), more…
ErikBjare Oct 2, 2019
fc950e7
improved eslint setup (now with typescript support!)
ErikBjare Oct 2, 2019
44d1770
type annotated classes.ts
ErikBjare Oct 2, 2019
9a53d88
moved daily queries into vuex
ErikBjare Oct 3, 2019
5d1ac53
fixed bugs, renamed aw-sunburst to aw-sunburst-clock
ErikBjare Oct 4, 2019
e746643
fixed categorization stuff to be up-to-date with latest changes to aw…
ErikBjare Oct 7, 2019
49ad8c9
major refactoring (more vuex)
ErikBjare Oct 14, 2019
1aa56bb
fixed a few bugs
ErikBjare Oct 14, 2019
3e5aebe
updated aw-client-js
ErikBjare Oct 14, 2019
663f61c
added basic ability to edit categories
ErikBjare Oct 14, 2019
a60ed2b
switched to using vue cli for easier config and tooling
ErikBjare Oct 14, 2019
b95115d
config fixes
ErikBjare Oct 14, 2019
3a5a5c6
improved vue cli support
ErikBjare Oct 14, 2019
2b8bcbd
Merge branch 'master' into dev/classify
ErikBjare Oct 18, 2019
53b5792
added category sunburst
ErikBjare Oct 18, 2019
3ac9190
finishing touches on category editor and other category stuff
ErikBjare Oct 19, 2019
de892d2
fixed bug when clicking date in date browser in daily view (and clean…
ErikBjare Oct 19, 2019
102f8f3
fixed bug and moved sunburst to same row as rest of category visualiz…
ErikBjare Oct 19, 2019
205cb51
removed no longer needed ./build/ and ./dist/ folders
ErikBjare Oct 19, 2019
35f26bf
fixed broken vue.config.js
ErikBjare Oct 19, 2019
c0a66d4
fixed bug when renaming category with children
ErikBjare Oct 19, 2019
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
16 changes: 0 additions & 16 deletions .babelrc

This file was deleted.

45 changes: 39 additions & 6 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,33 @@
{
"plugins": ["vue", "jest"],
"plugins": ["prettier", "vue", "jest", "@typescript-eslint"],
"extends": [
"eslint:recommended",
"prettier",
"plugin:vue/essential",
"plugin:jest/recommended"
"eslint:recommended",
"plugin:vue/recommended",
"@vue/typescript",
"plugin:jest/recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/eslint-recommended"
],
"rules": {
"prettier/prettier": "off",
"vue/require-default-prop": "off",
"@typescript-eslint/camelcase": ["off"],
"@typescript-eslint/explicit-function-return-type": ["off"],
"@typescript-eslint/no-var-requires": ["off"],
"no-shadow": [
"error",
{
"builtinGlobals": true,
"allow": ["name", "Promise", "event"]
"allow": ["name", "Promise", "event", "parent"]
}
],
"no-console": ["off"]
"no-console": ["off"],
"prefer-const": "warn",
"no-var": "warn"
},
"parser": "vue-eslint-parser",
"parserOptions": {
"ecmaVersion": 2017,
"sourceType": "module"
Expand All @@ -24,5 +37,25 @@
},
"globals": {
"PRODUCTION": false
}
},
"overrides": [
{
"files": [".*\\.vue$"],
"parserOptions": {
"parser": "vue-eslint-parser"
}
},
{
"files": [".*\\.js$"],
"parserOptions": {
"parser": "babel-eslint"
}
},
{
"files": [".*\\.ts$"],
"parserOptions": {
"parser": "@typescript-eslint/parser"
}
}
]
}
4 changes: 4 additions & 0 deletions .prettierrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
singleQuote: true
trailingComma: 'es5'
tabWidth: 2
printWidth: 100
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: node_js
node_js:
- "8"
- "node"

cache:
directories:
- "$HOME/.npm"
Expand All @@ -15,4 +15,5 @@ install:
- "make install"

script:
- "make test"
- "make build"
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ uninstall:
rm -r node_modules/

dev:
npm run dev
npm run serve

test:
babel-node test.js
npm test

clean:
rm -rf node_modules dist
Expand All @@ -24,4 +24,4 @@ lint:
npx eslint --ext=js,vue src/

aw-client-js:
(cd aw-client-js; make build)
make --directory=aw-client-js build
2 changes: 1 addition & 1 deletion aw-client-js
Submodule aw-client-js updated 1 files
+1 −0 tsconfig.json
6 changes: 6 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
// TODO: We should try to switch to the @vue/app preset, but right now it breaks everything
//presets: ['@vue/app'],
plugins: ['lodash', '@babel/plugin-syntax-dynamic-import'],
comments: false,
};
35 changes: 0 additions & 35 deletions build/build.js

This file was deleted.

9 changes: 0 additions & 9 deletions build/dev-client.js

This file was deleted.

65 changes: 0 additions & 65 deletions build/dev-server.js

This file was deleted.

47 changes: 0 additions & 47 deletions build/package_electron.js

This file was deleted.

53 changes: 0 additions & 53 deletions build/utils.js

This file was deleted.

Loading