Skip to content

Commit

Permalink
Merge pull request #55 from WildCodeSchool/making-better-database
Browse files Browse the repository at this point in the history
Making better database
  • Loading branch information
mahdimcheik authored Feb 26, 2024
2 parents 57ffffb + 386457a commit d89f823
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
3 changes: 0 additions & 3 deletions frontend/src/admin/TaskBar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,3 @@ export default function TaskBar() {
</Container>
);
}
// TaskBar.propTypes = {
// listEmail: PropTypes.arrayOf(string).isRequired,
// };
6 changes: 4 additions & 2 deletions frontend/src/pages/PageUser.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
} from "@mantine/core";
import { useUserContext } from "../context/UserContext";
import MyAlert from "../components/MyAlert";
import Default from "../assets/default.png";
// import Default from "../assets/default.png";

export default function PageUser() {
const { user, setUser, sendResetLink, updateName, updateDescription } =
Expand Down Expand Up @@ -121,7 +121,9 @@ export default function PageUser() {
className="user-image"
style={{
backgroundImage: `url(${
user.imgUrl !== "" ? user.imgUrl : Default
user.imgUrl !== ""
? user.imgUrl
: "https://cdn.pixabay.com/photo/2020/07/01/12/58/icon-5359553_1280.png"
})`,
}}
/>
Expand Down
14 changes: 11 additions & 3 deletions frontend/src/pages/SingleVideoPage.jsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { useEffect } from "react";
import { Container } from "@mantine/core";
import { Center, Container } from "@mantine/core";
import OneVideo from "./OneVideo";
import PrimeCarousel from "../components/PrimeCarousel";
import { useVideoContext } from "../context/videoContext";
import { useUserContext } from "../context/UserContext";

export default function SingleVideoPage() {
const { getAllPlaylistsByCategory, playlists, user, getFavorite } =
const { getAllPlaylistsByCategory, playlists, getFavorite } =
useVideoContext();
const { linkToVideo } = useUserContext();
const { linkToVideo, favoritePlaylist, user } = useUserContext();
useEffect(() => {
async function getData() {
await getAllPlaylistsByCategory(linkToVideo.tags);
Expand All @@ -33,6 +33,14 @@ export default function SingleVideoPage() {
);
})}
<PrimeCarousel playlistId={linkToVideo.playlistId} />
{user.isConnected && favoritePlaylist.length > 0 && (
<Center>
<h2 className="invisible-button">Favoris</h2>
</Center>
)}
{favoritePlaylist.map((ele) => (
<PrimeCarousel playlistId={ele} />
))}
</Container>
</div>
</div>
Expand Down

0 comments on commit d89f823

Please sign in to comment.