From 79d57fa26ce6d8170add86b9518888e96545d0fb Mon Sep 17 00:00:00 2001
From: Mark Linn <marktlinn@gmail.com>
Date: Fri, 25 Aug 2023 10:34:19 +0200
Subject: [PATCH 1/8] add: initial CICD settings; add them colors to DaisyUI

---
 .github/workflows/preview.yml | 18 ++++++++++++++++++
 .github/workflows/test.yml    | 31 +++++++++++++++++++++++++++++++
 cypress.config.ts             |  2 ++
 package.json                  |  4 ++--
 src/app/counter/page.tsx      |  2 +-
 tailwind.config.js            | 16 ++++++++++++++--
 6 files changed, 68 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/preview.yml
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
new file mode 100644
index 00000000..039bdb12
--- /dev/null
+++ b/.github/workflows/preview.yml
@@ -0,0 +1,18 @@
+name: Vercel Preview Deployment
+env:
+  VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
+  VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
+on: pull_request
+jobs:
+  Deploy-Preview:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Vercel CLI
+        run: npm install --global vercel@latest
+      - name: Pull Vercel Environment Information
+        run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
+      - name: Build Project Artifacts
+        run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
+      - name: Deploy Project Artifacts to Vercel
+        run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 00000000..2044e027
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,31 @@
+name: Lint & Test Workflow
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: "18" # current LTS (we have 16 in Docker)
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Run Eslint
+        run: yarn lint --strict
+
+      - name: Run Jest tests
+        run: yarn test
+
+      - name: Run Cypress tests
+        run: yarn cypress
diff --git a/cypress.config.ts b/cypress.config.ts
index 17161e32..41d499da 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -6,4 +6,6 @@ export default defineConfig({
       // implement node event listeners here
     },
   },
+  video: false,
+  screenshotOnRunFailure: false,
 });
diff --git a/package.json b/package.json
index fe328747..7a0d648a 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,8 @@
     "lint": "next lint",
     "prettier": "prettier . --write",
     "prepare": "husky install",
