)
@@ -34,13 +38,9 @@ function Card(props) {
{props.title}
{props.description}
-
+ {/* */}
)
}
-//ReactDOM.render(, document.getElementById('root'))
-
-// export default AboutUs
-
export default AboutUsPage
diff --git a/recmu/web-react/src/components/AboutUs.scss b/recmu/web-react/src/components/AboutUs.scss
index 56442fa..b9ba575 100644
--- a/recmu/web-react/src/components/AboutUs.scss
+++ b/recmu/web-react/src/components/AboutUs.scss
@@ -33,22 +33,34 @@ body {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(12rem, 16rem));
gap: 2rem;
- justify-content: center;
+ justify-content: left;
+ align-items: center;
+ // height: 1200;
+ // width: 100%;
+
+ height: 80vh;
+ width: 40vh;
}
.card {
overflow: hidden;
- box-shadow: 0 2px 20px $clr-gray300;
+ // box-shadow: 0 2px 20px $clr-gray300;
border-radius: $radius;
display: flex;
flex-direction: column;
+
+ // height: 2000;
+ // width: 1200px;
+
+ height: 90vh;
+ width: 80vw;
justify-content: space-between;
cursor: pointer;
transition: transform 200ms ease-in;
- background-color: #29e6a7;
+ background-color: whitesmoke;
&__image {
- height: 12rem;
+ height: 35rem;
width: 100%;
object-fit: cover;
}
diff --git a/recmu/web-react/src/components/LikedSongs.js b/recmu/web-react/src/components/LikedSongs.js
index 7ce055b..fe6d330 100644
--- a/recmu/web-react/src/components/LikedSongs.js
+++ b/recmu/web-react/src/components/LikedSongs.js
@@ -14,11 +14,6 @@ const GET_LIKED_SONGS_QUERY = gql`
findLikedSongs(userName: $userName)
}
`
-const GET_REL_ALBUMS_QUERY = gql`
- query($albumName: String) {
- findRelatedAlbums(albumName: $albumName)
- }
-`
const REMOVE_SONG_FROM_LIKES_QUERY = gql`
query($userName: String, $songName: String) {
@@ -41,7 +36,7 @@ export default function LikedSongs() {
console.log(error)
return Error: help!
}
- console.log('Liked songs: ' + data)
+ console.log('Liked songs: ' + data.findLikedSongs)
// const [dislikeSongQuery, { loading2, error2, data2 }] = useLazyQuery(
// REMOVE_SONG_FROM_LIKES_QUERY
diff --git a/recmu/web-react/src/components/SongCatalogue.js b/recmu/web-react/src/components/SongCatalogue.js
index 969f75c..e681816 100644
--- a/recmu/web-react/src/components/SongCatalogue.js
+++ b/recmu/web-react/src/components/SongCatalogue.js
@@ -1,11 +1,9 @@
import React from 'react'
-//import { Link } from 'react-router-dom'
import { makeStyles } from '@material-ui/core/styles'
import Typography from '@material-ui/core/Typography'
import Title from './Title'
import { useQuery, gql } from '@apollo/client'
import { Box, Card } from '@material-ui/core'
-//import clsx from 'clsx'
import { useTheme } from '@material-ui/core/styles'
import FavoriteIcon from '@mui/icons-material/Favorite'
import FavoriteBorderIcon from '@mui/icons-material/FavoriteBorder'
@@ -22,36 +20,41 @@ const useStyles = makeStyles({
},
})
-const GET_COUNT_QUERY = gql`
- query() {
- findSongCatalog()
+const GETSONGCATALOG = gql`
+ query($name: String) {
+ getSongCatalog(name: $name)
}
`
-export default function Deposits({ songName }) {
- const theme = useTheme()
+// const GET_COUNT_QUERY = gql`
+// query($songName: String) {
+// findRelatedSongs(songName: $songName)
+// }
+// `
+export default function SongCatalogue() {
+ const theme = useTheme()
+ const songName = 'anything'
const classes = useStyles(theme)
//const fixedHeightPaper = clsx(classes.paper, classes.fixedHeight)
- const { loading, error, data } = useQuery(GET_COUNT_QUERY, {
- variables: { songName },
- })
+ // const { loading, error, data } = useQuery(GETSONGCATALOG, {
+ // variables: { songName },
+ // })
+
+ const { loading, error, data } = useQuery(GETSONGCATALOG)
if (loading) return 'Loading...'
if (error) return Error: help!
+
+ console.log('Liked songs: ' + data.getSongCatalog)
return (
Our Music Catalog
- Prepare your ears..{songName}
+ Prepare your ears..
- {data.findRelatedSongs.length} Songs found
+ {data.getSongCatalog.length} Songs found
-
- {/*
- View songs
- */}
-
- {data.findRelatedSongs.map((result) => (
+ {data.getSongCatalog.map((result) => (
// {result}
@@ -79,3 +82,95 @@ export default function Deposits({ songName }) {
)
}
+
+// import React, { useState } from 'react'
+// import { useQuery, useLazyQuery, gql } from '@apollo/client'
+// import { useEffect } from 'react'
+// import ListGroup from 'react-bootstrap/ListGroup'
+// import Badge from 'react-bootstrap/Badge'
+// import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+// import Button from 'react-bootstrap/Button'
+
+// import { faHeart } from '@fortawesome/free-solid-svg-icons'
+// import { faXmark } from '@fortawesome/free-solid-svg-icons'
+
+// export default function LikedSongs() {
+// const [likedSongs, setLikedSongs] = useState([])
+// const [userName, setUsername] = useState('Default')
+// const [songToDislike, setSongToDislike] = useState('')
+
+// const { loading, error, data } = useQuery(GET_LIKED_SONGS_QUERY, {
+// variables: { userName },
+// })
+// if (loading) return 'Loading...'
+// if (error) {
+// console.log(error)
+// return Error: help!
+// }
+// console.log('Liked songs: ' + data.findLikedSongs)
+
+// // const [dislikeSongQuery, { loading2, error2, data2 }] = useLazyQuery(
+// // REMOVE_SONG_FROM_LIKES_QUERY
+// // )
+// // const [dislikeSongQuery, { l, e, d }] = useLazyQuery(
+// // REMOVE_SONG_FROM_LIKES_QUERY
+// // )
+
+// // useEffect(() => {
+// // if (songToDislike) {
+// // dislikeSongQuery({
+// // variables: {
+// // userName: userName,
+// // songName: songToDislike,
+// // },
+// // })
+// // }
+// // }, [])
+
+// // const dislikeSong = (e) => {
+// // const songName = e.target.name
+// // setSongToDislike(songName)
+// // // dislikeSongQuery({
+// // // variables: { userName, songName },
+// // // })
+// // }
+
+// const createLikedSongsList = (row) => {
+// return (
+//
+//
+
+//
+
+// {/* */}
+//
+// )
+// }
+
+// console.log('Liked songs: ', likedSongs)
+// return (
+//
+//
+// {data.findLikedSongs.map((i) => createLikedSongsList(i))}
+//
+//
+// )
+// }
diff --git a/recmu/web-react/src/components/SongSearch.js b/recmu/web-react/src/components/SongSearch.js
index 9327d6c..7e170d0 100644
--- a/recmu/web-react/src/components/SongSearch.js
+++ b/recmu/web-react/src/components/SongSearch.js
@@ -71,8 +71,8 @@ export default function Deposits({ songName }) {
{result}
{/*