Merge pull request #40 from KrustyC/chore/remove-netlify

chore: removed netlify

.env.template

@@ -0,0 +1,15 @@
+NEXT_PUBLIC_BASE_URL=http://localhost:3000
+DISABLE_CACHE=true
+
+CONTENTFUL_SPACE_ID=
+CONTENTFUL_ACCESS_TOKEN=
+CONTENTFUL_PREVIEW_ACCESS_TOKEN=
+
+POSTGRES_PRISMA_URL=
+POSTGRES_URL_NON_POOLING=
+
+DRAFT_MODE_SECRET_TOKEN=
+
+PROJECT_PASSWORD_COOKIE_SECRET=
+
+REBUILD_PROJECTS_INDEX_API_KEY=

.eslintrc.json

@@ -1,56 +1,28 @@
 {
-  "plugins": [
-    "@typescript-eslint",
-    "prettier"
-  ],
-  "extends": [
-    "next/core-web-vitals",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:prettier/recommended"
-  ],
+  "extends": ["next/core-web-vitals", "prettier"],
+  "plugins": ["simple-import-sort"],
   "rules": {
-    // I suggest you add those two rules:
-    "react-hooks/exhaustive-deps": 0,
-    "@typescript-eslint/no-unused-vars": "error",
-    "@typescript-eslint/no-explicit-any": "error",
-    "prettier/prettier": "error"
-  },
-  "settings": {
-    "import/resolver": {
-      "alias": {
-        "map": [
-          [
-            "@/components",
-            "src/components"
-          ],
-          [
-            "@/hooks/*",
-            "src/hooks/*"
-          ],
-          [
-            "@/contexts/*",
-            "src/contexts/*"
-          ],
-          [
-            "@/layouts/*",
-            "src/layouts/*"
-          ],
-          [
-            "@/types/*",
-            "src/types/*"
-          ],
-          [
-            "@/utils/*",
-            "src/utils/*"
-          ]
-        ],
-        "extensions": [
-          ".ts",
-          ".js",
-          ".jsx",
-          ".json"
+    "import/newline-after-import": ["error", { "count": 1 }],
+    // increase the severity of rules so they are auto-fixable
+    "simple-import-sort/imports": [
+      "error",
+      {
+        "groups": [
+          // Packages `react` related packages come first.
+          ["^react", "^@?\\w"],
+          // Internal packages.
+          ["^(@)(/.*|$)"],
+          // Side effect imports.
+          ["^\\u0000"],
+          // Parent imports. Put `..` last.
+          ["^\\.\\.(?!/?$)", "^\\.\\./?$"],
+          // Other relative imports. Put same-folder imports and `.` last.
+          ["^\\./(?=.*/)(?!/?$)", "^\\.(?!/?$)", "^\\./?$"],
+          // Style imports.
+          ["^.+\\.?(css)$"]
         ]
       }
-    }
+    ],
+    "simple-import-sort/exports": "error"
   }
-}
+}

.github/workflows/ci.yaml

@@ -0,0 +1,49 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  typecheck:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "20"
+          cache: "npm"
+      - name: Install dependencies
+        run: npm install
+      - name: Run typecheck
+        run: npm run typecheck
+
+  lint:
+    runs-on: ubuntu-latest
+    needs: typecheck
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "20"
+          cache: "npm"
+      - name: Install dependencies
+        run: npm install
+      - name: Run lint
+        run: npm run lint
+
+  format:
+    runs-on: ubuntu-latest
+    needs: lint
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "20"
+          cache: "npm"
+      - name: Install dependencies
+        run: npm install
+      - name: Run prettier
+        run: npm run format

.gitignore

@@ -24,18 +24,13 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-# local env files
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
 # vercel
 .vercel
 
 # env files
 .env
 .env.local
+.env.old
 
 # netlify
 /.netlify/

.nvmrc

@@ -0,0 +1 @@
+v20.11.0

.prettierrc

@@ -1,7 +1,6 @@
 {
-  "semi": true,
   "trailingComma": "es5",
-  "singleQuote": false,
   "tabWidth": 2,
-  "useTabs": false
+  "semi": true,
+  "singleQuote": false
 }

README.md

@@ -2,27 +2,17 @@
 
 This is the website for https://beatricecox.com a Web Designer based in London.
 
-[![Netlify Status](https://api.netlify.com/api/v1/badges/c26bf3d2-7ba8-48a8-975a-d7916a8a021f/deploy-status)](https://app.netlify.com/sites/beatricecox/deploys)
-
 ## Prerequisites
 
-- [NodeJs](https://nodejs.org/en/) - v16+
-- [Docker](https://nodejs.org/en/) / this is only used if you want to pull up the local mongo using docker-compose, otherwise you can install mongo directly into your machin
+- [NodeJs](https://nodejs.org/en/) - v20+
+- [Docker](https://docs.docker.com/) / this is only used if you want to pull up the local postgres using docker-compose, otherwise you can install postgres directly into your machin
 
 ## Getting Started
 
-First, run the development server:
-
-```bash
-netlify dev
-```
+First of all make sur eyou have copied `.env` into `.env.local`, and updtated all the values according to your local values. Once that is done, make sure to run the postgres database with `docker-compose up`. On a different terminal now simply run `npm run dev` and the app will start on port 3000.
 
 Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
 
-## API
-
-This project is making use of Netlify Functions to expose its API. All functions are kept inside `./netlify/functions`. Netlify automatically provision Lambda functions for each file inside the aforementioned folder.
-
-### Deploy on Netlify
+### Deploy on Vercel
 
-This website is deployed and served through netlify, any push on `master` will automatically trigger a deployment to the production website.
+This website is deployed and served through Vercel, any push on `master` will automatically trigger a deployment to the production website.

codegen.ts

@@ -0,0 +1,14 @@
+import type { CodegenConfig } from "@graphql-codegen/cli";
+
+const config: CodegenConfig = {
+  overwrite: true,
+  schema: "./schema.graphql",
+  generates: {
+    "src/types/new-generated/": {
+      preset: "client",
+      plugins: [],
+    },
+  },
+};
+
+export default config;

docker-compose.yaml

@@ -0,0 +1,12 @@
+version: "3.9"
+services:
+  beatrice-cox-pg-db:
+    image: postgres:16.1-alpine3.19
+    ports:
+      - 54320:5432
+    volumes:
+      - ~/apps/postgres:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_PASSWORD=an_amazing_password
+      - POSTGRES_USER=beatrice
+      - POSTGRES_DB=beatricedb