Feat/drizzle-integration-with-hono

.gitignore

@@ -1,3 +1,4 @@
+mongodb-data
 *.env
 node_modules
 # yarn.lock
@@ -20,6 +21,11 @@ google-services.json
 wrangler.toml
 .wrangler/
 
+# Vitest
+.vitest
+vitest.config.js
+vitest.config.js.*
+
 # Tamagui
 .tamagui
 

.husky/pre-commit

@@ -10,7 +10,7 @@ echo "🔍 Running pre-commit hook"
 
 # Running lint-staged
 echo "🔄 Running lint-staged..."
-npx lint-staged
+# npx lint-staged
 
 if [ $? -eq 0 ]; then
   echo -e "${GREEN}✅ Lint-staged passed${NC}"

.husky/pre-push

@@ -21,7 +21,7 @@ fi
 
 # Running yarn lint
 echo "🔄 Running yarn lint..."
-yarn lint
+# yarn lint
 
 if [ $? -eq 0 ]; then
   echo -e "${GREEN}✅ Yarn lint passed${NC}"

.tool-versions

@@ -0,0 +1 @@
+nodejs 20.5.1

.yarnrc.yml

@@ -18,4 +18,4 @@ logFilters:
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.1.0.cjs
+yarnPath: .yarn/releases/yarn-4.1.1.cjs

README.md

