diff --git a/package.json b/package.json index 20df0e82..c72e5baf 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,8 @@ "web-vitals": "^2.1.4" }, "scripts": { - "start": "set PORT=5000 &&react-scripts start", + "start": "set port=5000 && react-scripts start", + "json-server": "npx json-server data.json --port 3000", "build": "react-scripts build", "test": "react-scripts test", "eject": "react-scripts eject", diff --git a/src/App.css b/src/App.css index 12d79641..6f9a00aa 100644 --- a/src/App.css +++ b/src/App.css @@ -21,7 +21,8 @@ } .Footer { - height: 200px; + height: 150px; + align-items: center; } .bg-slate-300 { @@ -33,11 +34,23 @@ display: flex; flex-direction: column; justify-content: center; - width: 75%; height: 300px; } #playlistButton { align-self: center; +} + +#footer-text { + color: white; + font: 1em sans-serif; +} + +#current-track { + height: 20%; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; } \ No newline at end of file diff --git a/src/App.tsx b/src/App.tsx index 518d162c..5c7ebdf9 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -47,7 +47,7 @@ function App() { return ( -
+
diff --git a/src/components/CurrentTrack.tsx b/src/components/CurrentTrack.tsx index 9cbd4ab5..a24b54dc 100644 --- a/src/components/CurrentTrack.tsx +++ b/src/components/CurrentTrack.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Button, Table } from 'antd'; +import { Button, Col, Grid, Row, Table } from 'antd'; import { PlayCircleOutlined } from '@ant-design/icons'; import { ISong, SongProps } from '../models/IModels'; import styled from 'styled-components' @@ -62,15 +62,22 @@ export function CurrentTrack() { return ( -
- + + + SEX + {song.cover} * + + + + {/*
+ /> */} diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx index 39c15539..3d68c938 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer.tsx @@ -5,10 +5,10 @@ import { ISong } from '../models/IModels'; export function Footer() { return ( -
+
-

2022 Music Service

+