Merge pull request #61 from xi-effect/staging

Staging

apps/xi.front/app/community/[cid]/videoconference/[id]/page.tsx → apps/xi.front/app/communities/[community-id]/channels/[channel-id]/videoconference/page.tsx

@@ -14,15 +14,15 @@ export default function VideoConferenceInCommunity({ params }: { params: { vid:
   const token = useMainSt((state) => state.token);
 
   React.useEffect(() => {
-    getToken(params.vid);
+    getToken(params['[channel-id]']);
   }, []);
 
   return (
     <div className="w-full md:w-[calc(100vw-350px)] md:min-h-screen md:h-screen md:overflow-auto">
       {token === null ? (
         <>
           <h1 className="text-3xl font-bold"> Видеоконференция </h1>
-          <h3 className="text-xl font-bold">{`id: ${params.vid}`}</h3>
+          <h3 className="text-xl font-bold">{`id: ${params['[channel-id]']}`}</h3>
         </>
       ) : (
         <VideoConference token={token} />

apps/xi.front/app/invite/[iid]/page.tsx

@@ -78,7 +78,7 @@ export default function InvitePage({ params }: { params: { iid: string } }) {
   const date = useRef(new Date());
 
   const onSubmit = () => {
-    redirect('/community/1/home');
+    redirect('/communities/1/home');
   };
 
   return (

apps/xi.front/app/providers.tsx

@@ -5,6 +5,7 @@ import { redirect, usePathname } from 'next/navigation';
 import { ReactNode, useEffect } from 'react';
 import { Toaster } from 'sonner';
 import { useMainSt } from 'pkg.stores';
+// import { useSocketIO } from 'pkg.utils';
 import Load from './load';
 
 const mapsOfPathsWithoutRedirect = ['/', '/signin', '/signup', '/reset-password'];
@@ -28,6 +29,49 @@ type AuthProviderT = {
   children: ReactNode;
 };
 
+// const SocketProvider = ({ children }: { children: ReactNode }) => {
+//   const socket = useSocketIO();
+//   const isLogin = useMainSt((state) => state.isLogin);
+
+//   useEffect(() => {
+//     if (!socket.connected && isLogin) {
+//       socket.connect();
+//     }
+
+//     socket?.on('connect', () => {
+//       console.info('SIO connect', socket?.id);
+//     });
+
+//     socket?.on('disconnect', () => {
+//       console.info('SIO disconnect', socket?.id);
+//     });
+
+//     socket?.on('error', () => {
+//       toast('Ошибка вебсокета');
+//     });
+
+//     socket?.on('connect_error', (error) => {
+//       if (socket.active) {
+//         toast('Ошибка вебсокета, автоматическое переподключение');
+//         // temporary failure, the socket will automatically try to reconnect
+//       } else {
+//         toast('Ошибка вебсокета, переподключение');
+//         socket.connect();
+//         // the connection was denied by the server
+//         // in that case, `socket.connect()` must be manually called in order to reconnect
+//         console.log(error.message);
+//       }
+//     });
+
+//     return () => {
+//       socket?.off();
+//       socket?.disconnect();
+//     };
+//   }, []);
+
+//   return children;
+// };
+
 const AuthProvider = ({ children }: AuthProviderT) => {
   const pathname = usePathname();
 
@@ -57,7 +101,7 @@ const AuthProvider = ({ children }: AuthProviderT) => {
     onboardingStage === 'completed' &&
     welcomePagesPaths.includes(pathname)
   ) {
-    redirect('/community/1/home');
+    redirect('/communities/1/home');
   }
 
   if (
@@ -87,7 +131,10 @@ export const Providers = ({ children }: ProvidersT) => {
   return (
     <ThemeProvider defaultTheme="light" themes={['light', 'dark']} attribute="data-theme">
       <Toaster />
-      <AuthProvider>{children}</AuthProvider>
+      <AuthProvider>
+        {/* <SocketProvider>{children}</SocketProvider> */}
+        {children}
+      </AuthProvider>
     </ThemeProvider>
   );
 };

apps/xi.front/app/welcome/final/page.tsx

@@ -19,7 +19,7 @@ export default function WelcomeFinal() {
 
   const handleNext = () => {
     updateUser({ onboardingStage: 'completed' });
-    router.push('/community/1/home');
+    router.push('/communities/1/home');
   };
 
   return (
@@ -39,7 +39,7 @@ export default function WelcomeFinal() {
             Добро пожаловать!
           </div>
           <Link
-            href="/community/1/home/?show-tour=true"
+            href="/communities/1/home/?show-tour=true"
             className="mt-8 border-solid border-gray-20 flex flex-col justify-center p-4 gap-1 w-full items-start border rounded-2xl cursor-pointer"
           >
             <div className="text-xl font-medium leading-[28px] text-gray-80">

apps/xi.front/next.config.js

@@ -63,6 +63,9 @@ const nextConfig = {
     '@xipkg/label',
     '@xipkg/tabs',
     '@xipkg/toggle',
+    '@xipkg/datepicker',
+    '@xipkg/popover',
+    '@xipkg/calendar',
   ],
   compiler: {
     removeConsole: process.env.NODE_ENV !== 'development',