-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #105 from mikeiken:main-functional
Partial design update
- Loading branch information
Showing
30 changed files
with
1,701 additions
and
764 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 12 additions & 14 deletions
26
frontend/src/components/auth/login/components/background.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,18 @@ | ||
| import React from 'react' | ||
| import './auth-style.css' | ||
| import Form from './form' | ||
| import React from "react"; | ||
| import "./auth-style.css"; | ||
| import Form from "./form"; | ||
|
|
||
| export default function AuthFormBackgroundComponent() { | ||
| return ( | ||
| <div className='intro'> | ||
| <div className='video'> | ||
| <img | ||
| src={process.env.PUBLIC_URL + '/tenor.gif'} | ||
| alt="Background GIF" | ||
| className="background-video" | ||
| /> | ||
| </div> | ||
| <div className='main-wrapper'> | ||
| <Form /> | ||
| <div className="intro"> | ||
| <div className="auth-page-wrapper"> | ||
| <div className="waves"></div> | ||
| <div className="waves"></div> | ||
| <div className="waves"></div> | ||
| <div className="main-wrapper"> | ||
| <Form /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ) | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
frontend/src/components/auth/login/components/welocme/Welcome.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| import React, { useState, useEffect } from "react"; | ||
|
|
||
| export default function Welcome() { | ||
| // Массив с приветствиями | ||
| const greetings = [ | ||
| "Привет", // Русский | ||
| "Hello", // Английский | ||
| "Hola", // Испанский | ||
| "Bonjour", // Французский | ||
| "Ciao", // Итальянский | ||
| "こんにちは", // Японский | ||
| "안녕하세요", // Корейский | ||
| "Hallo", // Немецкий | ||
| "Olá", // Португальский | ||
| "Nǐ hǎo", // Китайский | ||
| ]; | ||
|
|
||
| const [greeting, setGreeting] = useState(greetings[0]); | ||
|
|
||
| const [isVisible, setIsVisible] = useState(false); | ||
|
|
||
| useEffect(() => { | ||
| setIsVisible(true); | ||
|
|
||
| const interval = setInterval(() => { | ||
| setIsVisible(false); | ||
| setTimeout(() => { | ||
| setGreeting((prevGreeting) => { | ||
| const currentIndex = greetings.indexOf(prevGreeting); | ||
| const nextIndex = (currentIndex + 1) % greetings.length; | ||
| return greetings[nextIndex]; | ||
| }); | ||
| setIsVisible(true); | ||
| }, 1000); | ||
| }, 3000); | ||
|
|
||
| return () => clearInterval(interval); | ||
| }, []); | ||
| return ( | ||
| <> | ||
| <h1 className={isVisible ? "show" : ""}>{greeting}</h1>{" "} | ||
| </> | ||
| ); | ||
| } |
Oops, something went wrong.