-    "test": "jest --watch",
-    "cypress": "cypress open"
+    "test": "jest",
+    "cypress": "cypress run"
   },
   "dependencies": {
     "@prisma/client": "5.1.1",
diff --git a/src/app/counter/page.tsx b/src/app/counter/page.tsx
index 42aef32a..dd14c9a8 100644
--- a/src/app/counter/page.tsx
+++ b/src/app/counter/page.tsx
@@ -34,7 +34,7 @@ function CounterPage() {
         </button>
         <button
           type="button"
-          className="btn btn-primary w-1/2"
+          className="btn btn-secondary w-1/2"
           onClick={handleDecrement}
         >
           -
diff --git a/tailwind.config.js b/tailwind.config.js
index 51f40985..335285e0 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -4,8 +4,20 @@ module.exports = {
     "./src/components/**/*.{js,ts,jsx,tsx,mdx}",
     "./src/app/**/*.{js,ts,jsx,tsx,mdx}",
   ],
-  theme: {
-    extend: {},
+  theme: {},
+  daisyui: {
+    themes: [
+      {
+        chingu: {
+          primary: "#40936d",
+          secondary: "#E6624B",
+          warning: "#f6d860",
+          accent: "#37cdbe",
+          neutral: "#757575",
+          "base-100": "#ffffff",
+        },
+      },
+    ],
   },
   plugins: [require("daisyui")],
 };

From 7b1fbf3376308120b31128e5699030658243d1bc Mon Sep 17 00:00:00 2001
From: Mark Linn <marktlinn@gmail.com>
Date: Fri, 25 Aug 2023 10:45:24 +0200
Subject: [PATCH 2/8] set theme properties in double quotes

---
 tailwind.config.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tailwind.config.js b/tailwind.config.js
index 335285e0..93905e18 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -9,11 +9,11 @@ module.exports = {
     themes: [
       {
         chingu: {
-          primary: "#40936d",
-          secondary: "#E6624B",
-          warning: "#f6d860",
-          accent: "#37cdbe",
-          neutral: "#757575",
+          "primary": "#40936d",
+          "secondary": "#E6624B",
+          "warning": "#f6d860",
+          "accent": "#37cdbe",
+          "neutral": "#757575",
           "base-100": "#ffffff",
         },
       },

From 27d7f715e7735a3e575b4d740064c5603557bc23 Mon Sep 17 00:00:00 2001
From: Mark Linn <marktlinn@gmail.com>
Date: Fri, 25 Aug 2023 10:56:42 +0200
Subject: [PATCH 3/8] set tests to run on pr to main and dev

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2044e027..9f712c07 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,7 +3,7 @@ name: Lint & Test Workflow
 on:
   pull_request:
     branches:
-      - main
+      [main, dev]
 
 jobs:
   build:

From d753f2219eaef03a599fa53dd127108f6e786cf5 Mon Sep 17 00:00:00 2001
From: Mark Linn <marktlinn@gmail.com>
Date: Fri, 25 Aug 2023 11:00:40 +0200
Subject: [PATCH 4/8] fix: counter test -> with redux provider

---
 .github/workflows/test.yml       |  3 +--
 src/app/counter/counter.test.tsx |  8 ++++++--
 tailwind.config.js               | 10 +++++-----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9f712c07..cba9c810 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,8 +2,7 @@ name: Lint & Test Workflow
 
 on:
   pull_request:
-    branches:
-      [main, dev]
+    branches: [main, dev]
 
 jobs:
   build:
diff --git a/src/app/counter/counter.test.tsx b/src/app/counter/counter.test.tsx
index 1185258f..1722f3ec 100644
--- a/src/app/counter/counter.test.tsx
+++ b/src/app/counter/counter.test.tsx
@@ -1,6 +1,10 @@
 import { render } from "@testing-library/react";
 import CounterPage from "./page";
-
+import { StoreProvider } from "@/components";
 it("should render the component", () => {
-  render(<CounterPage />);
+  render(
+    <StoreProvider>
+      <CounterPage />
+    </StoreProvider>,
+  );
 });
diff --git a/tailwind.config.js b/tailwind.config.js
index 93905e18..335285e0 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -9,11 +9,11 @@ module.exports = {
     themes: [
       {
         chingu: {
-          "primary": "#40936d",
-          "secondary": "#E6624B",
-          "warning": "#f6d860",
-          "accent": "#37cdbe",
-          "neutral": "#757575",
+          primary: "#40936d",
+          secondary: "#E6624B",
+          warning: "#f6d860",
+          accent: "#37cdbe",
+          neutral: "#757575",
           "base-100": "#ffffff",
         },
       },

From 97733493537e9c6c688b76c427e91c4b2e0d4222 Mon Sep 17 00:00:00 2001
From: Mark Linn <marktlinn@gmail.com>
Date: Sat, 26 Aug 2023 18:00:40 +0200
Subject: [PATCH 5/8] chore: test different Vercel deploy.yml

---
 .github/workflows/preview.yml | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 039bdb12..68faae26 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -1,18 +1,27 @@
-name: Vercel Preview Deployment
+name: Deploy PR to Preview
 env:
   VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
   VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
+
 on: pull_request
 jobs:
-  Deploy-Preview:
+  deploy:
     runs-on: ubuntu-latest
+    outputs:
+      url: ${{ steps.deploy-preview.outputs.url }}
     steps:
-      - uses: actions/checkout@v2
-      - name: Install Vercel CLI
+      - uses: actions/checkout@v3
+      - name: install Vercel CLI
         run: npm install --global vercel@latest
-      - name: Pull Vercel Environment Information
+      - name: pull Vercel environment information
         run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
-      - name: Build Project Artifacts
+      - name: build project artifacts
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
-      - name: Deploy Project Artifacts to Vercel
-        run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }}
+      - name: deploy preview
+        id: deploy-preview
+        run: |
+          du --inodes -d 5 .vercel/output
+          ls -l .vercel/output/functions
+          preview_url="$(vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }})"
+          echo "url=$preview_url" >> $GITHUB_OUTPUT
+          echo "deployed to $preview_url"
\ No newline at end of file

From dbe76603c3067b51e6eed94a5148312f2fa50565 Mon Sep 17 00:00:00 2001
From: Mark Linn <marktlinn@gmail.com>
Date: Sat, 26 Aug 2023 18:18:40 +0200
Subject: [PATCH 6/8] chore: attempt different .yml to comment Vercel deploy
 URL on PR

---
 .github/workflows/preview.yml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 68faae26..6342e614 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -8,7 +8,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     outputs:
-      url: ${{ steps.deploy-preview.outputs.url }}
+      url: ${{ steps.preview-deploy.outputs.url }}
     steps:
       - uses: actions/checkout@v3
       - name: install Vercel CLI
@@ -17,11 +17,14 @@ jobs:
         run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
       - name: build project artifacts
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
-      - name: deploy preview
-        id: deploy-preview
-        run: |
-          du --inodes -d 5 .vercel/output
-          ls -l .vercel/output/functions
-          preview_url="$(vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }})"
-          echo "url=$preview_url" >> $GITHUB_OUTPUT
-          echo "deployed to $preview_url"
\ No newline at end of file
+      - name: Deploy preview
+        id: preview-deploy
+        run: echo "URL=$(vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} | tail -n 1)" >> $GITHUB_OUTPUT
+      - name: Comment PR
+        uses: thollander/actions-comment-pull-request@v2
+        with:
+          message: |
+            Preview URL ${{ steps.preview-deploy.outputs.URL }}
+          comment_tag: execution
+
+

From 82705424454ada9315ca778110e2db1b28a2d020 Mon Sep 17 00:00:00 2001
From: Mark Linn <marktlinn@gmail.com>
Date: Sat, 26 Aug 2023 18:33:20 +0200
Subject: [PATCH 7/8] chore: tidy up .yml add specific branches

---
 .github/workflows/preview.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 6342e614..58171d93 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -3,12 +3,13 @@ env:
   VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
   VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
 
-on: pull_request
+on:
+  pull_request:
+    branches:
+        [main, dev]
 jobs:
   deploy:
     runs-on: ubuntu-latest
-    outputs:
-      url: ${{ steps.preview-deploy.outputs.url }}
     steps:
       - uses: actions/checkout@v3
       - name: install Vercel CLI

From 9b68f4939539937ba4f31df6bcc3bdf94de9a205 Mon Sep 17 00:00:00 2001
From: Mark Linn <marktlinn@gmail.com>
Date: Sun, 27 Aug 2023 14:57:02 +0200
Subject: [PATCH 8/8] chore: updat eslint rules + add font style

---
 .eslintrc.json                | 33 ++++++++++++++++++++++++++++++++-
 .github/workflows/preview.yml |  2 --
 .prettierignore               |  3 ++-
 src/app/layout.tsx            | 10 +++++++++-
 4 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index a6b416cc..99754607 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -38,6 +38,37 @@
     "react/destructuring-assignment": [2, "always"],
     "react/button-has-type": 2,
     "react/no-array-index-key": 2,
-    "import/order": 2
+    "import/order": 2,
+    "semi": [2, "always"],
+    "quotes": [2, "double"],
+    "prefer-destructuring": [
+      2,
+      {
+        "VariableDeclarator": {
+          "array": false,
+          "object": true
+        },
+        "AssignmentExpression": {
+          "array": true,
+          "object": false
+        }
+      },
+      {
+        "enforceForRenamedProperties": false
+      }
+    ],
+    "object-curly-spacing": [2, "always"],
+    "arrow-body-style": [2, "as-needed"],
+    "arrow-parens": [2, "always"],
+    "space-infix-ops": 2,
+    "arrow-spacing": [2, { "before": true, "after": true }],
+    "no-unused-vars": [2, { "args": "all", "argsIgnorePattern": "_" }],
+    "guard-for-in": 2,
+    "no-await-in-loop": 2,
+    "indent": [2, 2],
+    "object-curly-newline": [2, { "minProperties": 4, "consistent": true }],
+    "brace-style": 2,
+    "no-multiple-empty-lines": 2,
+    "eol-last": [2, "always"]
   }
 }
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 58171d93..e6cf6ee5 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -27,5 +27,3 @@ jobs:
           message: |
             Preview URL ${{ steps.preview-deploy.outputs.URL }}
           comment_tag: execution
-
-
diff --git a/.prettierignore b/.prettierignore
index 754f921a..65dda725 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -8,4 +8,5 @@ coverage
 **/out/*
 next-env.d.ts
 next.config.js
-*.md
\ No newline at end of file
+*.md
+.github/**
\ No newline at end of file
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 8264fada..46ada53c 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,5 +1,6 @@
 import "./globals.css";
 import type { Metadata } from "next";
+import { Inter } from "next/font/google";
 import { StoreProvider } from "@/components";
 
 export const metadata: Metadata = {
@@ -7,13 +8,20 @@ export const metadata: Metadata = {
   description: "Generated by create next app",
 };
 
+// If loading a variable font, you don't need to specify the font weight
+const inter = Inter({
+  weight: ["400", "500", "600", "700"],
+  subsets: ["latin"],
+  display: "swap",
+});
+
 export default function RootLayout({
   children,
 }: {
   children: React.ReactNode;
 }) {
   return (
-    <html lang="en">
+    <html lang="en" className={inter.className}>
       <body>
         <StoreProvider>{children}</StoreProvider>
       </body>