Merge branch 'master' into err_circles

components/ui/AddServer.tsx

@@ -61,7 +61,6 @@ export default function AddServerModal({
                   username,
                   proposedPassword,
                 });
-                console.log(data);
                 onClose(false);
               }}
             >

framework/common/c2s/useGetAccountInfo_c2s.ts

@@ -0,0 +1,12 @@
+import { MutationHook } from '@common/types/hooks';
+import { useHook, useMutationHook } from '@common/utils/useHook';
+
+export type UseGetAccountinfo<H extends MutationHook = MutationHook<any>> =
+  ReturnType<H['useHook']>;
+
+const useRegister_c2s: UseGetAccountinfo = () => {
+  const hook = useHook((hooks) => hooks.c2s.useGetAccountInfo);
+  return useMutationHook({ ...hook })();
+};
+
+export default useRegister_c2s;

pages/_app.tsx

@@ -53,9 +53,7 @@ function CustomApp({
         const key = Object.keys(data).at(0)!;
         const payload = data[key];
 
-        console.log('Stream_packet', payload);
         const req_id = payload.request_id;
-        console.log('ReqID stream', req_id);
         handlePacket(req_id, payload);
       }
     );
@@ -66,19 +64,14 @@ function CustomApp({
   }, []);
 
   const handlePacket = (req_id: string, payload: { [key: string]: any }) => {
-    console.log('ReqID', req_id);
-    console.log('Payload', payload);
     const { context: map } = store.getState();
-    console.log('Map', map);
     const context = map.context[req_id];
-    console.log('Context', context);
 
     if (context) {
       switch (context) {
         case 'GetSession':
           const activeSessions = payload.sessions as Array<number | string>;
           store.dispatch(setSessions(activeSessions));
-          console.log('Active sessions', activeSessions);
           break;
         case 'Register':
           const x = 1;

pages/server/discussions/[server].tsx

@@ -0,0 +1,27 @@
+import { Layout } from '@components/common/Layout';
+import React from 'react';
+import Chat from '@components/chat';
+import { useRouter } from 'next/router';
+import { useAppSelector } from 'framework/redux/store';
+
+export default function SpecificServer({ connErr }: { connErr: string }) {
+  const router = useRouter();
+  const serverCid = router.query.server;
+  // console.log(router.asPath);
+
+  // const current_used_session_server = useAppSelector(
+  //   (state) => state.context.sessions.current_used_session_server
+  // );
+
+  return (
+    <>
+      <div className="flex flex-col justify-between">
+        <main className="pt-10 h-full w-full flex flex-col justify-between text-white">
+          <Chat />
+        </main>
+      </div>
+    </>
+  );
+}
+
+SpecificServer.Layout = Layout;

pages/storage.tsx → pages/server/storage/[serverCid].tsx

@@ -1,10 +1,9 @@
 import { Layout } from '@components/common/Layout';
+import { useAppSelector } from 'framework/redux/store';
 import React from 'react';
-import { useSelector } from 'react-redux';
-import { State } from 'framework/redux/store';
 
 export default function Storage() {
-  const { uuid } = useSelector((state: State) => state.uuid);
+  const { uuid } = useAppSelector((state) => state.uuid);
   // const upload = (e: any) => {
   //   const arr: string[] = [];
   //   Array.from(e.target.files).forEach((file: any) => {

src-tauri/Cargo.toml

@@ -25,7 +25,6 @@ tokio-util = { version = "0.7.8", default-features = false }
 citadel_logging = { version = "0.5.0", default-features = false }
 tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 log = "^0.4"
-
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem
 # DO NOT REMOVE!!