Browse Source

Remove AUTO mode from api

pull/1342/head
yksolanki9 3 years ago
parent
commit
40506c7142
  1. 2
      apps/api/src/app/user/update-user-setting.dto.ts
  2. 5
      apps/api/src/app/user/user.service.ts
  3. 9
      apps/client/src/app/app.component.ts
  4. 4
      apps/client/src/app/pages/account/account-page.html
  5. 12
      apps/client/src/styles.scss
  6. 2
      libs/common/src/lib/types/appearance.type.ts

2
apps/api/src/app/user/update-user-setting.dto.ts

@ -48,7 +48,7 @@ export class UpdateUserSettingDto {
@IsOptional() @IsOptional()
viewMode?: ViewMode; viewMode?: ViewMode;
@IsIn(<Appearance[]>['AUTO', 'DARK', 'LIGHT']) @IsIn(<Appearance[]>['DARK', 'LIGHT'])
@IsOptional() @IsOptional()
appearance?: Appearance; appearance?: Appearance;
} }

5
apps/api/src/app/user/user.service.ts

@ -154,11 +154,6 @@ export class UserService {
(user.Settings.settings as UserSettings).viewMode = 'DEFAULT'; (user.Settings.settings as UserSettings).viewMode = 'DEFAULT';
} }
// Set default appearance value to AUTO
if (!(user.Settings.settings as UserSettings).appearance) {
(user.Settings.settings as UserSettings).appearance = 'AUTO';
}
if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) { if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
user.subscription = user.subscription =
this.subscriptionService.getSubscription(Subscription); this.subscriptionService.getSubscription(Subscription);

9
apps/client/src/app/app.component.ts

@ -100,11 +100,10 @@ export class AppComponent implements OnDestroy, OnInit {
this.unsubscribeSubject.complete(); this.unsubscribeSubject.complete();
} }
private initializeTheme(userPreferredAppearance: Appearance = 'AUTO') { private initializeTheme(userPreferredAppearance?: Appearance) {
const isDarkTheme = const isDarkTheme = userPreferredAppearance
userPreferredAppearance === 'DARK' || ? userPreferredAppearance === 'DARK'
(userPreferredAppearance === 'AUTO' && : window.matchMedia('(prefers-color-scheme: dark)').matches;
window.matchMedia('(prefers-color-scheme: dark)').matches);
this.materialCssVarsService.setDarkTheme(isDarkTheme); this.materialCssVarsService.setDarkTheme(isDarkTheme);

4
apps/client/src/app/pages/account/account-page.html

@ -204,8 +204,10 @@
[disabled]="!hasPermissionToUpdateUserSettings" [disabled]="!hasPermissionToUpdateUserSettings"
[value]="user.settings.appearance" [value]="user.settings.appearance"
(selectionChange)="onChangeUserSetting('appearance', $event.value)" (selectionChange)="onChangeUserSetting('appearance', $event.value)"
placeholder="AUTO"
class="with-placeholder-as-option"
> >
<mat-option value="AUTO">AUTO</mat-option> <mat-option [value]="null">AUTO</mat-option>
<mat-option value="LIGHT">LIGHT</mat-option> <mat-option value="LIGHT">LIGHT</mat-option>
<mat-option value="DARK">DARK</mat-option> <mat-option value="DARK">DARK</mat-option>
</mat-select> </mat-select>

12
apps/client/src/styles.scss

@ -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));
}
}

2
libs/common/src/lib/types/appearance.type.ts

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

Loading…
Cancel
Save