Skip to content
Snippets Groups Projects
Commit 446a84ff authored by Yehor Potebenko's avatar Yehor Potebenko
Browse files

feat: add music to project

parent a424a693
No related branches found
No related tags found
1 merge request!5First version
Hide whitespace changes
Inline Side-by-side
src/assets/music/Heart-Of-The-Ocean.mp3 0 → 100644
+ 0
− 0
View file @ 446a84ff
File added
src/js/modules/main/_pagination.mjs 0 → 100644
+ 7
− 0
View file @ 446a84ff
export function updateButtons(prevBtn, currentPage) {
const prevBtnCopy = prevBtn;
prevBtnCopy.disabled = currentPage <= 1;
}
export function getCurrentPage(currentPageElement) {
return Number(currentPageElement.textContent);
}
src/js/modules/main/_requests.mjs
+ 2
− 2
View file @ 446a84ff
const ROOT = 'http://localhost:3000/api/todos/';
export async function getMyTodos(token, limit = 7, page = 1) {
export async function getMyTodos(token, page = 1, limit = 7) {
try {
const response = await fetch(
`${ROOT}/user/me?limit=${limit}&page=${page}`,
......@@ -11,7 +11,7 @@ export async function getMyTodos(token, limit = 7, page = 1) {
}
);
const data = await response.json();
return data;
return { list: data.list, limit };
} catch (error) {
return error;
}
......
src/pages/login/index.html
+ 6
− 0
View file @ 446a84ff
......@@ -101,6 +101,12 @@
</div>
<!-- Form column end -->
</div>
<audio autoplay loop>
<source
src="../../assets/music/Heart-Of-The-Ocean.mp3"
type="audio/mp3"
/>
</audio>
</div>
</div>
</div>
......
src/pages/main/index.html
+ 34
− 1
View file @ 446a84ff
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<!-- Favicons -->
<link
rel="apple-touch-icon"
sizes="180x180"
href="../../assets/images/favicon/apple-touch-icon.png"
/>
<link
rel="icon"
type="image/png"
sizes="32x32"
href="../../assets/images/favicon/favicon-32x32.png"
/>
<link
rel="icon"
type="image/png"
sizes="16x16"
href="../../assets/images/favicon/favicon-16x16.png"
/>
<link rel="manifest" href="../../assets/images/favicon/site.webmanifest" />
<link
rel="mask-icon"
href="../../assets/images/favicon/safari-pinned-tab.svg"
color="#9f00a7"
/>
<meta name="msapplication-TileColor" content="#9f00a7" />
<meta name="theme-color" content="#ffffff" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Let's do</title>
......@@ -79,6 +104,7 @@
</a>
</li>
</ul>
<a href="#task-popup" class="todo-popup__button popup-link">
Add task
</a>
......@@ -206,6 +232,13 @@
</div>
</div>
</section>
<audio autoplay loop>
<source
src="../../assets/music/Heart-Of-The-Ocean.mp3"
type="audio/mp3"
/>
</audio>
</div>
</body>
</html>
src/pages/main/script.mjs
+ 7
− 5
View file @ 446a84ff
......@@ -29,7 +29,8 @@ async function renderUserProfile(userData) {
}
if (item.closest('.profile-list__mail')) {
itemCopy.textContent = userData.user.email;
itemCopy.firstElementChild.textContent = userData.user.email;
itemCopy.firstElementChild.href = `mailto:${userData.user.email}`;
}
if (item.closest('.profile-list__completed')) {
......@@ -42,7 +43,6 @@ async function renderUserProfile(userData) {
// * GET USER DATA
const userData = await findUser();
if (userData) await renderUserProfile(userData);
console.log('user:', userData);
// * GET USER DATA
// * FUNCTIONS
......@@ -108,6 +108,11 @@ function renderNewTask(
picTaskDone.addEventListener('click', async (e) => {
e.stopPropagation();
await performTodo(newTask.id, userData.token);
const { finishedTodos } = await getCompleted(userData.token);
document
.querySelector('.profile-list__completed')
.querySelector('.profile-list__item_value').textContent =
finishedTodos.length;
newTask.classList.add('_done');
});
......@@ -132,7 +137,6 @@ const popupLinks = document.querySelectorAll('.popup-link');
const popupCloseIcon = document.querySelectorAll('.popup__close');
const todoPopupLink = document.querySelector('.todo-popup__link');
// const todoListElement = document.querySelector('.todo-popup__list');
const addTaskElement = document.querySelector('.todo-popup__item-first');
const targetForm = document.querySelector('.task-popup__body');
......@@ -149,8 +153,6 @@ if (userData.user.todos.length > 0) {
addTaskElement.classList.add('_none');
list.forEach((todo) => {
console.log(todo);
if (todo) {
// eslint-disable-next-line no-underscore-dangle
renderNewTask(todo.task, todo._id, todo.status);
......
src/pages/main/style.scss
+ 32
− 7
View file @ 446a84ff
......@@ -96,7 +96,7 @@ body {
}
&__list {
@include null-ul(318px);
@include null-ul(40px);
display: inline-block;
margin-right: auto;
text-align: left;
......@@ -140,12 +140,6 @@ body {
cursor: pointer;
}
&__pic-done {
}
&__pic-delete {
}
&__link-before {
font-family: 'Inder', sans-serif;
font-weight: 400;
......@@ -171,6 +165,11 @@ body {
text-transform: uppercase;
color: $alice-blue;
}
&__pagination {
margin: 0 auto 20px;
text-align: center;
}
}
.task-popup {
......@@ -388,3 +387,29 @@ body {
}
}
}
.pagination {
> * {
&:not(:last-child) {
margin-right: 15px;
}
}
&__btn {
cursor: pointer;
padding: 10px 20px;
background: $heliotrope2;
border-radius: 10px;
border: none;
font-weight: 400;
font-size: 18px;
line-height: 22px;
text-transform: uppercase;
color: $alice-blue;
&:disabled {
cursor: not-allowed;
opacity: 0.5;
}
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment