Skip to content

Commit

Permalink
Merge pull request #27 from zolplay-cn/dev
Browse files Browse the repository at this point in the history
Prod bump
  • Loading branch information
CaliCastle authored Nov 9, 2023
2 parents 7b7df1e + 82114b4 commit 63c9ba4
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 2 deletions.
2 changes: 2 additions & 0 deletions app/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { clsxm } from '@zolplay/utils'
import { LocaleSelector } from '~/app/LocaleSelector'
import { ThemeSelector } from '~/app/ThemeSelector'
import { BrandXIcon } from '~/components/icons/BrandXIcon'
import { ShopIcon } from '~/components/icons/ShopIcon'
import { Logo, LogoHelmet } from '~/components/Logo'
import { Clock } from '~/components/ui/Clock'
import { motion } from 'framer-motion'
Expand All @@ -29,6 +30,7 @@ const links = [
{ href: '/portfolios', label: 'Portfolios', icon: TbCarouselHorizontal },
// { href: '/services', label: 'Services', icon: TbAugmentedReality2 },
{ href: '/contact', label: 'Contact', icon: TbMailbox },
{ href: 'https://shop.zolplay.cn', label: 'Shop', icon: ShopIcon },
// { href: '/gallery', label: 'Gallery', icon: TbPhoto },
]
const social = [
Expand Down
32 changes: 32 additions & 0 deletions components/icons/ShopIcon.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { clsxm } from '@zolplay/utils'

export function ShopIcon({ className }: { className?: string }) {
return (
<svg
className={clsxm('h-6 w-6 stroke-current', className)}
viewBox="0 0 500 500"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M221.078 54.5977C238.348 39.9444 263.714 40.04 280.873 54.8231L308.82 78.901C315.207 84.4038 318.88 92.4163 318.88 100.847V149.123C318.88 157.593 325.746 164.459 334.216 164.459C342.686 164.459 349.552 157.593 349.552 149.123V100.847C349.552 83.4896 341.99 66.9934 328.84 55.6641L300.892 31.5862C272.294 6.94763 230.017 6.78828 201.234 31.2105L172.519 55.5744C159.164 66.9058 151.466 83.535 151.466 101.049V149.123C151.466 157.593 158.332 164.459 166.801 164.459C175.271 164.459 182.137 157.593 182.137 149.123V101.049C182.137 92.5425 185.876 84.4654 192.363 78.9616L221.078 54.5977ZM76.6304 117.683L50.0442 470.446C49.3736 479.345 56.4128 486.934 65.3366 486.934H433.977C442.9 486.934 449.94 479.345 449.269 470.446L422.683 117.683C422.281 112.35 417.836 108.228 412.488 108.228H377.656C374.525 108.228 372.132 111.006 372.437 114.122C374.916 139.431 370.779 180.646 336.772 180.646C303.497 180.646 295.885 138.899 296.123 113.636C296.15 110.695 293.823 108.228 290.881 108.228H209.287C206.191 108.228 203.809 110.946 204.053 114.032C206.054 139.333 200.831 180.646 165.523 180.646C136.762 180.646 130.149 140.889 130.338 115.492C130.367 111.554 127.258 108.228 123.321 108.228H86.8253C81.4769 108.228 77.0324 112.35 76.6304 117.683Z"
fill="currentColor"
/>
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M192.536 234.266C185.805 230.092 186.166 220.153 193.271 216.516L193.295 216.504C251.585 186.957 324.059 210.087 353.597 270.517C379.39 323.249 362.038 388.009 313.334 420.779C257.312 458.515 182.603 441.995 147.07 386.717C143.012 380.457 146.843 371.977 154.37 371.063L155.207 370.96C156.202 370.837 157.236 370.71 158.266 370.582C133.241 323.044 148.935 264.137 194.236 235.338C193.649 234.958 193.088 234.605 192.56 234.281L192.536 234.266ZM211.104 249.081C210.149 249.584 209.201 250.108 208.258 250.652C168.574 273.563 154.977 324.307 177.889 363.991C178.387 364.855 178.899 365.706 179.423 366.544C182.231 365.774 185.407 364.817 188.808 363.645C199.284 360.035 211.5 354.52 221.71 346.453C219.841 344.492 218.174 342.279 216.759 339.83C207.158 323.199 212.856 301.933 229.486 292.332C232.468 290.61 235.599 289.38 238.785 288.617C234.486 277.426 227.32 267.204 220.648 259.317C217.037 255.048 213.652 251.559 211.104 249.081ZM264.622 269.451C264.039 276.7 263.033 283.879 261.621 290.954C258.514 289.501 255.207 288.515 251.818 288.025C253.041 281.719 253.923 275.327 254.451 268.876C251.895 267.71 249.665 265.765 248.154 263.147C244.291 256.455 246.583 247.899 253.275 244.035C259.966 240.172 268.522 242.465 272.385 249.156C276.249 255.848 273.956 264.404 267.265 268.268C266.41 268.761 265.524 269.155 264.622 269.451ZM236.276 304.092C226.141 309.944 222.668 322.904 228.52 333.04C234.371 343.176 247.331 346.648 257.466 340.797C267.601 334.945 271.074 321.984 265.223 311.849C259.371 301.713 246.411 298.24 236.276 304.092Z"
className="fill-stone-100 dark:fill-stone-900"
/>
<path
d="M207.664 270.605C207.664 270.605 185.078 282.273 183.593 312.766"
stroke-width="6.78973"
stroke-miterlimit="10"
stroke-linecap="round"
className="stroke-stone-100 dark:stroke-stone-900"
/>
</svg>
)
}
3 changes: 2 additions & 1 deletion messages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"Services": "Services",
"Portfolios": "Portfolios",
"Contact": "Contact",
"Gallery": "Gallery"
"Gallery": "Gallery",
"Shop": "Shop"
},
"Themes": {
"Placeholder": "Select a theme",
Expand Down
3 changes: 2 additions & 1 deletion messages/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"Services": "服务提供",
"Portfolios": "作品展廊",
"Contact": "联系我们",
"Gallery": "图片墙"
"Gallery": "图片墙",
"Shop": "佐玩商城"
},
"Themes": {
"Placeholder": "选择颜色主题",
Expand Down

1 comment on commit 63c9ba4

@vercel
Copy link

@vercel vercel bot commented on 63c9ba4 Nov 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

website – ./

website-zolplay.vercel.app
website-git-main-zolplay.vercel.app
www.zolplay.com
zolplay.com

Please sign in to comment.