Skip to content

Commit a9e5fb5

Browse files
yn1323yn1323
authored
Merge pull request #330 from yn1323/develop
main
2 parents d1becea + 829f2ee commit a9e5fb5

File tree

12 files changed

+272
-201
lines changed

12 files changed

+272
-201
lines changed

‎.github/workflows/deploy.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ jobs:
4242
VITE_CONVEX_URL: ${{ steps.convex.outputs.PREVIEW_URL }}
4343
VITE_CLERK_PUBLISHABLE_KEY: ${{ secrets.VITE_CLERK_PUBLISHABLE_KEY }}
4444
VITE_GTM_ID: ${{ secrets.VITE_GTM_ID }}
45+
# - name: Setup Playwright
46+
# uses: ./.github/actions/playwright
47+
# - name: Prerender static routes
48+
# run: pnpm prerender
4549
- name: Deploy to Cloudflare Pages
4650
id: deploy
4751
run: |
@@ -110,11 +114,14 @@ jobs:
110114
VITE_CONVEX_URL: ${{ secrets.VITE_CONVEX_URL }}
111115
VITE_CLERK_PUBLISHABLE_KEY: ${{ secrets.VITE_CLERK_PUBLISHABLE_KEY }}
112116
VITE_GTM_ID: ${{ secrets.VITE_GTM_ID }}
117+
- name: Setup Playwright
118+
uses: ./.github/actions/playwright
119+
- name: Prerender static routes
120+
run: pnpm prerender
113121
- name: Deploy to Cloudflare Pages
114122
run: |
115123
npx wrangler pages deploy dist \
116124
--project-name dev-yps-crispy-carnival
117125
env:
118126
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
119127
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
120-

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@ jobs:
7474
VITE_CLERK_PUBLISHABLE_KEY: ${{ secrets.VITE_CLERK_PUBLISHABLE_KEY }}
7575
VITE_GTM_ID: ${{ secrets.VITE_GTM_ID }}
7676

77+
# - name: Setup Playwright
78+
# uses: ./.github/actions/playwright
79+
80+
# - name: Prerender static routes
81+
# run: pnpm prerender
82+
7783
- name: Deploy to Cloudflare Pages
7884
run: |
7985
npx wrangler pages deploy dist \

‎design/dashboard.pen‎

