Merge pull request #29 from Keshav-writes-code/staging

Keshav-writes-code · web-flow · commit 323c888c7a78 · 2026-01-28T11:32:17.000Z
Staging
diff --git a/.github/workflows/app-build-release.yml b/.github/workflows/app-build-release.yml
@@ -2,6 +2,9 @@ name: 'app-build-release'
 
 on:
   pull_request:
+    paths:
+      - 'apps/app/**'
+      - '.github/workflows/tauri-build-release.yml'
   push:
     branches:
       - main
@@ -143,7 +146,7 @@ jobs:
           NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
         with:
           projectPath: 'apps/app'
-          tagName: cherit-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
+          tagName: v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
           releaseName: 'Cherit v__VERSION__'
           releaseAssetNamePattern: '[name]-[platform]-[arch][ext]'
           releaseBody: 'Download from Website : [Download](https://keshav.is-a.dev/Cherit/download/)'
diff --git a/.github/workflows/site-check.yml b/.github/workflows/site-check.yml
@@ -32,3 +32,12 @@ jobs:
         run: |
           bun install
           bun run build
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload Build Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: site-build-output
+          path: apps/site/dist
+          retention-days: 5
diff --git a/.github/workflows/site-deploy.yml b/.github/workflows/site-deploy.yml
@@ -31,6 +31,8 @@ jobs:
         uses: withastro/action@v5
         with:
           path: 'apps/site'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   deploy:
     needs: build
diff --git a/apps/site/src/components/home_page/section_1/index.astro b/apps/site/src/components/home_page/section_1/index.astro
@@ -15,7 +15,7 @@ import Screenshots from "./screenshots.astro";
     >
       <a
         href=`${base}/downloads`
-        class="group inline-flex items-center gap-2 rounded-full border border-gray-200 bg-white/50 px-4 py-1.5 text-sm font-medium text-gray-600 backdrop-blur-sm transition-colors hover:bg-white hover:text-gray-900 dark:border-gray-800 dark:bg-gray-950/50 dark:text-gray-400 dark:hover:bg-gray-950 dark:hover:text-white shadow-sm hover:shadow-md"
+        class="group inline-flex items-center gap-2 rounded-full border border-gray-200 bg-white/50 px-4 py-1.5 text-sm lt-sm:text-xs font-medium text-gray-600 backdrop-blur-sm transition-colors hover:bg-white hover:text-gray-900 dark:border-gray-800 dark:bg-gray-950/50 dark:text-gray-400 dark:hover:bg-gray-950 dark:hover:text-white shadow-sm hover:shadow-md"
       >
         <span class="relative flex h-2 w-2">
           <span
@@ -63,7 +63,7 @@ import Screenshots from "./screenshots.astro";
       the power of Markdown in a 3MB featherweight package
     </p>
     <div
-      class="flex justify-center gap-6 items-start mt-12 *:w-min animate-in slide-in-b-4 fade-in-0 animate-duration-500 animate-fill-both animate-delay-300"
+      class="flex lt-sm:flex-col justify-center items-center gap-6 lt-md:gap-4 items-start mt-12 *:w-min animate-in slide-in-b-4 fade-in-0 animate-duration-500 animate-fill-both animate-delay-300"
     >
       <DownloadBtnHeadless
         client:load
diff --git a/apps/site/src/components/home_page/section_2/index.astro b/apps/site/src/components/home_page/section_2/index.astro
@@ -66,55 +66,9 @@ let { class: classes } = Astro.props;
   </div>
 </section>
 <script>
-  import { initScrollAnimation } from "@/utils/animate_on_scroll";
+  import { initScrollAnimation } from "@/lib/animate_on_scroll";
 
   document.addEventListener("DOMContentLoaded", () => {
-    initScrollAnimation(".animate-on-scroll", ["visible"]);
+    initScrollAnimation(".animate-on-scroll");
   });
 </script>
