diff --git a/src/App.css b/src/App.css index f11b433..97238c6 100644 --- a/src/App.css +++ b/src/App.css @@ -5,33 +5,6 @@ } -.content__container { - height: 100vh; - width: 400px; - display: flex; - justify-content: center; - align-items: center; - border-width: 0px 2px; - border-style: solid; - border-color: #23242a; -} - -.popup { - border-radius: 4px; - width: 100%; - background: transparent; - padding: 56px; - box-sizing: border-box; - z-index: 99; -} - -.card-title-container { - margin-top: 136px; - display: flex; - justify-content: center; - align-items: center; - margin-bottom: 64px; -} .card-container { @@ -63,10 +36,7 @@ border-radius: 16px; } -.popup-container { - display: flex; - justify-content: center; -} + @@ -83,6 +53,7 @@ .card-title-container { margin-top: 96px; } + .card-container { gap: 20px; diff --git a/src/App.tsx b/src/App.tsx index 13588c6..d90626f 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -10,7 +10,7 @@ import cookies from "js-cookie"; import { Header } from "components/shared/Header/Header"; import { Card } from "components/pages/Main/Card/Card"; -import { PopupComponent } from "components/pages/ConnectPage/PopupComponent/PopupComponent"; +import { SessionStartComponent } from "components/pages/ConnectPage/SessionStartComponent/SessionStartComponent"; import { PlayerComponent } from "components/pages/Stream/components/PlayerComponent/PlayerComponent"; import { PlanComponent } from "components/pages/Plan/PlanComponent"; @@ -63,7 +63,6 @@ const App: React.FC = () => { } else if (handleCookiesLanguage()) { const languageCookies = handleCookiesLanguage() - console.log(languageCookies) dispatch(handleChangeLanguage(languageCookies as string)) return } @@ -122,7 +121,7 @@ const App: React.FC = () => {
- +
diff --git a/src/components/pages/ConnectPage/ConnectComponent/ConnectComponent.css b/src/components/pages/ConnectPage/ConnectComponent/ConnectComponent.css new file mode 100644 index 0000000..646907c --- /dev/null +++ b/src/components/pages/ConnectPage/ConnectComponent/ConnectComponent.css @@ -0,0 +1,79 @@ + +.content__container { + height: 100vh; + width: 400px; + display: flex; + justify-content: center; + align-items: center; + border-width: 0px 2px; + border-style: solid; + border-color: #23242a; + } + + .popup-container { + display: flex; + justify-content: center; + } + + .popup { + border-radius: 4px; + width: 100%; + background: transparent; + padding: 56px; + box-sizing: border-box; + z-index: 99; + } + + .card-title-container { + margin-top: 136px; + display: flex; + justify-content: center; + align-items: center; + margin-bottom: 64px; + } + + + +.popup-img-container { + height: 94px; + width: 100%; + padding: 0 21px 16px 0; + margin-bottom: 32px; + box-sizing: border-box; + +} + +.popup-logo { + height: 78px; + width: 267px; + object-fit: contain; + +} + +.popup-button-container { + display: flex; + flex-direction: column; + gap: 16px; +} + +.line { + height: 1px; + background-color: #23242A; + width: 100%; +} + + + + +@media screen and (max-width: 1000px) { + .popup-img-container { + margin-bottom: 16px; + } + +} + +@media screen and (max-width: 640px) { + .popup-connect { + padding: 16px; + } + } \ No newline at end of file diff --git a/src/components/pages/ConnectPage/PopupConnect/PopupConnect.tsx b/src/components/pages/ConnectPage/ConnectComponent/ConnectComponent.tsx similarity index 77% rename from src/components/pages/ConnectPage/PopupConnect/PopupConnect.tsx rename to src/components/pages/ConnectPage/ConnectComponent/ConnectComponent.tsx index 7e0531d..a7f8c35 100644 --- a/src/components/pages/ConnectPage/PopupConnect/PopupConnect.tsx +++ b/src/components/pages/ConnectPage/ConnectComponent/ConnectComponent.tsx @@ -1,13 +1,11 @@ -import "./PopupConnect.css"; +import "./ConnectComponent.css"; import { useHistory } from "react-router-dom"; -import { createSession } from "store/reducers/ActionCreator"; -import { useAppDispatch } from "hooks/redux"; import { useTranslation } from "react-i18next"; -export const PopupConnect: React.FC = ({ logo, isLoading, title, handleConnect }) => { +export const ConnectComponent: React.FC = ({ logo, isLoading, title, handleConnect }) => { const history = useHistory(); const { t } = useTranslation(); diff --git a/src/components/pages/ConnectPage/LoadingPopup/LoadingPopup.css b/src/components/pages/ConnectPage/LoaderComponent/LoaderComponent.css similarity index 100% rename from src/components/pages/ConnectPage/LoadingPopup/LoadingPopup.css rename to src/components/pages/ConnectPage/LoaderComponent/LoaderComponent.css diff --git a/src/components/pages/ConnectPage/LoadingPopup/LoadingPopup.tsx b/src/components/pages/ConnectPage/LoaderComponent/LoaderComponent.tsx similarity index 73% rename from src/components/pages/ConnectPage/LoadingPopup/LoadingPopup.tsx rename to src/components/pages/ConnectPage/LoaderComponent/LoaderComponent.tsx index 62777c7..eeada09 100644 --- a/src/components/pages/ConnectPage/LoadingPopup/LoadingPopup.tsx +++ b/src/components/pages/ConnectPage/LoaderComponent/LoaderComponent.tsx @@ -1,12 +1,10 @@ -import "./LoadingPopup.css"; -import { useHistory } from "react-router-dom"; +import "./LoaderComponent.css"; import { useTranslation } from "react-i18next"; -export const LoadingPopup: React.FC = ({ logo }) => { +export const LoaderComponent: React.FC = ({ logo }) => { - const history = useHistory(); const { t } = useTranslation(); return ( diff --git a/src/components/pages/ConnectPage/PopupConnect/PopupConnect.css b/src/components/pages/ConnectPage/PopupConnect/PopupConnect.css deleted file mode 100644 index d876979..0000000 --- a/src/components/pages/ConnectPage/PopupConnect/PopupConnect.css +++ /dev/null @@ -1,44 +0,0 @@ - -.popup-img-container { - height: 94px; - width: 100%; - padding: 0 21px 16px 0; - margin-bottom: 32px; - box-sizing: border-box; - -} - -.popup-logo { - height: 78px; - width: 267px; - object-fit: contain; - -} - -.popup-button-container { - display: flex; - flex-direction: column; - gap: 16px; -} - -.line { - height: 1px; - background-color: #23242A; - width: 100%; -} - - - - -@media screen and (max-width: 1000px) { - .popup-img-container { - margin-bottom: 16px; - } - -} - -@media screen and (max-width: 640px) { - .popup-connect { - padding: 16px; - } - } \ No newline at end of file diff --git a/src/components/pages/ConnectPage/PopupComponent/PopupComponent.css b/src/components/pages/ConnectPage/SessionStartComponent/SessionStartComponent.css similarity index 100% rename from src/components/pages/ConnectPage/PopupComponent/PopupComponent.css rename to src/components/pages/ConnectPage/SessionStartComponent/SessionStartComponent.css diff --git a/src/components/pages/ConnectPage/PopupComponent/PopupComponent.tsx b/src/components/pages/ConnectPage/SessionStartComponent/SessionStartComponent.tsx similarity index 68% rename from src/components/pages/ConnectPage/PopupComponent/PopupComponent.tsx rename to src/components/pages/ConnectPage/SessionStartComponent/SessionStartComponent.tsx index 7f3017f..bf2a7b2 100644 --- a/src/components/pages/ConnectPage/PopupComponent/PopupComponent.tsx +++ b/src/components/pages/ConnectPage/SessionStartComponent/SessionStartComponent.tsx @@ -3,19 +3,15 @@ import { motion, AnimatePresence } from "framer-motion"; import { popupAnimation } from "utils/animationProps"; -import { PopupConnect } from "components/pages/ConnectPage/PopupConnect/PopupConnect"; -import { LoadingPopup } from "components/pages/ConnectPage/LoadingPopup/LoadingPopup"; +import { ConnectComponent } from "components/pages/ConnectPage/ConnectComponent/ConnectComponent"; +import { LoaderComponent } from "components/pages/ConnectPage/LoaderComponent/LoaderComponent"; import { useAppDispatch } from "hooks/redux"; -import { sessionSlice } from "store/reducers/sessionSlice"; -export const PopupComponent: React.FC = ({isLoading, handleConnect, currentCard, cleanErrors}) => { +export const SessionStartComponent: React.FC = ({isLoading, handleConnect, currentCard, cleanErrors}) => { const dispatch = useAppDispatch(); - - - useEffect(() => { return () => { dispatch(cleanErrors()); @@ -32,12 +28,12 @@ export const PopupComponent: React.FC = ({isLoading, handleConnect, current animate={"show"} exit={"hidden"} > - + > )} {isLoading && ( @@ -48,7 +44,7 @@ export const PopupComponent: React.FC = ({isLoading, handleConnect, current animate={"show"} exit={"hidden"} > - + )} diff --git a/src/components/pages/Main/Card/building.png b/src/components/pages/Main/Card/building.png deleted file mode 100644 index e2755a5..0000000 Binary files a/src/components/pages/Main/Card/building.png and /dev/null differ diff --git a/src/components/pages/Main/Card/building1.png b/src/components/pages/Main/Card/building1.png deleted file mode 100644 index 6a6b47c..0000000 Binary files a/src/components/pages/Main/Card/building1.png and /dev/null differ diff --git a/src/components/pages/Main/Card/building2.png b/src/components/pages/Main/Card/building2.png deleted file mode 100644 index a6ff194..0000000 Binary files a/src/components/pages/Main/Card/building2.png and /dev/null differ diff --git a/src/components/pages/Stream/components/Player/player.css b/src/components/pages/Stream/components/Player/player.css index e3f0a8e..79f60dd 100644 --- a/src/components/pages/Stream/components/Player/player.css +++ b/src/components/pages/Stream/components/Player/player.css @@ -39,12 +39,6 @@ background: #151619; } -body { - margin: 0px; - background-color: #151619; - - font-family: 'Montserrat', sans-serif; -} h2 { font-family: "GilroyWebRegular"; diff --git a/src/components/pages/Stream/components/Sidebar/Sidebar.css b/src/components/pages/Stream/components/Sidebar/Sidebar.css index caa214d..549eb14 100644 --- a/src/components/pages/Stream/components/Sidebar/Sidebar.css +++ b/src/components/pages/Stream/components/Sidebar/Sidebar.css @@ -81,7 +81,7 @@ width: 32px; height: 128px; border: none; - background: url("openToolbarBackIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/openToolbarBackIcon.svg") 50% 50% no-repeat; background-size: 100% 100%; /* background-color: #2F80ED; */ @@ -92,11 +92,11 @@ .toolbar-open-button-icon { width: 24px; height: 24px; - background: url("pointerIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/pointerIcon.svg") 50% 50% no-repeat; } .toolbar-container.opened .toolbar-open-button-icon { - background: url("closeToolbarIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/closeToolbarIcon.svg") 50% 50% no-repeat; } .toolbar-button-area-container { @@ -267,7 +267,7 @@ width: 18px; height: 26px; background-color: #eb5757; - background: url("icons/newCaptTriangleIcon.svg"); + background: url("../../../../../images/icons/newCaptTriangleIcon.svg"); } .user-control-popup { @@ -288,12 +288,12 @@ } .toolbar-button.fullscreen.on { - background: url("./icons/openFullscreenIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/openFullscreenIcon.svg") 50% 50% no-repeat; background-color: #4f4f4f; } .toolbar-button.fullscreen { - background: url("./icons/closeFullscreenIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/fullscreen.svg") 50% 50% no-repeat; background-color: #4f4f4f; } @@ -312,57 +312,57 @@ } .toolbar-button.users { - background: url("./icons/usersIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/usersIcon.svg") 50% 50% no-repeat; background-color: #4f4f4f; } .toolbar-button.micro { - background: url("./icons/microOffIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/microOffIcon.svg") 50% 50% no-repeat; background-color: #4f4f4f; } .toolbar-button.micro.on { - background: url("./icons/microOnIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/microOnIcon.svg") 50% 50% no-repeat; background-color: #4f4f4f; } .toolbar-button.control { - background: url("./icons/constrolOffIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/constrolOffIcon.svg") 50% 50% no-repeat; background-color: #4f4f4f; } .toolbar-button.control.on { - background: url("./icons/constrolOnIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/constrolOnIcon.svg") 50% 50% no-repeat; background-color: #4f4f4f; } .toolbar-button.other { - background: url("./icons/othertIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/othertIcon.svg") 50% 50% no-repeat; background-color: #4f4f4f; } .toolbar-button.sound { - background: url("./icons/soundOffIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/soundOffIcon.svg") 50% 50% no-repeat; background-color: #4f4f4f; } .toolbar-button.sound.on { - background: url("./icons/soundOnIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/soundOnIcon.svg") 50% 50% no-repeat; background-color: #4f4f4f; } .toolbar-button.exit { - background: url("./icons/exitIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/exitIcon.svg") 50% 50% no-repeat; background-color: #eb5757; } .toolbar-button.copy { - background: url("./icons/copyIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/copyIcon.svg") 50% 50% no-repeat; background-color: #4f4f4f; } .toolbar-button.share { - background: url("./icons/shareIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/shareIcon.svg") 50% 50% no-repeat; background-color: #4f4f4f; } @@ -371,12 +371,12 @@ } .toolbar-button.language.ru { - background: url("./icons/ruIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/ruIcon.svg") 50% 50% no-repeat; background-color: #4f4f4f; } .toolbar-button.language.en { - background: url("./icons/enIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/enIcon.svg") 50% 50% no-repeat; background-color: #4f4f4f; } @@ -431,14 +431,14 @@ .toolbar-button.large.control .toolbar-button-large-view-icon { width: 24px; height: 24px; - background: url("icons/constrolOffIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/constrolOffIcon.svg") 50% 50% no-repeat; background-size: 100% 100%; } .toolbar-button.large.control.on .toolbar-button-large-view-icon { width: 24px; height: 24px; - background: url("icons/constrolOnIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/constrolOnIcon.svg") 50% 50% no-repeat; background-size: 100% 100%; } @@ -471,7 +471,7 @@ .toolbar-button.yes .toolbar-button-medium-view-icon { width: 24px; height: 24px; - background: url("icons/constrolOnIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/constrolOnIcon.svg") 50% 50% no-repeat; background-size: 100% 100%; } @@ -487,7 +487,7 @@ .toolbar-button.no .toolbar-button-medium-view-icon { width: 24px; height: 24px; - background: url("icons/constrolOffIcon.svg") 50% 50% no-repeat; + background: url("../../../../../images/icons/constrolOffIcon.svg") 50% 50% no-repeat; background-size: 100% 100%; } diff --git a/src/components/pages/Stream/components/SidebarDesktop/SidebarDesktop.tsx b/src/components/pages/Stream/components/SidebarDesktop/SidebarDesktop.tsx index a6355de..496fb03 100644 --- a/src/components/pages/Stream/components/SidebarDesktop/SidebarDesktop.tsx +++ b/src/components/pages/Stream/components/SidebarDesktop/SidebarDesktop.tsx @@ -165,7 +165,7 @@ export const SidebarDesktop: React.FC = ({ exit={"hidden"} > diff --git a/src/components/pages/Stream/components/SidebarMobile/SidebarMobile.tsx b/src/components/pages/Stream/components/SidebarMobile/SidebarMobile.tsx index b92193c..224a8a7 100644 --- a/src/components/pages/Stream/components/SidebarMobile/SidebarMobile.tsx +++ b/src/components/pages/Stream/components/SidebarMobile/SidebarMobile.tsx @@ -90,7 +90,7 @@ export const SidebarMobile: React.FC = ({ height, isMobile, handleLanguage, animate={"show"} exit={"hidden"} > - setUserListPopup(false)} isMobile={isMobile}> + setUserListPopup(false)} isMobile={isMobile}> )} {popupAdditional && ( = ({ onClick, isSidebarWide }) => { return (