diff --git a/package.json b/package.json index ada1684..e9b6b9c 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,14 @@ { "name": "femto-webapp", "private": true, - "version": "1.26.6", + "version": "1.16.0", "type": "module", "scripts": { "dev": "vite --host 0.0.0.0", "build": "tsc -b && vite build", "lint": "eslint .", "preview": "vite preview", - "build:deploy": "bash scripts/publish.sh", + "build:deploy": "bash scripts/bump-build-push.sh", "generate:schema": "node scripts/generate-schema.mjs" }, "dependencies": { @@ -20,8 +20,7 @@ "react": "^19.0.0", "react-dom": "^19.0.0", "react-router-dom": "^7.6.0", - "tailwindcss": "^4.1.5", - "zustand": "^5.0.7" + "tailwindcss": "^4.1.5" }, "devDependencies": { "@eslint/js": "^9.22.0", diff --git a/public/forgejo-logo-primary.svg b/public/forgejo-logo-primary.svg deleted file mode 100644 index 7f64c1a..0000000 --- a/public/forgejo-logo-primary.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - Forgejo logo - Caesar Schinas - - - - - - - - - - - - - diff --git a/scripts/bump-build-push.sh b/scripts/bump-build-push.sh new file mode 100755 index 0000000..ae679c6 --- /dev/null +++ b/scripts/bump-build-push.sh @@ -0,0 +1,57 @@ +#!/bin/bash + +set -euo pipefail + +# CONFIGURATION +REGISTRY="docker.botris.dev" +USERNAME="johnbotris" +IMAGE_NAME="femto-webapp" + +# Add this before the docker build line +export VITE_API_URL="https://femto-api.botris.social" + + +# Step 0: Ensure clean working directory +if [[ -n $(git status --porcelain) ]]; then + echo "❌ Uncommitted changes detected. Please commit or stash them before running this script." + exit 1 +fi + +# Step 1: Store current version to revert if needed +OLD_VERSION=$(node -p "require('./package.json').version") +echo "🔍 Current version: $OLD_VERSION" + +# Step 2: Bump version without Git tag/commit +echo "🚀 Bumping minor version..." +yarn version --minor --no-git-tag-version +NEW_VERSION=$(node -p "require('./package.json').version") +echo "📦 New version: $NEW_VERSION" + +# Step 3: Attempt Docker build +echo "🔧 Building Docker image..." + +if ! docker build --build-arg VITE_API_URL="$VITE_API_URL" -t $IMAGE_NAME .; then + echo "❌ Docker build failed. Reverting version bump..." + git checkout -- package.json yarn.lock + exit 1 +fi + +# Step 4: Tag and push Docker image +FULL_IMAGE="$REGISTRY/$USERNAME/$IMAGE_NAME" +echo "🏷️ Tagging Docker image..." +docker tag $IMAGE_NAME $FULL_IMAGE:$NEW_VERSION +docker tag $IMAGE_NAME $FULL_IMAGE:latest + +echo "📤 Pushing Docker images..." +docker push $FULL_IMAGE:$NEW_VERSION +docker push $FULL_IMAGE:latest + +# Step 5: Commit version bump & tag +echo "✅ Committing and tagging version bump..." +git add package.json yarn.lock +git commit -m "v$NEW_VERSION" +git tag "v$NEW_VERSION" +git push origin main +git push origin "v$NEW_VERSION" + +echo "🎉 Release v$NEW_VERSION complete." diff --git a/scripts/publish.sh b/scripts/publish.sh deleted file mode 100755 index 68a75e4..0000000 --- a/scripts/publish.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -# Function to display help text -show_help() { - echo "Usage: $0 [OPTIONS]" - echo - echo "Description:" - echo " This script automates the process of bumping the version, building a Docker image," - echo " pushing it to the registry, and optionally deploying to production." - echo - echo "Options:" - echo " -h,--help Display this help message and exit" - echo " -d,--deploy Deploy to production after building and pushing" - echo " --major Bump the major version (x.0.0)" - echo " --minor Bump the minor version (0.x.0)" - echo " --patch Bump the patch version (0.0.x) [default]" - echo - echo "Examples:" - echo " $0 # Bump patch version, build and push" - echo " $0 --minor # Bump minor version, build and push" - echo " $0 --major -d # Bump major version, build, push and deploy" - echo " $0 --patch --deploy # Bump patch version, build, push and deploy" - echo -} - -# Parse command line arguments -DEPLOY=false -VERSION_TYPE="patch" # Default to patch version bump - -for arg in "$@"; do - case "$arg" in - -h|--help) show_help; exit 0 ;; - -d|--deploy) DEPLOY=true ;; - --major) VERSION_TYPE="major" ;; - --minor) VERSION_TYPE="minor" ;; - --patch) VERSION_TYPE="patch" ;; - *) echo "Unknown option: $arg"; echo "Usage: $0 [-h|--help] [-d|--deploy] [--major|--minor|--patch]"; exit 1 ;; - esac -done - -# CONFIGURATION -REGISTRY="docker.botris.dev" -USERNAME="johnbotris" -IMAGE_NAME="femto-webapp" - -# Add this before the docker build line -export VITE_API_URL="https://api.botris.social" - -# Step 0: Ensure clean working directory -if [[ -n $(git status --porcelain) ]]; then - echo "❌ Uncommitted changes detected. Please commit or stash them before running this script." - exit 1 -fi - -# Step 1: Store current version to revert if needed -OLD_VERSION=$(node -p "require('./package.json').version") -echo "🔍 Current version: $OLD_VERSION" - -# Step 2: Bump version without Git tag/commit -echo "🚀 Bumping $VERSION_TYPE version..." -yarn version --$VERSION_TYPE --no-git-tag-version -NEW_VERSION=$(node -p "require('./package.json').version") -echo "📦 New version: $NEW_VERSION" - -# Step 3: Attempt Docker build -echo "🔧 Building Docker image..." - -if ! docker build --build-arg VITE_API_URL="$VITE_API_URL" -t $IMAGE_NAME .; then - echo "❌ Docker build failed. Reverting version bump..." - git checkout -- package.json yarn.lock - exit 1 -fi - -# Step 4: Tag and push Docker image -FULL_IMAGE="$REGISTRY/$USERNAME/$IMAGE_NAME" -echo "🏷️ Tagging Docker image..." -docker tag $IMAGE_NAME $FULL_IMAGE:$NEW_VERSION -docker tag $IMAGE_NAME $FULL_IMAGE:latest - -echo "📤 Pushing Docker images..." -docker push $FULL_IMAGE:$NEW_VERSION -docker push $FULL_IMAGE:latest - -# Step 5: Commit version bump & tag -echo "✅ Committing and tagging version bump..." -git add package.json yarn.lock -git commit -m "v$NEW_VERSION" -git tag "v$NEW_VERSION" -git push origin main -git push origin "v$NEW_VERSION" - -echo "🎉 Release v$NEW_VERSION complete." - -# Step 6: Deploy if flag is set -if [ "$DEPLOY" = true ]; then - echo "🚀 Deploying to production..." - ssh john@botris.social 'bash /home/john/docker/femto/update.sh' - echo "✅ Deployment complete." -fi diff --git a/src/App.tsx b/src/App.tsx index 9063592..c1406bc 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,6 +1,6 @@ import { BrowserRouter, Route, Routes } from 'react-router-dom' import HomePage from './app/feed/pages/HomePage.tsx' -import PostPage from './app/feed/pages/PostPage.tsx' +import AuthorPage from './app/feed/pages/AuthorPage.tsx' import SignupPage from './app/auth/pages/SignupPage.tsx' import LoginPage from './app/auth/pages/LoginPage.tsx' import LogoutPage from './app/auth/pages/LogoutPage.tsx' @@ -8,36 +8,13 @@ import UnauthorizedHandler from './app/auth/components/UnauthorizedHandler.tsx' import AdminPage from './app/admin/pages/AdminPage.tsx' import SignupCodesManagementPage from './app/admin/pages/subpages/SignupCodesManagementPage.tsx' import { useRefreshSessionLoop } from './useRefreshSessionLoop.ts' -import { setGlobal } from './app/femtoApp.ts' -import { PostsService } from './app/feed/posts/postsService.ts' -import { MediaService } from './app/media/mediaService.ts' -import { AuthService } from './app/auth/authService.ts' -import { initClient } from './app/api/client.ts' -import { useEffect } from 'react' -import { useUserStore } from './app/user/user.ts' -import { getUserFromCookie } from './app/auth/getUserFromCookie.ts' +import { initApp } from './initApp.ts' -setGlobal('version', import.meta.env.VITE_FEMTO_VERSION) - -const client = initClient() -const postService = new PostsService(client) -const mediaService = new MediaService(client) -const authService = new AuthService(client) - -setGlobal('postsService', postService) -setGlobal('authService', authService) +const { postService, mediaService, authService } = initApp() export default function App() { - const setUser = useUserStore((state) => state.setUser) - useRefreshSessionLoop(authService) - useEffect(() => { - const user = getUserFromCookie() - console.debug('got user cookie', user) - setUser(user) - }, [setUser]) - return ( @@ -46,7 +23,7 @@ export default function App() { path={'/'} element={} /> - } /> + } /> } /> } /> } /> diff --git a/src/app/admin/pages/subpages/SignupCodesManagementPage.tsx b/src/app/admin/pages/subpages/SignupCodesManagementPage.tsx index 0075c73..366d5cd 100644 --- a/src/app/admin/pages/subpages/SignupCodesManagementPage.tsx +++ b/src/app/admin/pages/subpages/SignupCodesManagementPage.tsx @@ -1,5 +1,5 @@ import { AuthService } from '../../../auth/authService.ts' -import { useEffect, useState, useRef, MouseEvent, useCallback } from 'react' +import { useEffect, useState, useRef, MouseEvent } from 'react' import { SignupCode } from '../../../auth/signupCode.ts' import { Temporal } from '@js-temporal/polyfill' import Button from '../../../../components/buttons/Button.tsx' @@ -12,24 +12,25 @@ export default function SignupCodesManagementPage({ authService }: SignupCodesMa const [codes, setCodes] = useState([]) const [code, setCode] = useState('') const [name, setName] = useState('') + const [email, setEmail] = useState('') const [isLoading, setIsLoading] = useState(false) const [error, setError] = useState(null) const dialogRef = useRef(null) const [tooltipPosition, setTooltipPosition] = useState<{ x: number; y: number } | null>(null) const [activeCode, setActiveCode] = useState(null) - const fetchCodes = useCallback(async () => { + const fetchCodes = async () => { try { setCodes(await authService.listSignupCodes()) } catch (err) { console.error('Failed to fetch signup codes:', err) } - }, [authService]) + } useEffect(() => { const timeoutId = setTimeout(fetchCodes) return () => clearTimeout(timeoutId) - }, [authService, fetchCodes]) + }, [authService]) const handleCreateCode = async (e: React.FormEvent) => { e.preventDefault() @@ -37,11 +38,12 @@ export default function SignupCodesManagementPage({ authService }: SignupCodesMa setError(null) try { - await authService.createSignupCode(code, name) + await authService.createSignupCode(code, email, name) setCode('') setName('') + setEmail('') dialogRef.current?.close() - fetchCodes() + fetchCodes() // Refresh the table } catch (err) { setError(err instanceof Error ? err.message : 'Failed to create signup code') } finally { @@ -114,6 +116,7 @@ export default function SignupCodesManagementPage({ authService }: SignupCodesMa Code + Email Redeemed By Expires On @@ -131,6 +134,7 @@ export default function SignupCodesManagementPage({ authService }: SignupCodesMa {code.code} + {code.email} {code.redeemedBy || 'Not redeemed'} {formatDate(code.expiresOn)} @@ -187,6 +191,20 @@ export default function SignupCodesManagementPage({ authService }: SignupCodesMa /> +
+ + setEmail(e.target.value)} + className="w-full px-3 py-2 border border-gray-300 rounded-md" + required + /> +
+
- {t('auth.login.register_instead')} + register instead? - {error} + {error}
diff --git a/src/app/auth/pages/LogoutPage.tsx b/src/app/auth/pages/LogoutPage.tsx index dfceb5c..dea8a72 100644 --- a/src/app/auth/pages/LogoutPage.tsx +++ b/src/app/auth/pages/LogoutPage.tsx @@ -1,7 +1,7 @@ import { useNavigate } from 'react-router-dom' import { AuthService } from '../authService.ts' import { useEffect } from 'react' -import { useUserStore } from '../../user/user.ts' +import { useUser } from '../../user/user.ts' interface LogoutPageProps { authService: AuthService @@ -9,7 +9,7 @@ interface LogoutPageProps { export default function LogoutPage({ authService }: LogoutPageProps) { const navigate = useNavigate() - const user = useUserStore((state) => state.user) + const user = useUser() useEffect(() => { if (!user) { diff --git a/src/app/auth/pages/SignupPage.tsx b/src/app/auth/pages/SignupPage.tsx index 40cbb37..19b2ab4 100644 --- a/src/app/auth/pages/SignupPage.tsx +++ b/src/app/auth/pages/SignupPage.tsx @@ -3,12 +3,12 @@ import { useEffect, useRef, useState, FormEvent, useCallback, Ref } from 'react' import SingleColumnLayout from '../../../layouts/SingleColumnLayout.tsx' import TextInput from '../../../components/inputs/TextInput.tsx' import Button from '../../../components/buttons/Button.tsx' +import AnchorButton from '../../../components/buttons/AnchorButton.tsx' import { invalid, valid, Validation } from '../../../utils/validation.ts' import { AuthService } from '../authService.ts' import LinkButton from '../../../components/buttons/LinkButton.tsx' import NavBar from '../../../components/NavBar.tsx' import NavButton from '../../../components/buttons/NavButton.tsx' -import { useTranslations } from '../../i18n/translations.ts' const SignupCodeKey = 'signupCode' @@ -17,11 +17,9 @@ interface SignupPageProps { } export default function SignupPage({ authService }: SignupPageProps) { - const { t } = useTranslations() const { code } = useParams() const [signupCode, setSignupCode] = useState(null) const [isSubmitting, setIsSubmitting] = useState(false) - const [rememberMe, setRememberMe] = useState(false) const [error, setError] = useState('') const [username, setUsername, usernameError, validateUsername] = useValidatedInput(isValidUsername) @@ -32,6 +30,8 @@ export default function SignupPage({ authService }: SignupPageProps) { const userNameInputRef = useRef(null) const passwordInputRef = useRef(null) + const dialogRef = useRef(null) + const navigate = useNavigate() useEffect(() => { @@ -46,6 +46,10 @@ export default function SignupPage({ authService }: SignupPageProps) { theSignupCode = localStorage.getItem(SignupCodeKey) setSignupCode(theSignupCode) } + + if (!theSignupCode) { + dialogRef.current?.showModal() + } }, [code, signupCode]) useEffect(() => {}, [signupCode]) @@ -75,7 +79,7 @@ export default function SignupPage({ authService }: SignupPageProps) { setIsSubmitting(true) try { - await authService.signup(username, password, signupCode, rememberMe) + await authService.signup(username, password, signupCode) navigate('/') } catch (e: unknown) { const err = e as Error @@ -89,7 +93,7 @@ export default function SignupPage({ authService }: SignupPageProps) { - {t('nav.home')} + home } > @@ -98,7 +102,6 @@ export default function SignupPage({ authService }: SignupPageProps) {
-
- setRememberMe(e.target.checked)} - className="h-4 w-4" - /> - -
- {t('auth.register.login_instead')} + login instead? {error} + + +
+

STOP !!!

+

You need an invitation to sign up

+

+ I'm surprised you even found your way here without one and honestly I'd prefer it if you + would leave +

+

+ If you do want to create an account, you should know who + to contact +

+ + I'm sorry I'll go somewhere else :( + +
+
) } interface FormInputProps { id: string - label: string value: string onInput: (value: string) => void error: string | null @@ -155,11 +166,11 @@ interface FormInputProps { ref: Ref } -function FormInput({ id, label, value, onInput, error, type = 'text', ref }: FormInputProps) { +function FormInput({ id, value, onInput, error, type = 'text', ref }: FormInputProps) { return (
{error}
diff --git a/src/app/feed/components/FeedView.ts b/src/app/feed/components/FeedView.ts new file mode 100644 index 0000000..b79acb9 --- /dev/null +++ b/src/app/feed/components/FeedView.ts @@ -0,0 +1,36 @@ +import { useCallback, useRef, useState } from 'react' +import { Post } from '../posts/posts.ts' + +const PageSize = 20 + +export function useFeedViewModel( + loadMore: (cursor: string | null, amount: number) => Promise, +) { + const [pages, setPages] = useState([]) + const [hasMore, setHasMore] = useState(true) + const [error, setError] = useState(null) + + const cursor = useRef(null) + const loading = useRef(false) + + const loadNextPage = useCallback(async () => { + if (loading.current || !hasMore || error) return + loading.current = true + + try { + const delay = new Promise((resolve) => setTimeout(resolve, 500)) + const pagePromise = loadMore(cursor.current, PageSize) + const [page] = await Promise.all([pagePromise, delay]) + setHasMore(page.length >= PageSize) + cursor.current = page.at(-1)?.postId ?? null + setPages((prev) => [...prev, page]) + } catch (e: unknown) { + const err = e as Error + setError(err.message) + } finally { + loading.current = false + } + }, [loadMore, hasMore, error]) + + return { pages, setPages, loadNextPage, error } as const +} diff --git a/src/app/feed/components/FeedView.tsx b/src/app/feed/components/FeedView.tsx new file mode 100644 index 0000000..d35256f --- /dev/null +++ b/src/app/feed/components/FeedView.tsx @@ -0,0 +1,29 @@ +import { useRef } from 'react' +import { useIntersectionLoad } from '../../../hooks/useIntersectionLoad.ts' +import { Post } from '../posts/posts.ts' +import PostItem from './PostItem.tsx' + +interface FeedViewProps { + pages: Post[][] + onLoadMore: () => Promise +} + +export default function FeedView({ pages, onLoadMore }: FeedViewProps) { + const sentinelRef = useRef(null) + const posts = pages.flat() + + useIntersectionLoad(onLoadMore, sentinelRef) + + return ( +
+
+
+ {posts.map((post) => ( + + ))} +
+
+
+
+ ) +} diff --git a/src/app/feed/components/NewCommentWidget.tsx b/src/app/feed/components/NewCommentWidget.tsx deleted file mode 100644 index 3d2e4ea..0000000 --- a/src/app/feed/components/NewCommentWidget.tsx +++ /dev/null @@ -1,58 +0,0 @@ -import { useState } from 'react' -import FancyTextEditor, { - TextInputKeyDownEvent, -} from '../../../components/inputs/FancyTextEditor.tsx' -import Button from '../../../components/buttons/Button.tsx' -import { useTranslations } from '../../i18n/translations.ts' - -interface NewCommentWidgetProps { - onSubmit: (content: string) => void - isSubmitting?: boolean -} - -export default function NewCommentWidget({ - onSubmit, - isSubmitting = false, -}: NewCommentWidgetProps) { - const { t } = useTranslations() - const [content, setContent] = useState('') - - const onContentInput = (value: string) => { - setContent(value) - } - - const handleSubmit = () => { - if (!content.trim()) { - return - } - - onSubmit(content) - - setContent('') - } - - const onInputKeyDown = (e: TextInputKeyDownEvent) => { - if (e.key === 'Enter' && e.ctrlKey) { - e.preventDefault() - handleSubmit() - } - } - - return ( -
- - -
- -
-
- ) -} diff --git a/src/app/feed/components/PostItem.tsx b/src/app/feed/components/PostItem.tsx index db766f6..582e05b 100644 --- a/src/app/feed/components/PostItem.tsx +++ b/src/app/feed/components/PostItem.tsx @@ -1,24 +1,12 @@ -import { PostMedia, PostReaction } from '../posts/posts.ts' -import { useEffect, useState } from 'react' +import { Post, PostMedia } from '../posts/posts.ts' import { Link } from 'react-router-dom' -import { PostInfo } from '../posts/usePostViewModel.ts' -import { useUserStore } from '../../user/user.ts' +import { useEffect, useState } from 'react' interface PostItemProps { - post: PostInfo - reactions: PostReaction[] - addReaction: (emoji: string) => void - clearReaction: (emoji: string) => void - hideViewButton?: boolean + post: Post } -export default function PostItem({ - post, - reactions, - addReaction, - clearReaction, - hideViewButton = false, -}: PostItemProps) { +export default function PostItem({ post }: PostItemProps) { const formattedDate = post.createdAt.toLocaleString('en-US', { year: 'numeric', month: 'short', @@ -41,15 +29,10 @@ export default function PostItem({ return (
- @{post.authorName}• {formattedDate} - {!hideViewButton && ( - <> - {' • '} - - View - - - )} + + @{post.authorName} + + • {formattedDate}
{post.content}
@@ -61,77 +44,10 @@ export default function PostItem({ ))}
)} - - ) } -interface PostReactionsProps { - post: PostInfo - reactions: PostReaction[] - addReaction: (emoji: string) => void - clearReaction: (emoji: string) => void -} - -function PostReactions({ post, reactions, addReaction, clearReaction }: PostReactionsProps) { - const username = useUserStore((state) => state.user?.username) - return ( -
- {post.possibleReactions.map((emoji) => { - const count = reactions.filter((r) => r.emoji === emoji).length - const didReact = reactions.some((r) => r.emoji == emoji && r.authorName == username) - const onClick = () => { - if (didReact) { - clearReaction(emoji) - } else { - addReaction(emoji) - } - } - - return ( - - ) - })} -
- ) -} - -interface PostReactionButtonProps { - emoji: string - didReact: boolean - count: number - onClick: () => void -} - -function PostReactionButton({ emoji, didReact, onClick, count }: PostReactionButtonProps) { - const formattedCount = count < 100 ? count.toString() : `99+` - - return ( - - ) -} - interface PostMediaProps { media: PostMedia } @@ -150,6 +66,7 @@ function PostMediaItem({ media }: PostMediaProps) { width={width} height={height} src={url.toString()} + alt="todo sry :(" className="w-full h-auto" loading="lazy" /> diff --git a/src/app/feed/components/PostTimeline.tsx b/src/app/feed/components/PostTimeline.tsx deleted file mode 100644 index c9653f1..0000000 --- a/src/app/feed/components/PostTimeline.tsx +++ /dev/null @@ -1,67 +0,0 @@ -import { PostComment, PostReaction } from '../posts/posts.ts' -import { Temporal } from '@js-temporal/polyfill' - -interface PostTimelineProps { - reactions: PostReaction[] - comments: PostComment[] -} - -export function PostTimeline({ reactions, comments }: PostTimelineProps) { - const items = [ - ...reactions.map((reaction) => ({ - timestamp: reaction.reactedOn, - component: ( - - ), - })), - ...comments.map((comment) => ({ - timestamp: comment.postedOn, - component: ( - - ), - })), - ].toSorted((a, b) => Temporal.Instant.compare(a.timestamp, b.timestamp)) - - return ( -
{items.map((item) => item.component)}
- ) -} - -function ReactionItem({ reaction }: { reaction: PostReaction }) { - return ( -
- {formatItemDate(reaction.reactedOn)} -
- @{reaction.authorName}  - clicked  - {reaction.emoji} -
-
- ) -} - -function CommentItem({ comment }: { comment: PostComment }) { - return ( -
-
{formatItemDate(comment.postedOn)}
-
- @{comment.author}  -
-
{comment.content}
-
- ) -} - -function formatItemDate(date: Temporal.Instant) { - return date.toLocaleString('en-AU', { - year: 'numeric', - month: 'numeric', - day: 'numeric', - }) -} diff --git a/src/app/feed/pages/AuthorPage.tsx b/src/app/feed/pages/AuthorPage.tsx new file mode 100644 index 0000000..d937b88 --- /dev/null +++ b/src/app/feed/pages/AuthorPage.tsx @@ -0,0 +1,39 @@ +import { useCallback } from 'react' +import FeedView from '../components/FeedView.tsx' +import { PostsService } from '../posts/postsService.ts' +import { useParams } from 'react-router-dom' +import SingleColumnLayout from '../../../layouts/SingleColumnLayout.tsx' +import NavBar from '../../../components/NavBar.tsx' +import { useFeedViewModel } from '../components/FeedView.ts' +import NavButton from '../../../components/buttons/NavButton.tsx' +import AuthNavButtons from '../../auth/components/AuthNavButtons.tsx' + +interface AuthorPageParams { + postsService: PostsService +} + +export default function AuthorPage({ postsService }: AuthorPageParams) { + const { username } = useParams() + + const fetchPosts = useCallback( + async (cursor: string | null, amount: number | null) => { + return postsService.loadByAuthor(username!, cursor, amount) + }, + [postsService, username], + ) + + const { pages, loadNextPage } = useFeedViewModel(fetchPosts) + + return ( + + home + + + } + > + + + ) +} diff --git a/src/app/feed/pages/HomePage.tsx b/src/app/feed/pages/HomePage.tsx index b505d83..73b6d84 100644 --- a/src/app/feed/pages/HomePage.tsx +++ b/src/app/feed/pages/HomePage.tsx @@ -1,104 +1,71 @@ -import { useRef, useState } from 'react' +import { useCallback, useState } from 'react' +import FeedView from '../components/FeedView.tsx' import { PostsService } from '../posts/postsService.ts' -import { useUserStore } from '../../user/user.ts' +import { useUser } from '../../user/user.ts' import { MediaService } from '../../media/mediaService.ts' -import NewPostWidget from '../components/NewPostWidget.tsx' +import NewPostWidget from '../../../components/NewPostWidget.tsx' +import { useFeedViewModel } from '../components/FeedView.ts' +import { Post } from '../posts/posts.ts' +import { Temporal } from '@js-temporal/polyfill' import SingleColumnLayout from '../../../layouts/SingleColumnLayout.tsx' import NavBar from '../../../components/NavBar.tsx' import AuthNavButtons from '../../auth/components/AuthNavButtons.tsx' import { useSaveSignupCodeToLocalStorage } from '../../../hooks/useSaveSignupCodeToLocalStorage.ts' -import PostItem from '../components/PostItem.tsx' -import { useIntersectionLoad } from '../../../hooks/useIntersectionLoad.ts' -import { delay } from '../../../utils/delay.ts' -import { usePostViewModel } from '../posts/usePostViewModel.ts' -import { Temporal } from '@js-temporal/polyfill' interface HomePageProps { postsService: PostsService mediaService: MediaService } -const PageSize = 20 - export default function HomePage({ postsService, mediaService }: HomePageProps) { - const user = useUserStore((state) => state.user) + const user = useUser() useSaveSignupCodeToLocalStorage() const [isSubmitting, setIsSubmitting] = useState(false) - const { posts, addPosts, addReaction, removeReaction, reactions } = usePostViewModel() + const fetchPosts = useCallback( + async (cursor: string | null, amount: number | null) => { + return postsService.loadPublicFeed(cursor, amount) + }, + [postsService], + ) - const [hasMore, setHasMore] = useState(true) - const [error, setError] = useState(null) + const { pages, setPages, loadNextPage } = useFeedViewModel(fetchPosts) - const cursor = useRef(null) - const loading = useRef(false) + const onCreatePost = useCallback( + async ( + content: string, + files: { file: File; width: number; height: number }[], + isPublic: boolean, + ) => { + setIsSubmitting(true) + if (user == null) throw new Error('Not logged in') + try { + const media = await Promise.all( + files.map(async ({ file, width, height }) => { + const { mediaId, url } = await mediaService.uploadImage(file) - const loadNextPage = async () => { - if (loading.current || !hasMore || error) return - loading.current = true - - try { - const [{ posts }] = await Promise.all([ - postsService.loadPublicFeed(cursor.current, PageSize), - delay(500), - ]) - - setHasMore(posts.length >= PageSize) - cursor.current = posts.at(-1)?.postId ?? null - addPosts(posts) - } catch (e: unknown) { - setError((e as Error).message) - } finally { - loading.current = false - } - } - - const onCreatePost = async ( - content: string, - files: { file: File; width: number; height: number }[], - isPublic: boolean, - ) => { - setIsSubmitting(true) - if (user == null) throw new Error('Not logged in') - try { - const media = await Promise.all( - files.map(async ({ file, width, height }) => { - const { mediaId, url } = await mediaService.uploadImage(file) - - return { - mediaId, - url, - width, - height, - } - }), - ) - const post = await postsService.createNew(user.id, content, media, isPublic) - addPosts([post]) - } catch (error) { - console.error('Failed to create post:', error) - } finally { - setIsSubmitting(false) - } - } + return { + mediaId, + url, + width, + height, + } + }), + ) + const postId = await postsService.createNew(user.id, content, media, isPublic) + const post = new Post(postId, content, media, Temporal.Now.instant(), user.username) + setPages((pages) => [[post], ...pages]) + } catch (error) { + console.error('Failed to create post:', error) + } finally { + setIsSubmitting(false) + } + }, + [mediaService, postsService, setPages, user], + ) const isLoggedIn = user != null - const onAddReaction = async (postId: string, emoji: string) => { - await postsService.addReaction(postId, emoji) - - addReaction(postId, emoji, user!.username, Temporal.Now.instant()) - } - - const onClearReaction = async (postId: string, emoji: string) => { - await postsService.removeReaction(postId, emoji) - - removeReaction(postId, emoji, user!.username) - } - - const sentinelRef = useRef(null) - useIntersectionLoad(loadNextPage, sentinelRef) - return (
{isLoggedIn && } -
-
-
- {posts.map((post) => ( - onAddReaction(post.postId, emoji)} - clearReaction={(emoji) => onClearReaction(post.postId, emoji)} - /> - ))} -
-
-
-
+
) diff --git a/src/app/feed/pages/PostPage.tsx b/src/app/feed/pages/PostPage.tsx deleted file mode 100644 index b275b68..0000000 --- a/src/app/feed/pages/PostPage.tsx +++ /dev/null @@ -1,96 +0,0 @@ -import { useCallback, useEffect, useState } from 'react' -import { useParams } from 'react-router-dom' -import { PostsService } from '../posts/postsService.ts' -import SingleColumnLayout from '../../../layouts/SingleColumnLayout.tsx' -import NavBar from '../../../components/NavBar.tsx' -import AuthNavButtons from '../../auth/components/AuthNavButtons.tsx' -import PostItem from '../components/PostItem.tsx' -import NavButton from '../../../components/buttons/NavButton.tsx' -import { useTranslations } from '../../i18n/translations.ts' -import { usePostViewModel } from '../posts/usePostViewModel.ts' -import { Temporal } from '@js-temporal/polyfill' -import { useUserStore } from '../../user/user.ts' -import { PostTimeline } from '../components/PostTimeline.tsx' -import NewCommentWidget from '../components/NewCommentWidget.tsx' - -interface PostPageProps { - postsService: PostsService -} - -export default function PostPage({ postsService }: PostPageProps) { - const { postId } = useParams<{ postId: string }>() - const { posts, setPosts, addReaction, reactions: _reactions, removeReaction } = usePostViewModel() - const { t } = useTranslations() - const username = useUserStore((state) => state.user?.username) - const post = posts.at(0) - const reactions = (post?.postId ? _reactions[post.postId] : []) ?? [] - - const loadPost = useCallback(() => { - if (!postId) return - postsService.load(postId).then((post) => setPosts(post ? [post] : [])) - }, [postId, postsService, setPosts]) - - useEffect(() => { - loadPost() - }, [loadPost]) - - const onAddReaction = async (emoji: string) => { - if (!username) return - if (!post) return - - await postsService.addReaction(post.postId, emoji) - - addReaction(post.postId, emoji, username, Temporal.Now.instant()) - } - - const onClearReaction = async (emoji: string) => { - if (!username) return - if (!post) return - - await postsService.removeReaction(post.postId, emoji) - removeReaction(post.postId, emoji, username) - } - - async function onSubmitComment(content: string) { - if (!postId) return - if (!content.trim()) return - - try { - setIsSubmittingComment(true) - await postsService.addComment(postId, content) - } finally { - setIsSubmittingComment(false) - } - - loadPost() - } - - const [isSubmittingComment, setIsSubmittingComment] = useState(false) - - return ( - - {t('nav.home')} - - - } - > -
- {post && ( -
- - - -
- )} -
-
- ) -} diff --git a/src/app/feed/posts/posts.ts b/src/app/feed/posts/posts.ts index 837e2b8..77d0a5f 100644 --- a/src/app/feed/posts/posts.ts +++ b/src/app/feed/posts/posts.ts @@ -1,30 +1,12 @@ import { Temporal } from '@js-temporal/polyfill' import { components } from '../../api/schema.ts' -import { immerable } from 'immer' - -export interface PostReaction { - emoji: string - authorName: string - reactedOn: Temporal.Instant -} - -export interface PostComment { - author: string - content: string - postedOn: Temporal.Instant -} export class Post { - [immerable] = true - public readonly postId: string public readonly content: string public readonly media: PostMedia[] public readonly createdAt: Temporal.Instant public readonly authorName: string - public readonly reactions: PostReaction[] - public readonly possibleReactions: string[] - public readonly comments: PostComment[] constructor( postId: string, @@ -32,18 +14,12 @@ export class Post { media: PostMedia[], createdAt: string | Temporal.Instant, authorName: string, - reactions: PostReaction[], - possibleReactions: string[], - comments: PostComment[], ) { this.postId = postId this.content = content this.media = media this.createdAt = Temporal.Instant.from(createdAt) this.authorName = authorName - this.reactions = reactions - this.possibleReactions = possibleReactions - this.comments = comments } public static fromDto(dto: components['schemas']['PostDto']): Post { @@ -53,9 +29,6 @@ export class Post { dto.media.map((m) => new PostMediaImpl(new URL(m.url), m.width, m.height)), Temporal.Instant.from(dto.createdAt), dto.author.username, - dto.reactions.map((r) => ({ ...r, reactedOn: Temporal.Instant.from(r.reactedOn) })), - dto.possibleReactions, - dto.comments.map((c) => ({ ...c, postedOn: Temporal.Instant.from(c.postedOn) })), ) } } diff --git a/src/app/feed/posts/postsService.ts b/src/app/feed/posts/postsService.ts index 72e55f7..6eaf4cc 100644 --- a/src/app/feed/posts/postsService.ts +++ b/src/app/feed/posts/postsService.ts @@ -1,6 +1,5 @@ import { Post } from './posts.ts' import { ApiClient } from '../../api/client.ts' -import { useUserStore } from '../../user/user.ts' export class PostsService { constructor(private readonly client: ApiClient) {} @@ -10,7 +9,7 @@ export class PostsService { content: string, media: CreatePostMedia[], isPublic: boolean, - ): Promise { + ): Promise { const response = await this.client.POST('/posts', { body: { authorId, @@ -27,68 +26,39 @@ export class PostsService { throw new Error('Failed to create post') } - return Post.fromDto(response.data.post) + return response.data.postId } - async load(postId: string): Promise { - const response = await this.client.GET('/posts/{postId}', { - params: { - path: { postId }, - }, + async loadPublicFeed(cursor: string | null, amount: number | null): Promise { + const response = await this.client.GET('/posts', { + query: { cursor, amount }, credentials: 'include', }) - if (!response.data?.post) { - return null + if (!response.data) { + return [] } - return Post.fromDto(response.data.post) + return response.data?.posts.map((post) => Post.fromDto(post)) } - async loadPublicFeed(cursor: string | null, amount: number | null): Promise<{ posts: Post[] }> { + async loadByAuthor( + username: string, + cursor: string | null, + amount: number | null, + ): Promise { const response = await this.client.GET('/posts', { params: { - query: { After: cursor ?? undefined, Amount: amount ?? undefined }, + query: { From: cursor ?? undefined, Amount: amount ?? undefined, Author: username }, }, credentials: 'include', }) if (!response.data) { - return { posts: [] } + return [] } - return { posts: response.data.posts.map(Post.fromDto) } - } - - async addReaction(postId: string, emoji: string): Promise { - await this.client.POST('/posts/{postId}/reactions', { - params: { - path: { postId }, - }, - body: { emoji }, - credentials: 'include', - }) - } - - async removeReaction(postId: string, emoji: string): Promise { - await this.client.DELETE('/posts/{postId}/reactions', { - params: { - path: { postId }, - }, - body: { emoji }, - credentials: 'include', - }) - } - - async addComment(postId: string, content: string): Promise { - const authorId = useUserStore.getState().user?.id - if (!authorId) return - - await this.client.POST('/posts/{postId}/comments', { - params: { path: { postId } }, - body: { content, authorId }, - credentials: 'include', - }) + return response.data?.posts.map((post) => Post.fromDto(post)) } } diff --git a/src/app/feed/posts/usePostViewModel.ts b/src/app/feed/posts/usePostViewModel.ts deleted file mode 100644 index 2fb06bd..0000000 --- a/src/app/feed/posts/usePostViewModel.ts +++ /dev/null @@ -1,83 +0,0 @@ -import { useCallback, useState } from 'react' -import { Post, PostComment, PostMedia, PostReaction } from './posts.ts' -import { Temporal } from '@js-temporal/polyfill' -import { produce } from 'immer' - -export interface PostInfo { - postId: string - authorName: string - content: string - createdAt: Temporal.Instant - media: PostMedia[] - possibleReactions: string[] - comments: PostComment[] -} - -type ReactionMap = Record - -export function usePostViewModel() { - const [posts, _setPosts] = useState([]) - const [reactions, setReactions] = useState({}) - - const setPosts = useCallback((posts: Post[]) => { - _setPosts([...posts]) - - setReactions( - posts.reduce((acc, post) => { - acc[post.postId] = [...post.reactions] - return acc - }, {} as ReactionMap), - ) - }, []) - - const addPosts = useCallback((posts: Post[]) => { - _setPosts((current) => { - return [...current, ...posts] - }) - - setReactions((current) => - produce(current, (draft) => { - for (const post of posts) { - draft[post.postId] = [...post.reactions] - } - }), - ) - }, []) - - function addReaction( - postId: string, - emoji: string, - authorName: string, - reactedOn: Temporal.Instant, - ) { - setReactions((current) => - produce(current, (draft) => { - if (draft[postId]?.some((r) => r.emoji === emoji && r.authorName == authorName)) { - return - } - - const reaction: PostReaction = { emoji, authorName, reactedOn } - - if (!draft[postId]) { - draft[postId] = [{ ...reaction }] - } else { - draft[postId].push({ ...reaction }) - } - }), - ) - } - - function removeReaction(postId: string, emoji: string, authorName: string) { - setReactions((current) => - produce(current, (draft) => { - if (!draft[postId]) return - - draft[postId] = draft[postId].filter( - (r) => r.emoji !== emoji || r.authorName !== authorName, - ) - }), - ) - } - - return { posts, reactions, addPosts, setPosts, addReaction, removeReaction } -} diff --git a/src/app/i18n/translations.ts b/src/app/i18n/translations.ts deleted file mode 100644 index 519fc55..0000000 --- a/src/app/i18n/translations.ts +++ /dev/null @@ -1,41 +0,0 @@ -import en from './translations/en.json' assert { type: 'json' } - -interface Translation { - 'auth.login.cta': string - 'auth.login.register_instead': string - 'auth.password.label': string - 'auth.register.cta': string - 'auth.register.login_instead': string - 'auth.remember_me.label': string - 'auth.username.label': string - - 'misc.loading': string - - 'nav.admin': string - 'nav.home': string - 'nav.login': string - 'nav.logout': string - 'nav.register': string - - 'post.add_media.cta': string - 'post.editor.placeholder': string - 'post.public.label': string - 'post.submit.cta': string -} - -export type TranslationKey = keyof Translation - -export interface UseTranslations { - t: (key: K) => Translation[K] -} - -export function useTranslations(): UseTranslations { - // TODO somehow handle other languages (reactively) - const texts = en as Translation - - function getText(key: K): Translation[K] { - return texts[key] ?? key - } - - return { t: getText } -} diff --git a/src/app/i18n/translations/en.json b/src/app/i18n/translations/en.json deleted file mode 100644 index 6cc6cb5..0000000 --- a/src/app/i18n/translations/en.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "nav.home": "home", - "nav.login": "login", - "nav.register": "register", - "nav.admin": "admin", - "auth.login.cta": "login", - "auth.login.register_instead": "register instead?", - "auth.register.cta": "signup", - "auth.register.login_instead": "login instead?", - "auth.username.label": "username", - "auth.password.label": "password", - "auth.remember_me.label": "stay logged in", - "misc.loading": "wait...", - "nav.logout": "logout", - "post.add_media.cta": "+ add media", - "post.public.label": "public", - "post.submit.cta": "post", - "post.editor.placeholder": "write something..." -} \ No newline at end of file diff --git a/src/app/user/user.ts b/src/app/user/user.ts index 8ce3446..b8b8a26 100644 --- a/src/app/user/user.ts +++ b/src/app/user/user.ts @@ -1,4 +1,8 @@ -import { create } from 'zustand' +import { addMessageListener, dispatchMessage } from '../messageBus/messageBus.ts' +import { getCookie } from '../auth/cookies.ts' +import { useMessageListener } from '../../hooks/useMessageListener.ts' +import { useState } from 'react' +import { setGlobal } from '../femtoApp.ts' export interface User { id: string @@ -6,17 +10,40 @@ export interface User { roles: Role[] } -export enum Role { - User = 0, - SuperUser = 1, +type Role = 'User' | 'SuperUser' + +let globalUser: User | null + +export function initUser() { + updateUser() + + addMessageListener('auth:logged-in', updateUser) + addMessageListener('auth:registered', updateUser) + addMessageListener('auth:logged-out', updateUser) + addMessageListener('auth:refreshed', updateUser) } -interface UserState { - user: User | null - setUser: (user: User | null) => void +function updateUser() { + globalUser = getUserFromCookie() + setGlobal('user', globalUser) + dispatchMessage('user:updated', globalUser) } -export const useUserStore = create()((set) => ({ - user: null, - setUser: (user: User | null) => set({ user }), -})) +export function useUser(): User | null { + const [user, setUser] = useState(globalUser) + + useMessageListener('user:updated', (u) => { + setUser(u) + }) + + return user +} + +function getUserFromCookie(): User | null { + const userCookie = getCookie('user') + + if (!userCookie) return null + + // TODO validate but it should be fine + return JSON.parse(decodeURIComponent(userCookie)) as User +} diff --git a/src/components/NavBar.tsx b/src/components/NavBar.tsx index 89691c9..b55a24f 100644 --- a/src/components/NavBar.tsx +++ b/src/components/NavBar.tsx @@ -1,35 +1,16 @@ -import { PropsWithChildren, ReactNode } from 'react' -import { Role, useUserStore } from '../app/user/user.ts' +import { PropsWithChildren } from 'react' +import { useUser } from '../app/user/user.ts' import NavButton from './buttons/NavButton.tsx' -type NavBarProps = { - leftChildren?: ReactNode -} +type NavBarProps = unknown export default function NavBar({ children }: PropsWithChildren) { - const user = useUserStore((state) => state.user) - const isSuperUser = user?.roles.includes(Role.SuperUser) + const user = useUser() + const isSuperUser = user?.roles.includes('SuperUser') return ( -
@@ -198,15 +196,7 @@ async function optimizeImageSize( dstCanvas.width = width dstCanvas.height = height - try { - // TODO resistFingerprinting in FF and other causes this to break. - // knowing this, i would still rather be able to post from other browsers for now - // and will hopefully find a better solution - await pica.resize(srcCanvas, dstCanvas) - } catch (e) { - console.error('cant resize image', e) - return file - } + await pica.resize(srcCanvas, dstCanvas) let blob = await pica.toBlob(dstCanvas, outputType, quality) diff --git a/src/components/inputs/FancyTextEditor.tsx b/src/components/inputs/FancyTextEditor.tsx index d72c391..f23c28d 100644 --- a/src/components/inputs/FancyTextEditor.tsx +++ b/src/components/inputs/FancyTextEditor.tsx @@ -15,7 +15,7 @@ export interface TextInputKeyDownEvent { } export default function FancyTextEditor({ - value: value, + value: _value, onInput, onKeyDown, className: extraClasses = '', @@ -24,7 +24,10 @@ export default function FancyTextEditor({ const divRef = useRef(null) const [hasFocus, setHasFocus] = useState(false) - const trimmedValue = value.trim() + // the contenteditable likes to slip in newlines at the bottom of our innerText + // which makes it bad to check for empty string because it might be "\n" + // so we just trim it upfront and then fogeddaboudit + const value = _value.trim() // The funky mechanics here are to stop the cursor from jumping back the start. // It probably will have the cursor jump to the start if anything changes programmatically, @@ -35,12 +38,12 @@ export default function FancyTextEditor({ return } - if (!trimmedValue && !hasFocus) { + if (!value && !hasFocus) { div.innerText = placeholder - } else if (div.innerText.trim() !== trimmedValue) { - div.innerText = trimmedValue + } else if (div.innerText !== value) { + div.innerText = value } - }, [hasFocus, placeholder, trimmedValue]) + }, [hasFocus, placeholder, value]) useEffect(() => { const div = divRef.current! diff --git a/src/initApp.ts b/src/initApp.ts new file mode 100644 index 0000000..de47b56 --- /dev/null +++ b/src/initApp.ts @@ -0,0 +1,19 @@ +import { initUser } from './app/user/user.ts' +import { setGlobal } from './app/femtoApp.ts' +import { PostsService } from './app/feed/posts/postsService.ts' +import { MediaService } from './app/media/mediaService.ts' +import { AuthService } from './app/auth/authService.ts' +import { initClient } from './app/api/client.ts' + +export function initApp() { + setGlobal('version', import.meta.env.VITE_FEMTO_VERSION) + initUser() + + const client = initClient() + + const postService = new PostsService(client) + const mediaService = new MediaService(client) + const authService = new AuthService(client) + + return { postService, mediaService, authService } +} diff --git a/src/types.d.ts b/src/types.d.ts index c2cd42e..5600fda 100644 --- a/src/types.d.ts +++ b/src/types.d.ts @@ -19,6 +19,4 @@ declare global { export interface FemtoApp { version: string user: User | null - authService: AuthService | null - postsService: PostsService | null } diff --git a/src/useRefreshSessionLoop.ts b/src/useRefreshSessionLoop.ts index 5a0bf1c..36144ce 100644 --- a/src/useRefreshSessionLoop.ts +++ b/src/useRefreshSessionLoop.ts @@ -1,10 +1,10 @@ import { useEffect } from 'react' +import { useUser } from './app/user/user.ts' import { AuthService } from './app/auth/authService.ts' -import { useUserStore } from './app/user/user.ts' // Starts a loop that pings the server to keep the session alive, while also getting any updates on the user profile export function useRefreshSessionLoop(authService: AuthService) { - const user = useUserStore((state) => state.user) + const user = useUser() const userId = user?.id ?? null useEffect(() => { diff --git a/src/utils/debounce.ts b/src/utils/debounce.ts deleted file mode 100644 index 9f74991..0000000 --- a/src/utils/debounce.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { useCallback, useRef } from 'react' - -export function useDebounce( - fn: (...args: Args) => Promise, - delay: number, -) { - const timeout = useRef | null>(null) - - return useCallback( - (...args: Args) => { - if (timeout.current) clearTimeout(timeout.current) - - setTimeout(() => fn(...args), delay) - }, - [delay, fn], - ) -} diff --git a/src/utils/delay.ts b/src/utils/delay.ts deleted file mode 100644 index 9c70749..0000000 --- a/src/utils/delay.ts +++ /dev/null @@ -1,3 +0,0 @@ -export function delay(ms: number) { - return new Promise((resolve) => setTimeout(resolve, ms)) -} diff --git a/src/utils/groupByAndMap.ts b/src/utils/groupByAndMap.ts deleted file mode 100644 index 7f30995..0000000 --- a/src/utils/groupByAndMap.ts +++ /dev/null @@ -1,19 +0,0 @@ -export function groupByAndMap( - items: T[], - groupBy: (item: T) => string, - map: (item: T) => U, -): Record { - const groupings: Record = {} - - for (const item of items) { - const key = groupBy(item) - - if (!groupings[key]) { - groupings[key] = [] - } - - groupings[key].push(map(item)) - } - - return groupings -} diff --git a/yarn.lock b/yarn.lock index efeeb13..02021f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2574,8 +2574,3 @@ zod@^3.23.8, zod@^3.24.2: version "3.24.3" resolved "https://registry.yarnpkg.com/zod/-/zod-3.24.3.tgz#1f40f750a05e477396da64438e0e1c0995dafd87" integrity sha512-HhY1oqzWCQWuUqvBFnsyrtZRhyPeR7SUGv+C4+MsisMuVfSPx8HpwWqH8tRahSlt6M3PiFAcoeFhZAqIXTxoSg== - -zustand@^5.0.7: - version "5.0.7" - resolved "https://registry.yarnpkg.com/zustand/-/zustand-5.0.7.tgz#e325364e82c992a84bf386d8445aa7f180c450dc" - integrity sha512-Ot6uqHDW/O2VdYsKLLU8GQu8sCOM1LcoE8RwvLv9uuRT9s6SOHCKs0ZEOhxg+I1Ld+A1Q5lwx+UlKXXUoCZITg==