commit 0ed40461c4beebc94c2ee4fd477c9dce4e5ab363 · veryroundbird.house/fanfic-atproto

+3 -2

db/config.ts

···

       15
       15
        
       const Works = defineTable({

     

       16
       16
        
         columns: {

     

       17
       17
        
           id: column.number({ primaryKey: true }),

     

       18
       18
       +
           uri: column.text({ unique: true, optional: true }),

     

       18
       19
        
           slug: column.text({ unique: true }),

     

       19
       19
       -
           author: column.text({ references: () => Users.columns.userDid }),

     

       20
       20
       -
           // recordkey

     

       21
       20
        
           title: column.text(),

     

       21
       21
       +
           author: column.text({ references: () => Users.columns.userDid }),

     

       22
       22
        
           content: column.text({ multiline: true }),

     

       23
       23
        
           tags: column.json(),

     

       24
       24
        
           createdAt: column.date({ name: "created_at", default: NOW }),

     
···

       26
       26
        
         },

     

       27
       27
        
         indexes: [

     

       28
       28
        
           { on: ["slug", "createdAt"], unique: true },

     

       29
       29
       +
           { on: ["uri", "createdAt"], unique: true },

     

       29
       30
        
         ],

     

       30
       31
        
       });

     

       31
       32

+191 -32

src/actions/works.ts

