feat(Makefile) Makefile fix&cleanup

.env

@@ -17,3 +17,7 @@ WORK_DIR=/nocturne
 # frontend settings
 API_LOCAL_URL=http://backend:3001
 API_REMOTE_URL=https://lumither.com/api
+
+# deployment
+USE_CR=true
+CHANNEL=release

.github/workflows/canary-build.yml

@@ -0,0 +1,64 @@
+name: build canary nocturne image
+on:
+  push:
+    branches:
+      - master
+
+env:
+  REGISTRY: cr.lmt.moe
+  TAG: canary
+  PROJECT: nocturne
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: setup builder
+        uses: docker/setup-buildx-action@v3
+
+      - name: registry login
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+
+      - name: build containers
+        run: |
+          make build
+
+      - name: tag and push
+        run: |
+          PROJECT_NAME=$(basename "$PWD")
+
+          ALL_IMAGES=$(docker compose -f prod.compose.yaml config --services 2>/dev/null)
+          PULLED_IMAGES=$(docker compose -f prod.compose.yaml config 2>/dev/null \
+                          | awk '/image:/ {print $2}' \
+                          | sort -u \
+                          | sed 's/:.*//' \
+          )
+          TO_PUSH=$(comm -23 \
+            <(echo "$ALL_IMAGES" | sort) \
+            <(echo "$PULLED_IMAGES") \
+          )
+          
+          FMT_STRING=$(echo "$TO_PUSH" | xargs printf '%s, ' | sed 's/, $//')
+          echo "services to push: $FMT_STRING"
+          
+          for SERVICE in $TO_PUSH; do
+            LOCAL_TAG="${PROJECT_NAME}-${SERVICE}:latest"
+            REMOTE_TAG="${REGISTRY}/${PROJECT}/${SERVICE}:${TAG}"
+          
+            if docker image inspect "$LOCAL_TAG" >/dev/null 2>&1; then
+              echo "Pushing $REMOTE_TAG"
+              docker tag "$LOCAL_TAG" "$REMOTE_TAG"
+              docker push "$REMOTE_TAG"
+            else
+              echo "warn: image $LOCAL_TAG not found, skipping $SERVICE"
+            fi
+          
+          done

.github/workflows/release-build.yml

@@ -0,0 +1,64 @@
+name: build release nocturne image
+on:
+  push:
+    branches:
+      - release
+
+env:
+  REGISTRY: cr.lmt.moe
+  TAG: release
+  PROJECT: nocturne
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: setup builder
+        uses: docker/setup-buildx-action@v3
+
+      - name: registry login
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+
+      - name: build containers
+        run: |
+          make build
+
+      - name: tag and push
+        run: |
+          PROJECT_NAME=$(basename "$PWD")
+
+          ALL_IMAGES=$(docker compose -f prod.compose.yaml config --services 2>/dev/null)
+          PULLED_IMAGES=$(docker compose -f prod.compose.yaml config 2>/dev/null \
+                          | awk '/image:/ {print $2}' \
+                          | sort -u \
+                          | sed 's/:.*//' \
+          )
+          TO_PUSH=$(comm -23 \
+            <(echo "$ALL_IMAGES" | sort) \
+            <(echo "$PULLED_IMAGES") \
+          )
+          
+          FMT_STRING=$(echo "$TO_PUSH" | xargs printf '%s, ' | sed 's/, $//')
+          echo "services to push: $FMT_STRING"
+          
+          for SERVICE in $TO_PUSH; do
+            LOCAL_TAG="${PROJECT_NAME}-${SERVICE}:latest"
+            REMOTE_TAG="${REGISTRY}/${PROJECT}/${SERVICE}:${TAG}"
+          
+            if docker image inspect "$LOCAL_TAG" >/dev/null 2>&1; then
+              echo "Pushing $REMOTE_TAG"
+              docker tag "$LOCAL_TAG" "$REMOTE_TAG"
+              docker push "$REMOTE_TAG"
+            else
+              echo "warn: image $LOCAL_TAG not found, skipping $SERVICE"
+            fi
+          
+          done

Makefile

@@ -3,7 +3,42 @@ ifeq ($(ARCH), arm64)
     ARCH := aarch64
 endif
 
-.PHONY: up
-clean:
-	echo "todo"
+ifneq (,$(wildcard ./.env))
+    include ./.env
+    export
+endif
+ifneq (,$(wildcard ./.env.local))
+    include ./.env.local
+    export
+endif
 
+USE_CR ?= false
+CHANNEL ?= release
+ifeq ($(USE_CR), true)
+    COMPOSE_FILE := prod.cr.compose.yaml
+else
+    COMPOSE_FILE := prod.compose.yaml
+endif
+
+DOCKER_ENV := ARCH=$(ARCH) TAG=$(CHANNEL)
+DOCKER_COMPOSE := $(DOCKER_ENV) docker compose -f $(COMPOSE_FILE)
+
+.PHONY: all
+all:up
+
+.PHONY: build
+build:
+	$(DOCKER_COMPOSE) pull
+	$(DOCKER_COMPOSE) build
+
+.PHONY: up
+up:
+	$(DOCKER_COMPOSE) up -d
+
+.PHONY: down
+down:
+	$(DOCKER_COMPOSE) down
+
+.PHONY: clean
+clean:
+	$(DOCKER_COMPOSE) down --rmi all --volumes

backend/server/Cargo.toml

@@ -8,6 +8,7 @@ macros = { path = "../macros" }
 markdown = { path = "../markdown" }
 
 axum = { version = "0.8.1", features = ["macros"] }
+axum-extra = { version = "0.10.3", features = ["query"] }
 tracing = { version = "0.1.41", features = ["log"] }
 git2 = "0.20.0"
 chrono = { version = "0.4.39", features = ["serde"] }

