Skip to content

Commit 2885a34

Browse files
author
tkokhing
committed
Refactor src/lib to handle all else files & re-org for Multi-root workspace
1 parent 3bbefdd commit 2885a34

File tree

18 files changed

+44
-39
lines changed

18 files changed

+44
-39
lines changed

.github/workflows/nextjs.yml

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,29 @@ jobs:
2020
steps:
2121
- name: Checkout full branches
2222
uses: actions/checkout@v4
23+
- name: Checkout [tkokhing_lib] private repo
24+
uses: actions/checkout@v4
25+
with:
26+
repository: tkokhing/tkokhing_lib
27+
token: ${{ secrets.PULL_LIB_TOKEN }}
28+
path: temp_lib
29+
- name: Copy and move [_data_exporter] folder to correct level
30+
id: move_setup_data_exporter
31+
run: |
32+
rm -rf src/lib/_data_exporter
33+
mv ./temp_lib/_data_exporter ./src/lib
34+
rm -rf ./temp_lib
2335
- name: Checkout [public] private repo
2436
uses: actions/checkout@v4
2537
with:
2638
repository: tkokhing/tkokhing_public
2739
token: ${{ secrets.PULL_SUB_FOLDERS_OF_PUBLIC_TOKEN }}
2840
path: temp_public
2941
- name: Copy and move [public] folder to correct level
30-
id: move_public_images_AND_setup_data_exporter
42+
id: move_public_images
3143
run: |
32-
echo "Present working directory --->:"
33-
pwd
34-
echo "ls ./ ----------------------->:"
35-
ls ./
3644
rm -rf public
3745
mkdir public
38-
mv ./temp_public/_data_exporter ./src/lib
3946
mv ./temp_public/* ./public
4047
rm -rf ./temp_public ./public/README.md
4148
- name: Checkout [frontier_post] private repo
@@ -47,12 +54,9 @@ jobs:
4754
- name: Move [_frontier] folder post to correct level
4855
id: move_frontier_post
4956
run: |
50-
echo "Present working directory---->: $(pwd)"
5157
mkdir -p _frontier_post/_frontier
5258
mv ./temp_frontier/_frontier/*.mdx ./_frontier_post/_frontier
5359
rm -rf ./temp_frontier
54-
echo "ls -lha ---->:"
55-
ls -lha .
5660
- name: Checkout [topic_post] private repo
5761
uses: actions/checkout@v4
5862
with:
@@ -62,12 +66,9 @@ jobs:
6266
- name: Move [_topics] folder post to correct level
6367
id: move_topics_post
6468
run: |
65-
echo "Present working directory---->: $(pwd)"
6669
mkdir -p _topic_post/_topics
6770
mv ./temp_topic/_topics/*.mdx ./_topic_post/_topics
6871
rm -rf ./temp_topic
69-
echo "ls -lha ---->:"
70-
ls -lha .
7172
- name: Checkout [blog_post] private repo
7273
uses: actions/checkout@v4
7374
with:
@@ -80,8 +81,6 @@ jobs:
8081
mkdir -p _blog_post/_blogs
8182
mv ./temp_blog/_blogs/*.mdx ./_blog_post/_blogs
8283
rm -rf ./temp_blog
83-
echo "ls -lha ---->:"
84-
ls -lha .
8584
- name: Checkout [linux_post] private repo
8685
uses: actions/checkout@v4
8786
with:
@@ -91,12 +90,9 @@ jobs:
9190
- name: Move [_linux] folder to correct level
9291
id: move_linux_post
9392
run: |
94-
echo "Present working directory---->: $(pwd)"
9593
mkdir -p _linux_post/_linux/
9694
mv ./temp_linux/_linux/*.mdx ./_linux_post/_linux/
9795
rm -rf ./temp_linux
98-
echo "ls -lha ---->:"
99-
ls -lha .
10096
- name: Verify PWD
10197
id: present-working-directory
10298
run: |
@@ -208,4 +204,4 @@ jobs:
208204
- name: Verify deployment url
209205
id: Verify-deployment-URL
210206
run: |
211-
echo "Deployment URL ---->: ${{ steps.deployment.outputs.page_url }}"
207+
echo "Deployment URL ---->: ${{ steps.deployment.outputs.page_url }}"

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
src/app/testerer/
1616
src/lib/_data_exporter/
1717
src/lib/.gitignore
18+
src/lib/README.md
1819

1920
# next.js
2021
/.next/

src/app/_components/main_frame/navi-bar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { Bars3Icon, BellIcon, XMarkIcon } from "@heroicons/react/24/outline";
77
import { HomeWithTextIcon, BlogWithTextIcon, TopicWithTextIcon, ResearchWithTextIcon } from "@/app/_components/main_frame/icons_svg";
88
import { ProfileLogoSVG } from "@/app/_components/main_frame/icons_svg";
99
import { useNavigation } from "@/app/_components/main_frame/navigation-context";
10-
import { TKOKHING_LOGO_SVG_URL } from "@/lib/constants";
10+
import { TKOKHING_LOGO_SVG_URL } from "@/lib/share/constants";
1111
import { ThemeSwitcher } from "@/app/_components/main_frame/theme-switcher";
1212
import FontSizeDropdown from "@/app/_components/main_frame/font-size-button";
1313

src/app/_components/post_gen/post-body.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { MDXRemote } from 'next-mdx-remote/rsc';
22
import rehypeSlug from 'rehype-slug';
33
import rehypeAutolinkHeadings from 'rehype-autolink-headings';
44
import remarkGfm from 'remark-gfm';
5-
import PostBodyClient from '@/app/_components/post_gen/post-body-client'; // 👈 import client wrapper
5+
import PostBodyClient from '@/app/_components/post_gen/post-body-client';
66

77
type Props = {
88
content: string;

src/app/_components/post_gen/post-list-concise.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// dual use for page.tsx and mdx
22

33
import Container from "@/app/_components/preference/container";
4-
import { getAllPosts } from "@/lib/api";
4+
import { getAllPosts } from "@/lib/share/api";
55
import { MoreStoriesConcise } from "@/app/_components/post_gen/more-stories-concise"
66
import { Suspense } from "react";
77

src/app/_components/preference/data-exporter.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
"use client";
44
import enFrontierData from '@/lib/_data_exporter/frontier_data_en.mdx';
55
import zhFrontierData from '@/lib/_data_exporter/frontier_data_zh.mdx';
6+
import enFrontierLeadinData from '@/lib/_data_exporter/frontier_leadin_en.mdx';
7+
import zhFrontierLeadinData from '@/lib/_data_exporter/frontier_leadin_zh.mdx';
68
import enCyberDomainData from '@/lib/_data_exporter/strategic_cyber_domains_en.mdx';
79
import zhCyberDomainData from '@/lib/_data_exporter/strategic_cyber_domains_zh.mdx';
810
import enCyberThreatsData from '@/lib/_data_exporter/cyber_threats_25_en.mdx';
@@ -16,6 +18,10 @@ export const FrontierData = () => {
1618
return <DisplayLanguageContent LanguageChoice={{ en: enFrontierData, zh: zhFrontierData }}/>
1719
};
1820

21+
export const FrontierLeadinData = () => {
22+
return <DisplayLanguageContent LanguageChoice={{ en: enFrontierLeadinData, zh: zhFrontierLeadinData }}/>
23+
};
24+
1925
export const CyberDomainData = () => {
2026
return <DisplayLanguageContent LanguageChoice={{ en: enCyberDomainData, zh: zhCyberDomainData }}/>
2127
};

src/app/blog/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// blog/post/ grid page
22
import Container from "@/app/_components/preference/container";
3-
import { getAllPosts } from "@/lib/api";
3+
import { getAllPosts } from "@/lib/share/api";
44
import { HeroPost } from "@/app/_components/post_gen/hero-post";
55
import { MoreStories } from "@/app/_components/post_gen/more-stories";
66

src/app/blog/posts/[slug]/page.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
// [tkokhing/blog_post/_blog_post/_blogs] MDX_FOLDER
22
import { Metadata } from "next";
33
import { notFound } from "next/navigation";
4-
import { getPostBySlug } from "@/lib/api";
5-
import { generatePageMetadata } from "@/lib/generatePageMetadata";
6-
import { generatePageStaticParams } from "@/lib/generatePageStaticParams";
4+
import { getPostBySlug } from "@/lib/share/api";
5+
import { generatePageMetadata } from "@/lib/share/generatePageMetadata";
6+
import { generatePageStaticParams } from "@/lib/share/generatePageStaticParams";
77
import Container from "@/app/_components/preference/container";
88
import { PostHeader } from "@/app/_components/post_gen/post-header";
99
import { PostBody } from "@/app/_components/post_gen/post-body";
1010
import { ToggleFrame } from "@/app/_components/preference/toggle-frame";
1111
import { FrontierData } from "@/app/_components/preference/data-exporter";
12+
import { FrontierLeadinData } from "@/app/_components/preference/data-exporter";
1213
import { PostListConcise } from "@/app/_components/post_gen/post-list-concise";
1314

1415
const MDX_FOLDER = "_blog_post/_blogs";
@@ -24,6 +25,7 @@ export default async function Post(props: Params) {
2425
const post = getPostBySlug(params.slug, MDX_FOLDER);
2526
const ImportComponents = {
2627
FrontierData,
28+
FrontierLeadinData,
2729
ToggleFrame,
2830
PostListConcise,
2931
};

src/app/blog/posts/securing-digital-frontiers/[slug]/page.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import { notFound } from "next/navigation";
44
import Container from "@/app/_components/preference/container";
55
import { PostHeader } from "@/app/_components/post_gen/post-header";
66
import { PostBody } from "@/app/_components/post_gen/post-body";
7-
import { getPostBySlug } from "@/lib/api";
8-
import { generatePageMetadata } from "@/lib/generatePageMetadata";
9-
import { generatePageStaticParams } from "@/lib/generatePageStaticParams";
7+
import { getPostBySlug } from "@/lib/share/api";
8+
import { generatePageMetadata } from "@/lib/share/generatePageMetadata";
9+
import { generatePageStaticParams } from "@/lib/share/generatePageStaticParams";
1010
import { CyberDomainData } from "@/app/_components/preference/data-exporter";
1111
import { BlueprintBattlefieldData } from "@/app/_components/preference/data-exporter";
1212
import { CyberThreatsData } from "@/app/_components/preference/data-exporter";

src/app/layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { NavigationProvider } from "@/app/_components/main_frame/navigation-cont
1111
import { FontSizeProvider } from "@/app/_components/main_frame/font-size-ctrl";
1212
import SubpageHeader from "@/app/_components/main_frame/subpage-header";
1313
import Footer from "@/app/_components/main_frame/footer";
14-
import { T_ANI_GIF_URL } from "@/lib/constants";
14+
import { T_ANI_GIF_URL } from "@/lib/share/constants";
1515

1616
const inter = Inter({ subsets: ["latin"] });
1717

0 commit comments

Comments
 (0)