Skip to content

Feature/issue 35 #42

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

Merged
Urszuja merged 9 commits into from
Dec 16, 2021
Merged

Feature/issue 35 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5378e6b
add button component in main page
Urszuja Dec 14, 2021
e1bce99
Merge branch 'develop' of https://github.com/Nefariusek/CodersCamp202…
Urszuja Dec 14, 2021
64265df
merge
Urszuja Dec 15, 2021
7fd9e8f
added links
Urszuja Dec 15, 2021
81312e7
add callback function goToPage for main page buttons
Urszuja Dec 15, 2021
120915c
add nav handler, clean code
Urszuja Dec 16, 2021
d90714d
Merge branch 'develop' into feature/issue-35
Urszuja Dec 16, 2021
466b6e7
onNavigationChange function moved to Router.js
Urszuja Dec 16, 2021
4af5ebc
Merge branch 'develop' into feature/issue-35
Urszuja Dec 16, 2021
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
1 change: 1 addition & 0 deletions src/components/Button/Button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ button {
text-transform: uppercase;
margin-bottom: 20px;
width: 200px;
font-weight: bold;
}

button:hover {
Expand Down
4 changes: 4 additions & 0 deletions src/components/router/Router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,7 @@ export function Router() {
app.innerHTML = '';
setRenderFunction(url)();
}

export function onNavigationChange(e) {
window.location.hash = e.target.className;
}
6 changes: 4 additions & 2 deletions src/views/MainPage/MainPage.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
grid-area: nav;
display: flex;
justify-content: center;
align-items: start;
align-items: center;
flex-direction: column;
}

.navigation-container ul {
Expand All @@ -44,7 +45,8 @@
padding: 0;
}

.navigation-container li {
.navigation-container li,
.wrapper {
position: relative;
}

Expand Down
19 changes: 11 additions & 8 deletions src/views/MainPage/MainPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import Button from '../../components/Button/Button.js';
import './MainPage.css';
import { onNavigationChange } from '../../components/router/Router.js';

const MAIN_ANIMAL_PATH = './public/kangoroo.png';
const FACT_ANIMAL_URL = 'http://placekitten.com/400/500';
Expand All @@ -18,14 +20,6 @@ function renderMainView() {
</div>

<div class="navigation-container">
<nav>
<ul>
<li><a href="#quiz-settings" data-name="StartQuiz">Start quiz</a></li>
<li><a href="#" data-name="Leaderboard">Leaderboard </a></li>
<li><a href="#" data-name="Adoption">Adoption </a></li>
<li><a href="#" data-name="Credits">Credits</a></li>
</ul>
</nav>
</div>

<div class="info">
Expand Down Expand Up @@ -62,6 +56,15 @@ function renderMainView() {
`;

const navContainer = document.querySelector('.navigation-container');

const handleNavigationButtonClick = (e) => onNavigationChange(e);

const quizButton = Button('Start Quiz', 'quiz-settings', true, 'click', handleNavigationButtonClick);
const leaderboardButton = Button('Leaderboard', 'whatever', true, 'click', handleNavigationButtonClick);
const adoptionButton = Button('Adoption', 'adoption-button', true, 'click', handleNavigationButtonClick);
const creditsButton = Button('Credits', 'credits-button', true, 'click', handleNavigationButtonClick);

navContainer.append(quizButton, leaderboardButton, adoptionButton, creditsButton);
const navItems = navContainer.querySelectorAll('a');

navItems.forEach((item) => {
Expand Down