diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..17b7f84
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,110 @@
+---
+kind: pipeline
+type: docker
+name: verify
+steps:
+- name: install
+ image: danlynn/ember-cli:3.28.5-node_16.13
+ commands:
+ - npm ci
+- name: lint
+ image: danlynn/ember-cli:3.28.5-node_16.13
+ commands:
+ - npm run lint
+- name: dependency-lint
+ image: danlynn/ember-cli:3.28.5-node_16.13
+ failure: ignore
+ commands:
+ - ember dependency-lint
+- name: test
+ image: danlynn/ember-cli:3.28.5-node_16.13
+ failure: ignore
+ commands:
+ - npm run test:ember
+- name: build-dry-run
+ image: plugins/docker
+ settings:
+ repo: lblod/frontend-gelinkt-notuleren
+ dry_run: true
+ purge: true
+trigger:
+ event:
+ - pull_request
+---
+kind: pipeline
+type: docker
+name: push-latest-build
+steps:
+- name: push-latest-build
+ image: plugins/docker
+ settings:
+ repo: lblod/frontend-gelinkt-notuleren
+ username:
+ from_secret: docker_username
+ password:
+ from_secret: docker_password
+ purge: true
+trigger:
+ branch:
+ - master
+ event:
+ exclude:
+ - pull_request
+---
+kind: pipeline
+type: docker
+name: push-futurenow-build
+steps:
+- name: push-latest-build
+ image: plugins/docker
+ settings:
+ repo: lblod/frontend-gelinkt-notuleren
+ username:
+ from_secret: docker_username
+ password:
+ from_secret: docker_password
+ purge: true
+ tags: futurenow
+trigger:
+ branch:
+ - futurenow
+ event:
+ exclude:
+ - pull_request
+---
+kind: pipeline
+type: docker
+name: release
+steps:
+- name: build-dry-run
+ image: plugins/docker
+ settings:
+ repo: lblod/frontend-gelinkt-notuleren
+ dry_run: true
+ purge: true
+- name: push-tagged-build
+ image: plugins/docker
+ settings:
+ repo: lblod/frontend-gelinkt-notuleren
+ tags: ${DRONE_TAG##v}
+ username:
+ from_secret: docker_username
+ password:
+ from_secret: docker_password
+ purge: true
+trigger:
+ event:
+ - tag
+---
+kind: secret
+name: docker_username
+data: eqZ7xv8p/lyEuKiNorcbYdZFmlkZab3pDWZUdmDq2frKrb1WBv0qew==
+---
+kind: secret
+name: docker_password
+data: 9gIVFfRe6fST03CLSukPobVBNntis/JVzfJ9ytbXjPhfsP6FWVxLq9Y/lQ==
+---
+kind: signature
+hmac: 8aa13c8fab152c9ec612a1943122a258c652092674009112a1f18150cb8261c6
+
+...
diff --git a/.eslintrc.js b/.eslintrc.js
index 2250c19..2abac3b 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -20,6 +20,7 @@ module.exports = {
browser: true,
},
rules: {
+ 'ember/no-mixins': 'warn',
semi: [2, 'always'],
},
overrides: [
diff --git a/Dockerfile b/Dockerfile
index 434ceae..c54ae49 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,16 @@
-FROM madnificent/ember:3.15.1 as builder
+FROM madnificent/ember:3.28.5 as builder
LABEL maintainer="info@redpencil.io"
WORKDIR /app
COPY package.json .
-RUN npm install
+COPY package-lock.json .
+RUN npm ci
COPY . .
RUN ember build -prod
-FROM semtech/ember-proxy-service:1.4.0
+FROM semtech/ember-proxy-service:1.5.1
-ENV STATIC_FOLDERS_REGEX "^/(assets|font|files)/"
+ENV STATIC_FOLDERS_REGEX "^/(assets|font|files|@appuniversum)/"
COPY --from=builder /app/dist /app
\ No newline at end of file
diff --git a/README.md b/README.md
index 889ca83..be83e89 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,20 @@ To include in a semantic.works stack, include the following in docker-compose.ym
restart: always
```
+In order to be able to log in with mu-login in the dashboard, you should include the mu-login-service in your docker-compose.yml:
+```
+ login:
+ image: semtech/mu-login-service:2.9.1
+ links:
+ - database:database
+```
+dispatcher.ex should contain the following rule in order to get ember-mu-login working:
+```
+match "/sessions/*path", %{ accept: %{json: true} } do
+ Proxy.forward conn, path, "http://login/sessions/"
+end
+```
+
## Further Reading / Useful Links
* [ember.js](https://emberjs.com/)
diff --git a/app/components/mu-login.hbs b/app/components/mu-login.hbs
new file mode 100644
index 0000000..30daae1
--- /dev/null
+++ b/app/components/mu-login.hbs
@@ -0,0 +1,35 @@
+{{#if this.errorMessage}}
+
+ {{this.errorMessage}}
+
+{{/if}}
+
+
diff --git a/app/components/mu-login.js b/app/components/mu-login.js
new file mode 100644
index 0000000..e98ced3
--- /dev/null
+++ b/app/components/mu-login.js
@@ -0,0 +1,3 @@
+import MuLoginComponent from 'ember-mu-login/components/mu-login';
+
+export default class MyMuLoginComponent extends MuLoginComponent {}
diff --git a/app/routes/application.js b/app/routes/application.js
index 9aca013..9e64afe 100644
--- a/app/routes/application.js
+++ b/app/routes/application.js
@@ -1,10 +1,13 @@
import Route from '@ember/routing/route';
import { inject as service } from '@ember/service';
+import ENV from 'frontend-dashboard/config/environment';
export default class ApplicationRoute extends Route {
@service session;
beforeModel(transition) {
- this.session.requireAuthentication(transition, 'login');
+ const loginRoute =
+ ENV['routes'].login !== '{{LOGIN_ROUTE}}' ? ENV['routes'].login : 'login';
+ this.session.requireAuthentication(transition, loginRoute);
}
}
diff --git a/app/routes/errors.js b/app/routes/errors.js
index dd1c85f..56c44c1 100644
--- a/app/routes/errors.js
+++ b/app/routes/errors.js
@@ -2,10 +2,12 @@ import Route from '@ember/routing/route';
import DataTableRouteMixin from 'ember-data-table/mixins/route';
import { action } from '@ember/object';
import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
export default class ErrorsRoute extends Route.extend(DataTableRouteMixin) {
modelName = 'log-entry';
@tracked isLoading = false;
+ @service session;
queryParams = {
logLevelId: { refreshModel: true },
@@ -14,6 +16,10 @@ export default class ErrorsRoute extends Route.extend(DataTableRouteMixin) {
logDateTo: { refreshModel: true },
};
+ beforeModel(transition) {
+ this.session.requireAuthentication(transition, 'index');
+ }
+
@action
loading(transition /*, route*/) {
//This used to be on the controller, but accessing a controller shouldn't be done outside the setupController method.
diff --git a/app/routes/index.js b/app/routes/index.js
index 83a7dbf..e2715c0 100644
--- a/app/routes/index.js
+++ b/app/routes/index.js
@@ -1,10 +1,14 @@
import Route from '@ember/routing/route';
import { inject as service } from '@ember/service';
+import ENV from 'frontend-dashboard/config/environment';
export default class Index extends Route {
@service router;
-
- activate() {
- this.router.transitionTo('reports');
+ @service session;
+ activate(transition) {
+ const loginRoute =
+ ENV['routes'].login !== '{{LOGIN_ROUTE}}' ? ENV['routes'].login : 'login';
+ this.session.requireAuthentication(transition, loginRoute);
+ this.session.prohibitAuthentication('reports');
}
}
diff --git a/app/routes/login.js b/app/routes/login.js
index e1c475a..2d1e0a3 100644
--- a/app/routes/login.js
+++ b/app/routes/login.js
@@ -7,6 +7,11 @@ export default class LoginRoute extends Route {
beforeModel() {
this.session.prohibitAuthentication('index');
- this.router.transitionTo('mock-login');
}
+
+ queryParams = {
+ page: {
+ refreshModel: true,
+ },
+ };
}
diff --git a/app/routes/mock-login.js b/app/routes/mock-login.js
index 7147438..07e08b7 100644
--- a/app/routes/mock-login.js
+++ b/app/routes/mock-login.js
@@ -6,12 +6,6 @@ export default class MockLoginRoute extends Route {
@service store;
@service session;
- queryParams = {
- page: {
- refreshModel: true,
- },
- };
-
beforeModel() {
this.session.prohibitAuthentication('index');
}
diff --git a/app/routes/reports.js b/app/routes/reports.js
index 82f2d02..6dd8351 100644
--- a/app/routes/reports.js
+++ b/app/routes/reports.js
@@ -1,7 +1,14 @@
import Route from '@ember/routing/route';
import DataTableRouteMixin from 'ember-data-table/mixins/route';
+import { inject as service } from '@ember/service';
export default class IndexRoute extends Route.extend(DataTableRouteMixin) {
+ @service session;
+
+ beforeModel(transition) {
+ this.session.requireAuthentication(transition, 'index');
+ }
+
modelName = 'report';
queryParams = {
page: { refreshModel: true },
diff --git a/app/templates/login.hbs b/app/templates/login.hbs
index e2147ca..06b28f4 100644
--- a/app/templates/login.hbs
+++ b/app/templates/login.hbs
@@ -1 +1,6 @@
-{{outlet}}
\ No newline at end of file
+
+
+
{{t 'login.submit'}}
+
+
+