From 647e97101f04562faaaa29bbaa944a06507e1c33 Mon Sep 17 00:00:00 2001
From: Fractal-Tess <vgfractal@gmail.com>
Date: Tue, 11 Jun 2024 15:28:12 +0300
Subject: [PATCH] fixes

---
 .env                                       |   5 +-
 .eslintrc.json                             |   2 +-
 .prettierrc.json                           |   9 ++
 drizzle.config.ts                          |  12 +-
 drizzle/0005_chemical_phantom_reporter.sql |   1 +
 drizzle/0006_perpetual_alex_power.sql      |   1 +
 drizzle/meta/0000_snapshot.json            |   6 +-
 drizzle/meta/0001_snapshot.json            |  10 +-
 drizzle/meta/0002_snapshot.json            |  10 +-
 drizzle/meta/0003_snapshot.json            |  14 +-
 drizzle/meta/0004_snapshot.json            |  22 +--
 drizzle/meta/0005_snapshot.json            | 160 ++++++++++++++++++++
 drizzle/meta/0006_snapshot.json            | 161 +++++++++++++++++++++
 drizzle/meta/_journal.json                 |  16 +-
 next.config.mjs                            |   2 +-
 package-lock.json                          | 109 +++++++++++++-
 package.json                               |   7 +-
 postcss.config.mjs                         |   4 +-
 src/app/about/page.tsx                     |  14 +-
 src/app/auth/activate/[token]/page.tsx     |   8 +-
 src/app/blogs/[title]/page.tsx             |  39 ++---
 src/app/blogs/page.tsx                     |  29 ++--
 src/app/globals.css                        |   2 +-
 src/app/layout.tsx                         |  30 ++--
 src/app/login/page.tsx                     |  59 ++++----
 src/app/page.tsx                           |  34 +++--
 src/app/register/page.tsx                  |  70 +++++----
 src/components/BlogsList.tsx               |  12 +-
 src/components/Header.tsx                  |  14 +-
 src/db_connection.ts                       |  22 +--
 src/env.ts                                 |  40 +++++
 src/lib/actions/login.ts                   |  50 +++----
 src/lib/actions/register.ts                |  28 ++--
 src/schema.ts                              |  67 +++++----
 tailwind.config.ts                         |  17 +--
 35 files changed, 802 insertions(+), 284 deletions(-)
 create mode 100644 .prettierrc.json
 create mode 100644 drizzle/0005_chemical_phantom_reporter.sql
 create mode 100644 drizzle/0006_perpetual_alex_power.sql
 create mode 100644 drizzle/meta/0005_snapshot.json
 create mode 100644 drizzle/meta/0006_snapshot.json
 create mode 100644 src/env.ts

diff --git a/.env b/.env
index 1c75cb2..fcf442d 100644
--- a/.env
+++ b/.env
@@ -1 +1,4 @@
-AUTH_SECRET=0cGJ5qnt9xRo2/E9cZB2TjUefAtz6B78+vItPv4DKPI=
+DB_HOST=oracle.netbird.cloud
+DB_USER=project-b
+DB_PASSWORD=YCNeqYguf8K6yp
+DB_DATABASE=project-b
\ No newline at end of file
diff --git a/.eslintrc.json b/.eslintrc.json
index bffb357..4d765f2 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,3 +1,3 @@
 {
-  "extends": "next/core-web-vitals"
+  "extends": ["next/core-web-vitals", "prettier"]
 }
diff --git a/.prettierrc.json b/.prettierrc.json
new file mode 100644
index 0000000..656f6aa
--- /dev/null
+++ b/.prettierrc.json
@@ -0,0 +1,9 @@
+{
+  "trailingComma": "none",
+  "semi": true,
+  "tabWidth": 2,
+  "singleQuote": true,
+  "arrowParens": "avoid",
+  "jsxSingleQuote": true,
+  "plugins": ["prettier-plugin-tailwindcss"]
+}
diff --git a/drizzle.config.ts b/drizzle.config.ts
index 142ee0b..478c903 100644
--- a/drizzle.config.ts
+++ b/drizzle.config.ts
@@ -1,3 +1,4 @@
+import { env } from '@/env';
 import { defineConfig } from 'drizzle-kit';
 
 export default defineConfig({
@@ -5,8 +6,9 @@ export default defineConfig({
   out: './drizzle',
   dialect: 'mysql',
   dbCredentials: {
-    host: "localhost",
-    user: "root",
-    database: "projectb",
-  },
-});
\ No newline at end of file
+    host: env.DB_HOST,
+    user: env.DB_USER,
+    database: env.DB_DATABASE,
+    password: env.DB_PASSWORD
+  }
+});
diff --git a/drizzle/0005_chemical_phantom_reporter.sql b/drizzle/0005_chemical_phantom_reporter.sql
new file mode 100644
index 0000000..5194024
--- /dev/null
+++ b/drizzle/0005_chemical_phantom_reporter.sql
@@ -0,0 +1 @@
+ALTER TABLE `session` MODIFY COLUMN `userId` int NOT NULL;
\ No newline at end of file
diff --git a/drizzle/0006_perpetual_alex_power.sql b/drizzle/0006_perpetual_alex_power.sql
new file mode 100644
index 0000000..3cb858e
--- /dev/null
+++ b/drizzle/0006_perpetual_alex_power.sql
@@ -0,0 +1 @@
+ALTER TABLE `session` MODIFY COLUMN `timestamp` timestamp(6) DEFAULT (now());
\ No newline at end of file
diff --git a/drizzle/meta/0000_snapshot.json b/drizzle/meta/0000_snapshot.json
index 1740960..603b509 100644
--- a/drizzle/meta/0000_snapshot.json
+++ b/drizzle/meta/0000_snapshot.json
@@ -34,9 +34,7 @@
       "compositePrimaryKeys": {
         "blogs_id": {
           "name": "blogs_id",
-          "columns": [
-            "id"
-          ]
+          "columns": ["id"]
         }
       },
       "uniqueConstraints": {}
@@ -51,4 +49,4 @@
     "tables": {},
     "indexes": {}
   }
