fix menu

.gitlab-ci.yml

@@ -56,6 +56,7 @@ build-ui:
                 - cd ui/hv2-ui
                 - if [ "$CI_COMMIT_TAG" != "" ]; then
                     sed -i -e 's/GITTAGVERSION/'"$CI_COMMIT_TAG"':'"$CI_COMMIT_SHORT_SHA"'/' ./src/app/navigation/navigation.component.html;
+                    sed -i -e 's,http://localhost:8080,https://api.hv.nober.de,' ./src/app/config.ts;
                   fi
                 - npm install
                 - ./node_modules/.bin/ng build --prod
@@ -97,6 +98,7 @@ dockerize-ui:
                 - docker rm $CONTAINER_NAME || echo "container not existing, never mind"
                 - docker run -d --network docker-server 
                                 --ip $CONTAINER_IP
+                                $VOLUMEOPT
                                 --name $CONTAINER_NAME
                                 --restart always 
                                 $IMAGE_NAME:$CI_COMMIT_TAG
@@ -107,6 +109,8 @@ deploy-api:
         variables:
                 IMAGE_NAME: ${CI_REGISTRY}/${CI_PROJECT_PATH}/api
                 CONTAINER_NAME: hv2-api
+                CONTAINER_IP: 172.16.10.38
+                VOLUMEOPT: -v hv2-api-conf:/opt/app/config
 
 deploy-ui:
         extends: 
@@ -114,3 +118,4 @@ deploy-ui:
         variables:
                 IMAGE_NAME: ${CI_REGISTRY}/${CI_PROJECT_PATH}/ui
                 CONTAINER_NAME: hv2-ui
+                CONTAINER_IP: 172.16.10.39

api/server.py

@@ -3,10 +3,16 @@ from flask_cors import CORS
 
 # instantiate the webservice
 app = connexion.App(__name__)
-app.add_api('openapi.yaml')
+app.add_api('openapi.yaml', options = {"swagger_ui": False})
 
 # CORSify it - otherwise Angular won't accept it
-CORS(app.app)
+CORS(app.app, 
+    origins=[
+        "http://localhost:4200",
+        "https://base.hv.nober.de"
+    ],
+    supports_credentials=True
+)
 
 # provide the webservice application to uwsgi
 application = app.app

ui/hv2-ui/src/app/navigation/navigation.component.html

@@ -4,17 +4,22 @@
       [mode]="(isHandset$ | async) ? 'over' : 'side'"
       [opened]="(isHandset$ | async) === false">
     <mat-toolbar>Menu</mat-toolbar>
-    <mat-nav-list>
+    <mat-nav-list *ngIf="!authenticated">
+      <a mat-list-item href="/login">Anmelden</a>
+    </mat-nav-list>
+    <mat-nav-list *ngIf="authenticated">
       <a mat-list-item href="/tenants">Meine Mieter/innen</a>
-    </mat-nav-list><mat-divider></mat-divider><mat-nav-list>
+    </mat-nav-list><mat-divider *ngIf="authenticated"></mat-divider><mat-nav-list *ngIf="authenticated">
       <a mat-list-item href="/flats">Meine Wohnungen</a>
       <a mat-list-item href="/parkings">Meine Garagen</a>
       <a mat-list-item href="/commercialunits">Meine Büros</a>
-    </mat-nav-list><mat-divider></mat-divider><mat-nav-list>
+    </mat-nav-list><mat-divider *ngIf="authenticated"></mat-divider><mat-nav-list *ngIf="authenticated">
       <a mat-list-item href="/overheadadvances">Betriebskostensätze</a>
       <a mat-list-item href="/fees">Mietsätze</a>
-    </mat-nav-list><mat-divider></mat-divider><mat-nav-list>
+    </mat-nav-list><mat-divider *ngIf="authenticated"></mat-divider><mat-nav-list *ngIf="authenticated">
       <a mat-list-item href="/premises">Meine Häuser</a>
+    </mat-nav-list><mat-divider *ngIf="authenticated"></mat-divider><mat-nav-list *ngIf="authenticated">
+      <a mat-list-item href="/logout">Abmelden</a>
     </mat-nav-list>
   </mat-sidenav>
   <mat-sidenav-content>
@@ -31,13 +36,11 @@
       <span class="spacer"></span>
       <span class="gittagversion">GITTAGVERSION</span>
       <span class="gittagversion" *ngIf="authenticated">Läuft aus in {{expiryTime | async }} Sekunden</span>
-      <a *ngIf="!authenticated" mat-button routerLink="/login">Login</a>
-      <a *ngIf="authenticated" mat-button routerLink="/logout">Logout</a>
     </mat-toolbar>
     <!-- Add Content Here -->
 
     <router-outlet></router-outlet>
-    <app-messages></app-messages>
+    <app-messages *ngIf="authenticated"></app-messages>
 
   </mat-sidenav-content>
 </mat-sidenav-container>