CBSNexora/cbsnexora
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: make configuration wizard work smoothly (#2332)

Browse Source 
This fixes a number of issues pointed out by the
ticket.

Fixes: WEB-14
This commit is contained in:
Felix van Hove
2025-03-18 11:20:07 -06:00
committed by GitHub
parent 08e3dfbf6e
commit 5b2148cebe
17 changed files with 98 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/core/shell/sidenav/sidenav.component.html
+1
View File
@@ -160,6 +160,7 @@
</div>
<ng-template #templateLogo let-popover="popover">
<h2>{{ 'labels.text.Home' | translate }}</h2>
<p class="mw300">{{ 'labels.text.Welcome page logo from anywhere' | translate }}</p>
<div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column">
<button mat-raised-button color="warn" (click)="popover.close(); configurationWizardService.closeConfigWizard()">
src/app/core/shell/toolbar/toolbar.component.html
+26 -26
View File
@@ -304,26 +304,6 @@
>
{{ 'labels.buttons.Back' | translate }}
</button>
<button mat-raised-button color="primary" (click)="popover.close(); showPopover(templateThemePicker, themePicker)">
{{ 'labels.buttons.Next' | translate }}
</button>
</div>
</ng-template>
<ng-template #templateThemePicker let-popover="popover">
<h2>{{ 'labels.menus.Theme Picker' | translate }}</h2>
<p class="mw300">{{ 'labels.text.Choose a theme as per organization will' | translate }}</p>
<div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column">
<button mat-raised-button color="warn" (click)="popover.close(); configurationWizardService.closeConfigWizard()">
{{ 'labels.buttons.Close' | translate }}
</button>
<button
mat-raised-button
color="primary"
(click)="popover.close(); showPopover(templateLanguageSelector, languageSelector)"
>
{{ 'labels.buttons.Back' | translate }}
</button>
<button
mat-raised-button
color="primary"
@@ -341,7 +321,31 @@
<button mat-raised-button color="warn" (click)="popover.close(); configurationWizardService.closeConfigWizard()">
{{ 'labels.buttons.Close' | translate }}
</button>
<button mat-raised-button color="primary" (click)="popover.close(); showPopover(templateThemePicker, themePicker)">
<button
mat-raised-button
color="primary"
(click)="popover.close(); showPopover(templateLanguageSelector, languageSelector)"
>
{{ 'labels.buttons.Back' | translate }}
</button>
<button mat-raised-button color="primary" (click)="popover.close(); showPopover(templateThemePicker, themeToggle)">
{{ 'labels.buttons.Next' | translate }}
</button>
</div>
</ng-template>
<ng-template #templateThemePicker let-popover="popover">
<h2>{{ 'labels.menus.Theme Picker' | translate }}</h2>
<p class="mw300">{{ 'labels.text.Choose to work with a dark or bright background' | translate }}</p>
<div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column">
<button mat-raised-button color="warn" (click)="popover.close(); configurationWizardService.closeConfigWizard()">
{{ 'labels.buttons.Close' | translate }}
</button>
<button
mat-raised-button
color="primary"
(click)="popover.close(); showPopover(templateNotifications, notifications)"
>
{{ 'labels.buttons.Back' | translate }}
</button>
<button mat-raised-button color="primary" (click)="popover.close(); showPopover(templateAppMenu, appMenu)">
@@ -357,11 +361,7 @@
<button mat-raised-button color="warn" (click)="popover.close(); configurationWizardService.closeConfigWizard()">
{{ 'labels.buttons.Close' | translate }}
</button>
<button
mat-raised-button
color="primary"
(click)="popover.close(); showPopover(templateNotifications, notifications)"
>
<button mat-raised-button color="primary" (click)="popover.close(); showPopover(templateThemePicker, themeToggle)">
{{ 'labels.buttons.Back' | translate }}
</button>
<button mat-raised-button color="primary" (click)="popover.close(); nextStep()">