Skip to content

darkmode saved in Storage #77

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
10 changes: 9 additions & 1 deletion src/data/dataApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const locationsUrl = '/assets/data/locations.json';
const HAS_LOGGED_IN = 'hasLoggedIn';
const HAS_SEEN_TUTORIAL = 'hasSeenTutorial';
const USERNAME = 'username';
const DARKMODE = 'darkMode';

export const getConfData = async () => {
const response = await Promise.all([
Expand Down Expand Up @@ -41,13 +42,16 @@ export const getUserData = async () => {
const response = await Promise.all([
Storage.get({ key: HAS_LOGGED_IN }),
Storage.get({ key: HAS_SEEN_TUTORIAL }),
Storage.get({ key: DARKMODE }),
Storage.get({ key: USERNAME })]);
const isLoggedin = await response[0].value === 'true';
const hasSeenTutorial = await response[1].value === 'true';
const username = await response[2].value || undefined;
const darkMode = await response[2].value === 'true';
const username = await response[3].value || undefined;
const data = {
isLoggedin,
hasSeenTutorial,
darkMode,
username
}
return data;
Expand All @@ -61,6 +65,10 @@ export const setHasSeenTutorialData = async (hasSeenTutorial: boolean) => {
await Storage.set({ key: HAS_SEEN_TUTORIAL, value: JSON.stringify(hasSeenTutorial) });
}

export const setDarkModeData = async (darkMode: boolean) => {
await Storage.set({ key: DARKMODE, value: JSON.stringify(darkMode) });
}

export const setUsernameData = async (username?: string) => {
if (!username) {
await Storage.remove({ key: USERNAME });
Expand Down
15 changes: 9 additions & 6 deletions src/data/user/user.actions.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getUserData, setIsLoggedInData, setUsernameData, setHasSeenTutorialData } from '../dataApi';
import { getUserData, setIsLoggedInData, setUsernameData, setHasSeenTutorialData, setDarkModeData } from '../dataApi';
import { ActionType } from '../../util/types';
import { UserState } from './user.state';

Expand Down Expand Up @@ -47,12 +47,15 @@ export const setHasSeenTutorial = (hasSeenTutorial: boolean) => async (dispatch:
type: 'set-has-seen-tutorial',
hasSeenTutorial
} as const);
}
}

export const setDarkMode = (darkMode: boolean) => ({
type: 'set-dark-mode',
darkMode
} as const);
export const setDarkMode = (darkMode: boolean) => async (dispatch: React.Dispatch<any>) => {
await setDarkModeData(darkMode);
return ({
type: 'set-dark-mode',
darkMode
} as const);
}

export type UserActions =
| ActionType<typeof setLoading>
Expand Down