Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/JudgedSauce7/SoundChain int…
Browse files Browse the repository at this point in the history
…o main
  • Loading branch information
JudgedSauce7 committed Nov 29, 2020
2 parents 2f39bd9 + f37bc3d commit c914496
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 1 deletion.
51 changes: 51 additions & 0 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"react": "16.11.0",
"react-audio-player": "^0.14.0",
"react-chartjs-2": "^2.11.1",
"react-custom-scrollbars": "^4.2.1",
"react-dom": "16.11.0",
"react-h5-audio-player": "^3.5.0",
"react-identicons": "^1.2.4",
Expand Down
9 changes: 8 additions & 1 deletion client/src/containers/Body/components/Explore.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { HeartFilled, HeartOutlined, SendOutlined } from "@ant-design/icons";
import Identicon from "identicon.js";
import Ethlogo from "../../../assets/images/ethlogo.png";
import AudioPlayer from "react-h5-audio-player";
import { Scrollbars } from 'react-custom-scrollbars';
import "react-h5-audio-player/lib/styles.css";
import "../style.css";

Expand Down Expand Up @@ -55,18 +56,21 @@ export default class Explore extends Component {
height: "100vh",
}}
>
<Scrollbars>
<Card
style={{
width: "90%",
height: "100%",
display: "flex",
justifyContent: "center",
overflowY: "scroll",
//overflowY: "scroll",
marginBottom: 20,
}}
hoverable
>

<Row gutter={10}>

{uploads
.filter(
(upload) =>
Expand Down Expand Up @@ -257,8 +261,11 @@ export default class Explore extends Component {
</Col>
);
})}

</Row>

</Card>
</Scrollbars>
</Col>
</Row>
</div>
Expand Down

0 comments on commit c914496

Please sign in to comment.