-<style>
-  /* Custom Font */
-  @import url("https://fonts.googleapis.com/css2?family=Space+Grotesk:wght@300;400;500;600;700&display=swap");
-
-  body {
-    font-family: "Space Grotesk", sans-serif;
-    overflow-x: hidden;
-  }
-
-  /* Icon Utility */
-  .i-tabler {
-    display: inline-block;
-    vertical-align: middle;
-    font-size: 1.5rem;
-  }
-
-  html {
-    scroll-behavior: smooth;
-  }
-
-  /* Canvas */
-  #hero-canvas {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    z-index: 0;
-    pointer-events: none;
-  }
-
-  /* Scrollbar */
-  ::-webkit-scrollbar {
-    width: 8px;
-  }
-  ::-webkit-scrollbar-track {
-    background: #000;
-  }
-  ::-webkit-scrollbar-thumb {
-    background: #333;
-    border-radius: 4px;
-  }
-  ::-webkit-scrollbar-thumb:hover {
-    background: #555;
-  }
-</style>
diff --git a/apps/site/src/components/home_page/section_3/index.astro b/apps/site/src/components/home_page/section_3/index.astro
@@ -36,7 +36,7 @@ let { class: classes } = Astro.props;
 </section>
 
 <script>
-  import { initScrollAnimation } from "@/utils/animate_on_scroll";
+  import { initScrollAnimation } from "@/lib/animate_on_scroll";
   document.addEventListener("DOMContentLoaded", () => {
     initScrollAnimation();
   });
diff --git a/apps/site/src/components/home_page/section_4/index.astro b/apps/site/src/components/home_page/section_4/index.astro
@@ -81,7 +81,7 @@ import { base } from "astro:config/client";
 </section>
 
 <script>
-  import { initScrollAnimation } from "@/utils/animate_on_scroll";
+  import { initScrollAnimation } from "@/lib/animate_on_scroll";
   document.addEventListener("DOMContentLoaded", () => {
     initScrollAnimation();
   });
diff --git a/apps/site/src/components/navbar/index.astro b/apps/site/src/components/navbar/index.astro
@@ -3,18 +3,15 @@ import { Image } from "astro:assets";
 import logo from "@/assets/images/logo_500.png";
 import InteractiveNav from "./interactive.svelte";
 import { base } from "astro:config/client";
+import { call_gh_api } from "@/lib/gh_api.ts";
 const links = {
   downloads: `${base}/downloads`,
   demo: `${base}/demo`,
   guides: `${base}/docs/guides/how_to_setup_syncing`,
   docs: `${base}/docs`,
   inspiration: `${base}/inspiration`,
 };
-const git_star_count = (
-  await (
-    await fetch("https://api.github.com/repos/Keshav-writes-code/Cherit")
-  ).json()
-).stargazers_count;
+const git_star_count = (await call_gh_api()).stargazers_count;
 ---
 
 <InteractiveNav nav_links={links} git_star_count={git_star_count} client:load>
diff --git a/apps/site/src/components/navbar/interactive.svelte b/apps/site/src/components/navbar/interactive.svelte
@@ -15,6 +15,14 @@
 
   let y = $state(0);
   let expand_navbar_mobile = $state(false);
+  let git_star_count_client_side = $state();
+  (async () => {
+    git_star_count_client_side = (
+      await (
+        await fetch("https://api.github.com/repos/Keshav-writes-code/Cherit")
+      ).json()
+    ).stargazers_count;
+  })();
 </script>
 
 <svelte:window bind:scrollY={y} />
@@ -51,7 +59,12 @@
         target="_blank"
       >
         <div class="i-mdi:github size-5.5"></div>
