отчеты

lab5/data.json

@@ -29,6 +29,24 @@
       "name": "assd",
       "text": "РУНА ЧТОБЫ НАПИСАННЫЙ КОД В КОМПИЛЯТОРЕ ВСЕГДА РАБОТАЛ ",
       "id": 2
+    },
+    {
+      "date": "22.12.2023",
+      "name": "Oleja123",
+      "text": "sdb",
+      "id": 3
+    },
+    {
+      "date": "22.12.2023",
+      "name": "Oleja123",
+      "text": "руна чтобы компьютерный код всегда работал компьютер код программист питон си джава 1 0 10 темная тема ",
+      "id": 4
+    },
+    {
+      "date": "22.12.2023",
+      "name": "Oleja123",
+      "text": "sdb",
+      "id": 5
     }
   ],
   "users": [

lab5/src/components/lines/table/Lines.jsx

@@ -1,3 +1,5 @@
+import './lines.css';
+
 import { Button, ButtonGroup } from 'react-bootstrap';
 import Select from '../../input/Select.jsx';
 import ModalConfirm from '../../modal/ModalConfirm.jsx';
@@ -36,7 +38,7 @@ const Lines = () => {
     return (
         <>
             <ButtonGroup>
-                <Button variant='info' onClick={() => showFormModal()}>
+                <Button variant='info' className='buttonstyle1' onClick={() => showFormModal()}>
                     Добавить товар 
                 </Button> 
             </ButtonGroup>

lab5/src/components/lines/table/lines.css

@@ -0,0 +1,10 @@
+.buttonstyle1{
+    background-color: #302b2b;
+    color: white;
+    border-color: #302b2b;
+}
+
+ .buttonstyle1 :hover{
+    background-color: yellow; 
+    color: black !important;
+ }

lab5/src/components/navigation/components/AdminHeaderComp/AdminHeaderComp.css

@@ -2,8 +2,9 @@ h1 {
     font-size: 1.5em;
 }
 
-h2 {
+.h2 {
     font-size: 1.25em;
+    text-decoration: none;
 }
 
 h3 {
@@ -74,4 +75,10 @@ h3 {
     font-size: 1.25em;
     color: white;
     text-decoration: none;
-}
+}
+
+
+.link{
+    text-decoration: none;
+}
+

lab5/src/components/navigation/components/AdminHeaderComp/AdminHeaderComp.jsx

@@ -4,7 +4,7 @@ import { Link } from 'react-router-dom';
 import 'bootstrap/dist/js/bootstrap.min';
 
 const AdminHeaderComp = () => (
-    <Link to = '/page5'>
+    <Link className='link' to = '/page5'>
         <div className="h2">
             Для администратора  &nbsp;
         </div>

lab5/src/components/navigation/components/ExitComponent/ExitComponent.css

@@ -9,4 +9,7 @@ button {
     font-size: 1.25em;
     color: white;
     text-decoration: none;
+}
+.link{
+    text-decoration: none;
 }

lab5/src/components/navigation/components/ExitComponent/ExitComponent.jsx

@@ -8,7 +8,7 @@ const ExitComponent = () => {
     userLogout();
   };
   return (
-    <Link to = '/page0' onClick = {makeExit}>
+    <Link className='link' to = '/page0' onClick = {makeExit}>
         <div className="h2">
             Выйти
         </div>

lab5/src/components/navigation/components/RegHeaderComp/RegHeaderComp.css

@@ -5,7 +5,7 @@
     text-decoration: none;
 }
 h4{
-    text-decoration: underline;
+    text-decoration: none;
     overflow: hidden;
 }
 h4:hover {
@@ -39,3 +39,6 @@ h4{
     height: 50px;
 }
 
+.link{
+    text-decoration: none;
+}

lab5/src/components/navigation/components/RegHeaderComp/RegHeaderComp.jsx

@@ -3,7 +3,7 @@ import { Link } from 'react-router-dom';
 import 'bootstrap/dist/js/bootstrap.min';
 
 const RegHeaderComp = () => (
-    <Link to = '/registration'>
+    <Link  className='link' to = '/registration'>
         <div className="linkToReg">
             <h4>Регистрация</h4>
         </div>

lab5/src/pages/LoginPage/Components/Login/login.css

@@ -1,17 +1,4 @@
-main .register-panel {
-    
-    font-size: 1.56em;
-}
-.form-container .form-horizontal .form-group {
-    margin: 0 0 25px 0;
-}
-.remember-month {
-    
-    font-size: 15px;
-}
-.form-container .form-horizontal .btn {
-    
-    color: #000;
-    background-color: #efefef;
-    font-size: 0.7em;
+.buttonstyle5{
+    background-color: black !important; 
+    color: white !important 
 }

lab5/src/pages/LoginPage/Components/Login/login.jsx

@@ -1,8 +1,10 @@
-import './login.css';
+
+
 import { useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom';
 import useSubmit from './hooks/LoginHook.jsx';
-
+import { Button } from 'react-bootstrap';
+import './login.css';
 
 const Login = () => {
  // const { userLogin } = useUser();
@@ -48,13 +50,17 @@ const Login = () => {
                 <input {...register('password', { required: 'Это поле обязательно' })} className="form-control" name = "password" type="password" placeholder="пароль"></input>
               <p>{errors.password?.message}</p>
               </div>
-              <input type = 'submit'/>
+              <Button  className='buttonstyle5 fs-4' type='submit' > Отправить </Button>
             </form>
+            
+            
           </div>
+          
         </div>
 
       </div>
     </div>
+    
   </main>
   );
 };

lab5/src/pages/RegistrationPage/components/reg/reg.css

@@ -20,4 +20,9 @@ main .register-panel {
     background-color: #302b2b;
     font-size: 1.8em;
     width: 100%;
-}
+}
+
+.buttonstyle5{
+    background-color: black !important; 
+    color: white !important 
+}

lab5/src/pages/RegistrationPage/components/reg/reg.jsx

@@ -54,7 +54,7 @@ const Reg = () => {
               <input {...register('password', { required: 'Это поле обязательно' })} className="form-control" name = "password" type="password" placeholder="Пароль"></input>
               <p>{errors.password?.message}</p>
             </div>
-            <input type = 'submit'/>
+            <Button  className='buttonstyle5 fs-4' type='submit' > Отправить </Button>
             
           </form>