Skip to content

Commit

Permalink
feat: modifying introductions & repair pages
Browse files Browse the repository at this point in the history
Co-authored-by: Shiroko <[email protected]>
  • Loading branch information
YanDao0313 and ShirokoBOT committed Jul 17, 2023
1 parent 80f7eb7 commit 60a2840
Show file tree
Hide file tree
Showing 30 changed files with 256 additions and 196 deletions.
2 changes: 1 addition & 1 deletion app/(main)/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export async function Footer() {
</div>
<div className="flex flex-col items-center justify-between gap-6 sm:flex-row">
<p className="text-sm text-zinc-500/80 dark:text-zinc-400/80">
&copy; {new Date().getFullYear()} Cali Castle. 网站已开源
&copy; {new Date().getFullYear()} Kris Yan. 基于此项目
<PeekabooLink href="https://github.com/CaliCastle/cali.so">
GitHub
</PeekabooLink>
Expand Down
27 changes: 11 additions & 16 deletions app/(main)/Headline.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { SocialLink } from '~/components/links/SocialLink'
function Developer() {
return (
<span className="group">
<span className="font-mono">&lt;</span>开发者
可能是 <span className="font-mono">&lt;</span>开发者
<span className="font-mono">/&gt;</span>
<span className="invisible inline-flex text-zinc-300 before:content-['|'] group-hover:visible group-hover:animate-typing dark:text-zinc-500" />
</span>
Expand All @@ -26,7 +26,7 @@ function Designer() {
<span className="absolute -bottom-0.5 -left-0.5 h-1.5 w-1.5 border border-lime-700 bg-zinc-50 dark:border-lime-400" />
<span className="absolute -right-0.5 -top-0.5 h-1.5 w-1.5 border border-lime-700 bg-zinc-50 dark:border-lime-400" />
</span>
设计师
摸鱼中
</span>
)
}
Expand All @@ -44,7 +44,7 @@ function Founder() {
return (
<span className="group">
<UserSecurityIcon className="mr-1 inline-flex group-hover:fill-zinc-600/20 dark:group-hover:fill-zinc-200/20" />
<span>创始人</span>
<span>视频博主</span>
</span>
)
}
Expand Down Expand Up @@ -80,9 +80,9 @@ export function Headline() {
}}
>
<Balancer>
我是 Cali
<PeekabooLink href="https://zolplay.cn">佐玩</PeekabooLink>
创始人,目前带领着佐玩致力于创造一个充满创造力的工作环境,同时鼓励团队创造影响世界的产品
我是 颜导
via <PeekabooLink href="https://krisyan.dev/">Kris Yan</PeekabooLink>
,目前还在探索期,仍在不断地学习与探索,憧憬着在不远的将来能创造出影响世界的产品
我热爱开发,设计,创新,享受生活,以及在未知领域中探索。
</Balancer>
</motion.p>
Expand All @@ -99,33 +99,28 @@ export function Headline() {
}}
>
<SocialLink
href="https://cali.so/twitter"
href="https://twitter.com/YanDao0313"
aria-label="我的推特"
platform="twitter"
/>
<SocialLink
href="https://cali.so/youtube"
href="https://www.youtube.com/channel/UCd6QCusZZ8urv2Owol_KEzA"
aria-label="我的 YouTube"
platform="youtube"
/>
<SocialLink
href="https://cali.so/bilibili"
href="https://space.bilibili.com/1639079419/"
aria-label="我的 Bilibili"
platform="bilibili"
/>
<SocialLink
href="https://cali.so/github"
href="https://github.com/YanDao0313"
aria-label="我的 GitHub"
platform="github"
/>
<SocialLink
href="https://cali.so/tg"
aria-label="我的 Telegram"
platform="telegram"
/>
<SocialLink href="/feed.xml" platform="rss" aria-label="RSS 订阅" />
<SocialLink
href="mailto:hi@cali.so"
href="mailto:hi@krisyan.dev"
aria-label="我的邮箱"
platform="mail"
/>
Expand Down
6 changes: 3 additions & 3 deletions app/(main)/Newsletter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ export function Newsletter({ subCount }: { subCount?: string }) {
<span className="ml-2">动态更新</span>
</h2>
<p className="mt-2 text-xs text-zinc-600 dark:text-zinc-400 md:text-sm">
<span>喜欢我的内容的话不妨订阅支持一下 🫶</span>
<span>喜欢我的内容的话不妨订阅支持一下 👋</span>
<br />
{subCount && (
<span>
加入其他 <span className="font-medium">{subCount}</span> 位订阅者
加入其他订阅者
</span>
)}
<span>每月一封,随时可以取消订阅。</span>
<span>不定期推送,随时可以取消订阅。</span>
</p>
<AnimatePresence mode="wait">
{!isSubscribed ? (
Expand Down
6 changes: 3 additions & 3 deletions app/(main)/Resume.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export function Resume() {
<div className="rounded-2xl border border-zinc-100 p-6 dark:border-zinc-700/40">
<h2 className="flex items-center text-sm font-semibold text-zinc-900 dark:text-zinc-100">
<BriefcaseIcon className="h-5 w-5 flex-none" />
<span className="ml-2">工作经历</span>
<span className="ml-2">个人项目</span>
</h2>
<ol className="mt-6 space-y-4">
{resume.map((role, roleIndex) => (
Expand All @@ -79,11 +79,11 @@ export function Resume() {
/>
</div>
<dl className="flex flex-auto flex-wrap gap-x-2">
<dt className="sr-only">公司</dt>
<dt className="sr-only">名称</dt>
<dd className="w-full flex-none text-sm font-medium text-zinc-900 dark:text-zinc-100">
{role.company}
</dd>
<dt className="sr-only">职位</dt>
<dt className="sr-only">链接</dt>
<dd className="text-xs text-zinc-500 dark:text-zinc-400">
{role.title}
</dd>
Expand Down
Binary file removed app/(main)/ama/Arc [email protected]
Binary file not shown.
Binary file removed app/(main)/ama/Arc [email protected]
Binary file not shown.
Binary file removed app/(main)/ama/alipay-qr.jpg
Binary file not shown.
Binary file removed app/(main)/ama/opengraph-image.png
Binary file not shown.
130 changes: 0 additions & 130 deletions app/(main)/ama/page.tsx

This file was deleted.

Binary file removed app/(main)/ama/twitter-image.png
Binary file not shown.
4 changes: 2 additions & 2 deletions app/(main)/blog/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Container } from '~/components/ui/Container'
import { BlogPosts } from './BlogPosts'

const description =
'写博客文章是我比较喜欢的沉淀分享方式,我希望能够把好用的技术知识传递给更多的人。我比较喜欢围绕着技术为主的话题,但是也会写一些非技术的话题,比如设计、创业、企业管理、生活随笔等等。'
'其实我不常更新博客,但我喜欢博文这种内容沉淀方式,它使我能拥有一个自己积累知识、积累兴趣的地方。如果能够帮助到更多的人,帮助更多人解决问题,那一定是非常棒的事情。我比较喜欢围绕着技术为主的话题,但是也常公开一些非技术的话题,比如个人感悟、网络迷因等等。'
export const metadata = {
title: '我的博客',
description,
Expand All @@ -27,7 +27,7 @@ export default function BlogPage() {
<Container className="mt-16 sm:mt-24">
<header className="max-w-2xl">
<h1 className="text-4xl font-bold tracking-tight text-zinc-800 dark:text-zinc-100 sm:text-5xl">
欢迎光临我的博客
欢迎光临!
</h1>
<p className="my-6 text-base text-zinc-600 dark:text-zinc-400">
<Balancer>{description}</Balancer>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ProjectCard } from '~/app/(main)/projects/ProjectCard'
import { ProjectCard } from '~/app/(main)/friends/ProjectCard'
import { getSettings } from '~/sanity/queries'

export async function Projects() {
Expand Down
File renamed without changes
21 changes: 12 additions & 9 deletions app/(main)/projects/page.tsx → app/(main)/friends/page.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { type Metadata } from 'next'

import { Projects } from '~/app/(main)/projects/Projects'
import { Projects } from '~/app/(main)/friends/Projects'
import { Container } from '~/components/ui/Container'
import { PeekabooLink } from '~/components/links/PeekabooLink'

const title = '我的项目'
const title = '友情链接'
const description =
'多年来,我一直在做各种各样的小项目,这里就是我筛选出来我觉得还不错的项目合集,也是我在技术领域中尝试和探索的最好见证。'
'欢迎前往YanDao0313/friends互换友链~'
export const metadata = {
title,
description,
Expand All @@ -25,13 +26,15 @@ export default function ProjectsPage() {
<Container className="mt-16 sm:mt-32">
<header className="max-w-2xl">
<h1 className="text-4xl font-bold tracking-tight text-zinc-800 dark:text-zinc-100 sm:text-5xl">
我过去的项目冒险之旅
我的朋友们
</h1>
<p className="mt-6 text-base text-zinc-600 dark:text-zinc-400">
多年来,我一直在做各种各样的小项目,有<b>开源</b>的,有<b>实验</b>
的,也有 <b>just for fun </b>
的,下面就是我筛选出来我觉得还不错的项目合集,也是我在技术领域中尝试和探索的最好见证。
</p>
<div className="mt-6 text-base text-zinc-600 dark:text-zinc-400">
欢迎前往此处互换友链:
<PeekabooLink href="https://github.com/CaliCastle/cali.so">
GitHub
</PeekabooLink><br />
愿大家都能互相支持、<b>无限进步</b>
</div>
</header>
<div className="mt-16 sm:mt-20">
<Projects />
Expand Down
File renamed without changes
2 changes: 1 addition & 1 deletion app/(main)/guestbook/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default async function GuestBookPage() {
<Container className="mt-16 sm:mt-32">
<header className="max-w-2xl">
<h1 className="text-4xl font-bold tracking-tight text-zinc-800 dark:text-zinc-100 sm:text-5xl">
欢迎来到我的留言墙
欢迎来到留言墙。
</h1>
<p className="mt-6 text-base text-zinc-600 dark:text-zinc-400">
<Balancer>{description}</Balancer>
Expand Down
Loading

0 comments on commit 60a2840

Please sign in to comment.