From f5b8b8610588f9b283aff730a637156e453d3dbe Mon Sep 17 00:00:00 2001 From: Hansoo Date: Tue, 7 Mar 2023 22:42:54 +0900 Subject: [PATCH] changes for evojapan2023 --- main-web/admin/public/manifest.json | 18 +----------------- main-web/client/package.json | 6 +++--- main-web/client/public/manifest.json | 18 +----------------- main-web/client/src/components/home.tsx | 18 ++++++------------ main-web/client/src/components/players.tsx | 1 + main-web/client/src/web.module.scss | 16 ++++++++++++++++ tools/janken/public/manifest.json | 18 +----------------- .../twitch-chat/public/index.html | 1 - .../twitch-chat/public/manifest.json | 18 +----------------- 9 files changed, 30 insertions(+), 84 deletions(-) diff --git a/main-web/admin/public/manifest.json b/main-web/admin/public/manifest.json index 080d6c7..ead4e20 100644 --- a/main-web/admin/public/manifest.json +++ b/main-web/admin/public/manifest.json @@ -1,23 +1,7 @@ { "short_name": "React App", "name": "Create React App Sample", - "icons": [ - { - "src": "favicon.ico", - "sizes": "64x64 32x32 24x24 16x16", - "type": "image/x-icon" - }, - { - "src": "logo192.png", - "type": "image/png", - "sizes": "192x192" - }, - { - "src": "logo512.png", - "type": "image/png", - "sizes": "512x512" - } - ], + "icons": [], "start_url": ".", "display": "standalone", "theme_color": "#000000", diff --git a/main-web/client/package.json b/main-web/client/package.json index 0ea987b..6a4ac34 100644 --- a/main-web/client/package.json +++ b/main-web/client/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "dependencies": { - "axios": "^0.19.2", + "axios": "^0.21.1", "dotenv": "^8.2.0", "i18next": "^19.6.3", "node-sass": "^4.13.1", @@ -15,13 +15,13 @@ "react-youtube": "^7.11.3", "semantic-ui-css": "^2.4.1", "semantic-ui-react": "^0.88.2", - "typescript": "^3.7.5" + "typescript": "^4.9.5" }, "devDependencies": { "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.5.0", "@testing-library/user-event": "^7.2.1", - "@types/react-router-dom": "^5.1.5", + "@types/react-router-dom": "^5.3.3", "@types/jest": "^24.9.1", "@types/node": "^12.12.35", "@types/react": "^16.9.34", diff --git a/main-web/client/public/manifest.json b/main-web/client/public/manifest.json index 080d6c7..ead4e20 100644 --- a/main-web/client/public/manifest.json +++ b/main-web/client/public/manifest.json @@ -1,23 +1,7 @@ { "short_name": "React App", "name": "Create React App Sample", - "icons": [ - { - "src": "favicon.ico", - "sizes": "64x64 32x32 24x24 16x16", - "type": "image/x-icon" - }, - { - "src": "logo192.png", - "type": "image/png", - "sizes": "192x192" - }, - { - "src": "logo512.png", - "type": "image/png", - "sizes": "512x512" - } - ], + "icons": [], "start_url": ".", "display": "standalone", "theme_color": "#000000", diff --git a/main-web/client/src/components/home.tsx b/main-web/client/src/components/home.tsx index 946a716..c568e65 100644 --- a/main-web/client/src/components/home.tsx +++ b/main-web/client/src/components/home.tsx @@ -1,27 +1,21 @@ import React, { FunctionComponent } from 'react'; import style from '../web.module.scss'; -import YouTube from 'react-youtube'; type ComponentProps = { }; export const Home: FunctionComponent = (props): JSX.Element => { - - const opts = { - height: '696', - width: '1024' - }; return (
-
-
+
-
-   -
+
+ {/*
+   +
*/}
-   +  
); diff --git a/main-web/client/src/components/players.tsx b/main-web/client/src/components/players.tsx index a7c2f31..ed6129c 100644 --- a/main-web/client/src/components/players.tsx +++ b/main-web/client/src/components/players.tsx @@ -12,6 +12,7 @@ type ComponentProps = { export const Players: FunctionComponent = (props): JSX.Element => { const { t } = useTranslation(); const [playerInfo, setPlayerInfo] = useState([]); + // @ts-ignore const { tournament_key } = useParams(); useEffect(() => { if (playerInfo.length === 0) { diff --git a/main-web/client/src/web.module.scss b/main-web/client/src/web.module.scss index abba2aa..33ea96c 100644 --- a/main-web/client/src/web.module.scss +++ b/main-web/client/src/web.module.scss @@ -440,6 +440,22 @@ background-size: contain; background-repeat: none; } +.evojapan2023 { + width: 500px; + height: 471px; + margin: auto; + background-image: url('https://static.catherine-fc.com/media/evo_logo_shadow_drop.png'); + background-size: contain; + background-repeat: none; +} +.evojapan2023kaisaikettei { + width: 941px; + height: 729px; + margin: auto; + background-image: url('https://static.catherine-fc.com/media/kaisaikettei2.png'); + background-size: contain; + background-repeat: none; +} .players { width: 900px; height: 606px; diff --git a/tools/janken/public/manifest.json b/tools/janken/public/manifest.json index 080d6c7..ead4e20 100644 --- a/tools/janken/public/manifest.json +++ b/tools/janken/public/manifest.json @@ -1,23 +1,7 @@ { "short_name": "React App", "name": "Create React App Sample", - "icons": [ - { - "src": "favicon.ico", - "sizes": "64x64 32x32 24x24 16x16", - "type": "image/x-icon" - }, - { - "src": "logo192.png", - "type": "image/png", - "sizes": "192x192" - }, - { - "src": "logo512.png", - "type": "image/png", - "sizes": "512x512" - } - ], + "icons": [], "start_url": ".", "display": "standalone", "theme_color": "#000000", diff --git a/twitch_chat_reader/twitch-chat/public/index.html b/twitch_chat_reader/twitch-chat/public/index.html index aa069f2..ed1fb15 100644 --- a/twitch_chat_reader/twitch-chat/public/index.html +++ b/twitch_chat_reader/twitch-chat/public/index.html @@ -9,7 +9,6 @@ name="description" content="Web site created using create-react-app" /> -