From 97419bb2d9cad2a23c1713199c17e1cd3def562d Mon Sep 17 00:00:00 2001 From: Kalidou Diagne Date: Wed, 19 Mar 2025 15:45:57 +0000 Subject: [PATCH 01/20] feat: api setup --- apps/api/.gitignore | 33 ++ apps/api/package.json | 23 ++ apps/api/src/index.ts | 29 ++ apps/api/src/modules/me/me.controller.ts | 12 + apps/api/src/modules/me/me.routes.ts | 8 + apps/api/src/modules/me/me.service.ts | 13 + .../api/src/modules/posts/posts.controller.ts | 44 +++ apps/api/src/modules/posts/posts.routes.ts | 9 + apps/api/src/modules/posts/posts.service.ts | 13 + apps/api/tsconfig.json | 37 ++ apps/client/src/hooks/usePosts.ts | 11 +- apps/client/src/routes/_app/post/$postId.tsx | 11 +- apps/client/src/sections/App/PostItems.tsx | 48 +++ apps/client/src/sections/App/index.tsx | 43 +-- apps/client/src/sections/Post/PostAuthor.tsx | 10 +- apps/client/tsconfig.app.json | 1 + apps/client/tsconfig.json | 4 +- apps/shared/.gitignore | 7 + apps/shared/package.json | 17 + apps/shared/src/mocks/posts.mocks.ts | 339 ++++++++++++++++++ apps/shared/src/schemas/post.ts | 51 +++ tsconfig.json | 11 + 22 files changed, 719 insertions(+), 55 deletions(-) create mode 100644 apps/api/.gitignore create mode 100644 apps/api/package.json create mode 100644 apps/api/src/index.ts create mode 100644 apps/api/src/modules/me/me.controller.ts create mode 100644 apps/api/src/modules/me/me.routes.ts create mode 100644 apps/api/src/modules/me/me.service.ts create mode 100644 apps/api/src/modules/posts/posts.controller.ts create mode 100644 apps/api/src/modules/posts/posts.routes.ts create mode 100644 apps/api/src/modules/posts/posts.service.ts create mode 100644 apps/api/tsconfig.json create mode 100644 apps/client/src/sections/App/PostItems.tsx create mode 100644 apps/shared/.gitignore create mode 100644 apps/shared/package.json create mode 100644 apps/shared/src/mocks/posts.mocks.ts create mode 100644 apps/shared/src/schemas/post.ts create mode 100644 tsconfig.json diff --git a/apps/api/.gitignore b/apps/api/.gitignore new file mode 100644 index 0000000..344e917 --- /dev/null +++ b/apps/api/.gitignore @@ -0,0 +1,33 @@ +# Dependencies +node_modules/ +yarn.lock +package-lock.json + +# Build output +dist/ +build/ + +# Environment variables +.env +.env.local +.env.*.local + +# Logs +logs/ +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# IDE and editor files +.idea/ +.vscode/ +*.swp +*.swo +.DS_Store + +# TypeScript cache +*.tsbuildinfo + +# Test coverage +coverage/ \ No newline at end of file diff --git a/apps/api/package.json b/apps/api/package.json new file mode 100644 index 0000000..4ebf7fa --- /dev/null +++ b/apps/api/package.json @@ -0,0 +1,23 @@ +{ + "name": "api", + "version": "1.0.0", + "private": true, + "scripts": { + "dev": "ts-node-dev --respawn --transpile-only -r tsconfig-paths/register src/index.ts", + "build": "tsc", + "start": "node dist/index.js" + }, + "dependencies": { + "cors": "^2.8.5", + "express": "^4.18.2", + "zod": "^3.22.4" + }, + "devDependencies": { + "@types/cors": "^2.8.17", + "@types/express": "^4.17.21", + "@types/node": "^20.11.19", + "ts-node-dev": "^2.0.0", + "tsconfig-paths": "^4.2.0", + "typescript": "^5.3.3" + } +} \ No newline at end of file diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts new file mode 100644 index 0000000..e753241 --- /dev/null +++ b/apps/api/src/index.ts @@ -0,0 +1,29 @@ +import express from 'express'; +import cors from 'cors'; +import { postsRouter } from './modules/posts/posts.routes'; +import { meRouter } from './modules/me/me.routes'; + +const app = express(); +const PORT = process.env.PORT || 3001; + +// Middleware +app.use(cors()); +app.use(express.json()); + +app.get('/health', (req, res) => { + res.json({ status: 'ok' }); +}); + +// Routes +app.use('/api/posts', postsRouter); +app.use('/api/me', meRouter); + +// Error handling +app.use((err: Error, req: express.Request, res: express.Response, next: express.NextFunction) => { + console.error(err.stack); + res.status(500).json({ error: 'Something broke!' }); +}); + +app.listen(PORT, () => { + console.log(`🚀 Server running on http://localhost:${PORT}`); +}); \ No newline at end of file diff --git a/apps/api/src/modules/me/me.controller.ts b/apps/api/src/modules/me/me.controller.ts new file mode 100644 index 0000000..b7499e1 --- /dev/null +++ b/apps/api/src/modules/me/me.controller.ts @@ -0,0 +1,12 @@ +import { Request, Response } from 'express'; +import { getUser } from './me.service'; + +export async function getCurrentUser(req: Request, res: Response) { + try { + const user = await getUser(); + res.json(user); + } catch (error) { + console.error('Error fetching user:', error); + res.status(500).json({ error: 'Failed to fetch user data' }); + } +} \ No newline at end of file diff --git a/apps/api/src/modules/me/me.routes.ts b/apps/api/src/modules/me/me.routes.ts new file mode 100644 index 0000000..e129e50 --- /dev/null +++ b/apps/api/src/modules/me/me.routes.ts @@ -0,0 +1,8 @@ +import { Router } from 'express'; +import { getCurrentUser } from './me.controller'; + +const router = Router(); + +router.get('/', getCurrentUser); + +export { router as meRouter }; \ No newline at end of file diff --git a/apps/api/src/modules/me/me.service.ts b/apps/api/src/modules/me/me.service.ts new file mode 100644 index 0000000..1b68caf --- /dev/null +++ b/apps/api/src/modules/me/me.service.ts @@ -0,0 +1,13 @@ +const mockUser = { + id: "1", + username: "john_doe", + avatar: "https://github.com/shadcn.png", + badges: ["verified"], + isAnon: false, + email: "john@example.com", + createdAt: "2024-01-01T00:00:00Z" +}; + +export async function getUser() { + return mockUser; +} \ No newline at end of file diff --git a/apps/api/src/modules/posts/posts.controller.ts b/apps/api/src/modules/posts/posts.controller.ts new file mode 100644 index 0000000..c07164a --- /dev/null +++ b/apps/api/src/modules/posts/posts.controller.ts @@ -0,0 +1,44 @@ +import { Request, Response } from 'express'; +import { getPosts, getPost } from './posts.service'; +import { ZodError } from 'zod'; + +export async function getAllPosts(req: Request, res: Response) { + try { + const posts = await getPosts(); + res.json(posts); + } catch (error) { + console.error('Error fetching posts:', error); + res.status(500).json({ error: 'Failed to fetch posts' }); + } +} + +export async function getPostById(req: Request, res: Response) { + try { + const id = parseInt(req.params.id); + + if (isNaN(id) || id < 1) { + return res.status(400).json({ + error: 'Invalid post ID. Must be a positive number.' + }); + } + + const post = await getPost(id); + + if (!post) { + return res.status(404).json({ error: 'Post not found' }); + } + + res.json(post); + } catch (error) { + console.error('Error fetching post:', error); + + if (error instanceof ZodError) { + return res.status(400).json({ + error: 'Invalid post data', + details: error.issues + }); + } + + res.status(500).json({ error: 'Failed to fetch post' }); + } +} \ No newline at end of file diff --git a/apps/api/src/modules/posts/posts.routes.ts b/apps/api/src/modules/posts/posts.routes.ts new file mode 100644 index 0000000..daf7760 --- /dev/null +++ b/apps/api/src/modules/posts/posts.routes.ts @@ -0,0 +1,9 @@ +import { Router } from 'express'; +import { getAllPosts, getPostById } from './posts.controller'; + +const router = Router(); + +router.get('/', getAllPosts); +router.get('/:id', getPostById); + +export { router as postsRouter }; \ No newline at end of file diff --git a/apps/api/src/modules/posts/posts.service.ts b/apps/api/src/modules/posts/posts.service.ts new file mode 100644 index 0000000..82c36ed --- /dev/null +++ b/apps/api/src/modules/posts/posts.service.ts @@ -0,0 +1,13 @@ +import { postMocks } from '@shared/mocks/posts.mocks'; +import { schemaPost, type PostSchema } from '@shared/schemas/post'; + +export async function getPosts(): Promise { + return postMocks; +} + +export async function getPost(id: number): Promise { + const post = postMocks.find(p => p.id === id); + if (!post) return undefined; + + return schemaPost.parse(post); +} \ No newline at end of file diff --git a/apps/api/tsconfig.json b/apps/api/tsconfig.json new file mode 100644 index 0000000..285a92f --- /dev/null +++ b/apps/api/tsconfig.json @@ -0,0 +1,37 @@ +{ + "compilerOptions": { + "target": "es2020", + "module": "commonjs", + "lib": ["es2020"], + "outDir": "./dist", + "rootDir": "../..", + "strict": true, + "esModuleInterop": true, + "skipLibCheck": true, + "forceConsistentCasingInFileNames": true, + "moduleResolution": "node", + "resolveJsonModule": true, + "baseUrl": "../..", + "paths": { + "@/*": ["apps/api/src/*"], + "@shared/*": ["apps/shared/src/*"] + }, + "composite": true, + "declaration": true, + "declarationMap": true, + "sourceMap": true + }, + "include": [ + "src/**/*", + "../shared/src/**/*" + ], + "exclude": [ + "node_modules", + "dist" + ], + "references": [ + { + "path": "../shared" + } + ] +} \ No newline at end of file diff --git a/apps/client/src/hooks/usePosts.ts b/apps/client/src/hooks/usePosts.ts index 4044932..6ffc4e6 100644 --- a/apps/client/src/hooks/usePosts.ts +++ b/apps/client/src/hooks/usePosts.ts @@ -1,13 +1,20 @@ import { useMutation, useQuery } from "@tanstack/react-query" -import { postMocks } from "mocks/postMocks" import { useStorage } from "./useStorage" import { LOCAL_STORAGE_KEYS } from "@/lib/config" +import { PostSchema } from "@/shared/schemas/post" + +export const useGetPosts = () => { + return useQuery({ + queryKey: ["getPosts"], + queryFn: (): Promise => fetch("http://localhost:3001/api/posts").then((res) => res.json()), + }); +}; export const useGetPostById = (postId: number) => { return useQuery({ queryKey: ["post.read", postId], queryFn: () => { - const postById = postMocks.find((post) => post?.id === postId) + const postById = fetch(`http://localhost:3001/api/posts/${postId}`).then((res) => res.json()) if (!postById) { throw new Error("Post not found") } diff --git a/apps/client/src/routes/_app/post/$postId.tsx b/apps/client/src/routes/_app/post/$postId.tsx index 87301ae..2260445 100644 --- a/apps/client/src/routes/_app/post/$postId.tsx +++ b/apps/client/src/routes/_app/post/$postId.tsx @@ -24,7 +24,6 @@ import { Button } from "@/components/ui/Button"; import { AuthWrapper } from "@/components/AuthWrapper"; export const Route = createFileRoute("/_app/post/$postId")({ component: PostPage, - //loader: async ({ params: { postId } }) => rspc.query(["post.read", Number.parseInt(postId)]), loader: async ({ params: { postId } }) => { return { postId: Number.parseInt(postId), @@ -37,10 +36,10 @@ function PostPage() { const { user } = useGlobalContext(); const [replyTo, setReplyTo] = useState(null); - const form = useForm(); - const { data: postData } = useGetPostById(postId); + const form = useForm(); + if (!postData) { return
Post not found
; } @@ -54,7 +53,7 @@ function PostPage() { header={
@@ -88,11 +87,11 @@ function PostPage() { />
- {postData.replies?.map((reply, index) => { + {postData?.replies?.map((reply: any, index: any) => { return (
diff --git a/apps/client/src/sections/App/PostItems.tsx b/apps/client/src/sections/App/PostItems.tsx new file mode 100644 index 0000000..595a4f4 --- /dev/null +++ b/apps/client/src/sections/App/PostItems.tsx @@ -0,0 +1,48 @@ +import { useGetPosts } from "@/hooks/usePosts"; +import { TimeSince } from "@/components/ui/TimeSince"; +import { MessageSquareIcon } from "lucide-react"; +import { PostAuthor } from "../Post/PostAuthor"; +import { PostCard } from "../Post/PostCard"; +import { User as UserGroupIcon } from "lucide-react"; +import { Tag } from "@/components/ui/Tag"; + +export const PostItems = () => { + const { data: posts = [], isLoading } = useGetPosts(); + + return ( +
+ {posts?.map((post, index) => { + return ( +
+ +
+ + + {post.group} + +
+ +
+ } + key={index} + title={post.title} + postId={post.id} + withHover + > + +
+ + + {post.replies.length} + +
+ +
+ ); + })} +
+ ); +}; diff --git a/apps/client/src/sections/App/index.tsx b/apps/client/src/sections/App/index.tsx index 632272d..d06572b 100644 --- a/apps/client/src/sections/App/index.tsx +++ b/apps/client/src/sections/App/index.tsx @@ -1,15 +1,9 @@ import { PageContent } from "@/components/PageContent"; import { PlusIcon } from "lucide-react"; -import { postMocks } from "mocks/postMocks"; import { Button } from "@/components/ui/Button"; -import { PostAuthor } from "@/sections/Post/PostAuthor"; -import { PostCard } from "@/sections/Post/PostCard"; import { Link } from "@tanstack/react-router"; -import { Users as UserGroupIcon } from "lucide-react"; -import { TimeSince } from "@/components/ui/TimeSince"; import { AuthWrapper } from "@/components/AuthWrapper"; -import { Tag } from "@/components/ui/Tag"; -import { MessageSquare as MessageSquareIcon } from "lucide-react"; +import { PostItems } from "./PostItems"; export const HomePage = () => { return ( @@ -25,40 +19,7 @@ export const HomePage = () => {
-
- {postMocks?.map((post, index) => { - return ( -
- -
- - - {post.group} - -
- -
- } - key={index} - title={post.title} - postId={post.id} - withHover - > - -
- - - {post.replies.length} - -
- -
- ); - })} - + ); }; diff --git a/apps/client/src/sections/Post/PostAuthor.tsx b/apps/client/src/sections/Post/PostAuthor.tsx index a058863..d494fde 100644 --- a/apps/client/src/sections/Post/PostAuthor.tsx +++ b/apps/client/src/sections/Post/PostAuthor.tsx @@ -1,10 +1,10 @@ import { Avatar } from "@/components/Avatar"; import { TimeSince } from "@/components/ui/TimeSince"; -import { Users as UserGroupIcon } from "lucide-react"; +import { AuthorSchema } from "@/shared/schemas/post"; import { ReactNode } from "react"; interface PostAuthorProps { - username: string; + author: AuthorSchema; createdAt?: string; titleSize?: "sm" | "lg"; badges?: { @@ -15,7 +15,7 @@ interface PostAuthorProps { } export const PostAuthor = ({ - username, + author, createdAt, avatarClassName, badges = [], @@ -26,10 +26,10 @@ export const PostAuthor = ({ size="sm" hasRandomBackground className={avatarClassName} - username={username} + username={author.username} /> - {username} + {author.username} {badges?.length > 0 && ( <> diff --git a/apps/client/tsconfig.app.json b/apps/client/tsconfig.app.json index 9441bf8..d743044 100644 --- a/apps/client/tsconfig.app.json +++ b/apps/client/tsconfig.app.json @@ -16,6 +16,7 @@ "@/state/*": ["state/*"], "@/contexts/*": ["contexts/*"], "@/sections/*": ["sections/*"], + "@/shared/*": ["../../shared/src/*"] }, /* Bundler mode */ diff --git a/apps/client/tsconfig.json b/apps/client/tsconfig.json index 9d9abd7..fc2ce34 100644 --- a/apps/client/tsconfig.json +++ b/apps/client/tsconfig.json @@ -2,7 +2,8 @@ "files": [], "references": [ { "path": "./tsconfig.app.json" }, - { "path": "./tsconfig.node.json" } + { "path": "./tsconfig.node.json" }, + { "path": "../shared" } ], "compilerOptions": { "baseUrl": "src", @@ -16,6 +17,7 @@ "@/state/*": ["state/*"], "@/contexts/*": ["contexts/*"], "@/sections/*": ["sections/*"], + "@/shared/*": ["../../shared/src/*"] } } } diff --git a/apps/shared/.gitignore b/apps/shared/.gitignore new file mode 100644 index 0000000..0c6c09c --- /dev/null +++ b/apps/shared/.gitignore @@ -0,0 +1,7 @@ +/dist +/node_modules +/target +/bun.lockb +/bunfig.toml +/tsconfig.json +/tsconfig.node.json \ No newline at end of file diff --git a/apps/shared/package.json b/apps/shared/package.json new file mode 100644 index 0000000..601fa26 --- /dev/null +++ b/apps/shared/package.json @@ -0,0 +1,17 @@ +{ + "name": "shared", + "version": "1.0.0", + "private": true, + "main": "dist/index.js", + "types": "dist/index.d.ts", + "scripts": { + "build": "tsc", + "dev": "tsc -w" + }, + "dependencies": { + "zod": "^3.22.4" + }, + "devDependencies": { + "typescript": "^5.3.3" + } +} \ No newline at end of file diff --git a/apps/shared/src/mocks/posts.mocks.ts b/apps/shared/src/mocks/posts.mocks.ts new file mode 100644 index 0000000..c493525 --- /dev/null +++ b/apps/shared/src/mocks/posts.mocks.ts @@ -0,0 +1,339 @@ +import { Mail as MailIcon, User as PersonIcon } from 'lucide-react'; +import { PostSchema } from '../schemas/post'; + +const AVAILABLE_BADGES = [ + { + label: "@pse.dev", + icon: null, + tooltip: "Verified by", + }, + { + label: "@ethereum.org", + icon: null, + tooltip: "Verified by", + }, + { + label: "zksync.io", + icon: null, + tooltip: "Verified by", + }, + { + label: "+18 years old", + icon: null, + tooltip: "Verified by", + } +]; + +const LOREM_REPLIES = [ + `Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.`, + + `Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur? At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident.`, + + `Similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat.`, + + `Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem.`, + + `At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus.` +]; + +export const postMocks: PostSchema[] = [ + { + id: 1, + title: "Security Challenges in Multi-party Applications", + content: `Security in multi-party applications faces key challenges: trust assumptions, scalability trade-offs, and real-world attack surfaces. While cryptographic tools like MPC and ZKPs help, key management and usability remain weak points.`, + author: { + username: "crypto_expert", + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[0], AVAILABLE_BADGES[1]], + isAnon: false, + }, + group: "PSE", + createdAt: "2024-03-10T10:00:00Z", + totalViews: 1205, + replies: [ + { + id: 101, + author: { + username: "security_researcher", + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[2]], + isAnon: false, + }, + content: LOREM_REPLIES[0], + createdAt: "2024-03-10T11:30:00Z", + replies: [ + { + author: { + username: null, + avatar: "", + badges: [AVAILABLE_BADGES[2]], + isAnon: true, + }, + id: 1011, + content: LOREM_REPLIES[0], + + } + ] + }, + { + id: 102, + author: { + username: "crypto_analyst", + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[1]], + isAnon: false, + }, + content: LOREM_REPLIES[1], + createdAt: "2024-03-10T12:30:00Z", + }, + { + id: 103, + author: { + username: "privacy_expert", + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[0]], + isAnon: false, + }, + content: LOREM_REPLIES[2], + createdAt: "2024-03-10T13:30:00Z", + } + ], + isAnon: false, + }, + { + id: 2, + title: "Zero Knowledge Proofs: A Comprehensive Guide", + content: `Understanding ZKPs from first principles. This guide covers the basics to advanced implementations...`, + author: { + username: "zkp_master", + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[2]], + isAnon: false, + }, + group: "ZKP", + createdAt: "2024-03-09T15:00:00Z", + totalViews: 892, + replies: [ + { + id: 104, + author: { + username: "zkp_enthusiast", + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[2]], + isAnon: false, + }, + content: LOREM_REPLIES[3], + createdAt: "2024-03-09T16:00:00Z", + } + ], + isAnon: false, + }, + { + id: 3, + title: "Ethereum Layer 2 Scaling Solutions Compared", + content: `Detailed comparison of different L2 solutions including Optimistic Rollups, ZK Rollups, and Validiums...`, + author: { + username: "l2_researcher", + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[2]], + isAnon: false, + }, + group: "Scaling", + replies: [ + { + id: 105, + author: { + username: "l2_expert", + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[1]], + isAnon: false, + }, + content: LOREM_REPLIES[4], + createdAt: "2024-03-08T10:15:00Z", + }, + { + id: 106, + author: { + username: "scaling_researcher", + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[0]], + isAnon: false, + }, + content: LOREM_REPLIES[0], + createdAt: "2024-03-08T11:30:00Z", + } + ], + totalViews: 1567, + createdAt: "2024-03-08T09:15:00Z", + isAnon: false, + }, + { + id: 4, + title: "Privacy-Preserving Machine Learning", + content: `Exploring the intersection of ML and privacy-preserving techniques...`, + author: { + username: null, + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[3]], + isAnon: true, + }, + group: "Privacy", + replies: [], + totalViews: 445, + createdAt: "2024-03-07T14:20:00Z", + isAnon: true, + }, + { + id: 5, + title: "The Future of Decentralized Identity", + content: `Examining the evolution of DID standards and implementations...`, + author: { + username: "identity_expert", + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[0]], + isAnon: false, + }, + group: "Identity", + replies: [ + { + id: 107, + author: { + username: "identity_researcher", + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[2]], + isAnon: false, + }, + content: LOREM_REPLIES[1], + createdAt: "2024-03-06T12:30:00Z", + }, + { + id: 108, + author: { + username: "did_expert", + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[1]], + isAnon: false, + }, + content: LOREM_REPLIES[2], + createdAt: "2024-03-06T13:45:00Z", + }, + { + id: 109, + author: { + username: "web3_identity", + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[0]], + isAnon: false, + }, + content: LOREM_REPLIES[3], + createdAt: "2024-03-06T14:30:00Z", + }, + { + id: 110, + author: { + username: null, + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[3]], + isAnon: true, + }, + content: LOREM_REPLIES[4], + createdAt: "2024-03-06T15:15:00Z", + } + ], + totalViews: 789, + createdAt: "2024-03-06T11:30:00Z", + isAnon: false, + }, + { + id: 6, + title: "Smart Contract Security Best Practices", + content: `Essential security considerations for smart contract development...`, + author: { + username: "smart_contract_dev", + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[0]], + isAnon: false, + }, + group: "Security", + replies: [], + totalViews: 2341, + createdAt: "2024-03-05T16:45:00Z", + isAnon: false, + }, + { + id: 7, + title: "Cross-Chain Bridge Security", + content: `Analysis of recent bridge hacks and security measures...`, + author: { + username: "bridge_security", + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[2]], + isAnon: false, + }, + group: "Security", + replies: [ + { + id: 102, + author: { + username: null, + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[4]], + isAnon: true, + }, + content: "Great analysis on recent exploits...", + createdAt: "2024-03-04T14:20:00Z", + } + ], + totalViews: 1123, + createdAt: "2024-03-04T13:20:00Z", + isAnon: false, + }, + { + id: 8, + title: "MEV Protection Strategies", + content: `Understanding and mitigating MEV in DeFi protocols...`, + author: { + username: "mev_researcher", + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[2]], + isAnon: false, + }, + group: "MEV", + replies: [], + totalViews: 567, + createdAt: "2024-03-03T10:10:00Z", + isAnon: false, + }, + { + id: 9, + title: "Quantum Resistance in Cryptography", + content: `Preparing cryptographic systems for the quantum era...`, + author: { + username: "quantum_crypto", + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[2]], + isAnon: false, + }, + group: "Cryptography", + replies: [], + totalViews: 890, + createdAt: "2024-03-02T09:30:00Z", + isAnon: false, + }, + { + id: 10, + title: "Account Abstraction Implementation", + content: `Step-by-step guide to implementing account abstraction...`, + author: { + username: "aa_developer", + avatar: "https://github.com/shadcn.png", + badges: [AVAILABLE_BADGES[1]], + isAnon: false, + }, + group: "Development", + replies: [], + totalViews: 1432, + createdAt: "2024-03-01T15:45:00Z", + isAnon: false, + }, +] diff --git a/apps/shared/src/schemas/post.ts b/apps/shared/src/schemas/post.ts new file mode 100644 index 0000000..3ae008d --- /dev/null +++ b/apps/shared/src/schemas/post.ts @@ -0,0 +1,51 @@ +import { z } from "zod" + +const badgeSchema = z.object({ + label: z.string(), + icon: z.any().optional(), + tooltip: z.string().optional(), +}) + +const authorSchema = z + .object({ + username: z.string().nullable(), + avatar: z.string(), + isAnon: z.boolean().optional(), + badges: z.array(badgeSchema), + }) + .refine( + (data) => (data.isAnon ? data.username === null : data.username !== null), + { + message: "Username must be null when isAnon is true.", + path: ["username"], + }, + ) + +const postReplySchema = z.object({ + id: z.number(), + content: z.string().optional(), + author: authorSchema, + createdAt: z.string().optional(), +}) + +export const schemaPost = z.object({ + id: z.number(), + title: z.string(), + content: z.string(), + group: z.string(), + replies: z.array( + postReplySchema.and( + z.object({ + replies: z.array(postReplySchema).optional(), + }), + ), + ), + author: authorSchema, + createdAt: z.string().optional(), + totalViews: z.number().optional(), + isAnon: z.boolean().optional().default(false), +}) + +export type PostSchema = z.infer +export type AuthorSchema = z.infer +export type BadgeSchema = z.infer diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..0ee8402 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,11 @@ +{ + "files": [], + "references": [ + { + "path": "apps/shared" + }, + { + "path": "apps/api" + } + ] +} \ No newline at end of file From 782ae4a342c28fc7b14b6e14bc189ad403e2d56e Mon Sep 17 00:00:00 2001 From: Kalidou Diagne Date: Thu, 20 Mar 2025 14:53:26 +0000 Subject: [PATCH 02/20] feat: node+express setup and FE progress --- .dockerignore | 5 + apps/api/Dockerfile | 13 ++ apps/api/src/index.ts | 2 + .../src/modules/badges/badges.controller.ts | 34 +++ apps/api/src/modules/badges/badges.routes.ts | 10 + apps/api/src/modules/badges/badges.service.ts | 14 ++ .../api/src/modules/posts/posts.controller.ts | 92 ++++++-- apps/api/src/modules/posts/posts.routes.ts | 4 +- apps/api/src/modules/posts/posts.service.ts | 74 +++++- apps/client/Dockerfile | 24 +- apps/client/src/components/Avatar.tsx | 8 + apps/client/src/components/Content.tsx | 4 +- apps/client/src/components/LeftSidebar.tsx | 163 +++++++------ apps/client/src/components/MainLayout.tsx | 7 +- .../src/components/RightSidebar/_Groups.tsx | 31 +-- apps/client/src/components/VersionDetail.tsx | 9 + apps/client/src/components/inputs/Switch.tsx | 38 +-- .../src/components/post/PostReplyTextarea.tsx | 145 ++++++++++++ apps/client/src/components/ui/EmojiButton.tsx | 66 ++++++ apps/client/src/components/ui/TimeSince.tsx | 5 +- apps/client/src/hooks/usePosts.ts | 72 ++++-- apps/client/src/mocks/badgesMocks.ts | 14 -- apps/client/src/mocks/postMocks.ts | 206 ---------------- apps/client/src/routes/_app/index.tsx | 1 + apps/client/src/routes/_app/post/$postId.tsx | 220 ++++++++---------- apps/client/src/sections/App/PostItems.tsx | 33 ++- .../sections/Communities/CommunityPage.tsx | 12 +- .../sections/Communities/_AllCommunities.tsx | 5 +- apps/client/src/sections/Post/PostAuthor.tsx | 43 ++-- apps/client/src/sections/Post/PostCard.tsx | 7 + apps/client/src/sections/Post/PostCreate.tsx | 16 +- apps/shared/package-lock.json | 41 ++++ apps/shared/src/mocks/badges.mocks.ts | 32 +++ .../src/mocks/community.mocks.ts} | 16 +- apps/shared/src/mocks/posts.mocks.ts | 38 +-- apps/shared/src/schemas/badge.schema.ts | 11 + .../src/schemas/{post.ts => post.schema.ts} | 27 ++- docker-compose.backup.yml | 133 +++++++++++ docker-compose.yml | 159 +++---------- 39 files changed, 1134 insertions(+), 700 deletions(-) create mode 100644 apps/api/Dockerfile create mode 100644 apps/api/src/modules/badges/badges.controller.ts create mode 100644 apps/api/src/modules/badges/badges.routes.ts create mode 100644 apps/api/src/modules/badges/badges.service.ts create mode 100644 apps/client/src/components/VersionDetail.tsx create mode 100644 apps/client/src/components/post/PostReplyTextarea.tsx create mode 100644 apps/client/src/components/ui/EmojiButton.tsx delete mode 100644 apps/client/src/mocks/badgesMocks.ts delete mode 100644 apps/client/src/mocks/postMocks.ts create mode 100644 apps/shared/package-lock.json create mode 100644 apps/shared/src/mocks/badges.mocks.ts rename apps/{client/src/mocks/membershipMocks.ts => shared/src/mocks/community.mocks.ts} (55%) create mode 100644 apps/shared/src/schemas/badge.schema.ts rename apps/shared/src/schemas/{post.ts => post.schema.ts} (54%) create mode 100644 docker-compose.backup.yml diff --git a/.dockerignore b/.dockerignore index 4d57b5b..0276d52 100644 --- a/.dockerignore +++ b/.dockerignore @@ -11,8 +11,13 @@ bun.lockb bunfig.toml fly* node_modules +**/node_modules package.json README.md supabase target yarn.lock +.git +**/dist +**/.next +**/.turbo diff --git a/apps/api/Dockerfile b/apps/api/Dockerfile new file mode 100644 index 0000000..5010b66 --- /dev/null +++ b/apps/api/Dockerfile @@ -0,0 +1,13 @@ +FROM node:18-alpine + +WORKDIR /workspace/apps/api + +# Install dependencies +RUN apk add --no-cache bash + +# Copy package files +COPY package*.json ./ + +RUN npm install + +CMD ["npm", "run", "dev"] \ No newline at end of file diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts index e753241..cc38fec 100644 --- a/apps/api/src/index.ts +++ b/apps/api/src/index.ts @@ -2,6 +2,7 @@ import express from 'express'; import cors from 'cors'; import { postsRouter } from './modules/posts/posts.routes'; import { meRouter } from './modules/me/me.routes'; +import { badgesRouter } from './modules/badges/badges.routes'; const app = express(); const PORT = process.env.PORT || 3001; @@ -17,6 +18,7 @@ app.get('/health', (req, res) => { // Routes app.use('/api/posts', postsRouter); app.use('/api/me', meRouter); +app.use('/api/badges', badgesRouter); // Error handling app.use((err: Error, req: express.Request, res: express.Response, next: express.NextFunction) => { diff --git a/apps/api/src/modules/badges/badges.controller.ts b/apps/api/src/modules/badges/badges.controller.ts new file mode 100644 index 0000000..0c5c051 --- /dev/null +++ b/apps/api/src/modules/badges/badges.controller.ts @@ -0,0 +1,34 @@ +import { Request, Response } from "express"; +import { BadgesService } from "./badges.service"; + +export class BadgesController { + private badgesService: BadgesService; + + constructor() { + this.badgesService = new BadgesService(); + } + + getAllBadges = async (req: Request, res: Response) => { + try { + const badges = await this.badgesService.getAllBadges(); + return res.status(200).json(badges); + } catch (error) { + return res.status(500).json({ error: "Failed to fetch badges" }); + } + }; + + getBadgeById = async (req: Request, res: Response) => { + try { + const { id } = req.params; + const badge = await this.badgesService.getBadgeById(id); + + if (!badge) { + return res.status(404).json({ error: "Badge not found" }); + } + + return res.status(200).json(badge); + } catch (error) { + return res.status(500).json({ error: "Failed to fetch badge" }); + } + }; +} \ No newline at end of file diff --git a/apps/api/src/modules/badges/badges.routes.ts b/apps/api/src/modules/badges/badges.routes.ts new file mode 100644 index 0000000..7fab3d6 --- /dev/null +++ b/apps/api/src/modules/badges/badges.routes.ts @@ -0,0 +1,10 @@ +import { Router } from "express"; +import { BadgesController } from "./badges.controller"; + +const router = Router(); +const badgesController = new BadgesController(); + +router.get("/", badgesController.getAllBadges); +router.get("/:id", badgesController.getBadgeById); + +export { router as badgesRouter }; \ No newline at end of file diff --git a/apps/api/src/modules/badges/badges.service.ts b/apps/api/src/modules/badges/badges.service.ts new file mode 100644 index 0000000..66b79a8 --- /dev/null +++ b/apps/api/src/modules/badges/badges.service.ts @@ -0,0 +1,14 @@ +import { BadgeSchema } from "@shared/schemas/badge.schema"; +import { badgesMocks } from "@shared/mocks/badges.mocks"; + +export class BadgesService { + private badges: BadgeSchema[] = []; + + async getAllBadges(): Promise { + return badgesMocks; + } + + async getBadgeById(id: string): Promise { + return this.badges.find(badge => badge.id === id); + } +} \ No newline at end of file diff --git a/apps/api/src/modules/posts/posts.controller.ts b/apps/api/src/modules/posts/posts.controller.ts index c07164a..f02bcdc 100644 --- a/apps/api/src/modules/posts/posts.controller.ts +++ b/apps/api/src/modules/posts/posts.controller.ts @@ -1,44 +1,86 @@ -import { Request, Response } from 'express'; -import { getPosts, getPost } from './posts.service'; -import { ZodError } from 'zod'; +import { Request, Response } from "express" +import { ZodError } from "zod" +import { postReactionSchema } from "@shared/schemas/post.schema" +import { + findAllPosts, + findPostById, + addPostReaction, + removePostReaction, +} from "./posts.service" export async function getAllPosts(req: Request, res: Response) { try { - const posts = await getPosts(); - res.json(posts); + const posts = await findAllPosts() + return res.status(200).json(posts) } catch (error) { - console.error('Error fetching posts:', error); - res.status(500).json({ error: 'Failed to fetch posts' }); + return res.status(500).json({ error: "Failed to fetch posts" }) } } export async function getPostById(req: Request, res: Response) { try { - const id = parseInt(req.params.id); - - if (isNaN(id) || id < 1) { - return res.status(400).json({ - error: 'Invalid post ID. Must be a positive number.' - }); - } + const { id } = req.params + const post = await findPostById(id) - const post = await getPost(id); - if (!post) { - return res.status(404).json({ error: 'Post not found' }); + return res.status(404).json({ error: "Post not found" }) } - res.json(post); + return res.status(200).json(post) } catch (error) { - console.error('Error fetching post:', error); + return res.status(500).json({ error: "Failed to fetch post" }) + } +} + +export async function addReaction(req: Request, res: Response) { + try { + const { id } = req.params + + const validatedData = postReactionSchema.parse(req.body) + console.log("Request params:", req.params, req.body); + + const post = await addPostReaction( + id, + validatedData.emoji, + validatedData.userIds ?? [], + ) + + if (!post) { + return res.status(404).json({ error: "Post not found" }) + } + + return res.status(200).json(post) + } catch (error) { if (error instanceof ZodError) { - return res.status(400).json({ - error: 'Invalid post data', - details: error.issues - }); + return res.status(400).json({ + error: "Invalid reaction data", + details: error.errors, + }) + } + return res + .status(500) + .json({ error: "Failed to add reaction", details: error, post: req.body }) + } +} + +export async function removeReaction(req: Request, res: Response) { + try { + const { id, emoji } = req.params + const { userIds } = req.body + + if (!userIds) { + return res.status(400).json({ error: "userIds is required" }) } - res.status(500).json({ error: 'Failed to fetch post' }); + const post = await removePostReaction(id, emoji, userIds) + + if (!post) { + return res.status(404).json({ error: "Post not found" }) + } + + return res.status(200).json(post) + } catch (error) { + return res.status(500).json({ error: "Failed to remove reaction" }) } -} \ No newline at end of file +} diff --git a/apps/api/src/modules/posts/posts.routes.ts b/apps/api/src/modules/posts/posts.routes.ts index daf7760..8601b4b 100644 --- a/apps/api/src/modules/posts/posts.routes.ts +++ b/apps/api/src/modules/posts/posts.routes.ts @@ -1,9 +1,11 @@ import { Router } from 'express'; -import { getAllPosts, getPostById } from './posts.controller'; +import { getAllPosts, getPostById, addReaction, removeReaction } from './posts.controller'; const router = Router(); router.get('/', getAllPosts); router.get('/:id', getPostById); +router.post('/:id/reactions', addReaction); +router.delete('/:id/reactions/:emoji', removeReaction); export { router as postsRouter }; \ No newline at end of file diff --git a/apps/api/src/modules/posts/posts.service.ts b/apps/api/src/modules/posts/posts.service.ts index 82c36ed..abbba35 100644 --- a/apps/api/src/modules/posts/posts.service.ts +++ b/apps/api/src/modules/posts/posts.service.ts @@ -1,13 +1,67 @@ -import { postMocks } from '@shared/mocks/posts.mocks'; -import { schemaPost, type PostSchema } from '@shared/schemas/post'; +import { postMocks } from "@shared/mocks/posts.mocks" +import { PostSchema } from "@shared/schemas/post.schema" -export async function getPosts(): Promise { - return postMocks; +export async function findAllPosts(): Promise { + return postMocks } -export async function getPost(id: number): Promise { - const post = postMocks.find(p => p.id === id); - if (!post) return undefined; - - return schemaPost.parse(post); -} \ No newline at end of file +export async function findPostById( + id: string | number, +): Promise { + return postMocks.find((post) => Number(post.id) === Number(id)) +} + +export async function addPostReaction( + postId: string, + emoji: string, + userIds: string[], +): Promise { + const post = postMocks?.find((p) => Number(p.id) === Number(postId)) + if (!post) return undefined + + if (!post?.reactions?.[emoji]) { + post.reactions = { + ...post.reactions, + [emoji]: { + emoji, + count: 0, + userIds: [], + }, + } + } + + const reaction = post?.reactions?.[emoji] + + if (!reaction?.userIds?.some((id) => userIds.includes(id))) { + reaction.userIds?.push(...userIds) + } + reaction.count += userIds.length ?? 0 + + return post +} + +export async function removePostReaction( + postId: string, + emoji: string, + userIds: string[], +): Promise { + const post = postMocks?.find((p) => Number(p.id) === Number(postId)) + if (!post) return undefined + + const reaction = post?.reactions?.[emoji] + if (!reaction) return post + + // Remove user from reaction + const userIndex = reaction.userIds?.findIndex((id) => userIds.includes(id)) + if (userIndex) { + reaction.userIds?.splice(userIndex, 1) + reaction.count -= 1 + + // Remove reaction entirely if no users left + if (reaction.count === 0) { + delete post.reactions?.[emoji] + } + } + + return post +} diff --git a/apps/client/Dockerfile b/apps/client/Dockerfile index 95721d2..0ea19be 100644 --- a/apps/client/Dockerfile +++ b/apps/client/Dockerfile @@ -1,15 +1,9 @@ -FROM nginx:alpine AS base -WORKDIR /usr/share/nginx/html - -FROM oven/bun:latest AS builder -WORKDIR /app -COPY . . -COPY .env .env -RUN bun i --frozen-lockfile -RUN bun vite build - -FROM base AS runtime -RUN rm -fr ./* -COPY --from=builder /app/dist ./ -EXPOSE 80 -CMD ["nginx", "-g", "daemon off;"] +FROM node:18-alpine + +WORKDIR /workspace/apps/client + +COPY package*.json ./ + +RUN npm install + +CMD ["npm", "run", "dev"] diff --git a/apps/client/src/components/Avatar.tsx b/apps/client/src/components/Avatar.tsx index 01dfc91..d2de7b8 100644 --- a/apps/client/src/components/Avatar.tsx +++ b/apps/client/src/components/Avatar.tsx @@ -2,6 +2,8 @@ import { classed } from "@tw-classed/react"; import type { FC } from "react"; import * as AvatarPrimitive from "@radix-ui/react-avatar"; import { cn } from "@/lib/utils"; +import { LucideIcon } from "lucide-react"; + const RandomBackgroundColors = [ "bg-red-600", "bg-blue-600", @@ -50,6 +52,7 @@ type AvatarProps = React.ComponentProps & { username?: string | null; hasRandomBackground?: boolean; className?: string; + icon?: LucideIcon; }; export const Avatar: FC = ({ @@ -57,8 +60,12 @@ export const Avatar: FC = ({ username, hasRandomBackground, className, + children = null, + icon, ...props }) => { + + const Icon = icon; const fallbackBackground = hasRandomBackground && username ? RandomBackgroundColors[ @@ -70,6 +77,7 @@ export const Avatar: FC = ({ + {Icon && } ); }; diff --git a/apps/client/src/components/Content.tsx b/apps/client/src/components/Content.tsx index 5172cd6..0103f04 100644 --- a/apps/client/src/components/Content.tsx +++ b/apps/client/src/components/Content.tsx @@ -77,7 +77,7 @@ export const Content: FC<{ content: string }> = ({ content }) => { ), p: ({ children, className }) => ( -

