Merge pull request #60 from RizkyRajitha/dev

Hotfix v0.5.1

.babelrc

@@ -1,5 +1,5 @@
 {
-  // diabled optimizeForSpeed becasue styled-jsx style not found error wehn updating styles
+  // diabled optimiuzeForSpeed becasue styled-jsx style not fond error wehn updating styles
   // framework.cb05d56be993eb6b088a.js:1 DOMException: Failed to execute 'insertRule' on 'CSSStyleSheet': Failed to insert the rule.
   //https://github.com/vercel/styled-jsx/issues/295
   "presets": [["next/babel", { "styled-jsx": { "optimizeForSpeed": false } }]]

.github/workflows/browsertesting.yml

@@ -0,0 +1,109 @@
+name: Browser-Testing
+
+on: [push, pull_request]
+
+jobs:
+  Browser-Testing:
+    runs-on: ubuntu-latest
+    # Service containers to run with `runner-job`
+    services:
+      # Label used to access the service container
+      postgres:
+        # Docker Hub image
+        image: postgres
+        # Provide the password for postgres
+        env:
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_USER: postgres
+          POSTGRES_DB: postgres
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps tcp port 5432 on service container to the host
+          - 5432:5432
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+
+      - name: install puppeteer libraries
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgbm1
+
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules
+        with:
+          path: "node_modules"
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Install puppeteer
+        run: npm install puppeteer
+
+      - name: Migrate database
+        run: npm run prismamigrateprod
+        env:
+          NODE_ENV: production
+          DATABASE_URL: "postgres://postgres:postgres@localhost:5432/postgres"
+
+      - name: Seed database
+        run: npm run seed
+        env:
+          NODE_ENV: production
+          DATABASE_URL: "postgres://postgres:postgres@localhost:5432/postgres"
+
+      - name: Run browser testing script
+        id: browser-testing
+        env:
+          HASHSALT: 123
+          # NODE_ENV: production
+          DATABASE_URL: "postgres://postgres:postgres@localhost:5432/postgres"
+          CLOUDINARY_CLOUD_NAME: ${{ secrets.CLOUDINARY_CLOUD_NAME }}
+          CLOUDINARY_API_KEY: ${{ secrets.CLOUDINARY_API_KEY }}
+          CLOUDINARY_API_SECRET: ${{ secrets.CLOUDINARY_API_SECRET }}
+        run: |
+          chmod +x run-browser-testing.sh
+          ./run-browser-testing.sh
+
+      - name: Use the value
+        id: step_two
+        run: |
+          echo "${{ env.commentBody }}"
+
+      - name: Add comment
+        uses: actions/github-script@v5
+        env:
+          SHA: ${{ github.sha }}
+          commentBody: ${{ env.commentBody }}
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+
+            let buffercommentBody = process.env.commentBody
+            let utf8commentBody = new Buffer.from(buffercommentBody, "base64").toString("utf8");
+            console.log(utf8commentBody);
+
+            github.rest.repos.createCommitComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              commit_sha: process.env.SHA,
+              body: utf8commentBody
+            })

components/footerform.js

@@ -9,7 +9,7 @@ const FontForm = ({ data, update, loading }) => {
     formState: { errors },
   } = useForm({ defaultValues: data });
 
-  console.log(data);
+  // console.log(data);
 
   return (
     <>

components/formwrapper.js

@@ -1,10 +1,6 @@
 import { useRouter } from "next/router";
 import { useState, useEffect } from "react";
 import { ToastContainer, toast } from "react-toastify";
-
-// importing hook useSWR from package swr
-// import useSWR from "swr";
-
 import styles from "../styles/formwrapper.module.css";
 
 import ColorForm from "./colorform";
@@ -39,26 +35,11 @@ function Formwrapper({ pageData, updatedPageData }) {
     });
   }, [activeForm]);
 
-  // asynchronous function to fetch data to save page data and update page
-  // const savePageDataFetcher = async ([url, data]) =>
-  //   await fetch(url, {
-  //     method: "POST",
-  //     body: JSON.stringify(data),
-  //     headers: { "Content-Type": "application/json" },
-  //   }).then((res) => res.json());
 