Lines changed: 7 additions & 171 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
"type": "frame",
267267
"id": "RokyI",
268268
"x": 0,
269-
"y": 0,
269+
"y": -63,
270270
"name": "Dashboard/Normal",
271271
"width": 1440,
272272
"fill": "$bg/default",
@@ -491,7 +491,7 @@
491491
"id": "15olP",
492492
"name": "card1Submitted",
493493
"fill": "$fg/muted",
494-
"content": "提出済み: 8人",
494+
"content": "提出状況: 8/10人",
495495
"fontFamily": "Inter",
496496
"fontSize": "$fontSize/sm",
497497
"fontWeight": "normal"
@@ -629,7 +629,7 @@
629629
"id": "6UZso",
630630
"name": "card2Submitted",
631631
"fill": "$fg/muted",
632-
"content": "提出済み: 10人",
632+
"content": "提出状況: 10/10人",
633633
"fontFamily": "Inter",
634634
"fontSize": "$fontSize/sm",
635635
"fontWeight": "normal"
@@ -701,47 +701,6 @@
701701
]
702702
}
703703
]
704-
},
705-
{
706-
"type": "frame",
707-
"id": "WnPm5",
708-
"name": "LoadMoreButton",
709-
"width": "fill_container",
710-
"cornerRadius": "$radii/md",
711-
"stroke": {
712-
"align": "inside",
713-
"thickness": 1,
714-
"fill": "$border/default"
715-
},
716-
"gap": 6,
717-
"padding": [
718-
10,
719-
0
720-
],
721-
"justifyContent": "center",
722-
"alignItems": "center",
723-
"children": [
724-
{
725-
"type": "icon_font",
726-
"id": "1FVzd",
727-
"name": "pcLoadMoreIcon",
728-
"width": 16,
729-
"height": 16,
730-
"iconFontName": "chevron-down",
731-
"iconFontFamily": "lucide",
732-
"fill": "$fg/muted"
733-
},
734-
{
735-
"type": "text",
736-
"id": "TLcfJ",
737-
"name": "pcLoadMoreText",
738-
"fill": "$fg/muted",
739-
"content": "もっと見る",
740-
"fontFamily": "Inter",
741-
"fontSize": "$fontSize/sm",
742-
"fontWeight": "500"
743-
}
744-
]
745704
}
746705
]
747706
},
@@ -1122,47 +1081,6 @@
11221081
]
11231082
}
11241083
]
1125-
},
1126-
{
1127-
"type": "frame",
1128-
"id": "AUacf",
1129-
"name": "ShowAllButton",
1130-
"width": "fill_container",
1131-
"cornerRadius": "$radii/md",
1132-
"stroke": {
1133-
"align": "inside",
1134-
"thickness": 1,
1135-
"fill": "$border/default"
1136-
},
1137-
"gap": 6,
1138-
"padding": [
1139-
10,
1140-
0
1141-
],
1142-
"justifyContent": "center",
1143-
"alignItems": "center",
1144-
"children": [
1145-
{
1146-
"type": "icon_font",
1147-
"id": "OkznT",
1148-
"name": "pcShowAllIcon",
1149-
"width": 16,
1150-
"height": 16,
1151-
"iconFontName": "chevrons-down",
1152-
"iconFontFamily": "lucide",
1153-
"fill": "$fg/muted"
1154-
},
1155-
{
1156-
"type": "text",
1157-
"id": "XEnZ6",
1158-
"name": "pcShowAllText",
1159-
"fill": "$fg/muted",
1160-
"content": "すべて表示",
1161-
"fontFamily": "Inter",
1162-
"fontSize": "$fontSize/sm",
1163-
"fontWeight": "500"
1164-
}
1165-
]
11661084
}
11671085
]
11681086
}
@@ -1174,7 +1092,7 @@
11741092
"type": "frame",
11751093
"id": "IdakJ",
11761094
"x": -12,
1177-
"y": 1035,
1095+
"y": 781,
11781096
"name": "Dashboard/CreateRecruitmentModal",
11791097
"width": 480,
11801098
"height": 360,
@@ -1691,7 +1609,7 @@
16911609
"id": "d3W9W",
16921610
"name": "spCard1Submitted",
16931611
"fill": "$fg/muted",
1694-
"content": "提出済み: 10人",
1612+
"content": "提出: 8/10人",
16951613
"fontFamily": "Inter",
16961614
"fontSize": "$fontSize/xs",
16971615
"fontWeight": "normal"
@@ -1818,7 +1736,7 @@
18181736
"id": "EeqAj",
18191737
"name": "spCard2Submitted",
18201738
"fill": "$fg/muted",
1821-
"content": "提出済み: 10人",
1739+
"content": "提出: 10/10人",
18221740
"fontFamily": "Inter",
18231741
"fontSize": "$fontSize/xs",
18241742
"fontWeight": "normal"
@@ -1887,47 +1805,6 @@
18871805
]
18881806
}
18891807
]
1890-
},
1891-
{
1892-
"type": "frame",
1893-
"id": "JOUpM",
1894-
"name": "LoadMoreButton",
1895-
"width": "fill_container",
1896-
"cornerRadius": "$radii/md",
1897-
"stroke": {
1898-
"align": "inside",
1899-
"thickness": 1,
1900-
"fill": "$border/default"
1901-
},
1902-
"gap": 6,
1903-
"padding": [
1904-
10,
1905-
0
1906-
],
1907-
"justifyContent": "center",
1908-
"alignItems": "center",
1909-
"children": [
1910-
{
1911-
"type": "icon_font",
1912-
"id": "u5Zm5",
1913-
"name": "spLoadMoreIcon",
1914-
"width": 14,
1915-
"height": 14,
1916-
"iconFontName": "chevron-down",
1917-
"iconFontFamily": "lucide",
1918-
"fill": "$fg/muted"
1919-
},
1920-
{
1921-
"type": "text",
1922-
"id": "w9WP4",
1923-
"name": "spLoadMoreText",
1924-
"fill": "$fg/muted",
1925-
"content": "もっと見る",
1926-
"fontFamily": "Inter",
1927-
"fontSize": "$fontSize/xs",
1928-
"fontWeight": "500"
1929-
}
1930-
]
19311808
}
19321809
]
19331810
},
@@ -2309,47 +2186,6 @@
23092186
]
23102187
}
23112188
]
2312-
},
2313-
{
2314-
"type": "frame",
2315-
"id": "wIG6I",
2316-
"name": "ShowAllButton",
2317-
"width": "fill_container",
2318-
"cornerRadius": "$radii/md",
2319-
"stroke": {
2320-
"align": "inside",
2321-
"thickness": 1,
2322-
"fill": "$border/default"
2323-
},
2324-
"gap": 6,
2325-
"padding": [
2326-
10,
2327-
0
2328-
],
2329-
"justifyContent": "center",
2330-
"alignItems": "center",
2331-
"children": [
2332-
{
2333-
"type": "icon_font",
2334-
"id": "ZiLR5",
2335-
"name": "spShowAllIcon",
2336-
"width": 14,
2337-
"height": 14,
2338-
"iconFontName": "chevrons-down",
2339-
"iconFontFamily": "lucide",
2340-
"fill": "$fg/muted"
2341-
},
2342-
{
2343-
"type": "text",
2344-
"id": "9ldt6",
2345-
"name": "spShowAllText",
2346-
"fill": "$fg/muted",
2347-
"content": "すべて表示",
2348-
"fontFamily": "Inter",
2349-
"fontSize": "$fontSize/xs",
2350-
"fontWeight": "500"
2351-
}
2352-
]
23532189
}
23542190
]
23552191
}
@@ -2621,7 +2457,7 @@
26212457
"type": "frame",
26222458
"id": "3iRDC",
26232459
"x": 3085,
2624-
"y": 1084,
2460+
"y": 900,
26252461
"name": "Dashboard/CreateRecruitmentSheet",
26262462
"width": 390,
26272463
"height": 500,

