Merge branch 'tarun/feature/stripe-express' of https://github.com/Uoa…

…WDCC/auis-portal into tarun/feature/stripe-express

api/db/User.ts

@@ -0,0 +1,20 @@
+import { Schema, model } from "mongoose";
+
+const userSchema = new Schema({
+  firstName: {
+    type: String,
+    required: true,
+  },
+  lastName: String,
+  email: {
+    type: String,
+    required: true,
+    unique: true,
+    maxLength: 40,
+    minLength: 1,
+  },
+});
+
+const User = model("User", userSchema);
+
+export default User;

api/db/config/env.ts

@@ -25,7 +25,7 @@ dotenv.config();
   if (!process.env.STRIPE_SECRET_TEST) {
     throw new Error(
       `.env: Stripe Secret (Test mode) is required. Received: "${process.env.STRIPE_SECRET_TEST}"`
-    )
+    );
   }
 })();
 
@@ -34,5 +34,5 @@ export const {
   DATABASE_PORT,
   DATABASE_USERNAME,
   DATABASE_PASSWORD,
-  STRIPE_SECRET_TEST
+  STRIPE_SECRET_TEST,
 } = process.env;

api/index.ts

@@ -9,7 +9,7 @@ import authRoutes from "./routes/authRoutes";
 import creditRoutes from "./routes/creditRoutes";
 import adminRoutes from "./routes/adminRoutes";
 import photoRoutes from "./routes/photoRoutes";
-import stripeRoutes from "./routes/stripeRoutes"
+import stripeRoutes from "./routes/stripeRoutes";
 
 import { errorHandler, notFound } from "./middleware/errorMiddleware";
 import userRoutes from "./routes/userRoutes";
@@ -32,7 +32,7 @@ app.use("/api/photos", photoRoutes);
 app.use("/api", userRoutes); //Demo Route on how to work with Drizzle
 
 //StripeJS
-app.use("/api/stripe", stripeRoutes)
+app.use("/api/stripe", stripeRoutes);
 
 // The custom handlers in /middleware need to be below Routes
 app.use(notFound);

api/middleware/errorMiddleware.ts

@@ -1,5 +1,5 @@
-import { Request, Response, NextFunction } from 'express';
-import dotenv from 'dotenv';
+import { Request, Response, NextFunction } from "express";
+import dotenv from "dotenv";
 
 dotenv.config();
 

web/src/main.tsx

@@ -25,7 +25,7 @@ import CheckoutScreen from "./screens/CheckoutScreen.tsx";
 import ReturnScreen from "./screens/ReturnScreen.tsx";
 import EventScreen from "./screens/EventScreen.tsx";
 
-// @Ratchet7x5: keys etc need to be parsed before route creation. 
+// @Ratchet7x5: keys etc need to be parsed before route creation.
 const CLERK_PUBLISHABLE_KEY = import.meta.env.VITE_CLERK_PUBLISHABLE_KEY;
 
 if (!CLERK_PUBLISHABLE_KEY) {

web/src/screens/CheckoutScreen.tsx

@@ -6,7 +6,7 @@ import {
 } from "@stripe/react-stripe-js";
 
 const STRIPE_PUBLISHABLE_KEY = import.meta.env.VITE_STRIPE_PUBLISH_KEY_DEV;
-console.log(STRIPE_PUBLISHABLE_KEY)
+console.log(STRIPE_PUBLISHABLE_KEY);
 
 // Make sure to call `loadStripe` outside of a component’s render to avoid
 // recreating the `Stripe` object on every render.
@@ -20,7 +20,7 @@ function CheckoutScreen() {
       "http://localhost:3000/api/stripe/create-checkout-session",
       {
         method: "POST",
-        headers: { 'Content-Type': 'application/json' },
+        headers: { "Content-Type": "application/json" },
         // add our own priceId here later for different products
         body: JSON.stringify(bodyData),
       }

web/src/screens/ReturnScreen.tsx

@@ -10,7 +10,9 @@ const ReturnScreen = () => {
     const urlParams = new URLSearchParams(queryString);
     const sessionId = urlParams.get("session_id");
 
-    fetch(`http://localhost:3000/api/stripe/session-status?session_id=${sessionId}`)
+    fetch(
+      `http://localhost:3000/api/stripe/session-status?session_id=${sessionId}`
+    )
       .then((res) => res.json())
       .then((data) => {
         setStatus(data.status);