catherine/catherine-league
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: some updates

Browse Source
This commit is contained in:
Hansoo
2026-03-17 18:45:25 +09:00
parent f5b8b86105
commit f7019403c4
7 changed files with 70 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Dockerfile
View File

@@ -1,15 +1,8 @@
FROM node:14
WORKDIR /tmp
COPY . .
RUN ["./build_script.sh"]
FROM arm32v7/node:14
FROM arm64v8/node:25-alpine
WORKDIR /usr/src/app
COPY --from=0 /tmp/build .
RUN apt-get update && apt install mariadb-client -y
COPY build .
RUN apk add mariadb-client
RUN npm install
EXPOSE 4000

20
build_script.sh
View File

@@ -22,15 +22,6 @@ cd ../../
mv main-web/client/client build/client
echo "Finished client build..."
# build admin and move
cd main-web/admin
echo "Starting admin ui build..."
npm install
npm run build
cd ../../
mv main-web/admin/build build/admin
echo "Finished admin ui build..."
# build server and move
cd main-web/server
echo "Starting server build..."
@@ -38,16 +29,9 @@ npm install
npm run build
cd ../../
cd build/
echo "Starting retrieval of db credentials..."
export catherine_db_endpoint=$(aws --region=ap-northeast-1 ssm get-parameter --name "db-endpoint" --with-decryption --output text --query Parameter.Value)
export catherine_db_user=$(aws --region=ap-northeast-1 ssm get-parameter --name "db-username" --with-decryption --output text --query Parameter.Value)
export catherine_db_pass=$(aws --region=ap-northeast-1 ssm get-parameter --name "db-password" --with-decryption --output text --query Parameter.Value)
echo "Saving db credentials to .env file..."
cat > .env <<EOL
DB_ENDPOINT=${catherine_db_endpoint}
DB_USER=${catherine_db_user}
DB_PASS=${catherine_db_pass}
EOL
cd ../
cp main-web/server/package.json build/
cp main-web/server/tsconfig.json build/

2
main-web/admin/package.json
View File

@@ -11,7 +11,7 @@
"semantic-ui-css": "^2.4.1",
"semantic-ui-react": "^0.88.2",
"i18next": "^19.6.3",
"typescript": "^3.7.5"
"typescript": "^4.9.5"
},
"devDependencies": {
"@testing-library/jest-dom": "^4.2.4",

14
main-web/client/src/components/home.tsx
View File

@@ -7,12 +7,18 @@ type ComponentProps = {
export const Home: FunctionComponent<ComponentProps> = (props): JSX.Element => {
return (
<div className={style.mainBody}>
<div className={style.evojapan2023} />
<div className={style.evojapan2025} />
<div className={style.padding} />
<div className={style.evojapan2023kaisaikettei} />
{/* <div className={style.tonamel}>
<a href='https://tonamel.com/competition/49WpE' rel='noopener noreferrer' target='_blank'>&nbsp;</a>
</div> */}
<div className={style.padding} />
<div className={style.group}>
<div className={style.evojapan2023catherinetonamel}>
<a href='https://tonamel.com/competition/VD6y8' rel='noopener noreferrer' target='_blank'>&nbsp;</a>
</div>
<div className={style.evojapan2023catherinefullbodytonamel}>
<a href='https://tonamel.com/competition/dgdQ9' rel='noopener noreferrer' target='_blank'>&nbsp;</a>
</div>
</div>
<div className={style.padding} />
<div className={style.twitchHome}>
<a href='https://www.twitch.tv/catherine_faito_crab' rel='noopener noreferrer' target='_blank'>&nbsp;</a>

55
main-web/client/src/web.module.scss
View File

@@ -448,11 +448,58 @@
background-size: contain;
background-repeat: none;
}
.evojapan2023kaisaikettei {
width: 941px;
height: 729px;
.evojapan2024 {
width: 500px;
height: 471px;
margin: auto;
background-image: url('https://static.catherine-fc.com/media/kaisaikettei2.png');
background-image: url('https://static.catherine-fc.com/media/evo_2024_logo_shadow_drop.png');
background-size: contain;
background-repeat: none;
}
.evojapan2025 {
width: 500px;
height: 471px;
margin: auto;
background-image: url('https://static.catherine-fc.com/media/evo_logo_2025_shadow_drop.png');
background-size: contain;
background-repeat: none;
}
.evojapan2023kaisaikettei {
width: 846px;
height: 285px;
margin: auto;
background-image: url('https://static.catherine-fc.com/media/kaisaikettei3.png');
background-size: contain;
}
.evojapan2023catherinetonamel {
width: 412px;
height: 389px;
background-image: url('https://static.catherine-fc.com/media/catherine_logo_classic.png');
background-size: contain;
background-repeat: none;
&> a {
display:block;
width: 412px;
height: 389px;
}
}
.evojapan2023catherinefullbodytonamel {
width: 517px;
height: 319px;
background-image: url('https://static.catherine-fc.com/media/catherine_fullbody_logo.png');
background-size: contain;
background-repeat: none;
&> a {
display:block;
width: 517px;
height: 319px;
}
}
.group {
width: 900px;
height: 389px;
margin: auto;
display: flex;
background-size: contain;
background-repeat: none;
}

2
main-web/server/package.json
View File

@@ -24,7 +24,7 @@
"@types/express": "^4.17.6",
"@types/mysql": "^2.1.4",
"@types/socket.io": "^2.1.4",
"typescript": "^3.8.3",
"typescript": "^4.9.5",
"tslint": "^5.18.0",
"tslint-config-airbnb": "^5.11.1"
}

3
tools/janken/package.json
View File

@@ -4,6 +4,7 @@
"private": true,
"homepage": "tool",
"dependencies": {
"@babel/core": "^7.24.4",
"dotenv": "^8.2.0",
"node-sass": "^4.13.1",
"react": "^16.13.1",
@@ -12,7 +13,7 @@
"semantic-ui-css": "^2.4.1",
"semantic-ui-react": "^0.88.2",
"socket.io-client": "^2.3.0",
"typescript": "^3.7.5"
"typescript": "^4.9.5"
},
"devDependencies": {
"@testing-library/jest-dom": "^4.2.4",