Skip to content
This repository was archived by the owner on Mar 29, 2023. It is now read-only.

Commit c25fb79

Browse files
itizawaitizawa
authored
Merge pull request #1088 from itizaworld/main
release v2.2.1
2 parents 1d1c2a1 + bffb236 commit c25fb79

File tree

5 files changed

+34
-35
lines changed

5 files changed

+34
-35
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"devDependencies": {
2727
"@typescript-eslint/parser": "^5.39.0",
28-
"eslint": "8.22.0",
28+
"eslint": "8.25.0",
2929
"eslint-config-prettier": "8.5.0",
3030
"eslint-import-resolver-typescript": "^3.5.1",
3131
"eslint-plugin-import": "^2.26.0",

‎packages/web/src/components/common/Parts/Sidebar/Sidebar.tsx

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { FC, ComponentProps } from 'react';
2-
import Link from 'next/link';
32
import { useRouter } from 'next/router';
43

54
import { Button, Grid } from '@nextui-org/react';
@@ -30,16 +29,16 @@ export const Sidebar: FC = () => {
3029
>
3130
{navbarItemMappings.map((v) => {
3231
return (
33-
<Link key={v.text} href={v.url}>
34-
<Button
35-
color="secondary"
36-
css={{ gap: '$2', fontWeight: '$bold' }}
37-
icon={v.icon != null ? <Icon icon={v.icon} /> : undefined}
38-
ghost={!router.pathname.startsWith(v.url)}
39-
>
40-
{v.text}
41-
</Button>
42-
</Link>
32+
<Button
33+
key={v.text}
34+
color="secondary"
35+
css={{ gap: '$2', fontWeight: '$bold' }}
36+
icon={v.icon != null ? <Icon icon={v.icon} /> : undefined}
37+
ghost={!router.pathname.startsWith(v.url)}
38+
onClick={() => router.push(v.url)}
39+
>
40+
{v.text}
41+
</Button>
4342
);
4443
})}
4544
{/* <SidebarDirectoryList /> */}

‎packages/web/src/pages/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const Page: WebevNextPage<Props> = ({ count }) => {
2727
<Grid css={{ textAlign: 'center', my: '$10' }}>
2828
<PageCountupCard count={count} text={t.total_pages} />
2929
</Grid>
30-
<Grid css={{ textAlign: 'center' }}>
30+
<Grid css={{ justifyContent: 'center', display: 'flex' }}>
3131
<Link href="/home" block color="default">
3232
{t.start_immediately}
3333
</Link>

‎packages/web/src/pages/page/[id].tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ const StyledDiv = styled(Grid)`
8181
width: 100%;
8282
8383
img {
84+
object-fit: contain;
8485
width: 100%;
8586
border: 3px #aaa solid;
8687
}

‎yarn.lock

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,7 @@
11031103
resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
11041104
integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
11051105

1106-
"@eslint/eslintrc@^1.3.0":
1106+
"@eslint/eslintrc@^1.3.3":
11071107
version "1.3.3"
11081108
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz#2b044ab39fdfa75b4688184f9e573ce3c5b0ff95"
11091109
integrity sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==
@@ -1157,7 +1157,7 @@
11571157
dependencies:
11581158
tslib "2.4.0"
11591159

1160-
"@humanwhocodes/config-array@^0.10.4":
1160+
"@humanwhocodes/config-array@^0.10.5":
11611161
version "0.10.7"
11621162
resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.7.tgz#6d53769fd0c222767e6452e8ebda825c22e9f0dc"
11631163
integrity sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==
@@ -1166,10 +1166,10 @@
11661166
debug "^4.1.1"
11671167
minimatch "^3.0.4"
11681168

1169-
"@humanwhocodes/gitignore-to-minimatch@^1.0.2":
1170-
version "1.0.2"
1171-
resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d"
1172-
integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==
1169+
"@humanwhocodes/module-importer@^1.0.1":
1170+
version "1.0.1"
1171+
resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
1172+
integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
11731173

11741174
"@humanwhocodes/object-schema@^1.2.1":
11751175
version "1.2.1"
@@ -3897,14 +3897,14 @@ eslint-visitor-keys@^3.3.0:
38973897
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
38983898
integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
38993899

3900-
eslint@8.22.0:
3901-
version "8.22.0"
3902-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.22.0.tgz#78fcb044196dfa7eef30a9d65944f6f980402c48"
3903-
integrity sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==
3900+
eslint@8.25.0:
3901+
version "8.25.0"
3902+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.25.0.tgz#00eb962f50962165d0c4ee3327708315eaa8058b"
3903+
integrity sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==
39043904
dependencies:
3905-
"@eslint/eslintrc" "^1.3.0"
3906-
"@humanwhocodes/config-array" "^0.10.4"
3907-
"@humanwhocodes/gitignore-to-minimatch" "^1.0.2"
3905+
"@eslint/eslintrc" "^1.3.3"
3906+
"@humanwhocodes/config-array" "^0.10.5"
3907+
"@humanwhocodes/module-importer" "^1.0.1"
39083908
ajv "^6.10.0"
39093909
chalk "^4.0.0"
39103910
cross-spawn "^7.0.2"
@@ -3914,13 +3914,12 @@ [email protected]:
39143914
eslint-scope "^7.1.1"
39153915
eslint-utils "^3.0.0"
39163916
eslint-visitor-keys "^3.3.0"
3917-
espree "^9.3.3"
3917+
espree "^9.4.0"
39183918
esquery "^1.4.0"
39193919
esutils "^2.0.2"
39203920
fast-deep-equal "^3.1.3"
39213921
file-entry-cache "^6.0.1"
39223922
find-up "^5.0.0"
3923-
functional-red-black-tree "^1.0.1"
39243923
glob-parent "^6.0.1"
39253924
globals "^13.15.0"
39263925
globby "^11.1.0"
@@ -3929,6 +3928,7 @@ [email protected]:
39293928
import-fresh "^3.0.0"
39303929
imurmurhash "^0.1.4"
39313930
is-glob "^4.0.0"
3931+
js-sdsl "^4.1.4"
39323932
js-yaml "^4.1.0"
39333933
json-stable-stringify-without-jsonify "^1.0.1"
39343934
levn "^0.4.1"
@@ -3940,9 +3940,8 @@ [email protected]:
39403940
strip-ansi "^6.0.1"
39413941
strip-json-comments "^3.1.0"
39423942
text-table "^0.2.0"
3943-
v8-compile-cache "^2.0.3"
39443943

3945-
espree@^9.3.3, espree@^9.4.0:
3944+
espree@^9.4.0:
39463945
version "9.4.0"
39473946
resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a"
39483947
integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==
@@ -5107,6 +5106,11 @@ jquery@>=1.12.0:
51075106
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16"
51085107
integrity sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==
51095108

5109+
js-sdsl@^4.1.4:
5110+
version "4.1.5"
5111+
resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.5.tgz#1ff1645e6b4d1b028cd3f862db88c9d887f26e2a"
5112+
integrity sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==
5113+
51105114
"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
51115115
version "4.0.0"
51125116
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -6938,11 +6942,6 @@ v8-compile-cache-lib@^3.0.1:
69386942
resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
69396943
integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
69406944

6941-
v8-compile-cache@^2.0.3:
6942-
version "2.3.0"
6943-
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
6944-
integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
6945-
69466945
v8-to-istanbul@^9.0.1:
69476946
version "9.0.1"
69486947
resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz#b6f994b0b5d4ef255e17a0d17dc444a9f5132fa4"

0 commit comments

Comments
 (0)