Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

10-final_vBrusentsov #441

Closed
wants to merge 12 commits into from
Closed

10-final_vBrusentsov #441

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7262d12
feat: add footer and adaptive layout
vBrusentsov Dec 23, 2023
78c72dc
Merge branch '9-async_vBrusentsov' into 10-final_vBrusentsov
vBrusentsov Dec 23, 2023
879cea3
fix: refactor of layout errors
vBrusentsov Dec 25, 2023
c94ce72
Merge branch 'main' into 10-final_vBrusentsov
vBrusentsov Dec 26, 2023
eb0b654
Update gamesStyle.css
vBrusentsov Dec 27, 2023
7cf9363
feat: add games project to my repo
vBrusentsov Dec 27, 2023
dff3d28
Update calculator.css
vBrusentsov Dec 27, 2023
697a590
fix: remove line-height in .calculate-operation
vBrusentsov Dec 27, 2023
f81fa95
fix: logic button go to the home
vBrusentsov Dec 27, 2023
1e15694
Merge branch 'MastersAcademy:10-final_vBrusentsov' into 10-final_vBru…
vBrusentsov Dec 27, 2023
de21fbd
Merge pull request #450 from vBrusentsov/10-final_vBrusentsov
vBrusentsov Dec 27, 2023
f0d29dd
add link on project
vBrusentsov Jan 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions homeworks/vladyslav.brusentsov_vBrusentsov/GamesProject/Img/facebook-logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions homeworks/vladyslav.brusentsov_vBrusentsov/GamesProject/Img/instagram-logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions homeworks/vladyslav.brusentsov_vBrusentsov/GamesProject/Img/linkedin-logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 12 additions & 2 deletions ...ntsov_vBrusentsov/GamesProject/index.html → ...ntsov_vBrusentsov/GamesProject/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<a href="./games.html">Games</a>
</li>
<li>
<a href="./index.html">About</a>
<a href="./about.html">About</a>
</li>
<li>
<a href="./login.html">Login</a>
Expand All @@ -28,7 +28,7 @@
</nav>
</header>
<main class="main__section">
<img src="./Img/image.svg" width="532px" height="356px">
<img class="about-image" src="./Img/image.svg">
<div class="about-main__content">
<h1 class="about-me__header">About me</h1>
<p>
Expand All @@ -45,6 +45,16 @@ <h1 class="about-me__header">About me</h1>
</p>
</div>
</main>
<footer class="footer">
<div class="social-links">
<img class="facebook-logo" src="./Img/facebook-logo.svg">
<img class="linkedin-logo" src="./Img/linkedin-logo.svg">
<img class="instagram-logo" src="./Img/instagram-logo.svg">
</div>
<p class="info-author">
Made with 💗 on course <a class="link-to-ma" href="https://www.mastersacademy.education/frontend-for-beginners-it"> 'Frontend for beginners' from Masters Academy in 2023,</a> by Vladyslav Brusentsov.
</p>
</footer>
<footer></footer>
</body>
</html>
12 changes: 11 additions & 1 deletion homeworks/vladyslav.brusentsov_vBrusentsov/GamesProject/calculator.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<a href="./games.html">Games</a>
</li>
<li>
<a href="./index.html">About</a>
<a href="./about.html">About</a>
</li>
<li>
<a href="./login.html">Login</a>
Expand Down Expand Up @@ -51,6 +51,16 @@ <h1>Calculator v. 1</h1>
<h2 id="calculate-opertaion" class="calculate-opertaion"></h2>
</div>
</main>
<footer class="footer">
<div class="social-links">
<img class="facebook-logo" src="./Img/facebook-logo.svg">
<img class="linkedin-logo" src="./Img/linkedin-logo.svg">
<img class="instagram-logo" src="./Img/instagram-logo.svg">
</div>
<p class="info-author">
Made with 💗 on course <a class="link-to-ma" href="https://www.mastersacademy.education/frontend-for-beginners-it"> 'Frontend for beginners' from Masters Academy in 2023,</a> by Vladyslav Brusentsov.
</p>
</footer>
<script src="./script/calculator.js"></script>
<script src="./script/script.js"></script>
</body>
Expand Down
22 changes: 17 additions & 5 deletions homeworks/vladyslav.brusentsov_vBrusentsov/GamesProject/css/aboutStyle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
body {
gap: 60px;
}

