Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ export class DfApiDocsTableComponent extends DfManageTableComponent<ApiDocsRowDa
}

override mapDataToTable(data: Service[]): ApiDocsRowData[] {
return data.map(val => {
const sortedData = data.sort((a, b) => a.id - b.id);
return sortedData.map(val => {
const type = this.getServiceType(val.type);
return {
name: val.name,
Expand Down
9 changes: 9 additions & 0 deletions src/app/adf-user-management/adf-user-management.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,12 @@
}
}
}

.user-management-card-container {
margin-top: 30%;

&.dark-theme {
background-color: #1e1e1e;
color: #fff;
}
}
4 changes: 3 additions & 1 deletion src/app/adf-user-management/df-login/df-login.component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<div class="user-management-card-container">
<div
class="user-management-card-container"
[class]="(isDarkMode | async) ? 'dark-theme' : ''">
<div class="left-panel">
<img
src="../../../assets/img/logo.png"
Expand Down
8 changes: 7 additions & 1 deletion src/app/adf-user-management/df-login/df-login.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ import { MatCardModule } from '@angular/material/card';
import { TranslocoPipe } from '@ngneat/transloco';
import { AuthService, LdapService } from 'src/app/shared/types/service';
import { UntilDestroy } from '@ngneat/until-destroy';
import { DfThemeService } from 'src/app/shared/services/df-theme.service';
import { CommonModule } from '@angular/common';
@UntilDestroy({ checkProperties: true })
@Component({
selector: 'df-user-login',
Expand All @@ -51,6 +53,7 @@ import { UntilDestroy } from '@ngneat/until-destroy';
RouterLink,
FontAwesomeModule,
TranslocoPipe,
CommonModule,
],
})
export class DfLoginComponent implements OnInit {
Expand All @@ -65,12 +68,15 @@ export class DfLoginComponent implements OnInit {

fpRoute = `/${ROUTES.AUTH}/${ROUTES.FORGOT_PASSWORD}`;

isDarkMode = this.themeService.darkMode$;

loginForm: FormGroup;
constructor(
private fb: FormBuilder,
private systemConfigDataService: DfSystemConfigDataService,
private authService: DfAuthService,
private router: Router
private router: Router,
private themeService: DfThemeService
) {
this.loginForm = this.fb.group({
services: [''],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ $red-palette: mat.define-palette(mat.$red-palette);
padding: 8px 20px 24px;
background: #f6f2fa;
.content-wrapper {
height: 100%;
padding: 2px;
border: 1px solid #f6f2fa;
background-color: #f6f2fa;
Expand Down Expand Up @@ -248,7 +249,8 @@ $red-palette: mat.define-palette(mat.$red-palette);
}

.breadcrumb-link {
color: white;
color: inherit;
text-decoration: none;
}

.dark-theme {
Expand Down