Skip to content

Commit

Permalink
send email when signing up for ticket
Browse files Browse the repository at this point in the history
- need to show how many tickets an event has
- enterprise me on prod and change max users in event, plus make sure there aren't any hardcoded 75 user limits
- contact email in more places

Co-Authored-By: Bloxs <[email protected]>
  • Loading branch information
quick007 and Blocksnmore committed Mar 14, 2024
1 parent c8b4cab commit 64bbe11
Show file tree
Hide file tree
Showing 22 changed files with 161 additions and 49 deletions.
10 changes: 5 additions & 5 deletions components/faq/artDesign.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { FAQ } from "@/components/faq/questions.ts";
import { FAQ } from "./questions.tsx";

export const artDesignFAQs: FAQ[] = [
{
q: "Who made the logo for this website?",
a: "Lukas (quick007 on discord) made the logos and designed this website.",
},
// {
// q: "Who made the logo for this website?",
// a: "Lukas (quick007 on discord) made the logos and designed this website.",
// },
{
q: "Where are the placeholder photos from?",
a: (
Expand Down
2 changes: 1 addition & 1 deletion components/faq/pricing.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FAQ } from "@/components/faq/questions.ts";
import { FAQ } from "./questions.tsx";

export const pricingfaqs: FAQ[] = [
{
Expand Down
4 changes: 4 additions & 0 deletions components/faq/questions.ts → components/faq/questions.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import { ComponentChildren } from "preact";

export const faqs: FAQ[] = [
{
q: "How do I contact Events?",
a: ( <>You can contact us at <a href="mailto:[email protected]" class="underline font-medium">[email protected]</a></> )
},
{
q: "How can I get alpha access?",
a: "We are currently in a closed alpha and not accepting new clients",
Expand Down
11 changes: 6 additions & 5 deletions emails/event.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import {
} from "@react-email/components";
import * as React from "react";
import config from "../tailwind.config.ts";
import Ticket from "@/islands/components/pieces/ticket.tsx";

export default function LoginEmail({ otp = "123456" }: { otp: string }) {
return (
Expand Down Expand Up @@ -53,8 +52,8 @@ export default function LoginEmail({ otp = "123456" }: { otp: string }) {
<Heading className="mt-10 mb-0">Your Tickets!</Heading>
<Text className="mt-0">{`{{EVENT-NAME}}`}</Text>

<Heading className="font-bold mt-4 text-xl">Your QR Code</Heading>
<Text>You'll scan this when entering your event. </Text>
{/* <Heading className="font-bold mt-4 text-xl">Your QR Code</Heading>
<Text>You'll scan this when entering your event. </Text> */}
<Container className="bg-gray-100 w-80">
<p className="border font-semibold text-gray-700 text-sm rounded-md mb-2 mx-auto mt-4 px-2 py-1">
{`{{TICKETS}}`} ticket(s)
Expand All @@ -65,6 +64,7 @@ export default function LoginEmail({ otp = "123456" }: { otp: string }) {
width={232}
className="mb-4"
/>
{`{{QR-VALUE}}`}
</Container>
</Container>
<Container className="my-8">
Expand All @@ -74,12 +74,13 @@ export default function LoginEmail({ otp = "123456" }: { otp: string }) {
>
View Ticket
</Button>
<Button
<a
href="{{EVENT-LINK}}"
rel="_blank"
className="ml-3 rounded-md font-semibold peer z-10 hover:brightness-95 transition hover:focus:ring-1 hover:focus:brightness-100 disabled:brightness-90 disabled:cursor-not-allowed bg-gray-300 ring-gray-400/50 text-gray-800 px-4 py-2"
>
View Event
</Button>
</a>
</Container>
</Body>
</Tailwind>
Expand Down
20 changes: 11 additions & 9 deletions fresh.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import * as $api_events_team_remove from "./routes/api/events/team/remove.ts";
import * as $api_events_team_update from "./routes/api/events/team/update.ts";
import * as $api_events_ticket_delete from "./routes/api/events/ticket/delete.ts";
import * as $api_events_ticket_index from "./routes/api/events/ticket/index.ts";
import * as $api_qr from "./routes/api/qr.ts";
import * as $events_pages_layout from "./routes/events/(pages)/_layout.tsx";
import * as $events_pages_attending_layout from "./routes/events/(pages)/attending/_layout.tsx";
import * as $events_pages_attending_index from "./routes/events/(pages)/attending/index.tsx";
Expand Down Expand Up @@ -57,6 +58,7 @@ import * as $components_pickers_dropdown from "./islands/components/pickers/drop
import * as $components_pickers_image from "./islands/components/pickers/image.tsx";
import * as $components_pickers_select from "./islands/components/pickers/select.tsx";
import * as $components_pickers_time from "./islands/components/pickers/time.tsx";
import * as $components_pieces_acceptCookies from "./islands/components/pieces/acceptCookies.tsx";
import * as $components_pieces_deleteToken from "./islands/components/pieces/deleteToken.tsx";
import * as $components_pieces_navDropDown from "./islands/components/pieces/navDropDown.tsx";
import * as $components_pieces_ticket from "./islands/components/pieces/ticket.tsx";
Expand Down Expand Up @@ -87,15 +89,15 @@ import * as $events_viewing_availability from "./islands/events/viewing/availabi
import * as $events_viewing_contact from "./islands/events/viewing/contact.tsx";
import * as $events_viewing_dates from "./islands/events/viewing/dates.tsx";
import * as $events_viewing_delete from "./islands/events/viewing/delete.tsx";
import * as $events_viewing_register_index from "./islands/events/viewing/register/index.tsx";
import * as $events_viewing_register_login from "./islands/events/viewing/register/login.tsx";
import * as $events_viewing_register_submit from "./islands/events/viewing/register/submit.tsx";
import * as $events_viewing_selectShowTime from "./islands/events/viewing/selectShowTime.tsx";
import * as $events_viewing_showtimes from "./islands/events/viewing/showtimes.tsx";
import * as $events_viewing_ticketActions from "./islands/events/viewing/ticketActions.tsx";
import * as $loginForm from "./islands/loginForm.tsx";
import * as $queueManagement from "./islands/queueManagement.tsx";
import * as $tickets_filters from "./islands/tickets/filters.tsx";
import * as $tickets_register_index from "./islands/tickets/register/index.tsx";
import * as $tickets_register_login from "./islands/tickets/register/login.tsx";
import * as $tickets_register_submit from "./islands/tickets/register/submit.tsx";
import { type Manifest } from "$fresh/server.ts";

const manifest = {
Expand Down Expand Up @@ -123,6 +125,7 @@ const manifest = {
"./routes/api/events/team/update.ts": $api_events_team_update,
"./routes/api/events/ticket/delete.ts": $api_events_ticket_delete,
"./routes/api/events/ticket/index.ts": $api_events_ticket_index,
"./routes/api/qr.ts": $api_qr,
"./routes/events/(pages)/_layout.tsx": $events_pages_layout,
"./routes/events/(pages)/attending/_layout.tsx":
$events_pages_attending_layout,
Expand Down Expand Up @@ -166,6 +169,8 @@ const manifest = {
"./islands/components/pickers/image.tsx": $components_pickers_image,
"./islands/components/pickers/select.tsx": $components_pickers_select,
"./islands/components/pickers/time.tsx": $components_pickers_time,
"./islands/components/pieces/acceptCookies.tsx":
$components_pieces_acceptCookies,
"./islands/components/pieces/deleteToken.tsx":
$components_pieces_deleteToken,
"./islands/components/pieces/navDropDown.tsx":
Expand Down Expand Up @@ -202,19 +207,16 @@ const manifest = {
"./islands/events/viewing/contact.tsx": $events_viewing_contact,
"./islands/events/viewing/dates.tsx": $events_viewing_dates,
"./islands/events/viewing/delete.tsx": $events_viewing_delete,
"./islands/events/viewing/register/index.tsx":
$events_viewing_register_index,
"./islands/events/viewing/register/login.tsx":
$events_viewing_register_login,
"./islands/events/viewing/register/submit.tsx":
$events_viewing_register_submit,
"./islands/events/viewing/selectShowTime.tsx":
$events_viewing_selectShowTime,
"./islands/events/viewing/showtimes.tsx": $events_viewing_showtimes,
"./islands/events/viewing/ticketActions.tsx": $events_viewing_ticketActions,
"./islands/loginForm.tsx": $loginForm,
"./islands/queueManagement.tsx": $queueManagement,
"./islands/tickets/filters.tsx": $tickets_filters,
"./islands/tickets/register/index.tsx": $tickets_register_index,
"./islands/tickets/register/login.tsx": $tickets_register_login,
"./islands/tickets/register/submit.tsx": $tickets_register_submit,
},
baseUrl: import.meta.url,
} satisfies Manifest;
Expand Down
15 changes: 15 additions & 0 deletions islands/components/pieces/acceptCookies.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import CTA from "@/components/buttons/cta.tsx";
import Deletion from "@/islands/events/components/delete.tsx";
import { useSignal } from "@preact/signals";

const Cookies = () => {
const open = useSignal(false);

return (
<div class="absolute z-50 bottom-4 right-4 bg-white shadow-lg rounded-md p-4">
Test
</div>
);
};

export default Cookies;
2 changes: 1 addition & 1 deletion islands/events/list/exportTicketData.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export default function ExportTicketData({
}}
class="rounded-md bg-gray-200 h-8 grid place-content-center px-2 font-medium hover:brightness-95 transition"
>
.csv Export
.csv
</button>
</>
);
Expand Down
14 changes: 14 additions & 0 deletions islands/events/viewing/contact.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,26 @@ export const Contact = ({ email }: { email: string }) => {
}}
>
<h2 class="font-bold text-lg">Contact Organizer</h2>
<h3 class="font-medium mt-2">Are you sure?</h3>
<p>
Are you looking for Events support or an organizer contact email?
It's simple and easy to contact Events, the ticketing platform
used to make this event. Create a ticket by emailing Events at{" "}
<a href="mailto:[email protected]" class="underline font-medium">
[email protected]
</a>.
</p>
<p class="mt-4 text-pretty">
Still want to contact the organizer? Agree to our terms below to
access it.
</p>
<label class="flex mt-4 items-start cursor-pointer">
<input
type="checkbox"
name="agreed"
class="mr-4 mt-1.5"
onClick={(e) => (checked.value = e.currentTarget.checked)}
disabled={checked.value}
/>
<p>
I agree to interacting with this email in a professional way and
Expand Down
22 changes: 17 additions & 5 deletions islands/loginForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,23 @@ const LoginForm = ({
Login
</CTA>
</form>
<p
className="mt-2 text-center underline text-sm cursor-pointer"
onClick={differentEmail}
>
Enter a Different Email
{!emailInputted && (
<p
className="mt-2 text-center underline text-sm cursor-pointer"
onClick={differentEmail}
>
Enter a Different Email
</p>
)}
<p class="text-center mt-4 text-gray-700">
By logging in, you agree to our{" "}
<a href="/terms-of-service" class="underline font-medium">
Terms of Service
</a>{" "}
and{" "}
<a href="/privacy-policy" class="underline font-medium">
Privacy Policy
</a>
</p>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { EventRegisterError } from "@/utils/event/register.ts";
import { RegisterErrors } from "@/islands/events/components/registerErrors.tsx";
import SelectShowTime from "@/islands/events/viewing/selectShowTime.tsx";
import { isUUID } from "@/utils/db/misc.ts";
import Submit from "@/islands/events/viewing/register/submit.tsx";
import Submit from "./submit.tsx";
import Login from "./login.tsx";

export default function EventRegister({
Expand Down
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 64bbe11

Please sign in to comment.