Sqlite and node server

.github/workflows/on-pull-request-to-main.yml

@@ -7,8 +7,6 @@ env:
     CI: true
     AI_GIFTS_API_URL: http://localhost:3000
     FREE_CURRENCY_API_KEY: ${{ secrets.FREE_CURRENCY_API_KEY }}
-    DATABASE_URL: postgres://postgres:password@localhost:5432/test
-    DATABASE_URL_UNPOOLED: postgres://postgres:password@localhost:5432/test
     OPENAI_API_KEY: foo
     OPENAI_ORG_ID: foo
     PRINTIFY_API_TOKEN: ${{secrets.PRINTIFY_API_TOKEN}}
@@ -26,7 +24,7 @@ jobs:
             - name: Setup Node.js
               uses: actions/setup-node@v4
               with:
-                  node-version: "20.11"
+                  node-version: "22.12.0"
                   cache: "npm"
             - name: Install dependencies
               run: npm ci
@@ -45,9 +43,9 @@ jobs:
             - name: Setup Node.js
               uses: actions/setup-node@v4
               with:
-                  node-version: "20.11"
+                  node-version: "22.12.0"
                   cache: "npm"
             - name: Install dependencies
               run: npm ci
             - name: Run unit tests
-              run: npm run test:ci
+              run: npm run test

.github/workflows/on-push-to-main.yml

@@ -18,7 +18,7 @@ jobs:
             - name: Setup Node.js environment
               uses: actions/setup-node@v4
               with:
-                  node-version: 20.11
+                  node-version: 22.12.0
                   cache: "npm"
             - name: Install dependencies
               run: npm install -D

.github/workflows/playwright-pull-request-tests.yml

@@ -21,7 +21,7 @@ jobs:
             - name: Setup Node.js environment
               uses: actions/setup-node@v4
               with:
-                  node-version: 20.11
+                  node-version: 22.12.0
                   cache: "npm"
 
             - name: Install dependencies

.gitignore

@@ -45,3 +45,4 @@ next-env.d.ts
 tests/screenshots
 
 creds.txt
+sqlite.db

.npmrc

@@ -0,0 +1 @@
+engine-strict=true

Caddyfile

@@ -0,0 +1,3 @@
+bilal-home-assistant.duckdns.org, ai-print-shop.com, www.ai-print-shop.com {
+	reverse_proxy localhost:3001
+}

README.md

@@ -6,21 +6,25 @@
 
 ## Technologies
 
--   UI - NextJs
+- UI - NextJs
 
 ## User Story
 
--   I want to enter text about what I want to print on a t shirt, mug or hoodie
--   I want the website to multiple options for what I want and to display it on different things
--   I want to select which product I want
--   I want to pay for this product
--   I want emails telling me about my purchase and delivery
--   I want to be delivered the product
+- I want to enter text about what I want to print on a t shirt, mug or hoodie
+- I want the website to multiple options for what I want and to display it on different things
+- I want to select which product I want
+- I want to pay for this product
+- I want emails telling me about my purchase and delivery
+- I want to be delivered the product
+
+# Set up
+
+`npm run setup`
 
 # Webhooks
 
--   Install stripe CLI from https://docs.stripe.com/stripe-cli
--   Run `stripe login` and login
+- Install stripe CLI from https://docs.stripe.com/stripe-cli
+- Run `npx stripe login` and login
 
 To listen to payment intent succeeded event:
 
