feat: settings & solid login

src/app/slices/auth.data.js

@@ -1,48 +1,72 @@
-import { createSlice } from '@reduxjs/toolkit';
-
+import { createSlice } from "@reduxjs/toolkit";
+import BASE_URL from "../config";
+import { getNonNullValues } from "../../common/utils";
 const initialState = {
- user: null,
- usersVersion: null,
- afterMid: null,
- token: null,
- refreshToken: null
+  user: null,
+  usersVersion: null,
+  afterMid: null,
+  token: null,
+  refreshToken: null,
 };
 const authDataSlice = createSlice({
- name: 'authData',
- initialState,
- reducers: {
-  setAuthData(state, action) {
-   const { user, token, refresh_token } = action.payload;
-   state.user = user;
-   state.token = token;
-   state.refreshToken = refresh_token;
+  name: "authData",
+  initialState,
+  reducers: {
+    setAuthData(state, action) {
+      const { user, token, refresh_token } = action.payload;
+      state.user = user;
+      state.token = token;
+      state.refreshToken = refresh_token;
+    },
+    updateLoginedUserByLogs(state, action) {
+      const logs = action.payload;
+      logs.forEach(({ action, uid, ...rest }) => {
+        switch (action) {
+          case "update":
+            {
+              const vals = getNonNullValues(rest);
+              console.log("update vals", vals);
+              if (Object.keys(vals).includes("avatar_updated_at")) {
+                vals.avatar = `${BASE_URL}/resource/avatar?uid=${uid}&t=${vals.avatar_updated_at}`;
+              }
+              state.user = { ...state.user, ...vals };
+            }
+
+            break;
+
+          default:
+            break;
+        }
+      });
+    },
+    clearAuthData(state) {
+      console.log("clear auth data");
+      state.user = null;
+      state.token = null;
+      state.refreshToken = null;
+    },
+    updateToken(state, action) {
+      const { token, refresh_token } = action.payload;
+      console.log("refresh token");
+      state.token = token;
+      state.refreshToken = refresh_token;
+    },
+    setUsersVersion(state, action) {
+      const { version } = action.payload;
+      state.usersVersion = version;
+    },
+    setAfterMid(state, action) {
+      const { mid } = action.payload;
+      state.afterMid = mid;
+    },
   },
-  clearAuthData(state) {
-   console.log('clear auth data');
-   state.user = null;
-   state.token = null;
-   state.refreshToken = null;
-   // 清掉本地缓存auth data
-   // localStorage.removeItem("AUTH_DATA");
-   // state.afterMid = null;
-   // state.usersVersion = null;
-  },
-  updateToken(state, action) {
-   const { token, refresh_token } = action.payload;
-   console.log('refresh token');
-   state.token = token;
-   state.refreshToken = refresh_token;
-  },
-  setUsersVersion(state, action) {
-   const { version } = action.payload;
-   state.usersVersion = version;
-  },
-  setAfterMid(state, action) {
-   const { mid } = action.payload;
-   state.afterMid = mid;
-  }
- }
 });
-export const { updateToken, setAuthData, clearAuthData, setUsersVersion, setAfterMid } =
- authDataSlice.actions;
+export const {
+  updateToken,
+  setAuthData,
+  clearAuthData,
+  setUsersVersion,
+  setAfterMid,
+  updateLoginedUserByLogs,
+} = authDataSlice.actions;
 export default authDataSlice.reducer;

src/app/slices/channels.js

@@ -14,6 +14,14 @@ const channelsSlice = createSlice({
         })
       );
     },
+
+    updateChannel(state, action) {
+      // console.log("set channels store", action);
+      const { id, name, description } = action.payload;
+      const oObj = state[id];
+      const newObj = { ...oObj, name, description };
+      state[id] = newObj;
+    },
     addChannel(state, action) {
       // console.log("set channels store", action);
       const ch = action.payload;
@@ -32,5 +40,10 @@ const channelsSlice = createSlice({
     // },
   },
 });
-export const { setChannels, addChannel, deleteChannel } = channelsSlice.actions;
+export const {
+  setChannels,
+  addChannel,
+  deleteChannel,
+  updateChannel,
+} = channelsSlice.actions;
 export default channelsSlice.reducer;

src/app/slices/contacts.js

@@ -1,4 +1,5 @@
 import { createSlice } from "@reduxjs/toolkit";
+import { getNonNullValues } from "../../common/utils";
 const initialState = [];
 const contactsSlice = createSlice({
   name: `contacts`,
@@ -9,6 +10,47 @@ const contactsSlice = createSlice({
       const contacts = action.payload || [];
       return contacts;
     },
+    removeContact(state, action) {
+      const uid = action.payload;
+      return state.filter((c) => c.uid != uid);
+    },
+    updateUsersByLogs(state, action) {
+      const changeLogs = action.payload;
+      changeLogs.forEach(({ action, uid, ...rest }) => {
+        switch (action) {
+          case "update":
+            {
+              const vals = getNonNullValues(rest);
+              console.log("update vals", vals);
+              const curr = state.find(({ uid: id }) => id == uid);
+              if (curr) {
+                Object.keys(vals).forEach((k) => {
+                  curr[k] = vals[k];
+                });
+              }
+            }
+            break;
+          case "create":
+            {
+              state.push({ uid, ...rest });
+            }
+            break;
+          case "delete":
+            {
+              const idx = state.findIndex((o) => {
+                return o.uid == uid;
+              });
+              if (idx > -1) {
+                state.splice(idx, 1);
+              }
+            }
+            break;
+
+          default:
+            break;
+        }
+      });
+    },
     updateUsersStatus(state, action) {
       const onlines = action.payload;
       onlines.forEach((item) => {
@@ -22,5 +64,10 @@ const contactsSlice = createSlice({
     },
   },
 });
-export const { setContacts, updateUsersStatus } = contactsSlice.actions;
+export const {
+  setContacts,
+  removeContact,
+  updateUsersByLogs,
+  updateUsersStatus,
+} = contactsSlice.actions;
 export default contactsSlice.reducer;

src/app/slices/ui.js

@@ -3,7 +3,6 @@ import { createSlice } from "@reduxjs/toolkit";
 const initialState = {
   menuExpand: true,
   setting: false,
-  profileSetting: false,
   channelSetting: null,
 };
 const uiSlice = createSlice({
@@ -16,9 +15,6 @@ const uiSlice = createSlice({
     toggleSetting(state) {
       state.setting = !state.setting;
     },
-    toggleProfileSetting(state) {
-      state.profileSetting = !state.profileSetting;
-    },
     toggleChannelSetting(state, action) {
       console.log("toggle channel setting payload", action);
       const id = action.payload;
@@ -29,7 +25,6 @@ const uiSlice = createSlice({
 export const {
   toggleSetting,
   toggleMenuExpand,
-  toggleProfileSetting,
   toggleChannelSetting,
 } = uiSlice.actions;
 export default uiSlice.reducer;