+

{children}

), @@ -95,7 +95,7 @@ export const Content: FC<{ content: string }> = ({ content }) => { ), div: ({ children, className }) => ( -
+
{children}
), diff --git a/apps/client/src/components/LeftSidebar.tsx b/apps/client/src/components/LeftSidebar.tsx index 592b2ee..a9952ac 100644 --- a/apps/client/src/components/LeftSidebar.tsx +++ b/apps/client/src/components/LeftSidebar.tsx @@ -3,17 +3,24 @@ import { CreateGroup } from "@/components/CreateGroup"; import { Signout } from "@/components/Signout"; import { useAuth } from "@/hooks/useAuth"; import { useQuery } from "@/lib/rspc"; -import { Home as HomeIcon, LucideIcon, Users } from "lucide-react"; +import { + Home as HomeIcon, + LucideIcon, + SunIcon, + MoonIcon, + Users, +} from "lucide-react"; import { Button } from "@/components/ui/Button"; import { MAIN_NAV_ITEMS } from "settings"; import { cn } from "@/lib/utils"; import { Accordion } from "@/components/Accordion"; -import { membershipMocks } from "mocks/membershipMocks"; import { Avatar } from "@/components/Avatar"; import { Badge } from "@/components/ui/Badge"; -import { Switch } from "./inputs/Switch"; import { useGlobalContext } from "@/contexts/GlobalContext"; import { AuthWrapper } from "./AuthWrapper"; +import { Switch } from "./inputs/Switch"; +// import { communityMocks } from "@/shared/mocks/community.mocks"; + const renderNavItems = ( _items: (typeof MAIN_NAV_ITEMS)[keyof typeof MAIN_NAV_ITEMS], ) => @@ -35,26 +42,32 @@ const NavItem = ({ to, icon, badge, + onClick, }: { title: string; to: string; icon: LucideIcon; badge?: string; + onClick?: () => void; }) => { const Icon = icon; + const communityMocks = [] as any[]; return ( { + onClick?.(); + }} className={cn( "text-sm font-inter font-medium leading-5 text-base-muted-foreground cursor-pointer outline-none focus:outline-none focus:ring-0 focus:ring-offset-0", - "duration-200 hover:bg-muted hover:text-base-primary", + "duration-200 hover:bg-muted hover:text-base-primary hover:bg-base-muted", "flex items-center gap-2 rounded-md h-9 py-2 w-full p-2", )} >
- + {title}
{badge && ( @@ -80,7 +93,7 @@ const SidebarContent = () => { aria-label="Sidebar Navigation" className="flex flex-col divide-y-[1px] divide-sidebar-border" > -
+
{renderStartItems()} {auth?.mapSync(renderStartItems)} @@ -92,7 +105,7 @@ const SidebarContent = () => { label: "MY COMMUNITIES", children: (
- {membershipMocks.map(({ id, name, logo }) => ( + {communityMocks.map(({ id, name, logo }) => ( { enabled: auth?.isSome(), }); const { isDarkMode, setIsDarkMode } = useGlobalContext(); + const communityMocks = [] as any[]; return ( -
- ), - }, - ]} - /> - - {user !== undefined && ( -
-
- - My Groups -
- {user.memberships.map(([gid, name]) => ( - - - - ))} - +
+
+ + setIsDarkMode(!isDarkMode)} + /> +
- )} - -
- {renderEndItems()} + {renderEndItems()} {auth.mapSync(renderEndItems)}
diff --git a/apps/client/src/components/MainLayout.tsx b/apps/client/src/components/MainLayout.tsx index 7cd9f10..0853e28 100644 --- a/apps/client/src/components/MainLayout.tsx +++ b/apps/client/src/components/MainLayout.tsx @@ -5,6 +5,7 @@ import { useGlobalContext } from "@/contexts/GlobalContext"; import { cn } from "@/lib/utils"; import { useRouter } from "@tanstack/react-router"; import { useEffect } from "react"; +import { VersionDetail } from "./VersionDetail"; interface MainLayoutProps { children: React.ReactNode; showHeader?: boolean; @@ -28,6 +29,8 @@ export const MainLayout = ({ setIsMenuOpen(false); }, [pathname]); + const hasBothSidebars = showLeftSidebar && showRightSidebar; + return (
{showHeader &&
} @@ -36,16 +39,18 @@ export const MainLayout = ({ {children && (
{children} + {!hasBothSidebars && }
)} {showRightSidebar && (
+ {!hasBothSidebars && }
)} diff --git a/apps/client/src/components/RightSidebar/_Groups.tsx b/apps/client/src/components/RightSidebar/_Groups.tsx index 24ac863..8b2a473 100644 --- a/apps/client/src/components/RightSidebar/_Groups.tsx +++ b/apps/client/src/components/RightSidebar/_Groups.tsx @@ -2,42 +2,47 @@ import { Avatar } from "@/components/Avatar"; import { Button } from "@/components/ui/Button"; import { Card } from "@/components/cards/Card"; import { Link } from "@tanstack/react-router"; -import { membershipMocks } from "mocks/membershipMocks"; +// import { communityMocks } from "@/shared/mocks/community.mocks"; import { useState } from "react"; export const Groups = () => { const [showAllGroups, setShowAllGroups] = useState(false); - - const displayedGroups = showAllGroups - ? membershipMocks - : membershipMocks.slice(0, 3); + const communityMocks = [] as any[]; + const displayedGroups = showAllGroups + ? communityMocks + : communityMocks.slice(0, 3); return ( - - EXPLORE COMMUNITIES + + + EXPLORE COMMUNITIES +
{displayedGroups.map(({ name, id: iid }) => (
- {name} + + {name} +
- +
))}
- ); diff --git a/apps/client/src/components/VersionDetail.tsx b/apps/client/src/components/VersionDetail.tsx new file mode 100644 index 0000000..6025927 --- /dev/null +++ b/apps/client/src/components/VersionDetail.tsx @@ -0,0 +1,9 @@ +export const VersionDetail = () => { + return ( +
+
version: v0.7.6-rc.0
+
sha256: ad6209c17e...
+
commit:
+
+ ); +}; diff --git a/apps/client/src/components/inputs/Switch.tsx b/apps/client/src/components/inputs/Switch.tsx index 7d91368..6777479 100644 --- a/apps/client/src/components/inputs/Switch.tsx +++ b/apps/client/src/components/inputs/Switch.tsx @@ -16,7 +16,6 @@ export interface SwitchWrapperProps { tooltip?: string; } - const SwitchWrapper = ({ header, label, @@ -33,18 +32,20 @@ const SwitchWrapper = ({ {header &&
{header}
}
-
- {tooltip && ( - - - - )} - {label && ( - - {label} - - )} -
+ {(tooltip || label) && ( +
+ {tooltip && ( + + + + )} + {label && ( + + {label} + + )} +
+ )} {children}
@@ -71,10 +72,8 @@ const SwitchBase = classed.input( "bg-base-input", "[&:checked]:bg-base-primary", "after:absolute after:top-0.5 after:left-0.5 after:h-4 after:w-4 after:rounded-full after:bg-white after:shadow-md after:transition-transform after:duration-200 [&:checked]:after:translate-x-[16px]", - ); - interface SwitchProps extends Omit, "type">, SwitchWrapperProps { @@ -83,7 +82,10 @@ interface SwitchProps } const Switch = forwardRef( - ({ label, description, containerClassName, field, tooltip, ...props }, ref) => { + ( + { label, description, containerClassName, field, tooltip, ...props }, + ref, + ) => { const error = field?.state.meta.isTouched && field?.state.meta.errors.length ? field.state.meta.errors.join(", ") @@ -100,9 +102,9 @@ const Switch = forwardRef( ); - } + }, ); Switch.displayName = "Switch"; -export { Switch }; \ No newline at end of file +export { Switch }; diff --git a/apps/client/src/components/post/PostReplyTextarea.tsx b/apps/client/src/components/post/PostReplyTextarea.tsx new file mode 100644 index 0000000..ad99742 --- /dev/null +++ b/apps/client/src/components/post/PostReplyTextarea.tsx @@ -0,0 +1,145 @@ +import { Button } from "../ui/Button"; +import { Textarea } from "../inputs/Textarea"; +import { Select } from "../inputs/Select"; +import { Switch } from "../inputs/Switch"; +import { useForm } from "@tanstack/react-form"; +import { MailIcon, FileBadge } from "lucide-react"; +import { cn } from "@/lib/utils"; +import { useState } from "react"; +import { Tag } from "../ui/Tag"; +import { useGetBadges } from "@/hooks/usePosts"; +import { AuthorSchema } from "@/shared/schemas/post"; + + +interface PostReplyProps { + postId?: number | string; + author?: AuthorSchema; + onFocus?: () => void; + isVisible?: boolean; + showFields?: boolean; + placeholder?: string; + rows?: number; + onClick?: () => void; + onBlur?: () => void; +} + +export const PostReplyTextarea = ({ + author, + isVisible = false, + showFields = false, + placeholder = "Add comment", + rows = 4, + onClick, + onFocus, + onBlur, +}: PostReplyProps) => { + if (!isVisible) return null; + + const [selectedBadges, setSelectedBadges] = useState(null); + const form = useForm(); + + const { data: badges } = useGetBadges(); + + return ( +
+ -
-
-
-
- -
-
- -
-
-
-
- - -
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
-

{{"about"|l10n(page_data.lang)}} {{ "captcha"|l10n(page_data.lang) }}

-
- - - -
-
-
-
- -
-
- -
-
-
-
- - - - -
-
-
-
- -
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
- -
-
-
-
- {% match site_config.spam_regex %} - {% when Some(spam_regex) %} - - {% else %} - - {% endmatch %} -
-
-
-
- -
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
- - - -
-{% endblock %} \ No newline at end of file diff --git a/apps/freedit/templates/admin_gallery.html b/apps/freedit/templates/admin_gallery.html deleted file mode 100644 index 0950e7a..0000000 --- a/apps/freedit/templates/admin_gallery.html +++ /dev/null @@ -1,57 +0,0 @@ -{% extends "layout.html" %} {% block content %} -
-
- {% for img in imgs %} -
-
-

{{ "delete_permanently"|l10n(page_data.lang) }}

- × -

{{ "delete_sure"|l10n(page_data.lang) }}

-

- {{ "delete"|l10n(page_data.lang) }} -

- -
-
-
-
-

- -

- - {{ "delete"|l10n(page_data.lang) }} -
- {{img.2}} -
-
-
- {% endfor %} -
-
- -
- - -{% endblock %} diff --git a/apps/freedit/templates/admin_view.html b/apps/freedit/templates/admin_view.html deleted file mode 100644 index 401af32..0000000 --- a/apps/freedit/templates/admin_view.html +++ /dev/null @@ -1,35 +0,0 @@ -{% extends "layout.html" %} - -{% block content %} -
- {{tree_names.len()}} trees
- {% for i in tree_names %} - - {% if i == tree_name.as_str() %} - {{i}} - {% else %} - {{i}} - {% endif %} - - {% endfor %} -
-
-

Help: kv explain


- {% for i in ones %}

{{i}}


{% endfor %} -
-
- - -{% endblock %} \ No newline at end of file diff --git a/apps/freedit/templates/atom.xml b/apps/freedit/templates/atom.xml deleted file mode 100644 index be02b7c..0000000 --- a/apps/freedit/templates/atom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - {{ title }} - {{ domain }}/inn/{{ iid }} - {{ updated }} - - - {{ subtitle }} - {% for category in categories %} - - {% endfor %} - - {% for entry in entries %} - - {{ entry.title }} - {{ domain }}/inn/{{ entry.iid }}/{{ entry.pid }} - {{ entry.updated }} - - {{ entry.author.0 }} - {{ domain }}/user/{{ entry.author.1 }} - - - {{ entry.content|trim }} - - {% endfor %} - \ No newline at end of file diff --git a/apps/freedit/templates/error.html b/apps/freedit/templates/error.html deleted file mode 100644 index 0ac24ef..0000000 --- a/apps/freedit/templates/error.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "layout.html" %} {% block menu_right %} {% endblock %} {% block -content %} -
-
-

{{status}}

-

Error: {{error}}

-
-
- -
-{% endblock %} diff --git a/apps/freedit/templates/feed.html b/apps/freedit/templates/feed.html deleted file mode 100644 index e710a2c..0000000 --- a/apps/freedit/templates/feed.html +++ /dev/null @@ -1,162 +0,0 @@ -{% extends "layout.html" %} - -{% block content %} -
-
-
- -
-
-
- {% if active_feed != 0 %} - - {% if username.is_some() %} - - {% else %} - - {% endif %} - - {% else %} - - {% endif %} -
-
- -
- {% for item in items %} -
-
-
- {{item.title}} -
-
- {{item.updated}} - {{item.folder}} - {{item.feed_title}} -
-
-
- - {% include "icons/star.svg" %} - -
-
- {% endfor %} -
- - - -{% endblock %} - - -{% block aside %} - -
- -
- -{% match username %} {% when None %} -
- - {{ "refresh"|l10n(page_data.lang) }} Feeds - -
-{% else %}{% endmatch %} - -
- {% for folder in folders %} -
- {% match filter.as_deref() %} {% when Some(val) %} - {{folder.0}} - {% else %} - {{folder.0}} - {% endmatch %} - - -
- {% endfor %} -
- -{% endblock %} diff --git a/apps/freedit/templates/feed_add.html b/apps/freedit/templates/feed_add.html deleted file mode 100644 index 9757409..0000000 --- a/apps/freedit/templates/feed_add.html +++ /dev/null @@ -1,125 +0,0 @@ -{% extends "layout.html" %} {% block content %} -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
-
- {% for folder in folders %} - - {% endfor %} - -
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
-
- - -
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
- -
-{% endblock %} {% block aside %} {% match page_data.claim %} {% when Some with -(val) %} -
- - Feed - -
-{% else %}{% endmatch %} {% endblock %} diff --git a/apps/freedit/templates/feed_read.html b/apps/freedit/templates/feed_read.html deleted file mode 100644 index a807067..0000000 --- a/apps/freedit/templates/feed_read.html +++ /dev/null @@ -1,39 +0,0 @@ -{% extends "layout.html" %} {% block csp %} - -{% endblock %} {% block tabs %} -
  • Inn
    • -
  • Solo
    • -{% endblock %} {% block content %} -
    -
    -
    -

    {{item.title|truncate(100)}}

    -

    - 📅 {{item.updated}}    ⚓ {{item.feed_title}}    - 🌐 {{ "source"|l10n(page_data.lang) }} -    - 🖼️ {{ "load_image"|l10n(page_data.lang) }} -

    -
    -
    -
    - - {% include "icons/star.svg" %} - -
    -
    -
    - {{item.content}} -
    - -{% endblock %} diff --git a/apps/freedit/templates/gallery.html b/apps/freedit/templates/gallery.html deleted file mode 100644 index b64d7a1..0000000 --- a/apps/freedit/templates/gallery.html +++ /dev/null @@ -1,57 +0,0 @@ -{% extends "layout.html" %} {% block content %} -
    -
    -

    - -

    -
    -
    - {% for img in imgs %} -
    -
    -

    {{ "delete_permanently"|l10n(page_data.lang) }}

    - × -

    {{ "delete_sure"|l10n(page_data.lang) }}

    -

    - {{ "delete"|l10n(page_data.lang) }} -

    - -
    -
    -
    -
    - - {{ "delete"|l10n(page_data.lang) }} -
    - ![](/static/upload/{{img.1}}) -
    -
    -
    - {% endfor %} -
    -
    - -
    - - -{% endblock %} diff --git a/apps/freedit/templates/icons/feeds.svg b/apps/freedit/templates/icons/feeds.svg deleted file mode 100644 index 153d789..0000000 --- a/apps/freedit/templates/icons/feeds.svg +++ /dev/null @@ -1,5 +0,0 @@ - - Feeds - - - \ No newline at end of file diff --git a/apps/freedit/templates/icons/lock.svg b/apps/freedit/templates/icons/lock.svg deleted file mode 100644 index d2c475c..0000000 --- a/apps/freedit/templates/icons/lock.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/apps/freedit/templates/icons/lock_square.svg b/apps/freedit/templates/icons/lock_square.svg deleted file mode 100644 index 610b6af..0000000 --- a/apps/freedit/templates/icons/lock_square.svg +++ /dev/null @@ -1,5 +0,0 @@ - - Only you can see - - - \ No newline at end of file diff --git a/apps/freedit/templates/icons/mail.svg b/apps/freedit/templates/icons/mail.svg deleted file mode 100644 index 9ec4f45..0000000 --- a/apps/freedit/templates/icons/mail.svg +++ /dev/null @@ -1,5 +0,0 @@ - - Message - - - \ No newline at end of file diff --git a/apps/freedit/templates/icons/notification.svg b/apps/freedit/templates/icons/notification.svg deleted file mode 100644 index 1541fcf..0000000 --- a/apps/freedit/templates/icons/notification.svg +++ /dev/null @@ -1,5 +0,0 @@ - - Notification - - - \ No newline at end of file diff --git a/apps/freedit/templates/icons/rss.svg b/apps/freedit/templates/icons/rss.svg deleted file mode 100644 index 0491537..0000000 --- a/apps/freedit/templates/icons/rss.svg +++ /dev/null @@ -1,4 +0,0 @@ - - Rss - - \ No newline at end of file diff --git a/apps/freedit/templates/icons/setting.svg b/apps/freedit/templates/icons/setting.svg deleted file mode 100644 index 3c1bfca..0000000 --- a/apps/freedit/templates/icons/setting.svg +++ /dev/null @@ -1,5 +0,0 @@ - - Setting - - - \ No newline at end of file diff --git a/apps/freedit/templates/icons/signout.svg b/apps/freedit/templates/icons/signout.svg deleted file mode 100644 index 170ee9b..0000000 --- a/apps/freedit/templates/icons/signout.svg +++ /dev/null @@ -1,5 +0,0 @@ - - Sign out - - - \ No newline at end of file diff --git a/apps/freedit/templates/icons/star.svg b/apps/freedit/templates/icons/star.svg deleted file mode 100644 index 99519ab..0000000 --- a/apps/freedit/templates/icons/star.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/apps/freedit/templates/icons/user-plus.svg b/apps/freedit/templates/icons/user-plus.svg deleted file mode 100644 index 6b713c6..0000000 --- a/apps/freedit/templates/icons/user-plus.svg +++ /dev/null @@ -1,6 +0,0 @@ - - Follow - - - - \ No newline at end of file diff --git a/apps/freedit/templates/icons/user-xmark.svg b/apps/freedit/templates/icons/user-xmark.svg deleted file mode 100644 index 3e2c3d7..0000000 --- a/apps/freedit/templates/icons/user-xmark.svg +++ /dev/null @@ -1,6 +0,0 @@ - - Unfollow - - - - \ No newline at end of file diff --git a/apps/freedit/templates/inbox.html b/apps/freedit/templates/inbox.html deleted file mode 100644 index 2a29eb7..0000000 --- a/apps/freedit/templates/inbox.html +++ /dev/null @@ -1,163 +0,0 @@ -{% extends "layout.html" %} {% block csp %} - -{% endblock %} {% block content %} -
    -
    -

    - Decrypting e2ee message from {{sender_name}}. -

    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - -
    - -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - -
    - -
    -
    - -
    -{% endblock %} {% block extra %} - - - -{% endblock %} {% block aside %} -
    - - Generate key pairs - -
    -{% endblock %} diff --git a/apps/freedit/templates/inn.html b/apps/freedit/templates/inn.html deleted file mode 100644 index 145cb0e..0000000 --- a/apps/freedit/templates/inn.html +++ /dev/null @@ -1,379 +0,0 @@ -{% extends "layout.html" %} {% block og %} - -{% endblock %} {% block tabs %} -
  • Inn
    • -
  • Solo
    • -{% endblock %} {% block content %} -
    -
    -
    - -
    -
    -
    -
    - {% if iid > 0 %} {% if inn_role >= 4 %} - - - {% else if inn_role == 3 %} - - - {% else if inn_role == 2 %} - - {% else if inn_role == 1 %} - - {% else %} - - {% endif %} {% else %} - - {% endif %} -
    -
    -
    - -
    - {% for post in posts %} -
    -
    -
    -

    - -

    -
    -
    -
    -
    - - - {% if post.is_pinned %} 📌 {% endif %}{{post.title}} -
    -
    - {{post.inn_name}} - {{post.created_at}} - {% match post.last_reply %}{% when Some(user) %} - {{user.1}} - {% else %}{% endmatch %} -
    -
    -
    - {% if post.comment_count >0 %} - {{post.comment_count}} - {% endif %} -
    -
    - {% endfor %} -
    - - -{% endblock %} {% block box %} {% if iid > 0 %} -
    -
    -
    - -
    -
    -
    -
    -

    {{about}}

    -
    - -
    - {% if inn_role >= 4 %} - {{ "new"|l10n(page_data.lang) }} Post - {% else if inn_role == 3 %} - - {% else if inn_role == 2 %} - - {% else if inn_role == 1 %} - - {% else %} - {{ "join"|l10n(page_data.lang) }} - {% endif %} -
    -
    -
    -
    - {{ "description"|l10n(page_data.lang) }} -
    -
    - {{description}} -
    -
    -
    - -{% else %} -
    -
    - {{page_data.site_description}} -
    -
    -{% endif %} - -
    -
    -
    -
    - {{ "explore"|l10n(page_data.lang) }} ⚓ inns -
    -
    -
    - {% for inn in inns %} -
    -
    -
    - -
    -
    -
    -
    {{inn.1}}
    -
    - -
    - {% if inn.2 %} - - {% else %} - - {% endif %} -
    -
    - {% endfor %} -
    - -
    -
    -
    -
    - {{ "active"|l10n(page_data.lang) }} 👤 {{ "users"|l10n(page_data.lang) }} -
    -
    -
    -
    - {% for user in recommend_users %} -
    - -
    - {% endfor %} -
    -
    - -{% endblock %} diff --git a/apps/freedit/templates/inn_create.html b/apps/freedit/templates/inn_create.html deleted file mode 100644 index 6705e78..0000000 --- a/apps/freedit/templates/inn_create.html +++ /dev/null @@ -1,179 +0,0 @@ -{% extends "layout.html" %} {% block content %} -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - - - -
    -

    {{ "inn_type"|l10n(page_data.lang) }}

    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -

    {{ "early_birds_help"|l10n(page_data.lang) }}

    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -

    - {{ "limit_edit_seconds_help"|l10n(page_data.lang) }} -

    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - -
    -{% endblock %} diff --git a/apps/freedit/templates/inn_edit.html b/apps/freedit/templates/inn_edit.html deleted file mode 100644 index aba382f..0000000 --- a/apps/freedit/templates/inn_edit.html +++ /dev/null @@ -1,332 +0,0 @@ -{% extends "layout.html" %} {% block content %} -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -

    {{ "avatar_help"|l10n(page_data.lang) }}

    -
    - -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - {% if inn.inn_type == 0 %} - - - - {% else if inn.inn_type == 5 %} - - - - {% else if inn.inn_type == 20 %} - - - - {% else if inn.inn_type == 10 %} - - - {% else if inn.inn_type == 30 %} - - - {% endif %} -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -

    {{ "early_birds_help"|l10n(page_data.lang) }}

    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -

    - {{ "limit_edit_seconds_help"|l10n(page_data.lang) }} -

    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -

    {{ "inn_feed_help"|l10n(page_data.lang) }}

    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - {% for feed in inn_feeds %} -

    {{feed.title}}      {{feed.link}}

    - {% endfor %} -
    -
    -
    -
    -
    - -
    -{% endblock %} diff --git a/apps/freedit/templates/inn_list.html b/apps/freedit/templates/inn_list.html deleted file mode 100644 index 8b54779..0000000 --- a/apps/freedit/templates/inn_list.html +++ /dev/null @@ -1,144 +0,0 @@ -{% extends "layout.html" %} {% block tabs %} -
  • Inn
    • -
  • Solo
    • -{% endblock %} {% block content %} -
    -
    -
    - -
    -
    -
    - {% match page_data.claim %} {% when Some with (val) %} {% if val.role >= 100 - %} - - {% endif %} {% else %}{% endmatch %} -
    -
    - -
    - {% for inn in inns %} -
    -
    -
    - -
    -
    -
    -
    - {{inn.inn_name}} -
    -
    {{inn.about}}
    -
    - -
    - {% for topic in inn.topics %} - {{topic}} - {% endfor %} {% match filter.as_deref() %} {% when Some with ("mod") %} - Edit - {% when Some with ("joined") %} - {{ "exit"|l10n(page_data.lang) }} - {% else %}{% endmatch %} -
    -
    - {% endfor %} -
    - - - -{% endblock %} {% block box %} -
    -
    - {{page_data.site_description}} -
    -
    -{% endblock %} diff --git a/apps/freedit/templates/key.html b/apps/freedit/templates/key.html deleted file mode 100644 index e01d1ec..0000000 --- a/apps/freedit/templates/key.html +++ /dev/null @@ -1,167 +0,0 @@ -{% extends "layout.html" %} {% block csp %} - -{% endblock %} {% block content %} -
    -
    -

    Generate RSA Keys

    -
    -
    -

    Warning

    -
    -
    -

    - Your keys and data are kept confidential by running cryptography - operations in your browser using - Web Crypto API and JavaScript is left unminified so you can - verify page source. -

    -

    - The code is copied from: https://github.com/galehouse5/rsa-webcrypto-tool -

    -

    - You must keep Private Key yourself and upload public key. -

    -

    - You can generate key pair from rsa-webcrypto-tool and upload public key here. -

    -
    -
    - - -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -

    - Download private key -

    - -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -
    -

    - Only the last uploaded public key will be used. -

    -

    - Once clicked you will no longer see the private key. - Therefore, please make sure you have saved your private key. -

    - -
    -
    -
    -
    -
    -
    -
    -
    - -
    -{% endblock %} {% block extra %} - - - -{% endblock %} {% block aside %} {% endblock %} diff --git a/apps/freedit/templates/layout.html b/apps/freedit/templates/layout.html deleted file mode 100644 index 21cef17..0000000 --- a/apps/freedit/templates/layout.html +++ /dev/null @@ -1,186 +0,0 @@ - - - - {% block csp %} - - {% endblock %} - - - - - - {{ page_data.title }} - - - - - {% block og %} {% endblock %} - - - -
    - -
    - - {% block section %} -
    -
    -
    - {% block content %}{% endblock %} -
    - -
    -
    -
    - {% endblock %} - - - - - {% block extra %} {% endblock %} - diff --git a/apps/freedit/templates/message.html b/apps/freedit/templates/message.html deleted file mode 100644 index 06f835a..0000000 --- a/apps/freedit/templates/message.html +++ /dev/null @@ -1,222 +0,0 @@ -{% extends "layout.html" %} {% block csp %} - -{% endblock %} {% block content %} -
    -
    - {% match pub_key %} {% when Some(key) %} -

    - Sending e2ee message to {{receiver_name}} -

    - - - - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - - {% else %} -

    - Sending message to {{receiver_name}} -

    -
    -
    -

    Warning

    -
    -
    - {{receiver_name}} does not have a public key so you can't send an end to - end encrypted message. It's safe to transmit the message but site - administrators can read it. -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - {% endmatch %} -
    -
    - -
    -{% endblock %} {% block extra %} - - - -{% endblock %} {% block aside %} -
    - - Generate key pairs - -
    -{% endblock %} diff --git a/apps/freedit/templates/notification.html b/apps/freedit/templates/notification.html deleted file mode 100644 index 6928692..0000000 --- a/apps/freedit/templates/notification.html +++ /dev/null @@ -1,118 +0,0 @@ -{% extends "layout.html" %} {% block content %} -
    -
    -
    - ✔️ - ❌ -
    -
    - -
    - {% for inn_nt in inn_notifications %} -
    -
    -
    -

    - -

    -
    -
    -
    -
    - would like to join Inn {{inn_nt.iid}} -
    -
    -
    -
    -
    -
    -

    - - - -

    -
    - -
    -
    -
    -
    -
    -
    - {% endfor %} {% for nt in notifications %} -
    -
    -
    -

    - -

    -
    -
    -
    -
    - {{nt.content1}} - {% if nt.is_read %} {{nt.content2}} {% else %} - {{nt.content2}} - {% endif %} -
    -
    - -
    - {% if !nt.is_read %} - ✔️ - {% endif %} - ❌ -
    -
    - {% endfor %} -
    - -
    - - -{% endblock %} diff --git a/apps/freedit/templates/post.html b/apps/freedit/templates/post.html deleted file mode 100644 index 0da2e75..0000000 --- a/apps/freedit/templates/post.html +++ /dev/null @@ -1,238 +0,0 @@ -{% extends "layout.html" %} - -{% block csp %} - -{% endblock %} - -{% block tabs %} -
  • Inn
    • -
  • Solo
    • -{% endblock %} - -{% block og %} - - -{% endblock %} - -{% block content %} -
    -
    -
    -

    {% if post.is_pinned %} 📌 {% endif %}{{post.title}}

    - ⚓ {{post.inn_name}}    📅 {{post.created_at}}    - 👤 {{post.username}}    👁️ {{pageview}}    - {% if post.can_edit %} - {{ "edit"|l10n(page_data.lang) }}    - {% endif %} - - {% if is_mod %} - - {% match post.status.as_str() %} - {% when "LockedByMod" %} {{ "unlock"|l10n(page_data.lang) }} - {% else %} {{ "lock"|l10n(page_data.lang) }} - {% endmatch %} -    - - {% match post.status.as_str() %} - {% when "HiddenByMod" %} {{ "unhide"|l10n(page_data.lang) }} - {% else %} {{ "hide"|l10n(page_data.lang) }} - {% endmatch %} -    - - {% if post.is_pinned %} - {{ "unpin"|l10n(page_data.lang) }} - {% else %} - {{ "pin"|l10n(page_data.lang) }} - {% endif %} - - {% else if is_author %} - - {% match post.status.as_str() %} - {% when "LockedByUser" %} {{ "unlock"|l10n(page_data.lang) }} - {% when "Normal" %} {{ "lock"|l10n(page_data.lang) }} - {% else %}{% endmatch %} -    - - {% match post.status.as_str() %} - {% when "HiddenByUser" %} {{ "unhide"|l10n(page_data.lang) }} - {% when "Normal" %} {{ "hide"|l10n(page_data.lang) }} - {% when "LockedByUser" %} {{ "hide"|l10n(page_data.lang) }} - {% else %}{% endmatch %} - - {% endif %} -    - {% if can_delete %} - {{ "delete"|l10n(page_data.lang) }} -
    -
    -

    {{ "delete_permanently"|l10n(page_data.lang) }}

    - × -

    {{ "delete_sure"|l10n(page_data.lang) }}

    - {{ "delete"|l10n(page_data.lang) }} -
    -
    - {% endif %} -
    -
    -
    -
    -

    - {{post.username}} -

    -
    -
    -
    -
    - {{post.content_html}} - {% for tag in post.tags %} - 🏷️ {{tag}} - {% endfor %} -
    - -
    - -
    - -{% if comments.len() > 0 %} -
    - {% for comment in comments %} -
    -
    -

    - -

    -
    -
    -
    -

    - - {{comment.username}}    - {{comment.created_at}} - {% if comment.is_upvoted %} - 👍 {% if comment.upvotes >0 %} {{comment.upvotes}} {% endif %} - {% else %} - 👍 {% if comment.upvotes >0 %} {{comment.upvotes}} {% endif %} - {% endif %} - - {% if comment.is_downvoted %} - 👎 {% if comment.downvotes >0 %} {{comment.downvotes}} {% endif %} - {% else %} - 👎 {% if comment.downvotes >0 %} {{comment.downvotes}} {% endif %} - {% endif %} - - {% if comment.uid == post.uid %} - [op] - {% endif %} - - {% if is_mod %} - - {% if comment.is_hidden %} - Open - {% else %} - Hide - {% endif %} - - {% endif %} - - {% match page_data.claim %} {% when Some with (val) %} - {% if comment.uid == val.uid %} - Delete -

    -
    -

    Delete permanently?

    - × -

    Are you sure you want to delete this comment?

    - Delete -
    -
    - {% endif %} - {% else %}{% endmatch %} - -

    - {% if comment.is_hidden %} -

    Hidden by mod.

    - {% else %} - {{comment.content}} - {% endif %} -
    -
    -
    - {{comment.cid}} -
    -
    - {% endfor %} -
    -{% endif %} - -{% if post.status.as_str() != "Normal" %} -
    - {% include "icons/lock.svg" %} - {{post.status}} -
    -{% else %} -
    -
    -
    - -
    - -
    -
    - -
    -
    -{% endif %} - - - -{% endblock %} \ No newline at end of file diff --git a/apps/freedit/templates/post_create.html b/apps/freedit/templates/post_create.html deleted file mode 100644 index dc99d13..0000000 --- a/apps/freedit/templates/post_create.html +++ /dev/null @@ -1,86 +0,0 @@ -{% extends "layout.html" %} - -{% block content %} -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -

    - -

    -
    - -
    - - Save as draft -
    - -
    - - Delete draft -
    - - -
    -
    -
    -
    -
    -{% endblock %} - -{% block aside %} - -
    -
    -
    Drafts
    - {% for draft_title in draft_titles %} -

    {{draft_title}}

    - {% endfor %} -
    -
    - -{% endblock %} \ No newline at end of file diff --git a/apps/freedit/templates/post_edit.html b/apps/freedit/templates/post_edit.html deleted file mode 100644 index 1a27960..0000000 --- a/apps/freedit/templates/post_edit.html +++ /dev/null @@ -1,89 +0,0 @@ -{% extends "layout.html" %} {% block content %} -
    -
    -
    -
    - - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -

    - -

    -
    - - -
    -
    -
    -
    - -
    -{% endblock %} diff --git a/apps/freedit/templates/preview.html b/apps/freedit/templates/preview.html deleted file mode 100644 index da20c89..0000000 --- a/apps/freedit/templates/preview.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "layout.html" %} {% block csp %} - -{% endblock %} {% block content %} -
    -
    -
    - {{content}} -
    -
    -
    - -
    -{% endblock %} diff --git a/apps/freedit/templates/reset.html b/apps/freedit/templates/reset.html deleted file mode 100644 index 48b4df4..0000000 --- a/apps/freedit/templates/reset.html +++ /dev/null @@ -1,72 +0,0 @@ -{% extends "layout.html" %} - -{% block content %} -
    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - -{% endblock %} \ No newline at end of file diff --git a/apps/freedit/templates/search.html b/apps/freedit/templates/search.html deleted file mode 100644 index 2c225bb..0000000 --- a/apps/freedit/templates/search.html +++ /dev/null @@ -1,119 +0,0 @@ -{% extends "layout.html" %} - -{% block content %} - - -
    - -
    - {% for out in outs %} -
    - {% match out.uid %} {% when Some(uid) %} -
    -
    -

    -
    -
    - {% else %}{% endmatch %} -
    -
    - - {{out.title}} -
    -
    - {{out.date}} - {{out.ctype}} -
    -
    -
    - {% endfor %} -
    - -
    - - -{% endblock %} - -{% block aside %} -{% endblock %} \ No newline at end of file diff --git a/apps/freedit/templates/show_recovery.html b/apps/freedit/templates/show_recovery.html deleted file mode 100644 index b4476ee..0000000 --- a/apps/freedit/templates/show_recovery.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends "layout.html" %} {% block content %} -
    -
    -

    {{ "recovery_code"|l10n(page_data.lang) }}

    -
    -

    Note:

    -

    {{ "recovery_code_note"|l10n(page_data.lang) }}

    -

    {{ "recovery_code_last_valid"|l10n(page_data.lang) }}

    -
    -

    {{recovery_code}}

    -
    -

    {{ "recovery_code_privacy_note"|l10n(page_data.lang) }}

    -
    -
    - -
    -{% endblock %} diff --git a/apps/freedit/templates/signin.html b/apps/freedit/templates/signin.html deleted file mode 100644 index 9f8912f..0000000 --- a/apps/freedit/templates/signin.html +++ /dev/null @@ -1,80 +0,0 @@ -{% extends "layout.html" %} {% block section %} -
    -
    -
    -
    -
    -

    {{ "sign_in"|l10n(page_data.lang) }}

    -
    -
    -
    - - 👤 -
    -
    - -
    -
    - - 🔑 -
    -
    - -
    - -
    -
    - -
    -
    -
    - -
    -
    -
    - -
    -
    -

    - {{ "sign_up"|l10n(page_data.lang) }} -

    -

    - {{ "password_reset"|l10n(page_data.lang) }} -

    -
    -
    -
    -
    -
    -{% endblock %} diff --git a/apps/freedit/templates/signup.html b/apps/freedit/templates/signup.html deleted file mode 100644 index 2b7080e..0000000 --- a/apps/freedit/templates/signup.html +++ /dev/null @@ -1,121 +0,0 @@ -{% extends "layout.html" %} {% block csp %} - -{% endblock %} {% block section %} -
    -
    -
    -
    -
    -

    {{ "sign_up"|l10n(page_data.lang) }}

    -
    -
    -
    - - 👤 -
    -
    - -
    -
    - - 🔑 -
    -
    - -
    -
    - - 🔑 -
    -
    - -
    - captcha -
    - -
    -
    - -
    -
    - - - -
    -
    - -
    -
    - -
    -
    -
    - -
    -
    -

    -

    - {{ "already_have_account"|l10n(page_data.lang) }} {{ "sign_in"|l10n(page_data.lang) }} -
    -

    -
    -
    -
    -
    -
    -{% endblock %} diff --git a/apps/freedit/templates/solo.html b/apps/freedit/templates/solo.html deleted file mode 100644 index 42de1ca..0000000 --- a/apps/freedit/templates/solo.html +++ /dev/null @@ -1,227 +0,0 @@ -{% extends "layout.html" %} {% block csp %} - -{% endblock %} {% block tabs %} -
  • Inn
    • -
  • Solo
    • -{% endblock %} {% block content %} -
    -
    -
    - -
    -
    -
    -
    -
    -
    - -
    -
    -

    - -

    -
    -
    -
    -

    - {% match solo.reply_to %}{% when Some with (val) %} - Replying to {{val}} -
    - {% else %}{% endmatch %} - - {{solo.username}} - - {{solo.created_at}} -
    {{solo.content}} -

    -
    - -
    - -
    - {% if solo.solo_type == 20 %} {% include "icons/lock_square.svg" %} {% else - if solo.solo_type == 10 %} {% include "icons/lock.svg" %} {% else %}{% endif - %} -
    -
    - -{% for solo in reply_solos %} -
    -
    -

    - -

    -
    -
    -
    -

    - - {{solo.username}} - -
    - {{solo.created_at}} -
    {{solo.content}} -

    -
    - -
    -
    - {% if solo.solo_type == 20 %} {% include "icons/lock_square.svg" %} {% else - if solo.solo_type == 10 %} {% include "icons/lock.svg" %} {% else %}{% endif - %} -
    -
    -{% endfor %} {% match page_data.claim %} {% when Some with (claim) %} -
    -
    -

    - -

    -
    -
    -
    -
    -
    -

    - -

    -
    - -
    -
    - - -
    -
    -
    -
    -{% else %} {% endmatch %} - -
    - -{% endblock %} diff --git a/apps/freedit/templates/solo_list.html b/apps/freedit/templates/solo_list.html deleted file mode 100644 index 04eaf08..0000000 --- a/apps/freedit/templates/solo_list.html +++ /dev/null @@ -1,284 +0,0 @@ -{% extends "layout.html" %} {% block csp %} - -{% endblock %} {% block tabs %} -
  • Inn
    • -
  • Solo
    • -{% endblock %} {% block content %} -
    -
    -
    - -
    -
    -
    -
    - {% if is_following %} - - {% else %} {% match page_data.claim %} {% when Some with (val) %} {% if - uid > 0 && uid != val.uid %} - - {% endif %} {% else %}{% endmatch %} {% endif %} -
    -
    -
    - -{% match page_data.claim %} {% when Some with (claim) %} -
    -
    -

    - -

    -
    -
    -
    -
    -
    -

    - -

    -
    - -
    -
    - - -
    -
    -
    -
    -{% else %} {% endmatch %} {% for solo in solos %} -
    -
    -

    - -

    -
    -
    -
    -

    - {% match solo.reply_to %}{% when Some with (val) %} - Replying to {{val}} -
    - {% else %}{% endmatch %} - - {{solo.username}} - - {{solo.created_at}} -
    {{solo.content}} -

    -
    - -
    -
    - {% if solo.solo_type == 20 %} {% include "icons/lock_square.svg" %} {% else - if solo.solo_type == 10 %} {% include "icons/lock.svg" %} {% else %}{% endif - %} -
    -
    -{% endfor %} - - -{% endblock %} {% block box %} -
    -
    - {{page_data.site_description}} -
    -
    -{% endblock %} diff --git a/apps/freedit/templates/tag.html b/apps/freedit/templates/tag.html deleted file mode 100644 index c38f1af..0000000 --- a/apps/freedit/templates/tag.html +++ /dev/null @@ -1,77 +0,0 @@ -{% extends "layout.html" %} {% block tabs %} -
  • Inn
    • -
  • Solo
    • -{% endblock %} {% block content %} -
    -
    -
    - -
    -
    -
    - -
    - {% for post in posts %} -
    -
    -
    -

    - -

    -
    -
    -
    -
    - {{post.title}} -
    -
    - {{post.inn_name}} - {{post.created_at}} -
    -
    -
    - {% if post.comment_count >0 %} - {{post.comment_count}} - {% endif %} -
    -
    - {% endfor %} -
    - - - -{% endblock %} diff --git a/apps/freedit/templates/upload.html b/apps/freedit/templates/upload.html deleted file mode 100644 index 52e80a0..0000000 --- a/apps/freedit/templates/upload.html +++ /dev/null @@ -1,53 +0,0 @@ -{% extends "layout.html" %} {% block content %} - -
    - {{ "gallery"|l10n(page_data.lang) }} -
    - -
    -
    -
    -
    - -
    -

    {{ "upload_help"|l10n(page_data.lang) }}

    -
    - -
    -
    -
    -
    - -
    - {% for img in imgs %} -
    - -
    - ![](/static/upload/{{img}}) -
    -
    - {% endfor %} {% for img in imgs %} - ![](/static/upload/{{img}}) -
    - {% endfor %} -
    - -
    -{% endblock %} diff --git a/apps/freedit/templates/user.html b/apps/freedit/templates/user.html deleted file mode 100644 index ee61ff4..0000000 --- a/apps/freedit/templates/user.html +++ /dev/null @@ -1,141 +0,0 @@ -{% extends "layout.html" %} {% block content %} {% if !has_recovery_code %} -
    - -
    -{% endif %} - -
    -
    -

    - -

    -

    {{user.role_desc}}

    -

    uid: {{user.uid}}

    -
    -
    -
    -
    -
    -
    -

    {{user.username}}

    -
    -
    -
    -
    -
    - - - - {% include "icons/mail.svg" %} - - - - {% match has_followed %} {% when Some with (true) %} - - - - {% include "icons/user-xmark.svg" %} - - - - {% when Some with (false) %} - - - - {% include "icons/user-plus.svg" %} - - - - {% else %} {% match page_data.claim %}{% when Some with (val) %} {% if - val.uid == user.uid %} - - - - {% include "icons/setting.svg" %} - - - - - - - {% include "icons/signout.svg" %} - - - - {% endif %} {% else %}{% endmatch %} {% endmatch %} -
    -
    -
    -
    -

    {{ "created"|l10n(page_data.lang) }}: {{user.created_at}}

    -

    - {{ "url"|l10n(page_data.lang) }}: {{user.url}} -

    -

    {{ "about"|l10n(page_data.lang) }}: {{user.about}}

    -
    -
    -
    - -
    - -
    -
    - -{% endblock %} diff --git a/apps/freedit/templates/user_list.html b/apps/freedit/templates/user_list.html deleted file mode 100644 index ab26081..0000000 --- a/apps/freedit/templates/user_list.html +++ /dev/null @@ -1,197 +0,0 @@ -{% extends "layout.html" %} - -{% block content %} -
    -
    -
    - -
    -
    -
    - {% match filter.as_deref() %} {% when Some with ("inn") %} -
    -
    - -
    -
    -
    - {% if info.2 %} - {{ "pending"|l10n(page_data.lang) }} - {{ "rejected"|l10n(page_data.lang) }} - {% endif %} - {{ "limited"|l10n(page_data.lang) }} - {{ "intern"|l10n(page_data.lang) }} - {{ "fellow"|l10n(page_data.lang) }} - {{ "mod"|l10n(page_data.lang) }} - {{ "super"|l10n(page_data.lang) }} -
    - {{ "all"|l10n(page_data.lang) }} -
    -
    -
    - {% when None %} -
    -
    - -
    -
    -
    - {{ "admin"|l10n(page_data.lang) }} - {{ "senior"|l10n(page_data.lang) }} - {{ "standard"|l10n(page_data.lang) }} - {{ "banned"|l10n(page_data.lang) }} -
    - {{ "all"|l10n(page_data.lang) }} -
    -
    -
    - {% else %} -
    -

    - {{info.1}} -

    -
    - {% endmatch %} -
    -
    - -
    -{% for user in users %} -
    -
    -
    - -
    -
    -
    -
    {{user.username}}
    -
    {{user.about}}
    -
    -
    - {% if is_admin %} - {% match filter.as_deref() %} {% when Some with ("inn") %} -
    -
    -
    -

    - - - -

    -
    - -
    -
    -
    -
    - {% when None %} -
    -
    -
    -

    - - - -

    -
    - -
    -
    -
    -
    - {% else %} - {{user.role_desc}} - {% endmatch %} - {% else %} - {{user.role_desc}} - {% endif %} -
    -
    -{% endfor %} -
    - - -{% endblock %} \ No newline at end of file diff --git a/apps/freedit/templates/user_setting.html b/apps/freedit/templates/user_setting.html deleted file mode 100644 index 80dfb9d..0000000 --- a/apps/freedit/templates/user_setting.html +++ /dev/null @@ -1,232 +0,0 @@ -{% extends "layout.html" %} - -{% block content %} -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -

    {{ "avatar_help"|l10n(page_data.lang) }}

    -
    - -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -

    {{ "recovery_help"|l10n(page_data.lang) }}

    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - -
    -
    -

    {{ "sessions"|l10n(page_data.lang) }}

    - -
    -
    - -
    - -{% endblock %} \ No newline at end of file From ec1791917874deaaee86e47f49725ed6fa7e7218 Mon Sep 17 00:00:00 2001 From: Kalidou Diagne Date: Mon, 7 Apr 2025 15:26:55 +0300 Subject: [PATCH 19/20] feat: fix docker --- apps/api/Dockerfile | 3 ++- apps/api/entrypoint.sh | 22 +++++++++++----------- apps/client/Dockerfile | 10 +++++++++- apps/client/package.json | 2 +- apps/client/vite.config.ts | 29 +++++++++++++++++++++++++++-- docker-compose.yml | 10 ++++++++-- 6 files changed, 58 insertions(+), 18 deletions(-) diff --git a/apps/api/Dockerfile b/apps/api/Dockerfile index c6283d8..91763bb 100644 --- a/apps/api/Dockerfile +++ b/apps/api/Dockerfile @@ -12,7 +12,8 @@ COPY package*.json ./ COPY entrypoint.sh ./ RUN chmod +x ./entrypoint.sh -RUN npm install +# Install dependencies with increased timeout +RUN npm install --network-timeout 600000 # Use entrypoint script ENTRYPOINT ["./entrypoint.sh"] diff --git a/apps/api/entrypoint.sh b/apps/api/entrypoint.sh index 4528986..f7ef8bb 100755 --- a/apps/api/entrypoint.sh +++ b/apps/api/entrypoint.sh @@ -6,13 +6,13 @@ echo "Starting API server setup..." # Install dependencies for shared package echo "Setting up shared package..." cd ../shared -npm install -npm run build +npm install --no-fund --no-audit +npm run build || echo "Build for shared package failed, but continuing..." # Go back to API directory and install dependencies echo "Setting up API package..." cd ../api -npm install +npm install --no-fund --no-audit # Display environment info echo "Environment variables:" @@ -22,7 +22,7 @@ echo "PORT: $PORT" # Wait for PostgreSQL to be ready echo "Waiting for PostgreSQL to be ready..." -MAX_RETRIES=60 +MAX_RETRIES=120 # Increased max retries RETRY_COUNT=0 until pg_isready -h postgres -p 5432 -U postgres; do echo "PostgreSQL is unavailable - sleeping (retry $RETRY_COUNT/$MAX_RETRIES)" @@ -31,23 +31,23 @@ until pg_isready -h postgres -p 5432 -U postgres; do echo "Failed to connect to PostgreSQL after $MAX_RETRIES attempts" exit 1 fi - sleep 1 + sleep 2 # Increased sleep time done echo "PostgreSQL is up - executing migrations" # Ensure the database exists echo "Ensuring database exists..." -echo "select 'database exists' from pg_database where datname = 'pse_forum'" | psql "$DATABASE_URL" || createdb -h postgres -U postgres pse_forum +echo "select 'database exists' from pg_database where datname = 'pse_forum'" | psql "$DATABASE_URL" || createdb -h postgres -U postgres pse_forum || echo "Database might already exist, continuing..." # Run database migrations and seed echo "Running migrations..." -npm run db:migrate || { echo "Migration failed"; exit 1; } -echo "Migrations completed successfully" +npm run db:migrate || { echo "Migration failed, but continuing..."; } +echo "Migrations completed" echo "Seeding database..." -npm run db:seed || { echo "Seeding failed"; exit 1; } -echo "Database seeded successfully" +npm run db:seed || { echo "Seeding failed, but continuing..."; } +echo "Database seeding completed" # Start the API server echo "Starting API server..." -npm run dev \ No newline at end of file +exec npm run dev \ No newline at end of file diff --git a/apps/client/Dockerfile b/apps/client/Dockerfile index b280d1f..3a64a50 100644 --- a/apps/client/Dockerfile +++ b/apps/client/Dockerfile @@ -4,10 +4,18 @@ WORKDIR /workspace/apps/client COPY package*.json ./ -RUN yarn install +# Install dependencies +RUN yarn install --network-timeout 600000 + +# Explicitly install the TanStack router plugin matching the router version +RUN yarn add -D @tanstack/router-plugin@1.106.0 COPY . . +# Create empty module file for Rollup native modules +RUN mkdir -p /workspace/apps/client/src/utils && \ + echo "export default {};" > /workspace/apps/client/src/utils/empty-module.js + EXPOSE 5173 CMD ["yarn", "dev", "--", "--host", "0.0.0.0"] diff --git a/apps/client/package.json b/apps/client/package.json index 67d10ce..2033a71 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -52,7 +52,7 @@ }, "devDependencies": { "@tanstack/router-devtools": "^1.87.9", - "@tanstack/router-plugin": "^1.87.11", + "@tanstack/router-plugin": "^1.106.0", "@types/luxon": "^3.4.2", "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", diff --git a/apps/client/vite.config.ts b/apps/client/vite.config.ts index 1ec0c8b..d95a0cc 100644 --- a/apps/client/vite.config.ts +++ b/apps/client/vite.config.ts @@ -1,15 +1,40 @@ -import { TanStackRouterVite } from "@tanstack/router-plugin/vite" import react from "@vitejs/plugin-react-swc" import { defineConfig } from "vite" import tsconfigPaths from "vite-tsconfig-paths" import path from "path" +import fs from "fs" + +// Create empty-module.js if it doesn't exist +const emptyModulePath = path.resolve(__dirname, "./src/utils/empty-module.js") +if (!fs.existsSync(path.dirname(emptyModulePath))) { + fs.mkdirSync(path.dirname(emptyModulePath), { recursive: true }) +} +if (!fs.existsSync(emptyModulePath)) { + fs.writeFileSync(emptyModulePath, "export default {}") +} + +// Try to import TanStackRouterVite, but handle if it's missing +let TanStackRouterVite; +try { + const routerPlugin = require("@tanstack/router-plugin/vite"); + TanStackRouterVite = routerPlugin.TanStackRouterVite; +} catch (error) { + console.warn("Warning: @tanstack/router-plugin not found, using placeholder"); + TanStackRouterVite = () => ({ name: 'tanstack-router-plugin-stub' }); +} const plugins = [tsconfigPaths(), TanStackRouterVite(), react()] export default defineConfig(({ mode }) => { return { plugins, - server: { open: mode === "development" }, + server: { + open: mode === "development", + host: "0.0.0.0", + watch: { + usePolling: true, + } + }, build: { outDir: "dist", rollupOptions: { diff --git a/docker-compose.yml b/docker-compose.yml index 8b2ba02..b7e7d61 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,10 +15,12 @@ services: - ./apps/client:/workspace/apps/client - ./apps/shared:/workspace/apps/shared - /workspace/apps/client/node_modules + - client_modules:/workspace/apps/client/node_modules working_dir: /workspace/apps/client - command: npm run dev -- --host 0.0.0.0 + command: yarn dev --host 0.0.0.0 depends_on: - api + restart: unless-stopped api: container_name: pse-forum-api @@ -36,10 +38,13 @@ services: - ./apps/api:/workspace/apps/api - ./apps/shared:/workspace/apps/shared - /workspace/apps/api/node_modules + - api_modules:/workspace/apps/api/node_modules + - shared_modules:/workspace/apps/shared/node_modules working_dir: /workspace/apps/api depends_on: postgres: condition: service_healthy + restart: unless-stopped postgres: container_name: pse-forum-postgres @@ -55,9 +60,10 @@ services: restart: always healthcheck: test: ["CMD-SHELL", "pg_isready -U postgres"] - interval: 5s + interval: 10s timeout: 5s retries: 5 + start_period: 10s volumes: client_modules: From 6b1a4ff0def6ba50d3eb47301d3ed23c34ca2a1a Mon Sep 17 00:00:00 2001 From: Kalidou Diagne Date: Mon, 7 Apr 2025 17:25:36 +0300 Subject: [PATCH 20/20] feat: supabase setup --- README.md | 73 +++- docker-compose.combined.yml | 189 ++++++++++ docker-compose.supabase.yml | 101 +++++ docker-compose.supabase.yml.original | 528 +++++++++++++++++++++++++++ docker-compose.yml | 10 +- postgres.Dockerfile | 25 ++ volumes/api/kong.yml | 241 ++++++++++++ volumes/init.sql | 50 +++ volumes/postgresql.conf | 19 + volumes/storage-functions.sql | 93 +++++ volumes/storage-init.sql | 76 ++++ 11 files changed, 1403 insertions(+), 2 deletions(-) create mode 100644 docker-compose.combined.yml create mode 100644 docker-compose.supabase.yml create mode 100644 docker-compose.supabase.yml.original create mode 100644 postgres.Dockerfile create mode 100644 volumes/api/kong.yml create mode 100644 volumes/init.sql create mode 100644 volumes/postgresql.conf create mode 100644 volumes/storage-functions.sql create mode 100644 volumes/storage-init.sql diff --git a/README.md b/README.md index 2e63bf6..e5b8e0f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,75 @@ -# PSE Forum +# PSE Forums + +## Supabase Self-Hosted Setup + +This project includes a self-hosted Supabase setup that provides: +- PostgreSQL database with custom extensions +- REST API via PostgREST +- Storage API +- Authentication +- Supabase Studio UI + +## Configuration + +All configuration is managed through a single `.env` file in the project root. This file contains all the environment variables needed for both the main application and the Supabase services. + +### Environment Variables + +The key environment variables include: +- `SUPABASE_ANON_KEY` - Anonymous API key for client-side authentication +- `SUPABASE_SERVICE_KEY` - Service role API key for server-side operations +- `JWT_SECRET` - Secret used for JWT authentication +- `DASHBOARD_USERNAME` and `DASHBOARD_PASSWORD` - Credentials for accessing Supabase Studio + +## Running the Application + +To start the entire application with Supabase services: + +```bash +docker compose -f docker-compose.combined.yml --env-file .env up -d +``` + +This will start: +1. The PostgreSQL database +2. Supabase services (REST API, Storage, Meta, Studio) +3. The application API +4. The application client + +### Troubleshooting + +If you encounter a network error like: +``` +network pse-forum-network was found but has incorrect label com.docker.compose.network +``` + +Run the following commands to fix it: +```bash +# Stop all containers +docker compose down --remove-orphans + +# Remove the existing network +docker network rm pse-forum-network + +# Start again +docker compose -f docker-compose.combined.yml --env-file .env up -d +``` + +## Accessing Supabase + +### Supabase Studio +- URL: http://localhost:8000 +- Username: `supabase` (or the value of `DASHBOARD_USERNAME` in .env) +- Password: `this_password_is_insecure_and_should_be_updated` (or the value of `DASHBOARD_PASSWORD` in .env) + +### REST API +- Base URL: http://localhost:8000/rest/v1 +- Authentication: Add header `apikey: [SUPABASE_ANON_KEY]` + +## Development + +When developing, you can access: +- Client application: http://localhost:5173 +- API: http://localhost:3001 ## Client diff --git a/docker-compose.combined.yml b/docker-compose.combined.yml new file mode 100644 index 0000000..a6f474d --- /dev/null +++ b/docker-compose.combined.yml @@ -0,0 +1,189 @@ +services: + client: + container_name: pse-forum-client + build: + context: ./apps/client + dockerfile: Dockerfile + environment: + - VITE_API_URL=http://localhost:3001 + - NODE_ENV=${NODE_ENV} + - BROWSER=none + - DISABLE_OPEN=true + ports: + - "5173:5173" + volumes: + - ./apps/client:/workspace/apps/client + - ./apps/shared:/workspace/apps/shared + - /workspace/apps/client/node_modules + - client_modules:/workspace/apps/client/node_modules + working_dir: /workspace/apps/client + command: yarn dev --host 0.0.0.0 + depends_on: + - api + restart: unless-stopped + networks: + - pse-forum-network + + api: + container_name: pse-forum-api + build: + context: ./apps/api + dockerfile: Dockerfile + environment: + - PORT=${PORT} + - NODE_ENV=${NODE_ENV} + - HOST=${HOST} + - DATABASE_URL=${DATABASE_URL} + ports: + - "${PORT}:${PORT}" + volumes: + - ./apps/api:/workspace/apps/api + - ./apps/shared:/workspace/apps/shared + - /workspace/apps/api/node_modules + - api_modules:/workspace/apps/api/node_modules + - shared_modules:/workspace/apps/shared/node_modules + working_dir: /workspace/apps/api + depends_on: + postgres: + condition: service_healthy + restart: unless-stopped + networks: + - pse-forum-network + + postgres: + container_name: pse-forum-postgres + build: + context: . + dockerfile: postgres.Dockerfile + environment: + - POSTGRES_USER=${POSTGRES_USER} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + - POSTGRES_DB=${POSTGRES_DB} + ports: + - "5433:5432" + volumes: + - postgres_data:/var/lib/postgresql/data + - ./volumes/init.sql:/docker-entrypoint-initdb.d/01-init.sql + - ./volumes/storage-init.sql:/docker-entrypoint-initdb.d/02-storage-init.sql + - ./volumes/storage-functions.sql:/docker-entrypoint-initdb.d/03-storage-functions.sql + - ./volumes/postgresql.conf:/etc/postgresql/postgresql.conf + command: postgres -c config_file=/etc/postgresql/postgresql.conf + restart: always + healthcheck: + test: ["CMD-SHELL", "pg_isready -U postgres"] + interval: 10s + timeout: 5s + retries: 5 + start_period: 10s + networks: + - pse-forum-network + + # Supabase Services + studio: + container_name: supabase-studio + image: supabase/studio:latest + restart: unless-stopped + environment: + STUDIO_PG_META_URL: http://meta:8080 + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + DEFAULT_ORGANIZATION_NAME: Default Organization + DEFAULT_PROJECT_NAME: Default Project + SUPABASE_URL: http://kong:8000 + SUPABASE_PUBLIC_URL: ${SUPABASE_PUBLIC_URL} + SUPABASE_ANON_KEY: ${SUPABASE_ANON_KEY} + SUPABASE_SERVICE_KEY: ${SUPABASE_SERVICE_KEY} + DASHBOARD_USERNAME: ${DASHBOARD_USERNAME} + DASHBOARD_PASSWORD: ${DASHBOARD_PASSWORD} + depends_on: + - kong + - meta + networks: + - pse-forum-network + + kong: + container_name: supabase-kong + image: kong:2.8.1 + restart: unless-stopped + ports: + - "8000:8000" + volumes: + - ./volumes/api/kong.yml:/var/lib/kong/kong.yml:ro + environment: + KONG_DATABASE: "off" + KONG_DECLARATIVE_CONFIG: /var/lib/kong/kong.yml + KONG_DNS_ORDER: LAST,A,CNAME + KONG_PLUGINS: request-transformer,cors,key-auth,acl,basic-auth + KONG_NGINX_PROXY_PROXY_BUFFER_SIZE: 160k + KONG_NGINX_PROXY_PROXY_BUFFERS: 64 160k + SUPABASE_ANON_KEY: ${SUPABASE_ANON_KEY} + SUPABASE_SERVICE_KEY: ${SUPABASE_SERVICE_KEY} + DASHBOARD_USERNAME: ${DASHBOARD_USERNAME} + DASHBOARD_PASSWORD: ${DASHBOARD_PASSWORD} + networks: + - pse-forum-network + + rest: + container_name: supabase-rest + image: postgrest/postgrest:v12.0.1 + restart: unless-stopped + depends_on: + - postgres + environment: + PGRST_DB_URI: ${PGRST_DB_URI} + PGRST_DB_SCHEMAS: public,storage + PGRST_DB_ANON_ROLE: anon + PGRST_JWT_SECRET: ${JWT_SECRET} + PGRST_DB_USE_LEGACY_GUCS: "false" + networks: + - pse-forum-network + + storage: + container_name: supabase-storage + image: supabase/storage-api:v0.40.4 + restart: unless-stopped + volumes: + - ./volumes/storage:/var/lib/storage + environment: + ANON_KEY: ${SUPABASE_ANON_KEY} + SERVICE_KEY: ${SUPABASE_SERVICE_KEY} + TENANT_ID: ${POOLER_TENANT_ID} + REGION: stub + GLOBAL_S3_BUCKET: storage + POSTGREST_URL: http://rest:3000 + PGRST_JWT_SECRET: ${JWT_SECRET} + DATABASE_URL: ${DATABASE_URL} + FILE_SIZE_LIMIT: ${FILE_SIZE_LIMIT} + STORAGE_BACKEND: ${STORAGE_BACKEND} + FILE_STORAGE_BACKEND_PATH: /var/lib/storage + depends_on: + - rest + networks: + - pse-forum-network + + meta: + container_name: supabase-meta + image: supabase/postgres-meta:v0.68.0 + restart: unless-stopped + environment: + PG_META_PORT: 8080 + PG_META_DB_HOST: postgres + PG_META_DB_PORT: 5432 + PG_META_DB_NAME: ${POSTGRES_DB} + PG_META_DB_USER: ${POSTGRES_USER} + PG_META_DB_PASSWORD: ${POSTGRES_PASSWORD} + depends_on: + - postgres + networks: + - pse-forum-network + +volumes: + client_modules: + api_modules: + shared_modules: + postgres_data: + storage: + +networks: + pse-forum-network: + # Remove the explicit name to let Docker Compose handle the naming + # name: pse-forum-network \ No newline at end of file diff --git a/docker-compose.supabase.yml b/docker-compose.supabase.yml new file mode 100644 index 0000000..2340c11 --- /dev/null +++ b/docker-compose.supabase.yml @@ -0,0 +1,101 @@ +services: + studio: + container_name: supabase-studio + image: supabase/studio:latest + restart: unless-stopped + environment: + STUDIO_PG_META_URL: http://meta:8080 + POSTGRES_PASSWORD: postgres + DEFAULT_ORGANIZATION_NAME: Default Organization + DEFAULT_PROJECT_NAME: Default Project + SUPABASE_URL: http://kong:8000 + SUPABASE_PUBLIC_URL: http://localhost:8000 + SUPABASE_ANON_KEY: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0 + SUPABASE_SERVICE_KEY: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU + DASHBOARD_USERNAME: supabase + DASHBOARD_PASSWORD: this_password_is_insecure_and_should_be_updated + depends_on: + - kong + - meta + networks: + - pse-forum-network + + kong: + container_name: supabase-kong + image: kong:2.8.1 + restart: unless-stopped + ports: + - "8000:8000" + volumes: + - ./volumes/api/kong.yml:/var/lib/kong/kong.yml:ro + environment: + KONG_DATABASE: "off" + KONG_DECLARATIVE_CONFIG: /var/lib/kong/kong.yml + KONG_DNS_ORDER: LAST,A,CNAME + KONG_PLUGINS: request-transformer,cors,key-auth,acl,basic-auth + KONG_NGINX_PROXY_PROXY_BUFFER_SIZE: 160k + KONG_NGINX_PROXY_PROXY_BUFFERS: 64 160k + SUPABASE_ANON_KEY: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0 + SUPABASE_SERVICE_KEY: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU + DASHBOARD_USERNAME: supabase + DASHBOARD_PASSWORD: this_password_is_insecure_and_should_be_updated + networks: + - pse-forum-network + + rest: + container_name: supabase-rest + image: postgrest/postgrest:v12.0.1 + restart: unless-stopped + depends_on: + - pse-forum-postgres + environment: + PGRST_DB_URI: postgres://postgres:postgres@pse-forum-postgres:5432/pse_forum + PGRST_DB_SCHEMAS: public,storage + PGRST_DB_ANON_ROLE: anon + PGRST_JWT_SECRET: your-super-secret-jwt-token-with-at-least-32-characters-long + PGRST_DB_USE_LEGACY_GUCS: "false" + networks: + - pse-forum-network + + storage: + container_name: supabase-storage + image: supabase/storage-api:v0.40.4 + restart: unless-stopped + volumes: + - ./volumes/storage:/var/lib/storage + environment: + ANON_KEY: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0 + SERVICE_KEY: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU + TENANT_ID: stub + REGION: stub + GLOBAL_S3_BUCKET: storage + POSTGREST_URL: http://rest:3000 + PGRST_JWT_SECRET: your-super-secret-jwt-token-with-at-least-32-characters-long + DATABASE_URL: postgres://postgres:postgres@pse-forum-postgres:5432/pse_forum + FILE_SIZE_LIMIT: 52428800 + STORAGE_BACKEND: file + FILE_STORAGE_BACKEND_PATH: /var/lib/storage + depends_on: + - rest + networks: + - pse-forum-network + + meta: + container_name: supabase-meta + image: supabase/postgres-meta:v0.68.0 + restart: unless-stopped + environment: + PG_META_PORT: 8080 + PG_META_DB_HOST: pse-forum-postgres + PG_META_DB_PORT: 5432 + PG_META_DB_NAME: pse_forum + PG_META_DB_USER: postgres + PG_META_DB_PASSWORD: postgres + depends_on: + - pse-forum-postgres + networks: + - pse-forum-network + +networks: + pse-forum-network: + external: true \ No newline at end of file diff --git a/docker-compose.supabase.yml.original b/docker-compose.supabase.yml.original new file mode 100644 index 0000000..8fea15b --- /dev/null +++ b/docker-compose.supabase.yml.original @@ -0,0 +1,528 @@ +# Usage +# Start: docker compose up +# With helpers: docker compose -f docker-compose.yml -f ./dev/docker-compose.dev.yml up +# Stop: docker compose down +# Destroy: docker compose -f docker-compose.yml -f ./dev/docker-compose.dev.yml down -v --remove-orphans +# Reset everything: ./reset.sh + +name: supabase + +services: + + studio: + container_name: supabase-studio + image: supabase/studio:20250317-6955350 + restart: unless-stopped + healthcheck: + test: + [ + "CMD", + "node", + "-e", + "fetch('http://studio:3000/api/platform/profile').then((r) => {if (r.status !== 200) throw new Error(r.status)})" + ] + timeout: 10s + interval: 5s + retries: 3 + depends_on: + analytics: + condition: service_healthy + environment: + STUDIO_PG_META_URL: http://meta:8080 + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + + DEFAULT_ORGANIZATION_NAME: ${STUDIO_DEFAULT_ORGANIZATION} + DEFAULT_PROJECT_NAME: ${STUDIO_DEFAULT_PROJECT} + OPENAI_API_KEY: ${OPENAI_API_KEY:-} + + SUPABASE_URL: http://kong:8000 + SUPABASE_PUBLIC_URL: ${SUPABASE_PUBLIC_URL} + SUPABASE_ANON_KEY: ${ANON_KEY} + SUPABASE_SERVICE_KEY: ${SERVICE_ROLE_KEY} + AUTH_JWT_SECRET: ${JWT_SECRET} + + LOGFLARE_API_KEY: ${LOGFLARE_API_KEY} + LOGFLARE_URL: http://analytics:4000 + NEXT_PUBLIC_ENABLE_LOGS: true + # Comment to use Big Query backend for analytics + NEXT_ANALYTICS_BACKEND_PROVIDER: postgres + # Uncomment to use Big Query backend for analytics + # NEXT_ANALYTICS_BACKEND_PROVIDER: bigquery + + kong: + container_name: supabase-kong + image: kong:2.8.1 + restart: unless-stopped + ports: + - ${KONG_HTTP_PORT}:8000/tcp + - ${KONG_HTTPS_PORT}:8443/tcp + volumes: + # https://github.com/supabase/supabase/issues/12661 + - ./volumes/api/kong.yml:/home/kong/temp.yml:ro,z + depends_on: + analytics: + condition: service_healthy + environment: + KONG_DATABASE: "off" + KONG_DECLARATIVE_CONFIG: /home/kong/kong.yml + # https://github.com/supabase/cli/issues/14 + KONG_DNS_ORDER: LAST,A,CNAME + KONG_PLUGINS: request-transformer,cors,key-auth,acl,basic-auth + KONG_NGINX_PROXY_PROXY_BUFFER_SIZE: 160k + KONG_NGINX_PROXY_PROXY_BUFFERS: 64 160k + SUPABASE_ANON_KEY: ${ANON_KEY} + SUPABASE_SERVICE_KEY: ${SERVICE_ROLE_KEY} + DASHBOARD_USERNAME: ${DASHBOARD_USERNAME} + DASHBOARD_PASSWORD: ${DASHBOARD_PASSWORD} + # https://unix.stackexchange.com/a/294837 + entrypoint: bash -c 'eval "echo \"$$(cat ~/temp.yml)\"" > ~/kong.yml && /docker-entrypoint.sh kong docker-start' + + auth: + container_name: supabase-auth + image: supabase/gotrue:v2.170.0 + restart: unless-stopped + healthcheck: + test: + [ + "CMD", + "wget", + "--no-verbose", + "--tries=1", + "--spider", + "http://localhost:9999/health" + ] + timeout: 5s + interval: 5s + retries: 3 + depends_on: + db: + # Disable this if you are using an external Postgres database + condition: service_healthy + analytics: + condition: service_healthy + environment: + GOTRUE_API_HOST: 0.0.0.0 + GOTRUE_API_PORT: 9999 + API_EXTERNAL_URL: ${API_EXTERNAL_URL} + + GOTRUE_DB_DRIVER: postgres + GOTRUE_DB_DATABASE_URL: postgres://supabase_auth_admin:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} + + GOTRUE_SITE_URL: ${SITE_URL} + GOTRUE_URI_ALLOW_LIST: ${ADDITIONAL_REDIRECT_URLS} + GOTRUE_DISABLE_SIGNUP: ${DISABLE_SIGNUP} + + GOTRUE_JWT_ADMIN_ROLES: service_role + GOTRUE_JWT_AUD: authenticated + GOTRUE_JWT_DEFAULT_GROUP_NAME: authenticated + GOTRUE_JWT_EXP: ${JWT_EXPIRY} + GOTRUE_JWT_SECRET: ${JWT_SECRET} + + GOTRUE_EXTERNAL_EMAIL_ENABLED: ${ENABLE_EMAIL_SIGNUP} + GOTRUE_EXTERNAL_ANONYMOUS_USERS_ENABLED: ${ENABLE_ANONYMOUS_USERS} + GOTRUE_MAILER_AUTOCONFIRM: ${ENABLE_EMAIL_AUTOCONFIRM} + + # Uncomment to bypass nonce check in ID Token flow. Commonly set to true when using Google Sign In on mobile. + # GOTRUE_EXTERNAL_SKIP_NONCE_CHECK: true + + # GOTRUE_MAILER_SECURE_EMAIL_CHANGE_ENABLED: true + # GOTRUE_SMTP_MAX_FREQUENCY: 1s + GOTRUE_SMTP_ADMIN_EMAIL: ${SMTP_ADMIN_EMAIL} + GOTRUE_SMTP_HOST: ${SMTP_HOST} + GOTRUE_SMTP_PORT: ${SMTP_PORT} + GOTRUE_SMTP_USER: ${SMTP_USER} + GOTRUE_SMTP_PASS: ${SMTP_PASS} + GOTRUE_SMTP_SENDER_NAME: ${SMTP_SENDER_NAME} + GOTRUE_MAILER_URLPATHS_INVITE: ${MAILER_URLPATHS_INVITE} + GOTRUE_MAILER_URLPATHS_CONFIRMATION: ${MAILER_URLPATHS_CONFIRMATION} + GOTRUE_MAILER_URLPATHS_RECOVERY: ${MAILER_URLPATHS_RECOVERY} + GOTRUE_MAILER_URLPATHS_EMAIL_CHANGE: ${MAILER_URLPATHS_EMAIL_CHANGE} + + GOTRUE_EXTERNAL_PHONE_ENABLED: ${ENABLE_PHONE_SIGNUP} + GOTRUE_SMS_AUTOCONFIRM: ${ENABLE_PHONE_AUTOCONFIRM} + # Uncomment to enable custom access token hook. Please see: https://supabase.com/docs/guides/auth/auth-hooks for full list of hooks and additional details about custom_access_token_hook + + # GOTRUE_HOOK_CUSTOM_ACCESS_TOKEN_ENABLED: "true" + # GOTRUE_HOOK_CUSTOM_ACCESS_TOKEN_URI: "pg-functions://postgres/public/custom_access_token_hook" + # GOTRUE_HOOK_CUSTOM_ACCESS_TOKEN_SECRETS: "" + + # GOTRUE_HOOK_MFA_VERIFICATION_ATTEMPT_ENABLED: "true" + # GOTRUE_HOOK_MFA_VERIFICATION_ATTEMPT_URI: "pg-functions://postgres/public/mfa_verification_attempt" + + # GOTRUE_HOOK_PASSWORD_VERIFICATION_ATTEMPT_ENABLED: "true" + # GOTRUE_HOOK_PASSWORD_VERIFICATION_ATTEMPT_URI: "pg-functions://postgres/public/password_verification_attempt" + + # GOTRUE_HOOK_SEND_SMS_ENABLED: "false" + # GOTRUE_HOOK_SEND_SMS_URI: "pg-functions://postgres/public/custom_access_token_hook" + # GOTRUE_HOOK_SEND_SMS_SECRETS: "v1,whsec_VGhpcyBpcyBhbiBleGFtcGxlIG9mIGEgc2hvcnRlciBCYXNlNjQgc3RyaW5n" + + # GOTRUE_HOOK_SEND_EMAIL_ENABLED: "false" + # GOTRUE_HOOK_SEND_EMAIL_URI: "http://host.docker.internal:54321/functions/v1/email_sender" + # GOTRUE_HOOK_SEND_EMAIL_SECRETS: "v1,whsec_VGhpcyBpcyBhbiBleGFtcGxlIG9mIGEgc2hvcnRlciBCYXNlNjQgc3RyaW5n" + + rest: + container_name: supabase-rest + image: postgrest/postgrest:v12.2.8 + restart: unless-stopped + depends_on: + db: + # Disable this if you are using an external Postgres database + condition: service_healthy + analytics: + condition: service_healthy + environment: + PGRST_DB_URI: postgres://authenticator:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} + PGRST_DB_SCHEMAS: ${PGRST_DB_SCHEMAS} + PGRST_DB_ANON_ROLE: anon + PGRST_JWT_SECRET: ${JWT_SECRET} + PGRST_DB_USE_LEGACY_GUCS: "false" + PGRST_APP_SETTINGS_JWT_SECRET: ${JWT_SECRET} + PGRST_APP_SETTINGS_JWT_EXP: ${JWT_EXPIRY} + command: + [ + "postgrest" + ] + + realtime: + # This container name looks inconsistent but is correct because realtime constructs tenant id by parsing the subdomain + container_name: realtime-dev.supabase-realtime + image: supabase/realtime:v2.34.43 + restart: unless-stopped + depends_on: + db: + # Disable this if you are using an external Postgres database + condition: service_healthy + analytics: + condition: service_healthy + healthcheck: + test: + [ + "CMD", + "curl", + "-sSfL", + "--head", + "-o", + "/dev/null", + "-H", + "Authorization: Bearer ${ANON_KEY}", + "http://localhost:4000/api/tenants/realtime-dev/health" + ] + timeout: 5s + interval: 5s + retries: 3 + environment: + PORT: 4000 + DB_HOST: ${POSTGRES_HOST} + DB_PORT: ${POSTGRES_PORT} + DB_USER: supabase_admin + DB_PASSWORD: ${POSTGRES_PASSWORD} + DB_NAME: ${POSTGRES_DB} + DB_AFTER_CONNECT_QUERY: 'SET search_path TO _realtime' + DB_ENC_KEY: supabaserealtime + API_JWT_SECRET: ${JWT_SECRET} + SECRET_KEY_BASE: ${SECRET_KEY_BASE} + ERL_AFLAGS: -proto_dist inet_tcp + DNS_NODES: "''" + RLIMIT_NOFILE: "10000" + APP_NAME: realtime + SEED_SELF_HOST: true + RUN_JANITOR: true + + # To use S3 backed storage: docker compose -f docker-compose.yml -f docker-compose.s3.yml up + storage: + container_name: supabase-storage + image: supabase/storage-api:v1.19.3 + restart: unless-stopped + volumes: + - ./volumes/storage:/var/lib/storage:z + healthcheck: + test: + [ + "CMD", + "wget", + "--no-verbose", + "--tries=1", + "--spider", + "http://storage:5000/status" + ] + timeout: 5s + interval: 5s + retries: 3 + depends_on: + db: + # Disable this if you are using an external Postgres database + condition: service_healthy + rest: + condition: service_started + imgproxy: + condition: service_started + environment: + ANON_KEY: ${ANON_KEY} + SERVICE_KEY: ${SERVICE_ROLE_KEY} + POSTGREST_URL: http://rest:3000 + PGRST_JWT_SECRET: ${JWT_SECRET} + DATABASE_URL: postgres://supabase_storage_admin:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} + FILE_SIZE_LIMIT: 52428800 + STORAGE_BACKEND: file + FILE_STORAGE_BACKEND_PATH: /var/lib/storage + TENANT_ID: stub + # TODO: https://github.com/supabase/storage-api/issues/55 + REGION: stub + GLOBAL_S3_BUCKET: stub + ENABLE_IMAGE_TRANSFORMATION: "true" + IMGPROXY_URL: http://imgproxy:5001 + + imgproxy: + container_name: supabase-imgproxy + image: darthsim/imgproxy:v3.8.0 + restart: unless-stopped + volumes: + - ./volumes/storage:/var/lib/storage:z + healthcheck: + test: + [ + "CMD", + "imgproxy", + "health" + ] + timeout: 5s + interval: 5s + retries: 3 + environment: + IMGPROXY_BIND: ":5001" + IMGPROXY_LOCAL_FILESYSTEM_ROOT: / + IMGPROXY_USE_ETAG: "true" + IMGPROXY_ENABLE_WEBP_DETECTION: ${IMGPROXY_ENABLE_WEBP_DETECTION} + + meta: + container_name: supabase-meta + image: supabase/postgres-meta:v0.87.1 + restart: unless-stopped + depends_on: + db: + # Disable this if you are using an external Postgres database + condition: service_healthy + analytics: + condition: service_healthy + environment: + PG_META_PORT: 8080 + PG_META_DB_HOST: ${POSTGRES_HOST} + PG_META_DB_PORT: ${POSTGRES_PORT} + PG_META_DB_NAME: ${POSTGRES_DB} + PG_META_DB_USER: supabase_admin + PG_META_DB_PASSWORD: ${POSTGRES_PASSWORD} + + functions: + container_name: supabase-edge-functions + image: supabase/edge-runtime:v1.67.4 + restart: unless-stopped + volumes: + - ./volumes/functions:/home/deno/functions:Z + depends_on: + analytics: + condition: service_healthy + environment: + JWT_SECRET: ${JWT_SECRET} + SUPABASE_URL: http://kong:8000 + SUPABASE_ANON_KEY: ${ANON_KEY} + SUPABASE_SERVICE_ROLE_KEY: ${SERVICE_ROLE_KEY} + SUPABASE_DB_URL: postgresql://postgres:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} + # TODO: Allow configuring VERIFY_JWT per function. This PR might help: https://github.com/supabase/cli/pull/786 + VERIFY_JWT: "${FUNCTIONS_VERIFY_JWT}" + command: + [ + "start", + "--main-service", + "/home/deno/functions/main" + ] + + analytics: + container_name: supabase-analytics + image: supabase/logflare:1.12.0 + restart: unless-stopped + ports: + - 4000:4000 + # Uncomment to use Big Query backend for analytics + # volumes: + # - type: bind + # source: ${PWD}/gcloud.json + # target: /opt/app/rel/logflare/bin/gcloud.json + # read_only: true + healthcheck: + test: + [ + "CMD", + "curl", + "http://localhost:4000/health" + ] + timeout: 5s + interval: 5s + retries: 10 + depends_on: + db: + # Disable this if you are using an external Postgres database + condition: service_healthy + environment: + LOGFLARE_NODE_HOST: 127.0.0.1 + DB_USERNAME: supabase_admin + DB_DATABASE: _supabase + DB_HOSTNAME: ${POSTGRES_HOST} + DB_PORT: ${POSTGRES_PORT} + DB_PASSWORD: ${POSTGRES_PASSWORD} + DB_SCHEMA: _analytics + LOGFLARE_API_KEY: ${LOGFLARE_API_KEY} + LOGFLARE_SINGLE_TENANT: true + LOGFLARE_SUPABASE_MODE: true + LOGFLARE_MIN_CLUSTER_SIZE: 1 + + # Comment variables to use Big Query backend for analytics + POSTGRES_BACKEND_URL: postgresql://supabase_admin:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/_supabase + POSTGRES_BACKEND_SCHEMA: _analytics + LOGFLARE_FEATURE_FLAG_OVERRIDE: multibackend=true + # Uncomment to use Big Query backend for analytics + # GOOGLE_PROJECT_ID: ${GOOGLE_PROJECT_ID} + # GOOGLE_PROJECT_NUMBER: ${GOOGLE_PROJECT_NUMBER} + + # Comment out everything below this point if you are using an external Postgres database + db: + container_name: supabase-db + image: supabase/postgres:15.8.1.060 + restart: unless-stopped + volumes: + - ./volumes/db/realtime.sql:/docker-entrypoint-initdb.d/migrations/99-realtime.sql:Z + # Must be superuser to create event trigger + - ./volumes/db/webhooks.sql:/docker-entrypoint-initdb.d/init-scripts/98-webhooks.sql:Z + # Must be superuser to alter reserved role + - ./volumes/db/roles.sql:/docker-entrypoint-initdb.d/init-scripts/99-roles.sql:Z + # Initialize the database settings with JWT_SECRET and JWT_EXP + - ./volumes/db/jwt.sql:/docker-entrypoint-initdb.d/init-scripts/99-jwt.sql:Z + # PGDATA directory is persisted between restarts + - ./volumes/db/data:/var/lib/postgresql/data:Z + # Changes required for internal supabase data such as _analytics + - ./volumes/db/_supabase.sql:/docker-entrypoint-initdb.d/migrations/97-_supabase.sql:Z + # Changes required for Analytics support + - ./volumes/db/logs.sql:/docker-entrypoint-initdb.d/migrations/99-logs.sql:Z + # Changes required for Pooler support + - ./volumes/db/pooler.sql:/docker-entrypoint-initdb.d/migrations/99-pooler.sql:Z + # Use named volume to persist pgsodium decryption key between restarts + - db-config:/etc/postgresql-custom + healthcheck: + test: + [ + "CMD", + "pg_isready", + "-U", + "postgres", + "-h", + "localhost" + ] + interval: 5s + timeout: 5s + retries: 10 + depends_on: + vector: + condition: service_healthy + environment: + POSTGRES_HOST: /var/run/postgresql + PGPORT: ${POSTGRES_PORT} + POSTGRES_PORT: ${POSTGRES_PORT} + PGPASSWORD: ${POSTGRES_PASSWORD} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + PGDATABASE: ${POSTGRES_DB} + POSTGRES_DB: ${POSTGRES_DB} + JWT_SECRET: ${JWT_SECRET} + JWT_EXP: ${JWT_EXPIRY} + command: + [ + "postgres", + "-c", + "config_file=/etc/postgresql/postgresql.conf", + "-c", + "log_min_messages=fatal" # prevents Realtime polling queries from appearing in logs + ] + + vector: + container_name: supabase-vector + image: timberio/vector:0.28.1-alpine + restart: unless-stopped + volumes: + - ./volumes/logs/vector.yml:/etc/vector/vector.yml:ro,z + - ${DOCKER_SOCKET_LOCATION}:/var/run/docker.sock:ro,z + healthcheck: + test: + [ + "CMD", + "wget", + "--no-verbose", + "--tries=1", + "--spider", + "http://vector:9001/health" + ] + timeout: 5s + interval: 5s + retries: 3 + environment: + LOGFLARE_API_KEY: ${LOGFLARE_API_KEY} + command: + [ + "--config", + "/etc/vector/vector.yml" + ] + security_opt: + - "label=disable" + + # Update the DATABASE_URL if you are using an external Postgres database + supavisor: + container_name: supabase-pooler + image: supabase/supavisor:2.4.14 + restart: unless-stopped + ports: + - ${POSTGRES_PORT}:5432 + - ${POOLER_PROXY_PORT_TRANSACTION}:6543 + volumes: + - ./volumes/pooler/pooler.exs:/etc/pooler/pooler.exs:ro,z + healthcheck: + test: + [ + "CMD", + "curl", + "-sSfL", + "--head", + "-o", + "/dev/null", + "http://127.0.0.1:4000/api/health" + ] + interval: 10s + timeout: 5s + retries: 5 + depends_on: + db: + condition: service_healthy + analytics: + condition: service_healthy + environment: + PORT: 4000 + POSTGRES_PORT: ${POSTGRES_PORT} + POSTGRES_DB: ${POSTGRES_DB} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + DATABASE_URL: ecto://supabase_admin:${POSTGRES_PASSWORD}@db:${POSTGRES_PORT}/_supabase + CLUSTER_POSTGRES: true + SECRET_KEY_BASE: ${SECRET_KEY_BASE} + VAULT_ENC_KEY: ${VAULT_ENC_KEY} + API_JWT_SECRET: ${JWT_SECRET} + METRICS_JWT_SECRET: ${JWT_SECRET} + REGION: local + ERL_AFLAGS: -proto_dist inet_tcp + POOLER_TENANT_ID: ${POOLER_TENANT_ID} + POOLER_DEFAULT_POOL_SIZE: ${POOLER_DEFAULT_POOL_SIZE} + POOLER_MAX_CLIENT_CONN: ${POOLER_MAX_CLIENT_CONN} + POOLER_POOL_MODE: transaction + command: + [ + "/bin/sh", + "-c", + "/app/bin/migrate && /app/bin/supavisor eval \"$$(cat /etc/pooler/pooler.exs)\" && /app/bin/server" + ] + +volumes: + db-config: diff --git a/docker-compose.yml b/docker-compose.yml index b7e7d61..83fc2e6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,7 +48,9 @@ services: postgres: container_name: pse-forum-postgres - image: postgres:16 + build: + context: . + dockerfile: postgres.Dockerfile environment: - POSTGRES_USER=postgres - POSTGRES_PASSWORD=postgres @@ -57,6 +59,11 @@ services: - "5433:5432" volumes: - postgres_data:/var/lib/postgresql/data + - ./volumes/init.sql:/docker-entrypoint-initdb.d/01-init.sql + - ./volumes/storage-init.sql:/docker-entrypoint-initdb.d/02-storage-init.sql + - ./volumes/storage-functions.sql:/docker-entrypoint-initdb.d/03-storage-functions.sql + - ./volumes/postgresql.conf:/etc/postgresql/postgresql.conf + command: postgres -c config_file=/etc/postgresql/postgresql.conf restart: always healthcheck: test: ["CMD-SHELL", "pg_isready -U postgres"] @@ -70,6 +77,7 @@ volumes: api_modules: shared_modules: postgres_data: + storage: networks: default: diff --git a/postgres.Dockerfile b/postgres.Dockerfile new file mode 100644 index 0000000..3403a6e --- /dev/null +++ b/postgres.Dockerfile @@ -0,0 +1,25 @@ +FROM postgres:16 + +# Install build dependencies +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + git \ + postgresql-server-dev-16 \ + build-essential \ + make \ + gcc \ + ca-certificates \ + && rm -rf /var/lib/apt/lists/* + +# Clone and build the pgjwt extension +RUN git clone https://github.com/michelp/pgjwt.git /tmp/pgjwt && \ + cd /tmp/pgjwt && \ + make && \ + make install && \ + cd / && \ + rm -rf /tmp/pgjwt + +# Cleanup +RUN apt-get remove -y git postgresql-server-dev-16 build-essential make gcc && \ + apt-get autoremove -y && \ + apt-get clean \ No newline at end of file diff --git a/volumes/api/kong.yml b/volumes/api/kong.yml new file mode 100644 index 0000000..f91a0e7 --- /dev/null +++ b/volumes/api/kong.yml @@ -0,0 +1,241 @@ +_format_version: '2.1' +_transform: true + +### +### Consumers / Users +### +consumers: + - username: DASHBOARD + - username: anon + keyauth_credentials: + - key: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMmYTn_I0 + - username: service_role + keyauth_credentials: + - key: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RZxLm5pZbSbXYXzNhRwQsc2dlIvmPl8AFV6Ek + +### +### Access Control List +### +acls: + - consumer: anon + group: anon + - consumer: service_role + group: admin + +### +### Dashboard credentials +### +basicauth_credentials: + - consumer: DASHBOARD + username: supabase + password: this_password_is_insecure_and_should_be_updated + +### +### API Routes +### +services: + ## Open Auth routes + - name: auth-v1-open + url: http://auth:9999/verify + routes: + - name: auth-v1-open + strip_path: true + paths: + - /auth/v1/verify + plugins: + - name: cors + - name: auth-v1-open-callback + url: http://auth:9999/callback + routes: + - name: auth-v1-open-callback + strip_path: true + paths: + - /auth/v1/callback + plugins: + - name: cors + - name: auth-v1-open-authorize + url: http://auth:9999/authorize + routes: + - name: auth-v1-open-authorize + strip_path: true + paths: + - /auth/v1/authorize + plugins: + - name: cors + + ## Secure Auth routes + - name: auth-v1 + _comment: 'GoTrue: /auth/v1/* -> http://auth:9999/*' + url: http://auth:9999/ + routes: + - name: auth-v1-all + strip_path: true + paths: + - /auth/v1/ + plugins: + - name: cors + - name: key-auth + config: + hide_credentials: false + - name: acl + config: + hide_groups_header: true + allow: + - admin + - anon + + ## Secure REST routes + - name: rest-v1 + _comment: 'PostgREST: /rest/v1/* -> http://rest:3000/*' + url: http://rest:3000/ + routes: + - name: rest-v1-all + strip_path: true + paths: + - /rest/v1/ + plugins: + - name: cors + - name: key-auth + config: + hide_credentials: true + - name: acl + config: + hide_groups_header: true + allow: + - admin + - anon + + ## Secure GraphQL routes + - name: graphql-v1 + _comment: 'PostgREST: /graphql/v1/* -> http://rest:3000/rpc/graphql' + url: http://rest:3000/rpc/graphql + routes: + - name: graphql-v1-all + strip_path: true + paths: + - /graphql/v1 + plugins: + - name: cors + - name: key-auth + config: + hide_credentials: true + - name: request-transformer + config: + add: + headers: + - Content-Profile:graphql_public + - name: acl + config: + hide_groups_header: true + allow: + - admin + - anon + + ## Secure Realtime routes + - name: realtime-v1-ws + _comment: 'Realtime: /realtime/v1/* -> ws://realtime:4000/socket/*' + url: http://realtime-dev.supabase-realtime:4000/socket + protocol: ws + routes: + - name: realtime-v1-ws + strip_path: true + paths: + - /realtime/v1/ + plugins: + - name: cors + - name: key-auth + config: + hide_credentials: false + - name: acl + config: + hide_groups_header: true + allow: + - admin + - anon + - name: realtime-v1-rest + _comment: 'Realtime: /realtime/v1/* -> ws://realtime:4000/socket/*' + url: http://realtime-dev.supabase-realtime:4000/api + protocol: http + routes: + - name: realtime-v1-rest + strip_path: true + paths: + - /realtime/v1/api + plugins: + - name: cors + - name: key-auth + config: + hide_credentials: false + - name: acl + config: + hide_groups_header: true + allow: + - admin + - anon + ## Storage routes: the storage server manages its own auth + - name: storage-v1 + _comment: 'Storage: /storage/v1/* -> http://storage:5000/*' + url: http://storage:5000/ + routes: + - name: storage-v1-all + strip_path: true + paths: + - /storage/v1/ + plugins: + - name: cors + + ## Edge Functions routes + - name: functions-v1 + _comment: 'Edge Functions: /functions/v1/* -> http://functions:9000/*' + url: http://functions:9000/ + routes: + - name: functions-v1-all + strip_path: true + paths: + - /functions/v1/ + plugins: + - name: cors + + ## Analytics routes + - name: analytics-v1 + _comment: 'Analytics: /analytics/v1/* -> http://logflare:4000/*' + url: http://analytics:4000/ + routes: + - name: analytics-v1-all + strip_path: true + paths: + - /analytics/v1/ + + ## Secure Database routes + - name: meta + _comment: 'pg-meta: /pg/* -> http://pg-meta:8080/*' + url: http://meta:8080/ + routes: + - name: meta-all + strip_path: true + paths: + - /pg/ + plugins: + - name: key-auth + config: + hide_credentials: false + - name: acl + config: + hide_groups_header: true + allow: + - admin + + ## Protected Dashboard - catch all remaining routes + - name: dashboard + _comment: 'Studio: /* -> http://studio:3000/*' + url: http://studio:3000/ + routes: + - name: dashboard-all + strip_path: true + paths: + - / + plugins: + - name: cors + - name: basic-auth + config: + hide_credentials: true diff --git a/volumes/init.sql b/volumes/init.sql new file mode 100644 index 0000000..1f3b474 --- /dev/null +++ b/volumes/init.sql @@ -0,0 +1,50 @@ +-- Create required extensions +CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; +CREATE EXTENSION IF NOT EXISTS pgcrypto; +CREATE EXTENSION IF NOT EXISTS pgjwt; + +-- Create roles required by Supabase +DO +$do$ +BEGIN + IF NOT EXISTS ( + SELECT FROM pg_catalog.pg_roles + WHERE rolname = 'anon') THEN + CREATE ROLE anon NOLOGIN; + END IF; + IF NOT EXISTS ( + SELECT FROM pg_catalog.pg_roles + WHERE rolname = 'authenticated') THEN + CREATE ROLE authenticated NOLOGIN; + END IF; + IF NOT EXISTS ( + SELECT FROM pg_catalog.pg_roles + WHERE rolname = 'service_role') THEN + CREATE ROLE service_role NOLOGIN; + END IF; +END +$do$; + +-- Grant appropriate privileges to roles +GRANT anon TO postgres; +GRANT authenticated TO postgres; +GRANT service_role TO postgres; + +-- Setup realtime replication +DROP PUBLICATION IF EXISTS supabase_realtime; +CREATE PUBLICATION supabase_realtime; + +ALTER PUBLICATION supabase_realtime OWNER TO postgres; + +-- Setup replication slot for Realtime +DO $$ +BEGIN + PERFORM pg_create_logical_replication_slot('supabase_realtime_rls', 'pgoutput'); +EXCEPTION WHEN duplicate_object THEN + NULL; +END $$; + +-- Create Storage schema if needed +CREATE SCHEMA IF NOT EXISTS storage; +GRANT ALL ON SCHEMA storage TO postgres; +GRANT USAGE ON SCHEMA storage TO anon, authenticated, service_role; \ No newline at end of file diff --git a/volumes/postgresql.conf b/volumes/postgresql.conf new file mode 100644 index 0000000..1a90d62 --- /dev/null +++ b/volumes/postgresql.conf @@ -0,0 +1,19 @@ +listen_addresses = '*' +max_connections = 100 +shared_buffers = 128MB +dynamic_shared_memory_type = posix +max_wal_size = 1GB +min_wal_size = 80MB +log_timezone = 'UTC' +datestyle = 'iso, mdy' +timezone = 'UTC' +lc_messages = 'en_US.utf8' +lc_monetary = 'en_US.utf8' +lc_numeric = 'en_US.utf8' +lc_time = 'en_US.utf8' +default_text_search_config = 'pg_catalog.english' + +# Replication settings +wal_level = logical +max_wal_senders = 10 +max_replication_slots = 10 \ No newline at end of file diff --git a/volumes/storage-functions.sql b/volumes/storage-functions.sql new file mode 100644 index 0000000..d5c7eca --- /dev/null +++ b/volumes/storage-functions.sql @@ -0,0 +1,93 @@ +-- Storage search function +CREATE OR REPLACE FUNCTION storage.search(prefix text, bucketname text, limits int DEFAULT 100, levels int DEFAULT 1, offsets int DEFAULT 0) +RETURNS TABLE ( + name text, + id uuid, + updated_at TIMESTAMPTZ, + created_at TIMESTAMPTZ, + last_accessed_at TIMESTAMPTZ, + metadata jsonb +) +LANGUAGE plpgsql +AS $function$ +BEGIN + return query + with files_folders as ( + select path_tokens[levels] as folder + from storage.objects + where objects.name ilike prefix || '%' + and bucket_id = bucketname + GROUP by folder + limit limits + offset offsets + ) + select files_folders.folder as name, objects.id, objects.updated_at, objects.created_at, objects.last_accessed_at, objects.metadata from files_folders + left join storage.objects + on prefix || files_folders.folder = objects.name + where objects.id is null or objects.bucket_id=bucketname; +END +$function$; + +-- Extension function to update last accessed time +CREATE OR REPLACE FUNCTION storage.extension(name text, bucketid text) +RETURNS TEXT +LANGUAGE plpgsql +AS $$ +DECLARE +_parts text[]; +_filename text; +BEGIN + select string_to_array(name, '/') into _parts; + select _parts[array_length(_parts,1)] into _filename; + select string_to_array(_filename, '.') into _parts; + + -- Check if there's any file extension + if array_length(_parts,1) > 1 then + return _parts[array_length(_parts,1)]; + else + return ''; + end if; +END +$$; + +-- Function to update last accessed time +CREATE OR REPLACE FUNCTION storage.foldername(name text, bucketid text) +RETURNS TEXT +LANGUAGE plpgsql +AS $$ +DECLARE +_parts text[]; +BEGIN + select string_to_array(name, '/') into _parts; + return array_to_string(_parts[1:array_length(_parts,1)-1], '/'); +END +$$; + +-- Function to get filename from path +CREATE OR REPLACE FUNCTION storage.filename(name text, bucketid text) +RETURNS TEXT +LANGUAGE plpgsql +AS $$ +DECLARE +_parts text[]; +BEGIN + select string_to_array(name, '/') into _parts; + return _parts[array_length(_parts,1)]; +END +$$; + +-- Function to update last accessed time +CREATE OR REPLACE FUNCTION storage.update_updated_at_column() +RETURNS TRIGGER +LANGUAGE plpgsql +AS $$ +BEGIN + NEW.updated_at = now(); + return NEW; +END +$$; + +-- Create the trigger for objects table +CREATE TRIGGER update_storage_objects_updated_at +BEFORE UPDATE ON storage.objects +FOR EACH ROW EXECUTE FUNCTION storage.update_updated_at_column(); \ No newline at end of file diff --git a/volumes/storage-init.sql b/volumes/storage-init.sql new file mode 100644 index 0000000..c669ef7 --- /dev/null +++ b/volumes/storage-init.sql @@ -0,0 +1,76 @@ +-- Create storage schema if it doesn't exist +CREATE SCHEMA IF NOT EXISTS storage; + +-- Enable uuid-ossp extension if not enabled +CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; + +-- Grant permissions on the storage schema +GRANT ALL PRIVILEGES ON SCHEMA storage TO postgres; +GRANT ALL PRIVILEGES ON SCHEMA storage TO anon; +GRANT ALL PRIVILEGES ON SCHEMA storage TO authenticated; +GRANT ALL PRIVILEGES ON SCHEMA storage TO service_role; + +-- Create storage.buckets table +CREATE TABLE IF NOT EXISTS storage.buckets ( + id text NOT NULL, + name text NOT NULL, + owner uuid, + created_at timestamptz DEFAULT now(), + updated_at timestamptz DEFAULT now(), + public boolean DEFAULT FALSE, + avif_autodetection boolean DEFAULT FALSE, + file_size_limit integer, + allowed_mime_types text[], + CONSTRAINT buckets_pkey PRIMARY KEY (id), + CONSTRAINT buckets_name_key UNIQUE (name) +); + +-- Create storage.objects table +CREATE TABLE IF NOT EXISTS storage.objects ( + id uuid DEFAULT uuid_generate_v4() NOT NULL, + bucket_id text, + name text, + owner uuid, + created_at timestamptz DEFAULT now(), + updated_at timestamptz DEFAULT now(), + last_accessed_at timestamptz DEFAULT now(), + metadata jsonb, + path_tokens text[] GENERATED ALWAYS AS (string_to_array(name, '/')) STORED, + CONSTRAINT objects_pkey PRIMARY KEY (id), + CONSTRAINT objects_bucketid_name_key UNIQUE (bucket_id, name), + CONSTRAINT objects_buckets_fkey FOREIGN KEY (bucket_id) REFERENCES storage.buckets(id) ON DELETE CASCADE +); + +-- Grant permissions on the tables +GRANT ALL PRIVILEGES ON TABLE storage.buckets TO postgres; +GRANT ALL PRIVILEGES ON TABLE storage.buckets TO anon; +GRANT ALL PRIVILEGES ON TABLE storage.buckets TO authenticated; +GRANT ALL PRIVILEGES ON TABLE storage.buckets TO service_role; + +GRANT ALL PRIVILEGES ON TABLE storage.objects TO postgres; +GRANT ALL PRIVILEGES ON TABLE storage.objects TO anon; +GRANT ALL PRIVILEGES ON TABLE storage.objects TO authenticated; +GRANT ALL PRIVILEGES ON TABLE storage.objects TO service_role; + +-- Enable Row Level Security +ALTER TABLE storage.buckets ENABLE ROW LEVEL SECURITY; +ALTER TABLE storage.objects ENABLE ROW LEVEL SECURITY; + +-- Create default policies +CREATE POLICY "Public buckets are viewable by everyone." ON storage.buckets + FOR SELECT USING (public = true); + +CREATE POLICY "Users can insert their own objects." ON storage.objects + FOR INSERT WITH CHECK (bucket_id IN ( + SELECT id FROM storage.buckets WHERE public = true + )); + +CREATE POLICY "Public objects are viewable by everyone." ON storage.objects + FOR SELECT USING (bucket_id IN ( + SELECT id FROM storage.buckets WHERE public = true + )); + +-- Create public bucket +INSERT INTO storage.buckets (id, name, public) +VALUES ('public', 'public', true) +ON CONFLICT (id) DO NOTHING; \ No newline at end of file