Brijesh's Git Server — watchman @ 06015f9ee3bf5decd99f1b13233799f6609d5989

observability tool, needs to be rewritten once identity is stable

chore: move config to yaml file, add favicon and titles to client pages

env file ended up not having any enviroment variables and only config stuff so moved to a YAML file for config and deleted .env

also created a temporary favicon and added titles to pages

will move rate limiting requests/sec count to config file as well in coming updates
Brijesh ops@brijesh.dev
Fri, 28 Jun 2024 15:37:54 +0530
commit

06015f9ee3bf5decd99f1b13233799f6609d5989

parent

620f0d0941040f67e80c42836d12911027389218

17 files changed, 85 insertions(+), 18 deletions(-)

jump to
M .gitignore → .gitignore 
@@ -1,3 +1,4 @@ 
 .env
 watchman.db
 todo.txt
+.DS_Store
D client/public/next.svg 
@@ -1,1 +0,0 @@ 
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>
D client/public/vercel.svg 
@@ -1,1 +0,0 @@ 
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 283 64"><path fill="black" d="M141 16c-11 0-19 7-19 18s9 18 20 18c7 0 13-3 16-7l-7-5c-2 3-6 4-9 4-5 0-9-3-10-7h28v-3c0-11-8-18-19-18zm-9 15c1-4 4-7 9-7s8 3 9 7h-18zm117-15c-11 0-19 7-19 18s9 18 20 18c6 0 12-3 16-7l-8-5c-2 3-5 4-8 4-5 0-9-3-11-7h28l1-3c0-11-8-18-19-18zm-10 15c2-4 5-7 10-7s8 3 9 7h-19zm-39 3c0 6 4 10 10 10 4 0 7-2 9-5l8 5c-3 5-9 8-17 8-11 0-19-7-19-18s8-18 19-18c8 0 14 3 17 8l-8 5c-2-3-5-5-9-5-6 0-10 4-10 10zm83-29v46h-9V5h9zM37 0l37 64H0L37 0zm92 5-27 48L74 5h10l18 30 17-30h10zm59 12v10l-3-1c-6 0-10 4-10 10v15h-9V17h9v9c0-5 6-9 13-9z"/></svg>
M client/src/components/Breadcrumb.tsx → client/src/components/Breadcrumb.tsx 
@@ -20,17 +20,20 @@ </Link>
             </>
           )}
           {/* if path contains only one slash, it means page is project details */}
-          {(router.pathname.match(new RegExp("/", "g")) || []).length == 2 && (
-            <>
-              <p>/</p>
-              <Link
-                className="hover:underline"
-                href={`/projects/${router.query.id}`}
-              >
-                Project Details
-              </Link>
-            </>
-          )}
+          {(router.pathname.match(new RegExp("/", "g")) || []).length == 2 &&
+            !router.pathname.includes("/create") &&
+            !router.pathname.includes("/update") &&
+            !router.pathname.includes("/delete") && (
+              <>
+                <p>/</p>
+                <Link
+                  className="hover:underline"
+                  href={`/projects/${router.query.id}`}
+                >
+                  Project Details
+                </Link>
+              </>
+            )}
         </div>
       )}
     </div>
M client/src/pages/index.tsx → client/src/pages/index.tsx 
@@ -1,8 +1,17 @@ 
 import MainLayout from "@/components/MainLayout";
