Skip to content

Commit

Permalink
Final changes
Browse files Browse the repository at this point in the history
  • Loading branch information
alex090890 committed May 16, 2024
1 parent e1cd247 commit b98236a
Show file tree
Hide file tree
Showing 5 changed files with 59 additions and 37 deletions.
28 changes: 26 additions & 2 deletions client/src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,14 @@ body {
box-shadow: 0 0 10px rgba(71, 170, 205, 0.685);
}

.regbutton-bottom {
width: 100px;
}

.main {
margin: 10px 0;
width: 100%;
padding: 20px;
width: 100vw;
text-align: center;
}

.main>h1 {
Expand Down Expand Up @@ -245,6 +249,26 @@ label {
margin-top: 20px;
}

.welcome-header {
text-align: center;
font-family: 'Comic Sans MS', sans-serif;
width: 100vw;
padding-top: 20px;
}

.welcome-text {
text-align: center;
font-family: 'Courier New', Courier, monospace;
width: 100vw;
}

.welcome-img {
width: 40%;
margin-top: 40px;
height: 80%;
text-align: center;
margin: 20px auto;
}

@media screen and (max-width: 600px) {
.header {
Expand Down
26 changes: 10 additions & 16 deletions client/src/components/Home-De.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,17 @@ export default function HomeEN() {
<h1>WordWeb</h1>
<h2>Eine kostenlose, einfache Website, auf der Sie sich alles merken können!</h2>
</div>
<div className="main">
<h1>Willkommen zu WordWeb!</h1>
<p>Suchen Sie nach einer kostenlosen Website, die ein wichtiges Hilfsmittel beim Erlernen einer Sprache sein kann?</p>
<p>Nun, Sie können beruhigt aufatmen, denn Ihre lange Suche hat ein Ende!</p>
<h3>Hier sind die wichtigsten Funktionen:</h3>
<ul>
<li>Ganz <b>kostenlos</b>;</li>
<li>100% <b>Werbung-frei</b>;</li>
<li>Einfach zu nutzen;</li>
<li>Sie können Karteikarten jederzeit hinzufügen, bearbeiten oder löschen</li>
<li>Benutzerfreundliches Design</li>
</ul>
<div className="logincomponent">
<Button variant="primary" className="regbutton" onClick={() => navigate('/de/login')}>Anmelden</Button>
<Button variant="primary" className="regbutton" onClick={() => navigate('/de/register')}>Registrieren</Button>
<div className="welcome-div">
<div className="welcome-container">
<div className="main">
<h1 className="welcome-header">Willkommen zu WordWeb!</h1>
<img src="https://res.cloudinary.com/dosvnb1kk/image/upload/v1715882574/Main_Features_2_eiyzso.png" className="welcome-img" />

<p className="welcome-text">Suchen Sie nach einer kostenlosen Website, die ein wichtiges Hilfsmittel beim Erlernen einer Sprache sein kann?</p>
<p className="welcome-text">Nun, Sie können beruhigt aufatmen, denn Ihre lange Suche hat ein Ende!</p>
</div>
</div>
</div>
</div>
<Footer />
</div>
)
Expand Down
26 changes: 10 additions & 16 deletions client/src/components/Home-EN.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,17 @@ export default function HomeEN() {
<h1>WordWeb</h1>
<h2>A free easy website to make flashcards!</h2>
</div>
<div className="main">
<h1>Welcome to WordWeb!</h1>
<p>Are you looking for a free website that can become an important tool in learning a language?</p>
<p>Well, you can breathe easily as your long search is over!</p>
<h3>Here are the key features:</h3>
<ul>
<li>Completely <b>cost-free</b>;</li>
<li>100% <b>ad-free</b>;</li>
<li>Easy to use;</li>
<li>Add, edit, delete flashcards anytime you wish</li>
<li>Easy-to-use design</li>
</ul>
<div className="logincomponent">
<Button variant="primary" className="regbutton" onClick={() => navigate('/login')}>Login</Button>
<Button variant="primary" className="regbutton" onClick={() => navigate('/register')}>Register</Button>
<div className="welcome-div">
<div className="welcome-container">
<div className="main">
<h1 className="welcome-header">Welcome to WordWeb!</h1>
<img src="https://res.cloudinary.com/dosvnb1kk/image/upload/v1715880929/Main_Features_1_rk7zzv.png" className="welcome-img" />

<p className="welcome-text">Are you looking for a free website that can become an important tool in learning a language?</p>
<p className="welcome-text">Well, you can breathe easily as your long search is over!</p>
</div>
</div>
</div>
</div>
</div>
<Footer />
</div>
Expand Down
14 changes: 12 additions & 2 deletions client/src/components/Home-UA.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default function HomeEN() {
<h1>WordWeb</h1>
<h2>Легкий безкоштовний сервіс для вивчення нових слів</h2>
</div>
<div className="main">
{/*<div className="main">
<h1>Ласкаво просимо до WordWeb!</h1>
<p>Ви шукаєте безкоштовний сервіс для вивчення мови?</p>
<p>Що ж, ви можете видихнути спокійно, оскільки ваш пошук дійшов до кінця!</p>
Expand All @@ -42,7 +42,17 @@ export default function HomeEN() {
<Button variant="primary" className="regbutton" onClick={() => navigate('/ua/login')}>Увійти</Button>
<Button variant="primary" className="regbutton" onClick={() => navigate('/ua/register')}>Зареєструватися</Button>
</div>
</div>
</div>*/}
<div className="welcome-div">
<div className="welcome-container">
<div className="main">
<h1 className="welcome-header">Ласкаво просимо до WordWeb!</h1>
<img src="https://res.cloudinary.com/dosvnb1kk/image/upload/v1715884259/Main_Features_3_wmf92p.png" className="welcome-img" />
<p className="welcome-text">Ви шукаєте безкоштовний сервіс для вивчення мови?</p>
<p className="welcome-text">Що ж, ви можете видихнути спокійно, оскільки ваш пошук добіг до кінця!</p>
</div>
</div>
</div>
<Footer />
</div>
)
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/styles/Footer.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.footer {
text-align: center;
color: gray;

margin-top: 20px;
}

0 comments on commit b98236a

Please sign in to comment.