diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5dc4909..546f65b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -53,4 +53,4 @@ jobs: envs: BRANCH_NAME script: | cd ${{ github.ref == 'refs/heads/main' && secrets.REMOTE_PATH || secrets.REMOTE_PATH_DEVELOPMENT }} - docker compose up --force-recreate -d + docker compose up --force-recreate -d --pull=always diff --git a/src/components/MemberCard.astro b/src/components/MemberCard.astro index 144eed5..83a846d 100644 --- a/src/components/MemberCard.astro +++ b/src/components/MemberCard.astro @@ -1,9 +1,9 @@ --- // Import the global.css file here so that it is included on // all pages through the use of the component. -import type { Member } from "../store/member" +import type { PublicMember } from "../store/member" import "../styles/global.css" -const { member } = Astro.props as { member: Member } +const { member } = Astro.props as { member: PublicMember } const avatar = member.avatar; --- @@ -19,32 +19,32 @@ const avatar = member.avatar; class="w-full aspect-square overflow-hidden flex items-center justify-center bg-gradient-to-b from-gray-300/70" > { - avatar - ? ( - typeof avatar !== "string" - ? ( - - ) - : ( - - ) - ) - : ( - - ) - } + avatar + ? ( + typeof avatar !== "string" + ? ( + + ) + : ( + + ) + ) + : ( + + ) + }
diff --git a/src/pages/_assets/hayasaka.jpg b/src/pages/_assets/hayasaka.jpg new file mode 100644 index 0000000..8a8c1b0 Binary files /dev/null and b/src/pages/_assets/hayasaka.jpg differ diff --git a/src/pages/_assets/join_us_code.jpeg b/src/pages/_assets/join_us_code.jpeg new file mode 100644 index 0000000..676198a Binary files /dev/null and b/src/pages/_assets/join_us_code.jpeg differ diff --git a/src/pages/_assets/repair_mini_program_qr_code.jpg b/src/pages/_assets/repair_mini_program_qr_code.jpg new file mode 100644 index 0000000..094886e Binary files /dev/null and b/src/pages/_assets/repair_mini_program_qr_code.jpg differ diff --git a/src/pages/_assets/sharing_on_site.jpg b/src/pages/_assets/sharing_on_site.jpg new file mode 100644 index 0000000..5f43068 Binary files /dev/null and b/src/pages/_assets/sharing_on_site.jpg differ diff --git a/src/pages/about/index.astro b/src/pages/about/index.astro new file mode 100644 index 0000000..6e943f3 --- /dev/null +++ b/src/pages/about/index.astro @@ -0,0 +1,157 @@ +--- +import BaseLayout from "../../layouts/BaseLayout.astro" +import sharingOnSite from "../_assets/sharing_on_site.jpg" +import joinUsCode from "../_assets/join_us_code.jpeg" +import hayasaka from "../_assets/hayasaka.jpg" + +--- + + +
+
+ +
+ 你听说过 计算机协会 吗？ +
+
+ + 从维修 + + + + + + + + + + + + + + + 到开发 + + + + + + + + + + + + +
+
+ 所有你能想到的，都在我们的活动范围内。 +
+
+
+
+
+
+ +
+
+
开发
+
+ 我们有许多持续维护中的项目 +
+
+ 你可以在 GitHub 上加入我们 +
+ github.com/nbtca +
+
+
+
+ +
+
+
讲座
+
+ 我们会定期举办活动 +
+
+ 分享电脑使用及项目开发上的经验 +
+
+
+
+
+
+ +
+
维修
+
+ 理工维修日 + + + +
+
+ 我们每月举办维修日， +
+
+ 提供免费的电脑维修服务。 +
+ +
+
+
+
+
+
+ 加入协会， +
+
+ 共同创造我们的社区。 +
+
+
+ 进一步了解{" >"} +
+
+
+
+
+ 扫一扫， +
+
+ 获取免费维修。 +
+
+
+ 查看报修小程序{" >"} +
+
+
+
+
+ 海内存知己， +
+
+ 天涯若比邻。 +
+
+
+ + 查看历届成员 + {" >"} + +
+
+
+
+ +
+
+ diff --git a/src/pages/about.astro b/src/pages/members/index.astro similarity index 88% rename from src/pages/about.astro rename to src/pages/members/index.astro index 23b57b6..6a809e2 100644 --- a/src/pages/about.astro +++ b/src/pages/members/index.astro @@ -1,9 +1,9 @@ --- -import BaseLayout from "../layouts/BaseLayout.astro" +import BaseLayout from "../../layouts/BaseLayout.astro" import { computed } from "vue" -import MemberCard from "../components/MemberCard.astro" -import type { PublicMember } from "../store/member.ts" -import { saturdayClient } from "../utils/client" +import MemberCard from "../../components/MemberCard.astro" +import type { PublicMember } from "../../store/member.ts" +import { saturdayClient } from "../../utils/client" const { data: members } = await saturdayClient.GET("/members", { params: {} }) diff --git a/src/pages/repair/mini-program.astro b/src/pages/repair/mini-program.astro new file mode 100644 index 0000000..04d55f5 --- /dev/null +++ b/src/pages/repair/mini-program.astro @@ -0,0 +1,23 @@ +--- +import BaseLayout from "../../layouts/BaseLayout.astro" +import RepairMiniProgramQRCode from "../_assets/repair_mini_program_qr_code.jpg" +--- + + +
+
+
+ NBT 电脑维修小程序 +
+
+
+ 微信扫码 +
+
+ 获取免费维修 +
+
+ +
+
+