From 6dbb6afa3e3db53735b7b327ea2b4ef5ad9949e7 Mon Sep 17 00:00:00 2001 From: Timourka Date: Fri, 24 Nov 2023 04:12:16 +0400 Subject: [PATCH] 4:11a.m. ohhh yeah --- laba4/site/index.html | 5 +- laba4/site/src/App.css | 0 laba4/site/src/App.jsx | 1 - .../src/components/caroucele/Caroucele.css | 16 ++++++ .../src/components/caroucele/Caroucele.jsx | 49 ++++++++++++++++ .../components/createdTest/CreatedTest.jsx | 15 +++++ .../site/src/components/navigation/Header.jsx | 6 +- .../site/src/components/question/Question.jsx | 42 ++++++++++++++ laba4/site/src/components/rowTest/RowTest.jsx | 23 ++++++++ laba4/site/src/index.css | 20 +++---- laba4/site/src/main.jsx | 30 ++++++++++ laba4/site/src/pages/CreateTest.jsx | 29 ++++++++++ laba4/site/src/pages/LogInInIn.jsx | 23 ++++++++ laba4/site/src/pages/MainPage.jsx | 56 ++----------------- laba4/site/src/pages/Profile.jsx | 28 ++++++++++ laba4/site/src/pages/SignInInIn.jsx | 31 ++++++++++ laba4/site/src/pages/TestInProcess.jsx | 40 +++++++++++++ laba4/site/src/pages/TestPage.jsx | 23 ++++++++ 18 files changed, 365 insertions(+), 72 deletions(-) delete mode 100644 laba4/site/src/App.css create mode 100644 laba4/site/src/components/caroucele/Caroucele.css create mode 100644 laba4/site/src/components/caroucele/Caroucele.jsx create mode 100644 laba4/site/src/components/createdTest/CreatedTest.jsx create mode 100644 laba4/site/src/components/question/Question.jsx create mode 100644 laba4/site/src/components/rowTest/RowTest.jsx create mode 100644 laba4/site/src/pages/CreateTest.jsx create mode 100644 laba4/site/src/pages/LogInInIn.jsx create mode 100644 laba4/site/src/pages/Profile.jsx create mode 100644 laba4/site/src/pages/SignInInIn.jsx create mode 100644 laba4/site/src/pages/TestInProcess.jsx create mode 100644 laba4/site/src/pages/TestPage.jsx diff --git a/laba4/site/index.html b/laba4/site/index.html index 0f336da..85c53ab 100644 --- a/laba4/site/index.html +++ b/laba4/site/index.html @@ -7,9 +7,8 @@ unreal tests - -
- + + \ No newline at end of file diff --git a/laba4/site/src/App.css b/laba4/site/src/App.css deleted file mode 100644 index e69de29..0000000 diff --git a/laba4/site/src/App.jsx b/laba4/site/src/App.jsx index b242694..3dea8a7 100644 --- a/laba4/site/src/App.jsx +++ b/laba4/site/src/App.jsx @@ -1,6 +1,5 @@ import PropTypes from 'prop-types'; import { Outlet } from 'react-router-dom'; -import './App.css'; import Footer from './components/footer/Footer.jsx'; import Header from './components/navigation/Header.jsx'; diff --git a/laba4/site/src/components/caroucele/Caroucele.css b/laba4/site/src/components/caroucele/Caroucele.css new file mode 100644 index 0000000..9404140 --- /dev/null +++ b/laba4/site/src/components/caroucele/Caroucele.css @@ -0,0 +1,16 @@ +.carousel-item{ + height: 30rem !important; + background-repeat: no-repeat; + background-size:cover; + background-position: center; +} + +.carouselItem1{ + background-image: url("image.jpg"); +} +.carouselItem2{ + background-image: url("image.jpg"); +} +.carouselItem3{ + background-image: url("image.jpg"); +} \ No newline at end of file diff --git a/laba4/site/src/components/caroucele/Caroucele.jsx b/laba4/site/src/components/caroucele/Caroucele.jsx new file mode 100644 index 0000000..6b37e7e --- /dev/null +++ b/laba4/site/src/components/caroucele/Caroucele.jsx @@ -0,0 +1,49 @@ +import { Link } from 'react-router-dom'; +import './Caroucele.css'; + +const Caroucele = () => { + return ( + <> +
+
+
+
+
+

Ваше описание

+
+
+ Начать +
+
+
+
+

Ваше описание

+
+
+ Начать +
+
+
+
+

Ваше описание

+
+
+ Начать +
+
+
+ + +
+
+ + ); +}; + +export default Caroucele; diff --git a/laba4/site/src/components/createdTest/CreatedTest.jsx b/laba4/site/src/components/createdTest/CreatedTest.jsx new file mode 100644 index 0000000..174cba3 --- /dev/null +++ b/laba4/site/src/components/createdTest/CreatedTest.jsx @@ -0,0 +1,15 @@ +import { Link } from "react-router-dom"; + +const CreatedTest = () => { + return ( +
+
пёс
+
ПЁЁЁСdfghkl;khgddfhkl;kjgfgh
+ открыть тест + изменить + удалить +
+ ); +}; + +export default CreatedTest; diff --git a/laba4/site/src/components/navigation/Header.jsx b/laba4/site/src/components/navigation/Header.jsx index c09e245..48381c8 100644 --- a/laba4/site/src/components/navigation/Header.jsx +++ b/laba4/site/src/components/navigation/Header.jsx @@ -19,9 +19,9 @@ const Header = () => { diff --git a/laba4/site/src/components/question/Question.jsx b/laba4/site/src/components/question/Question.jsx new file mode 100644 index 0000000..7e4864d --- /dev/null +++ b/laba4/site/src/components/question/Question.jsx @@ -0,0 +1,42 @@ +import { Button, Form } from 'react-bootstrap'; + +const Question = () => { + return ( + <> +
+
+ Файл картинки + +
+
+ +
+
+ Текст вопроса + +
+
+ Ответы на вопрос: +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ + ); +}; + +export default Question; diff --git a/laba4/site/src/components/rowTest/RowTest.jsx b/laba4/site/src/components/rowTest/RowTest.jsx new file mode 100644 index 0000000..cdbcf4f --- /dev/null +++ b/laba4/site/src/components/rowTest/RowTest.jsx @@ -0,0 +1,23 @@ +import { Link } from 'react-router-dom'; + +const RowTest = () => { + return ( + <> +
+
+ +
+
+
+

описание

+
+
+ Начать +
+
+
+ + ); +}; + +export default RowTest; diff --git a/laba4/site/src/index.css b/laba4/site/src/index.css index c57ec23..e83b45a 100644 --- a/laba4/site/src/index.css +++ b/laba4/site/src/index.css @@ -33,19 +33,13 @@ body{ min-height: 100%; } -.carousel-item{ - height: 30rem !important; - background-repeat: no-repeat; - background-size:cover; - background-position: center; +.form-check-input{ + border: none; + border-radius: 0px !important; + background-clip: padding-box; } -.carouselItem1{ - background-image: url("image.jpg"); -} -.carouselItem2{ - background-image: url("image.jpg"); -} -.carouselItem3{ - background-image: url("image.jpg"); +.form-control{ + padding-top: 0; + padding-bottom: 0; } \ No newline at end of file diff --git a/laba4/site/src/main.jsx b/laba4/site/src/main.jsx index 6512252..b99bf5c 100644 --- a/laba4/site/src/main.jsx +++ b/laba4/site/src/main.jsx @@ -6,6 +6,12 @@ import App from './App.jsx'; import './index.css'; import ErrorPage from './pages/ErrorPage.jsx'; import MainPage from './pages/MainPage.jsx'; +import LogIn from './pages/LogInInIn.jsx'; +import SignIn from './pages/SignInInIn.jsx'; +import Profile from './pages/Profile.jsx'; +import TestInProcess from './pages/TestInProcess.jsx'; +import TestPage from './pages/TestPage.jsx'; +import CreateTest from './pages/CreateTest.jsx'; const routes = [ { @@ -13,6 +19,30 @@ const routes = [ path: '/', element: , }, + { + path: '/LogIn', + element: , + }, + { + path: '/SignIn', + element: , + }, + { + path: '/Profile', + element: , + }, + { + path: '/TestInProcess', + element: , + }, + { + path: '/TestPage', + element: , + }, + { + path: '/CreateTest', + element: , + }, ]; const router = createBrowserRouter([ diff --git a/laba4/site/src/pages/CreateTest.jsx b/laba4/site/src/pages/CreateTest.jsx new file mode 100644 index 0000000..0f30be8 --- /dev/null +++ b/laba4/site/src/pages/CreateTest.jsx @@ -0,0 +1,29 @@ +import { Link } from 'react-router-dom'; +import { Button, Form } from 'react-bootstrap'; +import Question from '../components/question/Question.jsx'; + +const CreateTest = () => { + return ( + <> +
+
+
+ Название теста + +
+
+ Описание + +
+ +
Добавить вопрос
+
+ +
+
+
+ + ); +}; + +export default CreateTest; diff --git a/laba4/site/src/pages/LogInInIn.jsx b/laba4/site/src/pages/LogInInIn.jsx new file mode 100644 index 0000000..564a248 --- /dev/null +++ b/laba4/site/src/pages/LogInInIn.jsx @@ -0,0 +1,23 @@ +import { Button, Form } from 'react-bootstrap'; + +const LogIn = () => { + return ( + <> +
+ + E-mail + + + + Пароль + + + + + +
+ + ); +}; + +export default LogIn; diff --git a/laba4/site/src/pages/MainPage.jsx b/laba4/site/src/pages/MainPage.jsx index c93db9b..8f9bb62 100644 --- a/laba4/site/src/pages/MainPage.jsx +++ b/laba4/site/src/pages/MainPage.jsx @@ -1,60 +1,12 @@ -import { Link } from 'react-router-dom'; +import RowTest from '../components/rowTest/RowTest'; +import Caroucele from '../components/caroucele/Caroucele'; const MainPage = () => { return ( <> -
-
-
-
-
-

Ваше описание

-
-
- Начать -
-
-
-
-

Ваше описание

-
-
- Начать -
-
-
-
-

Ваше описание

-
-
- Начать -
-
-
- - -
-
+
-
-
- -
-
-
-

описание

-
-
- Начать -
-
-
+
); diff --git a/laba4/site/src/pages/Profile.jsx b/laba4/site/src/pages/Profile.jsx new file mode 100644 index 0000000..92f091a --- /dev/null +++ b/laba4/site/src/pages/Profile.jsx @@ -0,0 +1,28 @@ +import { Link } from 'react-router-dom'; +import CreatedTest from '../components/createdTest/CreatedTest'; + +const Profile = () => { + return ( + <> +
+
+

Порофиль

+
+
+
+

Созданные тесты

+
+

навзвание

+

описание

+
+
+ +
+ Создать тест +
+
+ + ); +}; + +export default Profile; diff --git a/laba4/site/src/pages/SignInInIn.jsx b/laba4/site/src/pages/SignInInIn.jsx new file mode 100644 index 0000000..2becbcb --- /dev/null +++ b/laba4/site/src/pages/SignInInIn.jsx @@ -0,0 +1,31 @@ +import { Button, Form } from 'react-bootstrap'; + +const SignIn = () => { + return ( + <> +
+ + Логин + + + + E-mail + + + + Пароль + + + + Повторите ароль + + + + + +
+ + ); +}; + +export default SignIn; diff --git a/laba4/site/src/pages/TestInProcess.jsx b/laba4/site/src/pages/TestInProcess.jsx new file mode 100644 index 0000000..5066b3a --- /dev/null +++ b/laba4/site/src/pages/TestInProcess.jsx @@ -0,0 +1,40 @@ +import { Link } from 'react-router-dom'; +import { Button, Form } from 'react-bootstrap'; + +const TestInProcess = () => { + return ( + <> +
+ +
+ +

Текст вопроса

+ +
+
+ + + ответ 1 + + + + ответ 2 + + + + ответ 3 + + + + ответ 4 + + + + +
+
+ + ); +}; + +export default TestInProcess; diff --git a/laba4/site/src/pages/TestPage.jsx b/laba4/site/src/pages/TestPage.jsx new file mode 100644 index 0000000..0d746b0 --- /dev/null +++ b/laba4/site/src/pages/TestPage.jsx @@ -0,0 +1,23 @@ +import { Link } from 'react-router-dom'; + +const TestPage = () => { + return ( + <> +
+
+
+ +
+
+ Начать тест +
+
+
+

Описание

+
+
+ + ); +}; + +export default TestPage;