@@ -159,67 +159,36 @@ const hideNestedDropdown = (index) => {
diff --git a/pages/Page/[id].vue b/pages/Page/[id].vue
index 9903a0a9..1abfb3fb 100644
--- a/pages/Page/[id].vue
+++ b/pages/Page/[id].vue
@@ -293,6 +293,9 @@ setImageAutoSlide()
.reply-box(v-if="reply.reply.length > 0" style="padding: 1rem; text-align: left; border-bottom: 1px solid black")
.reply-header(style="font-size: 1rem; font-weight: bold; margin-bottom: 2.5rem; margin-left: 1rem") {{reply.name}}
.reply-body(style="font-size: 1rem; color: #666; margin-bottom: 2.5rem;") {{reply.reply}}
+div.flex(style="color:gray; font-weight: 700; justify-content:center; align-items: center; height: 100px;")
+ .col-md-8.mx-9(class="sm:col-span-1 sm:mr-11")
+ .div.px-8.py-4(style="color: #6E6E6E; font-weight: 500; font-size: 18px; line-height: 28px; letter-spacing: -0.078px; word-break: break-word;" id="obituary") {{ pageDataDB.obituary }}
div.flex(style="color:gray; font-weight: 700; justify-content:center; align-items: center; height: 100px;")
label SHARE THIS PAGE |
.col
@@ -304,8 +307,4 @@ div.flex(style="color:gray; font-weight: 700; justify-content:center; align-item
.col
button(@click="shareMail")
img(src="/mail_fa.png" style="width:50px; height:29px;")
- .col
- p {{ "" }}
- .col-md-8.mx-9(class="sm:col-span-1 sm:mr-11")
- .div.px-8.py-4(style="color: #6E6E6E; font-weight: 500; font-size: 18px; line-height: 28px; letter-spacing: -0.078px; word-break: break-word;" id="obituary") {{ pageDataDB.obituary }}
diff --git a/server/api/family.post.ts b/server/api/family.post.ts
index 962ab5ed..0540d845 100644
--- a/server/api/family.post.ts
+++ b/server/api/family.post.ts
@@ -42,10 +42,9 @@ const body = await readBody(event);
middle_name,
last_name,
phone, address } = body
-if(event.context.user?.user_role == "advocate" || event.context.user.user_role === "admin") {
+if(event.context.user?.user_role === "advocate" || event.context.user.user_role === "admin") {
try {
- await sendEmail(body.email, "invitation", "Invitation to Carson's village", ({...body, url: `${runtime.BASEURL}api/login`}))
- const queryRes = await prisma.family.create({
+ const queryRes = await event.context.client.family.create({
data: {
family_name: family_name,
AdvocateResponsible: {
@@ -67,6 +66,7 @@ if(event.context.user?.user_role == "advocate" || event.context.user.user_role =
}
}
)
+ await sendEmail(body.email, "invitation", "Invitation to Carson's village", ({...body, url: `${runtime.BASEURL}api/login`}))
return queryRes
} catch (e) {
console.log(e)
diff --git a/server/api/user.post.ts b/server/api/user.post.ts
index 62ffcd78..6446f1b6 100644
--- a/server/api/user.post.ts
+++ b/server/api/user.post.ts
@@ -50,30 +50,36 @@ if(event.context.user?.user_role === "advocate" || event.context.user.user_role
}
});
await sendEmail(body.email, "invitation", "Invitation to Carson's village", ({...body, url: `${runtime.BASEURL}api/login`}))
+ return { success: true, result: queryRes }
} else if(body.user_role == "family") {
- const pages = body.Pages
delete body.Pages
+ delete body.AdvocateFamily
const userRes = await prisma.user.create({
data: {
...body, cuid: undefined,
- }})
+ }})
const queryRes = await prisma.family.update({
where: { cuid: body.familyCuid },
data: {
- Pages: pages, updated_at: now,
+ updated_at: now,
FamilyMembers: {
connect: {
cuid: userRes.cuid
}
},
}
+ }
+ )
+ await sendEmail(body.email, "invitation", "Invitation to Carson's village", ({...body, url: `${runtime.BASEURL}api/login`}))
+ return { success: true, result: queryRes }
}
- )}
- return true
- } catch(e){
- console.error(e);
- return false
+ } catch(e: any){
+ let error = e as string || undefined
+ throw createError({
+ statusCode: 500,
+ message: e.message as unknown as string,
+ })
}
} else{
return await sendRedirect(event, loginRedirectUrl());
diff --git a/server/api/user.put.ts b/server/api/user.put.ts
index 100b5618..b1b32c25 100644
--- a/server/api/user.put.ts
+++ b/server/api/user.put.ts
@@ -53,11 +53,14 @@ if(event.context.user?.user_role == "advocate" || event.context.user.user_role
}
})
}
- return true;
- } catch(e) {
- console.log(e)
- return false
- }
+ return { success: true, result: "success" }
+ } catch(e: any) {
+ console.error(e);
+ throw createError({
+ statusCode: 500,
+ message: e.message as unknown as string,
+ })
+ }
} else {
return await sendRedirect(event, loginRedirectUrl());
}
From 1957f4d5b00413a67f0daafd0f91a57912429f59 Mon Sep 17 00:00:00 2001
From: Isi Emordi
Date: Mon, 15 Jul 2024 13:37:09 -0500
Subject: [PATCH 09/47] started apis for email list
---
server/api/constant_contacts.ts | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 server/api/constant_contacts.ts
diff --git a/server/api/constant_contacts.ts b/server/api/constant_contacts.ts
new file mode 100644
index 00000000..caa8b17e
--- /dev/null
+++ b/server/api/constant_contacts.ts
@@ -0,0 +1,15 @@
+import {nanoid} from "nanoid"
+
+const state = {};
+const genState = () => { const s = nanoid(); state[s] = 1; return s}
+const runtime = useRuntimeConfig()
+
+export const authRequestUrl = () => `https://authz.constantcontact.com/oauth2/default/v1/authorize?client_id=${runtime.CONSTANT_CONTACT_CLIENTID}&redirect_uri=${runtime.BASE_URL}&response_type=code&scope=account_read%20account_update%20contact_data%20offline_access&state=${body.state}&nonce=${genState()}`
+
+export const verifyNonce = (nonce: string) => {
+ if (state[nonce]) {
+ delete state[nonce]
+ return true
+ }
+ return false
+ }
\ No newline at end of file
From 32d7496b606b289e27ab64da6520a53fdd1661ba Mon Sep 17 00:00:00 2001
From: Alonso Toji
Date: Mon, 15 Jul 2024 15:35:19 -0500
Subject: [PATCH 10/47] edit page view to look cleaner and look more like what
Jason wants
---
pages/EditPage/[EditPageId].vue | 15 +++
pages/Page/[id].vue | 101 ++++++++++++------
.../migration.sql | 3 +
.../migration.sql | 2 +
prisma/schema.prisma | 3 +
types.d.ts | 3 +
utils.ts | 23 +++-
7 files changed, 114 insertions(+), 36 deletions(-)
create mode 100644 prisma/migrations/20240715194925_service_location_names/migration.sql
create mode 100644 prisma/migrations/20240715202032_donation_description/migration.sql
diff --git a/pages/EditPage/[EditPageId].vue b/pages/EditPage/[EditPageId].vue
index 902e4a44..7c77aed7 100644
--- a/pages/EditPage/[EditPageId].vue
+++ b/pages/EditPage/[EditPageId].vue
@@ -43,13 +43,16 @@ const data = ref({
day_of_passing: null,
visitation_date: null,
visitation_location: "",
+ visitation_address: "",
visitation_description: "",
funeral_date: null,
funeral_description: "",
funeral_location: "",
+ funeral_address: "",
obituary: "",
deadline: null,
donation_goal: 0,
+ donation_description: "",
amount_raised: 0,
amount_distributed: 0,
profileImageCuid: "",
@@ -350,6 +353,10 @@ description="Here, you select from photos you uploaded to show up first on the F
CVLabel Location
.col-md-8.mx-9(class="sm:col-span-2 sm:mr-11")
CVInput(v-model='data.visitation_location' placeholder="optional")
+ .py-4.grid(class="sm:grid-cols-3")
+ CVLabel Address
+ .col-md-8.mx-9(class="sm:col-span-2 sm:mr-11")
+ CVInput(v-model='data.visitation_address' placeholder="optional")
.py-4.grid(class="sm:grid-cols-3")
CVLabel Description
.col-md-8.mx-9(class="sm:col-span-2 sm:mr-11")
@@ -365,6 +372,10 @@ description="Here, you select from photos you uploaded to show up first on the F
CVLabel Location
.col-md-8.mx-9(class="sm:col-span-2 sm:mr-11")
CVInput(v-model='data.funeral_location' placeholder="optional")
+ .py-4.grid(class="sm:grid-cols-3")
+ CVLabel Address
+ .col-md-8.mx-9(class="sm:col-span-2 sm:mr-11")
+ CVInput(v-model='data.funeral_address' placeholder="optional")
.py-4.grid(class="sm:grid-cols-3")
CVLabel Description
.col-md-8.mx-9(class="sm:col-span-2 sm:mr-11")
@@ -386,6 +397,10 @@ description="Here, you select from photos you uploaded to show up first on the F
CVLabel Deadline Date
.col-md-8.mx-9(class="sm:col-span-2 sm:mr-11")
CVDatepicker(v-model='data.deadline')
+ .py-4.grid(class="sm:grid-cols-3")
+ CVLabel Description
+ .col-md-8.mx-9(class="sm:col-span-2 sm:mr-11")
+ CVTextArea(v-model='data.donation_description' placeholder="optional")
.information.rounded-md.mx-9.my-2.text-center(class="sm:text-start text-white bg-blue-999")
CVLegend Comment Moderation
.py-4.grid.flex-box.flex-row.item-centered.gap-1(v-if="replies?.length" style="line-height: 0px;")
diff --git a/pages/Page/[id].vue b/pages/Page/[id].vue
index 9903a0a9..473285c0 100644
--- a/pages/Page/[id].vue
+++ b/pages/Page/[id].vue
@@ -11,7 +11,7 @@
import type { User, Page, PageDonation, Image, Reply, Family} from '@/types.d.ts'
-import { dateFormat, donationFormat } from '@/utils'
+import { dateFormat, donationFormat, longDateFormat } from '@/utils'
import CVReplySystem from '@/components/CVReplySystem.vue'
import CVReply from '@/components/CVReply.vue'
@@ -27,10 +27,12 @@ const pageData = ref({
visitation_date: null,
visitation_location: "",
+ visitation_address: "",
visitation_description: "",
funeral_date: "",
funeral_description: "",
funeral_location: "",
+ funeral_address: "",
obituary: "",
deadline: "",
donation_goal: 0,
@@ -239,46 +241,75 @@ setImageAutoSlide()
button.absolute.right-8.top-64.bg-black.text-white(@click="nextImage" style="opacity:0.7; --tw-text-opacity: 1; width: 46px; height: 46px; border-radius:50%; align-items: center; justify-content: center; line-height: 2; text-align: center;color: white;") >
img.w-96(style="z-index: -1; object-fit:cover;" :src="imageData[currentImage].url")
// services list
- .py-4.flex.flex-col.gap-5(style="font-size: 18px")
- .text-gray-dark.font-poppins.text-2xl.text-left.font-bold(style="line-height: 36px; text-shadow: 3px 3px 4px rgba(0, 0, 0, 0.25);") Services
- .flex.flex-col.gap-5(class="lg:grid lg:grid-cols-2")
- .flex.flex-col.gap-5(v-if="pageDataDB.visitation_date")
+ .py-4.flex.flex-col(class="lg:grid lg:grid-rows-6")
+ .flex.flex-col(v-if="pageDataDB.visitation_date")
.text-gray-dark.font-poppins.text-2xl.text-left.font-bold(style="line-height: 36px; text-shadow: 3px 3px 4px rgba(0, 0, 0, 0.25);") Visitation
- .flex.gap-5
- .font-outfit {{ "Date:" }}
- .font-outfit {{ dateFormat(pageDataDB.visitation_date, true) }}
- .flex.gap-5
- .font-outfit {{ "Location:" }}
+ .flex.row.gap-2
+ .font-outfit.flex-col.font-bold {{ "Date:" }}
+ .font-outfit {{ longDateFormat(pageDataDB.visitation_date) }}
+ .flex.row.gap-2
+ .font-outfit.font-bold {{ "Time:" }}
+ .font-outfit.gap-y-5 {{ longDateFormat(pageDataDB.visitation_date, true) }}
+ .flex.row.gap-2
+ .font-outfit.font-bold {{ "Location:" }}
.font-outfit.whitespace-normal {{ pageDataDB.visitation_location ? pageDataDB.visitation_location : "TBD" }}
- .font-outfit {{ pageDataDB.visitation_description }}
- .flex.flex-col.gap-5(v-else)
+ //.font-outfit {{ pageDataDB.visitation_description }}
+ .flex.row.gap-2
+ .font-outfit.gap-y-5 {{ "400 Freeport Pkwy, Coppell, TX 75019" }}
+ .flex-row.gap-2
+ .flex.flex-col(v-else)
.text-gray-dark.font-poppins.text-2xl.text-left.font-bold(style="line-height: 36px; text-shadow: 3px 3px 4px rgba(0, 0, 0, 0.25);") Visitation
- .flex.gap-5
- .font-outfit {{ "Date: TBD"}}
- .flex.gap-5
- .font-outfit {{ "Location: TBD" }}
- .flex.flex-col.gap-5(v-if="pageDataDB.funeral_date")
- .text-gray-dark.font-poppins.text-2xl.text-left.font-bold(style="line-height: 36px; text-shadow: 3px 3px 4px rgba(0, 0, 0, 0.25);") Funeral
- .flex.gap-5
- .font-outfit {{ "Date:" }}
- .font-outfit {{ dateFormat(pageDataDB.funeral_date, true) }}
- .flex.gap-5
- .font-outfit {{ "Location:" }}
+ .flex.row.gap-2
+ .font-outfit.font-bold {{ "Date:" }}
+ .font-outfit.gap-y-5 {{ "TBD" }}
+ .flex.row.gap-2
+ .font-outfit.font-bold {{ "Time:" }}
+ .font-outfit.gap-y-5 {{ "TBD" }}
+ .flex.row.gap-2
+ .font-outfit.font-bold {{ "Location:" }}
+ .font-outfit.gap-y-5 {{ "TBD" }}
+ .flex.row.gap-2
+ .font-outfit.font-bold {{ "Address:" }}
+ .font-outfit.gap-y-5 {{ "TBD" }}
+ .flex-row.gap-2
+ .flex.flex-col(v-if="pageDataDB.funeral_date")
+ .text-gray-dark.font-poppins.text-2xl.text-left.font-bold(style="line-height: 36px; text-shadow: 3px 3px 4px rgba(0, 0, 0, 0.25);") Funeral Service
+ .flex.row.gap-2
+ .font-outfit.font-bold {{ "Date:" }}
+ .font-outfit.gap-2 {{ longDateFormat(pageDataDB.funeral_date) }}
+ .flex.row.gap-2
+ .font-outfit.font-bold {{ "Time:" }}
+ .font-outfit.gap-y-5 {{ longDateFormat(pageDataDB.funeral_date, true) }}
+ .flex.row.gap-2
+ .font-outfit.font-bold {{ "Location:" }}
.font-outfit.whitespace-normal {{ pageDataDB.funeral_location }}
- .font-outfit {{ pageDataDB.funeral_description }}
- .flex.flex-col.gap-5(v-else)
- .text-gray-dark.font-poppins.text-2xl.text-left.font-bold(style="line-height: 36px; text-shadow: 3px 3px 4px rgba(0, 0, 0, 0.25);") Funeral
- .flex.gap-5
- .font-outfit {{ "Date: TBD" }}
- .flex.gap-5
- .font-outfit {{ "Location: TBD" }}
+ //.font-outfit {{ pageDataDB.funeral_description }}
+ .flex.row.gap-2
+ .font-outfit.font-bold {{ "Address:" }}
+ .font-outfit.gap-y-5 {{ "TBD" }}
+ .flex-row
+ .flex.flex-col(v-else)
+ .text-gray-dark.font-poppins.text-2xl.text-left.font-bold(style="line-height: 36px; text-shadow: 3px 3px 4px rgba(0, 0, 0, 0.25);") Funeral Service
+ .flex.row.gap-2
+ .font-outfit.font-bold {{ "Date:" }}
+ .font-outfit.gap-y-5 {{ "TBD" }}
+ .flex.row.gap-2
+ .font-outfit.font-bold {{ "Time:" }}
+ .font-outfit.gap-y-5 {{ "TBD" }}
+ .flex.row.gap-2
+ .font-outfit.font-bold {{ "Location:" }}
+ .font-outfit.gap-y-5 {{ "TBD" }}
+ .flex.row.gap-2
+ .font-outfit.font-bold {{ "Address:" }}
+ .font-outfit.gap-y-5 {{ "TBD" }}
+ .container.m-4.place-content-center.font-poppins(class="w-5/6 sm:m-auto sm:py-3")
+ .well.well-sm
+ h1.ml-4.pt-9.text-2xl.text-gray-dark(class="sm:text-3xl" style="font-weight: 600; letter-spacing: 0.35px;") Donations
+ // add donation description
+ .col-md-8.ml-4.pt-6.pr-5.flex.items-center.justify-center
+ ActionButton.mx-auto.text-md(name='submit' @click="DisplayDonationPopup=true" class="transition duration-300 bg-orange-999 hover:bg-green-600" ) DONATE NOW
//.container(class="sm:overflow-hidden sm:w-3/4 sm:mt-4 sm:mx-auto sm:place-content-center sm:max-w-xl sm:p-6 sm:rounded-card sm:shadow-card")
.grid(class="sm:grid-cols-2")
- .container.m-4.place-content-center.font-poppins(class="w-5/6 sm:m-auto sm:py-3")
- .well.well-sm
- h1.ml-4.pt-9.text-2xl.text-gray-dark(class="sm:text-3xl" style="font-weight: 600; letter-spacing: 0.35px;") Donations
- .col-md-8.ml-4.pt-6.pr-5.flex.items-center.justify-center
- ActionButton.mx-auto.text-md(name='submit' @click="DisplayDonationPopup=true" class="transition duration-300 bg-orange-999 hover:bg-green-600" ) DONATE NOW
.py-4.grid.gap-1(v-if="comments?.length" style="text-align: center")
.div.py-4.grid(class="w-full" style="grid-template-columns: repeat(3, 1fr);")
.div(v-for="(comment, i) in comments" :key="i" class="comment-box")
diff --git a/prisma/migrations/20240715194925_service_location_names/migration.sql b/prisma/migrations/20240715194925_service_location_names/migration.sql
new file mode 100644
index 00000000..2299856b
--- /dev/null
+++ b/prisma/migrations/20240715194925_service_location_names/migration.sql
@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "pages" ADD COLUMN "funeral_address" TEXT NOT NULL DEFAULT '',
+ADD COLUMN "visitation_address" TEXT NOT NULL DEFAULT '';
diff --git a/prisma/migrations/20240715202032_donation_description/migration.sql b/prisma/migrations/20240715202032_donation_description/migration.sql
new file mode 100644
index 00000000..f4371804
--- /dev/null
+++ b/prisma/migrations/20240715202032_donation_description/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "pages" ADD COLUMN "donation_description" TEXT NOT NULL DEFAULT '';
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 0a2eb689..78345676 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -56,12 +56,15 @@ model Page {
day_of_passing DateTime?
visitation_date DateTime?
visitation_location String
+ visitation_address String @default("")
visitation_description String
funeral_date DateTime?
funeral_location String
funeral_description String
+ funeral_address String @default("")
obituary String
donation_goal Int @default(0)
+ donation_description String @default("")
amount_raised Int @default(0)
deadline DateTime?
userCuid String @map("user_cuid")
diff --git a/types.d.ts b/types.d.ts
index 19db4898..7f8419ac 100644
--- a/types.d.ts
+++ b/types.d.ts
@@ -57,13 +57,16 @@ export type Page = {
day_of_passing: Date | string | null,
visitation_date: Date | string | null,
visitation_location: string,
+ visitation_address: string,
visitation_description: string,
funeral_date: Date | string | null,
funeral_description: string,
funeral_location: string,
+ funeral_address: string,
obituary: string,
deadline: Date | string | null,
donation_goal: number | string
+ donation_description: string,
amount_raised: number | string
amount_distributed: number | string
profileImageCuid: string
diff --git a/utils.ts b/utils.ts
index 3b291410..d9439623 100644
--- a/utils.ts
+++ b/utils.ts
@@ -28,4 +28,25 @@ export function donationFormat(amount = 0){
style: "currency",
currency: "usd"
})
-}
\ No newline at end of file
+}
+
+export function longDateFormat(date: string, justTime = false) {
+ if(date === "") {
+ return ""
+ }
+ if(date == null) {
+ return ""
+ }
+
+ const options: Intl.DateTimeFormatOptions = {
+ weekday: 'long',
+ year: 'numeric',
+ month: 'long',
+ day: 'numeric',
+ };
+
+ const dateObj = new Date(date);
+ if(justTime) return dateObj.toLocaleTimeString()
+ return dateObj.toLocaleDateString(undefined, options);
+}
+
From d64673b5cf17bea70c8790ea099272d98cb68c2b Mon Sep 17 00:00:00 2001
From: Isi Emordi
Date: Wed, 17 Jul 2024 14:51:44 -0500
Subject: [PATCH 11/47] created email list page and get authorization code api
---
components/CVHeader.vue | 2 ++
nuxt.config.ts | 2 ++
pages/EmailList.vue | 13 +++++++++++++
server/api/constant_contacts.ts | 15 ++++++++-------
4 files changed, 25 insertions(+), 7 deletions(-)
create mode 100644 pages/EmailList.vue
diff --git a/components/CVHeader.vue b/components/CVHeader.vue
index 601afd80..14751cf9 100644
--- a/components/CVHeader.vue
+++ b/components/CVHeader.vue
@@ -41,6 +41,8 @@ ClientOnly
p.uppercase.white.w-max New page
NavLinkButton( v-if="isAdvocateAdmin" to='/Users' :class="{'!text-black border-green-999 bg-white': route.path.includes('/Users')}")
p.uppercase.white.w-max Users
+ NavLinkButton( v-if="isAdvocateAdmin" to='/EmailList' :class="{'!text-black border-green-999 bg-white': route.path.includes('/EmailList')}")
+ p.uppercase.white.w-max Email List
NavLinkButton( v-if="isAdvocateAdmin" to='/EditUser/0' :class="{'!text-black border-green-999 bg-white': route.path.includes('/EditUser')}")
p.uppercase.white.w-max Invite user
NavLinkButton( v-if="isAdvocateAdmin" to='/EditFamily' :class="{'!text-black border-green-999 bg-white': route.path == '/EditFamily'}")
diff --git a/nuxt.config.ts b/nuxt.config.ts
index b2bf93fd..4f4c97fb 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -3,6 +3,8 @@ export default defineNuxtConfig({
runtimeConfig: {
AUTH0_CLIENTID: '',
AUTH0_SECRET: '',
+ CONSTANT_CONTACTS_CLIENTID: '',
+ CONSTANT_CONTACTS_SECRET: '',
BASEURL: 'asd',
ISSUER: '',
STRIPE_PUBLIC: '',
diff --git a/pages/EmailList.vue b/pages/EmailList.vue
new file mode 100644
index 00000000..f38c54d8
--- /dev/null
+++ b/pages/EmailList.vue
@@ -0,0 +1,13 @@
+
+
+
+button.type-button.my-4.bg-orange-999.text-white.px-4.py-2.rounded-full.w-32.grow-0(type="button" @click="getAuthRequestUrl") Authorize
+
diff --git a/server/api/constant_contacts.ts b/server/api/constant_contacts.ts
index caa8b17e..81724a28 100644
--- a/server/api/constant_contacts.ts
+++ b/server/api/constant_contacts.ts
@@ -4,12 +4,13 @@ const state = {};
const genState = () => { const s = nanoid(); state[s] = 1; return s}
const runtime = useRuntimeConfig()
-export const authRequestUrl = () => `https://authz.constantcontact.com/oauth2/default/v1/authorize?client_id=${runtime.CONSTANT_CONTACT_CLIENTID}&redirect_uri=${runtime.BASE_URL}&response_type=code&scope=account_read%20account_update%20contact_data%20offline_access&state=${body.state}&nonce=${genState()}`
+const nanoidString = nanoid()
+
+ export default defineEventHandler(async event => {
+ if (event.context.user.user_role === "admin") {
+ const authRequestUrl = () => `https://authz.constantcontact.com/oauth2/default/v1/authorize?client_id=${runtime.CONSTANT_CONTACTS_CLIENTID}&redirect_uri=${encodeURIComponent(runtime.BASEURL)}&response_type=code&scope=account_read%20account_update%20contact_data%20offline_access&state=${nanoidString}`
+
+ await sendRedirect(event, authRequestUrl())
-export const verifyNonce = (nonce: string) => {
- if (state[nonce]) {
- delete state[nonce]
- return true
}
- return false
- }
\ No newline at end of file
+ })
\ No newline at end of file
From 9ce3582568fe05390f415865b50b5ed762dbd269 Mon Sep 17 00:00:00 2001
From: Isi Emordi
Date: Mon, 22 Jul 2024 13:50:47 -0500
Subject: [PATCH 12/47] started writing callback api for constant contacts
---
server/api/cc_callback.ts | 35 +++++++++++++++++++++++++++++++++
server/api/constant_contacts.ts | 3 ++-
2 files changed, 37 insertions(+), 1 deletion(-)
create mode 100644 server/api/cc_callback.ts
diff --git a/server/api/cc_callback.ts b/server/api/cc_callback.ts
new file mode 100644
index 00000000..9581bbe2
--- /dev/null
+++ b/server/api/cc_callback.ts
@@ -0,0 +1,35 @@
+
+const runtime = useRuntimeConfig()
+const getQuery = (event) => {
+ const urlParams = new URLSearchParams(window.location.search);
+ return urlParams
+ }
+
+export default defineEventHandler(async event => {
+ const query = getQuery(event)
+ const authCode = query.code
+
+ if (authCode) {
+ console.log(authCode)
+ } else {
+ console.log('Authorization code not found')
+ }
+
+ const body = new URLSearchParams({
+ code: authCode,
+ redirect_uri: runtime.BASEURL,
+ grant_type: 'authorization_code'
+ })
+
+ const headers = new Headers({
+ "Accept", "application/json"
+ "Content-Type", "application/x-www-form-urlencoded"
+ })
+
+ const response = await fetch(`https://authz.constantcontact.com/oauth2/default/v1/token`, {
+ method: 'POST',
+ body: body.toString(),
+ headers: headers
+ })
+ })
+
\ No newline at end of file
diff --git a/server/api/constant_contacts.ts b/server/api/constant_contacts.ts
index 81724a28..79667907 100644
--- a/server/api/constant_contacts.ts
+++ b/server/api/constant_contacts.ts
@@ -5,10 +5,11 @@ const genState = () => { const s = nanoid(); state[s] = 1; return s}
const runtime = useRuntimeConfig()
const nanoidString = nanoid()
+const redirectURI = `${runtime.BASEURL}/api/cc_callback`
export default defineEventHandler(async event => {
if (event.context.user.user_role === "admin") {
- const authRequestUrl = () => `https://authz.constantcontact.com/oauth2/default/v1/authorize?client_id=${runtime.CONSTANT_CONTACTS_CLIENTID}&redirect_uri=${encodeURIComponent(runtime.BASEURL)}&response_type=code&scope=account_read%20account_update%20contact_data%20offline_access&state=${nanoidString}`
+ const authRequestUrl = () => `https://authz.constantcontact.com/oauth2/default/v1/authorize?client_id=${runtime.CONSTANT_CONTACTS_CLIENTID}&redirect_uri=${encodeURIComponent(redirectURI)}&response_type=code&scope=account_read%20account_update%20contact_data%20offline_access&state=${nanoidString}`
await sendRedirect(event, authRequestUrl())
From 7c84beac3ee2fb0887f16da37ee274ea72adb344 Mon Sep 17 00:00:00 2001
From: Isi Emordi
Date: Mon, 22 Jul 2024 14:59:04 -0500
Subject: [PATCH 13/47] trying to get authorization code from constant contacts
---
server/api/cc_callback.ts | 37 ++++++++++++++-------------------
server/api/constant_contacts.ts | 2 +-
2 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/server/api/cc_callback.ts b/server/api/cc_callback.ts
index 9581bbe2..39ae446d 100644
--- a/server/api/cc_callback.ts
+++ b/server/api/cc_callback.ts
@@ -1,35 +1,30 @@
const runtime = useRuntimeConfig()
-const getQuery = (event) => {
- const urlParams = new URLSearchParams(window.location.search);
- return urlParams
- }
+
+const creds = runtime.CONSTANT_CONTACTS_CLIENTID + ':' + runtime.CONSTANT_CONTACTS_SECRET
+const encodedCreds = btoa(creds)
export default defineEventHandler(async event => {
- const query = getQuery(event)
- const authCode = query.code
-
- if (authCode) {
- console.log(authCode)
+ const { code } = getQuery(event)
+
+ if (code) {
+ console.log(code)
} else {
console.log('Authorization code not found')
}
- const body = new URLSearchParams({
- code: authCode,
- redirect_uri: runtime.BASEURL,
- grant_type: 'authorization_code'
- })
+
- const headers = new Headers({
- "Accept", "application/json"
- "Content-Type", "application/x-www-form-urlencoded"
- })
- const response = await fetch(`https://authz.constantcontact.com/oauth2/default/v1/token`, {
+ const response = await fetch(`https://authz.constantcontact.com/oauth2/default/v1/token?code=${code as string}&redirect_uri=${encodeURIComponent(`${runtime.BASEURL}EmailList`)}&grant_type=authorization_code`, {
method: 'POST',
- body: body.toString(),
- headers: headers
+ headers: {
+ "Accept": "application/json",
+ "Content-Type": "application/x-www-form-urlencoded",
+ "Authorization": `Basic ${encodedCreds}`
+ }
})
+
+ console.log(response)
})
\ No newline at end of file
diff --git a/server/api/constant_contacts.ts b/server/api/constant_contacts.ts
index 79667907..dd542267 100644
--- a/server/api/constant_contacts.ts
+++ b/server/api/constant_contacts.ts
@@ -5,7 +5,7 @@ const genState = () => { const s = nanoid(); state[s] = 1; return s}
const runtime = useRuntimeConfig()
const nanoidString = nanoid()
-const redirectURI = `${runtime.BASEURL}/api/cc_callback`
+const redirectURI = `${runtime.BASEURL}api/cc_callback`
export default defineEventHandler(async event => {
if (event.context.user.user_role === "admin") {
From 0ecfcfe148eba3f1dcc5abf904701ba18eda1f84 Mon Sep 17 00:00:00 2001
From: Alonso Toji
Date: Mon, 22 Jul 2024 15:46:35 -0500
Subject: [PATCH 14/47] finish editing page view and add toggle for headers
---
components/CVHeader.vue | 32 ++++++++--
components/CVReplySystem.vue | 7 ++-
pages/Page/[id].vue | 110 +++++++++++++++--------------------
3 files changed, 76 insertions(+), 73 deletions(-)
diff --git a/components/CVHeader.vue b/components/CVHeader.vue
index f5a93b53..791783f0 100644
--- a/components/CVHeader.vue
+++ b/components/CVHeader.vue
@@ -14,6 +14,7 @@ const pages = ref([])
const searchQuery = ref('');
const route = useRoute()
const isNotSearch = computed(() => route.path !== "/Search/")
+const toggle = ref(true);
console.log(route.path)
const onEnter = async() => {
@@ -28,12 +29,16 @@ const onEnter = async() => {
ClientOnly
.max-w-min.mx-auto.flex.gap-2.mt-7(style="text-align:center")
- div.max-w-min.mx-auto.flex.gap-2(v-if="isLoggedIn")
+ div.max-w-min.mx-auto.flex.gap-2(v-if="isLoggedIn && toggle")
+ NavLinkButton(to='https://carsonsvillage.org' :class="{'!text-black border-green-999 bg-white': route.path == '/'}")
+ p.uppercase.white.w-max 💚
a.items-center.px-2.py-2.text-base.font-medium.rounded-md.text-blue-999.cursor-pointer(
class='hover:text-black bg-white'
href="/api/logout"
)
p.uppercase.white.w-max.font-bold.text-orange-999 LOGOUT
+ NavLinkButton(:class="{'!text-black border-green-999 bg-white': route.path == '/'}" @click="toggle = !toggle")
+ p.uppercase.white.w-max Home
NavLinkButton(:to="`/pageList/${cuid}/?fromUsers=0`" v-if="isAdvocateAdmin" :class="{'!text-black border-green-999 bg-white': route.path.includes('/page') || route.path.includes('/Page')}")
p.uppercase.white.w-max Pages
NavLinkButton(:to="`/pageList/${familyCuid}/?fromUsers=0`" v-if="!isAdvocateAdmin" :class="{'!text-black border-green-999 bg-white': route.path.includes('/pageList')}")
@@ -47,11 +52,29 @@ ClientOnly
NavLinkButton( v-if="isAdvocateAdmin" to='/EditFamily' :class="{'!text-black border-green-999 bg-white': route.path == '/EditFamily'}")
p.uppercase.white.w-max Create Family
NavLinkButton(to="/" :class="{'!text-black border-green-999 bg-white': route.path == '/'}")
- p.uppercase.white.w-max Home
+ p.uppercase.white.w-max Profile
NavLinkButton(v-if="isAdmin" to='/FamilyTransactionList' :class="{'!text-black border-green-999 bg-white': route.path == '/FamilyTransactionList'}")
p.uppercase.white.w-max Donations
NavLinkButton(v-if="isAdvocateAdmin" to='/FamilyReports' :class="{'!text-black border-green-999 bg-white': route.path == '/FamilyReports'}")
p.uppercase.white.w-max Family Reports
+
+ div.max-w-min.mx-auto.flex.gap-2(v-else-if="isLoggedIn && !toggle")
+ a.items-center.px-2.py-2.text-base.font-medium.rounded-md.text-blue-999.cursor-pointer(
+ class='hover:text-black bg-white'
+ href="/api/logout"
+ )
+ p.uppercase.white.w-max.font-bold.text-orange-999 LOGOUT
+ NavLinkButton(:class="{'!text-black border-green-999 bg-white': route.path == '/'}" @click="toggle = !toggle")
+ p.uppercase.white.w-max Dashboard
+ DropdownMenu(:has-submenus="true" :num-submenus="4"
+ :submenus="[{ title: 'Timeline of Important Events', to: 'https://carsonsvillage.org/timeline-of-events/' }, { title: 'Resource Library', to: 'http://carsonsvillage.org/resource-library' }, { title: 'Group Support', to: 'https://carsonsvillage.org/grief-group-support/' }, { title: 'Find Support', to: 'https://carsonsvillage.org/support/' }]" :dropdownMinWidth="200")
+ | RESOURCES
+ NavLinkButton(to='https://carsonsvillage.org/get-involved/' target="_blank")
+ p.uppercase.white.w-max GET INVOLVED
+ DropdownMenu(:has-submenus="true" :num-submenus="6"
+ :submenus="[{ title: 'Our Story', to: 'https://carsonsvillage.org/about-us/our-family/' }, { title: 'Our Testimonies', to: 'https://carsonsvillage.org/our-testimonials/' }, { title: 'In The News', to: 'https://carsonsvillage.org/about-us/in-the-news/' }, { title: 'Newsletter Archive', to: 'https://carsonsvillage.org/about-us/newsletter-archive/' }, { title: 'Our Team >', submenus: [{ title: 'Advocates', to: 'https://carsonsvillage.org/about-us/advocates/' }, { title: 'Clinical Consultants', to: 'https://carsonsvillage.org/about-us/clinical-consultants/' }, { title: 'Support Team', to: 'https://carsonsvillage.org/about-us/meet-our-team/' }]}, { title: 'Board of Directors', to: 'https://carsonsvillage.org/about-us/board-of-directors/' }]" :dropdownMinWidth="150" :nestedDropdownMinWidth="150")
+ | ABOUT US
+
div.max-w-min.mx-auto.flex.gap-2(v-else)
a.items-center.px-2.py-2.text-base.font-medium.rounded-md.text-gray-999.cursor-pointer(
class='hover:!text-black bg-white'
@@ -61,20 +84,17 @@ ClientOnly
NavLinkButton(to='https://carsonsvillage.org/' target="_blank")
p.uppercase.white.w-max HOME
-
DropdownMenu(:has-submenus="true" :num-submenus="4"
:submenus="[{ title: 'Timeline of Important Events', to: 'https://carsonsvillage.org/timeline-of-events/' }, { title: 'Resource Library', to: 'http://carsonsvillage.org/resource-library' }, { title: 'Group Support', to: 'https://carsonsvillage.org/grief-group-support/' }, { title: 'Find Support', to: 'https://carsonsvillage.org/support/' }]" :dropdownMinWidth="200")
| RESOURCES
-
NavLinkButton(to='https://carsonsvillage.org/get-involved/' target="_blank")
p.uppercase.white.w-max GET INVOLVED
-
DropdownMenu(:has-submenus="true" :num-submenus="6"
:submenus="[{ title: 'Our Story', to: 'https://carsonsvillage.org/about-us/our-family/' }, { title: 'Our Testimonies', to: 'https://carsonsvillage.org/our-testimonials/' }, { title: 'In The News', to: 'https://carsonsvillage.org/about-us/in-the-news/' }, { title: 'Newsletter Archive', to: 'https://carsonsvillage.org/about-us/newsletter-archive/' }, { title: 'Our Team >', submenus: [{ title: 'Advocates', to: 'https://carsonsvillage.org/about-us/advocates/' }, { title: 'Clinical Consultants', to: 'https://carsonsvillage.org/about-us/clinical-consultants/' }, { title: 'Support Team', to: 'https://carsonsvillage.org/about-us/meet-our-team/' }]}, { title: 'Board of Directors', to: 'https://carsonsvillage.org/about-us/board-of-directors/' }]" :dropdownMinWidth="150" :nestedDropdownMinWidth="150")
| ABOUT US
//&& isLoggedIn")
- .flex.w-max(v-if="isNotSearch")
+ .flex.w-max.px-2(v-if="isNotSearch")
input(class="border border-gray-300 py-2 px-4 rounded-lg focus:outline-none focus:border-black-500"
type="search" placeholder=" " v-model="searchQuery" v-on:keyup.enter="onEnter" style="height: 40px")
NuxtLink.inline(:to="`/Search/?search=${searchQuery}&isPageList=0`")
diff --git a/components/CVReplySystem.vue b/components/CVReplySystem.vue
index f7a1b5c3..c4b50bbc 100644
--- a/components/CVReplySystem.vue
+++ b/components/CVReplySystem.vue
@@ -55,9 +55,10 @@ const submitComment = async () => {
.comment-system.flex.flex-col.items-center(class="sm:mx-4 sm:w-full sm:py-2")
h2.text-center.mt-4.mb-6.font-bold Leave a Message
- CVTextArea(name='reply' v-model="replyData.reply" placeholder='Replies' class="font-normal h-40 w-full")
- .field-row.flex.mt-4.w-full
- CVInput(name='name' v-model="replyData.name" placeholder='Name' class="font-normal w-full")
+ .w-full.flex.justify-center
+ CVTextArea(name='reply' v-model="replyData.reply" placeholder='Replies' class="font-normal h-40 w-2/3")
+ .field-row.flex.justify-center.mt-4.w-full
+ CVInput(name='name' v-model="replyData.name" placeholder='Name' class="font-normal w-2/3" )
.col-md-8.ml-4.pt-6.pr-5.flex.items-center.justify-center.mt-6
ActionButton.mx-auto.text-md(@click="submitComment" class="transition duration-300 bg-orange-999 hover:bg-green-600") Submit
.div(v-if="successMessage" class="mt-4 text-green-500") {{ successMessage }}
diff --git a/pages/Page/[id].vue b/pages/Page/[id].vue
index 473285c0..109d40fd 100644
--- a/pages/Page/[id].vue
+++ b/pages/Page/[id].vue
@@ -220,31 +220,31 @@ setImageAutoSlide()
// donation popup
-.div.flex(@click.self="DisplayDonationPopup=false" v-if="DisplayDonationPopup" style="z-index: 10; align-items: center; justify-content: center; position: fixed; top: 0; bottom: 0; left: 0; right: 0; background: rgba(0, 0, 0, 0.7);")
- .mx-auto.flex.p-2(style="width:50%; background-color:#fff;")
- DonationEntryPopup(@Exit="exitPopup" :amount_raised="pageDataDB.amount_raised" :donation_goal="pageDataDB.donation_goal" :donation_goal_provided="donation_goal_provided" :donated_percentage="donated_percentage" :isActive="isActive" :donationData="donationData" :pageCuid="pageCuid" :familyCuid="familyCuid")
-
-// the header overlay with image and name
-
+.flex.flex-col
+ .div.flex(@click.self="DisplayDonationPopup=false" v-if="DisplayDonationPopup" style="z-index: 10; align-items: center; justify-content: center; position: fixed; top: 0; bottom: 0; left: 0; right: 0; background: rgba(0, 0, 0, 0.7);")
+ .mx-auto.flex.p-2(style="width:50%; background-color:#fff;")
+ DonationEntryPopup(@Exit="exitPopup" :amount_raised="pageDataDB.amount_raised" :donation_goal="pageDataDB.donation_goal" :donation_goal_provided="donation_goal_provided" :donated_percentage="donated_percentage" :isActive="isActive" :donationData="donationData" :pageCuid="pageCuid" :familyCuid="familyCuid")
.flex.gap-2.justify-center.cols-2.pl-6.pr-6
a.mr-2.mt-1.p-2.px-9.pt-3.pb-3.bg-orange-999(class="transition duration-300 bg-orange-999 hover:bg-green-600" style="border-radius: 100px; height: 50px; color: white; font-weight: 700;") Archive
.mt-2.min-h-24.text-white.uppercase.w-full(style="background-image: url('https://carsonsvillage.org/wp-content/uploads/2018/11/iStock-862083112-BW.jpg');")
.h-full.py-8.self-center.w-full.text-center.flex.flex-col(style="background-color: rgba(50, 119, 136, .8)")
- p.my-auto.font-bold.text-4xl {{ pageDataDB.page_first_name + " " + pageDataDB.page_last_name }}
+ p.my-auto.font-bold.text-5xl {{ pageDataDB.page_first_name + " " + pageDataDB.page_last_name }}
-.flex.flex-col.gap-5.px-4.mx-auto.mt-8(class="w-3/4 sm:px-16")
- img.mx-auto(v-if="profileImage?.url" class="w-[122px] h-[122px] rounded-[8px]" :src="`${profileImage?.url}`")
- .text-gray-dark.mx-auto.w-max.font-poppins.text-md {{ dateFormat(pageDataDB.day_of_birth, true) + ((pageDataDB.day_of_birth || pageDataDB.day_of_passing) ? ' - ' : '') + dateFormat(pageDataDB.day_of_passing, true) }}
- .flex.flex-col-reverse.gap-5(class="sm:grid sm:grid-cols-2")
+.grid.grid-cols-1(class="sm:grid-cols-2").justify-center.px-2
+ .col-span-2
+ .flex.flex-col.gap-5.px-4.mx-auto.mt-8(class="w-3/4 sm:px-16")
+ img.mx-auto(v-if="profileImage?.url" class="w-[122px] h-[122px] rounded-[8px]" :src="`${profileImage?.url}`")
+ .text-gray-dark.mx-auto.w-max.font-poppins.text-md {{ dateFormat(pageDataDB.day_of_birth, true) + ((pageDataDB.day_of_birth || pageDataDB.day_of_passing) ? ' - ' : '') + dateFormat(pageDataDB.day_of_passing, true) }}
+ .col-span-1.justify-self-end.pr-5.pt-5
.relative.w-96.p-1(v-if="imageData.length != 0" )
button.absolute.left-4.top-64.bg-black.text-white(@click="prevImage" style="opacity:0.7; --tw-text-opacity: 1; width: 46px; height: 46px; border-radius:50%; align-items: center; justify-content: center; line-height: 2; text-align: center;color: white;") <
button.absolute.right-8.top-64.bg-black.text-white(@click="nextImage" style="opacity:0.7; --tw-text-opacity: 1; width: 46px; height: 46px; border-radius:50%; align-items: center; justify-content: center; line-height: 2; text-align: center;color: white;") >
img.w-96(style="z-index: -1; object-fit:cover;" :src="imageData[currentImage].url")
- // services list
- .py-4.flex.flex-col(class="lg:grid lg:grid-rows-6")
- .flex.flex-col(v-if="pageDataDB.visitation_date")
- .text-gray-dark.font-poppins.text-2xl.text-left.font-bold(style="line-height: 36px; text-shadow: 3px 3px 4px rgba(0, 0, 0, 0.25);") Visitation
- .flex.row.gap-2
+ // services list
+ .col-span-1(class="sm:grid-cols-2").pt-5.pl-5.pr-15
+ .flex.flex-col(v-if="pageDataDB.visitation_date").pb-5.pr-15
+ .text-gray-dark.font-poppins.text-3xl.text-left.font-bold(style="line-height: 10px; justify-content: start; text-shadow: 3px 3px 4px rgba(0, 0, 0, 0.25);") Visitation
+ .flex.row.gap-2.pt-2
.font-outfit.flex-col.font-bold {{ "Date:" }}
.font-outfit {{ longDateFormat(pageDataDB.visitation_date) }}
.flex.row.gap-2
@@ -255,25 +255,17 @@ setImageAutoSlide()
.font-outfit.whitespace-normal {{ pageDataDB.visitation_location ? pageDataDB.visitation_location : "TBD" }}
//.font-outfit {{ pageDataDB.visitation_description }}
.flex.row.gap-2
- .font-outfit.gap-y-5 {{ "400 Freeport Pkwy, Coppell, TX 75019" }}
- .flex-row.gap-2
- .flex.flex-col(v-else)
- .text-gray-dark.font-poppins.text-2xl.text-left.font-bold(style="line-height: 36px; text-shadow: 3px 3px 4px rgba(0, 0, 0, 0.25);") Visitation
- .flex.row.gap-2
- .font-outfit.font-bold {{ "Date:" }}
- .font-outfit.gap-y-5 {{ "TBD" }}
- .flex.row.gap-2
- .font-outfit.font-bold {{ "Time:" }}
- .font-outfit.gap-y-5 {{ "TBD" }}
- .flex.row.gap-2
- .font-outfit.font-bold {{ "Location:" }}
- .font-outfit.gap-y-5 {{ "TBD" }}
+ .font-outfit.gap-y-5 {{ pageDataDB.visitation_address }}
+ .flex.row.gap-2.pr-10
+ .font-outfit.font-bold {{ "Description:" }}
+ .font-outfit.whitespace-normal {{ pageDataDB.visitation_description }}
+
+ .flex.flex-col(v-else).pb-5.pr-15
+ .text-gray-dark.font-poppins.text-3xl.text-left.font-bold(style="line-height: 36px; text-shadow: 3px 3px 4px rgba(0, 0, 0, 0.25);") Visitation
.flex.row.gap-2
- .font-outfit.font-bold {{ "Address:" }}
- .font-outfit.gap-y-5 {{ "TBD" }}
- .flex-row.gap-2
- .flex.flex-col(v-if="pageDataDB.funeral_date")
- .text-gray-dark.font-poppins.text-2xl.text-left.font-bold(style="line-height: 36px; text-shadow: 3px 3px 4px rgba(0, 0, 0, 0.25);") Funeral Service
+ .font-outfit {{ "There is no visitation information available at this time." }}
+ .flex.flex-col(v-if="pageDataDB.funeral_date").pb-5.pr-15
+ .text-gray-dark.font-poppins.text-3xl.text-left.font-bold(style="line-height: 36px; text-shadow: 3px 3px 4px rgba(0, 0, 0, 0.25);") Funeral Service
.flex.row.gap-2
.font-outfit.font-bold {{ "Date:" }}
.font-outfit.gap-2 {{ longDateFormat(pageDataDB.funeral_date) }}
@@ -283,33 +275,27 @@ setImageAutoSlide()
.flex.row.gap-2
.font-outfit.font-bold {{ "Location:" }}
.font-outfit.whitespace-normal {{ pageDataDB.funeral_location }}
- //.font-outfit {{ pageDataDB.funeral_description }}
.flex.row.gap-2
- .font-outfit.font-bold {{ "Address:" }}
- .font-outfit.gap-y-5 {{ "TBD" }}
- .flex-row
- .flex.flex-col(v-else)
- .text-gray-dark.font-poppins.text-2xl.text-left.font-bold(style="line-height: 36px; text-shadow: 3px 3px 4px rgba(0, 0, 0, 0.25);") Funeral Service
- .flex.row.gap-2
- .font-outfit.font-bold {{ "Date:" }}
- .font-outfit.gap-y-5 {{ "TBD" }}
- .flex.row.gap-2
- .font-outfit.font-bold {{ "Time:" }}
- .font-outfit.gap-y-5 {{ "TBD" }}
- .flex.row.gap-2
- .font-outfit.font-bold {{ "Location:" }}
- .font-outfit.gap-y-5 {{ "TBD" }}
+ .font-outfit.whitespace-normal {{ pageDataDB.funeral_address }}
+ .flex.row.gap-2.pr-10
+ .font-outfit.font-bold {{ "Description:" }}
+ .font-outfit {{ pageDataDB.funeral_description }}
+
+ .flex.flex-col(v-else).pb-5
+ .text-gray-dark.font-poppins.text-3xl.text-left.font-bold(style="line-height: 36px; text-shadow: 3px 3px 4px rgba(0, 0, 0, 0.25);") Funeral Service
.flex.row.gap-2
- .font-outfit.font-bold {{ "Address:" }}
- .font-outfit.gap-y-5 {{ "TBD" }}
- .container.m-4.place-content-center.font-poppins(class="w-5/6 sm:m-auto sm:py-3")
- .well.well-sm
- h1.ml-4.pt-9.text-2xl.text-gray-dark(class="sm:text-3xl" style="font-weight: 600; letter-spacing: 0.35px;") Donations
- // add donation description
- .col-md-8.ml-4.pt-6.pr-5.flex.items-center.justify-center
+ .font-outfit.gap-y-5 {{ "There is no funeral information avilable at this time" }}
+ .flex.flex-col.pb-5
+ .text-gray-dark.font-poppins.text-3xl.text-left.font-bold(style="line-height: 36px; text-shadow: 3px 3px 4px rgba(0, 0, 0, 0.25);") Donations
+ .text-gray-dark.font-poppins.text-1xl.text-left.font-bold(style="line-height: 36px; text-shadow: 3px 3px 4px rgba(0, 0, 0, 0.25);")
+ .col-md-1.ml-1.pt-9.pr-5.flex.items-center.justify-center
ActionButton.mx-auto.text-md(name='submit' @click="DisplayDonationPopup=true" class="transition duration-300 bg-orange-999 hover:bg-green-600" ) DONATE NOW
+ .col-span-2
+ .col-md-8.mx-9(class="sm:col-span-1 sm:mr-11")
+ .div.px-10.py-4(style="color: #6E6E6E; font-weight: 500; font-size: 18px; line-height: 28px; letter-spacing: -0.078px; word-break: break-word;" id="obituary") {{ pageDataDB.obituary }}
+
//.container(class="sm:overflow-hidden sm:w-3/4 sm:mt-4 sm:mx-auto sm:place-content-center sm:max-w-xl sm:p-6 sm:rounded-card sm:shadow-card")
-.grid(class="sm:grid-cols-2")
+.grid.grid-cols-1(class="sm:grid-cols-1" )
.py-4.grid.gap-1(v-if="comments?.length" style="text-align: center")
.div.py-4.grid(class="w-full" style="grid-template-columns: repeat(3, 1fr);")
.div(v-for="(comment, i) in comments" :key="i" class="comment-box")
@@ -318,10 +304,10 @@ setImageAutoSlide()
p.comment-body(style="font-size: 0.75rem; width: fit-content; color: #666;") {{ comment.comments }}
.div.comment-donation-amount(style="font-size: 0.75rem; color: #666;") Amount Donated: {{ donationFormat(comment.amount) }}
CVReplySystem(:pageCuid="id" :familyCuid="familyCuid" :replies="replies" @displayReply="displayReply")
- .py-4.grid.flex-box.flex-row.item-centered.gap-1(v-if="replies?.length" style="line-height: 0px;text-align: center")
+ .py-4.grid.flex-box.flex-row.gap-1(v-if="replies?.length" style="line-height: 0px;text-align: center")
div(class="flex")
- .div(v-for="(reply,i) in replies" :key="i" class="reply-box")
- .reply-box(v-if="reply.reply.length > 0" style="padding: 1rem; text-align: left; border-bottom: 1px solid black")
+ .div(v-for="(reply,i) in replies" :key="i" class="reply-box" )
+ .px-10.reply-box(v-if="reply.reply.length > 0" style="padding: 1rem; text-align: left; border-bottom: 1px solid black")
.reply-header(style="font-size: 1rem; font-weight: bold; margin-bottom: 2.5rem; margin-left: 1rem") {{reply.name}}
.reply-body(style="font-size: 1rem; color: #666; margin-bottom: 2.5rem;") {{reply.reply}}
div.flex(style="color:gray; font-weight: 700; justify-content:center; align-items: center; height: 100px;")
@@ -335,8 +321,4 @@ div.flex(style="color:gray; font-weight: 700; justify-content:center; align-item
.col
button(@click="shareMail")
img(src="/mail_fa.png" style="width:50px; height:29px;")
- .col
- p {{ "" }}
- .col-md-8.mx-9(class="sm:col-span-1 sm:mr-11")
- .div.px-8.py-4(style="color: #6E6E6E; font-weight: 500; font-size: 18px; line-height: 28px; letter-spacing: -0.078px; word-break: break-word;" id="obituary") {{ pageDataDB.obituary }}
From 4d3857da3d9d36cffc242cfa0799376dfb9758f0 Mon Sep 17 00:00:00 2001
From: Isi Emordi
Date: Wed, 24 Jul 2024 13:10:19 -0500
Subject: [PATCH 15/47] added the auth token to the database
---
.../migration.sql | 8 ++++++++
prisma/schema.prisma | 6 ++++++
2 files changed, 14 insertions(+)
create mode 100644 prisma/migrations/20240722200429_constant_contacts_access_token/migration.sql
diff --git a/prisma/migrations/20240722200429_constant_contacts_access_token/migration.sql b/prisma/migrations/20240722200429_constant_contacts_access_token/migration.sql
new file mode 100644
index 00000000..f2781052
--- /dev/null
+++ b/prisma/migrations/20240722200429_constant_contacts_access_token/migration.sql
@@ -0,0 +1,8 @@
+-- CreateTable
+CREATE TABLE "CC_Token" (
+ "cuid" TEXT NOT NULL,
+ "token" TEXT NOT NULL,
+ "date" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+ CONSTRAINT "CC_Token_pkey" PRIMARY KEY ("cuid")
+);
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 0a2eb689..bfe519bf 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -104,6 +104,12 @@ model PageDonation {
@@map("page_donations")
}
+model CC_Token {
+ cuid String @id @default(cuid())
+ token String
+ date DateTime @default(now())
+}
+
model Reply {
cuid String @id @default(cuid())
pageCuid String @map("page_cuid")
From d19ad3ded431419c409f6c694f53627885f3d262 Mon Sep 17 00:00:00 2001
From: Isi Emordi
Date: Wed, 24 Jul 2024 13:43:24 -0500
Subject: [PATCH 16/47] fixed database and callback api
---
prisma/schema.prisma | 1 +
server/api/cc_callback.ts | 11 ++++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index bfe519bf..0ca16076 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -107,6 +107,7 @@ model PageDonation {
model CC_Token {
cuid String @id @default(cuid())
token String
+ refresh_token String
date DateTime @default(now())
}
diff --git a/server/api/cc_callback.ts b/server/api/cc_callback.ts
index 39ae446d..f0973ddf 100644
--- a/server/api/cc_callback.ts
+++ b/server/api/cc_callback.ts
@@ -13,10 +13,7 @@ export default defineEventHandler(async event => {
console.log('Authorization code not found')
}
-
-
-
- const response = await fetch(`https://authz.constantcontact.com/oauth2/default/v1/token?code=${code as string}&redirect_uri=${encodeURIComponent(`${runtime.BASEURL}EmailList`)}&grant_type=authorization_code`, {
+ const response = await fetch(`https://authz.constantcontact.com/oauth2/default/v1/token?code=${code as string}&redirect_uri=${encodeURIComponent(`${runtime.BASEURL}api/cc_callback`)}&grant_type=authorization_code`, {
method: 'POST',
headers: {
"Accept": "application/json",
@@ -25,6 +22,10 @@ export default defineEventHandler(async event => {
}
})
- console.log(response)
+ const accessToken = (await response.json()).access_token
+
+
+
+ console.log(accessToken)
})
\ No newline at end of file
From d5fb857b38e1a42e4c1f7d9ee7719a24d4bb6031 Mon Sep 17 00:00:00 2001
From: Isi Emordi
Date: Wed, 24 Jul 2024 14:30:09 -0500
Subject: [PATCH 17/47] completed oauth2 flow of constant contacts
---
pages/EmailList.vue | 6 ++-
.../migration.sql | 8 ++++
.../migration.sql | 2 +
prisma/schema.prisma | 2 +-
server/api/cc_callback.ts | 23 ++++++++--
server/api/refresh_token.ts | 45 +++++++++++++++++++
6 files changed, 80 insertions(+), 6 deletions(-)
create mode 100644 prisma/migrations/20240724184351_add_refresh_token_to_cc_token/migration.sql
create mode 100644 prisma/migrations/20240724185315_default_token_id/migration.sql
create mode 100644 server/api/refresh_token.ts
diff --git a/pages/EmailList.vue b/pages/EmailList.vue
index f38c54d8..f9a2f628 100644
--- a/pages/EmailList.vue
+++ b/pages/EmailList.vue
@@ -1,13 +1,17 @@
button.type-button.my-4.bg-orange-999.text-white.px-4.py-2.rounded-full.w-32.grow-0(type="button" @click="getAuthRequestUrl") Authorize
+button.type-button.my-4.bg-orange-999.text-white.px-4.py-2.rounded-full.w-32.grow-0(type="button" @click="refreshToken") Refresh
diff --git a/prisma/migrations/20240724184351_add_refresh_token_to_cc_token/migration.sql b/prisma/migrations/20240724184351_add_refresh_token_to_cc_token/migration.sql
new file mode 100644
index 00000000..90d7a747
--- /dev/null
+++ b/prisma/migrations/20240724184351_add_refresh_token_to_cc_token/migration.sql
@@ -0,0 +1,8 @@
+/*
+ Warnings:
+
+ - Added the required column `refresh_token` to the `CC_Token` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "CC_Token" ADD COLUMN "refresh_token" TEXT NOT NULL;
diff --git a/prisma/migrations/20240724185315_default_token_id/migration.sql b/prisma/migrations/20240724185315_default_token_id/migration.sql
new file mode 100644
index 00000000..8c989bf1
--- /dev/null
+++ b/prisma/migrations/20240724185315_default_token_id/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "CC_Token" ALTER COLUMN "cuid" SET DEFAULT '0';
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 0ca16076..4f95f2fc 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -105,7 +105,7 @@ model PageDonation {
}
model CC_Token {
- cuid String @id @default(cuid())
+ cuid String @id @default("0")
token String
refresh_token String
date DateTime @default(now())
diff --git a/server/api/cc_callback.ts b/server/api/cc_callback.ts
index f0973ddf..bcb95b54 100644
--- a/server/api/cc_callback.ts
+++ b/server/api/cc_callback.ts
@@ -1,6 +1,5 @@
const runtime = useRuntimeConfig()
-
const creds = runtime.CONSTANT_CONTACTS_CLIENTID + ':' + runtime.CONSTANT_CONTACTS_SECRET
const encodedCreds = btoa(creds)
@@ -22,10 +21,26 @@ export default defineEventHandler(async event => {
}
})
- const accessToken = (await response.json()).access_token
+ const respBody = await response.json()
-
+ const addToken = await event.context.client.CC_Token.upsert({
+ where: {
+ cuid: "0"
+ },
+ update: {
+ token: respBody.access_token,
+ refresh_token: respBody.refresh_token,
+ date: new Date()
+
+ },
+ create: {
+ token: respBody.access_token,
+ refresh_token: respBody.refresh_token,
+ date: new Date()
+
+ }
+ })
- console.log(accessToken)
+ await sendRedirect(event, `/EmailList?success=1`)
})
\ No newline at end of file
diff --git a/server/api/refresh_token.ts b/server/api/refresh_token.ts
new file mode 100644
index 00000000..14023184
--- /dev/null
+++ b/server/api/refresh_token.ts
@@ -0,0 +1,45 @@
+
+
+const runtime = useRuntimeConfig()
+const creds = runtime.CONSTANT_CONTACTS_CLIENTID + ':' + runtime.CONSTANT_CONTACTS_SECRET
+const encodedCreds = btoa(creds)
+export default defineEventHandler(async event => {
+
+ const refreshToken = await event.context.client.CC_Token.findFirst({
+ where: {
+ cuid: "0"
+ }
+ })
+
+ const response = await fetch(`https://authz.constantcontact.com/oauth2/default/v1/token?refresh_token=${refreshToken.refresh_token as string}&grant_type=refresh_token`, {
+ method: 'POST',
+ headers: {
+ "Accept": "application/json",
+ "Content-Type": "application/x-www-form-urlencoded",
+ "Authorization": `Basic ${encodedCreds}`
+ }
+ })
+
+ const respBody = await response.json()
+
+ const addToken = await event.context.client.CC_Token.upsert({
+ where: {
+ cuid: "0"
+ },
+ update: {
+ token: respBody.access_token,
+ refresh_token: respBody.refresh_token,
+ date: new Date()
+
+ },
+ create: {
+ token: respBody.access_token,
+ refresh_token: respBody.refresh_token,
+ date: new Date()
+
+ }
+ })
+
+ await sendRedirect(event, `/EmailList?success=1`)
+ })
+
\ No newline at end of file
From de9d757a67a806f2a78a1b05c42a140ed2aa38cd Mon Sep 17 00:00:00 2001
From: Alonso Toji
Date: Wed, 24 Jul 2024 15:55:23 -0500
Subject: [PATCH 18/47] add CV logo to navbar and finalize edits on the navbar
---
.DS_Store | Bin 0 -> 6148 bytes
components/CVHeader.vue | 39 ++++---
components/DropdownMenu.vue | 193 +++++++++++++++--------------------
components/NavLinkButton.vue | 6 +-
package-lock.json | 24 +++--
package.json | 4 +-
public/CVLogo.png | Bin 0 -> 21392 bytes
public/greenHeart.png | Bin 0 -> 2598 bytes
tailwind.config.js | 8 +-
9 files changed, 131 insertions(+), 143 deletions(-)
create mode 100644 .DS_Store
create mode 100644 public/CVLogo.png
create mode 100644 public/greenHeart.png
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..0c444cb4ed0fde751068c5916b2c11223959e8f2
GIT binary patch
literal 6148
zcmeHK%}T>S5Z-NTn^J@v6nYGJEm+%96fYsx7cim+m718M!I&*gVh*K{v%Zi|;`2DO
zyEy~{-bCyS?0&QJvzz%K`@$-O61kgtX_h$N>IO%bLPUP4
zd;V3p$mizXnTS&_j2A1J5C#hfxxEhKK;(|d;vkW^u5uV%qdPbI>-A_l99ZMY@n&GH
zPe!0m#?#HFYwRB!o?gtKqnB8`DIz&=E@f9^3Gbj(YI=27aU|kLu$MVyEFm#K3=jjv
z!1ghq&jO>jeWg>y!~iky0|U4}SkMq{jfFzFbwG#LXY{uaQ9#GH1fr$U)>tS64+vMO
zfGU;iCk9vPV7GLft+7z3(ixX4!#sNB^6|pu>R`8IIODcL>WKkjpvpi~4NW}%&*7J;
zedJeDXhaMU1OJQx-kP~H2a3{X>$mdothJ!sLqoy10u>O@E0+Km;6BoqPUW{yhd5hf
Wp%7<5yG#e9i-07AI%41#82AENzDyGU
literal 0
HcmV?d00001
diff --git a/components/CVHeader.vue b/components/CVHeader.vue
index 791783f0..c87e7fd7 100644
--- a/components/CVHeader.vue
+++ b/components/CVHeader.vue
@@ -23,22 +23,26 @@ const onEnter = async() => {
}
-
ClientOnly
- .max-w-min.mx-auto.flex.gap-2.mt-7(style="text-align:center")
+ .max-w-min.mx-auto.pt-3.flex.gap-2.mt-7(style="text-align:center")
div.max-w-min.mx-auto.flex.gap-2(v-if="isLoggedIn && toggle")
- NavLinkButton(to='https://carsonsvillage.org' :class="{'!text-black border-green-999 bg-white': route.path == '/'}")
- p.uppercase.white.w-max 💚
- a.items-center.px-2.py-2.text-base.font-medium.rounded-md.text-blue-999.cursor-pointer(
+ a.w-20.items-center.px-2.py-2.text-sm.font-medium.rounded-md.text-blue-999.cursor-pointer(
+ class='hover:text-black bg-white'
+ target="blank"
+ href="https://carsonsvillage.org"
+ )
+ img.w-20.h-14(src="/CVLogo.png")
+
+ a.items-center.pt-5.px-2.py-2.text-sm.font-medium.rounded-md.text-blue-999.cursor-pointer(
class='hover:text-black bg-white'
href="/api/logout"
)
p.uppercase.white.w-max.font-bold.text-orange-999 LOGOUT
NavLinkButton(:class="{'!text-black border-green-999 bg-white': route.path == '/'}" @click="toggle = !toggle")
- p.uppercase.white.w-max Home
+ p.uppercase.white.w-max.text-blue-999 Main Menu
NavLinkButton(:to="`/pageList/${cuid}/?fromUsers=0`" v-if="isAdvocateAdmin" :class="{'!text-black border-green-999 bg-white': route.path.includes('/page') || route.path.includes('/Page')}")
p.uppercase.white.w-max Pages
NavLinkButton(:to="`/pageList/${familyCuid}/?fromUsers=0`" v-if="!isAdvocateAdmin" :class="{'!text-black border-green-999 bg-white': route.path.includes('/pageList')}")
@@ -59,24 +63,31 @@ ClientOnly
p.uppercase.white.w-max Family Reports
div.max-w-min.mx-auto.flex.gap-2(v-else-if="isLoggedIn && !toggle")
- a.items-center.px-2.py-2.text-base.font-medium.rounded-md.text-blue-999.cursor-pointer(
+ a.w-20.items-center.px-2.py-2.text-sm.font-medium.rounded-md.text-blue-999.cursor-pointer(
+ class='hover:text-black bg-white'
+ target="blank"
+ href="https://carsonsvillage.org"
+ )
+ img.w-20.h-14(src="/CVLogo.png")
+
+ a.items-center.pt-5.px-2.py-2.text-sm.font-medium.rounded-md.text-blue-999.cursor-pointer(
class='hover:text-black bg-white'
href="/api/logout"
)
p.uppercase.white.w-max.font-bold.text-orange-999 LOGOUT
NavLinkButton(:class="{'!text-black border-green-999 bg-white': route.path == '/'}" @click="toggle = !toggle")
- p.uppercase.white.w-max Dashboard
+ p.uppercase.white.w-max.text-blue-999 Dashboard
DropdownMenu(:has-submenus="true" :num-submenus="4"
:submenus="[{ title: 'Timeline of Important Events', to: 'https://carsonsvillage.org/timeline-of-events/' }, { title: 'Resource Library', to: 'http://carsonsvillage.org/resource-library' }, { title: 'Group Support', to: 'https://carsonsvillage.org/grief-group-support/' }, { title: 'Find Support', to: 'https://carsonsvillage.org/support/' }]" :dropdownMinWidth="200")
| RESOURCES
NavLinkButton(to='https://carsonsvillage.org/get-involved/' target="_blank")
- p.uppercase.white.w-max GET INVOLVED
+ p.uppercase.white.w-max.text-black-999 GET INVOLVED
DropdownMenu(:has-submenus="true" :num-submenus="6"
:submenus="[{ title: 'Our Story', to: 'https://carsonsvillage.org/about-us/our-family/' }, { title: 'Our Testimonies', to: 'https://carsonsvillage.org/our-testimonials/' }, { title: 'In The News', to: 'https://carsonsvillage.org/about-us/in-the-news/' }, { title: 'Newsletter Archive', to: 'https://carsonsvillage.org/about-us/newsletter-archive/' }, { title: 'Our Team >', submenus: [{ title: 'Advocates', to: 'https://carsonsvillage.org/about-us/advocates/' }, { title: 'Clinical Consultants', to: 'https://carsonsvillage.org/about-us/clinical-consultants/' }, { title: 'Support Team', to: 'https://carsonsvillage.org/about-us/meet-our-team/' }]}, { title: 'Board of Directors', to: 'https://carsonsvillage.org/about-us/board-of-directors/' }]" :dropdownMinWidth="150" :nestedDropdownMinWidth="150")
| ABOUT US
- div.max-w-min.mx-auto.flex.gap-2(v-else)
- a.items-center.px-2.py-2.text-base.font-medium.rounded-md.text-gray-999.cursor-pointer(
+ div.max-w-min.mx-auto.flex.gap-2.pt-3(v-else)
+ a.items-center.px-2.py-2.text-sm.font-medium.rounded-md.text-gray-999.cursor-pointer(
class='hover:!text-black bg-white'
href="/api/login"
)
@@ -85,16 +96,16 @@ ClientOnly
NavLinkButton(to='https://carsonsvillage.org/' target="_blank")
p.uppercase.white.w-max HOME
DropdownMenu(:has-submenus="true" :num-submenus="4"
- :submenus="[{ title: 'Timeline of Important Events', to: 'https://carsonsvillage.org/timeline-of-events/' }, { title: 'Resource Library', to: 'http://carsonsvillage.org/resource-library' }, { title: 'Group Support', to: 'https://carsonsvillage.org/grief-group-support/' }, { title: 'Find Support', to: 'https://carsonsvillage.org/support/' }]" :dropdownMinWidth="200")
+ :submenus="[{ title: 'Timeline of Important Events', to: 'https://carsonsvillage.org/timeline-of-events/' }, { title: 'Resource Library', to: 'http://carsonsvillage.org/resource-library' }, { title: 'Group Support', to: 'https://carsonsvillage.org/grief-group-support/' }, { title: 'Find Support', to: 'https://carsonsvillage.org/support/' }]" :dropdownMinWidth="225")
| RESOURCES
NavLinkButton(to='https://carsonsvillage.org/get-involved/' target="_blank")
p.uppercase.white.w-max GET INVOLVED
DropdownMenu(:has-submenus="true" :num-submenus="6"
- :submenus="[{ title: 'Our Story', to: 'https://carsonsvillage.org/about-us/our-family/' }, { title: 'Our Testimonies', to: 'https://carsonsvillage.org/our-testimonials/' }, { title: 'In The News', to: 'https://carsonsvillage.org/about-us/in-the-news/' }, { title: 'Newsletter Archive', to: 'https://carsonsvillage.org/about-us/newsletter-archive/' }, { title: 'Our Team >', submenus: [{ title: 'Advocates', to: 'https://carsonsvillage.org/about-us/advocates/' }, { title: 'Clinical Consultants', to: 'https://carsonsvillage.org/about-us/clinical-consultants/' }, { title: 'Support Team', to: 'https://carsonsvillage.org/about-us/meet-our-team/' }]}, { title: 'Board of Directors', to: 'https://carsonsvillage.org/about-us/board-of-directors/' }]" :dropdownMinWidth="150" :nestedDropdownMinWidth="150")
+ :submenus="[{ title: 'Our Story', to: 'https://carsonsvillage.org/about-us/our-family/' }, { title: 'Our Testimonies', to: 'https://carsonsvillage.org/our-testimonials/' }, { title: 'In The News', to: 'https://carsonsvillage.org/about-us/in-the-news/' }, { title: 'Newsletter Archive', to: 'https://carsonsvillage.org/about-us/newsletter-archive/' }, { title: 'Our Team >', submenus: [{ title: 'Advocates', to: 'https://carsonsvillage.org/about-us/advocates/' }, { title: 'Clinical Consultants', to: 'https://carsonsvillage.org/about-us/clinical-consultants/' }, { title: 'Support Team', to: 'https://carsonsvillage.org/about-us/meet-our-team/' }]}, { title: 'Board of Directors', to: 'https://carsonsvillage.org/about-us/board-of-directors/' }]" :dropdownMinWidth="160" :nestedDropdownMinWidth="165")
| ABOUT US
//&& isLoggedIn")
- .flex.w-max.px-2(v-if="isNotSearch")
+ .flex.w-max.px-2.pt-2(v-if="isNotSearch")
input(class="border border-gray-300 py-2 px-4 rounded-lg focus:outline-none focus:border-black-500"
type="search" placeholder=" " v-model="searchQuery" v-on:keyup.enter="onEnter" style="height: 40px")
NuxtLink.inline(:to="`/Search/?search=${searchQuery}&isPageList=0`")
diff --git a/components/DropdownMenu.vue b/components/DropdownMenu.vue
index 050d9525..0ae92f07 100644
--- a/components/DropdownMenu.vue
+++ b/components/DropdownMenu.vue
@@ -1,115 +1,82 @@
-
-
-
+div.dropdown(@mouseleave="hideDropdown" @mouseover="showDropdown")
+ NuxtLink.items-center.pt-5.px-2.py-2.text-sm.font-medium.rounded-md.cursor-pointer.relative.no-border.text-gray-999(
+ v-if="to && !submenus"
+ class="buttonClasses"
+ to="to"
+ target="blank"
active-class="active"
- @mouseover="showDropdown"
- @mouseleave="hideDropdown"
- >
-
-
- ⌄
-
-
-
-
-
-
-
-
-
-