Skip to content

main #330

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.

Sign up for GitHub

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

Merged
yn1323 merged 9 commits into from
Apr 16, 2026
Merged

main #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9e4e434
fix: ダッシュボードデザインの提出状況表示を分数形式に変更しもっと見る/すべて表示ボタンを削除
yn1323 Apr 16, 2026
15239d3
chore: RenovateのPR作成スケジュールを土曜早朝のみに変更
yn1323 Apr 16, 2026
ccf569e
chore: 静的ルートのプリレンダリングをCI/CDに組み込み
yn1323 Apr 16, 2026
ac7a40d
feat: ロゴ画像の導入とOGP画像の差し替え
yn1323 Apr 16, 2026
150eba2
feat: LPナビ背景をグラデーションに変更
yn1323 Apr 16, 2026
603e905
fix: LPナビのグラデ下端をHero上端色と揃えてシームレス化
yn1323 Apr 16, 2026
4f6f9aa
fix
yn1323 Apr 16, 2026
0616dfc
Merge pull request #329 from yn1323/feat/0415
yn1323 Apr 16, 2026
829f2ee
Merge branch 'main' into develop
yn1323 Apr 16, 2026
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
9 changes: 8 additions & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ jobs:
VITE_CONVEX_URL: ${{ steps.convex.outputs.PREVIEW_URL }}
VITE_CLERK_PUBLISHABLE_KEY: ${{ secrets.VITE_CLERK_PUBLISHABLE_KEY }}
VITE_GTM_ID: ${{ secrets.VITE_GTM_ID }}
# - name: Setup Playwright
# uses: ./.github/actions/playwright
# - name: Prerender static routes
# run: pnpm prerender
- name: Deploy to Cloudflare Pages
id: deploy
run: |
Expand Down Expand Up @@ -110,11 +114,14 @@ jobs:
VITE_CONVEX_URL: ${{ secrets.VITE_CONVEX_URL }}
VITE_CLERK_PUBLISHABLE_KEY: ${{ secrets.VITE_CLERK_PUBLISHABLE_KEY }}
VITE_GTM_ID: ${{ secrets.VITE_GTM_ID }}
- name: Setup Playwright
uses: ./.github/actions/playwright
- name: Prerender static routes
run: pnpm prerender
- name: Deploy to Cloudflare Pages
run: |
npx wrangler pages deploy dist \
--project-name dev-yps-crispy-carnival
env:
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}

6 changes: 6 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ jobs:
VITE_CLERK_PUBLISHABLE_KEY: ${{ secrets.VITE_CLERK_PUBLISHABLE_KEY }}
VITE_GTM_ID: ${{ secrets.VITE_GTM_ID }}

# - name: Setup Playwright
# uses: ./.github/actions/playwright

# - name: Prerender static routes
# run: pnpm prerender