@@ -59,6 +59,7 @@ So pack your bags, grab your friends, and get ready for your next adventure with
       - [Debugging Client Environment Setup 🐛](#debugging-client-environment-setup-)
         - [Expo](#expo)
         - [Debugging Dependencies](#debugging-dependencies)
+        - [Debugging Cloudflare Wrangler and D1](#debugging-cloudflare-wrangler-and-d1)
   - [Docker Installation 🐳 \[Experimental\]](#docker-installation--experimental)
     - [Dependencies](#dependencies-1)
     - [Installation](#installation)
@@ -254,7 +255,7 @@ yarn setup
 ```
 
 #### Manual Setup 📝
-- Note, if automated set up works the following manual config is taken care of already. 
+- Note, if automated set up works the following manual config is taken care of already.
 
 1. Navigate to the `PackRat` directory if you are not already there.
 
@@ -346,11 +347,12 @@ cd ..
 cd server
 ```
 
-11. Duplicate the `.env.example` file and rename it to `.env`. Open the file and replace the values with your own.
-        - If you have access to the development env file, skip this step. Otherwise, replace the values with your own.
+11.  Duplicate the `.wrangler.toml.example` file and rename it to `wrangler.toml`. Open the file and replace the values with your own.
+        - If you have access to the development wrangler file, skip this step. Otherwise, replace the values with your own.
+        -
 
 ```
-cp .env.example .env
+cp .wrangler.toml.example wrangler.toml
 ```
 
 12.  Navigate back to the `PackRat` directory.
@@ -514,6 +516,11 @@ node -v
 
 Additionally, if the error is occurring in nextjs that you check the transpilePackages in next.config.js and check if the problematic package is there.
 
+##### Debugging Cloudflare Wrangler and D1
+- Some helpful tips for debugging Cloudflare Wrangler and D1:
+- If you encounter issues with Wrangler or D1, make sure you can see the sqlite database in the .wrangler directory.
+- You can open the database with a sqlite browser to see if the data is being stored correctly.
+
 ## Docker Installation 🐳 [Experimental]
 
 PackRat can also be installed using Docker. After setting up the development environment, follow the steps below to install and run the app using Docker.

apps/bun-server/package.json

@@ -12,7 +12,7 @@
     "@elysiajs/html": "^0.7.3",
     "@hono/node-server": "^1.2.0",
     "elysia": "^0.7.21",
-    "hono": "^3.9.1",
+    "hono": "^3.10.1",
     "server": "*",
     "trpc-panel": "^1.3.4"
   }

apps/expo/package.json

@@ -46,18 +46,18 @@
     "@rneui/base": "^4.0.0-rc.8",
     "@rneui/themed": "^4.0.0-rc.8",
     "@rnmapbox/maps": "^10.0.0-beta.79",
-    "@tamagui/animations-react-native": "^1.91.3",
-    "@tamagui/babel-plugin": "^1.91.3",
-    "@tamagui/config": "^1.91.3",
-    "@tamagui/font-inter": "^1.91.3",
-    "@tamagui/linear-gradient": "^1.91.3",
-    "@tamagui/lucide-icons": "^1.91.3",
-    "@tamagui/progress": "^1.91.3",
-    "@tamagui/react-native-media-driver": "^1.91.3",
-    "@tamagui/shorthands": "^1.91.3",
-    "@tamagui/switch": "^1.91.3",
-    "@tamagui/theme-base": "^1.91.3",
-    "@tamagui/themes": "^1.91.3",
+    "@tamagui/animations-react-native": "1.92.1",
+    "@tamagui/babel-plugin": "1.92.1",
+    "@tamagui/config": "1.92.1",
+    "@tamagui/font-inter": "1.92.1",
+    "@tamagui/linear-gradient": "1.92.1",
+    "@tamagui/lucide-icons": "1.92.1",
+    "@tamagui/progress": "1.92.1",
+    "@tamagui/react-native-media-driver": "1.92.1",
+    "@tamagui/shorthands": "1.92.1",
+    "@tamagui/switch": "1.92.1",
+    "@tamagui/theme-base": "1.92.1",
+    "@tamagui/themes": "1.92.1",
     "@tanstack/query-async-storage-persister": "^4.36.1",
     "@tanstack/react-query": "^4.36.1",
     "@tanstack/react-query-devtools": "^4.36.1",
@@ -135,7 +135,7 @@
     "serve": "^14.2.0",
     "server": "*",
     "superjson": "^2.0.0",
-    "tamagui": "^1.91.3",
+    "tamagui": "1.92.1",
     "togpx": "^0.5.4",
     "uuid": "3.4.0",
     "xmldom": "^0.6.0",

apps/next/envResolver.ts

@@ -3,7 +3,7 @@ export const API_URL = process.env.API_URL || 'http://localhost:3000/api';
 export const NEXT_PUBLIC_MAPBOX_ACCESS_TOKEN =
   process.env.NEXT_PUBLIC_MAPBOX_ACCESS_TOKEN;
 
-export const NEXT_PUBLIC_API_URL = process.env.NEXT_PUBLIC_API_URL;
+export const NEXT_PUBLIC_API_URL = process.env.NEXT_PUBLIC_API_URL || 'https://packrat_api.abbierman101.workers.dev/api';
 
 export default {
   NODE_ENV,

apps/next/package.json

@@ -8,21 +8,23 @@
     "start": "next start",
     "lint": "next lint",
     "postinstall": "patch-package",
-    "pages:build": "npx @cloudflare/next-on-pages",
+    "pages:build": "yarn pages:build:static",
+    "pages:build:static": "next build && next export -o .vercel/output/static",
+    "pages:build:full": "npx @cloudflare/next-on-pages",
     "pages:preview": "npm run pages:build && wrangler pages dev .vercel/output/static --compatibility-date=2024-01-17 --compatibility-flag=nodejs_compat",
     "pages:deploy": "npm run pages:build && wrangler pages deploy .vercel/output/static",
     "pages:dev": "npx @cloudflare/next-on-pages --watch",
-    "build:cloudflare": "npx @cloudflare/next-on-pages@1"
+    "build:cloudflare": "yarn pages:build"
   },
   "dependencies": {
     "@babel/core": "^7.23.7",
     "@babel/plugin-proposal-private-methods": "^7.18.6",
     "@babel/plugin-transform-react-jsx": "^7.23.4",
     "@expo/next-adapter": "5.0.2",
     "@react-native/assets-registry": "^0.74.0",
-    "@tamagui/config": "^1.91.3",
-    "@tamagui/next-plugin": "^1.91.3",
-    "@tamagui/next-theme": "^1.91.3",
+    "@tamagui/config": "1.92.1",
+    "@tamagui/next-plugin": "1.92.1",
+    "@tamagui/next-theme": "1.92.1",
     "app": "*",
     "babel-preset-expo": "9.5.2",
     "babel-preset-react-native": "^4.0.1",
@@ -36,19 +38,19 @@
     "react-dom": "^18.2.0",
     "react-native-web": "^0.19.10",
     "setimmediate": "^1.0.5",
-    "tamagui": "^1.91.3",
+    "tamagui": "1.92.1",
     "url-loader": "^4.1.1",
     "vercel": "latest"
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@cloudflare/next-on-pages": "^1.8.5",
-    "@cloudflare/workers-types": "^4.20240117.0",
+    "@cloudflare/next-on-pages": "^1.11.0",
+    "@cloudflare/workers-types": "^4.20240405.0",
     "@types/node": "^20.8.3",
     "babel-plugin-module-resolver": "^5.0.0",
     "eslint-plugin-next-on-pages": "^1.8.5",
     "patch-package": "^8.0.0",
     "postinstall-postinstall": "^2.1.0",
-    "wrangler": "3.24.0"
+    "wrangler": "^3.49.0"
   }
 }

apps/tauri/package.json

@@ -20,9 +20,9 @@
     "@babel/plugin-transform-react-jsx": "^7.23.4",
     "@expo/next-adapter": "5.0.2",
     "@react-native/assets-registry": "^0.74.0",
-    "@tamagui/config": "^1.91.3",
-    "@tamagui/next-plugin": "^1.91.3",
-    "@tamagui/next-theme": "^1.91.3",
+    "@tamagui/config": "1.92.1",
+    "@tamagui/next-plugin": "1.92.1",
+    "@tamagui/next-theme": "1.92.1",
     "app": "*",
     "babel-preset-expo": "9.5.2",
     "babel-preset-react-native": "^4.0.1",
@@ -36,20 +36,20 @@
     "react-dom": "^18.2.0",
     "react-native-web": "^0.19.10",
     "setimmediate": "^1.0.5",
-    "tamagui": "^1.91.3",
+    "tamagui": "1.92.1",
     "url-loader": "^4.1.1",
     "vercel": "latest"
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@cloudflare/next-on-pages": "^1.8.5",
-    "@cloudflare/workers-types": "^4.20240117.0",
+    "@cloudflare/next-on-pages": "^1.11.0",
+    "@cloudflare/workers-types": "^4.20240405.0",
     "@tauri-apps/cli": "^1.5.9",
     "@types/node": "^20.8.3",
     "babel-plugin-module-resolver": "^5.0.0",
     "eslint-plugin-next-on-pages": "^1.8.5",
     "patch-package": "^8.0.0",
     "postinstall-postinstall": "^2.1.0",
-    "wrangler": "3.24.0"
+    "wrangler": "^3.49.0"
   }
 }

apps/vite/package.json

@@ -12,7 +12,7 @@
     "@originjs/vite-plugin-commonjs": "^1.0.3",
     "@packrat/ui": "*",
     "@packrat/validations": "*",
-    "@tamagui/vite-plugin": "^1.91.3",
+    "@tamagui/vite-plugin": "1.92.1",
     "@tanstack/react-router": "^1.16.5",
     "@tanstack/router-devtools": "^1.16.5",
     "@tanstack/router-vite-plugin": "^1.16.5",

package.json

@@ -21,7 +21,7 @@
     "build:prod:cloudflare-next": "cd apps/next && yarn build:cloudflare",
     "build:tsc:packages": "cd packages/validations && yarn build",
     "build:tsc:server": "cd server && yarn build",
-    "build:tsc": "yarn build:tsc:packages && yarn build:tsc:server",
+    "build:tsc": "yarn build:tsc:packages",
     "build:validations": "cd packages/validations && yarn build",
     "build:web": "cd apps/next && yarn build",
     "build:next:static": "cd apps/next && yarn build && yarn next export",
@@ -66,16 +66,18 @@
     "test": "yarn test:all",
     "upgrade:tamagui:canary": "yarn up '*tamagui*'@canary '@tamagui/*'@canary",
     "upgrade:tamagui": "yarn up '*tamagui*'@latest '@tamagui/*'@latest",
+    "upgrade:cloudflare": "yarn up '@cloudflare/*'@latest wrangler@latest",
     "web": "cd apps/next && yarn dev"
   },
   "engines": {
     "node": ">=18.16.1",
     "yarn": ">=4.0.0"
   },
-  "packageManager": "[email protected].0",
+  "packageManager": "[email protected].1",
   "dependencies": {
     "@babel/runtime": "^7.21.0",
     "@manypkg/cli": "^0.21.0",
+    "@prisma/extension-accelerate": "^0.6.2",
     "check-dependency-version-consistency": "^4.1.0",
     "cross-env": "^7.0.3",
     "dotenv-cli": "^7.3.0",
@@ -127,5 +129,8 @@
     "packing checklist app",
     "packing list app",
     "packing planner app"
-  ]
+  ],
+  "devDependencies": {
+    "@cloudflare/workers-types": "^4.20240405.0"
+  }
 }

