buttons

src/app/api/schema.ts

@@ -275,6 +275,7 @@ export interface components {
       authorId: string
       content: string
       media: components['schemas']['CreatePostRequestMedia'][]
+      isPublic: boolean | null
     }
     CreatePostRequestMedia: {
       /** Format: uuid */
@@ -292,7 +293,7 @@ export interface components {
       postId: string
     }
     GetAllPublicPostsResponse: {
-      posts: components['schemas']['PublicPostDto'][]
+      posts: components['schemas']['PostDto'][]
       /** Format: uuid */
       next: string | null
     }
@@ -305,21 +306,21 @@ export interface components {
       userId: string
       username: string
     }
-    PublicPostAuthorDto: {
+    PostAuthorDto: {
       /** Format: uuid */
       authorId: string
       username: string
     }
-    PublicPostDto: {
-      author: components['schemas']['PublicPostAuthorDto']
+    PostDto: {
+      author: components['schemas']['PostAuthorDto']
       /** Format: uuid */
       postId: string
       content: string
-      media: components['schemas']['PublicPostMediaDto'][]
+      media: components['schemas']['PostMediaDto'][]
       /** Format: date-time */
       createdAt: string
     }
-    PublicPostMediaDto: {
+    PostMediaDto: {
       /** Format: uri */
       url: string
       /** Format: int32 */

src/app/auth/components/AuthNavButtons.tsx

@@ -0,0 +1,30 @@
+import { useUser } from '../../user/userStore.ts'
+import NavButton from '../../../components/buttons/NavButton.tsx'
+import { useLocation } from 'react-router-dom'
+
+export default function AuthNavButtons() {
+  const { user } = useUser()
+
+  const { pathname } = useLocation()
+
+  const redirectQuery = new URLSearchParams()
+  redirectQuery.set('t', pathname)
+
+  const loggedIn = user != null
+
+  if (loggedIn) {
+    return (
+      <>
+        <NavButton to="/logout">logout</NavButton>
+      </>
+    )
+  } else {
+    const search = redirectQuery.toString()
+    return (
+      <>
+        <NavButton to={{ pathname: '/login', search }}>login</NavButton>
+        <NavButton to={{ pathname: '/signup', search }}>register</NavButton>
+      </>
+    )
+  }
+}

src/app/auth/pages/LoginPage.tsx

@@ -1,11 +1,13 @@
 import { useRef, useState, FormEvent, useEffect } from 'react'
 import SingleColumnLayout from '../../../layouts/SingleColumnLayout.tsx'
-import TextInput from '../../../components/TextInput.tsx'
-import PrimaryButton from '../../../components/PrimaryButton.tsx'
+import TextInput from '../../../components/inputs/TextInput.tsx'
+import Button from '../../../components/buttons/Button.tsx'
 import { AuthService } from '../authService.ts'
 import { useNavigate } from 'react-router-dom'
-import SecondaryNavButton from '../../../components/SecondaryNavButton.tsx'
 import { useUser } from '../../user/userStore.ts'
+import NavBar from '../../../components/NavBar.tsx'
+import NavButton from '../../../components/buttons/NavButton.tsx'
+import LinkButton from '../../../components/buttons/LinkButton.tsx'
 
 interface LoginPageProps {
   authService: AuthService
@@ -24,7 +26,8 @@ export default function LoginPage({ authService }: LoginPageProps) {
 
   useEffect(() => {
     if (user) {
-      navigate('/')
+      const search = new URLSearchParams(window.location.search)
+      navigate(search.get('t') || '/')
     }
   }, [user, navigate])
 
@@ -55,7 +58,13 @@ export default function LoginPage({ authService }: LoginPageProps) {
   }
 
   return (
-    <SingleColumnLayout>
+    <SingleColumnLayout
+      navbar={
+        <NavBar>
+          <NavButton to={'/'}>home</NavButton>
+        </NavBar>
+      }
+    >
       <main className="w-full mx-auto p-4">
         <div className="mt-12">
           <form className="flex flex-col gap-4 max-w-md" onSubmit={onSubmit}>
@@ -86,11 +95,13 @@ export default function LoginPage({ authService }: LoginPageProps) {
               />
             </div>
 
-            <PrimaryButton className="mt-4" disabled={isSubmitting} type="submit">
+            <Button className="mt-4" disabled={isSubmitting} type="submit">
               {isSubmitting ? 'wait...' : 'make login pls'}
-            </PrimaryButton>
+            </Button>
 
-            <SecondaryNavButton to={'/signup'}>register instead?</SecondaryNavButton>
+            <LinkButton secondary to={{ pathname: '/signup', search: window.location.search }}>
+              register instead?
+            </LinkButton>
 
             <span className="text-xs h-3 text-red-500">{error}</span>
           </form>

src/app/auth/pages/SignupPage.tsx

@@ -1,12 +1,14 @@
 import { useNavigate, useParams } from 'react-router-dom'
 import { useEffect, useRef, useState, FormEvent, useCallback, Ref } from 'react'
 import SingleColumnLayout from '../../../layouts/SingleColumnLayout.tsx'
-import TextInput from '../../../components/TextInput.tsx'
-import PrimaryButton from '../../../components/PrimaryButton.tsx'
-import PrimaryLinkButton from '../../../components/PrimaryLinkButton.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 SecondaryNavButton from '../../../components/SecondaryNavButton.tsx'
+import LinkButton from '../../../components/buttons/LinkButton.tsx'
+import NavBar from '../../../components/NavBar.tsx'
+import NavButton from '../../../components/buttons/NavButton.tsx'
 
 const SignupCodeKey = 'signupCode'
 
@@ -82,7 +84,13 @@ export default function SignupPage({ authService }: SignupPageProps) {
   }
 
   return (
-    <SingleColumnLayout>
+    <SingleColumnLayout
+      navbar={
+        <NavBar>
+          <NavButton to={'/'}>home</NavButton>
+        </NavBar>
+      }
+    >
       <main className="w-full mx-auto p-4">
         <div className="mt-12">
           <form className="flex flex-col gap-4 max-w-md" onSubmit={onSubmit}>
@@ -102,14 +110,16 @@ export default function SignupPage({ authService }: SignupPageProps) {
               type="password"
               ref={passwordInputRef}
             />
-            <PrimaryButton
+            <Button
               className="mt-4"
               disabled={isSubmitting || !!usernameError || !!passwordError}
               type="submit"
             >
               {isSubmitting ? 'wait...' : 'give me an account pls'}
-            </PrimaryButton>
-            <SecondaryNavButton to={'/login'}>login instead?</SecondaryNavButton>
+            </Button>
+            <LinkButton secondary to={'/login'}>
+              login instead?
+            </LinkButton>
           </form>
         </div>
       </main>
@@ -130,9 +140,9 @@ export default function SignupPage({ authService }: SignupPageProps) {
             If you <span className="italic">do</span> want to create an account, you should know who
             to contact
           </p>
-          <PrimaryLinkButton className={`mt-4`} href="https://en.wikipedia.org/wiki/Special:Random">
+          <AnchorButton className={`mt-4`} href="https://en.wikipedia.org/wiki/Special:Random">
             I'm sorry I'll go somewhere else :(
-          </PrimaryLinkButton>
+          </AnchorButton>
         </div>
       </dialog>
     </SingleColumnLayout>

src/app/feed/pages/AuthorPage.tsx

@@ -5,7 +5,8 @@ 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 NavLinkButton from '../../../components/NavLinkButton.tsx'
+import NavButton from '../../../components/buttons/NavButton.tsx'
+import AuthNavButtons from '../../auth/components/AuthNavButtons.tsx'
 
 interface AuthorPageParams {
   postsService: PostsService
@@ -27,8 +28,8 @@ export default function AuthorPage({ postsService }: AuthorPageParams) {
     <SingleColumnLayout
       navbar={
         <NavBar>
-          <NavLinkButton to={'/'}>home</NavLinkButton>
-          <NavLinkButton to="/logout">logout</NavLinkButton>
+          <NavButton to={'/'}>home</NavButton>
+          <AuthNavButtons />
         </NavBar>
       }
     >

src/app/feed/pages/HomePage.tsx

@@ -9,7 +9,7 @@ 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 NavLinkButton from '../../../components/NavLinkButton.tsx'
+import AuthNavButtons from '../../auth/components/AuthNavButtons.tsx'
 
 interface HomePageProps {
   postsService: PostsService
@@ -18,7 +18,6 @@ interface HomePageProps {
 
 export default function HomePage({ postsService, mediaService }: HomePageProps) {
   const { user } = useUser()
-
   const [isSubmitting, setIsSubmitting] = useState(false)
 
   const fetchPosts = useCallback(
@@ -59,16 +58,18 @@ export default function HomePage({ postsService, mediaService }: HomePageProps)
     [mediaService, postsService, setPages, user],
   )
 
+  const isLoggedIn = user != null
+
   return (
     <SingleColumnLayout
       navbar={
         <NavBar>
-          <NavLinkButton to="/logout">logout</NavLinkButton>
+          <AuthNavButtons />
         </NavBar>
       }
     >
       <main className={`w-full max-w-3xl mx-auto`}>
-        <NewPostWidget onSubmit={onCreatePost} isSubmitting={isSubmitting} />
+        {isLoggedIn && <NewPostWidget onSubmit={onCreatePost} isSubmitting={isSubmitting} />}
         <FeedView pages={pages} onLoadMore={loadNextPage} />
       </main>
     </SingleColumnLayout>

src/app/feed/posts/postsService.ts

@@ -4,7 +4,12 @@ import client from '../../api/client.ts'
 export class PostsService {
   constructor() {}
 
-  async createNew(authorId: string, content: string, media: CreatePostMedia[]): Promise<string> {
+  async createNew(
+    authorId: string,
+    content: string,
+    media: CreatePostMedia[],
+    isPublic: boolean,
+  ): Promise<string> {
     const response = await client.POST('/posts', {
       body: {
         authorId,
@@ -12,6 +17,7 @@ export class PostsService {
         media: media.map((m) => {
           return { ...m, type: null, url: m.url.toString() }
         }),
+        isPublic,
       },
       credentials: 'include',
     })