Skip to content

Commit

Permalink
Merge pull request #20 from zolplay-cn/dev
Browse files Browse the repository at this point in the history
Bump dev to production
  • Loading branch information
CaliCastle authored Sep 14, 2023
2 parents e28c280 + c4206ed commit ebd0271
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 26 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ yarn-error.log*
*.code-workspace
tsconfig.tsbuildinfo
.vercel
.env*.local
26 changes: 20 additions & 6 deletions app/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { Link, useTranslations } from 'next-intl'
import { usePathname } from 'next-intl/client'
import NextLink from 'next/link'
import React from 'react'
import { BsGithub, BsTwitter, BsYoutube } from 'react-icons/bs'
import { BsGithub, BsYoutube } from 'react-icons/bs'
import {
TbBriefcase,
TbCarouselHorizontal,
Expand All @@ -34,7 +34,19 @@ const social = [
{
name: 'Twitter',
url: 'https://twitter.com/zolplay',
icon: BsTwitter,
icon: (props: any) => (
<svg
viewBox="0 0 37 34"
fill="none"
xmlns="http://www.w3.org/2000/svg"
{...props}
>
<path
d="M0.45849 33.5746L13.8922 18.88L0 0.425781H11.4393L20.1735 11.9797L30.7876 0.425781H35.1661L22.145 14.616L36.427 33.5746H24.9648L15.8637 21.5163L4.83706 33.5746H0.45849ZM26.4778 31.0758H31.1544L9.94922 2.92455H5.24971L26.4778 31.0758Z"
fill="currentColor"
/>
</svg>
),
},
{
name: 'GitHub',
Expand All @@ -60,7 +72,7 @@ export function Sidebar({ className }: { className?: string }) {
<aside
className={clsxm('md:mx-0 md:w-44 md:flex-shrink-0 md:px-0', className)}
>
<div className="md:sticky md:top-12 md:pr-4">
<motion.div className="md:sticky md:top-12 md:pr-4" layout layoutRoot>
<Link
href="/"
aria-label={t('Title')}
Expand Down Expand Up @@ -92,8 +104,6 @@ export function Sidebar({ className }: { className?: string }) {
className={clsxm(
'text-stone-400 transition-colors hover:text-stone-800 dark:text-stone-500 dark:hover:text-stone-100',
{
'hover:text-[#1D9BF0] dark:hover:text-[#1D9BF0]':
item.name === 'Twitter',
'hover:text-[#FF0000] dark:hover:text-[#FF0000]':
item.name === 'YouTube',
}
Expand Down Expand Up @@ -129,7 +139,7 @@ export function Sidebar({ className }: { className?: string }) {
<LocaleSelector />
<Clock />
</motion.div>
</div>
</motion.div>
</aside>
)
}
Expand Down Expand Up @@ -171,6 +181,10 @@ const MenuLink = React.forwardRef<
<NavigationMenu.Link active={isActive} asChild>
<Link
href={href}
onClick={() => {
// @see https://github.com/framer/motion/issues/2006#issuecomment-1477824846
window.scroll(0, 0)
}}
className={clsxm(
'relative inline-flex select-none p-2 font-bold leading-none text-stone-400 no-underline outline-none transition-colors hover:text-stone-800 dark:text-stone-500 dark:hover:text-stone-100',
'rounded-lg focus-visible:outline-stone-300 dark:focus-visible:outline-stone-700',
Expand Down
1 change: 0 additions & 1 deletion app/[locale]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export default function Home() {
<h1>👋&nbsp;{t('Heading')}</h1>
<p>{t.rich('Paragraph1')}</p>
<Image src={Poster} alt="Zolplay Poster" placeholder="blur" />
<p>{t.rich('Paragraph2')}</p>
<Image src={OfficeShot} alt="Zolplay Office Shot" placeholder="blur" />
<p className="-mt-4 text-center text-sm text-stone-400 dark:text-stone-500">
{t('Caption')}
Expand Down
17 changes: 8 additions & 9 deletions messages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,19 @@
"Metadata": {
"Title": "Zolplay",
"TitleTemplate": "%s / Zolplay",
"Description": "Zolplay - the superheroes of software development! Our superpowers are creating next-gen applications or platforms for businesses of all sizes.",
"Keywords": "Zolplay,Software development,Web applications,Mobile applications,Custom software solutions,High-quality products,Passionate developers,Skilled designers,Project management,Digital experiences,Innovative solutions,Software craftsmanship,Exceptional digital presence,Software superhero,Digital transformation,Custom software development"
"Description": "Zolplay: Where Innovation Meets Imagination. Crafting Fun, Engineering Play.",
"Keywords": "Zolplay,Software development,Web applications,Mobile applications,,High-quality products,Passionate developers,Skilled designers,Project management,Digital experiences,Innovative solutions,Software craftsmanship,Exceptional digital presence,Software superhero"
}
},
"Home": {
"Heading": "We are Zolplay",
"Paragraph1": "At <gradient>Zolplay</gradient>, we're like the <red>Tony Starks</red> of software development, using our superpowers to create next-gen web and mobile applications for businesses of all sizes. Our team of skilled developers, designers, and project managers are like <b>the Avengers</b> \uD83E\uDDB8, working together to bring your ideas to life and deliver high-quality products that will <green>knock your socks off</green>.",
"Paragraph2": "Whether you need a <b>custom software solution</b> or just want to give your existing app a <b>digital makeover</b>, we're your go-to partner for success. <contact-us-link>Contact us</contact-us-link> today to learn how we can help your business <green>Hulk-smash</green> 🥊 the competition in the digital era!",
"Paragraph1": "At <gradient>Zolplay</gradient>, we're like the <red>Tony Starks</red> of software development, using our superpowers to create next-gen web and mobile applications. Our team of skilled developers, designers, and project managers are like <b>the Avengers</b> \uD83E\uDDB8, working together to bring ideas to life and deliver high-quality products that will <green>knock your socks off</green>.",
"Caption": "Watching Friends in our office during lunch break"
},
"About": {
"Title": "Who we are",
"Description": "Welcome to Zolplay, a software development company that strives to make a difference in the world. Our mission is to create innovative solutions that enhance people's lives and transform the way we live and work.",
"Heading": "We strive to make a difference in the world.",
"Description": "Welcome to Zolplay, a software development company that strives to make software fun again. Our mission is to create innovative solutions that enhance people's lives and transform the way we live and work.",
"Heading": "Where Innovation Meets Imagination. Crafting Fun, Engineering Play.",
"Intro": "Welcome to Zolplay, founded in 2021, a software development company that strives to make a difference in the world. Our mission is to create innovative solutions \uD83E\uDD84 that enhance people's lives and transform the way we live and work.<br></br><br></br>At Zolplay, we believe that technology has the power to bring positive change to the world. We are a team of passionate individuals who are committed to making a difference through our work. We work tirelessly to create products and services that <b>solve complex problems, simplify processes, and make people's lives easier</b>.<br></br><br></br>\uD83D\uDC23 <gradient>That is why Zolplay was born.</gradient><br></br><br></br>Our core values are <green>integrity, creativity, and collaboration</green>. We believe in doing the right thing, even when no one is watching. We encourage creativity and innovation in everything we do, and we collaborate closely with our clients to ensure that we deliver the best possible results.",
"Founder": {
"Title": "About our founder",
Expand Down Expand Up @@ -166,8 +165,8 @@
},
"Contact": {
"Title": "Contact us",
"Heading": "Contact us: <gradient>let's build something amazing together</gradient>.",
"Description": "We're always looking for new opportunities to collaborate with like-minded people. If you have a project you'd like to discuss, or just want to say hi, we'd love to hear from you \uD83D\uDC4F.",
"Heading": "Contact us: <gradient>let's bring the fun back to software development</gradient>.",
"Description": "We're always looking for new opportunities to collaborate with like-minded people. If you want to say hi, we'd love to hear from you \uD83D\uDC4F.",
"Tips": "You can also get in touch by sending us an email via <email>[email protected]</email>",
"Form": {
"Message": {
Expand All @@ -191,6 +190,6 @@
}
},
"Copyright": {
"Text": "© {year} - Zolplay, Inc."
"Text": "© {year} - Zolplay, LLC."
}
}
19 changes: 9 additions & 10 deletions messages/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,19 @@
"Metadata": {
"Title": "佐玩",
"TitleTemplate": "%s / 佐玩",
"Description": "佐玩是一家有非同寻常的软件开发公司,我们的超能力是为各种规模的企业打造次世代的平台与应用",
"Keywords": "佐玩,Zolplay,软件开发,Web应用程序,移动应用程序,定制软件解决方案,高质量产品,热情的开发人员,熟练的设计师,项目管理,数字体验,创新解决方案,软件工艺,软件超级英雄,数字转型,定制软件开发"
"Description": "佐玩是一家有非同寻常的软件开发公司,我们的使命是匠心筑楽,巧技佐玩",
"Keywords": "佐玩,Zolplay,软件开发,Web应用程序,移动应用程序,定制软件解决方案,高质量产品,热情的开发人员,熟练的设计师,项目管理,数字体验,创新解决方案,软件工艺,软件超级英雄"
}
},
"Home": {
"Heading": "欢迎光临佐玩",
"Paragraph1": "<gradient>佐玩</gradient>是一家拥有<red>超级英雄</red> 🦸 精神的软件开发公司,我们的超能力就是为各种规模的企业打造独一无二的次世代 Web 和移动端平台应用。我们的资深工程师、设计师和产品经理就是<b>一支梦之队</b> 💫,我们共同合作,将您的想法落地成现实,并交付让您<green>欣喜若狂</green>的高品质产品。",
"Paragraph2": "无论您是需要<b>量身定制</b>的软件解决方案,还是想为现有的应用程序进行<b>改进与重新设计</b>,我们都是您在互联网领域中的得力伙伴。不妨<contact-us-link>联系我们</contact-us-link>,了解我们如何能帮助您的企业在数字时代中<green>赢得全面胜利</green> 🥊!",
"Paragraph1": "<gradient>佐玩</gradient>是一家拥有<red>超级英雄</red> 🦸 精神的软件开发公司,我们的超能力就是打造独一无二的次世代 Web 和移动端平台应用。我们的资深工程师、设计师和产品经理就是<b>一支梦之队</b> 💫,我们共同合作,将想法落地成现实,尝试做出让你<green>欣喜若狂</green>的高品质产品。",
"Caption": "办公室午餐时间一起看「老友记」"
},
"About": {
"Title": "关于我们",
"Description": "欢迎来到佐玩,一家致力于用软件改善身边世界的软件开发公司。我们的使命是打造创新的解决方案,以提升人们的生活质量并改变我们的生活和工作方式",
"Heading": "我们致力于用软件改善身边世界",
"Description": "欢迎来到佐玩,一家致力于用软件改善身边世界的软件开发公司。我们的使命是匠心筑楽,巧技佐玩",
"Heading": "创新与想象的碰撞,我们的使命是<gradient>匠心筑楽,巧技佐玩</gradient>",
"Intro": "欢迎来到佐玩,一家成立于2021年的软件开发公司,致力于用软件改善身边世界。我们的使命是打造创新的解决方案,\uD83E\uDD84 以提升人们的生活质量并改变我们的生活和工作方式。<br></br><br></br>在佐玩,我们相信技术具有为世界带来积极改变的力量。我们是一群热情洋溢、致力于通过工作做出贡献的创造者。我们不断努力,创建能够<b>解决复杂问题、简化流程并让人们的生活更轻松</b>的产品和服务。<br></br><br></br>\uD83D\uDC23 <gradient>这就是佐玩诞生的原因。</gradient><br></br><br></br>我们的核心价值观是<green>透明、创造和协作</green>。我们坚信做正确的事情,鼓励在所有方面都迸发创新和创意,并与客户密切合作,以确保我们提供最佳的结果。",
"Founder": {
"Title": "关于创始人",
Expand Down Expand Up @@ -165,13 +164,13 @@
},
"Contact": {
"Title": "联系我们",
"Heading": "联系我们:<gradient>期待与您的合作</gradient>",
"Description": "我们始终在寻找与志同道合的人合作的新机会。无论您是有一个项目想要讨论,或者只是想打个招呼,我们都随时欢迎 👏。",
"Tips": "您也可以通过发送邮件到 <email>[email protected]</email> 来跟我们联系。",
"Heading": "联系我们:<gradient>期待与你碰撞火花</gradient>",
"Description": "我们始终在寻找与志同道合的人合作的新机会。无论你是有一个项目想要讨论,或者只是想打个招呼,我们都随时欢迎 👏。",
"Tips": "你也可以通过发送邮件到 <email>[email protected]</email> 来跟我们联系。",
"Form": {
"Message": {
"Label": "留个言吧",
"Placeholder": "跟我们聊聊您的需求,或打个招呼也行~ \uD83D\uDC4B"
"Placeholder": "跟我们聊聊你的想法,或打个招呼也行~ \uD83D\uDC4B"
},
"FullName": {
"Label": "名字/称呼",
Expand Down

1 comment on commit ebd0271

@vercel
Copy link

@vercel vercel bot commented on ebd0271 Sep 14, 2023

Choose a reason for hiding this comment

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

Please sign in to comment.