Skip to content

Commit

Permalink
Merge branch 'master' into convert-remaining-components-to-ts
Browse files Browse the repository at this point in the history
  • Loading branch information
ChristophNiehoff committed May 24, 2024
2 parents 87c5499 + 29f6487 commit b74769b
Show file tree
Hide file tree
Showing 12 changed files with 266 additions and 117 deletions.
164 changes: 55 additions & 109 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eop",
"version": "0.22.0",
"version": "0.23.0",
"private": true,
"main": "src/client/index.tsx",
"dependencies": {
Expand All @@ -13,7 +13,7 @@
"bootstrap": "^4.6.0",
"cornucopia-cards-modified": "file:cornucopiaCards",
"esm": "^3.2.25",
"jointjs": "^3.7.4",
"jointjs": "^3.7.7",
"koa": "^2.14.2",
"koa-body": "^4.2.0",
"koa-router": "^12.0.1",
Expand All @@ -30,7 +30,7 @@
"react-scripts": "^5.0.1",
"reactstrap": "^8.10.1",
"reactstrap-confirm": "^1.3.2",
"superagent": "^8.0.9",
"superagent": "^9.0.2",
"uuid": "^9.0.0"
},
"type": "module",
Expand Down Expand Up @@ -76,7 +76,7 @@
"@types/jest": "^27.5.2",
"@types/koa__cors": "^3.3.0",
"@types/koa-router": "^7.4.4",
"@types/koa-send": "^4.1.3",
"@types/koa-send": "^4.1.6",
"@types/lodash": "^4.14.189",
"@types/node": "^16.11.26",
"@types/react": "^17.0.43",
Expand All @@ -95,7 +95,7 @@
"npm-run-all": "^4.1.5",
"prettier": "^3.2.5",
"seedrandom": "^3.0.5",
"supertest": "^6.3.4",
"supertest": "^7.0.0",
"ts-toolbelt": "^9.6.0",
"typescript": "^4.8.4"
},
Expand Down
4 changes: 3 additions & 1 deletion src/client/components/dealtcard/dealtcard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ interface DealtCardProps {
const DealtCard: React.FC<DealtCardProps> = ({ gameMode, card }) => {
const roundedClass =
gameMode === GameMode.CUMULUS ? `card-rounded-cumulus` : `card-rounded`;
const translationClass =
gameMode === GameMode.EOMLSEC ? `card-translate-left` : ``;
return (
<div
className={`playing-card ${getCardCssClass(
gameMode,
card,
)} active ${roundedClass} scaled-big`}
)} active ${roundedClass} scaled-big ${translationClass}`}
/>
);
};
Expand Down
Loading

0 comments on commit b74769b

Please sign in to comment.