add utils

Tatyana-js · Dec 24, 2024 · d04344a · d04344a
1 parent 53f9e84
commit d04344a
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 12 deletions.
diff --git a/frontend/index.html b/frontend/index.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="en" class="h-100">
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />

diff --git a/frontend/src/components/App.jsx → frontend/src/App.jsx b/frontend/src/components/App.jsx → frontend/src/App.jsx
@@ -1,9 +1,10 @@
 import 'bootstrap/dist/css/bootstrap.min.css';
 import { BrowserRouter, Routes, Route } from 'react-router-dom';
 import { Container, Navbar } from 'react-bootstrap';
-import PageNotFound from './PageNotFound.jsx';
-import MainPage from './MainPage.jsx';
-import LoginPage from './LoginPage.jsx';
+import PageNotFound from './pages/PageNotFound.jsx';
+import MainPage from '../components/MainPage.jsx';
+import LoginPage from './pages/LoginPage.jsx';
+import router from './utils/routes.js';
 
 const App = () => {
   return (
@@ -17,8 +18,8 @@ const App = () => {
         </Navbar>
         <Routes>
           <Route path="*" element={<PageNotFound />} />
-          <Route path="/" element={<MainPage />} />
-          <Route path="/login" element={<LoginPage />} />
+          <Route path={router.main} element={<MainPage />} />
+          <Route path={router.login} element={<LoginPage />} />
         </Routes>
       </div>
     </BrowserRouter>

diff --git a/frontend/src/components/сhatComponents/MessageField.jsx b/frontend/src/components/сhatComponents/MessageField.jsx
@@ -8,7 +8,7 @@ const MessageField = () => {
         <p className="m-0">
           <b># general</b>
         </p>
-        <span className="text-muted">1 сообщение</span>
+        <span className="text-muted">0 сообщений</span>
       </div>
       <div id="messages-box" className="chat-messages overflow-auto px-5 ">{}</div>
       <MessageForm />

diff --git a/frontend/src/init.jsx b/frontend/src/init.jsx
@@ -1,8 +1,8 @@
 import i18next from 'i18next';
 import { I18nextProvider, initReactI18next } from 'react-i18next';
 import { Provider } from 'react-redux';
-import store from './slices/index.js';
-import App from './components/App';
+import store from './store/index.js';
+import App from './App.jsx';
 import resources from './locales/index.js';
 
 const init = async () => {
@@ -21,7 +21,6 @@ const init = async () => {
         <App />
       </I18nextProvider>
     </Provider>
-
   );
 };
 

diff --git a/frontend/src/components/LoginPage.jsx → frontend/src/pages/LoginPage.jsx b/frontend/src/components/LoginPage.jsx → frontend/src/pages/LoginPage.jsx
diff --git a/frontend/src/components/MainPage.jsx → frontend/src/pages/MainPage.jsx b/frontend/src/components/MainPage.jsx → frontend/src/pages/MainPage.jsx
diff --git a/frontend/src/components/PageNotFound.jsx → frontend/src/pages/PageNotFound.jsx b/frontend/src/components/PageNotFound.jsx → frontend/src/pages/PageNotFound.jsx
diff --git a/frontend/src/slices/channelsSlice.js → frontend/src/store/channelsSlice.js b/frontend/src/slices/channelsSlice.js → frontend/src/store/channelsSlice.js
diff --git a/frontend/src/slices/index.js → frontend/src/store/index.js b/frontend/src/slices/index.js → frontend/src/store/index.js
diff --git a/frontend/src/index.jsx → frontend/src/store/store.jsx b/frontend/src/index.jsx → frontend/src/store/store.jsx
@@ -1,6 +1,6 @@
 import ReactDOM from 'react-dom/client';
-import init from './init.jsx';
-import './index.css';
+import init from '../init.jsx';
+import '../index.css';
 
 const app = async () => {
   const root = ReactDOM.createRoot(document.querySelector('#root'));

diff --git a/frontend/src/utils/routes.js b/frontend/src/utils/routes.js
@@ -0,0 +1,4 @@
+export default {
+  login: '/login',
+  main: '/',
+};