Tea 63 forum topics list

packages/client/src/components/ModalThemeNew/index.tsx

@@ -0,0 +1,84 @@
+import { useEffect } from 'react'
+import * as RB from '@mui/material'
+import { useForm, FormProvider } from 'react-hook-form'
+import { forumThemeType } from '../../pages/forum/types'
+import { useAppDispatch, useAppSelector } from '../../store/index'
+import { fetchUser } from '../../store/actions/ProfileActionCreators'
+import { selectProfileData } from '../../store/slices/ProfileSlice'
+
+const ModalThemeNew = (props: any) => {
+  const dispatch = useAppDispatch()
+  const { userData } = useAppSelector(selectProfileData)
+
+  useEffect(() => {
+    dispatch(fetchUser())
+  }, [])
+
+  const methods = useForm<forumThemeType>({
+    defaultValues: {
+      title: '',
+      description: '',
+      userId: userData.id,
+      userLogin: userData.login,
+    },
+    mode: 'onBlur',
+  })
+  const { register, handleSubmit, reset } = methods
+
+  useEffect(() => {
+    reset({
+      title: '',
+      description: '',
+      userId: userData.id,
+      userLogin: userData.login,
+    })
+  }, [userData])
+
+  return (
+    <RB.Container sx={{ display: 'flex', flexDirection: 'column' }}>
+      <RB.Dialog open={props.isopen} onClose={props.handleClose}>
+        <RB.DialogTitle>Создать тему</RB.DialogTitle>
+        <FormProvider {...methods}>
+          <form
+            onSubmit={handleSubmit(data => {
+              props.onSubmitTheme(data)
+              reset()
+            })}>
+            <RB.DialogContent>
+              <RB.Grid
+                container
+                direction="column"
+                justifyContent="center"
+                alignItems="center"
+                spacing={2}>
+                <RB.Grid item xs={12}>
+                  <RB.TextField
+                    type="text"
+                    {...register('title')}
+                    label="Название"
+                    size="small"
+                  />
+                </RB.Grid>
+                <RB.Grid item xs={12}>
+                  <RB.TextField
+                    type="text"
+                    {...register('description')}
+                    label="Описание"
+                    size="small"
+                  />
+                </RB.Grid>
+              </RB.Grid>
+            </RB.DialogContent>
+            <RB.DialogActions>
+              <RB.Button size="small" type="submit" onClick={props.handleClose}>
+                Добавить
+              </RB.Button>
+            </RB.DialogActions>
+          </form>
+        </FormProvider>
+      </RB.Dialog>
+    </RB.Container>
+  )
+}
+
+export default ModalThemeNew

packages/client/src/components/YandexIcon/YandexIcon.tsx

@@ -1,4 +1,15 @@
-import icon from '@assets/RU.svg'
+import { SvgIcon } from '@mui/material';
 export const YandexIcon = () => {
+<<<<<<< HEAD
+  return (
+    <SvgIcon viewBox="0 0 44 44" sx={{ width: "24", height: "24", fill: "none", xmlns: "http://www.w3.org/2000/svg" }}>
+      <rect width="44" height="44" rx="22" fill="#FC3F1D" />
+      <path d="M25.2438 12.3208H23.0173C19.2005 12.3208 17.292 14.2292 17.292 17.0919C17.292 20.2726 18.5643 21.863 21.427 23.7714L23.6535 25.3618L17.292 35.222H12.2029L18.2463 26.316C14.7475 23.7714 12.839 21.5449 12.839 17.41C12.839 12.3208 16.3378 8.82202 23.0173 8.82202H29.6969V35.222H25.2438V12.3208Z" fill="white" />
+    </SvgIcon>
+  );
+}
+
+=======
   return <img src={icon} />
 }
+>>>>>>> main

packages/client/src/entry-client.tsx

@@ -14,6 +14,7 @@ declare global {
   }
 }
 
