chore: update workspace store

This commit is contained in:
Steven
2023-09-23 08:54:27 +08:00
parent 0df3164654
commit f0ffe2e419
8 changed files with 76 additions and 56 deletions

View File

@ -8,7 +8,7 @@ import useUserStore from "./stores/v1/user";
import { WorkspaceSetting } from "./types/proto/api/v2/workspace_service";
function App() {
const { mode } = useColorScheme();
const { mode: colorScheme } = useColorScheme();
const userStore = useUserStore();
const [workspaceSetting, setWorkspaceSetting] = useState<WorkspaceSetting>(WorkspaceSetting.fromPartial({}));
const [loading, setLoading] = useState(true);
@ -51,9 +51,9 @@ function App() {
useEffect(() => {
const root = document.documentElement;
if (mode === "light") {
if (colorScheme === "light") {
root.classList.remove("dark");
} else if (mode === "dark") {
} else if (colorScheme === "dark") {
root.classList.add("dark");
} else {
const darkMediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
@ -80,7 +80,7 @@ function App() {
darkMediaQuery.removeEventListener("change", handleColorSchemeChange);
};
}
}, [mode]);
}, [colorScheme]);
return !loading ? (
<>

View File

@ -9,7 +9,7 @@ import { WorkspaceSetting } from "@/types/proto/api/v2/workspace_service";
const WorkspaceSection: React.FC = () => {
const [workspaceSetting, setWorkspaceSetting] = useState<WorkspaceSetting>(WorkspaceSetting.fromPartial({}));
const originalWorkspaceSetting = useRef<WorkspaceSetting>(WorkspaceSetting.fromPartial({}));
const allowToSave = !isEqual(originalWorkspaceSetting.current, workspaceSetting);
const allowSave = !isEqual(originalWorkspaceSetting.current, workspaceSetting);
useEffect(() => {
workspaceServiceClient.getWorkspaceSetting({}).then(({ setting }) => {
@ -86,7 +86,7 @@ const WorkspaceSection: React.FC = () => {
<p className="mt-2 text-gray-500">Once enabled, other users can signup.</p>
</div>
<div>
<Button variant="outlined" color="neutral" disabled={!allowToSave} onClick={handleSaveWorkspaceSetting}>
<Button variant="outlined" color="neutral" disabled={!allowSave} onClick={handleSaveWorkspaceSetting}>
Save
</Button>
</div>

View File

@ -3,9 +3,9 @@ import React, { FormEvent, useEffect, useState } from "react";
import { toast } from "react-hot-toast";
import { useTranslation } from "react-i18next";
import { Link, useNavigate } from "react-router-dom";
import { workspaceService } from "@/services";
import * as api from "../helpers/api";
import useLoading from "../hooks/useLoading";
import { useAppSelector } from "../stores";
import useUserStore from "../stores/v1/user";
const SignIn: React.FC = () => {
@ -14,7 +14,7 @@ const SignIn: React.FC = () => {
const userStore = useUserStore();
const {
workspaceProfile: { enableSignup, mode },
} = useAppSelector((state) => state.global);
} = workspaceService.getState();
const [email, setEmail] = useState("");
const [password, setPassword] = useState("");
const actionBtnLoadingState = useLoading(false);

View File

@ -5,7 +5,7 @@ import { setWorkspaceState } from "../stores/modules/workspace";
const workspaceService = {
getState: () => {
return store.getState().global;
return store.getState().workspace;
},
initialState: async () => {

View File

@ -1,11 +1,11 @@
import { configureStore } from "@reduxjs/toolkit";
import { TypedUseSelectorHook, useSelector } from "react-redux";
import shortcutReducer from "./modules/shortcut";
import globalReducer from "./modules/workspace";
import workspaceReducer from "./modules/workspace";
const store = configureStore({
reducer: {
global: globalReducer,
workspace: workspaceReducer,
shortcut: shortcutReducer,
},
});