-        {git_star_count}
+
+        {#if git_star_count_client_side}
+          {git_star_count_client_side}
+        {:else}
+          {git_star_count}
+        {/if}
       </a>
     </div>
     <div class="h-full md:hidden justify-self-end">
@@ -68,17 +81,36 @@
     </div>
   </div>
   {#if expand_navbar_mobile}
+    {@const links_arr = Object.entries(nav_links)}
     <div class="w-full h-full" transition:slide>
       <nav class="flex flex-col gap-1 font-semibold">
         <ul class="menu menu-lg rounded-box w-full">
-          {#each Object.entries(nav_links) as [key, value], i}
+          {#each links_arr as [key, value], i}
             <li
-              class="animate-in slide-in-b-2 fade-in-0 animate-duration-500 animate-fill-both {i}"
+              class="animate-in slide-in-b-2 fade-in-0 animate-duration-500 animate-fill-both"
               style="animation-delay: {200 + 50 * i}ms;"
             >
               <a class="capitalize" href={value}>{key}</a>
             </li>
           {/each}
+          <li
+            class="mt-4 animate-in slide-in-b-2 fade-in-0 animate-duration-500 animate-fill-both"
+            style="animation-delay: {200 + 50 * (links_arr.length + 2)}ms;"
+          >
+            <a
+              href="https://github.com/Keshav-writes-code/Cherit"
+              class="btn flex items-center"
+              target="_blank"
+            >
+              <div class="i-mdi:github size-5.5"></div>
+
+              {#if git_star_count_client_side}
+                {git_star_count_client_side}
+              {:else}
+                {git_star_count}
+              {/if}
+            </a>
+          </li>
         </ul>
       </nav>
     </div>
diff --git a/apps/site/src/content/docs/docs/dev_docs/ci_pipelines.md b/apps/site/src/content/docs/docs/dev_docs/ci_pipelines.md
@@ -22,6 +22,11 @@ This is our "Test Flight" zone.
 
 - **App:** Builds **Debug** artifacts (unsigned) for all platforms. These are available in the GitHub Actions "Summary" tab for testers to download and try.
 - **Site:** Runs `bun run build` to ensure the Astro site builds without errors (same as PR check).
+  - to test site builds
+    - go to `Action Tab` > latest `site-build-check` run > `Summary` > download workflow artifact `site-build-output`
+    - then extract the zip, move all content to a new dir called `Cherit`
+    - then in the parent dir, run `bunx serve .`
+    - open `http://localhost:3000/Cherit/` in browser to test
 
 ## 3. Main Branch (Production)
 
diff --git a/apps/site/src/env.d.ts b/apps/site/src/env.d.ts
@@ -1 +1,8 @@
 /// <reference path="../.astro/types.d.ts" />
+interface ImportMetaEnv {
+  readonly GH_TOKEN: string;
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}
diff --git a/apps/site/src/lib/animate_on_scroll.ts b/apps/site/src/lib/animate_on_scroll.ts
diff --git a/apps/site/src/lib/gh_api.ts b/apps/site/src/lib/gh_api.ts
@@ -0,0 +1,20 @@
+const gh_token: string | undefined = import.meta.env.GH_TOKEN;
+export const owner = "keshav-writes-code";
+export const repo = "cherit";
+
+export const file = (suffix: string) =>
+  `https://github.com/${owner}/${repo}/releases/latest/download/${repo}-${suffix}`;
+
+export async function call_gh_api(path?: string) {
+  const headers: Record<string, string> = {
+    "X-GitHub-Api-Version": "2022-11-28",
+  };
+  if (gh_token) {
+    headers["Authorization"] = `Bearer ${gh_token}`;
+  }
+  const res = await fetch(
+    `https://api.github.com/repos/${owner}/${repo}${path ? path : ""}`,
+    { headers },
+  );
+  return await res.json();
+}
diff --git a/apps/site/src/pages/downloads.astro b/apps/site/src/pages/downloads.astro

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import Screenshots from "./screenshots.astro";`
`15`	`15`	`>`
`16`	`16`	`<a`
`17`	`17`	href=`${base}/downloads`
`18`		`- class="group inline-flex items-center gap-2 rounded-full border border-gray-200 bg-white/50 px-4 py-1.5 text-sm font-medium text-gray-600 backdrop-blur-sm transition-colors hover:bg-white hover:text-gray-900 dark:border-gray-800 dark:bg-gray-950/50 dark:text-gray-400 dark:hover:bg-gray-950 dark:hover:text-white shadow-sm hover:shadow-md"`
	`18`	`+ class="group inline-flex items-center gap-2 rounded-full border border-gray-200 bg-white/50 px-4 py-1.5 text-sm lt-sm:text-xs font-medium text-gray-600 backdrop-blur-sm transition-colors hover:bg-white hover:text-gray-900 dark:border-gray-800 dark:bg-gray-950/50 dark:text-gray-400 dark:hover:bg-gray-950 dark:hover:text-white shadow-sm hover:shadow-md"`
`19`	`19`	`>`
`20`	`20`	`<span class="relative flex h-2 w-2">`
`21`	`21`	`<span`
`@@ -63,7 +63,7 @@ import Screenshots from "./screenshots.astro";`
`63`	`63`	`the power of Markdown in a 3MB featherweight package`
`64`	`64`	`</p>`
`65`	`65`	`<div`
`66`		`- class="flex justify-center gap-6 items-start mt-12 *:w-min animate-in slide-in-b-4 fade-in-0 animate-duration-500 animate-fill-both animate-delay-300"`
	`66`	`+ class="flex lt-sm:flex-col justify-center items-center gap-6 lt-md:gap-4 items-start mt-12 *:w-min animate-in slide-in-b-4 fade-in-0 animate-duration-500 animate-fill-both animate-delay-300"`
`67`	`67`	`>`
`68`	`68`	`<DownloadBtnHeadless`
`69`	`69`	`client:load`