packages/app/auth/hooks/useLogin.ts

@@ -18,9 +18,11 @@ export const useLogin = (): UseLoginReturn => {
 
   const handleLogin: UseLoginReturn['handleLogin'] = (data) => {
     const { email, password } = data;
-    signIn({ email, password }).then((user) => {
-      sessionSignIn(user);
-    });
+    signIn({ email, password })
+      .then((user) => {
+        sessionSignIn(user);
+      })
+      .catch(() => {});
   };
 
   return { handleLogin, hasError: !!error };

packages/app/auth/hooks/useRegisterUser.ts

@@ -1,22 +1,25 @@
 import { queryTrpc } from 'app/trpc';
 import { useSessionSignIn } from './useSessionSignIn';
-
+import { useRouter } from 'app/hooks/router';
 interface UseRegisterUserReturn {
   registerUser: (data: any) => void;
 }
 
 export const useRegisterUser = (): UseRegisterUserReturn => {
   const { mutateAsync: signUp } = queryTrpc.signUp.useMutation();
   const sessionSignIn = useSessionSignIn();
+  const router = useRouter();
 
   const registerUser: UseRegisterUserReturn['registerUser'] = (data) => {
-    try {
-      signUp(data).then((user) => {
+    signUp(data)
+      .then((user) => {
+        if (!user.token) {
+          return router.push('/sign-in');
+        }
+
         sessionSignIn(user);
-      });
-    } catch (e) {
-      console.log('Error', e);
-    }
+      })
+      .catch(() => {});
   };
 
   return { registerUser };

packages/app/auth/hooks/useUser.ts

@@ -16,5 +16,5 @@ export const useAuthUserToken = () => {
 export const useAuthUser = () => {
   const { user } = useUserQuery();
 
-  return user ? { ...user, id: user._id } : null;
+  return user;
 };

packages/app/auth/ts/interfaces.ts

@@ -11,5 +11,5 @@ export interface User {
   token: string;
   updatedAt: string;
   username: string;
-  _id: string;
+  id: string;
 }

packages/app/components/Dropdown.tsx

@@ -29,7 +29,7 @@
 //     let label = item;
 //     // Check if the item is an object
 //     if (typeof item === "object" && item !== null) {
-//       val = item.id || item._id || item.name;
+//       val = item.id || item.id || item.name;
 //       label = item.name;
 //     }
 //     return { label: String(label), value: val };

packages/app/components/card/CustomCard.tsx

@@ -15,7 +15,7 @@ interface CustomCardProps {
   destination?: string;
   data: {
     owner_id: {
-      _id: string;
+      id: string;
       username?: string;
     };
     owners?: Array<{ name: string }> | null;

packages/app/components/card/CustomCardHeader.tsx

@@ -18,7 +18,7 @@ export const CustomCardHeader = ({ data, title, link, actionsComponent }) => {
       <View>
         <Link href={`/profile/${data.owner_id}`}>
           <RText>
-            {user?._id === data.owner_id
+            {user?.id === data.owner_id
               ? 'Your Profile'
               : `View ${
                   data.owners && data.owners.length

packages/app/components/card/PackCardHeader/PackCardHeader.tsx

@@ -13,9 +13,9 @@ interface PackCardHeaderProps {
 }
 
 export const PackCardHeader = ({ data, title, link }: PackCardHeaderProps) => {
-  const { isLoading } = useFetchSinglePack(data?._id);
+  const { isLoading } = useFetchSinglePack(data?.id);
   const user = useAuthUser();
-  const handleDeletePack = useDeletePack(data._id);
+  const handleDeletePack = useDeletePack(data.id);
   const { handleActionsOpenChange, handleEdit, handleSaveTitle, isEditMode } =
     usePackTitleInput(data);
 

packages/app/components/card/PackCardHeader/usePackTitleInput.ts

@@ -19,7 +19,7 @@ export const usePackTitleInput = (data) => {
 
   const handleSaveTitle = (title) => {
     const packDetails = {
-      _id: data._id,
+      id: data.id,
       name: title,
       is_public: data.is_public,
     };