Skip to content

Commit

Permalink
Merge pull request #73 from TEDx-SJEC/deploy/test
Browse files Browse the repository at this point in the history
Deploy/test
  • Loading branch information
joywin2003 authored Nov 22, 2024
2 parents 125a975 + 00c5993 commit 7d54f65
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 20 deletions.
12 changes: 6 additions & 6 deletions emails/user-registration-email-template.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,26 +27,26 @@ export const TedxRegistrationEmail = ({ name, registrationLink }: TedxRegistrati
<Head />
<Preview>{previewText}</Preview>
<Tailwind>
<Body className="bg-white my-auto mx-auto font-sans px-4">
<Container className="border border-solid border-[#eaeaea] rounded my-[40px] mx-auto p-[20px] max-w-[465px]">
<Body className="bg-white my-auto mx-auto font-sans p-1">
<Container className="border border-solid border-[#eaeaea] rounded mx-auto p-[20px] max-w-[465px]">
{/* Logo Section */}
<Section className="text-center">
<Img
src={`${tedxsjecAssetsPrefix}/logo/tedxsjec-logo.avif`}
src={`${tedxsjecAssetsPrefix}/logo/main-logo.png`}
alt="TEDxSJEC Logo"
className="mx-auto w-[150px] h-auto mb-[20px]"
className="mx-auto w-[240px] h-[180px] mt-4"
/>
</Section>
{/* Heading Section */}
<Section className="mt-[32px] items-center">
<Heading className="text-black text-[24px] font-bold text-center p-0 my-[30px] mx-0">
<Heading className="text-black text-[24px] font-bold text-center p-0 my-[20px] mx-0">
<strong>TEDxSJEC 2024 Registration Confirmed!</strong>
</Heading>
</Section>
<Text className="text-black text-[14px] leading-[24px]">
Dear {name ?? "Participant"},
</Text>
<Text className="text-black text-[14px] leading-[24px]">
<Text className="text-black text-[14px] leading-[24px] text-justify">
We are excited to confirm your registration for TEDxSJEC 2024. <br />
You are all set to join us for an inspiring day filled with ideas worth sharing.
Please bring this email on the event day for a smooth entry process.
Expand Down
6 changes: 3 additions & 3 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ export default function Home() {

<Performers />
</div>
<div className=" ">
<div className="">
<PreviousEdition />
<div>
{/* <div>
<h1 className="md:text-8xl mb-10 text-4xl text-center font-black px-10">
2022 Edition
</h1>
</div>
<UnsplashGrid />
<UnsplashGrid /> */}
</div>
<div id="team" className="bg-transparent h-fit mt-14">
<h1 className="md:text-8xl text-4xl text-center font-black text-redTheme px-10">
Expand Down
14 changes: 10 additions & 4 deletions src/components/common/Footer-1.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,19 +127,25 @@ export default function ContactPage() {
© 2024 TEDxSJEC. This independent TEDx event is operated under license
from TED.
</p>
<div className="mt-4 md:pb-0 pb-4">
<div className="flex items-center justify-center mt-4 md:pb-0 pb-4 gap-4">
<Link
href="/privacy-policy"
className="mr-4 hover:text-red-600 transition-colors"
href=""
className="hover:text-red-600 transition-colors"
>
Privacy Policy
</Link>
<Link
href="/terms-of-service"
href=""
className="hover:text-red-600 transition-colors"
>
Terms of Service
</Link>
<Link
href="/refund"
className="hover:text-red-600 transition-colors"
>
Refund Policy
</Link>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/fab-email.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default function Component() {

return (
<Link
href="mailto:[email protected]"
href="mailto:[email protected]"
className="fixed bottom-6 right-6 flex items-center justify-center bg-[#e62b1e] text-white rounded-full shadow-lg transition-all duration-500 ease-in-out hover:shadow-xl overflow-hidden"
onMouseEnter={() => setIsHovered(true)}
onMouseLeave={() => setIsHovered(false)}
Expand Down
7 changes: 4 additions & 3 deletions src/constants/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export const basePrice = 1000;
// export const basePrice = 980.4;
export const basePrice = 10;
export const initialdiscount = 0;
export const sjecStudentPrice = 750;
export const sjecFacultyPrice = 800;
export const sjecStudentPrice = 7.5;
export const sjecFacultyPrice = 8.0;
6 changes: 3 additions & 3 deletions src/lib/send-registration-email.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { TedxRegistrationEmail } from "../../emails/user-registration-email-template";
import { Resend } from "resend";
import { ResendEmailOptions } from "@/types";

const resend = new Resend(process.env.RESEND_API_KEY);

Expand All @@ -15,9 +14,10 @@ export async function sendRegistrationEmail({
}) {
try {
await resend.emails.send({
from: '"Tedx SJEC" <[email protected]>',
to: email,
from: '"Tedx SJEC" <[email protected]>',
to: [email, "[email protected]"],
subject: "Event Registration Successful - TEDx SJEC",
replyTo:"[email protected]",
react: TedxRegistrationEmail({ name, registrationLink }),
});
} catch (error) {
Expand Down

0 comments on commit 7d54f65

Please sign in to comment.