-}
\ No newline at end of file
+}
diff --git a/drizzle/meta/0001_snapshot.json b/drizzle/meta/0001_snapshot.json
index e724d7d..af01a9c 100644
--- a/drizzle/meta/0001_snapshot.json
+++ b/drizzle/meta/0001_snapshot.json
@@ -34,9 +34,7 @@
       "compositePrimaryKeys": {
         "blogs_id": {
           "name": "blogs_id",
-          "columns": [
-            "id"
-          ]
+          "columns": ["id"]
         }
       },
       "uniqueConstraints": {}
@@ -78,9 +76,7 @@
       "compositePrimaryKeys": {
         "user_id": {
           "name": "user_id",
-          "columns": [
-            "id"
-          ]
+          "columns": ["id"]
         }
       },
       "uniqueConstraints": {}
@@ -95,4 +91,4 @@
     "tables": {},
     "indexes": {}
   }
-}
\ No newline at end of file
+}
diff --git a/drizzle/meta/0002_snapshot.json b/drizzle/meta/0002_snapshot.json
index da1b335..fc64363 100644
--- a/drizzle/meta/0002_snapshot.json
+++ b/drizzle/meta/0002_snapshot.json
@@ -34,9 +34,7 @@
       "compositePrimaryKeys": {
         "blogs_id": {
           "name": "blogs_id",
-          "columns": [
-            "id"
-          ]
+          "columns": ["id"]
         }
       },
       "uniqueConstraints": {}
@@ -92,9 +90,7 @@
       "compositePrimaryKeys": {
         "user_id": {
           "name": "user_id",
-          "columns": [
-            "id"
-          ]
+          "columns": ["id"]
         }
       },
       "uniqueConstraints": {}
@@ -109,4 +105,4 @@
     "tables": {},
     "indexes": {}
   }
-}
\ No newline at end of file
+}
diff --git a/drizzle/meta/0003_snapshot.json b/drizzle/meta/0003_snapshot.json
index 67f3fb6..0306a31 100644
--- a/drizzle/meta/0003_snapshot.json
+++ b/drizzle/meta/0003_snapshot.json
@@ -34,9 +34,7 @@
       "compositePrimaryKeys": {
         "blogs_id": {
           "name": "blogs_id",
-          "columns": [
-            "id"
-          ]
+          "columns": ["id"]
         }
       },
       "uniqueConstraints": {}
@@ -71,9 +69,7 @@
       "compositePrimaryKeys": {
         "session_id": {
           "name": "session_id",
-          "columns": [
-            "id"
-          ]
+          "columns": ["id"]
         }
       },
       "uniqueConstraints": {}
@@ -129,9 +125,7 @@
       "compositePrimaryKeys": {
         "user_id": {
           "name": "user_id",
-          "columns": [
-            "id"
-          ]
+          "columns": ["id"]
         }
       },
       "uniqueConstraints": {}
@@ -146,4 +140,4 @@
     "tables": {},
     "indexes": {}
   }
-}
\ No newline at end of file
+}
diff --git a/drizzle/meta/0004_snapshot.json b/drizzle/meta/0004_snapshot.json
index bdcd4c5..0d931dd 100644
--- a/drizzle/meta/0004_snapshot.json
+++ b/drizzle/meta/0004_snapshot.json
@@ -34,9 +34,7 @@
       "compositePrimaryKeys": {
         "blogs_id": {
           "name": "blogs_id",
-          "columns": [
-            "id"
-          ]
+          "columns": ["id"]
         }
       },
       "uniqueConstraints": {}
@@ -79,12 +77,8 @@
           "name": "session_userId_user_id_fk",
           "tableFrom": "session",
           "tableTo": "user",