@@ -34,9 +38,15 @@ or
   npm run stripe:listen
 ```
 
+# Vercel
+
+To pull production environment variables
+
+`npx vercel pull --environment=production`
+
 # DB
 
--   Need to have .env.development.local with updated pg connection values
+- Need to have .env.development.local with updated pg connection values
 
 Update schema:
 

app/create/page.tsx

@@ -1,19 +1,17 @@
 import { SomethingWrongButton } from "@/components/buttons/SomethingWrongButton";
 import { ImageGenerationForm } from "@/components/ImageGenerationForm";
 import { CountryCode } from "@/lib/stripe/createCheckoutSession";
-import { track } from "@vercel/analytics/server";
 
 export default async function CreatePage({
     searchParams,
 }: {
-    searchParams: {
+    searchParams: Promise<{
         country: CountryCode;
         prompt?: string;
-    };
+    }>;
 }) {
-    const { country, prompt } = searchParams;
+    const { country, prompt } = await searchParams;
     console.log({ msg: "Create Page", country, prompt });
-    track("Landed on create");
 
     return (
         <div className="flex w-full flex-col gap-4 md:w-2/3">

app/error.tsx

@@ -7,7 +7,6 @@ import {
     CardFooter,
     CardHeader,
 } from "@/components/ui/card";
-import { track } from "@vercel/analytics";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
 
@@ -19,7 +18,6 @@ export default function ErrorPage({
     reset: () => void;
 }) {
     console.error({ error });
-    track("Error page");
     const router = useRouter();
 
     return (

app/image/[prompt]/page.tsx

@@ -13,15 +13,15 @@ import { ImageWithLoadingAndError } from "@/components/ImageWithLoadingAndError"
 export const maxDuration = 300;
 
 export default async function GenerateImagePage(params: {
-    params: { prompt: string };
-    searchParams: {
+    params: Promise<{ prompt: string }>;
+    searchParams: Promise<{
         style: string;
         location: string;
         country: CountryCode;
-    };
+    }>;
 }) {
-    const { prompt: encodedPrompt } = params.params;
-    const { style, location, country } = params.searchParams;
+    const { prompt: encodedPrompt } = await params.params;
+    const { style, location, country } = await params.searchParams;
     const decodedPrompt = decodeURIComponent(encodedPrompt);
     console.log({ msg: "Image Page", decodedPrompt, style, location, country });
 

app/layout.tsx

@@ -1,5 +1,4 @@
 import type { Metadata, Viewport } from "next";
-import { Analytics } from "@vercel/analytics/react";
 import { Inter } from "next/font/google";
 import "./globals.css";
 import { CardFooter } from "@/components/ui/card";
@@ -53,7 +52,6 @@ export default function RootLayout({
                         disableTransitionOnChange
                     >
                         {children}
-                        <Analytics />
                     </ThemeProvider>
                 </main>
                 <footer className="mt-auto w-full">

app/page.tsx

@@ -1,10 +1,8 @@
 import { SomethingWrongButton } from "@/components/buttons/SomethingWrongButton";
 import { CreateLink } from "@/components/CreateLink";
 import { ExamplesSection } from "@/components/sections/ExamplesSection";
-import { track } from "@vercel/analytics/server";
 
 export default function Home() {
-    track("Landed on Home");
     return (
         <div className="flex w-full flex-col items-center gap-20">
             <div className="flex w-4/5 flex-col gap-20 pt-20 md:w-3/5">

app/payment/success/page.tsx

@@ -17,7 +17,6 @@ import {
     CardHeader,
     CardTitle,
 } from "@/components/ui/card";
-import { track } from "@vercel/analytics/server";
 import { sendEmail } from "@/lib/email/sendEmail";
 
 export const dynamic = "force-dynamic";
@@ -47,16 +46,16 @@ const pollForPrintifyOrder = async (
 };
 
 export default async function Page(params: {
-    searchParams: { orderId: string };
+    searchParams: Promise<{ orderId: string }>;
 }) {
-    const internalOrderId = Number(params.searchParams.orderId);
+    const { orderId } = await params.searchParams;
+    const internalOrderId = Number(orderId);
     const { printifyOrderId } = await pollForInternalOrder(internalOrderId);
 
     if (!printifyOrderId) {
         console.log("No printify order id for internal order", internalOrderId);
         throw new Error("No printify order id");
     }
-    track("Payment Success");
 
     const printifyOrder = await pollForPrintifyOrder(printifyOrderId);
 

app/product/[productType]/page.tsx

@@ -10,31 +10,30 @@ import {
     getEnabledProductsForCountry,
 } from "@/lib/printify/productsData";
 import { CountryCode } from "@/lib/stripe/createCheckoutSession";
-import { track } from "@vercel/analytics/server";
 
 export type Position = "front" | "back";
 export default async function ProductTypePage({
-    params: { productType },
-    searchParams: {
-        imageId,
-        country,
-        position = "front",
-        scale = 0.7,
-        x = 0.5,
-        y = 0.5,
-    },
+    params,
+    searchParams,
 }: {
-    params: { productType: string };
-    searchParams: {
+    params: Promise<{ productType: string }>;
+    searchParams: Promise<{
         imageId: string;
         country: CountryCode | "undefined";
         position?: Position;
         scale?: number;
         x?: number;
         y?: number;
-    };
+    }>;
 }) {
-    track("Product page");
+    const {
+        imageId,
+        country,
+        position = "front",
+        scale = 0.7,
+        x = 0.5,
+        y = 0.5,
+    } = await searchParams;
 
     if (country === "undefined") {
         return <CountrySetter />;
@@ -44,6 +43,8 @@ export default async function ProductTypePage({
         return <CountryPicker />;
     }
 
+    const { productType } = await params;
+
     const products = getEnabledProductsForCountry(country);
     const displayName = decodeURIComponent(productType) as DisplayName;
     const productInfo = products.find((p) => p.displayName === displayName);

app/support/page.tsx

@@ -18,7 +18,6 @@ import { Textarea } from "@/components/ui/textarea";
 import { useToast } from "@/components/ui/use-toast";
 import { sendFeedbackEmail } from "@/lib/email/sendFeedbackEmail";
 import { Copy } from "lucide-react";
-import { track } from "@vercel/analytics";
 
 const formSchema = z.object({
     email: z.string().email().optional(),
@@ -111,7 +110,6 @@ export default function SupportPage() {
                                 title: "Copied email to clipboard",
                                 duration: 1200,
                             });
-                            track("Copy email to clipboard");
                         }}
                         variant={"secondary"}
                     >

components/ExamplesCard.tsx

@@ -53,8 +53,7 @@ export function ExampleCard({
             <CardFooter>
                 <Link
                     className="w-full"
-                    href={`/product/T%20Shirt?country=${countryCode}&imageId=${printifyImageId}`}
-                    target="_blank"
+                    href={`/product/T%20Shirt?country=${countryCode}&imageId=${printifyImageId}&size=L&color=Black`}
                 >
                     <Button
                         className="w-full"

components/ImageGenerationForm.tsx

@@ -20,7 +20,6 @@ import {
     DialogTrigger,
 } from "@/components/ui/dialog";
 import { sample } from "lodash";
-import { track } from "@vercel/analytics";
 import { checkPromptForIssues } from "@/lib/openai/copyrightCheck";
 
 const styleOptions = [
@@ -93,7 +92,6 @@ export function ImageGenerationForm({
     };
 
     const generateImage = async () => {
-        track("Generated Image");
         if (promptValue.trim() === "") return;
 
         const response = await checkPromptForIssues(promptValue);
@@ -123,7 +121,6 @@ export function ImageGenerationForm({
     function randomisePrompt(): void {
         const randomPrompt = getRandomPrompt();
         setPromptValue(randomPrompt);
-        track("Randomise Prompt");
     }
 
     return (

components/ImageWithLoadingAndError.tsx

@@ -1,5 +1,4 @@
 "use client";
-import { track } from "@vercel/analytics";
 import Image from "next/image";
 import { useState } from "react";
 import { Skeleton } from "./ui/skeleton";
@@ -36,7 +35,6 @@ export function ImageWithLoadingAndError({
                         error,
                         msg: "Image loading error",
                     });
-                    track("Image Error");
                     setImageErrored(true);
                 }}
                 priority

components/product/ProductDetails.tsx

@@ -34,7 +34,6 @@ import { Slider } from "@/components/ui/slider";
 import { Label } from "@/components/ui/label";
 import { AppRouterInstance } from "next/dist/shared/lib/app-router-context.shared-runtime";
 import { capitalize } from "lodash";
-import { track } from "@vercel/analytics";
 import { SaveForLaterDialogueAndButton } from "../dialogues/SaveForLaterDialogueAndButton";
 import { setNewSearchParamsAndPushRoute } from "./setNewSearchParamsAndPushRoute";
 import {
@@ -138,7 +137,6 @@ export function ProductDetails({
     }, [selectedProductVariant, country, blueprint_id, print_provider_id]);
 
     const onClick = async () => {
-        track("Buy now");
         if (!sellingPriceInLocalCurrency) {
             throw new Error("No selling price");
         }
@@ -199,7 +197,6 @@ export function ProductDetails({
                 <Button
                     variant={"secondary"}
                     onClick={async () => {
-                        track("Toggle Background");
                         await toggleImageBackgroundButtonAction({
                             currentImageId: printifyImageId,
                             country,
@@ -214,7 +211,6 @@ export function ProductDetails({
                         variant={"secondary"}
                         className="w-full"
                         onClick={() => {
-                            track("Position Image on Front");
                             setNewSearchParamsAndPushRoute({
                                 searchParams,
                                 name: "position",
@@ -230,7 +226,6 @@ export function ProductDetails({
                         variant={"secondary"}
                         className="w-full"
                         onClick={() => {
-                            track("Position image on back");
                             setNewSearchParamsAndPushRoute({
                                 searchParams,
                                 name: "position",

db/client.ts

@@ -1,6 +1,7 @@
-import { neon } from "@neondatabase/serverless";
-import { drizzle } from "drizzle-orm/neon-http";
-import { envServer } from "@/lib/env/server";
+import { drizzle } from "drizzle-orm/better-sqlite3";
+import Database from "better-sqlite3";
 
-const sql = neon(envServer.DATABASE_URL);
-export const dbClient = drizzle(sql);
+const sqlite = new Database("sqlite.db");
+const dbClient = drizzle(sqlite);
+
+export { dbClient };