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

Final #159

Merged
merged 7 commits into from
Jun 10, 2022
Merged

Final #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8e8ac1f
first commit
marti-midna Jun 9, 2022
2374eb8
player customized
marti-midna Jun 9, 2022
101493d
fixed button filter
marti-midna Jun 9, 2022
be04ac7
fix
giuseppefavaro Jun 10, 2022
1317ebe
feat: responsive card
giuseppefavaro Jun 10, 2022
e71b671
cancel console.log
marti-midna Jun 10, 2022
6c1a4bf
cancel //
marti-midna Jun 10, 2022
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
42 changes: 19 additions & 23 deletions components/CardAlbum/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,25 @@ export default function CardAlbum({ allData, inputSearchValue }) {

.map((el) => (
<div className={styles.CardAlbum} key={el.id}>
<div className={styles.CardAlbum__container}>
<Link
href={
el.iam === "album" ? `album/${el.id}` : `playlist/${el.id}`
}
key={el.id}
>
<a>
<div className={styles.CardAlbum__container__img}>
<Image
src={el?.cover}
alt={el?.title}
width={160}
height={160}
/>
</div>
<div className={styles.CardAlbum__container__info}>
<h2>{el?.title}</h2>
<p className={styles.artist}>{el?.artist}</p>
</div>
</a>
</Link>
</div>
<Link href={ el.iam === "album" ? `album/${el.id}` : `playlist/${el.id}`} key={el.id}>
<a>
<div className={styles.CardAlbum__container}>
<div className={styles.CardAlbum__container__img}>
<Image
src={el?.cover}
alt={el?.title}
width={200}
height={200}
layout="fill"
/>
</div>
<div className={styles.CardAlbum__container__info}>
<h2>{el?.title}</h2>
<p className={styles.artist}>{el?.artist}</p>
</div>
</div>
</a>
</Link>
</div>
))}
</div>
Expand Down
49 changes: 33 additions & 16 deletions components/CardAlbum/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,27 @@
align-items: center;

&__img {
text-align: center;
position: relative;
width: 160px;
height: 160px;

img {
border-radius: 10px;
}
}

&__info {
width: 160px;
}

&__info h2 {
font-size: 20px;
margin: 10px 0;

}
h2 {
font-size: 20px;
margin: 10px 0;
}

&__info p {
font-size: 15px;
color: $grey;
p {
font-size: 15px;
color: $grey;
}
}
}
}
Expand All @@ -48,6 +50,7 @@
}



@media all and (max-width: 1200px) {
.CardAlbum {
width: 25%;
Expand All @@ -56,15 +59,29 @@


@media all and (max-width: 767px) {
.CardAlbum {
width: 50%;
}
}

@media all and (max-width: 400px) {
.CardAlbum {
width: 100%;

&__container {
display: flex;
flex-direction: row;

&__img {
width: 100px;
min-width: 100px;
height: 100px;
min-height: 100px;
margin-right: 20px;
}

&__info {
width: 100%;
}

}
}
}



}
5 changes: 1 addition & 4 deletions components/FilterButtonAlbum/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import '../../styles/palette.module.scss';

.btn {
// box-shadow: inset -5px -5px 9px rgba(255,255,255,0.45), inset 5px 5px 9px rgba(94,104,121,0.3); background-color: rgb(226, 224, 222);
border-radius: 20px;
padding: 10px 30px;
text-align: center;
Expand All @@ -11,12 +10,10 @@
cursor: pointer;

@media all and (max-width: 767px) {
padding: 5px 15px;
padding: 10px 20px;
}
}



.selected {
font-weight: 600;
box-shadow: none;
Expand Down
3 changes: 1 addition & 2 deletions components/FilterButtonPlaylist/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import '../../styles/palette.module.scss';

.btn {
// box-shadow: inset -5px -5px 9px rgba(255,255,255,0.45), inset 5px 5px 9px rgba(94,104,121,0.3); background-color: rgb(226, 224, 222);
border-radius: 20px;
padding: 10px 30px;
text-align: center;
Expand All @@ -11,7 +10,7 @@
cursor: pointer;

@media all and (max-width: 767px) {
padding: 5px 15px;
padding: 10px 20px;
}
}

Expand Down
8 changes: 6 additions & 2 deletions components/InputLogin/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,20 @@
}

label {
display: block;
text-align: left;
font-size: 0.8rem;
font-size: 0.9rem;
padding-left: 1rem;
color: rgb(112, 112, 112);
font-weight: 600;
margin-bottom: 5px;

}

input {
width: 100%;
font-weight: 600;
font-weight: 600;
font-size: 0.9rem;
}

input[type="email"],input[type="password"] {
Expand Down
31 changes: 13 additions & 18 deletions components/LayoutDefault/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Navbar from "../../components/Navbar";
import Player from "../../components/Player";
import UserLogged from "../../components/UserLogged";
import ModalSignup from "../../components/ModalSignup";
import {useState} from "react";
import { useState } from "react";
import styles from "./styles.module.scss";

const LayoutDefault = ({ children }) => {
Expand All @@ -17,34 +17,29 @@ const LayoutDefault = ({ children }) => {
visible: false,
});



return (
<>
<header className={styles.navbar}>
<header className={styles.navbar}>
<Navbar />
</header>

<div className={styles.ModalSignup}>
<ModalSignup setViewModalSignUp={setViewModalSignUp} viewModalSignup={viewModalSignup} />
<ModalSignup
setViewModalSignUp={setViewModalSignUp}
viewModalSignup={viewModalSignup}
/>
</div>

<main className={styles.main}>{children}
<div className={styles.user}>
<UserLogged parloaLayout={parloaLayout}/>
</div>

<main className={styles.main}>
{children}
<div className={styles.user}>
<UserLogged parloaLayout={parloaLayout} />
</div>
</main>



{/* <footer className={styles.footer}>
<Footer />
</footer> */}

{/* <div className={styles.player}>
<div className={styles.player}>
<Player />
</div> */}
</div>
</>
);
};
Expand Down
10 changes: 8 additions & 2 deletions components/LayoutDefault/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
margin-left: 260px;
height: 100%;
background: #fff;
padding: 60px 30px;
padding: 60px 30px 120px 30px;
display: flex;
flex-direction: column;
align-items: center;
Expand Down Expand Up @@ -47,12 +47,18 @@
height: auto;
padding: 10px 20px;
z-index: 1;

}

.main {
margin-left: 0px;
height: auto;
padding-bottom: 150px;
padding-bottom: 200px;
}

.player {
bottom:85px;
z-index: 2;
}


Expand Down
2 changes: 1 addition & 1 deletion components/ModalSignup/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
z-index: 1;
z-index: 3;

.modal {
background-color: white;
Expand Down
2 changes: 1 addition & 1 deletion components/Navbar/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
}

li a:hover {
color: $secondary-color;
color: $orange;
}

li a svg {
Expand Down
1 change: 1 addition & 0 deletions components/Player/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export default function Player() {
setPlaying(!isPlaying);
};


return (
<div className={styles.player_all}>
<div className={styles.img_container}>{/* <Image /> */}</div>
Expand Down
Loading