Compare commits

...

5 Commits

Author SHA1 Message Date
TerryM
aaebd7ccd1 chore: comment legacy api nginx route
All checks were successful
Deploy to Frontend Servers / deploy (push) Successful in 47s
2026-05-24 00:43:40 +08:00
3f0a9f72d9 1
All checks were successful
Deploy to Frontend Servers / deploy (push) Successful in 48s
2026-05-24 00:31:42 +08:00
769087ba4a Route same-origin API via /apnew/api to bypass ALB /api* rule.
All checks were successful
Deploy to Frontend Servers / deploy (push) Successful in 53s
ALB sends /api/* to an unreachable backend target group (502 on apex).
Use VITE_API_PREFIX=/apnew with nginx proxy to backend-1 until the listener rule is removed.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-23 17:56:38 +08:00
2c710e2e24 Same-origin API: empty VITE_API_URL with nginx proxy to backend-1.
Frontends call /api/ on ark-library.com; nginx forwards internally to 100.93.205.19.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-23 17:42:59 +08:00
TerryM
e6bc212c4e fix: align official recommendations behavior
All checks were successful
Deploy to Frontend Servers / deploy (push) Successful in 47s
2026-05-19 00:34:29 +08:00
10 changed files with 218 additions and 49 deletions

View File

@@ -34,7 +34,8 @@ jobs:
- name: Build - name: Build
run: npm run build run: npm run build
env: env:
VITE_API_URL: https://api.ark-library.com VITE_API_URL: ""
VITE_API_PREFIX: "/apnew"
VITE_DISABLE_ADMIN: "true" VITE_DISABLE_ADMIN: "true"
- name: Setup SSH key - name: Setup SSH key

View File

@@ -0,0 +1,105 @@
# Shared SPA locations. Browser calls same-origin /apnew/api/ (VITE_API_PREFIX=/apnew).
# /apnew/api/ avoids ALB listener rule that sends /api/* to an unreachable backend target group.
# Nginx proxies internally to ark-library-backend-1 (Tailscale); Host header for backend TLS.
# Legacy /api/ locations are commented below for reference only.
gzip on;
gzip_vary on;
gzip_proxied any;
gzip_comp_level 5;
gzip_types text/plain text/css application/javascript application/json application/xml image/svg+xml;
gzip_min_length 256;
location ^~ /apnew/api/admin {
return 404;
}
# Legacy same-origin /api admin block. Disabled while production uses /apnew/api.
# location ^~ /api/admin {
# return 404;
# }
location ^~ /admin {
return 404;
}
location ^~ /apnew/api/ {
proxy_pass https://100.93.205.19/api/;
proxy_http_version 1.1;
proxy_ssl_server_name on;
proxy_set_header Host api.ark-library.com;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
client_max_body_size 512m;
client_body_timeout 600s;
proxy_read_timeout 600s;
proxy_send_timeout 600s;
}
# Legacy same-origin /api proxy. Disabled while production uses /apnew/api.
# location ^~ /api/ {
# proxy_pass https://100.93.205.19/api/;
# proxy_http_version 1.1;
# proxy_ssl_server_name on;
# proxy_set_header Host api.ark-library.com;
# proxy_set_header X-Real-IP $remote_addr;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# proxy_set_header X-Forwarded-Proto $scheme;
# client_max_body_size 512m;
# client_body_timeout 600s;
# proxy_read_timeout 600s;
# proxy_send_timeout 600s;
# }
location ^~ /uploads/ {
proxy_pass https://100.93.205.19/uploads/;
proxy_http_version 1.1;
proxy_ssl_server_name on;
proxy_set_header Host api.ark-library.com;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}
location = /health {
default_type text/plain;
return 200 "ok\n";
}
location = /healthz {
default_type text/plain;
return 200 "ok\n";
}
location = /index.html {
try_files $uri =404;
add_header Cache-Control "no-cache, no-store, must-revalidate" always;
}
# Exact `/` so the HTML shell is never edge-cached without validators (avoids stale index.html → 404 on hashed /index-*.js or /assets/*).
location = / {
try_files /index.html =404;
add_header Cache-Control "no-cache, no-store, must-revalidate" always;
}
location = /assets/logo-primary.webp {
try_files $uri =404;
add_header Cache-Control "public, max-age=3600, stale-while-revalidate=86400" always;
}
location ^~ /assets/ark-library/ {
try_files $uri =404;
add_header Cache-Control "public, max-age=86400, stale-while-revalidate=604800" always;
}
location ^~ /assets/ {
try_files $uri =404;
add_header Cache-Control "public, max-age=31536000, immutable" always;
}
# Hashed entry chunk at /index-[hash].js (Vite entryFileNames). Do not 308 to /assets — file lives here.
location ~* ^/index-[A-Za-z0-9_-]+\.(js|mjs)$ {
try_files $uri =404;
add_header Cache-Control "public, max-age=31536000, immutable" always;
}
location / {
try_files $uri $uri/ /index.html;
}

View File

@@ -0,0 +1,18 @@
# Native system nginx (not Docker). SPA root: /var/www/ark-library
# Snippet: /etc/nginx/snippets/ark-library-frontend.inc
# ALB terminates TLS; apex uses X-Forwarded-Proto so we do not 301-loop behind the LB.
server {
listen 80 default_server;
listen [::]:80 default_server;
server_name ark-library.com www.ark-library.com;
if ($http_x_forwarded_proto != "https") {
return 301 https://$host$request_uri;
}
root /var/www/ark-library;
index index.html;
include /etc/nginx/snippets/ark-library-frontend.inc;
}

View File

@@ -1,4 +1,5 @@
export const apiBase = import.meta.env.VITE_API_URL || ""; export const apiPrefix = import.meta.env.VITE_API_PREFIX || "";
export const apiBase = (import.meta.env.VITE_API_URL || "") + apiPrefix;
/** Go JSON encodes nil slices as null — normalize before .map() */ /** Go JSON encodes nil slices as null — normalize before .map() */
export function itemsOrEmpty<T>(items: T[] | null | undefined): T[] { export function itemsOrEmpty<T>(items: T[] | null | undefined): T[] {

View File

@@ -27,11 +27,11 @@ export function LatestUpdateRow({
className="h-10 w-10 text-ark-gold" className="h-10 w-10 text-ark-gold"
/> />
</div> </div>
<div className="min-w-0 flex-1 py-0.5"> <div className="flex min-w-0 flex-1 self-stretch py-0.5 flex-col">
<div className="text-base font-bold leading-snug text-white line-clamp-2 md:text-lg"> <div className="text-base font-bold leading-snug text-white line-clamp-2 md:text-lg">
{r.title} {r.title}
</div> </div>
<div className="mt-4 grid gap-1 text-sm text-[#9b9ca6] md:mt-6"> <div className="mt-auto grid gap-1 text-sm text-[#9b9ca6]">
<span>{r.categoryName}</span> <span>{r.categoryName}</span>
<span> <span>
{resourceTypeLabel(t, r.type)} {resourceTypeLabel(t, r.type)}
@@ -58,11 +58,11 @@ export function ComingSoonLatestUpdateRow({ index = 0 }: { index?: number }) {
<div className="flex shrink-0 items-center justify-center pt-0.5"> <div className="flex shrink-0 items-center justify-center pt-0.5">
<CategoryIcon iconKey={iconKey} className="h-10 w-10 text-ark-gold" /> <CategoryIcon iconKey={iconKey} className="h-10 w-10 text-ark-gold" />
</div> </div>
<div className="min-w-0 flex-1 py-0.5"> <div className="flex min-w-0 flex-1 self-stretch py-0.5 flex-col">
<div className="text-base font-bold leading-snug text-white line-clamp-2 md:text-lg"> <div className="text-base font-bold leading-snug text-white line-clamp-2 md:text-lg">
</div> </div>
<div className="mt-4 grid gap-1 text-sm text-[#9b9ca6] md:mt-6"> <div className="mt-auto grid gap-1 text-sm text-[#9b9ca6]">
<span></span> <span></span>
<span>Coming soon</span> <span>Coming soon</span>
</div> </div>

View File

@@ -79,13 +79,13 @@ export function PublicLayout() {
<header className="sticky top-0 z-40 border-b border-ark-line bg-ark-nav/98 backdrop-blur-md"> <header className="sticky top-0 z-40 border-b border-ark-line bg-ark-nav/98 backdrop-blur-md">
<div className="mx-auto max-w-[1280px] px-4 py-[15px] min-[440px]:px-5 sm:px-6 md:px-9 xl:px-0"> <div className="mx-auto max-w-[1280px] px-4 py-[15px] min-[440px]:px-5 sm:px-6 md:px-9 xl:px-0">
{/* Single row (md+): logo | scrollable nav (左對齊,可橫向滑動) | 搜尋 + 語言 */} {/* Single row (md+): logo | scrollable nav (左對齊,可橫向滑動) | 搜尋 + 語言 */}
<div className="flex h-10 items-center gap-2 lg:gap-4"> <div className="flex h-10 items-center gap-2 min-[1200px]:gap-0 lg:gap-4">
<Link <Link
to="/" to="/"
className="flex min-w-0 shrink-0 items-center gap-2.5 rounded-sm text-xl font-bold tracking-wide text-ark-gold outline-none focus-visible:ring-2 focus-visible:ring-ark-gold/80 focus-visible:ring-offset-2 focus-visible:ring-offset-ark-bg" className="flex min-w-0 shrink-0 items-center gap-2.5 rounded-sm text-xl font-bold tracking-wide text-ark-gold outline-none focus-visible:ring-2 focus-visible:ring-ark-gold/80 focus-visible:ring-offset-2 focus-visible:ring-offset-ark-bg"
> >
<ArkLogoMark className="h-10 w-10 shrink-0" /> <ArkLogoMark className="h-10 w-10 shrink-0" />
<span className="max-w-[7.125rem] truncate text-ark-gold sm:inline"> <span className="max-w-[8rem] truncate text-ark-gold sm:inline">
{t("brand")} {t("brand")}
</span> </span>
</Link> </Link>

View File

@@ -53,13 +53,40 @@ export function Browse() {
useEffect(() => { useEffect(() => {
setErr(null); setErr(null);
if (sort === "recommended") {
const p = new URLSearchParams();
p.set("lang", lang);
p.set("limit", "100");
getJSON<{ items: Resource[] }>(`/api/resources/recommended?${p}`)
.then((r) => {
const tagLower = tag.toLowerCase();
const officialItems = itemsOrEmpty(r.items)
.filter((item) => item.isRecommended)
.filter((item) => type === "all" || item.type === type)
.filter((item) => !resourceLang || item.language === resourceLang)
.filter(
(item) =>
!tagLower ||
item.tags?.some(
(itemTag) => itemTag.toLowerCase() === tagLower,
),
);
setTotal(officialItems.length);
setItems(officialItems.slice((page - 1) * limit, page * limit));
})
.catch((e) => setErr(String(e)));
return;
}
getJSON<{ items: Resource[]; total?: number }>(`/api/resources?${query}`) getJSON<{ items: Resource[]; total?: number }>(`/api/resources?${query}`)
.then((r) => { .then((r) => {
setItems(itemsOrEmpty(r.items)); setItems(itemsOrEmpty(r.items));
setTotal(typeof r.total === "number" ? r.total : 0); setTotal(typeof r.total === "number" ? r.total : 0);
}) })
.catch((e) => setErr(String(e))); .catch((e) => setErr(String(e)));
}, [query]); }, [lang, limit, page, query, resourceLang, sort, tag, type]);
const setPage = (next: number) => { const setPage = (next: number) => {
const n = new URLSearchParams(sp); const n = new URLSearchParams(sp);

View File

@@ -8,10 +8,7 @@ import {
ComingSoonLatestUpdateRow, ComingSoonLatestUpdateRow,
LatestUpdateRow, LatestUpdateRow,
} from "../components/LatestUpdateRow"; } from "../components/LatestUpdateRow";
import { import { RecommendedCard } from "../components/RecommendedCard";
ComingSoonRecommendedCard,
RecommendedCard,
} from "../components/RecommendedCard";
import { SectionHeader } from "../components/SectionHeader"; import { SectionHeader } from "../components/SectionHeader";
import { useI18n } from "../i18n"; import { useI18n } from "../i18n";
import { categoryCardLines } from "../utils/categoryDisplay"; import { categoryCardLines } from "../utils/categoryDisplay";
@@ -23,6 +20,7 @@ export function Home() {
const [latest, setLatest] = useState<Resource[]>([]); const [latest, setLatest] = useState<Resource[]>([]);
const [err, setErr] = useState<string | null>(null); const [err, setErr] = useState<string | null>(null);
const recRowRef = useRef<HTMLDivElement>(null); const recRowRef = useRef<HTMLDivElement>(null);
const [canScrollRec, setCanScrollRec] = useState(false);
useEffect(() => { useEffect(() => {
const q = `?lang=${encodeURIComponent(lang)}`; const q = `?lang=${encodeURIComponent(lang)}`;
@@ -42,11 +40,27 @@ export function Home() {
const iconKeyForResource = (r: Resource) => const iconKeyForResource = (r: Resource) =>
cats.find((c) => c.id === r.categoryId)?.iconKey ?? "folder"; cats.find((c) => c.id === r.categoryId)?.iconKey ?? "folder";
useEffect(() => {
const row = recRowRef.current;
if (!row) {
setCanScrollRec(false);
return;
}
const updateCanScroll = () => {
setCanScrollRec(row.scrollWidth > row.clientWidth + 1);
};
updateCanScroll();
const resizeObserver = new ResizeObserver(updateCanScroll);
resizeObserver.observe(row);
return () => resizeObserver.disconnect();
}, [rec.length]);
const scrollRec = (dir: 1 | -1) => { const scrollRec = (dir: 1 | -1) => {
recRowRef.current?.scrollBy({ left: dir * 280, behavior: "smooth" }); recRowRef.current?.scrollBy({ left: dir * 280, behavior: "smooth" });
}; };
const recommendedPlaceholderCount = Math.max(0, 5 - rec.length);
const latestPlaceholderCount = Math.max(0, 5 - latest.length); const latestPlaceholderCount = Math.max(0, 5 - latest.length);
if (err) { if (err) {
@@ -115,20 +129,11 @@ export function Home() {
<RecommendedCard r={r} visualIndex={index} /> <RecommendedCard r={r} visualIndex={index} />
</div> </div>
))} ))}
{Array.from({ length: recommendedPlaceholderCount }).map(
(_, index) => (
<div
key={`recommended-coming-soon-${index}`}
className="snap-start"
>
<ComingSoonRecommendedCard visualIndex={rec.length + index} />
</div>
),
)}
</div> </div>
<div className="h-1 rounded-full bg-black/80 md:hidden"> <div className="h-1 rounded-full bg-black/80 md:hidden">
<div className="h-full w-24 rounded-full bg-[#353740]" /> <div className="h-full w-24 rounded-full bg-[#353740]" />
</div> </div>
{canScrollRec ? (
<button <button
type="button" type="button"
onClick={() => scrollRec(1)} onClick={() => scrollRec(1)}
@@ -137,6 +142,7 @@ export function Home() {
> >
<ChevronRight className="h-5 w-5" /> <ChevronRight className="h-5 w-5" />
</button> </button>
) : null}
</div> </div>
</section> </section>

1
src/vite-env.d.ts vendored
View File

@@ -2,6 +2,7 @@
interface ImportMetaEnv { interface ImportMetaEnv {
readonly VITE_API_URL: string; readonly VITE_API_URL: string;
readonly VITE_API_PREFIX?: string;
readonly VITE_WALLETCONNECT_PROJECT_ID: string; readonly VITE_WALLETCONNECT_PROJECT_ID: string;
readonly VITE_ADMIN_UI_PREFIX?: string; readonly VITE_ADMIN_UI_PREFIX?: string;
/** When `"true"`, bundle admin UI only (no public pages); use with `VITE_ADMIN_UI_PREFIX` or default secret prefix. */ /** When `"true"`, bundle admin UI only (no public pages); use with `VITE_ADMIN_UI_PREFIX` or default secret prefix. */

View File

@@ -1,7 +1,11 @@
import { defineConfig } from "vite"; import { defineConfig, loadEnv } from "vite";
import react from "@vitejs/plugin-react"; import react from "@vitejs/plugin-react";
export default defineConfig({ export default defineConfig(({ mode }) => {
const env = loadEnv(mode, process.cwd(), "");
const apiProxyTarget = env.DEV_API_PROXY_TARGET || "http://127.0.0.1:8080";
return {
plugins: [react()], plugins: [react()],
build: { build: {
rollupOptions: { rollupOptions: {
@@ -16,8 +20,14 @@ export default defineConfig({
server: { server: {
port: 5173, port: 5173,
proxy: { proxy: {
"/api": { target: "http://127.0.0.1:8080", changeOrigin: true }, "/apnew/api": {
"/uploads": { target: "http://127.0.0.1:8080", changeOrigin: true }, target: apiProxyTarget,
changeOrigin: true,
rewrite: (path) => path.replace(/^\/apnew/, ""),
},
"/api": { target: apiProxyTarget, changeOrigin: true },
"/uploads": { target: apiProxyTarget, changeOrigin: true },
}, },
}, },
};
}); });