Skip to content

UI: Remove theme control settings. #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Maphikza merged 2 commits into from
Jul 3, 2025
+5 −8
Merged

UI: Remove theme control settings. #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c646226
remove theme control for launch
AnthonyMarin Jun 26, 2025
0ecb1aa
Merge branch 'main' into ui/remove-theme-settings
AnthonyMarin Jul 3, 2025
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
9 changes: 3 additions & 6 deletions ...ts/header/components/settingsDropdown/settingsOverlay/SettingsOverlay/SettingsOverlay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
import React, { useState, useEffect } from 'react';
import React from 'react';
import { Link } from 'react-router-dom';
import { DropdownCollapse } from '@app/components/header/Header.styles';
import { useTranslation } from 'react-i18next';
import { NightModeSettings } from '../nightModeSettings/NightModeSettings';
import { ThemePicker } from '../ThemePicker/ThemePicker';
import { BaseButton } from '@app/components/common/BaseButton/BaseButton';
import { useAppSelector } from '@app/hooks/reduxHooks';
import { useAppDispatch } from '@app/hooks/reduxHooks';
import { setShowAlert } from '@app/store/slices/pwaSlice';
import * as S from './SettingsOverlay.styles';
import { Alert } from 'antd';

export const SettingsOverlay: React.FC = ({ ...props }) => {
const { t } = useTranslation();
Expand All @@ -31,12 +28,12 @@ export const SettingsOverlay: React.FC = ({ ...props }) => {
return (
<S.SettingsOverlayMenu {...props}>
<DropdownCollapse bordered={false} expandIconPosition="end" ghost defaultActiveKey="themePicker">
<DropdownCollapse.Panel header={t('header.changeTheme')} key="themePicker">
{/* { <DropdownCollapse.Panel header={t('header.changeTheme')} key="themePicker">
<ThemePicker />
</DropdownCollapse.Panel>
<DropdownCollapse.Panel header={t('header.nightMode.title')} key="nightMode">
<NightModeSettings />
</DropdownCollapse.Panel>
</DropdownCollapse.Panel>} */}
</DropdownCollapse>
<S.Text>
<Link to="/logout">{t('header.logout')}</Link>
Expand Down
4 changes: 2 additions & 2 deletions src/store/slices/themeSlice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ interface ThemeState {
theme: ThemeType;
}

const preferredTheme = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
//const preferredTheme = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';

export const defaultTheme = (localStorage.getItem('theme') as ThemeType) || preferredTheme;
export const defaultTheme = 'dark';// Removing Support for preferred theme detection for launch

localStorage.setItem('theme', defaultTheme);

Expand Down
Loading