diff --git a/qtify/public/favicon.ico b/qtify/public/favicon.ico index a11777cc47..92c4aefc9d 100644 Binary files a/qtify/public/favicon.ico and b/qtify/public/favicon.ico differ diff --git a/qtify/public/index.html b/qtify/public/index.html index ca0c48d8f1..b3ac02559c 100644 --- a/qtify/public/index.html +++ b/qtify/public/index.html @@ -7,18 +7,18 @@ - + - + - React App + Qtify diff --git a/qtify/public/logo.png b/qtify/public/logo.png new file mode 100644 index 0000000000..92c4aefc9d Binary files /dev/null and b/qtify/public/logo.png differ diff --git a/qtify/public/logo192.png b/qtify/public/logo192.png deleted file mode 100644 index fc44b0a379..0000000000 Binary files a/qtify/public/logo192.png and /dev/null differ diff --git a/qtify/public/logo512.png b/qtify/public/logo512.png deleted file mode 100644 index a4e47a6545..0000000000 Binary files a/qtify/public/logo512.png and /dev/null differ diff --git a/qtify/public/manifest.json b/qtify/public/manifest.json index 080d6c77ac..e6041f5df1 100644 --- a/qtify/public/manifest.json +++ b/qtify/public/manifest.json @@ -8,14 +8,9 @@ "type": "image/x-icon" }, { - "src": "logo192.png", + "src": "logo.png", "type": "image/png", "sizes": "192x192" - }, - { - "src": "logo512.png", - "type": "image/png", - "sizes": "512x512" } ], "start_url": ".", diff --git a/qtify/src/App.test.js b/qtify/src/App.test.js deleted file mode 100644 index 1f03afeece..0000000000 --- a/qtify/src/App.test.js +++ /dev/null @@ -1,8 +0,0 @@ -import { render, screen } from '@testing-library/react'; -import App from './App'; - -test('renders learn react link', () => { - render(); - const linkElement = screen.getByText(/learn react/i); - expect(linkElement).toBeInTheDocument(); -}); diff --git a/qtify/src/components/Section/Section.js b/qtify/src/components/Section/Section.js index 7bf4cc175f..a6a5cf9759 100644 --- a/qtify/src/components/Section/Section.js +++ b/qtify/src/components/Section/Section.js @@ -11,78 +11,79 @@ import AccordionDetails from "@mui/material/AccordionDetails"; import ExpandMoreIcon from "@mui/icons-material/ExpandMore"; export default React.memo(function Section({ - title, - data: { data, type }, - songs = false, - genres, + title, + data: { data, type }, + songs = false, + genres, }) { - const [collapsed, setCollapse] = useState(true); + const [collapsed, setCollapse] = useState(true); - const handleCollapse = () => { - setCollapse(!collapsed); - }; + const handleCollapse = () => { + setCollapse(!collapsed); + }; - return ( -
- {type === "grid" ? ( - - - - {songs ? title : `${title} Albums`} - - {!songs && ( - - )} - - {collapsed ? ( - - ) : ( - data && - data.map((group, index) => ( - - - - {group.title} - - - )) - )} - - ) : ( + return (
-

{title}

- - {data.map((faq, index) => ( - - - } - aria-controls="panel1-content" - id="panel1-header" - > - {faq.question} - - - {faq.answer} - - - ))} - + {type === "grid" ? ( + + + + {songs ? title : `${title} Albums`} + + {!songs && ( + + )} + + {collapsed ? ( + + ) : ( + data && + data.map((group, index) => ( + + + + {group.title} + + + )) + )} + + ) : ( +
+

{title}

+ + {data.map((faq, index) => ( + + + } + aria-controls="panel1-content" + id="panel1-header" + className={styles.faqAccordionSummary} + > + {faq.question} + + + {faq.answer} + + + ))} + -
+
+
+ )}
- )} -
- ); + ); }); diff --git a/qtify/src/components/Section/Section.module.css b/qtify/src/components/Section/Section.module.css index 4b270f7b48..dc43f3f412 100644 --- a/qtify/src/components/Section/Section.module.css +++ b/qtify/src/components/Section/Section.module.css @@ -40,10 +40,14 @@ h2 { } .faqAccordion { + border: 1px solid white; + border-radius: 5px; + overflow: hidden; +} + +.faqAccordionSummary { background-color: var(--color-black); color: white; - border: 1px solid white; - border-radius: 5px; } .faqAccordionDetails { diff --git a/qtify/src/index.js b/qtify/src/index.js index 0906b026e8..8277608103 100644 --- a/qtify/src/index.js +++ b/qtify/src/index.js @@ -2,7 +2,6 @@ import React from 'react'; import ReactDOM from 'react-dom/client'; import './index.css'; import App from './App'; -import reportWebVitals from './reportWebVitals'; import { BrowserRouter as Router } from 'react-router-dom'; const root = ReactDOM.createRoot(document.getElementById('root')); @@ -14,7 +13,3 @@ root.render( ); -// If you want to start measuring performance in your app, pass a function -// to log results (for example: reportWebVitals(console.log)) -// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals -reportWebVitals(); diff --git a/qtify/src/reportWebVitals.js b/qtify/src/reportWebVitals.js deleted file mode 100644 index 5253d3ad9e..0000000000 --- a/qtify/src/reportWebVitals.js +++ /dev/null @@ -1,13 +0,0 @@ -const reportWebVitals = onPerfEntry => { - if (onPerfEntry && onPerfEntry instanceof Function) { - import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => { - getCLS(onPerfEntry); - getFID(onPerfEntry); - getFCP(onPerfEntry); - getLCP(onPerfEntry); - getTTFB(onPerfEntry); - }); - } -}; - -export default reportWebVitals; diff --git a/qtify/src/setupTests.js b/qtify/src/setupTests.js index 8f2609b7b3..28e70748db 100644 --- a/qtify/src/setupTests.js +++ b/qtify/src/setupTests.js @@ -1,5 +1,5 @@ -// jest-dom adds custom jest matchers for asserting on DOM nodes. -// allows you to do things like: -// expect(element).toHaveTextContent(/react/i) -// learn more: https://github.com/testing-library/jest-dom -import '@testing-library/jest-dom'; +// // jest-dom adds custom jest matchers for asserting on DOM nodes. +// // allows you to do things like: +// // expect(element).toHaveTextContent(/react/i) +// // learn more: https://github.com/testing-library/jest-dom +// import '@testing-library/jest-dom';