Skip to content

Commit cab70ae

Browse files
committed
Moved toolbar to the right
1 parent aa20fe8 commit cab70ae

File tree

10 files changed

+397
-347
lines changed

10 files changed

+397
-347
lines changed
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
<mat-checkbox [checked]="hideCompleted()" (change)="toggleHideCompleted()">
2-
{{ TranslationConstants.OPERATIONS.FILTERS.HIDE_COMPLETED | translate }}
3-
</mat-checkbox>
1+
<p>
2+
<mat-slide-toggle [checked]="hideCompleted()" (change)="toggleHideCompleted()">
3+
{{ TranslationConstants.OPERATIONS.FILTERS.HIDE_COMPLETED | translate }}
4+
</mat-slide-toggle>
5+
</p>

src/Moryx.Orders.Web/app/src/app/components/operations/operations-filter/operations-filter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { Component, inject } from '@angular/core';
2-
import { MatCheckbox } from '@angular/material/checkbox';
32
import { FilterService } from '../../../services/filter.service';
43
import { toSignal } from '@angular/core/rxjs-interop';
54
import { TranslationConstants } from '../../../extensions/translation-constants.extensions';
65
import { TranslateModule } from '@ngx-translate/core';
6+
import { MatSlideToggleModule } from '@angular/material/slide-toggle';
77

