chore: del folders, files,

depocoder · Oct 8, 2024 · 207b8c5 · 207b8c5
1 parent e70f064
commit 207b8c5
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 54 deletions.
diff --git a/frontend/src/App.js b/frontend/src/App.js
diff --git a/frontend/src/App.scss b/frontend/src/App.scss
diff --git a/frontend/src/App.test.js b/frontend/src/App.test.js
diff --git a/frontend/src/components/Login/ModeusLoginForm.jsx b/frontend/src/components/Login/ModeusLoginForm.jsx
diff --git a/frontend/src/index.scss b/frontend/src/index.scss
@@ -2,6 +2,41 @@
 @import url("https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&family=Unbounded:wght@200..900&display=swap");
 @import url("https://fonts.googleapis.com/css2?family=Roboto+Mono:ital,wght@0,100..700;1,100..700&display=swap");
 
+// app file start ========
+.App {
+    text-align: center;
+    &-logo {
+        height: 40vmin;
+        pointer-events: none;
+    }
+    &-header {
+        background-color: #282c34;
+        min-height: 100vh;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        font-size: calc(10px + 2vmin);
+        color: white;
+    }
+    &-link {
+        color: #61dafb;
+    }
+}
+//TODO: ругается здесь
+//media (prefers-reduced-motion: no-preference) {
+//    animation: App-logo-spin infinite 20s linear;
+//}
+//keyframes App-logo-spin {
+//    transform: rotate(0deg);
+//}
+//to {
+//    transform: rotate(360deg);
+//}
+// app file end ========
+
+
+
 html {
     height: 100%;
 }
@@ -105,7 +140,7 @@ header .exit-btn {
 }
 
 header #rectangle {
-    padding: 0px 12px;
+    padding: 0 12px;
     margin: 22px 120px;
     width: 534px;
     height: 106px;
@@ -385,7 +420,7 @@ header #rectangle {
         background: #F46386;
         border-radius: 6px;
         color: #fff;
-        font-family: "Roboto" sans-serif;
+        font-family: "Roboto", sans-serif;
         font-weight: 700;
         font-size: 13px;
         transition: color 0.3s linear;
@@ -406,7 +441,7 @@ header #rectangle {
         background-color: #fff;
         border: 2px solid #F46386;
         border-radius: 6px;
-        font-family: "Roboto" sans-serif;
+        font-family: "Roboto", sans-serif;
         font-weight: 700;
         font-size: 13px;
         transition: color 0.3s linear;

diff --git a/frontend/src/pages/CalendarRoute.jsx b/frontend/src/pages/CalendarRoute.jsx
@@ -1,5 +1,5 @@
 import React, {useContext, useEffect, useState} from "react";
-import { getNetologyCourse, bulkEvents } from "../services/api/login";
+import { getNetologyCourse, bulkEvents } from "../services/api";
 import {AuthContext} from "../context/AuthContext"; // Импортируем API функции
 
 const CalendarRoute = () => {

diff --git a/frontend/src/pages/LoginRoute.jsx b/frontend/src/pages/LoginRoute.jsx
@@ -1,7 +1,7 @@
 import {useContext, useState} from "react";
 import { useNavigate } from "react-router-dom";
 import {AuthContext} from "../context/AuthContext";
-import {loginModeus, searchModeus} from "../services/api/login";
+import {loginModeus, searchModeus} from "../services/api";
 
 const LoginRoute = () => {
     const { setAuthData } = useContext(AuthContext); // Достаем setAuthData из контекста

diff --git a/frontend/src/services/api/login.js → frontend/src/services/api.js b/frontend/src/services/api/login.js → frontend/src/services/api.js
@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { BACKEND_URL } from '../../variables';
+import { BACKEND_URL } from '../variables';
 
 
 export function getTokenFromLocalStorage() {