‎index.html‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
/>
1111
<link rel="canonical" href="https://shiftori.app" />
1212
<meta name="theme-color" content="#000000" />
13-
<link
14-
rel="icon"
15-
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>"
16-
/>
13+
<link rel="icon" href="/favicon.ico" />
1714
<link rel="apple-touch-icon" href="/logo192.png" />
1815
<link rel="manifest" href="/manifest.json" />
1916

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

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

4756
<!-- JSON-LD -->
4857
<script type="application/ld+json">

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"type": "module",
66
"scripts": {
77
"build": "vite build && tsc",
8+
"prerender": "tsx scripts/prerender.ts",
89
"dev": "vite --port 3000",
910
"dev:all": "concurrently -n dev,convex,storybook -c blue,green,magenta \"pnpm dev\" \"pnpm convex:dev\" \"pnpm storybook\"",
1011
"format": "biome check --write",

‎public/ogp.png‎

71 KB
Loading

‎public/textlogo.png‎

55.7 KB
Loading

‎renovate.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"baseBranches": ["develop"],
77
"automerge": true,
88
"minimumReleaseAge": "2 days",
9-
"schedule": ["every weekend"],
9+
"schedule": ["before 6am on saturday"],
1010
"packageRules": [
1111
{
1212
"addLabels": ["react"],

0 commit comments

Comments
 (0)
⚡