88
@Component({
99
selector: 'app-operations-filter',
1010
imports: [
11-
MatCheckbox,
11+
MatSlideToggleModule,
1212
TranslateModule
1313
],
1414
templateUrl: './operations-filter.html',

src/Moryx.Orders.Web/app/src/app/components/operations/operations.html

Lines changed: 318 additions & 310 deletions
Large diffs are not rendered by default.

src/Moryx.Orders.Web/app/src/app/components/operations/operations.scss

Lines changed: 51 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,6 @@
22
@use "@moryx/ngx-web-framework/styles/variables" as *;
33
@use 'sass:map';
44

5-
.toolbar-spacer {
6-
flex: 1 1 auto;
7-
}
8-
9-
.toolbar {
10-
.icon-button {
11-
width: 40px;
12-
height: 40px;
13-
padding: 8px;
14-
display: inline-flex;
15-
align-items: center;
16-
justify-content: center;
17-
box-sizing: border-box;
18-
}
19-
}
20-
215
.multi-progress-container {
226
display: flex;
237
width: 100%;
@@ -143,10 +127,6 @@ mat-grid-list {
143127
width: 840px;
144128
}
145129

146-
.operation-progress mat-progress-bar {
147-
height: 6px;
148-
}
149-
150130
.operation-title {
151131
margin: 0px;
152132
font-weight: bold;
@@ -258,8 +238,56 @@ mat-grid-list {
258238
}
259239
}
260240

261-
.fab-flex-container {
241+
.sidenav-container {
242+
@include mat.sidenav-overrides((
243+
container-background-color: white,
244+
));
245+
height: 100%;
246+
}
247+
248+
.sidenav-toolbar {
249+
width: auto;
250+
}
251+
252+
.sidenav-toolbar-buttons {
262253
display: flex;
263-
flex-direction: row;
264-
gap: 8px;
254+
flex-direction: column;
255+
padding: 12px 0;
256+
gap: 12px;
257+
}
258+
259+
.sidenav-toolbar-item {
260+
display: flex;
261+
flex-direction: column;
262+
align-items: center;
263+
gap: 4px;
264+
padding: 4px 12px;
265+
cursor: pointer;
266+
text-decoration: none;
267+
color: inherit;
268+
269+
.material-symbols-outlined {
270+
font-size: 24px;
271+
width: 56px;
272+
height: 32px;
273+
display: flex;
274+
align-items: center;
275+
justify-content: center;
276+
border-radius: 16px;
277+
transition: background-color 0.2s;
278+
}
279+
280+
.label {
281+
font-size: 12px;
282+
text-align: center;
283+
color: rgba(0, 0, 0, 0.87);
284+
}
285+
286+
&:hover .material-symbols-outlined {
287+
background-color: rgba(0, 0, 0, 0.08);
288+
}
289+
290+
&:active .material-symbols-outlined {
291+
background-color: rgba(0, 0, 0, 0.12);
292+
}
265293
}

src/Moryx.Orders.Web/app/src/app/extensions/translation-constants.extensions.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ export class TranslationConstants {
6262
FAILED_LOADING: 'OPERATIONS.FAILED_LOADING',
6363
EMPTY_STATE_HEADER: 'OPERATIONS.EMPTY_STATE_HEADER',
6464
EMPTY_STATE_TEXT: 'OPERATIONS.EMPTY_STATE_TEXT',
65+
CREATE: 'OPERATIONS.CREATE',
66+
FILTER: 'OPERATIONS.FILTER',
6567
};
6668

6769
public static readonly RECIPES = {

src/Moryx.Orders.Web/app/src/assets/languages/de.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@
4848
"EMPTY_LOG": "Dieses Protokoll ist leer",
4949
"FAILED_LOADING": "Die Verbindung zum Server ist leider fehlgeschlagen. Bitte überprüfe deine Netzwerkverbindung oder versuch es später nochmal.",
5050
"EMPTY_STATE_HEADER": "Keine Aufträge",
51-
"EMPTY_STATE_TEXT": "Um einen Auftrag zu erstellen klicke auf das Plus und starte die Konfiguration."
51+
"EMPTY_STATE_TEXT": "Um einen Auftrag zu erstellen klicke auf das Plus und starte die Konfiguration.",
52+
"CREATE": "Erstellen",
53+
"FILTER": "Filter"
5254
},
5355
"RECIPES": {
5456
"RECIPES_OF": "Rezepte von",

src/Moryx.Orders.Web/app/src/assets/languages/en.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@
4848
"EMPTY_LOG": "This log is empty",
4949
"FAILED_LOADING": "The connection to the server could not be established. Please check your network connection or try again later.",
5050
"EMPTY_STATE_HEADER": "No Orders",
51-
"EMPTY_STATE_TEXT": "To create an order click on the plus sign and start the configuration."
51+
"EMPTY_STATE_TEXT": "To create an order click on the plus sign and start the configuration.",
52+
"CREATE": "Create",
53+
"FILTER": "Filter"
5254
},
5355
"RECIPES": {
5456
"RECIPES_OF": "Recipes of",

src/Moryx.Orders.Web/app/src/assets/languages/it.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@
4848
"EMPTY_LOG": "Questo registro è vuoto",
4949
"FAILED_LOADING": "Non è stato possibile stabilire la connessione al server. Controllare la connessione di rete o riprovare più tardi.",
5050
"EMPTY_STATE_HEADER": "Nessun ordine",
51-
"EMPTY_STATE_TEXT": "Per creare un ordine, fare clic sul segno più e avviare la configurazione."
51+
"EMPTY_STATE_TEXT": "Per creare un ordine, fare clic sul segno più e avviare la configurazione.",
52+
"CREATE": "Crea",
53+
"FILTER": "Filtro"
5254
},
5355
"RECIPES": {
5456
"RECIPES_OF": "Ricette di",

src/Moryx.Orders.Web/app/src/assets/languages/zh.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@
4848
"EMPTY_LOG": "此日志为空",
4949
"FAILED_LOADING": "无法建立与服务器的连接。请检查您的网络连接或稍后重试。",
5050
"EMPTY_STATE_HEADER": "没有订单",
51-
"EMPTY_STATE_TEXT": "单击加号创建订单并开始配置。"
51+
"EMPTY_STATE_TEXT": "单击加号创建订单并开始配置。",
52+
"CREATE": "创建",
53+
"FILTER": "筛选"
5254
},
5355
"RECIPES": {
5456
"RECIPES_OF": "配方 -",
Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
@use "@moryx/ngx-web-framework/styles/theme.scss" as *;
2+
@use "@angular/material" as mat;
3+
html, body {
4+
height: 100%;
5+
}
26

3-
html, body { height: 100%;}
4-
body { margin: 0; overflow: hidden; }
5-
6-
.toolbar-gradient-background {
7-
background: linear-gradient(90deg, rgba(0,0,0,0.8016456582633054) 0%, rgba(9,9,121,0) 50%);
7+
body {
8+
margin: 0;
9+
overflow: hidden;
810
}

0 commit comments

Comments
 (0)