diff options
author | Jari Vetoniemi <jari.vetoniemi@indooratlas.com> | 2020-11-05 15:34:22 +0900 |
---|---|---|
committer | Jari Vetoniemi <jari.vetoniemi@indooratlas.com> | 2020-11-05 15:34:22 +0900 |
commit | dc7a7e2bd330611936638eea06638efafda4e2dd (patch) | |
tree | 0b85dfe529ad360914bda0c32e2e78ed96d49b0b | |
parent | c4969b8261fd1d98ab2b3740d52b097dc0fe840c (diff) |
Cleanup junk and fill the correct metadata
-rw-r--r-- | public/index.html | 27 | ||||
-rw-r--r-- | public/manifest.json | 4 | ||||
-rw-r--r-- | src/App.css | 38 | ||||
-rw-r--r-- | src/App.js | 28 | ||||
-rw-r--r-- | src/index.css | 13 | ||||
-rw-r--r-- | src/index.js | 1 | ||||
-rw-r--r-- | src/logo.svg | 7 |
7 files changed, 15 insertions, 103 deletions
diff --git a/public/index.html b/public/index.html index aa069f2..71c2c1f 100644 --- a/public/index.html +++ b/public/index.html @@ -7,37 +7,14 @@ <meta name="theme-color" content="#000000" /> <meta name="description" - content="Web site created using create-react-app" + content="Marketplace for doujin products" /> <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> - <!-- - manifest.json provides metadata used when your web app is installed on a - user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ - --> <link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> - <!-- - Notice the use of %PUBLIC_URL% in the tags above. - It will be replaced with the URL of the `public` folder during the build. - Only files inside the `public` folder can be referenced from the HTML. - - Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will - work correctly both with client-side routing and a non-root public URL. - Learn how to configure a non-root public URL by running `npm run build`. - --> - <title>React App</title> + <title>DoujinSea</title> </head> <body> <noscript>You need to enable JavaScript to run this app.</noscript> <div id="root"></div> - <!-- - This HTML file is a template. - If you open it directly in the browser, you will see an empty page. - - You can add webfonts, meta tags, or analytics to this file. - The build step will place the bundled scripts into the <body> tag. - - To begin the development, run `npm start` or `yarn start`. - To create a production bundle, use `npm run build` or `yarn build`. - --> </body> </html> diff --git a/public/manifest.json b/public/manifest.json index 080d6c7..ee48711 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,6 +1,6 @@ { - "short_name": "React App", - "name": "Create React App Sample", + "short_name": "DoujinSea", + "name": "DoujinSea", "icons": [ { "src": "favicon.ico", diff --git a/src/App.css b/src/App.css deleted file mode 100644 index 74b5e05..0000000 --- a/src/App.css +++ /dev/null @@ -1,38 +0,0 @@ -.App { - text-align: center; -} - -.App-logo { - height: 40vmin; - pointer-events: none; -} - -@media (prefers-reduced-motion: no-preference) { - .App-logo { - animation: App-logo-spin infinite 20s linear; - } -} - -.App-header { - background-color: #282c34; - min-height: 100vh; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - font-size: calc(10px + 2vmin); - color: white; -} - -.App-link { - color: #61dafb; -} - -@keyframes App-logo-spin { - from { - transform: rotate(0deg); - } - to { - transform: rotate(360deg); - } -} @@ -40,11 +40,10 @@ import AccountCircleIcon from '@material-ui/icons/AccountCircle'; import StoreIcon from '@material-ui/icons/Store'; import LibraryBooksIcon from '@material-ui/icons/LibraryBooks'; import HelpOutlineIcon from '@material-ui/icons/HelpOutline'; -import Button from '@material-ui/core/Button'; import NavigateNextIcon from '@material-ui/icons/NavigateNext'; import NavigateBeforeIcon from '@material-ui/icons/NavigateBefore'; import Grow from '@material-ui/core/Grow'; -import { CarouselProvider, Slider, Slide, ButtonBack, ButtonNext, DotGroup } from 'pure-react-carousel'; +import { CarouselProvider, Slider, Slide, ButtonBack, ButtonNext } from 'pure-react-carousel'; import { useWindowDimensions } from './utils.js'; import 'pure-react-carousel/dist/react-carousel.es.css'; import 'fontsource-roboto'; @@ -60,6 +59,7 @@ const StyledBadge = withStyles((theme) => ({ function StoreItemDetails(props) { const { t } = useTranslation(); + const classes = makeStyles((theme) => ({ }))(); @@ -77,6 +77,7 @@ function StoreItemDetails(props) { function StoreItem(props) { const { t } = useTranslation(); + const classes = makeStyles((theme) => ({ media: { height: 180, position: 'relative' }, cat: { position: 'absolute', bottom: 4, left: 4 }, @@ -152,9 +153,11 @@ function StoreItemSkeleton(props) { function StoreSeparator(props) { const { t } = useTranslation(); + const classes = makeStyles((theme) => ({ root: { margin: 4 }, }))(); + return ( <div className={classes.root}> <Typography variant="h6">{t(props.title)}</Typography> @@ -167,6 +170,7 @@ function StoreCarousel(props) { const { height, width } = useWindowDimensions(); const cols = Math.floor(width / 240); const tw = (cols > 1 ? (cols * 240 > width - 18 ? 240 - 20 : 240) : '100%') + const classes = makeStyles((theme) => ({ root: { paddingLeft: cols > 1 ? 18 : 4, paddingRight: cols > 1 ? 18 : 4 }, tile: { width: tw, marginRight: 'auto', marginLeft: 'auto' }, @@ -174,8 +178,10 @@ function StoreCarousel(props) { prev: { position: 'absolute', left: cols > 1 ? -15 : -4, top: '50%', backgroundColor: 'rgba(0, 0, 0, 0.5)', color: 'white' }, next: { position: 'absolute', right: cols > 1 ? -15 : -4, top: '50%', backgroundColor: 'rgba(0, 0, 0, 0.5)', color: 'white' }, }))(); + var skeletons = []; for (var i = 0; props.loading && i < cols; i += 1) skeletons.push({}); + return ( <div className={classes.root}> <StoreSeparator title={props.name}/> @@ -209,14 +215,17 @@ function StoreList(props) { const { height, width } = useWindowDimensions(); const cols = Math.floor(width / 240); const tw = (cols > 1 ? (cols * 240 > width - 18 ? 240 - 20 : 240) : '100%') + const classes = makeStyles((theme) => ({ list: { justifyContent: 'space-evenly', maxWidth: '100%' }, tile: { width: tw, marginRight: 'auto', marginLeft: 'auto' }, }))(); + var extra = []; for (var i = 0; i < cols - (props.data.length % cols); i += 1) extra.push({key: i}); var skeletons = []; for (var i2 = 0; props.loading && i2 < cols * (Math.floor(height / 240)) - cols * 2; i2 += 1) skeletons.push({key: i2}); + return ( <div className={props.className} style={{ paddingLeft: cols > 1 ? 18 : 4, paddingRight: cols > 1 ? 18 : 4 }}> <StoreSeparator title={props.name}/> @@ -414,24 +423,9 @@ export default function Main() { }, }), [prefersDarkMode]); - const GlobalCss = withStyles({ - '@global': { - '#keywords-popup': { - padding: 0, - }, - '.KeywordList li': { - display: 'inline-block', - verticalAlign: 'top', - marginLeft: 4, - marginRight: 4, - }, - } - })(() => null); - return ( <> <CssBaseline/> - <GlobalCss /> <ThemeProvider theme={theme}> <StoreView/> </ThemeProvider> diff --git a/src/index.css b/src/index.css deleted file mode 100644 index ec2585e..0000000 --- a/src/index.css +++ /dev/null @@ -1,13 +0,0 @@ -body { - margin: 0; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', - 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', - sans-serif; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -code { - font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', - monospace; -} diff --git a/src/index.js b/src/index.js index e146c59..dbd3f8b 100644 --- a/src/index.js +++ b/src/index.js @@ -1,6 +1,5 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import './index.css'; import App from './App'; import reportWebVitals from './reportWebVitals'; diff --git a/src/logo.svg b/src/logo.svg deleted file mode 100644 index 6b60c10..0000000 --- a/src/logo.svg +++ /dev/null @@ -1,7 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"> - <g fill="#61DAFB"> - <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/> - <circle cx="420.9" cy="296.5" r="45.7"/> - <path d="M520.5 78.1z"/> - </g> -</svg> |