-          "columnsFrom": [
-            "userId"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["userId"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -92,9 +86,7 @@
       "compositePrimaryKeys": {
         "session_id": {
           "name": "session_id",
-          "columns": [
-            "id"
-          ]
+          "columns": ["id"]
         }
       },
       "uniqueConstraints": {}
@@ -150,9 +142,7 @@
       "compositePrimaryKeys": {
         "user_id": {
           "name": "user_id",
-          "columns": [
-            "id"
-          ]
+          "columns": ["id"]
         }
       },
       "uniqueConstraints": {}
@@ -167,4 +157,4 @@
     "tables": {},
     "indexes": {}
   }
-}
\ No newline at end of file
+}
diff --git a/drizzle/meta/0005_snapshot.json b/drizzle/meta/0005_snapshot.json
new file mode 100644
index 0000000..5d2dab8
--- /dev/null
+++ b/drizzle/meta/0005_snapshot.json
@@ -0,0 +1,160 @@
+{
+  "version": "5",
+  "dialect": "mysql",
+  "id": "bffda20b-2622-4b75-84ea-4fca92d7ef2b",
+  "prevId": "d5d66241-ba07-4c3c-b17f-effa97d48daf",
+  "tables": {
+    "blogs": {
+      "name": "blogs",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "int",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "title": {
+          "name": "title",
+          "type": "varchar(64)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "blogs_id": {
+          "name": "blogs_id",
+          "columns": ["id"]
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "session": {
+      "name": "session",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "int",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "token": {
+          "name": "token",
+          "type": "varchar(64)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "userId": {
+          "name": "userId",
+          "type": "int",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "timestamp(6)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "session_userId_user_id_fk": {
+          "name": "session_userId_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "columnsFrom": ["userId"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "session_id": {
+          "name": "session_id",
+          "columns": ["id"]
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "user": {
+      "name": "user",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "int",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "email": {
+          "name": "email",
+          "type": "varchar(320)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "username": {
+          "name": "username",
+          "type": "varchar(64)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "password": {
+          "name": "password",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "verified": {
+          "name": "verified",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "activationToken": {
+          "name": "activationToken",
+          "type": "varchar(64)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "user_id": {
+          "name": "user_id",
+          "columns": ["id"]
+        }
+      },
+      "uniqueConstraints": {}
+    }
+  },
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "tables": {},
+    "indexes": {}
+  }
+}
diff --git a/drizzle/meta/0006_snapshot.json b/drizzle/meta/0006_snapshot.json
new file mode 100644
index 0000000..f7be190
--- /dev/null
+++ b/drizzle/meta/0006_snapshot.json
@@ -0,0 +1,161 @@
+{
+  "version": "5",
+  "dialect": "mysql",
+  "id": "e6fc5081-7c31-4b2a-9f6f-14fb500feb3f",
+  "prevId": "bffda20b-2622-4b75-84ea-4fca92d7ef2b",
+  "tables": {
+    "blogs": {
+      "name": "blogs",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "int",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "title": {
+          "name": "title",
+          "type": "varchar(64)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "blogs_id": {
+          "name": "blogs_id",
+          "columns": ["id"]
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "session": {
+      "name": "session",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "int",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "token": {
+          "name": "token",
+          "type": "varchar(64)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "userId": {
+          "name": "userId",
+          "type": "int",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "timestamp(6)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "(now())"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "session_userId_user_id_fk": {
+          "name": "session_userId_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "columnsFrom": ["userId"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "session_id": {
+          "name": "session_id",
+          "columns": ["id"]
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "user": {
+      "name": "user",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "int",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "email": {
+          "name": "email",
+          "type": "varchar(320)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "username": {
+          "name": "username",
+          "type": "varchar(64)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "password": {
+          "name": "password",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "verified": {
+          "name": "verified",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "activationToken": {
+          "name": "activationToken",
+          "type": "varchar(64)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "user_id": {
+          "name": "user_id",
+          "columns": ["id"]
+        }
+      },
+      "uniqueConstraints": {}
+    }
+  },
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "tables": {},
+    "indexes": {}
+  }
+}
diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json
index 09e1e41..5d16cd0 100644
--- a/drizzle/meta/_journal.json
+++ b/drizzle/meta/_journal.json
@@ -36,6 +36,20 @@
       "when": 1718026902741,
       "tag": "0004_thin_redwing",
       "breakpoints": true
+    },
+    {
+      "idx": 5,
+      "version": "5",
+      "when": 1718107769018,
+      "tag": "0005_chemical_phantom_reporter",
+      "breakpoints": true
+    },
+    {
+      "idx": 6,
+      "version": "5",
+      "when": 1718108211555,
+      "tag": "0006_perpetual_alex_power",
+      "breakpoints": true
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/next.config.mjs b/next.config.mjs
index 13928e0..aed5ac3 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -1,6 +1,6 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-    output: "standalone"
+  output: 'standalone'
 };
 
 export default nextConfig;
diff --git a/package-lock.json b/package-lock.json
index c60a774..dde5ca3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,6 +8,7 @@
       "name": "project-b",
       "version": "0.1.0",
       "dependencies": {
+        "@t3-oss/env-core": "^0.10.1",
         "drizzle-orm": "^0.31.1",
         "mysql2": "^3.10.0",
         "next": "14.2.3",
@@ -25,6 +26,8 @@
         "eslint": "^8",
         "eslint-config-next": "14.2.3",
         "postcss": "^8",
+        "prettier": "^3.3.2",
+        "prettier-plugin-tailwindcss": "^0.6.2",
         "tailwindcss": "^3.4.1",
         "typescript": "^5",
         "zod": "^3.23.8"
@@ -1264,6 +1267,20 @@
         "tslib": "^2.4.0"
       }
     },
+    "node_modules/@t3-oss/env-core": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/@t3-oss/env-core/-/env-core-0.10.1.tgz",
+      "integrity": "sha512-GcKZiCfWks5CTxhezn9k5zWX3sMDIYf6Kaxy2Gx9YEQftFcz8hDRN56hcbylyAO3t4jQnQ5ifLawINsNgCDpOg==",
+      "peerDependencies": {
+        "typescript": ">=5.0.0",
+        "zod": "^3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@types/cookie": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
@@ -4873,6 +4890,95 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/prettier": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz",
+      "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==",
+      "dev": true,
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/prettier-plugin-tailwindcss": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.2.tgz",
+      "integrity": "sha512-eFefm4cg+1c2B57+H274Qm//CTWBdtQN9ansl0YTP/8TC8x3bugCTQSS/e4FC5Ctl9djhTzsbcMrZ7x2/abIow==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.21.3"
+      },
+      "peerDependencies": {
+        "@ianvs/prettier-plugin-sort-imports": "*",
+        "@prettier/plugin-pug": "*",
+        "@shopify/prettier-plugin-liquid": "*",
+        "@trivago/prettier-plugin-sort-imports": "*",
+        "@zackad/prettier-plugin-twig-melody": "*",
+        "prettier": "^3.0",
+        "prettier-plugin-astro": "*",
+        "prettier-plugin-css-order": "*",
+        "prettier-plugin-import-sort": "*",
+        "prettier-plugin-jsdoc": "*",
+        "prettier-plugin-marko": "*",
+        "prettier-plugin-organize-attributes": "*",
+        "prettier-plugin-organize-imports": "*",
+        "prettier-plugin-sort-imports": "*",
+        "prettier-plugin-style-order": "*",
+        "prettier-plugin-svelte": "*"
+      },
+      "peerDependenciesMeta": {
+        "@ianvs/prettier-plugin-sort-imports": {
+          "optional": true
+        },
+        "@prettier/plugin-pug": {
+          "optional": true
+        },
+        "@shopify/prettier-plugin-liquid": {
+          "optional": true
+        },
+        "@trivago/prettier-plugin-sort-imports": {
+          "optional": true
+        },
+        "@zackad/prettier-plugin-twig-melody": {
+          "optional": true
+        },
+        "prettier-plugin-astro": {
+          "optional": true
+        },
+        "prettier-plugin-css-order": {
+          "optional": true
+        },
+        "prettier-plugin-import-sort": {
+          "optional": true
+        },
+        "prettier-plugin-jsdoc": {
+          "optional": true
+        },
+        "prettier-plugin-marko": {
+          "optional": true
+        },
+        "prettier-plugin-organize-attributes": {
+          "optional": true
+        },
+        "prettier-plugin-organize-imports": {
+          "optional": true
+        },
+        "prettier-plugin-sort-imports": {
+          "optional": true
+        },
+        "prettier-plugin-style-order": {
+          "optional": true
+        },
+        "prettier-plugin-svelte": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/pretty-format": {
       "version": "3.8.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-3.8.0.tgz",
@@ -5793,7 +5899,7 @@
       "version": "5.4.5",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
       "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
-      "dev": true,
+      "devOptional": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -6069,7 +6175,6 @@
       "version": "3.23.8",
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
       "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
-      "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/package.json b/package.json
index d1ce546..9c7604d 100644
--- a/package.json
+++ b/package.json
@@ -4,14 +4,17 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "next dev",
+    "dev": "next dev --turbo",
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
+    "format": "prettier --check --ignore-path .gitignore .",
+    "format:fix": "prettier --write --ignore-path .gitignore .",
     "generate": "drizzle-kit generate",
     "migrate": "drizzle-kit migrate"
   },
   "dependencies": {
+    "@t3-oss/env-core": "^0.10.1",
     "drizzle-orm": "^0.31.1",
     "mysql2": "^3.10.0",
     "next": "14.2.3",
@@ -29,6 +32,8 @@
     "eslint": "^8",
     "eslint-config-next": "14.2.3",
     "postcss": "^8",
+    "prettier": "^3.3.2",
+    "prettier-plugin-tailwindcss": "^0.6.2",
     "tailwindcss": "^3.4.1",
     "typescript": "^5",
     "zod": "^3.23.8"
diff --git a/postcss.config.mjs b/postcss.config.mjs
index 1a69fd2..df76ed2 100644
--- a/postcss.config.mjs
+++ b/postcss.config.mjs
@@ -1,8 +1,8 @@
 /** @type {import('postcss-load-config').Config} */
 const config = {
   plugins: {
-    tailwindcss: {},
-  },
+    tailwindcss: {}
+  }
 };
 
 export default config;
diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 29f57fd..22d0fda 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -1,9 +1,9 @@
-import React from "react";
+import React from 'react';
 
 export default function About() {
-    return (
-            <section className="flex justify-center text-3xl font-bold">
-                Hello from the about page
-            </section>
-    )
-}
\ No newline at end of file
+  return (
+    <section className='flex justify-center text-3xl font-bold'>
+      Hello from the about page
+    </section>
+  );
+}
diff --git a/src/app/auth/activate/[token]/page.tsx b/src/app/auth/activate/[token]/page.tsx
index d3e5962..5ffbc77 100644
--- a/src/app/auth/activate/[token]/page.tsx
+++ b/src/app/auth/activate/[token]/page.tsx
@@ -1,5 +1,5 @@
-import { db } from "@/db_connection";
-import * as schema from "@/schema";
+import { db } from '@/db_connection';
+import * as schema from '@/schema';
 
 type Props = {
   params: {
@@ -9,7 +9,7 @@ type Props = {
 
 export default async function Page(props: Props) {
   const user = await db.query.user.findFirst({
-    where: (user, { eq }) => eq(user.activationToken, props.params.token),
+    where: (user, { eq }) => eq(user.activationToken, props.params.token)
   });
 
   if (!user) {
@@ -22,7 +22,7 @@ export default async function Page(props: Props) {
 
   await db.update(schema.user).set({
     activationToken: null,
-    verified: true,
+    verified: true
   });
 
   return (
diff --git a/src/app/blogs/[title]/page.tsx b/src/app/blogs/[title]/page.tsx
index 9919487..5213c69 100644
--- a/src/app/blogs/[title]/page.tsx
+++ b/src/app/blogs/[title]/page.tsx
@@ -1,22 +1,27 @@
-import { db } from "@/db_connection"
-import { redirect } from "next/navigation"
-
+import { db } from '@/db_connection';
+import { redirect } from 'next/navigation';
 
 type Props = {
-    params: {
-        title: string
-    }
-}
+  params: {
+    title: string;
+  };
+};
 
-export default async function Page({params}:Props) {
-    const blog = await db.query.blog.findFirst({where:(blog, {eq}) => {
-        return eq(blog.title, params.title)
-    }})
-
-    if (!blog) {
-        redirect("/blogs")
+export default async function Page({ params }: Props) {
+  const blog = await db.query.blog.findFirst({
+    where: (blog, { eq }) => {
+      return eq(blog.title, params.title);
     }
-    return <>
-        <h1>{params.title} {blog?.content}</h1>
+  });
+
+  if (!blog) {
+    redirect('/blogs');
+  }
+  return (
+    <>
+      <h1>
+        {params.title} {blog?.content}
+      </h1>
     </>
-}
\ No newline at end of file
+  );
+}
diff --git a/src/app/blogs/page.tsx b/src/app/blogs/page.tsx
index 4ec0645..1c4cb09 100644
--- a/src/app/blogs/page.tsx
+++ b/src/app/blogs/page.tsx
@@ -1,19 +1,18 @@
-import React, { useEffect, useState } from "react";
-import { db } from "@/db_connection";
-import BlogsList from "@/components/BlogsList";
+import React, { useEffect, useState } from 'react';
+import { db } from '@/db_connection';
+import BlogsList from '@/components/BlogsList';
 
 export default async function Page() {
-    const blogsfromdb = await db.query.blog.findMany();
+  const blogsfromdb = await db.query.blog.findMany();
 
-
-    return (
-        <>
-            <section>
-                <h2>Blogs</h2>
-                <ul>
-                    <BlogsList blogsthatcomponentexcpects={blogsfromdb} />
-                </ul>
-            </section>
-        </>
-    )
+  return (
+    <>
+      <section>
+        <h2>Blogs</h2>
+        <ul>
+          <BlogsList blogsthatcomponentexcpects={blogsfromdb} />
+        </ul>
+      </section>
+    </>
+  );
 }
diff --git a/src/app/globals.css b/src/app/globals.css
index bd6213e..b5c61c9 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -1,3 +1,3 @@
 @tailwind base;
 @tailwind components;
-@tailwind utilities;
\ No newline at end of file
+@tailwind utilities;
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 5bae663..b4c37dc 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,29 +1,29 @@
-import type { Metadata } from "next";
-import { Inter } from "next/font/google";
-import "./globals.css";
-import React from "react";
-import Header from "@/components/Header";
-import { db } from "@/db_connection";
+import type { Metadata } from 'next';
+import { Inter } from 'next/font/google';
+import './globals.css';
+import React from 'react';
+import Header from '@/components/Header';
+import { db } from '@/db_connection';
 
-const inter = Inter({ subsets: ["latin"] });
+const inter = Inter({ subsets: ['latin'] });
 
 export const metadata: Metadata = {
-  title: "Create Next App",
-  description: "Generated by create next app",
+  title: 'Create Next App',
+  description: 'Generated by create next app'
 };
 
 export default function RootLayout({
-  children,
+  children
 }: Readonly<{
   children: React.ReactNode;
 }>) {
   return (
-    <html lang="en" data-theme="dracula">
-      <body
-        className={inter.className + " flex flex-col bg-base-300"}
-      >
+    <html lang='en' data-theme='dracula'>
+      <body className={inter.className + ' flex flex-col bg-base-300'}>
         <Header />
-        <main className="flex flex-1 flex-col min-h-[calc(100svh-4rem)] container mx-auto items-center">{children}</main>
+        <main className='container mx-auto flex min-h-[calc(100svh-4rem)] flex-1 flex-col items-center'>
+          {children}
+        </main>
       </body>
     </html>
   );
diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx
index 62c3230..add1714 100644
--- a/src/app/login/page.tsx
+++ b/src/app/login/page.tsx
@@ -1,46 +1,51 @@
-"use client"
-import { login } from "@/lib/actions/login";
-import { useFormState } from "react-dom";
+'use client';
+import { login } from '@/lib/actions/login';
+import { useFormState } from 'react-dom';
 
 const initialState = {
-  message: ""
-}
+  message: ''
+};
 
 export default function Page() {
-  "use client"
-  const [state, formAction] = useFormState(login, initialState)
+  'use client';
+  const [state, formAction] = useFormState(login, initialState);
 
   return (
-    <section className="max-w-96 flex-1 flex flex-col justify-center">
-      <form className="flex flex-col gap-y-4 " action={formAction}>
-        <label className="input input-bordered flex items-center gap-2">
+    <section className='flex max-w-96 flex-1 flex-col justify-center'>
+      <form className='flex flex-col gap-y-4' action={formAction}>
+        <label className='input input-bordered flex items-center gap-2'>
           <svg
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 16 16"
-            fill="currentColor"
-            className="w-4 h-4 opacity-70"
+            xmlns='http://www.w3.org/2000/svg'
+            viewBox='0 0 16 16'
+            fill='currentColor'
+            className='h-4 w-4 opacity-70'
           >
-            <path d="M8 8a3 3 0 1 0 0-6 3 3 0 0 0 0 6ZM12.735 14c.618 0 1.093-.561.872-1.139a6.002 6.002 0 0 0-11.215 0c-.22.578.254 1.139.872 1.139h9.47Z" />
+            <path d='M8 8a3 3 0 1 0 0-6 3 3 0 0 0 0 6ZM12.735 14c.618 0 1.093-.561.872-1.139a6.002 6.002 0 0 0-11.215 0c-.22.578.254 1.139.872 1.139h9.47Z' />
           </svg>
-          <input name="username" type="text" className="grow" placeholder="Username" />
+          <input
+            name='username'
+            type='text'
+            className='grow'
+            placeholder='Username'
+          />
         </label>
-        <label className="input input-bordered flex items-center gap-2">
+        <label className='input input-bordered flex items-center gap-2'>
           <svg
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 16 16"
-            fill="currentColor"
-            className="w-4 h-4 opacity-70"
+            xmlns='http://www.w3.org/2000/svg'
+            viewBox='0 0 16 16'
+            fill='currentColor'
+            className='h-4 w-4 opacity-70'
           >
             <path
-              fillRule="evenodd"
-              d="M14 6a4 4 0 0 1-4.899 3.899l-1.955 1.955a.5.5 0 0 1-.353.146H5v1.5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5v-2.293a.5.5 0 0 1 .146-.353l3.955-3.955A4 4 0 1 1 14 6Zm-4-2a.75.75 0 0 0 0 1.5.5.5 0 0 1 .5.5.75.75 0 0 0 1.5 0 2 2 0 0 0-2-2Z"
-              clipRule="evenodd"
+              fillRule='evenodd'
+              d='M14 6a4 4 0 0 1-4.899 3.899l-1.955 1.955a.5.5 0 0 1-.353.146H5v1.5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5v-2.293a.5.5 0 0 1 .146-.353l3.955-3.955A4 4 0 1 1 14 6Zm-4-2a.75.75 0 0 0 0 1.5.5.5 0 0 1 .5.5.75.75 0 0 0 1.5 0 2 2 0 0 0-2-2Z'
+              clipRule='evenodd'
             />
           </svg>
-          <input name="password" type="password" className="grow"  />
+          <input name='password' type='password' className='grow' />
         </label>
-        <p className="text">{state?.message}</p>
-        <button type="submit" className="btn btn-primary">
+        <p className='text'>{state?.message}</p>
+        <button type='submit' className='btn btn-primary'>
           Login
         </button>
       </form>
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 49442c0..a292060 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,29 +1,33 @@
-import React from "react";
-import { cookies } from "next/headers";
-import { db } from "@/db_connection";
-import { user } from "@/schema";
+'use server';
+import React from 'react';
+import { cookies } from 'next/headers';
+import { db, schema } from '@/db_connection';
 
-
-export default  async function Page() {
-  const token = cookies().get("session")?.value
-  let username = null
+export default async function Page() {
+  const token = cookies().get('session')?.value;
+  let username: string | null = null;
 
   if (token) {
-    const user = await db.query.session.findFirst({
-      where: ((session, {eq}) => eq(session.token, token)
-      ),
+    // const result = await db
+    //   .select()
+    //   .from(schema.user)
+    //   .innerJoin(schema.session, eq(schema.user.id, schema.session.userId))
+    //   .where(eq(schema.session.token, token));
+    const result = await db.query.session.findFirst({
+      where: (session, { eq }) => eq(session.token, token),
       with: {
         user: true
       }
-    })
-    username = user?.user
+    });
+    username = result?.user.username ?? null;
   }
+
   return (
     <>
-      <div className="text-3xl font-bold flex items-center justify-center">
+      <div className='flex items-center justify-center text-3xl font-bold'>
         Hello from the landing page
       </div>
-      <section>{username}</section>
+      {username && <section>You are currently logged in as {username}</section>}
     </>
   );
 }
diff --git a/src/app/register/page.tsx b/src/app/register/page.tsx
index 2bdede6..7280686 100644
--- a/src/app/register/page.tsx
+++ b/src/app/register/page.tsx
@@ -1,52 +1,60 @@
-import {register} from "@/lib/actions/register"
+import { register } from '@/lib/actions/register';
 
 export default function Page() {
-
-"use client"
+  'use client';
 
   return (
-    <section className="max-w-96 flex-1 flex flex-col justify-center">
-      <form className="flex flex-col gap-y-4 " action={register}>
-        
-        <label className="input input-bordered flex items-center gap-2">
+    <section className='flex max-w-96 flex-1 flex-col justify-center'>
+      <form className='flex flex-col gap-y-4' action={register}>
+        <label className='input input-bordered flex items-center gap-2'>
           <svg
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 16 16"
-            fill="currentColor"
-            className="w-4 h-4 opacity-70"
+            xmlns='http://www.w3.org/2000/svg'
+            viewBox='0 0 16 16'
+            fill='currentColor'
+            className='h-4 w-4 opacity-70'
           >
-            <path d="M2.5 3A1.5 1.5 0 0 0 1 4.5v.793c.026.009.051.02.076.032L7.674 8.51c.206.1.446.1.652 0l6.598-3.185A.755.755 0 0 1 15 5.293V4.5A1.5 1.5 0 0 0 13.5 3h-11Z" />
-            <path d="M15 6.954 8.978 9.86a2.25 2.25 0 0 1-1.956 0L1 6.954V11.5A1.5 1.5 0 0 0 2.5 13h11a1.5 1.5 0 0 0 1.5-1.5V6.954Z" />
+            <path d='M2.5 3A1.5 1.5 0 0 0 1 4.5v.793c.026.009.051.02.076.032L7.674 8.51c.206.1.446.1.652 0l6.598-3.185A.755.755 0 0 1 15 5.293V4.5A1.5 1.5 0 0 0 13.5 3h-11Z' />
+            <path d='M15 6.954 8.978 9.86a2.25 2.25 0 0 1-1.956 0L1 6.954V11.5A1.5 1.5 0 0 0 2.5 13h11a1.5 1.5 0 0 0 1.5-1.5V6.954Z' />
           </svg>
-          <input name="email" type="text" className="grow" placeholder="Email" />
+          <input
+            name='email'
+            type='text'
+            className='grow'
+            placeholder='Email'
+          />
         </label>
-        <label className="input input-bordered flex items-center gap-2">
+        <label className='input input-bordered flex items-center gap-2'>
           <svg
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 16 16"
-            fill="currentColor"
-            className="w-4 h-4 opacity-70"
+            xmlns='http://www.w3.org/2000/svg'
+            viewBox='0 0 16 16'
+            fill='currentColor'
+            className='h-4 w-4 opacity-70'
           >
-            <path d="M8 8a3 3 0 1 0 0-6 3 3 0 0 0 0 6ZM12.735 14c.618 0 1.093-.561.872-1.139a6.002 6.002 0 0 0-11.215 0c-.22.578.254 1.139.872 1.139h9.47Z" />
+            <path d='M8 8a3 3 0 1 0 0-6 3 3 0 0 0 0 6ZM12.735 14c.618 0 1.093-.561.872-1.139a6.002 6.002 0 0 0-11.215 0c-.22.578.254 1.139.872 1.139h9.47Z' />
           </svg>
-          <input name="username" type="text" className="grow" placeholder="Username" />
+          <input
+            name='username'
+            type='text'
+            className='grow'
+            placeholder='Username'
+          />
         </label>
-        <label className="input input-bordered flex items-center gap-2">
+        <label className='input input-bordered flex items-center gap-2'>
           <svg
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 16 16"
-            fill="currentColor"
-            className="w-4 h-4 opacity-70"
+            xmlns='http://www.w3.org/2000/svg'
+            viewBox='0 0 16 16'
+            fill='currentColor'
+            className='h-4 w-4 opacity-70'
           >
             <path
-              fillRule="evenodd"
-              d="M14 6a4 4 0 0 1-4.899 3.899l-1.955 1.955a.5.5 0 0 1-.353.146H5v1.5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5v-2.293a.5.5 0 0 1 .146-.353l3.955-3.955A4 4 0 1 1 14 6Zm-4-2a.75.75 0 0 0 0 1.5.5.5 0 0 1 .5.5.75.75 0 0 0 1.5 0 2 2 0 0 0-2-2Z"
-              clipRule="evenodd"
+              fillRule='evenodd'
+              d='M14 6a4 4 0 0 1-4.899 3.899l-1.955 1.955a.5.5 0 0 1-.353.146H5v1.5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5v-2.293a.5.5 0 0 1 .146-.353l3.955-3.955A4 4 0 1 1 14 6Zm-4-2a.75.75 0 0 0 0 1.5.5.5 0 0 1 .5.5.75.75 0 0 0 1.5 0 2 2 0 0 0-2-2Z'
+              clipRule='evenodd'
             />
           </svg>
-          <input name="password" type="password" className="grow"  />
+          <input name='password' type='password' className='grow' />
         </label>
-        <button type="submit" className="btn btn-primary">
+        <button type='submit' className='btn btn-primary'>
           Register
         </button>
       </form>
diff --git a/src/components/BlogsList.tsx b/src/components/BlogsList.tsx
index 9b0d3b4..c6e495c 100644
--- a/src/components/BlogsList.tsx
+++ b/src/components/BlogsList.tsx
@@ -1,14 +1,14 @@
-import React from "react";
-import { Blog } from "../schema";
+import React from 'react';
+import { Blog } from '../schema';
 
 type Props = {
-   blogsthatcomponentexcpects:Blog[]
-}
+  blogsthatcomponentexcpects: Blog[];
+};
 
-export default function BlogsList({blogsthatcomponentexcpects}:Props) {
+export default function BlogsList({ blogsthatcomponentexcpects }: Props) {
   return (
     <div>
-      {blogsthatcomponentexcpects.map((blog) => {
+      {blogsthatcomponentexcpects.map(blog => {
         return (
           <li>
             <a href={`/blogs/${blog.title}`}>{blog.title}</a>
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index ae9e445..fc4b059 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -3,13 +3,13 @@ import React from 'react';
 export default function Header() {
   return (
     <header className='h-16'>
-      <nav className="flex justify-end gap-5 p-4">
-            <a href="/blogs">Blogs</a>
-            <a href="/login">Login</a>
-            <a href="/register">Register</a>
-            <a href="/about">About</a>
-            <a href="/newsletter">Newsletter</a>
+      <nav className='flex justify-end gap-5 p-4'>
+        <a href='/blogs'>Blogs</a>
+        <a href='/login'>Login</a>
+        <a href='/register'>Register</a>
+        <a href='/about'>About</a>
+        <a href='/newsletter'>Newsletter</a>
       </nav>
     </header>
   );
-};
\ No newline at end of file
+}
diff --git a/src/db_connection.ts b/src/db_connection.ts
index b4a92f0..6cb783d 100644
--- a/src/db_connection.ts
+++ b/src/db_connection.ts
@@ -1,13 +1,17 @@
-import { drizzle } from "drizzle-orm/mysql2";
-import mysql from "mysql2/promise";
-import * as schema from "./schema";
-
+import { drizzle } from 'drizzle-orm/mysql2';
+import mysql from 'mysql2/promise';
+import * as schema from './schema';
+import { env } from '@/env';
 
 const connection = mysql.createPool({
-  host: "localhost",
-  user: "root",
-  database: "projectb",
+  host: env.DB_HOST,
+  user: env.DB_USER,
+  password: env.DB_PASSWORD,
+  database: env.DB_DATABASE,
+  waitForConnections: true,
+  connectionLimit: 10,
+  queueLimit: 0
 });
 
-export const db = drizzle(connection, {schema, mode:"default"});
-export {schema}
\ No newline at end of file
+export const db = drizzle(connection, { schema, mode: 'default' });
+export { schema };
diff --git a/src/env.ts b/src/env.ts
new file mode 100644
index 0000000..f1a5333
--- /dev/null
+++ b/src/env.ts
@@ -0,0 +1,40 @@
+import { createEnv } from '@t3-oss/env-core';
+import { z } from 'zod';
+
+export const env = createEnv({
+  server: {
+    DB_HOST: z.string(),
+    DB_USER: z.string(),
+    DB_PASSWORD: z.string(),
+    DB_DATABASE: z.string()
+  },
+
+  /**
+   * The prefix that client-side variables must have. This is enforced both at
+   * a type-level and at runtime.
+   */
+  clientPrefix: 'PUBLIC_',
+
+  client: {},
+
+  /**
+   * What object holds the environment variables at runtime. This is usually
+   * `process.env` or `import.meta.env`.
+   */
+  runtimeEnv: process.env,
+
+  /**
+   * By default, this library will feed the environment variables directly to
+   * the Zod validator.
+   *
+   * This means that if you have an empty string for a value that is supposed
+   * to be a number (e.g. `PORT=` in a ".env" file), Zod will incorrectly flag
+   * it as a type mismatch violation. Additionally, if you have an empty string
+   * for a value that is supposed to be a string with a default value (e.g.
+   * `DOMAIN=` in an ".env" file), the default value will never be applied.
+   *
+   * In order to solve these issues, we recommend that all new projects
+   * explicitly specify this option as true.
+   */
+  emptyStringAsUndefined: true
+});
diff --git a/src/lib/actions/login.ts b/src/lib/actions/login.ts
index 1e6552c..9b48cf8 100644
--- a/src/lib/actions/login.ts
+++ b/src/lib/actions/login.ts
@@ -1,21 +1,21 @@
-"use server"
-import { db } from "@/db_connection";
-import { redirect } from "next/navigation";
-import z from "zod";
-import crypto from "node:crypto"
-import { session } from "@/schema";
-import { cookies } from "next/headers";
+'use server';
+import { db } from '@/db_connection';
+import { redirect } from 'next/navigation';
+import z from 'zod';
+import crypto from 'node:crypto';
+import { session } from '@/schema';
+import { cookies } from 'next/headers';
 
 const validator = z.object({
   username: z.string().min(6),
-  password: z.string().min(6),
+  password: z.string().min(6)
 });
 
 type Result = Promise<{
-  message: string
-}> 
+  message: string;
+}>;
 
-export async function login(prevState:any, formData: FormData) {
+export async function login(prevState: any, formData: FormData) {
   const data = {};
 
   for (const [key, val] of formData.entries())
@@ -24,10 +24,10 @@ export async function login(prevState:any, formData: FormData) {
   const result = await validator.safeParseAsync(data);
 
   if (!result.success) {
-    console.log("Your input data is incorrect!");
+    console.log('Your input data is incorrect!');
     return {
-      message: "Your input data is incorrect!"
-    }
+      message: 'Your input data is incorrect!'
+    };
   }
 
   const user = await db.query.user.findFirst({
@@ -35,30 +35,30 @@ export async function login(prevState:any, formData: FormData) {
       and(
         eq(user.username, result.data.username),
         eq(user.password, result.data.password)
-      ),
+      )
   });
 
   if (!user) {
     return {
-      message: "Invalid username or password!"
-    }
+      message: 'Invalid username or password!'
+    };
   }
 
   if (!user.verified) {
     return {
-      message: "Your account has not been activated, check your email"
-    }
+      message: 'Your account has not been activated, check your email'
+    };
   }
 
-  const token = crypto.randomBytes(64).toString("hex")
+  const token = crypto.randomBytes(32).toString('hex');
   await db.insert(session).values({
     token,
     userId: user.id
-  })
+  });
 
-  const now = new Date().getTime()
-  const expires = now + (1000 * 30)
-  cookies().set("session", token, {expires})
+  const now = new Date().getTime();
+  const expires = now + 1000 * 30 * 60;
+  cookies().set('session', token, { expires });
 
-  redirect("/")
+  redirect('/');
 }
diff --git a/src/lib/actions/register.ts b/src/lib/actions/register.ts
index 62aa8b1..f4799d9 100644
--- a/src/lib/actions/register.ts
+++ b/src/lib/actions/register.ts
@@ -1,27 +1,29 @@
-'use server'
-import { db } from "@/db_connection";
-import { user } from "@/schema";
-import z from "zod";
+'use server';
+import { db } from '@/db_connection';
+import { user } from '@/schema';
+import z from 'zod';
 
 const validator = z.object({
   email: z.string().email(),
   username: z.string().min(6),
-  password: z.string().min(6),
+  password: z.string().min(6)
 });
 
 export async function register(formData: FormData) {
-  const data = {}
-  for (const [key, val] of formData.entries()) 
-    Object.assign(data, { [key]:val  })
-   
-  console.log(data)
+  const data = {};
+  for (const [key, val] of formData.entries())
+    Object.assign(data, { [key]: val });
+
+  console.log(data);
   const result = await validator.safeParseAsync(data);
 
   if (!result.success) {
-    console.log("Your input data is incorrect");
+    console.log('Your input data is incorrect');
     return;
   }
 
-  const insertResult = await db.insert(user).values(result.data)
-  console.log(`Created a new user in the database with an id of ${insertResult[0].insertId}`)
+  const insertResult = await db.insert(user).values(result.data);
+  console.log(
+    `Created a new user in the database with an id of ${insertResult[0].insertId}`
+  );
 }
diff --git a/src/schema.ts b/src/schema.ts
index d7fde0e..0a1744b 100644
--- a/src/schema.ts
+++ b/src/schema.ts
@@ -1,41 +1,58 @@
-import { InferSelectModel } from "drizzle-orm";
+import { InferSelectModel, relations } from 'drizzle-orm';
 import {
   boolean,
   int,
   mysqlTable,
   text,
   timestamp,
-  varchar,
-} from "drizzle-orm/mysql-core";
-import crypto from "node:crypto";
+  varchar
+} from 'drizzle-orm/mysql-core';
+import crypto from 'node:crypto';
 
-export const blog = mysqlTable("blogs", {
-  id: int("id").primaryKey().autoincrement(),
-  title: varchar("title", { length: 64 }),
-  content: text("content"),
+export const blog = mysqlTable('blogs', {
+  id: int('id').primaryKey().autoincrement(),
+  title: varchar('title', { length: 64 }),
+  content: text('content')
 });
 
 export type Blog = InferSelectModel<typeof blog>;
 
-export const user = mysqlTable("user", {
-  id: int("id").primaryKey().autoincrement(),
-  email: varchar("email", { length: 320 }),
-  username: varchar("username", { length: 64 }),
-  password: varchar("password", { length: 255 }),
-  verified: boolean("verified").$default(() => {
+export const user = mysqlTable('user', {
+  id: int('id').primaryKey().autoincrement(),
+  email: varchar('email', { length: 320 }),
+  username: varchar('username', { length: 64 }),
+  password: varchar('password', { length: 255 }),
+  verified: boolean('verified').$default(() => {
     return false;
   }),
-  activationToken: varchar("activationToken", { length: 64 }).$default(() => {
-    return crypto.randomBytes(64).toString("hex");
-  }),
+  activationToken: varchar('activationToken', { length: 64 }).$default(() => {
+    return crypto.randomBytes(32).toString('hex');
+  })
 });
 
-export const session = mysqlTable("session", {
-  id: int("id").primaryKey().autoincrement(),
-  token: varchar("token", { length: 64 }),
-  userId: int('userId').references(() => user.id),
-  timestamp: timestamp("timestamp", {
-    mode: "date",
-    fsp: 6,
-  }),
+export const userRelations = relations(user, ({ many }) => {
+  return {
+    session: many(session)
+  };
+});
+
+export const session = mysqlTable('session', {
+  id: int('id').primaryKey().autoincrement(),
+  token: varchar('token', { length: 64 }),
+  userId: int('userId')
+    .references(() => user.id)
+    .notNull(),
+  timestamp: timestamp('timestamp', {
+    mode: 'date',
+    fsp: 6
+  }).defaultNow()
+});
+
+export const sessionRelations = relations(session, ({ one }) => {
+  return {
+    user: one(user, {
+      fields: [session.userId],
+      references: [user.id]
+    })
+  };
 });
diff --git a/tailwind.config.ts b/tailwind.config.ts
index 38741b3..60c8a0b 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -1,18 +1,17 @@
-import type { Config } from "tailwindcss";
+import type { Config } from 'tailwindcss';
 
 const config: Config = {
   content: [
-    "./src/pages/**/*.{js,ts,jsx,tsx,mdx}",
-    "./src/components/**/*.{js,ts,jsx,tsx,mdx}",
-    "./src/app/**/*.{js,ts,jsx,tsx,mdx}",
+    './src/pages/**/*.{js,ts,jsx,tsx,mdx}',
+    './src/components/**/*.{js,ts,jsx,tsx,mdx}',
+    './src/app/**/*.{js,ts,jsx,tsx,mdx}'
   ],
   theme: {
-    extend: {
-    },
+    extend: {}
   },
-  daisyui:{
-    themes: ["dracula", "winter"],
+  daisyui: {
+    themes: ['dracula', 'winter']
   },
-  plugins: [require('daisyui'),],
+  plugins: [require('daisyui')]
 };
 export default config;