···

       2
       2
        
       import { getAgent } from "@/lib/atproto";

     

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

     

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

     

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

     

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

     

       6
       6
        
       import { customAlphabet } from "nanoid";

     

       7
       7
       +
       import { AtUri } from "@atproto/api";

     

       7
       8
        
       

     

       8
       9
        
       const workSchema = z.object({

     

       9
       10
        
         title: z.string(),

     

       10
       11
        
         content: z.string(),

     

       11
       12
        
         tags: z.string(),

     

       12
       12
       -
         public: z.boolean(),

     

       13
       13
       +
         publish: z.boolean(),

     

       13
       14
        
       });

     

       14
       15
        
       

     

       15
       16
        
       export const worksActions = {

     

       16
       17
        
         addWork: defineAction({

     

       17
       18
        
           accept: "form",

     

       18
       19
        
           input: workSchema,

     

       19
       19
       -
           handler: async (input, context) => {

     

       20
       20
       +
           handler: async ({ title, content, tags, publish }, context) => {

     

       20
       21
        
             const loggedInUser = context.locals.loggedInUser;

     

       21
       22
        
       

     

       22
       23
        
             // check against auth

     
···

       28
       29
        
             }

     

       29
       30
        
       

     

       30
       31
        
             // find the did of the logged in user from our db

     

       31
       31
       -
             const query = await db

     

       32
       32
       +
             const [user] = await db

     

       32
       33
        
               .select({ did: Users.userDid })

     

       33
       34
        
               .from(Users)

     

       34
       35
        
               .where(eq(Users.userDid, loggedInUser.did))

     

       35
       36
        
               .limit(1);

     

       36
       37
        
       

     

       37
       37
       -
             if (query.length === 0) {

     

       38
       38
       +
             if (!user) {

     

       38
       39
        
               throw new ActionError({

     

       39
       40
        
                 code: "UNAUTHORIZED",

     

       40
       41
        
                 message: "You can only add a work if you connected your PDS!",

     

       41
       42
        
               });

     

       42
       43
        
             }

     

       43
       44
        
       

     

       44
       44
       -
             const [user] = query;

     

       45
       45
       +
             // convert the tags into json thru shenaniganery

     

       46
       46
       +
             console.log(tags);

     

       47
       47
       +
       

     

       48
       48
       +
             // we'll create a timestamp and record here

     

       49
       49
       +
             const createdAt = new Date();

     

       50
       50
       +
             const record = {

     

       51
       51
       +
               title,

     

       52
       52
       +
               content,

     

       53
       53
       +
               tags,

     

       54
       54
       +
             };

     

       55
       55
       +
       

     

       56
       56
       +
             let uri; // we'll assign this after a successful request was made

     

       57
       57
       +
             // depending on whether someone toggled the privacy option, push this into user pds

     

       58
       58
       +
             if (publish) {

     

       59
       59
       +
               try {

     

       60
       60
       +
                 const rkey = TID.nextStr();

     

       61
       61
       +
                 const agent = await getAgent(context.locals);

     

       62
       62
       +
       

     

       63
       63
       +
                 if (!agent) {

     

       64
       64
       +
                   console.error("Agent not found!");

     

       65
       65
       +
                   throw new ActionError({

     

       66
       66
       +
                     code: "BAD_REQUEST",

     

       67
       67
       +
                     message: "Something went wrong when connecting to your PDS.",

     

       68
       68
       +
                   });

     

       69
       69
       +
                 }

     

       70
       70
       +
       

     

       71
       71
       +
                 // ideally, we'd like tags to be references to another record but we won't process them here

     

       72
       72
       +
                 // we'll just smush this in and pray

     

       73
       73
       +
                 const result = await agent.com.atproto.repo.createRecord({

     

       74
       74
       +
                   repo: user.did,

     

       75
       75
       +
                   collection: "moe.fanfics.works",

     

       76
       76
       +
                   rkey,

     

       77
       77
       +
                   record: {

     

       78
       78
       +
                     ...record,

     

       79
       79
       +
                     createdAt: createdAt.toISOString(),

     

       80
       80
       +
                   },

     

       81
       81
       +
                   validate: false,

     

       82
       82
       +
                 });

     

       83
       83
       +
                 

     

       84
       84
       +
                 uri = result.data.uri;

     

       85
       85
       +
               } catch (error) {

     

       86
       86
       +
                 console.error(error);

     

       87
       87
       +
                 throw new ActionError({

     

       88
       88
       +
                   code: "BAD_REQUEST",

     

       89
       89
       +
                   message: "Something went wrong with posting your fic to your PDS!",

     

       90
       90
       +
                 });

     

       91
       91
       +
               }

     

       92
       92
       +
             }

     

       45
       93
        
       

     

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

     

       47
       95
        
             const alphabet = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';

     

       48
       96
        
             const nanoid = customAlphabet(alphabet, 16);

     

       49
       97
        
             const slug = nanoid();

     

       50
       98
        
       

     

       51
       51
       -
             // convert the tags into json thru shenaniganery

     

       52
       52
       -
             const tags = input.tags;

     

       53
       53
       -
             

     

       54
       99
        
             const work = await db.insert(Works).values({

     

       100
       100
       +
               uri,

     

       55
       101
        
               slug,

     

       102
       102
       +
               createdAt,

     

       56
       103
        
               author: user.did,

     

       57
       57
       -
               title: input.title,

     

       58
       58
       -
               content: input.content,

     

       59
       59
       -
               tags,

     

       104
       104
       +
               ...record,

     

       60
       105
        
             }).returning();

     

       61
       106
        
             

     

       62
       107
        
             const [newWork] = work;

     

       108
       108
       +
             return newWork;

     

       109
       109
       +
           },

     

       110
       110
       +
         }),

     

       111
       111
       +
         updateWork: defineAction({

     

       112
       112
       +
           accept: "form",

     

       113
       113
       +
           input: workSchema,

     

       114
       114
       +
           handler: async ({ title, content, tags }, context) => {

     

       115
       115
       +
             const workId = context.params["workId"];

     

       116
       116
       +
             const loggedInUser = context.locals.loggedInUser;

     

       117
       117
       +
             

     

       118
       118
       +
             if (!loggedInUser) {

     

       119
       119
       +
               throw new ActionError({

     

       120
       120
       +
                 code: "UNAUTHORIZED",

     

       121
       121
       +
                 message: "You're not logged in!",

     

       122
       122
       +
               });

     

       123
       123
       +
             }

     

       63
       124
        
       

     

       64
       64
       -
             // depending on whether someone toggled the privacy option, push this into user pds

     

       65
       65
       -
             if (input.public) {

     

       66
       66
       -
               // we don't need the id, but we'll need the author's did

     

       67
       67
       -
               // we'll grab the created + updated timestamps and convert them into strings

     

       68
       68
       -
               const { author, id, createdAt, updatedAt, ...data } = newWork;

     

       69
       69
       -
               const createdTimestamp = createdAt.toISOString();

     

       70
       70
       -
               const record = {

     

       71
       71
       -
                 ...data,

     

       72
       72
       -
                 createdAt: createdTimestamp,

     

       73
       73
       -
               };

     

       74
       74
       -
               

     

       125
       125
       +
             const [work] = await db.select().from(Works)

     

       126
       126
       +
               .where(and(

     

       127
       127
       +
                 eq(Works.slug, workId!),

     

       128
       128
       +
                 eq(Works.author, loggedInUser.did)

     

       129
       129
       +
               ))

     

       130
       130
       +
               .limit(1);

     

       131
       131
       +
             

     

       132
       132
       +
             if (!work) {

     

       133
       133
       +
               throw new ActionError({

     

       134
       134
       +
                 code: "NOT_FOUND",

     

       135
       135
       +
                 message: "Could not find the work to update!",

     

       136
       136
       +
               });

     

       137
       137
       +
             }

     

       138
       138
       +
       

     

       139
       139
       +
             const updatedAt = new Date();

     

       140
       140
       +
             // if the work has a uri, we should update the record to the pds

     

       141
       141
       +
             if (work.uri) {

     

       75
       142
        
               try {

     

       76
       76
       -
                 const rkey = TID.nextStr();

     

       143
       143
       +
                 const { rkey, host } = new AtUri(work.uri);

     

       77
       144
        
                 const agent = await getAgent(context.locals);

     

       78
       145
        
       

     

       79
       146
        
                 if (!agent) {

     

       80
       147
        
                   console.error("Agent not found!");

     

       81
       148
        
                   throw new ActionError({

     

       82
       82
       -
                     code: "BAD_REQUEST",

     

       149
       149
       +
                     code: "INTERNAL_SERVER_ERROR",

     

       83
       150
        
                     message: "Something went wrong when connecting to your PDS.",

     

       84
       151
        
                   });

     

       85
       152
        
                 }

     

       86
       153
        
       

     

       87
       87
       -
                 // ideally, we'd like tags to be references to another record but we won't process them here

     

       154
       154
       +
                 if (loggedInUser.did !== host) {

     

       155
       155
       +
                   throw new ActionError({

     

       156
       156
       +
                     code: "UNAUTHORIZED",

     

       157
       157
       +
                     message: "You can only update your own work!",

     

       158
       158
       +
                   });

     

       159
       159
       +
                 }

     

       160
       160
       +
       

     

       88
       161
        
                 // we'll just smush this in and pray

     

       89
       162
        
                 const result = await agent.com.atproto.repo.putRecord({

     

       90
       90
       -
                   repo: author, // since we KNOW that the author is the users' did

     

       163
       163
       +
                   repo: work.author, // since the author will be a did

     

       91
       164
        
                   collection: "moe.fanfics.works",

     

       92
       165
        
                   rkey,

     

       93
       93
       -
                   record,

     

       166
       166
       +
                   record: {

     

       167
       167
       +
                     title,

     

       168
       168
       +
                     tags,

     

       169
       169
       +
                     content,

     

       170
       170
       +
                     updatedAt: updatedAt.toISOString(),

     

       171
       171
       +
                   },

     

       94
       172
        
                   validate: false,

     

       173
       173
       +
                   swapRecord: rkey, // idk what this does

     

       95
       174
        
                 });

     

       96
       175
        
       

     

       97
       97
       -
                 return result.data.uri;

     

       176
       176
       +
                 if (!result.success) {

     

       177
       177
       +
                   throw new ActionError({

     

       178
       178
       +
                     code: "INTERNAL_SERVER_ERROR",

     

       179
       179
       +
                     message: "Something went wrong with updating your fic on your PDS!",

     

       180
       180
       +
                   });

     

       181
       181
       +
                 }

     

       98
       182
        
               } catch (error) {

     

       99
       183
        
                 console.error(error);

     

       100
       184
        
                 throw new ActionError({

     

       101
       185
        
                   code: "BAD_REQUEST",

     

       102
       102
       -
                   message: "Something went wrong with posting your fic to your PDS!",

     

       186
       186
       +
                   message: "Something went wrong with updating your fic on your PDS!",

     

       103
       187
        
                 });

     

       104
       188
        
               }

     

       105
       189
        
             }

     

       190
       190
       +
       

     

       191
       191
       +
             const [result] = await db.update(Works)

     

       192
       192
       +
               .set({

     

       193
       193
       +
                 title,

     

       194
       194
       +
                 tags,

     

       195
       195
       +
                 content,

     

       196
       196
       +
                 updatedAt,

     

       197
       197
       +
               })

     

       198
       198
       +
               .where(and(

     

       199
       199
       +
                 eq(Works.slug, workId!),

     

       200
       200
       +
                 eq(Works.author, loggedInUser.did)

     

       201
       201
       +
               ))

     

       202
       202
       +
               .returning();

     

       106
       203
        
             

     

       107
       107
       -
             // otherwise just return the work

     

       108
       108
       -
             return newWork;

     

       204
       204
       +
             return result;

     

       205
       205
       +
           },

     

       206
       206
       +
         }),

     

       207
       207
       +
         deleteWork: defineAction({

     

       208
       208
       +
           accept: "form",

     

       209
       209
       +
           handler: async (_, context) => {

     

       210
       210
       +
             const workId = context.params["workId"];

     

       211
       211
       +
             const loggedInUser = context.locals.loggedInUser;

     

       212
       212
       +
       

     

       213
       213
       +
             if (!loggedInUser) {

     

       214
       214
       +
               throw new ActionError({

     

       215
       215
       +
                 code: "UNAUTHORIZED",

     

       216
       216
       +
                 message: "You're not logged in!",

     

       217
       217
       +
               });

     

       218
       218
       +
             }

     

       219
       219
       +
       

     

       220
       220
       +
             const [work] = await db.select().from(Works)

     

       221
       221
       +
               .where(and(

     

       222
       222
       +
                 eq(Works.slug, workId!),

     

       223
       223
       +
                 eq(Works.author, loggedInUser.did)

     

       224
       224
       +
               ))

     

       225
       225
       +
               .limit(1);

     

       226
       226
       +
             

     

       227
       227
       +
             if (!work) {

     

       228
       228
       +
               throw new ActionError({

     

       229
       229
       +
                 code: "NOT_FOUND",

     

       230
       230
       +
                 message: "Could not find the work!",

     

       231
       231
       +
               });

     

       232
       232
       +
             }

     

       233
       233
       +
       

     

       234
       234
       +
             if (work.uri) {

     

       235
       235
       +
               try {

     

       236
       236
       +
                 const { rkey, host } = new AtUri(work.uri);

     

       237
       237
       +
                 const agent = await getAgent(context.locals);

     

       238
       238
       +
       

     

       239
       239
       +
                 if (!agent) {

     

       240
       240
       +
                   console.error("Agent not found!");

     

       241
       241
       +
                   throw new ActionError({

     

       242
       242
       +
                     code: "INTERNAL_SERVER_ERROR",

     

       243
       243
       +
                     message: "Something went wrong when connecting to your PDS.",

     

       244
       244
       +
                   });

     

       245
       245
       +
                 }

     

       246
       246
       +
       

     

       247
       247
       +
                 if (loggedInUser.did !== host) {

     

       248
       248
       +
                   throw new ActionError({

     

       249
       249
       +
                     code: "UNAUTHORIZED",

     

       250
       250
       +
                     message: "You can only delete works that you own!",

     

       251
       251
       +
                   });

     

       252
       252
       +
                 }

     

       253
       253
       +
       

     

       254
       254
       +
                 // we'll just smush this in and pray

     

       255
       255
       +
                 const result = await agent.com.atproto.repo.deleteRecord({

     

       256
       256
       +
                   repo: work.author, // since the author will be a did

     

       257
       257
       +
                   collection: "moe.fanfics.works",

     

       258
       258
       +
                   rkey,

     

       259
       259
       +
                 });

     

       260
       260
       +
               } catch (error) {

     

       261
       261
       +
                 console.error(error);

     

       262
       262
       +
                 throw new ActionError({

     

       263
       263
       +
                   code: "BAD_REQUEST",

     

       264
       264
       +
                   message: "Something went wrong with deleting your fic from your PDS!",

     

       265
       265
       +
                 });

     

       266
       266
       +
               }

     

       267
       267
       +
             }

     

       109
       268
        
           },

     

       110
       269
        
         }),

     

       111
       270
        
       };

-29

src/pages/works/[workId].astro

···

       1
       1
       -
       ---

     

       2
       2
       -
       import WorkPage from "@/layouts/WorkPage.astro";

     

       3
       3
       -
       import { didToHandle } from "@/lib/atproto";

     

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

     

       5
       5
       -
       

     

       6
       6
       -
       const { workId } = Astro.params;

     

       7
       7
       -
       

     

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

     

       9
       9
       -
         .from(Works)

     

       10
       10
       -
         .where(eq(Works.slug, workId!))

     

       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
       -
       }

     

       17
       17
       -
       ---

     

       18
       18
       -
       {work.map(async ({ Works, Users }) => (

     

       19
       19
       -
         <WorkPage 

     

       20
       20
       -
           slug={Works.slug}

     

       21
       21
       -
           title={Works.title}

     

       22
       22
       -
           author={await didToHandle(Users.userDid)}

     

       23
       23
       -
           createdAt={Works.createdAt}

     

       24
       24
       -
           updatedAt={Works.updatedAt}

     

       25
       25
       -
           tags={Works.tags}

     

       26
       26
       -
         >

     

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

     

       28
       28
       -
         </WorkPage>

     

       29
       29
       -
       ))}

+93

src/pages/works/[workId]/edit.astro

···

       1
       1
       +
       ---

     

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

     

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

     

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

     

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

     

       6
       6
       +
       

     

       7
       7
       +
       const { workId } = Astro.params;

     

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

     

       9
       9
       +
       

     

       10
       10
       +
       // the work could be fetched from the database or from the pds

     

       11
       11
       +
       // would this potentially lighten db load? maybe

     

       12
       12
       +
       const [work] = await db.select()

     

       13
       13
       +
         .from(Works)

     

       14
       14
       +
         .where(eq(Works.slug, workId!))

     

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

     

       16
       16
       +
         .limit(1);

     

       17
       17
       +
       

     

       18
       18
       +
       if (!work) {

     

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

     

       20
       20
       +
       }

     

       21
       21
       +
       

     

       22
       22
       +
       if (!loggedInUser) {

     

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

     

       24
       24
       +
       }

     

       25
       25
       +
       

     

       26
       26
       +
       if (work.Users.userDid !== loggedInUser.did) {

     

       27
       27
       +
         return Astro.redirect("/unauthorized");

     

       28
       28
       +
       }

     

       29
       29
       +
       

     

       30
       30
       +
       const result = Astro.getActionResult(actions.worksActions.updateWork);

     

       31
       31
       +
       const errors = isInputError(result?.error) ? result.error.fields : {};

     

       32
       32
       +
       ---

     

       33
       33
       +
       <Layout skipLink={`edit-${workId}`}>

     

       34
       34
       +
         <main id={`edit-${workId}`}>

     

       35
       35
       +
           <form action={actions.worksActions.updateWork} method="post">

     

       36
       36
       +
             <label for="title">title</label>

     

       37
       37
       +
             <input 

     

       38
       38
       +
               type="text" 

     

       39
       39
       +
               name="title" 

     

       40
       40
       +
               id="title" 

     

       41
       41
       +
               aria-describedby="title-error" 

     

       42
       42
       +
               value={work.Works.title}  

     

       43
       43
       +
               required 

     

       44
       44
       +
               transition:persist

     

       45
       45
       +
             />

     

       46
       46
       +
             {errors.title && (

     

       47
       47
       +
               <div id="title-error">

     

       48
       48
       +
                 {errors.title}

     

       49
       49
       +
               </div>

     

       50
       50
       +
             )}

     

       51
       51
       +
       

     

       52
       52
       +
             <label for="tags">add tags</label>

     

       53
       53
       +
             <input

     

       54
       54
       +
               type="text" 

     

       55
       55
       +
               list="tags-list" 

     

       56
       56
       +
               name="tags" 

     

       57
       57
       +
               id="tags" 

     

       58
       58
       +
               aria-describedby="tags-error"

     

       59
       59
       +
               value={work.Works.tags as string} 

     

       60
       60
       +
               transition:persist 

     

       61
       61
       +
             />

     

       62
       62
       +
             <!-- could be cool to fetch tags from a tags server or smth? idk -->

     

       63
       63
       +
             <datalist id="tags-list">

     

       64
       64
       +
               <option value="test">here</option>

     

       65
       65
       +
               <option value="tag2">another</option>

     

       66
       66
       +
               <option value="tag3">try them all!</option>

     

       67
       67
       +
             </datalist>

     

       68
       68
       +
             {errors.tags && (

     

       69
       69
       +
               <div id="tags-error">

     

       70
       70
       +
                 {errors.tags}

     

       71
       71
       +
               </div>

     

       72
       72
       +
             )}

     

       73
       73
       +
       

     

       74
       74
       +
             <label for="content">body</label>

     

       75
       75
       +
             <textarea name="content" id="content" aria-describedby="content-error" transition:persist>

     

       76
       76
       +
               {work.Works.content}

     

       77
       77
       +
             </textarea>

     

       78
       78
       +
             {errors.content && (

     

       79
       79
       +
               <div id="content-error">

     

       80
       80
       +
                 {errors.content}

     

       81
       81
       +
               </div>

     

       82
       82
       +
             )}

     

       83
       83
       +
             

     

       84
       84
       +
             <button>submit</button>

     

       85
       85
       +
           </form>

     

       86
       86
       +
       

     

       87
       87
       +
           {result?.error && (

     

       88
       88
       +
             <div class="error">

     

       89
       89
       +
               {result.error.message}

     

       90
       90
       +
             </div>

     

       91
       91
       +
           )}

     

       92
       92
       +
         </main>

     

       93
       93
       +
       </Layout>

+33

src/pages/works/[workId]/index.astro

···

       1
       1
       +
       ---

     

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

     

       3
       3
       +
       import { didToHandle } from "@/lib/atproto";

     

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

     

       5
       5
       +
       

     

       6
       6
       +
       const { workId } = Astro.params;

     

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

     

       8
       8
       +
       

     

       9
       9
       +
       // the work could be fetched from the database or from the pds

     

       10
       10
       +
       // would this potentially lighten db load? maybe

     

       11
       11
       +
       const [work] = await db.select()

     

       12
       12
       +
         .from(Works)

     

       13
       13
       +
         .where(eq(Works.slug, workId!))

     

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

     

       15
       15
       +
         .limit(1);

     

       16
       16
       +
       

     

       17
       17
       +
       if (!work) {

     

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

     

       19
       19
       +
       }

     

       20
       20
       +
       ---

     

       21
       21
       +
       <WorkPage 

     

       22
       22
       +
         slug={work.Works.slug}

     

       23
       23
       +
         title={work.Works.title}

     

       24
       24
       +
         author={await didToHandle(work.Users.userDid)}

     

       25
       25
       +
         createdAt={work.Works.createdAt}

     

       26
       26
       +
         updatedAt={work.Works.updatedAt}

     

       27
       27
       +
         tags={work.Works.tags}

     

       28
       28
       +
       >

     

       29
       29
       +
         {(work.Users.userDid === loggedInUser?.did) && (

     

       30
       30
       +
           <a href={`/works/${workId}/edit`}>Edit your work</a>

     

       31
       31
       +
         )}

     

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

     

       33
       33
       +
       </WorkPage>

+30 -9

src/pages/works/add.astro

···

       5
       5
        
       const loggedInUser = Astro.locals.loggedInUser;

     

       6
       6
        
       

     

       7
       7
        
       if (!loggedInUser) {

     

       8
       8
       -
         Astro.redirect("/works");

     

       8
       8
       +
         // put in a thing that tells the user they're not logged in

     

       9
       9
       +
         return Astro.redirect("/works");

     

       9
       10
        
       }

     

       10
       11
        
       

     

       11
       12
        
       const result = Astro.getActionResult(actions.worksActions.addWork);

     

       12
       13
        
       const errors = isInputError(result?.error) ? result.error.fields : {};

     

       14
       14
       +
       

     

       15
       15
       +
       if (result && !result.error) {

     

       16
       16
       +
         return Astro.redirect(`/works/${result.data.slug}`);

     

       17
       17
       +
         // eventually we could return a uri and parse? it? i think?

     

       18
       18
       +
       }

     

       13
       19
        
       ---

     

       14
       14
       -
       <Layout>

     

       15
       15
       -
         <main>

     

       20
       20
       +
       <Layout skipLink="new-work">

     

       21
       21
       +
         <main id="new-work">

     

       16
       22
        
           <h1>Add a new work</h1>

     

       17
       23
        
       

     

       18
       24
        
           <form action={actions.worksActions.addWork} method="post">

     

       19
       25
        
             <label for="title">title</label>

     

       20
       20
       -
             <input transition:persist type="text" name="title" id="title" aria-describedby="title-error" required />

     

       26
       26
       +
             <input 

     

       27
       27
       +
               type="text" 

     

       28
       28
       +
               name="title" 

     

       29
       29
       +
               id="title" 

     

       30
       30
       +
               aria-describedby="title-error" 

     

       31
       31
       +
               required 

     

       32
       32
       +
               transition:persist 

     

       33
       33
       +
             />

     

       21
       34
        
             {errors.title && (

     

       22
       35
        
               <div id="title-error">

     

       23
       36
        
                 {errors.title}

     
···

       25
       38
        
             )}

     

       26
       39
        
       

     

       27
       40
        
             <label for="tags">add tags</label>

     

       28
       28
       -
             <input transition:persist type="text" list="tags-list" name="tags" id="tags" aria-describedby="tags-error" />

     

       41
       41
       +
             <input 

     

       42
       42
       +
               type="text" 

     

       43
       43
       +
               list="tags-list" 

     

       44
       44
       +
               name="tags" 

     

       45
       45
       +
               id="tags" 

     

       46
       46
       +
               aria-describedby="tags-error" 

     

       47
       47
       +
               transition:persist 

     

       48
       48
       +
             />

     

       29
       49
        
             <!-- could be cool to fetch tags from a tags server or smth? idk -->

     

       30
       50
        
             <datalist id="tags-list">

     

       31
       51
        
               <option value="test">here</option>

     
···

       39
       59
        
             )}

     

       40
       60
        
       

     

       41
       61
        
             <label for="content">body</label>

     

       42
       42
       -
             <textarea transition:persist name="content" id="content" aria-describedby="content-error"></textarea>

     

       62
       62
       +
             <!-- replace this with a rich text editor / code editor later -->

     

       63
       63
       +
             <textarea name="content" id="content" aria-describedby="content-error" transition:persist></textarea>

     

       43
       64
        
             {errors.content && (

     

       44
       65
        
               <div id="content-error">

     

       45
       66
        
                 {errors.content}

     

       46
       67
        
               </div>

     

       47
       68
        
             )}

     

       48
       48
       -
       

     

       49
       49
       -
             <label for="public">Publish to your PDS?</label>

     

       50
       50
       -
             <input type="checkbox" name="public" id="public" />

     

       69
       69
       +
             

     

       70
       70
       +
             <label for="publish">Publish to your PDS?</label>

     

       71
       71
       +
             <input type="checkbox" name="publish" id="publish" />

     

       51
       72
        
             

     

       52
       73
        
             <button>submit</button>

     

       53
       74
        
           </form>