-  // savePageData was previously asynchronous
   const savePageData = async (data) => {
     setloading(true);
     try {
-      // const { res } = useSWR(
-      //   [`${endpoint}/api/updatepagedata`, data],
-      //   savePageDataFetcher
-      // );
-      /*
-      the following piece of code has been replaced with the implementation of useSWR hook above
 
-      */
       let res = await fetch(`${endpoint}/api/updatepagedata`, {
         method: "POST",
         body: JSON.stringify(data),
@@ -93,21 +74,13 @@ function Formwrapper({ pageData, updatedPageData }) {
     setloading(false);
   };
 
-  // asynchronous function to fetch logout data
-  // const logOutFetcher = async (url) =>
-  //   await fetch(url).then((res) => res.json());
-
-  // the logout function was previously asynchronous
   const logout = async () => {
     try {
-      // const { res } = useSWR(`${endpoint}/api/user/logout`, logOutFetcher);
-      /*
-      the following piece of code has been replaced with the implementation of useSWR hook above
-      */
+
       let res = await fetch(`${endpoint}/api/user/logout`).then((res) =>
         res.json()
       );
-      console.log(res);
+      // console.log(res);
 
       if (res.success) {
         router.push("/admin");

components/linksform.js

@@ -122,7 +122,7 @@ const LinksForm = ({ pagedataid }) => {
         headers: { "Content-Type": "application/json" },
       }).then((res) => res.json());
 
-      console.log(res);
+      // console.log(res);
 
       if (!res.success) {
         toast.error(`Error ${res.message}`, { autoClose: 5000 });
@@ -207,7 +207,7 @@ const LinksForm = ({ pagedataid }) => {
       }
     });
 
-    console.log(data);
+    // console.log(data);
 
     let confirm = await Swal.fire({
       title: "Apply common settings",
@@ -232,7 +232,7 @@ const LinksForm = ({ pagedataid }) => {
         headers: { "Content-Type": "application/json" },
       }).then((res) => res.json());
 
-      console.log(res);
+      // console.log(res);
 
       if (!res.success) {
         toast.error(`Error ${res.message}`, { autoClose: 5000 });

components/passwordchangeform.js

@@ -24,7 +24,7 @@ const PasswordChangeForm = () => {
   password.current = watch("newPassword", "");
 
   const updatePassword = async (data) => {
-    console.log(data);
+    // console.log(data);
     setloading(true);
 
     try {
@@ -57,7 +57,7 @@ const PasswordChangeForm = () => {
       let res = await fetch(`${endpoint}/api/user/logout`).then((res) =>
         res.json()
       );
-      console.log(res);
+      // console.log(res);
 
       if (res.success) {
         router.push("/admin");

components/toast.js

@@ -5,7 +5,7 @@ export default function Toast({ message, type, toaster }) {
   const [msg, setmsg] = useState(message);
 
   useEffect(() => {
-    console.log(message);
+    // console.log(message);
 
     toaster(showError);
 

docker-compose.yml

@@ -7,7 +7,7 @@ services:
       - "3000:3000"
     environment:
       DATABASE_URL: "postgres://linkin:linkin123@db:5432/linkin"
-      HASHSALT: "123" # random secret key
+      HASHSALT: "1234" # random secret key
       NODE_ENV: "production"
     depends_on:
       - db
@@ -34,7 +34,6 @@ services:
       POSTGRES_USER: "linkin"
       POSTGRES_PASSWORD: "linkin123"
     volumes:
-      #      - ./scripts/db-migrate.sql:/docker-entrypoint-initdb.d/db-migrate.sql
       - linkin-data:/var/lib/postgresql/data
 volumes:
   linkin-data:

lib/crypto.js

@@ -8,7 +8,7 @@ const HASHSALT = process.env.HASHSALT;
 export function createSecureToken(payload) {
   let jwttoken = JWT.sign(payload, HASHSALT);
   let encryttedToken = JWE.encrypt(jwttoken, HASHSALT);
-  console.log(encryttedToken);
+  // console.log(encryttedToken);
   return encryttedToken;
 }
 

middleware/middleware.js

@@ -1,5 +1,3 @@
-// import Cors from "cors";
-
 import { parse } from "cookie";
 import { parseSecureToken } from "../lib/crypto";
 
@@ -46,9 +44,15 @@ export function jwtAuth(req, res, next) {
 export function cookieValidate(req, res) {
   let cookie = req.headers?.cookie;
 
+  // console.log("dashboard cookie");
+
   if (!cookie) {
-    res.setHeader("location", "/admin");
-    res.statusCode = 302;
+    res.writeHead(302, {
+      location: "/admin",
+      "Content-Type": "text/html",
+    });
+    // res.setHeader("location", "/admin");
+    // res.statusCode = 302;
     res.end();
     return new Error("cookie invalid");
   }
@@ -58,7 +62,11 @@ export function cookieValidate(req, res) {
   let decodedToken = parseSecureToken(token);
 
   if (!decodedToken) {
-    res.setHeader("location", "/admin");
+    res.writeHead(302, {
+      location: "/admin",
+      "Content-Type": "text/html",
+    });
+    // res.setHeader("location", "/admin");
     res.statusCode = 302;
     res.end();
     return new Error("cookie invalid");
@@ -75,8 +83,12 @@ export function cookieValidateLogin(req, res) {
   let decodedToken = parseSecureToken(token);
 
   if (decodedToken) {
-    res.setHeader("location", "/dashboard");
-    res.statusCode = 302;
+    res.writeHead(302, {
+      location: "/dashboard",
+      "Content-Type": "text/html",
+    });
+    // res.setHeader("location", "/dashboard");
+    // res.statusCode = 302;
     res.end();
   }
 }