Add appearance option in settings (#1342)

* Add appearance option in settings
pull/1345/head
Yash Solanki 2 years ago committed by GitHub
parent 16145f18d9
commit c896bf9199
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,4 +1,4 @@
import type { DateRange, ViewMode } from '@ghostfolio/common/types'; import type { Appearance, DateRange, ViewMode } from '@ghostfolio/common/types';
import { import {
IsBoolean, IsBoolean,
IsIn, IsIn,
@ -47,4 +47,8 @@ export class UpdateUserSettingDto {
@IsIn(<ViewMode[]>['DEFAULT', 'ZEN']) @IsIn(<ViewMode[]>['DEFAULT', 'ZEN'])
@IsOptional() @IsOptional()
viewMode?: ViewMode; viewMode?: ViewMode;
@IsIn(<Appearance[]>['DARK', 'LIGHT'])
@IsOptional()
appearance?: Appearance;
} }

@ -13,6 +13,7 @@ import {
} from '@ghostfolio/common/config'; } from '@ghostfolio/common/config';
import { InfoItem, User } from '@ghostfolio/common/interfaces'; import { InfoItem, User } from '@ghostfolio/common/interfaces';
import { hasPermission, permissions } from '@ghostfolio/common/permissions'; import { hasPermission, permissions } from '@ghostfolio/common/permissions';
import { Appearance } from '@ghostfolio/common/types';
import { MaterialCssVarsService } from 'angular-material-css-vars'; import { MaterialCssVarsService } from 'angular-material-css-vars';
import { DeviceDetectorService } from 'ngx-device-detector'; import { DeviceDetectorService } from 'ngx-device-detector';
import { Subject } from 'rxjs'; import { Subject } from 'rxjs';
@ -77,6 +78,8 @@ export class AppComponent implements OnDestroy, OnInit {
permissions.createUserAccount permissions.createUserAccount
); );
this.initializeTheme(this.user?.settings.appearance);
this.changeDetectorRef.markForCheck(); this.changeDetectorRef.markForCheck();
}); });
} }
@ -97,10 +100,12 @@ export class AppComponent implements OnDestroy, OnInit {
this.unsubscribeSubject.complete(); this.unsubscribeSubject.complete();
} }
private initializeTheme() { private initializeTheme(userPreferredAppearance?: Appearance) {
this.materialCssVarsService.setDarkTheme( const isDarkTheme = userPreferredAppearance
window.matchMedia('(prefers-color-scheme: dark)').matches ? userPreferredAppearance === 'DARK'
); : window.matchMedia('(prefers-color-scheme: dark)').matches;
this.materialCssVarsService.setDarkTheme(isDarkTheme);
window.matchMedia('(prefers-color-scheme: dark)').addListener((event) => { window.matchMedia('(prefers-color-scheme: dark)').addListener((event) => {
this.materialCssVarsService.setDarkTheme(event.matches); this.materialCssVarsService.setDarkTheme(event.matches);

@ -167,7 +167,7 @@
</mat-form-field> </mat-form-field>
</div> </div>
</div> </div>
<div class="d-flex"> <div class="d-flex mb-2">
<div class="align-items-center d-flex pr-1 pt-1 w-50"> <div class="align-items-center d-flex pr-1 pt-1 w-50">
<ng-container i18n>View Mode</ng-container> <ng-container i18n>View Mode</ng-container>
</div> </div>
@ -190,6 +190,30 @@
</div> </div>
</div> </div>
</div> </div>
<div class="d-flex">
<div class="align-items-center d-flex pr-1 pt-1 w-50">
<ng-container i18n>Appearance</ng-container>
</div>
<div class="pl-1 w-50">
<mat-form-field
appearance="outline"
class="compact-with-outline w-100 without-hint"
>
<mat-select
name="appearance"
[disabled]="!hasPermissionToUpdateUserSettings"
[value]="user.settings.appearance"
(selectionChange)="onChangeUserSetting('appearance', $event.value)"
placeholder="AUTO"
class="with-placeholder-as-option"
>
<mat-option [value]="null">AUTO</mat-option>
<mat-option value="LIGHT">LIGHT</mat-option>
<mat-option value="DARK">DARK</mat-option>
</mat-select>
</mat-form-field>
</div>
</div>
</form> </form>
</div> </div>
<div class="align-items-center d-flex mt-4 py-1"> <div class="align-items-center d-flex mt-4 py-1">

@ -97,6 +97,12 @@ body {
color: rgba(var(--light-primary-text)); color: rgba(var(--light-primary-text));
} }
} }
.with-placeholder-as-option {
.mat-select-placeholder {
color: rgba(var(--light-primary-text));
}
}
} }
} }
@ -228,3 +234,9 @@ ngx-skeleton-loader {
.with-info-message { .with-info-message {
height: calc(100vh - 5rem - 3.5rem) !important; height: calc(100vh - 5rem - 3.5rem) !important;
} }
.with-placeholder-as-option {
.mat-select-placeholder {
color: rgba(var(--dark-primary-text));
}
}

@ -1,6 +1,7 @@
import { DateRange, ViewMode } from '@ghostfolio/common/types'; import { DateRange, ViewMode, Appearance } from '@ghostfolio/common/types';
export interface UserSettings { export interface UserSettings {
appearance?: Appearance;
baseCurrency?: string; baseCurrency?: string;
benchmark?: string; benchmark?: string;
dateRange?: DateRange; dateRange?: DateRange;

@ -0,0 +1 @@
export type Appearance = 'LIGHT' | 'DARK';

@ -9,6 +9,7 @@ import type { OrderWithAccount } from './order-with-account.type';
import type { RequestWithUser } from './request-with-user.type'; import type { RequestWithUser } from './request-with-user.type';
import { ToggleOption } from './toggle-option.type'; import { ToggleOption } from './toggle-option.type';
import type { ViewMode } from './view-mode.type'; import type { ViewMode } from './view-mode.type';
import type { Appearance } from './appearance.type';
export type { export type {
AccessWithGranteeUser, AccessWithGranteeUser,
@ -21,5 +22,6 @@ export type {
OrderWithAccount, OrderWithAccount,
RequestWithUser, RequestWithUser,
ToggleOption, ToggleOption,
ViewMode ViewMode,
Appearance
}; };

Loading…
Cancel
Save