+import Head from "next/head";
+import Link from "next/link";
 
 const Homepage = () => {
   return (
     <MainLayout>
+      <Head>
+        <title>Watchman</title>
+        <Link
+          rel="icon"
+          href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>🎯</text></svg>"
+        />
+      </Head>
       <h1 className="text-xl font-medium">Homepage</h1>
       <p className="my-2">
         Please check this page later, as it is still under construction.
M client/src/pages/projects/[id]/delete.tsx → client/src/pages/projects/[id]/delete.tsx 
@@ -1,6 +1,7 @@ 
 import { DeleteProject, GetProjectById, ListProjects } from "@/api/projects";
 import { PrimaryButton } from "@/components/Button";
 import MainLayout from "@/components/MainLayout";
+import Head from "next/head";
 import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
 

@@ -27,6 +28,9 @@ }, [apiResponse]);
 
   return (
     <MainLayout>
+      <Head>
+        <title>Delete Project | Watchman</title>
+      </Head>
       <div className="mb-4 flex justify-between items-center uppercase">
         {project?.data?.name && (
           <h1 className="text-xl font-medium">{project.data.name}</h1>
M client/src/pages/projects/[id]/index.tsx → client/src/pages/projects/[id]/index.tsx 
@@ -1,6 +1,7 @@ 
 import { GetProjectById, ListProjects } from "@/api/projects";
 import { PrimaryButton } from "@/components/Button";
 import MainLayout from "@/components/MainLayout";
+import Head from "next/head";
 import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
 

@@ -16,6 +17,9 @@ }, [id]);
 
   return (
     <MainLayout>
+      <Head>
+        <title>Project Details | Watchman</title>
+      </Head>
       <div className="mb-4 flex justify-between items-center uppercase">
         {project?.data?.name && (
           <h1 className="text-xl font-medium">{project.data.name}</h1>
M client/src/pages/projects/[id]/update.tsx → client/src/pages/projects/[id]/update.tsx 
@@ -1,6 +1,7 @@ 
 import { GetProjectById, UpdateProject } from "@/api/projects";
 import { PrimaryButton } from "@/components/Button";
 import MainLayout from "@/components/MainLayout";
+import Head from "next/head";
 import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
 

@@ -34,6 +35,9 @@ }, [project]);
 
   return (
     <MainLayout>
+      <Head>
+        <title>Update Project | Watchman</title>
+      </Head>
       <h1 className="text-xl font-medium">Update Project</h1>
 
       <form onSubmit={formSubmit} className="my-4 flex flex-col gap-4">
M client/src/pages/projects/create.tsx → client/src/pages/projects/create.tsx 
@@ -1,6 +1,7 @@ 
 import { CreatePorject } from "@/api/projects";
 import { PrimaryButton } from "@/components/Button";
 import MainLayout from "@/components/MainLayout";
+import Head from "next/head";
 import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
 

@@ -23,6 +24,9 @@ }, [apiResponse]);
 
   return (
     <MainLayout>
+      <Head>
+        <title>Create Projects | Watchman</title>
+      </Head>
       <h1 className="text-xl font-medium">Create Project</h1>
 
       <form onSubmit={formSubmit} className="my-4 flex flex-col gap-4">
M client/src/pages/projects/index.tsx → client/src/pages/projects/index.tsx 
@@ -2,6 +2,7 @@ import { ListProjects } from "@/api/projects";
 import { PrimaryButton } from "@/components/Button";
 import MainLayout from "@/components/MainLayout";
 import Table from "@/components/table";
+import Head from "next/head";
 import Link from "next/link";
 import { useRouter } from "next/router";
 import { useEffect, useState } from "react";

@@ -17,6 +18,9 @@ }, []);
 
   return (
     <MainLayout>
+      <Head>
+        <title>Projects | Watchman</title>
+      </Head>
       <div className="mb-4 flex justify-between items-center">
         <h1 className="text-xl font-medium">Projects</h1>
         <PrimaryButton
A config.yaml 
@@ -0,0 +1,1 @@ 
+port: 4000
M go.mod → go.mod 
@@ -5,6 +5,8 @@ 
 require (
 	github.com/google/uuid v1.6.0
 	github.com/joho/godotenv v1.5.0
-	golang.org/x/time v0.5.0
 	github.com/mattn/go-sqlite3 v1.14.22
+	golang.org/x/time v0.5.0
 )
+
+require gopkg.in/yaml.v3 v3.0.1 // indirect
M go.sum → go.sum 
@@ -14,3 +14,6 @@ golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU=
 golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
M main.go → main.go 
@@ -5,6 +5,7 @@ "database/sql"
 	"fmt"
 	"log"
 	"net/http"
+	"strconv"
 	"watchman/internal"
 	"watchman/middleware"
 	"watchman/utils"

@@ -28,7 +29,7 @@ }
 }
 
 func main() {
-	port := utils.Load_ENV("PORT")
+	config := utils.Read_Config()
 
 	db_connection, err := sql.Open("sqlite3", "./watchman.db")
 	if err != nil {

@@ -117,8 +118,8 @@ utils.Method_Not_Allowed_Handler(w, r)
 		}
 	})
 
-	fmt.Println("Starting server on " + port)
-	log.Fatal(http.ListenAndServe(":"+port,
+	fmt.Println("Starting server on " + strconv.Itoa(config.Port))
+	log.Fatal(http.ListenAndServe(":"+strconv.Itoa(config.Port),
 		middleware.CorsMiddleware(
 			middleware.RequestIDMiddleware(
 				middleware.Ratelimit(
M schema/types.go → schema/types.go 
@@ -1,10 +1,14 @@ 
 package schema
 
 type Response_Type struct {
+	Data      interface{} `json:"data,omitempty"`
 	Status    string      `json:"status"`
 	Message   string      `json:"message"`
 	RequestID string      `json:"request_id"`
-	Data      interface{} `json:"data,omitempty"`
 }
 
 type RequestIDKey struct{}
+
+type ConfigType struct {
+	Port int `yaml:"port"`
+}
A utils/config.go 
@@ -0,0 +1,25 @@ 
+package utils
+
+import (
+	"fmt"
+	"os"
+	"watchman/schema"
+
+	"gopkg.in/yaml.v3"
+)
+
+func Read_Config() schema.ConfigType {
+	var Config schema.ConfigType
+
+	yamlFile, err := os.ReadFile("config.yaml")
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	err = yaml.Unmarshal(yamlFile, &Config)
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	return Config
+}