Merge pull request #239 from projectcaluma/fix-emeis-alexandria

fix: display and configure emeis and alexandria
projectcaluma · Apr 29, 2022 · 9a65686 · 9a65686
2 parents 877632f + 243f4ff
commit 9a65686
Show file tree

Hide file tree

Showing 6 changed files with 904 additions and 159 deletions.
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ You have to add the following entry to your `/etc/hosts`:
 To start the project:
 ```bash
 docker-compose exec alexandria ./manage.py migrate
-docker-compose exec alexandria ./manage.py loaddata inital_data.json
+docker-compose exec alexandria ./manage.py loaddata initial_data.json
 ```
 
 ## Make commands

diff --git a/config/proxy/nginx.conf b/config/proxy/nginx.conf
@@ -29,11 +29,4 @@ server {
     set $caluma http://caluma:8000;
     proxy_pass $caluma;
   }
-
-  location / {
-    set $ember http://ember:80;
-    proxy_pass $ember;
-  }
 }
-
-
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
       - dbdata:/var/lib/postgresql/data
 
   emeis:
-    image: ghcr.io/projectcaluma/emeis:1.0.5@sha256:e3a778c3027be4e303e8c53cd6c123fb9cfc6cc7e4db9a3c230b027864e490dd
+    image: ghcr.io/projectcaluma/emeis:1.0.5
     depends_on:
       - db
     environment:
@@ -30,12 +30,14 @@ services:
       - ALLOWED_HOSTS=*
       - DATABASE_PASSWORD=emeis
       - DATABASE_USER=emeis
-      - ENV=dev
+      - ENV=production
       - ALLOW_ANONYMOUS_WRITE=true
       - LANGUAGES=de,en
+      - VISIBILITY_CLASSES=
+      - PERMISSION_CLASSES=
 
   alexandria:
-    image: projectcaluma/alexandria:version-0.2.1@sha256:900785fae96fbfb1d6cbe8efc17258715c9e263596002ff08d863286b0b1d397
+    image: projectcaluma/alexandria:version-0.2.1
     volumes:
         - "./config/alexandria/initial_data.json:/app/initial_data.json"
     depends_on:
@@ -47,9 +49,11 @@ services:
       - ALLOWED_HOSTS=*
       - DATABASE_PASSWORD=alexandria
       - DATABASE_USER=alexandria
-      - ENV=dev
+      - ENV=production
       - ALLOW_ANONYMOUS_WRITE=true
       - LANGUAGES=de,en
+      - VISIBILITY_CLASSES=
+      - PERMISSION_CLASSES=
 
   minio:
     image: minio/minio:latest
@@ -81,11 +85,9 @@ services:
       - minio
 
   caluma:
-    image: ghcr.io/projectcaluma/caluma:7.14.1@sha256:1eab696764cc0c3e3c3ef5289d7a267655c63165fce638aa4ec493ba168cfd80
+    image: ghcr.io/projectcaluma/caluma:7.15.2
     depends_on:
       - db
-    ports:
-      - "8000:8000"
     environment:
       - ENV=development
       - DATABASE_HOST=db

diff --git a/ember/app/components/nav-bar/template.hbs b/ember/app/components/nav-bar/template.hbs
@@ -10,5 +10,7 @@
   <UkTab as |tab|>
     <tab.item @href="/">{{t "nav.documents"}}</tab.item>
     <tab.item @href="/form-builder">{{t "nav.form-builder"}}</tab.item>
+    <tab.item @href="/alexandria">{{t "nav.alexandria"}}</tab.item>
+    <tab.item @href="/emeis">{{t "nav.emeis"}}</tab.item>
   </UkTab>
 </nav>
diff --git a/ember/package.json b/ember/package.json
@@ -19,7 +19,7 @@
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
     "start": "ember serve",
-    "start-proxy": "ember server --proxy http://localhost:8000/",
+    "start-proxy": "ember server --proxy http://localhost:8080/",
     "test": "npm-run-all lint:* test:*",
     "test:ember": "ember test"
   },
@@ -41,8 +41,8 @@
     "ember-apollo-client": "3.2.0",
     "ember-auto-import": "2.4.0",
     "ember-can": "4.1.0",
-    "ember-changeset": "4.0.0-beta.5",
-    "ember-changeset-validations": "4.0.0-beta.3",
+    "ember-changeset": "4.1.0",
+    "ember-changeset-validations": "4.1.0",
     "ember-cli": "3.28.5",
     "ember-cli-app-version": "5.0.0",
     "ember-cli-babel": "7.26.11",
@@ -99,7 +99,9 @@
     "webpack": "5.70.0"
   },
   "resolutions": {
-    "ember-engines": "https://gitpkg.now.sh/ember-engines/ember-engines/packages/ember-engines?4d8a7607ed690053f6e8ab4f35f9dfa543a3697f"
+    "ember-engines": "https://gitpkg.now.sh/ember-engines/ember-engines/packages/ember-engines?4d8a7607ed690053f6e8ab4f35f9dfa543a3697f",
+    "ember-uikit": "5.1.0",
+    "validated-changeset": "1.3.2"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"