+
 window.addEventListener('load', () => {
   if ('serviceWorker' in navigator) {
     navigator.serviceWorker
@@ -30,6 +31,7 @@ window.addEventListener('load', () => {
   }
 })
 
+
 ReactDOM.hydrateRoot(
   document.getElementById('root') as HTMLElement,
   <React.StrictMode>

packages/client/src/hooks/useAuth.ts

@@ -9,12 +9,13 @@ export const useAuth = () => {
   const navigate = useNavigate()
 
   return () => {
-    user.userData.id
-      ? navigate('/game/start')
-      : dispatch(fetchUser()).then(res => {
-        if (res.type === '/user/fetchUser/rejected') {
+    if (!user.id) {
+      dispatch(fetchUser()).then(res => {
+        if (res.type === 'auth/fetch/rejected') {
           return navigate('/auth')
         }
       })
+    }
+    return
   }
 }

packages/client/src/hooks/useOAuth.ts

@@ -1,34 +1,24 @@
-import location from 'location-href'
-import { REDIRECT_URI } from '../services/BaseApi'
 import { fetchUser, oauthYandex } from '../store/actions/AuthActionCreators'
 import { useAppDispatch } from '../store/index'
 import { OauthData } from '../store/types'
 
 export const useOAuth = () => {
-  try {
-    const dispatch = useAppDispatch()
-
-    const url = location()
-
-    if (url) {
-      const code = url.split('=').pop()
-
-      return () => {
-        if (/code/.test(url)) {
-          dispatch(
-            oauthYandex({
-              code: code,
-              redirect_uri: REDIRECT_URI,
-            } as OauthData)
-          ).then(res => {
-            if (res.payload === 'OK') {
-              dispatch(fetchUser())
-            }
-          })
+  const REDIRECT_URI = 'http://localhost:3001'
+  const dispatch = useAppDispatch()
+  const url = document.location.href
+  const code = url.split('=').pop()
+  return () => {
+    if (/code/.test(url)) {
+      dispatch(
+        oauthYandex({
+          code: code,
+          redirect_uri: REDIRECT_URI,
+        } as OauthData)
+      ).then(res => {
+        if (res.payload === 'OK') {
+          dispatch(fetchUser())
         }
-      }
+      })
     }
-  } catch (e) {
-    console.log(e)
-  }
+}
 }

packages/client/src/hooks/useServiceId.tsx

@@ -1,10 +1,10 @@
-import { REDIRECT_URI } from '../services/BaseApi'
-import { getServiceId } from '../store/actions/AuthActionCreators'
-import { useAppDispatch } from '../store/index'
+import { getServiceId } from '@store/actions/AuthActionCreators'
+import { useAppDispatch } from '@store/index'
 
 export const useServiceId = () => {
   const dispatch = useAppDispatch()
-
+  const REDIRECT_URI = 'http://localhost:3001'
+  // const REDIRECT_URI =`http://localhost:${__CLIENT_PORT__}`
   return () => {
     dispatch(getServiceId()).then(res => {
       if (res.payload.service_id) {

packages/client/src/pages/LoginPage/Login.tsx

@@ -11,9 +11,9 @@ import { Link, useNavigate } from 'react-router-dom'
 import { LoginData } from '../../store/types'
 import { useLogin } from '../../hooks/useLogin'
 import { useUser } from '../../hooks/useUser'
-import { fetchUser } from '../../store/actions/UserActionCreators'
-import { useAppDispatch } from '../../store/index'
-import { styled } from '@mui/material/styles'
+import { fetchUser } from '@store/actions/AuthActionCreators'
+import { useAppDispatch } from '@store/index'
+import { YandexIcon } from '@components/YandexIcon/YandexIcon'
 import { useServiceId } from '../../hooks/useServiceId'
 
 export default function Login() {
@@ -24,6 +24,7 @@ export default function Login() {
   const location = useServiceId()
 
   const YandexIdButton = styled(Button)({
+    margin: '12px 0',
     color: ' white',
     width: '100%',
     height: '44px',
@@ -52,7 +53,6 @@ export default function Login() {
     } as LoginData
     login(authData)
   }
-
 
   return (
     <Box color="primary">
@@ -101,17 +101,15 @@ export default function Login() {
               Войти
             </Button>
             <Typography
-              component="p"
-              sx={{ textAlign: 'center', fontSize: '12px' }}>
+              sx={{ textAlign: 'center' }}>
               или
             </Typography>
             <YandexIdButton
               onClick={() => location()}
-              // startIcon={<YandexIcon/>}
-            >
+              startIcon={<YandexIcon/>}>
               Войти c Яндекс ID
             </YandexIdButton>
-            <Stack spacing={2} sx={{ textAlign: 'center' }}>
+            <Stack spacing={1} sx={{ textAlign: 'center' }}>
               <Typography>Еще не зарегистрированы?</Typography>
               <Typography
                 to="/register"