Skip to content

Commit

Permalink
feat(analytics): add analytics and xapi-reporter (#1196)
Browse files Browse the repository at this point in the history
* feat(analytics): add reporter and analytics

* test(data): add test data

* test(h5proutes): increase timeout limit

* ci(reporter): run npm ci for reporter-client

* ci(reporter): fix workflow

* deps(reporter): update package-lock.json

* ci(build-win): fix reporter build

* fix(htmlexport): add missing include-reporter-dialog

* fix(launchpad): clicking on the card now opens the tool

* fix(menu): display different menus for h5peditor and analytics

* fix(analytics): use search for student names in placeholder

* fix(analytics): display title & content type in list

* fix(reporter): remove files from report-files

* feat(reporter): include timestamp in xAPI statements

* fix(analytics): show an error when importing data from different content

* fix(client): add noreferrer to links

* ci(reporter): build reporter-client

* ci(reporter): remove reporter unit-test

* fix(analytics): make search case insensitive

* fix(analytics): show human readable library name in non-composed content

* fix(analytics): blackout window after canceling import

* fix(reporter): add padding to content

* fix(reporter): handleSubmit when enter key is pressed

* fix(analytics): allow file + multiple selection when importing analytic

* chore(deps): update package lock
  • Loading branch information
JPSchellenberg committed Jan 31, 2021
1 parent 1866bd8 commit daa02d2
Show file tree
Hide file tree
Showing 258 changed files with 39,860 additions and 143 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: install
run: npm ci && (cd client && npm ci)
run: npm ci && (cd client && npm ci) && (cd reporter-client && npm ci)
- name: Build macOS
run: npm run build:mac:dev
env:
Expand Down Expand Up @@ -52,8 +52,8 @@ jobs:
NPM_TOKEN: $${ secrets.NPM_TOKEN }
- name: Copy NPM config
run: cp ./.npmrc ./client/.npmrc
- name: install client
run: cd client && npm ci
- name: install client(s)
run: (cd client && npm ci) && (cd ../reporter-client && npm ci)
env:
NPM_TOKEN: $${ secrets.NPM_TOKEN }
- name: Build Windows
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
- name: install labarchive-tools
run: sudo apt install libarchive-tools
- name: install
run: npm ci && (cd client && npm ci)
run: npm ci && (cd client && npm ci) && (cd reporter-client && npm ci)
- name: Build Linux
run: npm run build:linux:dev
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
env:
NPM_TOKEN: $${ secrets.NPM_TOKEN }
- name: Copy NPM config
run: cp ./.npmrc ./client/.npmrc
run: cp ./.npmrc ./client/.npmrc && cp ./.npmrc ./reporter-client/.npmrc
- name: install client
run: cd client && npm ci
run: (cd client && npm ci) && (cd reporter-client && npm ci)
env:
NPM_TOKEN: $${ secrets.NPM_TOKEN }
- name: build
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: install
run: npm ci && (cd client && npm ci)
run: npm ci && (cd client && npm ci) && (cd reporter-client && npm ci)
- name: Release
run: npm run semantic-release || true
env:
Expand Down Expand Up @@ -58,9 +58,9 @@ jobs:
env:
NPM_TOKEN: $${ secrets.NPM_TOKEN }
- name: Copy NPM config
run: cp ./.npmrc ./client/.npmrc
run: cp ./.npmrc ./client/.npmrc && cp ./.npmrc ./reporter-client/.npmrc
- name: install client
run: cd client && npm ci
run: (cd client && npm ci) && (cd reporter-client && npm ci)
env:
NPM_TOKEN: $${ secrets.NPM_TOKEN }
- name: Build
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
- name: install labarchive-tools
run: sudo apt install libarchive-tools
- name: install
run: npm ci && (cd client && npm ci)
run: npm ci && (cd client && npm ci) && (cd reporter-client && npm ci)
- name: Build
run: npm run build
- name: Install Snapcraft
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ jobs:
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: install
run: npm ci && (cd client && npm ci)
run: npm ci && (cd client && npm ci) && (cd reporter-client && npm ci)
- name: lint
run: npm run lint
- name: build:server
run: npm run build:server
- name: build:client
run: npm run build:client
run: npm run build:client && npm run build:reporter-client
- name: unit-tests
run: npm run test
env:
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ npm-debug.log*
build
coverage
dist
data/

# libraries
!test/build

# vscode
.vscode
Expand Down
1 change: 1 addition & 0 deletions builder.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ module.exports = {
files: [
'build/**/*',
'node_modules/**/*',
'reporter-client/build/static/js/**/*',
'package.json',
'h5p/**/*',
'electron/**/*'
Expand Down
Loading

0 comments on commit daa02d2

Please sign in to comment.