backend/server/build.rs

@@ -1,16 +1,17 @@
-use chrono::Utc;
-use git2::Repository;
+// use chrono::Utc;
+// use git2::Repository;
 
 fn main() {
-    let repo = Repository::open("../..").expect("failed to open repository");
-    let commit = repo
-        .head()
-        .expect("failed to get HEAD")
-        .peel_to_commit()
-        .expect("failed to get HEAD commit");
-    let hash = commit.id().to_string();
-    let utc_timestamp = Utc::now().date_naive().format("%Y%m%d").to_string();
-    let pkg_version = env!("CARGO_PKG_VERSION");
-    let build_id = format!("{}:{}@{}", pkg_version, &hash[..8], utc_timestamp);
-    println!("cargo:rustc-env=BUILD_ID={}", build_id);
+    // let repo = Repository::open("../..").expect("failed to open repository");
+    // let commit = repo
+    //     .head()
+    //     .expect("failed to get HEAD")
+    //     .peel_to_commit()
+    //     .expect("failed to get HEAD commit");
+    // let hash = commit.id().to_string();
+    // let utc_timestamp = Utc::now().date_naive().format("%Y%m%d").to_string();
+    // let pkg_version = env!("CARGO_PKG_VERSION");
+    // let build_id = format!("{}:{}@{}", pkg_version, &hash[..8], utc_timestamp);
+    // println!("cargo:rustc-env=BUILD_ID={}", build_id);
+    println!("cargo:rustc-env=BUILD_ID=undefined");
 }

backend/server/src/modules/blog/api/posts/count_tag_filtered_posts.sql

@@ -0,0 +1,20 @@
+WITH filtered_posts AS
+         (SELECT p.id, p.date_created
+          FROM posts p
+          WHERE $1::text[] IS NULL
+             OR (
+              CASE
+                  WHEN $4 THEN (SELECT COUNT(DISTINCT t.name)
+                                FROM post_tag pt
+                                         JOIN tags t ON pt.tag = t.id
+                                WHERE pt.post = p.id
+                                  AND t.name = ANY ($1::text[])) = cardinality($1)
+                  ELSE EXISTS (SELECT 1
+                               FROM post_tag pt
+                                        JOIN tags t ON pt.tag = t.id
+                               WHERE pt.post = p.id
+                                 AND t.name = ANY ($1::text[]))
+                  END
+              ))
+SELECT COUNT(*) AS total_count
+FROM filtered_posts;

backend/server/src/modules/blog/api/posts/get.rs

@@ -4,17 +4,65 @@ use crate::{
     utils::axum_response::{err_resp, succ_resp},
 };
 
-use axum::{
-    extract::{Query, State},
-    http::StatusCode,
-    response::IntoResponse,
-};
+use std::collections::HashSet;
+
+use axum::{extract::State, http::StatusCode, response::IntoResponse};
+use axum_extra::extract::Query;
 use chrono::NaiveDate;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
-use sqlx::{FromRow, PgPool, query_as};
+use sqlx::{query_as, FromRow, PgPool};
 use uuid::Uuid;
 