- name: Deploy to Cloudflare Pages
run: |
npx wrangler pages deploy dist \
Expand Down
178 changes: 7 additions & 171 deletions design/dashboard.pen
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
"type": "frame",
"id": "RokyI",
"x": 0,
"y": 0,
"y": -63,
"name": "Dashboard/Normal",
"width": 1440,
"fill": "$bg/default",
Expand Down Expand Up @@ -491,7 +491,7 @@
"id": "15olP",
"name": "card1Submitted",
"fill": "$fg/muted",
"content": "提出済み: 8人",
"content": "提出状況: 8/10人",
"fontFamily": "Inter",
"fontSize": "$fontSize/sm",
"fontWeight": "normal"
Expand Down Expand Up @@ -629,7 +629,7 @@
"id": "6UZso",
"name": "card2Submitted",
"fill": "$fg/muted",
"content": "提出済み: 10人",
"content": "提出状況: 10/10人",
"fontFamily": "Inter",
"fontSize": "$fontSize/sm",
"fontWeight": "normal"
Expand Down Expand Up @@ -701,47 +701,6 @@
]
}
]
},
{
"type": "frame",
"id": "WnPm5",
"name": "LoadMoreButton",
"width": "fill_container",
"cornerRadius": "$radii/md",
"stroke": {
"align": "inside",
"thickness": 1,
"fill": "$border/default"
},
"gap": 6,
"padding": [
10,
0
],
"justifyContent": "center",
"alignItems": "center",
"children": [
{
"type": "icon_font",
"id": "1FVzd",
"name": "pcLoadMoreIcon",
"width": 16,
"height": 16,
"iconFontName": "chevron-down",
"iconFontFamily": "lucide",
"fill": "$fg/muted"
},
{
"type": "text",
"id": "TLcfJ",
"name": "pcLoadMoreText",
"fill": "$fg/muted",
"content": "もっと見る",
"fontFamily": "Inter",
"fontSize": "$fontSize/sm",
"fontWeight": "500"
}
]
}
]
},
Expand Down Expand Up @@ -1122,47 +1081,6 @@
]
}
]
},
{
"type": "frame",
"id": "AUacf",
"name": "ShowAllButton",
"width": "fill_container",
"cornerRadius": "$radii/md",
"stroke": {
"align": "inside",
"thickness": 1,
"fill": "$border/default"
},
"gap": 6,
"padding": [
10,
0
],
"justifyContent": "center",
"alignItems": "center",
"children": [
{
"type": "icon_font",
"id": "OkznT",
"name": "pcShowAllIcon",
"width": 16,
"height": 16,
"iconFontName": "chevrons-down",
"iconFontFamily": "lucide",
"fill": "$fg/muted"
},
{
"type": "text",
"id": "XEnZ6",
"name": "pcShowAllText",
"fill": "$fg/muted",
"content": "すべて表示",
"fontFamily": "Inter",
"fontSize": "$fontSize/sm",
"fontWeight": "500"
}
]
}
]
}
Expand All @@ -1174,7 +1092,7 @@
"type": "frame",
"id": "IdakJ",
"x": -12,
"y": 1035,
"y": 781,
"name": "Dashboard/CreateRecruitmentModal",
"width": 480,
"height": 360,
Expand Down Expand Up @@ -1691,7 +1609,7 @@
"id": "d3W9W",
"name": "spCard1Submitted",
"fill": "$fg/muted",
"content": "提出済み: 10人",
"content": "提出: 8/10人",
"fontFamily": "Inter",
"fontSize": "$fontSize/xs",
"fontWeight": "normal"
Expand Down Expand Up @@ -1818,7 +1736,7 @@
"id": "EeqAj",
"name": "spCard2Submitted",
"fill": "$fg/muted",
"content": "提出済み: 10人",
"content": "提出: 10/10人",
"fontFamily": "Inter",
"fontSize": "$fontSize/xs",
"fontWeight": "normal"
Expand Down Expand Up @@ -1887,47 +1805,6 @@
]
}
]
},
{
"type": "frame",
"id": "JOUpM",
"name": "LoadMoreButton",
"width": "fill_container",
"cornerRadius": "$radii/md",
"stroke": {
"align": "inside",
"thickness": 1,
"fill": "$border/default"
},
"gap": 6,
"padding": [
10,
0
],
"justifyContent": "center",
"alignItems": "center",
"children": [
{
"type": "icon_font",
"id": "u5Zm5",
"name": "spLoadMoreIcon",
"width": 14,
"height": 14,
"iconFontName": "chevron-down",
"iconFontFamily": "lucide",
"fill": "$fg/muted"
},
{
"type": "text",
"id": "w9WP4",
"name": "spLoadMoreText",
"fill": "$fg/muted",
"content": "もっと見る",
"fontFamily": "Inter",
"fontSize": "$fontSize/xs",
"fontWeight": "500"
}
]
}
]
},
Expand Down Expand Up @@ -2309,47 +2186,6 @@
]
}
]
},
{
"type": "frame",
"id": "wIG6I",
"name": "ShowAllButton",
"width": "fill_container",
"cornerRadius": "$radii/md",
"stroke": {
"align": "inside",
"thickness": 1,
"fill": "$border/default"
},
"gap": 6,
"padding": [
10,
0
],
"justifyContent": "center",
"alignItems": "center",
"children": [
{
"type": "icon_font",
"id": "ZiLR5",
"name": "spShowAllIcon",
"width": 14,
"height": 14,
"iconFontName": "chevrons-down",
"iconFontFamily": "lucide",
"fill": "$fg/muted"
},
{
"type": "text",
"id": "9ldt6",
"name": "spShowAllText",
"fill": "$fg/muted",
"content": "すべて表示",
"fontFamily": "Inter",
"fontSize": "$fontSize/xs",
"fontWeight": "500"
}
]
}
]
}
Expand Down Expand Up @@ -2621,7 +2457,7 @@
"type": "frame",
"id": "3iRDC",
"x": 3085,
"y": 1084,
"y": 900,
"name": "Dashboard/CreateRecruitmentSheet",
"width": 390,
"height": 500,
Expand Down
21 changes: 15 additions & 6 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@
/>
<link rel="canonical" href="https://shiftori.app" />
<meta name="theme-color" content="#000000" />
<link
rel="icon"
href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'><text y='.9em' font-size='90'>🦜</text></svg>"
/>
<link rel="icon" href="/favicon.ico" />
<link rel="apple-touch-icon" href="/logo192.png" />
<link rel="manifest" href="/manifest.json" />

Expand All @@ -29,7 +26,15 @@
content="少人数のお店のシフト作成をもっとラクに リンクを送るだけで希望シフトを収集 スタッフのアカウント登録も不要 無料ではじめられるシフト管理ツール"
/>
<meta property="og:url" content="https://shiftori.app" />
<meta property="og:image" content="https://shiftori.app/og-image.png" />
<meta property="og:image" content="https://shiftori.app/ogp.png" />
<meta property="og:image:secure_url" content="https://shiftori.app/ogp.png" />
<meta property="og:image:type" content="image/png" />
<meta property="og:image:width" content="1200" />
<meta property="og:image:height" content="630" />
<meta
property="og:image:alt"
content="シフトリ | 少人数のお店のシフト管理をもっとラクに"
/>
<meta property="og:locale" content="ja_JP" />

<!-- Twitter Card -->
Expand All @@ -42,7 +47,11 @@
name="twitter:description"
content="少人数のお店のシフト作成をもっとラクに リンクを送るだけで希望シフトを収集 スタッフのアカウント登録も不要 無料ではじめられるシフト管理ツール"
/>
<meta name="twitter:image" content="https://shiftori.app/og-image.png" />
<meta name="twitter:image" content="https://shiftori.app/ogp.png" />
<meta
name="twitter:image:alt"
content="シフトリ | 少人数のお店のシフト管理をもっとラクに"
/>

<!-- JSON-LD -->
<script type="application/ld+json">
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"type": "module",
"scripts": {
"build": "vite build && tsc",
"prerender": "tsx scripts/prerender.ts",
"dev": "vite --port 3000",
"dev:all": "concurrently -n dev,convex,storybook -c blue,green,magenta \"pnpm dev\" \"pnpm convex:dev\" \"pnpm storybook\"",
"format": "biome check --write",
Expand Down
Binary file added public/ogp.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/textlogo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"baseBranches": ["develop"],
"automerge": true,
"minimumReleaseAge": "2 days",
"schedule": ["every weekend"],
"schedule": ["before 6am on saturday"],
"packageRules": [
{
"addLabels": ["react"],
Expand Down
Loading
Loading
⚡