Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cumulative updates #69

Merged
merged 3 commits into from
Aug 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.20.2
18.20.4
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
18.20.2
18.20.4
lts/hydrogen
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodejs 18.20.2 ref:v18.20.2 lts-hydrogen lts system latest
nodejs 18.20.4 ref:v18.20.4 lts-hydrogen lts system latest
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"typescript-eslint-language-service": "^4.1.5"
},
"engines": {
"node": ">=18.20.2",
"node": "^18.20 || ^20.10 || >=22",
"npm": ">=8.7.0"
}
}
40 changes: 26 additions & 14 deletions src/intl/locales/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
"description": "e-sea は、自分の可能性を信じてチャレンジする人を応援します。"
},
"pages": {
"error": {
"http404": {
"primary": "404",
"secondary": ["Oh no's! We couldn't find that page :("]
}
},
"top": {
"hero": ["FOR TOMO", "RROW FUN"],
"overview": {
Expand Down Expand Up @@ -31,6 +37,14 @@
"title": "SESコンサルティング",
"note": [""]
},
{
"note": [""],
"title": "人材紹介免許 認定事業者"
},
{
"note": [""],
"title": "中小機構 IT導入補助金 認定事業者"
},
{
"title": "農林水産業",
"note": ["農林水産省認可済"]
Expand Down Expand Up @@ -184,18 +198,14 @@
"萩池々茶屋ビル 2F"
]
},
"hr": {
"primary": "HR リクルートオフィス",
"secondary": ["〒1100016", "東京都台東区台東2-7-3", "瀬戸ビル 3F"]
},
"management": {
"primary": "請求管理部",
"secondary": ["〒1510053", "東京都渋谷区代々木 2-18-6-802"]
},
"studio": {
"primary": "巣鴨地蔵通り ロケスタジオ",
"secondary": [
"〒1700002",
"東京都豊島区巣鴨 3-21-16",
"グレースベルツリービル 5F 萩中央水産(株)"
]
},
"sales": {
"primary": "営業部",
"secondary": [
Expand All @@ -204,6 +214,14 @@
"クサフカビル5F"
]
},
"studio": {
"primary": "巣鴨地蔵通り ロケスタジオ",
"secondary": [
"〒1700002",
"東京都豊島区巣鴨 3-21-16",
"グレースベルツリービル 5F 萩中央水産(株)"
]
},
"vietnam": {
"primary": "ベトナムオフィス",
"secondary": [
Expand Down Expand Up @@ -258,12 +276,6 @@
"secondary": "伊澤までお問い合わせください。"
},
"footer": "Copyright ©︎{date} {company} All right reserved."
},
"error": {
"http404": {
"primary": "404",
"secondary": ["Oh no's! We couldn't find that page :("]
}
}
}
}
4 changes: 4 additions & 0 deletions src/intl/messages/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ export const top = {
primary: { id: 'pages.top.about.body.offices.hq.primary' },
secondary: { id: 'pages.top.about.body.offices.hq.secondary' },
}),
hr: defineMessages({
primary: { id: 'pages.top.about.body.offices.hr.primary' },
secondary: { id: 'pages.top.about.body.offices.hr.secondary' },
}),
management: defineMessages({
primary: { id: 'pages.top.about.body.offices.management.primary' },
secondary: { id: 'pages.top.about.body.offices.management.secondary' },
Expand Down
16 changes: 10 additions & 6 deletions src/molecules/About.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,19 @@ const FC: React.FC = () => {
<Divider variant="inset" component="li" />
<ListItem>
<Address
caption={intl.format(offices.sales.primary)}
address={intl.format(offices.sales.secondary) as string[]}
caption={intl.format(offices.hr.primary)}
address={intl.format(offices.hr.secondary) as string[]}
/>
<Address
caption={intl.format(offices.management.primary)}
address={intl.format(offices.management.secondary) as string[]}
caption={intl.format(offices.sales.primary)}
address={intl.format(offices.sales.secondary) as string[]}
/>
</ListItem>
<Divider variant="inset" component="li" />
<ListItem>
<Address
caption={intl.format(offices.vietnam.primary)}
address={intl.format(offices.vietnam.secondary) as string[]}
caption={intl.format(offices.management.primary)}
address={intl.format(offices.management.secondary) as string[]}
/>
<Address
caption={intl.format(offices.factory.primary)}
Expand All @@ -93,6 +93,10 @@ const FC: React.FC = () => {
</ListItem>
<Divider variant="inset" component="li" />
<ListItem>
<Address
caption={intl.format(offices.vietnam.primary)}
address={intl.format(offices.vietnam.secondary) as string[]}
/>
<Address
caption={intl.format(offices.cambodia.primary)}
address={intl.format(offices.cambodia.secondary) as string[]}
Expand Down