Merge pull request #200 from UTDallasEPICS/ofekLateSummerChanges

OfekLateSummerChanges
UTDallasEPICS · Aug 7, 2024 · 8f6c810 · 8f6c810
2 parents e824cc0 + d5d8cf5
commit 8f6c810
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/pages/Page/[id].vue b/pages/Page/[id].vue
@@ -299,14 +299,18 @@ setImageAutoSlide()
   .div.py-4.grid(v-if="comments?.length" class="w-full justify-center" style="grid-template-columns: repeat(3, 12rem);")
     .div(v-for="(comment, i) in comments" :key="i" class="comment-box")
         .flex-auto.h-40.w-44.m-2.p-4.rounded-lg.bg-white.border-border-gray-300.shadow-md
+          .flex.justify-between.gap-5.pd-4
             .text-xs.font-bold.mb-6 {{ comment.donorFirstName }} {{ comment.donorLastName }}
-            .text-xs.w-fit.text-gray-600.border-l-2.border-green-500.pl-5 {{ comment.comments }}
-            .text-xs.text-gray-600.pt-5 Amount Donated: {{ donationFormat(comment.amount) }}
+            .text-xs.font-bold.mb-6 {{ dateFormat(comment.donationDate, true) }}
+          .text-xs.w-fit.text-gray-600.border-l-2.border-green-500.pl-5 {{ comment.comments }}
+          .text-xs.text-gray-600.pt-5 Amount Donated: {{ donationFormat(comment.amount) }}
   CVReplySystem(:pageCuid="id" :familyCuid="familyCuid" :replies="replies" @displayReply="displayReply")
   .py-4.grid.row-span-3.gap-2(v-if="replies?.length")
-      .p-2.bg-white.rounded-lg.mb-2.shadow-md.pb-4(v-for="(reply,i) in replies" :key="i") 
-        .ml-1.pb-4.text-lg.font-bold {{reply.name}}
-        .ml-1.pt-3.pb-3.pl-5.border-l-2.border-green-500 {{reply.reply}}
+    .p-2.bg-white.rounded-lg.mb-2.shadow-md.pb-4(v-for="(reply,i) in replies" :key="i") 
+      .flex.justify-between.gap-5.pd-4
+        .ml-1.text-lg.font-bold {{reply.name}}
+        .ml-1.text-lg {{dateFormat(reply.date)}}
+      .ml-1.pt-3.pb-3.pl-5.border-l-2.border-green-500 {{reply.reply}}
 div.flex(style="color:gray; font-weight: 700; justify-content:center; align-items: center; height: 100px;")
   label SHARE THIS PAGE |&nbsp;
   .col

diff --git a/prisma/migrations/20240807102321_reply_date_default/migration.sql b/prisma/migrations/20240807102321_reply_date_default/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Reply" ADD COLUMN     "date" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -123,6 +123,7 @@ model Reply {
   name       String?  @default("")
   Page       Page     @relation(fields: [pageCuid], references: cuid)
   suspended  Boolean  @default(false)
+  date       DateTime @default(now())
 }
 
 model Image {

diff --git a/server/middleware/auth.ts b/server/middleware/auth.ts
@@ -112,7 +112,7 @@ export default defineEventHandler(async event => {
                     const accountLink = await stripe.accountLinks.create({
                         account: stripeAccountId,
                         refresh_url: `${runtime.BASEURL}`,
-                        return_url: `${runtime.BASEURL}/api/complete_onboarding/?stripe_account_id=${stripeAccountId}`,
+                        return_url: `${runtime.BASEURL}api/complete_onboarding?stripe_account_id=${stripeAccountId}`,
                         type: 'account_onboarding',
                     });
 
@@ -128,7 +128,7 @@ export default defineEventHandler(async event => {
             const accountLink = await stripe.accountLinks.create({
                 account: id,
                 refresh_url: `${runtime.BASEURL}`,
-                return_url: `${runtime.BASEURL}/api/complete_onboarding/?stripe_account_id=${id}`,
+                return_url: `${runtime.BASEURL}api/complete_onboarding?stripe_account_id=${id}`,
                 type: 'account_onboarding',
             });
             return await sendRedirect(event, accountLink.url);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- AlterTable
		ALTER TABLE "Reply" ADD COLUMN "date" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP;