commit eb067dd9fdad7aa8821d4f54b62ac9b2b5b9ea24 · veryroundbird.house/fanfic-atproto

+3 -1

db/seed.ts

···

       7
       7
        
         ]);

     

       8
       8
        
       

     

       9
       9
        
         await db.insert(Works).values([

     

       10
       10
       -
           { 

     

       10
       10
       +
           {

     

       11
       11
       +
             slug: "1234",

     

       11
       12
        
             author: "test", 

     

       12
       13
        
             title: "Hey there title",

     

       13
       14
        
             content: "<p>i have evil html</p>",

     

       14
       15
        
             tags: [{ label: "test", url: "#" }],

     

       15
       16
        
           },

     

       16
       17
        
           { 

     

       18
       18
       +
             slug: "1235",

     

       17
       19
        
             author: "another", 

     

       18
       20
        
             title: "Hello world",

     

       19
       21
        
             content: "<p>whoag i have <b>BOLD</b></p>",

+2

src/actions/index.ts

···

       1
       1
       +
       import { usersActions } from "./users";

     

       1
       2
        
       import { worksActions } from "./works";

     

       2
       3
        
       

     

       3
       4
        
       export const server = {

     

       5
       5
       +
         usersActions,

     

       4
       6
        
         worksActions,

     

       5
       7
        
       };

+7

src/actions/works.ts

···

       1
       1
        
       import { ActionError, defineAction } from "astro:actions";

     

       2
       2
        
       import { z } from "astro:content";

     

       3
       3
        
       import { db, eq, Users, Works } from "astro:db";

     

       4
       4
       +
       import { customAlphabet } from "nanoid";

     

       4
       5
        
       

     

       5
       6
        
       const workSchema = z.object({

     

       6
       7
        
         title: z.string(),

     
···

       36
       37
        
                 eq(Users.userDid, context.locals.loggedInUser.did)

     

       37
       38
        
               );

     

       38
       39
        
             

     

       40
       40
       +
             // check nanoid for collision probability: https://zelark.github.io/nano-id-cc/

     

       41
       41
       +
             const alphabet = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';

     

       42
       42
       +
             const nanoid = customAlphabet(alphabet, 16);

     

       43
       43
       +
             const slug = nanoid();

     

       44
       44
       +
             

     

       39
       45
        
             const work = await db.insert(Works).values({

     

       46
       46
       +
               slug,

     

       40
       47
        
               author: userId[0].did,

     

       41
       48
        
               title: input.title,

     

       42
       49
        
               content: input.content,

+2 -2

src/assets/styles/base.css

···

       35
       35
        
         --space-2xl-3xl: clamp(4.5rem, 3.2727rem + 5.4545cqi, 7.5rem);

     

       36
       36
        
         

     

       37
       37
        
         /* font tokens */

     

       38
       38
       -
         --serif: var(--plex-serif);

     

       39
       38
        
         --sans: var(--atkinson);

     

       39
       39
       +
         --serif: var(--plex-serif);

     

       40
       40
        
         --mono: var(--plex-mono);

     

       41
       41
       -
       

     

       41
       41
       +
         

     

       42
       42
        
         --body: var(--serif);

     

       43
       43
        
       }

     

       44
       44

+15

src/components/Navbar.astro

···

       1
       1
       +
       ---

     

       2
       2
       +
       const LINKS = [

     

       3
       3
       +
         { label: "Home", url: "/" },

     

       4
       4
       +
         { label: "Works", url: "/works" },

     

       5
       5
       +
         { label: "Login", url: "/login" },

     

       6
       6
       +
         { label: "Settings", url: "/user" },

     

       7
       7
       +
       ];

     

       8
       8
       +
       ---

     

       9
       9
       +
       <nav id="main-nav">

     

       10
       10
       +
         <ul>

     

       11
       11
       +
           {LINKS.map(({ label, url }) => (

     

       12
       12
       +
             <li><a href={url}>{label}</a></li>

     

       13
       13
       +
           ))}

     

       14
       14
       +
         </ul>

     

       15
       15
       +
       </nav>

+32 -3

src/layouts/Layout.astro

···

       1
       1
        
       ---

     

       2
       2
       +
       import "$/styles/base.css";

     

       2
       3
        
       import { Font } from "astro:assets";

     

       3
       3
       -
       import "$/styles/base.css";

     

       4
       4
       +
       import Navbar from "~/Navbar.astro";

     

       5
       5
       +
       

     

       6
       6
       +
       interface Props {

     

       7
       7
       +
       	title?: string;

     

       8
       8
       +
       	skipLink?: string;

     

       9
       9
       +
       }

     

       4
       10
        
       

     

       5
       5
       -
       const { title = "fanfics" } = Astro.props;

     

       11
       11
       +
       const { title = "fanfics", skipLink } = Astro.props;

     

       6
       12
        
       ---

     

       7
       13
        
       <html lang="en">

     

       8
       14
        
       	<head>

     
···

       17
       23
        
       		<slot name="head" />

     

       18
       24
        
       	</head>

     

       19
       25
        
       	<body>

     

       26
       26
       +
       		<header>

     

       27
       27
       +
       			{skipLink && (

     

       28
       28
       +
       				<a class="skip-link" href={`#${skipLink}`}>Skip to content</a>

     

       29
       29
       +
       			)}

     

       30
       30
       +
       

     

       31
       31
       +
       			<Navbar />

     

       32
       32
       +
       		</header>

     

       33
       33
       +
       

     

       20
       34
        
       		<slot />

     

       35
       35
       +
       

     

       36
       36
       +
       		<footer>

     

       37
       37
       +
       			copyright or something ig

     

       38
       38
       +
       		</footer>

     

       21
       39
        
       	</body>

     

       22
       22
       -
       </html>
     

       40
       40
       +
       </html>

     

       41
       41
       +
       

     

       42
       42
       +
       <style>

     

       43
       43
       +
       	.skip-link {

     

       44
       44
       +
       		position: absolute;

     

       45
       45
       +
       		left: calc(max-content * -1);

     

       46
       46
       +
       	}

     

       47
       47
       +
       

     

       48
       48
       +
       	footer {

     

       49
       49
       +
       		margin-top: auto;

     

       50
       50
       +
       	}

     

       51
       51
       +
       </style>

src/layouts/Work.astro src/layouts/WorkPage.astro

+5 -5

src/lib/types.ts

···

       1
       1
        
       export interface Work {

     

       2
       2
       -
         id: number;

     

       2
       2
       +
         slug: string;

     

       3
       3
        
         title: string;

     

       4
       4
       -
         author: number | string;

     

       5
       5
       -
         tags: Array<Tag>;

     

       4
       4
       +
         author: string;

     

       5
       5
       +
         tags: Tag[];

     

       6
       6
        
         content: string;

     

       7
       7
       -
         createdAt: Date | string;

     

       8
       8
       -
         updatedAt: Date | string | undefined;

     

       7
       7
       +
         createdAt: Date;

     

       8
       8
       +
         updatedAt: Date | undefined;

     

       9
       9
        
       }

     

       10
       10
        
       

     

       11
       11
        
       export interface Tag {

+8 -11

src/pages/index.astro

···

       1
       1
        
       ---

     

       2
       2
        
       import Layout from "../layouts/Layout.astro";

     

       3
       3
       -
       import Settings from "~/Settings.astro";

     

       4
       3
        
       

     

       5
       4
        
       const currentUser = Astro.locals.loggedInUser;

     

       6
       5
        
       ---

     

       7
       7
       -
       <Layout>

     

       8
       8
       -
       	<h1>hi</h1>

     

       9
       9
       -
       	<main>

     

       6
       6
       +
       <Layout skipLink="content">

     

       7
       7
       +
       	<main id="content">

     

       8
       8
       +
       		<h1>hi</h1>

     

       10
       9
        
       		<p>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Praesentium eum est quisquam distinctio magni recusandae quia vero tempore consectetur! Dolore repellat, voluptatem dignissimos sit eaque iste atque facilis in saepe?</p>

     

       11
       10
        
       		<p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Dolorem, maxime libero eveniet repellat corporis, architecto voluptate maiores ullam accusamus quasi nostrum nihil placeat cum earum ex voluptatum, harum sunt quam!</p>

     

       12
       11
        
       	</main>

     

       13
       12
        
       

     

       14
       14
       -
       	<Settings />

     

       15
       15
       -
       

     

       16
       13
        
       	{currentUser

     

       17
       14
        
       		? <>

     

       18
       18
       -
       			<p>you're logged in!</p>

     

       19
       19
       -
       			<form action="/oauth/logout" method="post">

     

       20
       20
       -
       				<button>logout</button>

     

       21
       21
       -
       			</form>

     

       22
       22
       -
       		</>

     

       15
       15
       +
       				<p>you're logged in!</p>

     

       16
       16
       +
       				<form action="/oauth/logout" method="post">

     

       17
       17
       +
       					<button>logout</button>

     

       18
       18
       +
       				</form>

     

       19
       19
       +
       			</>

     

       23
       20
        
       		: <a href="/login">login</a>}

     

       24
       21
        
       </Layout>

+8

src/pages/not-found.astro

···

       1
       1
       +
       ---

     

       2
       2
       +
       import Layout from "../layouts/Layout.astro"

     

       3
       3
       +
       ---

     

       4
       4
       +
       <Layout>

     

       5
       5
       +
         <h1>Not found!</h1>

     

       6
       6
       +
         <p>There's a chance that the resource you're looking for doesn't exist or there was a typo in the URL.</p>

     

       7
       7
       +
         <p>You can go back to the <a href="/">home page</a> or report the issue through the contact form.</p>

     

       8
       8
       +
       </Layout>

+22

src/pages/user/[id].astro

···

       1
       1
       +
       ---

     

       2
       2
       +
       import { db, eq, Users, Works } from "astro:db";

     

       3
       3
       +
       

     

       4
       4
       +
       const { id } = Astro.params;

     

       5
       5
       +
       

     

       6
       6
       +
       const user = await db.select()

     

       7
       7
       +
         .from(Users)

     

       8
       8
       +
         .where(eq(Users.userDid, id!))

     

       9
       9
       +
         .innerJoin(Works, eq(Works.author, Users.userDid))

     

       10
       10
       +
         .limit(1);

     

       11
       11
       +
       

     

       12
       12
       +
       if (user.length === 0) {

     

       13
       13
       +
         return Astro.redirect("/not-found");

     

       14
       14
       +
       }

     

       15
       15
       +
       ---

     

       16
       16
       +
       

     

       17
       17
       +
       {user.map(({ Users, Works }) => (

     

       18
       18
       +
         <>

     

       19
       19
       +
           <h1>{Users.userDid}</h1>

     

       20
       20
       +
           {JSON.stringify(Works)}

     

       21
       21
       +
         </>

     

       22
       22
       +
       ))}

+72

src/pages/user/index.astro

···

       1
       1
       +
       ---

     

       2
       2
       +
       import Layout from "@/layouts/Layout.astro";

     

       3
       3
       +
       import { actions } from "astro:actions";

     

       4
       4
       +
       import { db, eq, Users, Works } from "astro:db";

     

       5
       5
       +
       import Dialog from "~/Dialog.astro";

     

       6
       6
       +
       

     

       7
       7
       +
       const loggedInUser = Astro.locals.loggedInUser;

     

       8
       8
       +
       

     

       9
       9
       +
       const user = await db.select()

     

       10
       10
       +
         .from(Users)

     

       11
       11
       +
         .where(eq(Users.userDid, loggedInUser?.did ?? ""))

     

       12
       12
       +
         .fullJoin(Works, eq(Users.userDid, Works.author));

     

       13
       13
       +
       

     

       14
       14
       +
       if (!loggedInUser) {

     

       15
       15
       +
         return Astro.redirect("/login");

     

       16
       16
       +
       }

     

       17
       17
       +
       ---

     

       18
       18
       +
       <Layout>

     

       19
       19
       +
         <h1>User Settings</h1>

     

       20
       20
       +
         <p>{loggedInUser?.handle}</p>

     

       21
       21
       +
         

     

       22
       22
       +
         <!-- registration will only happen in the below form! -->

     

       23
       23
       +
         {!user && (

     

       24
       24
       +
           <>

     

       25
       25
       +
             <h2>Connect account</h2>

     

       26
       26
       +
             <div class="info">

     

       27
       27
       +
               <p>Right now, you aren't connected to the site. You can connect your BlueSky / self-hosted PDS account to this website to post a work.</p>

     

       28
       28
       +
               <p>Please check out the Terms of Service, Privacy Policy, and Code of Conduct before connecting your account.</p>

     

       29
       29
       +
             </div>

     

       30
       30
       +
             <button id="trigger-confirm">Connect your PDS Account</button>

     

       31
       31
       +
             

     

       32
       32
       +
             <Dialog id="connect-account" title="Are you sure?">

     

       33
       33
       +
               <form action={actions.usersActions.addUser} method="post">

     

       34
       34
       +
                 <input type="hidden" name="did" value={loggedInUser.did} />

     

       35
       35
       +
                 

     

       36
       36
       +
                 <button formmethod="dialog">Cancel</button>

     

       37
       37
       +
                 <button>Confirm</button>

     

       38
       38
       +
               </form>

     

       39
       39
       +
             </Dialog>

     

       40
       40
       +
           </>

     

       41
       41
       +
         )}

     

       42
       42
       +
         

     

       43
       43
       +
         <!-- this is weird but this should ONLY render if the user is registered -->

     

       44
       44
       +
         {user.map(({ Users, Works }) => {

     

       45
       45
       +
           if (Users) {

     

       46
       46
       +
             return (

     

       47
       47
       +
               <>

     

       48
       48
       +
                 <time datetime={Users.joinedAt.toISOString()}>{Users.joinedAt}</time>

     

       49
       49
       +
                 <p>{Users.userDid}</p>

     

       50
       50
       +
       

     

       51
       51
       +
                 {Works

     

       52
       52
       +
                   ? <section>

     

       53
       53
       +
                       <ul>

     

       54
       54
       +
                         {JSON.stringify(Works)}

     

       55
       55
       +
                       </ul>

     

       56
       56
       +
                     </section>

     

       57
       57
       +
                   : <a href="/works/add">go write! if you want :)</a>

     

       58
       58
       +
                 }

     

       59
       59
       +
               </>

     

       60
       60
       +
             )

     

       61
       61
       +
           }

     

       62
       62
       +
         })}

     

       63
       63
       +
       </Layout>

     

       64
       64
       +
       

     

       65
       65
       +
       <script>

     

       66
       66
       +
         const trigger = document.getElementById("trigger-confirm");

     

       67
       67
       +
         const confirmDialog = document.getElementById("connect-account") as HTMLDialogElement;

     

       68
       68
       +
       

     

       69
       69
       +
         trigger?.addEventListener("click", (_) => {

     

       70
       70
       +
           confirmDialog.showModal();

     

       71
       71
       +
         });

     

       72
       72
       +
       </script>

+14 -11

src/pages/works/[id].astro

···

       5
       5
        
       

     

       6
       6
        
       const { id } = Astro.params;

     

       7
       7
        
       

     

       8
       8
       -
       const works = await db.select()

     

       8
       8
       +
       const work = await db.select()

     

       9
       9
        
         .from(Works)

     

       10
       10
       -
         .where(eq(Works.id, Number(id)))

     

       10
       10
       +
         .where(eq(Works.slug, id!))

     

       11
       11
        
         .innerJoin(Users, eq(Works.author, Users.userDid))

     

       12
       12
        
         .limit(1);

     

       13
       13
        
       

     

       14
       14
       +
       if (work.length === 0) {

     

       15
       15
       +
         return Astro.redirect("/not-found");

     

       16
       16
       +
       }

     

       14
       17
        
       ---

     

       15
       18
        
       <Layout>

     

       16
       16
       -
         {works.map(({ Works, Users }) => (

     

       17
       17
       -
           <h1>{Works.title}</h1>

     

       18
       18
       -
           <h2>{Users.userDid}</h2>

     

       19
       19
       -
           <time datetime={Works.createdAt.toISOString()}>{Works.createdAt}</time>

     

       20
       20
       -
           <ul>

     

       21
       21
       -
             {(Works.tags as unknown as Tag[]).map(tag => (

     

       22
       22
       -
               <li><a href={tag.url}>{tag.label}</a></li>

     

       19
       19
       +
         {work.map(({ Works, Users }) => (

     

       20
       20
       +
           <>

     

       21
       21
       +
             <h1>{Works.title}</h1>

     

       22
       22
       +
             <h2>{Users.userDid}</h2>

     

       23
       23
       +
             <time datetime={Works.createdAt.toISOString()}>{Works.createdAt}</time>

     

       24
       24
       +
             {(Works.tags as Tag[]).map(tag => (

     

       25
       25
       +
               <a href={tag.url}>{tag.label}</a>

     

       23
       26
        
             ))}

     

       24
       24
       -
           </ul>

     

       25
       27
        
       

     

       26
       26
       -
           <Fragment set:html={Works.content} />

     

       28
       28
       +
             <Fragment set:html={Works.content} />

     

       29
       29
       +
           </>

     

       27
       30
        
         ))}

     

       28
       31
        
       </Layout>

+1 -1

src/pages/works/index.astro

···

       18
       18
        
       

     

       19
       19
        
         {works.map(({ Works, Users }) => (

     

       20
       20
        
           <article>

     

       21
       21
       -
             <h2>{Works.title}</h2>

     

       21
       21
       +
             <h2><a href={`/works/${Works.slug}`}>{Works.title}</a></h2>

     

       22
       22
        
             <h3>{Users.userDid}</h3>

     

       23
       23
        
             <time datetime={Works.createdAt.toISOString()}>{Works.createdAt}</time>

     

       24
       24
        
             {(Works.tags as Tag[]).map((tag: Tag) => (