Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
DlieBG committed Feb 19, 2022
1 parent 993cacf commit a6ec95a
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 3 deletions.
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ services:
frontend:
build: frontend
container_name: schwering_app_frontend
restart: unless-stopped
ports:
- 80:80
networks:
Expand All @@ -14,6 +15,7 @@ services:
backend:
build: backend
container_name: schwering_app_backend
restart: unless-stopped
env_file: .env

networks:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div class="card" (click)="openApp()">

<div class="widget" [class.loaded]="!loading" [hidden]="!app.widgetUrl">
<mat-progress-bar mode="indeterminate" *ngIf="loading"></mat-progress-bar>
<mat-progress-bar mode="indeterminate" color="accent" *ngIf="loading"></mat-progress-bar>
<iframe (load)="loaded()" [hidden]="loading" #iframe></iframe>
</div>

<div>
<h2>
{{ app.name }}
<span class="name">{{ app.name }}</span>
<mat-icon>{{ app.icon }}</mat-icon>
</h2>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,14 @@ h2 {
margin-bottom: 0em;
}

.name {
color: #d69bfd;
}

mat-icon {
float: right;
margin-top: .2em;
color: #ff5c5c;
}

p {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<mat-progress-bar mode="indeterminate" *ngIf="!(loginJwt && apps)"></mat-progress-bar>
<div class="body" *ngIf="loginJwt && apps">
<div class="content">
<h1>Hallo {{ loginJwt.name }}!</h1>
<h1>Hey <span class="name">{{ loginJwt.name }}</span></h1>

<div class="list">
<app-app-item class="app" *ngFor="let app of apps;" [app]="app"></app-app-item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
margin: 1em;
}

.name {
color: #84ffd1;
}

.list {
display: flex;
align-items: flex-start;
Expand Down

0 comments on commit a6ec95a

Please sign in to comment.