.main__section {
display: flex;
max-width: 1175px;
max-height: 479px;
margin-top: 60px;
flex: 1;
padding: 0 30px;
}

.about-main__content {
Expand All @@ -15,6 +13,12 @@ body {
gap: 24px;
}

.about-image {
display: flex;
max-width: 100%;
max-height: 356px;
}

.about-me__header {
font-family: Roboto;
font-size: 48px;
Expand All @@ -41,3 +45,11 @@ body {
color: #EF4934;
}

@media screen and (max-width: 768px) {

.main__section {
display: flex;
flex-direction: column;
gap: 30px;
}
}
8 changes: 2 additions & 6 deletions homeworks/vladyslav.brusentsov_vBrusentsov/GamesProject/css/calculator.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
body {
gap: 60px;
}

.main {
display: flex;
flex-direction: column;
justify-content: center;
max-width: 1175px;
max-height: 479px;
flex: 1;
}

.main h1 {
Expand All @@ -22,6 +17,7 @@ body {

.field {
display: flex;
justify-content: center;
gap: 16px;
}

Expand Down
33 changes: 31 additions & 2 deletions homeworks/vladyslav.brusentsov_vBrusentsov/GamesProject/css/gamesStyle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,9 +235,9 @@


.main-section {
display: flex;
flex-direction: column;
align-items: center;
margin-top: 100px;
flex: 1;
}

.main-header {
Expand All @@ -252,11 +252,14 @@
max-width: 1175px;
align-items: flex-start;
margin-top: 40px;
justify-content: center;
flex: 1;
}

.card-list {
display: grid;
flex-wrap: wrap;
flex: 1;
list-style: none;
padding: 0;
margin: 0;
Expand Down Expand Up @@ -346,3 +349,29 @@
font-weight: 400;
line-height: 21px;
}

@media screen and (max-width: 768px) {

.games-filter {
flex-direction: column;
padding: 15px;
gap: 15px;
}

.main-header {
display: flex;
justify-content: center;
text-align: center;
}

.card-list {
grid-template-columns: 1fr 1fr 1fr;
}
}

@media screen and (max-width: 425px) {

.card-list {
grid-template-columns: 1fr 1fr;
}
}
6 changes: 2 additions & 4 deletions homeworks/vladyslav.brusentsov_vBrusentsov/GamesProject/css/login.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
body {
gap: 80px;
}

.login-main-section {
display: inline-flex;
flex-direction: column;
align-items: center;
gap: 60px;
min-width: 25%;
margin-top: 80px;
flex: 1;
}

.login-header {
Expand Down
47 changes: 46 additions & 1 deletion homeworks/vladyslav.brusentsov_vBrusentsov/GamesProject/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,18 @@
font-family: Roboto;
}

/* .wrapper {
flex: 1;
width: 100%;
align-items: center;
} */

body {
display: flex;
align-items: center;
flex-direction: column;
width: 100%;
min-height: 100vh;
margin: 0;
}

Expand All @@ -17,7 +25,6 @@ body {
padding: 11px 53px;
justify-content: space-between;
width: 100%;
max-height: 80px;
background-color: #EF4934;
align-items: center;
position: relative;
Expand Down Expand Up @@ -46,3 +53,41 @@ body {
.nav-menu a:hover {
color: #1085B7;
}

.footer {
display: flex;
flex-direction: column;
width: 100%;
background-color: #221F1F;
align-items: center;
padding: 0 30px;
margin-top: 30px;
}

.social-links {
display: flex;
margin-top: 30px;
gap: 33px;
}

.info-author {
font-size: 22px;
font-style: normal;
font-weight: 400;
color: #FFF;
}

.link-to-ma {
color: #FFF;
text-decoration: none;
}

@media screen and (max-width: 768px) {

.nav-menu ul {
display: flex;
flex-direction: column;
align-items: center;
gap: 20px;
}
}
10 changes: 6 additions & 4 deletions homeworks/vladyslav.brusentsov_vBrusentsov/GamesProject/css/successfulLogin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
body {
gap: 80px;
}

.successful-login-main {
display: inline-flex;
flex-direction: column;
align-items: center;
gap: 60;
flex: 1;
min-width: 25%;
margin: 80px 30px;
}

.successful-login-header {
Expand All @@ -16,6 +14,8 @@ body {
font-style: normal;
font-weight: 700;
line-height: 66%;
justify-content: center;
text-align: center;
}

.message-for-user {
Expand All @@ -24,6 +24,7 @@ body {
font-weight: 400;
font-style: normal;
line-height: 32px;
text-align: center;
}

.go-to-home-form {
Expand All @@ -46,4 +47,5 @@ body {
font-weight: 600;
line-height: normal;
color: #FFF;
width: 100%;
}
15 changes: 12 additions & 3 deletions homeworks/vladyslav.brusentsov_vBrusentsov/GamesProject/games.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<a href="./games.html">Games</a>
</li>
<li>
<a href="./index.html">About</a>
<a href="./about.html">About</a>
</li>
<li>
<a href="./login.html">Login</a>
Expand Down Expand Up @@ -65,7 +65,7 @@
<button type="button" id="applyButton">Apply</button>
</form>
</div>
<main class="main__section">
<main class="main-section">
<h1 class="main-header">Study project "Games"</h1>
<div class="loading-overlay" id="loading-overlay">
<div class="loading-spinner" id="loading-spinner"></div>
Expand All @@ -75,7 +75,16 @@ <h1 class="main-header">Study project "Games"</h1>
<ul class="card-list" data-type="card-container"></ul>
</div>
</main>
<footer></footer>
<footer class="footer">
<div class="social-links">
<img class="facebook-logo" src="./Img/facebook-logo.svg">
<img class="linkedin-logo" src="./Img/linkedin-logo.svg">
<img class="instagram-logo" src="./Img/instagram-logo.svg">
</div>
<p class="info-author">
Made with 💗 on course <a class="link-to-ma" href="https://www.mastersacademy.education/frontend-for-beginners-it"> 'Frontend for beginners' from Masters Academy in 2023,</a> by Vladyslav Brusentsov.
</p>
</footer>
<template id="card-template" data-card-template>
<li class="card">
<div class="main-card-header">
Expand Down
12 changes: 11 additions & 1 deletion homeworks/vladyslav.brusentsov_vBrusentsov/GamesProject/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<a href="./games.html">Games</a>
</li>
<li>
<a href="./index.html">About</a>
<a href="./about.html">About</a>
</li>
<li>
<a href="./login.html">Login</a>
Expand Down Expand Up @@ -48,6 +48,16 @@ <h1 class="login-header">Login page</h1>
<button class="login-main-submit-button" id="login-main-submit-button" type="button">Login</button>
</form>
</main>
<footer class="footer">
<div class="social-links">
<img class="facebook-logo" src="./Img/facebook-logo.svg">
<img class="linkedin-logo" src="./Img/linkedin-logo.svg">
<img class="instagram-logo" src="./Img/instagram-logo.svg">
</div>
<p class="info-author">
Made with 💗 on course <a class="link-to-ma" href="https://www.mastersacademy.education/frontend-for-beginners-it"> 'Frontend for beginners' from Masters Academy in 2023,</a> by Vladyslav Brusentsov.
</p>
</footer>
<script src="./script/logining-veryfication-script.js"></script>
</body>
</html>
Loading
Loading