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.

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

Dev t #4

Merged
merged 4 commits into from
Sep 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Getting Started with Create React App
# Music-platform on react

This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).

Expand Down
39 changes: 39 additions & 0 deletions 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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"@testing-library/user-event": "^13.5.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.16.0",
"react-scripts": "^5.0.1",
"web-vitals": "^2.1.4"
},
Expand Down
4 changes: 2 additions & 2 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import './App.css';
import Main from './components/Main/Main';
import Bar from './components/Bar/Bar';
import Main from './pages/Main/components/Main/Main';
import Bar from './pages/Main/components/Bar/Bar';
function App() {
return (
<div className="App">
Expand Down
36 changes: 0 additions & 36 deletions src/components/PlayListItem/PlayListItem.jsx

This file was deleted.

5 changes: 4 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import App from './App';
import { BrowserRouter } from "react-router-dom";

const root = ReactDOM.createRoot(document.getElementById('root'));
root.render(
<React.StrictMode>
<App />
<BrowserRouter>
<App />
</BrowserRouter>
</React.StrictMode>
);
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ function Centerblock(){
const singers=['messi', 'Noize MC', 'RHCP', 'Pyrokinesis', 'Joy Division', 'Lol', 'mocker'];
const years = ['1987', '2022', '1995', '2015', '1980'];
const genres = ['rock', 'rap', 'hip-hop', 'post-punk', 'alternative rock', 'punk-rock'];
// const timeOut = setTimeout(()=>{
// setIsSkeleton(false);
// }, 5000);
const timeOut = setTimeout(()=>{
setIsSkeleton(false);
}, 5000);
const switchHandle=(e)=>{
const target = e.target;
const parent = target.parentElement;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,13 +235,6 @@
padding: 34px 24px 34px 34px;
border-radius: 12px;
}
.author__list{

}
.year__list{
}
.genre__list{
}
.active{
color: #ad61ff;
border-color: #ad61ff;
Expand Down
File renamed without changes.
File renamed without changes.
36 changes: 36 additions & 0 deletions src/pages/Main/components/PlayListItem/PlayListItem.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import c from './PlayListItem.module.css';
export default function PlayList__item(props){
return(
<div className={c.playlist__item}>
<div className={`${c.playlist__track} ${c.track}`}>
<div className={`${c.track__title}`}>
<div className={c.track__title_image}>
<svg className={c.track__title_svg} alt="music">
{props.isSkeleton?(<img src='/img/Group12.png'></img>):
(<use xlinkHref="img/icon/sprite.svg#icon-note"></use>)}
</svg>
</div>
<div className={c.track__title_text}>
{props.isSkeleton ? <div className={c.column1}></div>
:<a className={c.track__title_link} href="http://">{props.title} <span className={c.track__title_span}>{props.span? props.span: ''}</span></a>}
</div>
</div>
<div className={`${c.track__author}`}>
{props.isSkeleton? <div className={c.column2}></div>
:<a className={c.track__author_link} href="http://">{props.author}</a>}
</div>
{props.isSkeleton? <div className={c.column3}></div>
:<><div className={c.track__album}>
<a className={c.track__album_link} href="http://">{props.album}</a>
</div>
<div className={c.track__time}>
<svg className={c.track__time_svg} alt="time">
<use xlinkHref="img/icon/sprite.svg#icon-like"></use>
</svg>
<span className={c.track__time_text}>{props.duration}</span>
</div>
</>}
</div>
</div>
);
}
Loading