+fn tags_deserializer<'de, D>(deserializer: D) -> Result<Option<Vec<String>>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    let deserialize_each = |input: String| -> Result<Vec<String>, D::Error> {
+        Ok(input.split(',').map(|s| s.to_string()).collect())
+    };
+
+    #[derive(Deserialize)]
+    #[serde(untagged)]
+    enum Cardinality {
+        One(String),
+        Many(Vec<String>),
+    }
+    let cardinality: Option<Cardinality> = Deserialize::deserialize(deserializer)?;
+
+    let mut tags = HashSet::new();
+
+    match cardinality {
+        Some(Cardinality::One(s)) => {
+            for item in deserialize_each(s)? {
+                let item = item.trim().to_string();
+                if !item.is_empty() {
+                    tags.insert(item);
+                }
+            }
+            let ret = tags.into_iter().collect::<Vec<_>>();
+            Ok(if ret.is_empty() { None } else { Some(ret) })
+        }
+        Some(Cardinality::Many(v)) => {
+            for items in v
+                .into_iter()
+                .map(deserialize_each)
+                .collect::<Result<Vec<_>, _>>()?
+            {
+                for item in items {
+                    let item = item.trim().to_string();
+                    if !item.is_empty() {
+                        tags.insert(item);
+                    }
+                }
+            }
+            let ret = tags.into_iter().collect::<Vec<_>>();
+            Ok(if ret.is_empty() { None } else { Some(ret) })
+        }
+        None => Ok(None),
+    }
+}
+
 #[derive(FromRow, Serialize)]
 struct PostBriefModel {
     id: Uuid,
@@ -29,9 +77,15 @@ struct PostBriefModel {
 }
 
 #[derive(Deserialize, Serialize)]
-pub struct Pagination {
+pub struct SearchParams {
     page: Option<u32>,
     page_size: Option<u32>,
+
+    #[serde(default, deserialize_with = "tags_deserializer")]
+    tags: Option<Vec<String>>,
+
+    #[serde(default)]
+    match_all: bool,
 }
 
 #[derive(Serialize)]
@@ -52,15 +106,25 @@ struct UuidRow {
     id: Uuid,
 }
 
+const I32_PLACEHOLDER: i32 = 0;
+
+const COUNT_TAG_FILTERED_POSTS: &str = include_str!("count_tag_filtered_posts.sql");
+const SELECT_POST_WITH_TAG_FILTER_PAGINATED: &str =
+    include_str!("select_post_with_tag_filter_paginated.sql");
 const GET_POST_WITH_BRIEF_MODEL: &str = include_str!("get_post_with_brief_model.sql");
 
 pub async fn handler(
     State(db): State<PgPool>,
-    Query(pagination): Query<Pagination>,
+    Query(search_params): Query<SearchParams>,
 ) -> impl IntoResponse {
-    let page = pagination.page.unwrap_or(1);
-    let page_size = pagination.page_size.unwrap_or(PAGE_SIZE);
-    let page_count = match sqlx::query_scalar::<_, i64>("SELECT COUNT(*) FROM posts")
+    let page = search_params.page.unwrap_or(1);
+    let page_size = search_params.page_size.unwrap_or(PAGE_SIZE);
+
+    let page_count = match sqlx::query_scalar::<_, i64>(COUNT_TAG_FILTERED_POSTS)
+        .bind(&search_params.tags)
+        .bind(I32_PLACEHOLDER) // not used, but help sqlx/psql hit cache
+        .bind(I32_PLACEHOLDER)
+        .bind(search_params.match_all)
         .fetch_one(&db)
         .await
     {
@@ -84,11 +148,11 @@ pub async fn handler(
 
     let offset = page_size * (page - 1);
 
-    let ids = match query_as::<_, UuidRow>(
-        "SELECT id FROM posts ORDER BY date_created DESC LIMIT $1 OFFSET $2",
-    )
+    let ids = match query_as::<_, UuidRow>(SELECT_POST_WITH_TAG_FILTER_PAGINATED)
+        .bind(search_params.tags)
         .bind(page_size as i32)
         .bind(offset as i32)
+        .bind(search_params.match_all)
         .fetch_all(&db)
         .await
     {

backend/server/src/modules/blog/api/posts/select_post_with_tag_filter_paginated.sql

@@ -0,0 +1,22 @@
+WITH filtered_posts AS
+         (SELECT p.id, p.date_created
+          FROM posts p
+          WHERE $1::text[] IS NULL
+             OR (
+              CASE
+                  WHEN $4 THEN (SELECT COUNT(DISTINCT t.name)
+                                FROM post_tag pt
+                                         JOIN tags t ON pt.tag = t.id
+                                WHERE pt.post = p.id
+                                  AND t.name = ANY ($1::text[])) = cardinality($1)
+                  ELSE EXISTS (SELECT 1
+                               FROM post_tag pt
+                                        JOIN tags t ON pt.tag = t.id
+                               WHERE pt.post = p.id
+                                 AND t.name = ANY ($1::text[]))
+                  END
+              ))
+SELECT id
+FROM filtered_posts
+ORDER BY date_created DESC
+LIMIT $2 OFFSET $3;

container/release/backend.containerfile

@@ -5,6 +5,6 @@ RUN ["cargo", "build", "-r"]
 
 FROM gcr.io/distroless/cc AS production
 ARG ARCH
-COPY --from=builder /app/target/release/api_server ./api_server
+COPY --from=builder /app/target/release/server ./server
 COPY --from=builder /usr/lib/${ARCH}-linux-gnu/libz.so.1 /usr/lib/${ARCH}-linux-gnu/
-ENTRYPOINT ["./api_server"]
+ENTRYPOINT ["./server"]

daemon/.gitignore

@@ -0,0 +1,3 @@
+target/
+
+Cargo.lock

daemon/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "daemon"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+clap = { version = "4.5.47", features = ["derive"] }
+containerd-client = "0.8.0"
+tokio = { version = "1.45.1", features = ["macros", "rt-multi-thread"] }

daemon/Makefile

@@ -0,0 +1,13 @@
+.PHONY: rebuild
+rebuild:
+	cargo clean
+	cargo build
+
+.PHONY: rebuild-release
+rebuild-release:
+	cargo clean
+	cargo build -r
+
+.PHONY: run
+run:
+	sudo ./target/debug/daemon

daemon/src/actions/mod.rs

@@ -0,0 +1 @@
+mod pull;

daemon/src/config/default.json

@@ -0,0 +1,8 @@
+{
+  "images": [
+    {
+      "id": "",
+      "image": ""
+    }
+  ]
+}

daemon/src/main.rs

@@ -0,0 +1,89 @@
+mod actions;
+mod config;
+
+use clap::Parser;
+use containerd_client::tonic::Request;
+use containerd_client::{
+    connect,
+    services::v1::{transfer_client::TransferClient, TransferOptions, TransferRequest},
+    to_any,
+    types::transfer::OciRegistry,
+    types::transfer::{ImageStore, UnpackConfiguration},
+    types::Platform,
+    with_namespace,
+};
+use std::env::consts;
+
+#[derive(Parser, Debug)]
+struct Args {
+    /// containerd namespace
+    #[arg(short, long, default_value = "nocturne")]
+    namespace: String,
+
+    /// containerd socket
+    #[arg(short, long, default_value = "/run/containerd/containerd.sock")]
+    socket: String,
+}
+
+const IMAGE: &str = "docker.io/library/alpine:latest";
+
+#[tokio::main]
+async fn main() {
+    let args = Args::parse();
+
+    let arch = match consts::ARCH {
+        "x86_64" => "amd64",
+        "aarch64" => "arm64",
+        _ => consts::ARCH,
+    };
+
+    dbg!(&args);
+
+    let channel = connect(&args.socket).await.expect("failed to bind socket");
+    let mut client = TransferClient::new(channel.clone());
+
+    let registry = OciRegistry {
+        reference: IMAGE.to_string(),
+        resolver: Default::default(),
+    };
+
+    let platform = Platform {
+        os: "linux".to_string(),
+        architecture: arch.to_string(),
+        variant: "".to_string(),
+        os_version: "".to_string(),
+    };
+
+    let destination = ImageStore {
+        name: IMAGE.to_string(),
+        platforms: vec![platform.clone()],
+        unpacks: vec![UnpackConfiguration {
+            platform: Some(platform),
+            ..Default::default()
+        }],
+        ..Default::default()
+    };
+
+    let anys = to_any(&registry);
+    let anyd = to_any(&destination);
+
+    println!(
+        "Pulling image for linux/{} from source: {:?}",
+        arch, registry
+    );
+
+    let request = TransferRequest {
+        source: Some(anys),
+        destination: Some(anyd),
+        options: Some(TransferOptions {
+            ..Default::default()
+        }),
+    };
+    // let request = Request::new(request);
+    let req = with_namespace!(request, args.namespace);
+
+    client
+        .transfer(req)
+        .await
+        .expect("unable to transfer image");
+}

dev.compose.yaml

@@ -31,6 +31,6 @@ services:
   postgres:
     image: postgres:16.3
     ports:
-      - 5432:5432
+      - "5432:5432"
     env_file:
       - ./container/dev/.env

frontend/Makefile

@@ -0,0 +1,8 @@
+
+.PHONY:all
+all: standalone
+
+.PHONY: standalone
+standalone:
+	npm run build
+	cp -r public .next/standalone/ && cp -r .next/static .next/standalone/.next/

frontend/app/(pages)/blog/BlogPostCard.tsx

@@ -4,6 +4,8 @@ import { Chip } from '@nextui-org/react';
 import Image from 'next/image';
 import Link from 'next/link';
 import { MdCalendarMonth, MdNorthEast } from 'react-icons/md';
+import { HighlightSelector } from '@/app/(pages)/blog/post/components/AnimationPostList';
+import TagChip from '@/app/(pages)/blog/TagChip';
 
 interface Post {
     id: string,
@@ -19,13 +21,18 @@ interface Post {
 
 type Props = {
     post: Post
+
+    highlightSelector: HighlightSelector,
 }
 
-function BlogPostCard({ post }: Props) {
+function BlogPostCard({ post, highlightSelector }: Props) {
+    const highlightTags = highlightSelector?.tags;
+
     return (
         <div className={ `w-full` }>
-            <Card as={ Link } href={ `/blog/post/${ post.id }` }
-                  className={ `group` }
+            <Card
+                as={ Link } href={ `/blog/post/${ post.identifier }` }
+                className={ `group w-full dark:bg-[#353540]` }
                 isPressable
                 isHoverable
             >
@@ -63,10 +70,24 @@ function BlogPostCard({ post }: Props) {
                     <div className={ `flex flex-row flex-wrap justify-between w-full` }>
                         <div>
                             <ul className={ `flex flex-row flex-wrap` }>
-                                {
-                                    post.tags.map((tag: string, key: any) => (
+                                {/*highlight*/
+                                    post.tags
+                                        .filter((tag) => highlightTags?.includes(tag))
+                                        .sort()
+                                        .map((tag: string, key: any) => (
                                             <li key={ key } className={ `mx-1 mb-1` }>
-                                            <Chip>{ tag }</Chip>
+                                                <TagChip tagName={ tag } isHighlighted={ true } />
+                                            </li>
+                                        ))
+                                }
+
+                                {/*normal */
+                                    post.tags
+                                        .filter((tag) => !highlightTags?.includes(tag))
+                                        .sort()
+                                        .map((tag: string, key: any) => (
+                                            <li key={ key } className={ `mx-1 mb-1` }>
+                                                <TagChip tagName={ tag } isHighlighted={ false } />
                                             </li>
                                         ))
                                 }

frontend/app/(pages)/blog/Pagination.tsx

@@ -8,7 +8,9 @@ import { useScreenSizeTrigger } from '@/app/(pages)/public/screenSizeTrigger';
 const Pagination = ({ total }: {
     total: number,
 }) => {
-    const parsePage = Number(useSearchParams().get('page'));
+    const searchParams = useSearchParams();
+
+    const parsePage = Number(searchParams.get('page'));
     const currPage = parsePage > 0 ? parsePage : 1;
 
     const router = useRouter();
@@ -27,7 +29,10 @@ const Pagination = ({ total }: {
                 color={ 'default' }
                 variant={ 'light' }
                 onChange={ (page) => {
-                    router.push(`?page=${ page }`, { scroll: false });
+                    const params = new URLSearchParams(searchParams.toString());
+                    params.set('page', page.toString());
+                    const queryString = params.toString();
+                    router.push(`?${ queryString }`, { scroll: false });
                 } }
             />
         </div>

frontend/app/(pages)/blog/PostList.tsx

@@ -1,33 +1,19 @@
-'use server';
-
 import React from 'react';
-import BlogPostCard from '@/app/(pages)/blog/BlogPostCard';
+import { Post } from '@/src/api/blog/post';
+import AnimationPostList, { HighlightSelector } from '@/app/(pages)/blog/post/components/AnimationPostList';
 
-import * as motion from 'motion/react-client';
-import { fetchPostList } from '@/src/api/blog/post';
+interface Props {
+    posts: Post[],
+    tags: string[] | undefined
+}
 
-const PostList = async ({ page }: { page: number }) => {
+const PostList = async ({ posts, tags }: Props) => {
     try {
-        const postListResponse = await fetchPostList(page);
-
-        const posts = postListResponse.data.posts;
         return (
-            // blog list
             <div className={ 'w-full' }>
-                <ul className={ 'flex flex-col items-center w-full space-y-7' }>
-                    { posts.map((post, key: number) => (
-                        <li key={ key } className={ 'w-full' }>
-                            <motion.div
-                                initial={ { y: 20, opacity: 0 } }
-                                animate={ { y: 0, opacity: 1 } }
-                                transition={ { ease: 'easeInOut', duration: 0.5, delay: key * .2 + .25 } }
-                            >
-                                <BlogPostCard post={ post } />
-                            </motion.div>
-                        </li>)
-                    ) }
-                </ul>
-
+                <AnimationPostList posts={ posts } highlight={ {
+                    tags: tags
+                } } />
             </div>
         );
     } catch (e: any) {

frontend/app/(pages)/blog/TagChip.tsx

@@ -0,0 +1,52 @@
+'use client';
+
+import React from 'react';
+import { Chip } from '@nextui-org/react';
+import { useRouter, useSearchParams } from 'next/navigation';
+import { cn } from '@/src/utils';
+
+interface TagChipProps {
+    tagName: string,
+    isHighlighted: boolean
+}
+
+const TagChip = ({ tagName, isHighlighted }: TagChipProps) => {
+    const router = useRouter();
+    const searchParams = useSearchParams();
+
+    const toggleTag = (e: React.MouseEvent<HTMLDivElement>) => {
+        e.stopPropagation();
+        e.preventDefault();
+
+        const params = new URLSearchParams(searchParams.toString());
+        const tags = params.getAll('tags');
+
+        if (tags.includes(tagName)) {
+            const newTags = tags.filter(t => t !== tagName);
+            params.delete('tags');
+            newTags.forEach(t => params.append('tags', t));
+        } else {
+            params.append('tags', tagName);
+        }
+
+        const queryString = params.toString();
+        router.push(`?${ queryString }`, { scroll: false });
+    };
+    return (
+        <div
+            onClick={ toggleTag }
+            className="cursor-pointer relative"
+        >
+            <Chip
+                className={ cn(
+                    'hover:border-amber-400 hover:dark:border-amber-700  transition-all ',
+                    !isHighlighted && 'dark:border-amber-50/25'
+                ) }
+                variant={ 'bordered' }
+                color={ isHighlighted ? 'warning' : 'default' }
+            >{ tagName }</Chip>
+        </div>
+    );
+};
+
+export default TagChip;

frontend/app/(pages)/blog/ToolBar.tsx

@@ -0,0 +1,11 @@
+import React from 'react';
+
+const ToolBar = () => {
+    return (
+        <div className={ 'w-full' }>
+
+        </div>
+    );
+};
+
+export default ToolBar;

frontend/app/(pages)/blog/page.tsx

@@ -1,6 +1,7 @@
 import PostList from '@/app/(pages)/blog/PostList';
 import Pagination from '@/app/(pages)/blog/Pagination';
-import { fetchPostListPagination } from '@/src/api/blog/post';
+import { fetchPostList } from '@/src/api/blog/post';
+import ToolBar from '@/app/(pages)/blog/ToolBar';
 
 
 async function Blog({
@@ -9,18 +10,40 @@ async function Blog({
     searchParams: Promise<{ [_: string]: string | string[] | undefined }>
 }) {
 
-    const parsePage = Number((await searchParams)?.page);
+    const sp = await searchParams;
+
+    const parsePage = Number(sp?.page);
     const currPage = parsePage > 0 ? parsePage : 1;
 
+    const matchAll = Boolean(sp?.match_all);
+
+    const ensureList = (input: string | string[] | undefined): string[] | undefined => {
+        if (!input) {
+            return undefined;
+        }
+        if (typeof input === 'string') {
+            return [ input ];
+        } else {
+            return input;
+        }
+    };
+    const tags = ensureList(sp?.tags);
 
     try {
-        const pagination = await fetchPostListPagination();
-        const pageCount = pagination.data.page_count;
+        const postListResponse = await fetchPostList({
+            page: currPage,
+            match_all: matchAll,
+            tag_filter: tags
+        });
+
+        const pagination = postListResponse.data.pagination;
+        const posts = postListResponse.data.posts;
 
         return (
             <div className={ 'w-full min-w-full space-y-4' }>
-                <PostList page={ currPage } />
-                <Pagination total={ pageCount } />
+                <ToolBar />
+                <PostList posts={ posts } tags={ tags } />
+                <Pagination total={ pagination.page_count } />
             </div>
         );
     } catch (e: any) {
@@ -28,7 +51,7 @@ async function Blog({
             <div className={ `flex h-full min-h-dvh w-full justify-center items-center` }>
                 <div className={ `flex-row` }>
                     <p className={ `text-xl font-bold` }>
-                        { 'Unexpected Error [loading pagination]:' }
+                        { 'Unexpected Error [loading blog posts]:' }
                     </p>
                     <p className={ `font-bold` }>
                         { e.message }

frontend/app/(pages)/blog/post/[id]/ButtonGoBack.tsx

@@ -12,7 +12,7 @@ const ButtonGoBack = () => {
         <Button
             startContent={ <IoArrowBackOutline /> }
             variant={ 'light' }
-            onClick={ () => router.back() }
+            onPress={ () => router.back() }
         >
             { 'Back' }
         </Button>

frontend/app/(pages)/blog/post/[id]/Footer.tsx

@@ -33,7 +33,7 @@ const Footer = (props: Props) => {
     return (
         <div className={ `w-full` }>
 
-            <div className={ 'flex transition bg-zinc-300/80 dark:bg-gray-600/25' }>
+            <div className={ 'flex transition bg-zinc-300/80 dark:bg-[#1c1c22]/50' }>
                 <div className={ `p-8 w-full overflow-hidden` }>
                     <div className={ 'relative' }>
                         <FaCreativeCommons

frontend/app/(pages)/blog/post/[id]/Headers.tsx

@@ -2,6 +2,7 @@ import React from 'react';
 import Image from 'next/image';
 import { Chip } from '@nextui-org/react';
 import { MdCalendarMonth } from 'react-icons/md';
+import TagChip from '@/app/(pages)/blog/post/[id]/TagChip';
 
 type Props = {
     title: string;
@@ -50,7 +51,7 @@ const Headers = (post: Props) => {
                             {
                                 post.tags.map((tag: string, key: any) => (
                                     <li key={ key } className={ `mx-1 mb-1` }>
-                                        <Chip>{ tag }</Chip>
+                                        <TagChip tag={ tag } />
                                     </li>
                                 ))
                             }

frontend/app/(pages)/blog/post/[id]/MinifyPostCard.tsx

@@ -12,12 +12,12 @@ const MinifyPostCard = (props: Props) => {
     const { post, desc } = props;
     const img_url = post['header_img'] as string;
     return (
-        <div className={ 'w-full transition hover:brightness-75' }>
+        <div className={ 'w-full transition hover:brightness-90' }>
             <Card isFooterBlurred
-                  className="w-full h-[300px] shadow-none border-0 rounded-none overflow-hidden"
+                  className="w-full h-[300px] shadow-none border-0 rounded-none overflow-hidden dark:bg-[#353540]"
                   as={ Link }
                   isPressable
-                  href={ `/blog/post/${ post['id'] }` }
+                  href={ `/blog/post/${ post['identifier'] }` }
             >
                 <CardHeader className="absolute z-10 top-1 flex-col items-start">
                     <p className={ `text-tiny uppercase font-bold ${ img_url ? 'text-white/60' : 'text-black/60 dark:text-white/60' }` }>{ desc }</p>

frontend/app/(pages)/blog/post/[id]/PostCard.tsx

@@ -16,7 +16,7 @@ async function PostCard(props: Props) {
 
     return (
         <div>
-            <Card className={ `max-w-full relative` }>
+            <Card className={ `max-w-full relative dark:bg-[#34343e]` }>
 
                 {/* card headers */ }
                 <Headers title={ post.title }

frontend/app/(pages)/blog/post/[id]/TagChip.tsx

@@ -0,0 +1,20 @@
+'use client';
+
+import React from 'react';
+import { Chip } from '@nextui-org/react';
+import { useRouter } from 'next/navigation';
+
+const TagChip = ({ tag }: { tag: string }) => {
+    const router = useRouter();
+
+    return (
+        <div onClick={ () => router.push(`/blog?tags=${ tag }`) }>
+            <Chip
+                className={ 'hover:border-amber-400 hover:dark:border-amber-700  transition-all dark:bg-[#353540] dark:border-amber-50/25' }
+                variant={ 'faded' }
+            >{ tag }</Chip>
+        </div>
+    );
+};
+
+export default TagChip;

frontend/app/(pages)/blog/post/components/AnimationPostList.tsx

@@ -0,0 +1,40 @@
+'use client';
+
+import React from 'react';
+import BlogPostCard from '@/app/(pages)/blog/BlogPostCard';
+
+import * as motion from 'motion/react-client';
+import { AnimatePresence } from 'motion/react';
+import { Post } from '@/src/api/blog/post';
+
+export interface HighlightSelector {
+    tags?: string[];
+}
+
+interface Props {
+    posts: Post[];
+    highlight: HighlightSelector;
+}
+
+const PostList = ({ posts, highlight }: Props) => {
+    return (
+        <div className={ 'w-full' }>
+            <ul className={ 'flex flex-col items-center w-full space-y-7' }>
+                <AnimatePresence mode={ 'wait' }>
+                    { posts.map((post, key: number) => (
+                        <motion.li
+                            initial={ { y: 20, opacity: 0 } }
+                            animate={ { y: 0, opacity: 1 } }
+                            transition={ { ease: 'easeOut', duration: 0.5, delay: key * .1 + .1 } }
+                            key={ key }
+                            className={ 'w-full' }>
+                            <BlogPostCard post={ post } highlightSelector={ highlight } />
+                        </motion.li>)
+                    ) }
+                </AnimatePresence>
+            </ul>
+
+        </div>
+    );
+};
+export default PostList;

frontend/app/(pages)/layout.tsx

@@ -14,7 +14,7 @@ function Layout({
             <motion.div
                 initial={ { opacity: 0 } }
                 animate={ { opacity: 1 } }
-                transition={ { ease: 'easeInOut', duration: 0.3, delay: 0.5 } }
+                transition={ { ease: 'easeInOut', duration: 0.3, delay: 0.1 } }
                 className={ `justify-center flex flex-row w-full max-w-full` }>
                 <Navbar />
                 <div className={ `flex flex-col flex-1 max-w-[1024px] min-w-0` }>

frontend/app/(pages)/public/screenSizeTrigger.ts

@@ -2,6 +2,7 @@ import { useEffect, useState } from 'react';
 
 const screenSize = new Map<string, number>(
     [
+        [ 'xs', 480 ],
         [ 'sm', 640 ],
         [ 'md', 768 ],
         [ 'lg', 1024 ],

frontend/app/globals.css

@@ -1,4 +1,4 @@
-@import "lxgw-wenkai-webfont/style.css";
+@import "lxgw-wenkai-webfont/lxgwwenkai-light.css";
 
 @tailwind base;
 @tailwind components;
@@ -6,8 +6,10 @@
 
 body {
     font-family: "LXGW WenKai", sans-serif;
+    /*font-family: "Arial", "monospace", sans-serif;*/
 }
 
 pre, code {
-    font-family: "LXGW WenKai Mono", sans-serif;
+    /*font-family: "monospace", sans-serif;*/
+    font-family: "monospace", sans-serif;
 }

frontend/app/page.tsx

@@ -5,46 +5,79 @@ import { useScreenSizeTrigger } from '@/app/(pages)/public/screenSizeTrigger';
 import { Button } from '@nextui-org/react';
 import { entries } from '@/app/entries';
 import Link from 'next/link';
+import * as motion from 'motion/react-client';
+import { cn } from '@/src/utils';
 
 export default function Home() {
 
-    const isMobile = useScreenSizeTrigger('lg');
-
-    // const [ test, setTest, removeTest ] = useLocalStorage('test', 'test_value');
-    // console.log(test);
-    // setTest('test value 2');
-    // console.log(test);
-    // removeTest();
-    // console.log(test);
+    const isSm = useScreenSizeTrigger('sm');
+    const isXs = useScreenSizeTrigger('xs');
 
     return (
-        <div className={ `h-dvh relative` }>
-            <ul className={ `flex flex-col space-y-2 w-full` }>
+        <div className={ 'h-dvh w-full overflow-hidden relative' }>
+            <motion.div
+                initial={ { opacity: 0 } }
+                animate={ { opacity: 1 } }
+                transition={ { ease: 'easeInOut', duration: 0.3, delay: 0.0 } }
+            >
+                <div className={ `min-h-dvh h-min content-center z-20 p-10` }>
+                    <p className={ 'text-center text-4xl' }>Atelier Lumiaethor</p>
+                    <p className={ 'text-center text-gray-700 font-bold dark:text-gray-400' }>In pursuit of absolute
+                        simplicity and ultimate
+                        sophistication</p>
+                </div>
+
+                <div
+                    className={ 'absolute left-1/2 -translate-x-1/2 bottom-0 w-full h-60 p-12 max-w-[1536px] justify-center' }
+                >
+                    <div
+                        className={ 'h-full w-full rounded-3xl backdrop-blur align-middle grid grid-cols-1 sm:grid-cols-2 content-center' }>
+
+                        { !isSm &&
+                            <div className={ 'w-full grid content-center' }>
+                                <div
+                                    className={ 'p-2 h-fit brightness-50 lg:brightness-75 lg:p-8 xl:p-16 transition-all' }>
+                                    <p>
+                                        © 2024-{ new Date().getFullYear() } <Link href={ `/about` }>Lumither Tao</Link>
+                                    </p>
+                                    <p>Powered by Next.js and Rust, built with passion and love</p>
+                                    <p>LMTCloud ecosystem</p>
+                                </div>
+                            </div>
+                        }
+
+                        <div className={ 'h-full content-center p-4' }>
+                            <ul className={ `grid grid-cols-3 sm:grid-cols-2 justify-items-center sm:justify-items-start w-full` }>
                                 {
                                     entries.map((meta, key) => (
-                        <li key={ key }>
+                                        <li key={ key } className={ cn(isXs && 'w-fit', !isXs && 'w-full') }>
                                             <Button
                                                 as={ Link }
                                                 variant={ `light` }
                                                 color={ `default` }
                                                 fullWidth
-                                isIconOnly={ isMobile }
-                                className={ 'flex lg:justify-start w-fit lg:w-full' }
+                                                isIconOnly={ isXs }
+                                                className={ cn(
+                                                    'flex justify-center',
+                                                    isXs && 'w-fit',
+                                                    !isXs && 'sm:justify-start'
+                                                ) }
                                                 aria-label={ `navbar: ${ meta.display_name }` }
                                                 href={ meta.href }
                                             >
                                                 { meta.icon }
-                                <p className={ `font-bold hidden lg:block` }>{ meta.display_name }</p>
+                                                { !isXs && <p className={ `font-bold` }>{ meta.display_name }</p> }
                                             </Button>
                                         </li>
                                     ))
                                 }
                             </ul>
-            <div
-                className={ 'absolute bottom-0 w-full h-60 bg-yellow-500 p-12' }
-            >
-                <div className={ 'bg-blue-500 h-full w-full rounded-3xl backdrop-blur' }></div>
                         </div>
+
+
+                    </div>
+                </div>
+            </motion.div>
         </div>
     );
 }

frontend/components/ConstructionPlaceHolder.tsx

@@ -4,7 +4,7 @@ const ConstructionPlaceHolder = () => {
     return (
         <div className={ `flex h-full w-full justify-center items-center` }>
             <p className={ `text-2xl font-bold` }>
-                正在施工中...
+                * Under Construction *
             </p>
         </div>
     );

frontend/components/Footer.tsx

@@ -1,3 +1,5 @@
+'use client';
+
 import React from 'react';
 import Link from 'next/link';
 import { IoLogoGithub } from 'react-icons/io5';

frontend/next.config.mjs

@@ -8,7 +8,7 @@ const nextConfig = {
             },
             {
                 protocol: 'https',
-                hostname: 'pic.re'
+                hostname: 'cdn.jsdelivr.net'
             }
         ]
     },

frontend/package.json

@@ -11,8 +11,9 @@
   "dependencies": {
     "@nextui-org/react": "^2.4.6",
     "@types/react-syntax-highlighter": "^15.5.13",
+    "clsx": "^2.1.1",
     "lxgw-wenkai-webfont": "^1.7.0",
-    "motion": "^12.3.1",
+    "motion": "^12.23.12",
     "next": "^15.3.2",
     "next-themes": "^0.3.0",
     "react": "^18.3.1",
@@ -26,7 +27,9 @@
     "remark-frontmatter": "^5.0.0",
     "remark-gfm": "^4.0.0",
     "remark-toc": "^9.0.0",
-    "sharp": "^0.33.4"
+    "sharp": "^0.33.4",
+    "tailwind-merge": "^3.3.1",
+    "ts-pattern": "^5.8.0"
   },
   "devDependencies": {
     "@tailwindcss/typography": "^0.5.14",

frontend/src/api/blog/post.ts

@@ -1,10 +1,8 @@
 import { fetchNocturneJson } from '@/src/api/endpoint';
 
-const DEFAULT_PAGE_SIZE = 6;
+const DEFAULT_PAGE_SIZE = 8;
 
-export interface PostListResponse {
-    data: {
-        posts: {
+export interface Post {
     id: string,
     identifier: string,
     title: string,
@@ -14,7 +12,11 @@ export interface PostListResponse {
     date_created: Date,
     date_updated: Date | null,
     header_img: string | null
-        }[],
+}
+
+export interface PostListResponse {
+    data: {
+        posts: Post[],
         pagination: {
             page: number,
             page_count: number,
@@ -24,9 +26,26 @@ export interface PostListResponse {
     status: string
 }
 
+interface FetchPostListParams {
+    page: number;
+    page_size?: number;
+    tag_filter?: string[];
+    match_all?: boolean;
+}
 
-export async function fetchPostList(page: number, page_size: number = DEFAULT_PAGE_SIZE): Promise<PostListResponse> {
-    const url = `/blog/posts?page=${ page }&page_size=${ page_size }`;
+export async function fetchPostList({
+        page,
+        page_size = DEFAULT_PAGE_SIZE,
+        tag_filter = [],
+        match_all = false
+    }: FetchPostListParams
+): Promise<PostListResponse> {
+    const pagination_string = `page=${ page }&page_size=${ page_size }`;
+    const tag_filter_string = tag_filter.length != 0
+        ? `&tags=${ tag_filter.join(',') }&match_all=${ match_all }`
+        : '';
+
+    const url = `/blog/posts?${ pagination_string }${ tag_filter_string }`;
     return await fetchNocturneJson(url);
 }
 

frontend/src/constants.ts

@@ -1,4 +1,4 @@
 export const SITE_CONFIG = {
     name: 'Atelier Lumiaethor',
-    desc: ''
+    desc: 'In pursuit of absolute simplicity and ultimate sophistication'
 };

frontend/src/utils.ts

@@ -0,0 +1,6 @@
+import { ClassValue, clsx } from 'clsx';
+import { twMerge } from 'tailwind-merge';
+
+export function cn(...inputs: ClassValue[]) {
+    return twMerge(clsx(inputs));
+}

gateway/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gateway"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]

gateway/src/main.rs

@@ -1,3 +1 @@
-fn main() {
-    println!("Hello, world!");
-}
+fn main() {}

migration/migration.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+set -e
+
+PGPASSFILE="/root/.pgpass"
+echo "postgres:5432:${POSTGRES_DB}:${POSTGRES_USER}:${POSTGRES_PASSWORD}" > "$PGPASSFILE"
+chmod 600 "$PGPASSFILE"
+
+echo "waiting for postgres"
+until pg_isready -h postgres -U "$POSTGRES_USER" -d "$POSTGRES_DB"; do
+   echo "retrying, sleep 2s"
+   sleep 2
+done
+echo "db ready, running migrations"
+for file in /migrations/*.sql; do
+  echo "applying $file"
+  psql -h postgres -U "$POSTGRES_USER" -d "$POSTGRES_DB" -f "$file"
+done
+echo "migration complete"

prod.compose.yaml

@@ -7,14 +7,14 @@ services:
       dockerfile: ../container/release/frontend.containerfile
     restart: always
     ports:
-      - "3000:3000"
+      - "0.0.0.0:3000:3000"
     env_file:
       - ./.env
 
 
   backend:
     depends_on:
-      - postgres
+      - migrate
     build:
       context: ./backend
       dockerfile: ../container/release/backend.containerfile
@@ -22,17 +22,39 @@ services:
         ARCH: ${ARCH}
     restart: always
     ports:
-      - "3001:3001"
+      - "0.0.0.0:3001:3001"
     env_file:
       - ./.env
       - ./.env.local
     dns:
       - 1.1.1.1
 
+
+  migrate:
+    image: postgres:17
+    depends_on:
       postgres:
-    image: postgres:16.3
+        condition: service_healthy
+    env_file:
+      - ./.env
+      - ./.env.local
+    volumes:
+      - ./migration/ddl:/migrations:ro
+      - ./migration/migration.sh:/migration.sh:ro
+    entrypoint: [ "/bin/sh", "/migration.sh" ]
+
+
+  postgres:
+    image: postgres:17
     ports:
       - "5432:5432"
     env_file:
       - ./.env
       - ./.env.local
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB" ]
+      interval: 5s
+      timeout: 3s
+      retries: 10
+      start_period: 5s
+    restart: always

prod.cr.compose.yaml

@@ -0,0 +1,54 @@
+services:
+  frontend:
+    depends_on:
+      - backend
+    image: cr.lmt.moe/nocturne/frontend:${TAG}
+    restart: always
+    ports:
+      - "0.0.0.0:3000:3000"
+    env_file:
+      - ./.env
+
+
+  backend:
+    depends_on:
+      - migrate
+    image: cr.lmt.moe/nocturne/backend:${TAG}
+    restart: always
+    ports:
+      - "0.0.0.0:3001:3001"
+    env_file:
+      - ./.env
+      - ./.env.local
+    dns:
+      - 1.1.1.1
+
+
+  migrate:
+    image: postgres:17
+    depends_on:
+      postgres:
+        condition: service_healthy
+    env_file:
+      - ./.env
+      - ./.env.local
+    volumes:
+      - ./migration/ddl:/migrations:ro
+      - ./migration/migration.sh:/migration.sh:ro
+    entrypoint: [ "/bin/sh", "/migration.sh" ]
+
+
+  postgres:
+    image: postgres:17
+    ports:
+      - "5432:5432"
+    env_file:
+      - ./.env
+      - ./.env.local
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB" ]
+      interval: 5s
+      timeout: 3s
+      retries: 10
+      start_period: 5s
+    restart: always