add webview2, switch from gorm to raw sql first steps

Author: Gluek

.vscode/launch.json

@@ -0,0 +1,7 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": []
+}

Taskfile.yaml

@@ -17,3 +17,7 @@ tasks:
     desc: Run the application
     cmds:
       - go run ./cmd/server/...
+  build:
+    desc: Run the application
+    cmds:
+      - go build -ldflags -H=windowsgui ./cmd/server/...

cmd/server/main.go

@@ -1,22 +1,40 @@
 package main
 
 import (
-	"fmt"
+	"html/template"
 	"local/timetracker/internal/database"
 	"log"
 	"mime"
 	"net/http"
+	"os"
 
 	"github.com/gorilla/mux"
+	"github.com/jchv/go-webview2"
 )
 
+var (
+	pwd, _ = os.Getwd()
+)
+
+type PageData struct {
+	Title   string
+	Entries []database.Timeframe
+}
+
 func main() {
+	go webServer()
+
+	webView()
+}
+
+func webServer() {
 	database.Connect()
-	database.Migrate()
+
 	router := mux.NewRouter()
 
-	http.Handle("/", http.FileServer(http.Dir("D:\\Dev\\Go\\TimeTracker\\internal\\templates\\")))
+	http.Handle("/", http.FileServer(http.Dir(pwd+"/internal/templates/")))
 	http.Handle("/api/", router)
+	//http.HandleFunc("/layout", TemplateHandler)
 	RegisterEntryRoutes(router)
 
 	// Windows may be missing this
@@ -26,14 +44,42 @@ func main() {
 }
 
 func RegisterEntryRoutes(router *mux.Router) {
-	router.HandleFunc("/api/hello", h1).Methods("GET")
 	router.HandleFunc("/api/timeframes", database.CreateEntry).Methods("POST")
 	router.HandleFunc("/api/timeframes", database.GetEntries).Methods("GET")
 	router.HandleFunc("/api/timeframes/{id}", database.GetEntryByID).Methods("GET")
 	router.HandleFunc("/api/timeframes/{id}", database.UpdateEntry).Methods("PUT")
 	router.HandleFunc("/api/timeframes/{id}", database.DeleteEntry).Methods("DELETE")
 }
 
-func h1(w http.ResponseWriter, r *http.Request) {
-	fmt.Println("Test!")
+func TemplateHandler(w http.ResponseWriter, r *http.Request) {
+	var entries []database.Timeframe
+	//database.Instance.Find(&entries)
+	tmpl := template.Must(template.ParseFiles(pwd + "/internal/templates/templtest.html"))
+	data := PageData{
+		Title:   "My Title",
+		Entries: entries,
+	}
+	tmpl.Execute(w, data)
+}
+
+func webView() {
+	w := webview2.NewWithOptions(webview2.WebViewOptions{
+		Debug:     true, // To display the development tools
+		AutoFocus: true,
+		WindowOptions: webview2.WindowOptions{
+			Title:  "Time Tracker",
+			Width:  200,
+			Height: 200,
+			IconId: 2, // icon resource id
+			Center: true,
+		},
+	})
+	if w == nil {
+		log.Fatalln("Failed to load webview.")
+	}
+	defer w.Destroy()
+
+	w.SetSize(600, 600, webview2.HintNone)
+	w.Navigate("http://localhost:34115/")
+	w.Run()
 }

go.mod

@@ -9,7 +9,28 @@ require (
 )
 
 require (
+	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/jchv/go-webview2 v0.0.0-20221223143126-dc24628cff85 // indirect
+	github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
+	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/mattn/go-sqlite3 v1.14.18 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	golang.org/x/mod v0.3.0 // indirect
+	golang.org/x/sys v0.9.0 // indirect
+	golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	lukechampine.com/uint128 v1.2.0 // indirect
+	modernc.org/cc/v3 v3.40.0 // indirect
+	modernc.org/ccgo/v3 v3.16.13 // indirect
+	modernc.org/libc v1.29.0 // indirect
+	modernc.org/mathutil v1.6.0 // indirect
+	modernc.org/memory v1.7.2 // indirect
+	modernc.org/opt v0.1.3 // indirect
+	modernc.org/sqlite v1.27.0 // indirect
+	modernc.org/strutil v1.1.3 // indirect
+	modernc.org/token v1.0.1 // indirect
 )

go.sum

@@ -1,12 +1,75 @@
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
+github.com/jchv/go-webview2 v0.0.0-20221223143126-dc24628cff85 h1:t6lhRbwURcdWgp8OsJlq6sOfWMOXP21YuiCicjutHv4=
+github.com/jchv/go-webview2 v0.0.0-20221223143126-dc24628cff85/go.mod h1:/BNVc0Sw3Wj6Sz9uSxPwhCEUhhWs92hPde75K2YV24A=
+github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5 h1:pdFFlHXY9tZXmJz+tRSm1DzYEH4ebha7cffmm607bMU=
+github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-sqlite3 v1.14.18 h1:JL0eqdCOq6DJVNPSvArO/bIV9/P7fbGrV00LZHc+5aI=
 github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210218145245-beda7e5e158e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
+golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78 h1:M8tBwCtWD/cZV9DZpFYRUgaymAYAr+aIUTWzDaM3uPs=
+golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gorm.io/driver/sqlite v1.5.4 h1:IqXwXi8M/ZlPzH/947tn5uik3aYQslP9BVveoax0nV0=
 gorm.io/driver/sqlite v1.5.4/go.mod h1:qxAuCol+2r6PannQDpOP1FP6ag3mKi4esLnB/jHed+4=
 gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls=
 gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI=
+lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
+modernc.org/cc/v3 v3.40.0 h1:P3g79IUS/93SYhtoeaHW+kRCIrYaxJ27MFPv+7kaTOw=
+modernc.org/cc/v3 v3.40.0/go.mod h1:/bTg4dnWkSXowUO6ssQKnOV0yMVxDYNIsIrzqTFDGH0=
+modernc.org/ccgo/v3 v3.16.13 h1:Mkgdzl46i5F/CNR/Kj80Ri59hC8TKAhZrYSaqvkwzUw=
+modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY=
+modernc.org/libc v1.29.0 h1:tTFRFq69YKCF2QyGNuRUQxKBm1uZZLubf6Cjh/pVHXs=
+modernc.org/libc v1.29.0/go.mod h1:DaG/4Q3LRRdqpiLyP0C2m1B8ZMGkQ+cCgOIjEtQlYhQ=
+modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
+modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
+modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E=
+modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E=
+modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
+modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
+modernc.org/sqlite v1.27.0 h1:MpKAHoyYB7xqcwnUwkuD+npwEa0fojF0B5QRbN+auJ8=
+modernc.org/sqlite v1.27.0/go.mod h1:Qxpazz0zH8Z1xCFyi5GSL3FzbtZ3fvbjmywNogldEW0=
+modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY=
+modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
+modernc.org/token v1.0.1 h1:A3qvTqOwexpfZZeyI0FeGPDlSWX5pjZu9hF4lU+EKWg=
+modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=

internal/database/client.go

@@ -2,17 +2,22 @@ package database
 
 import (
 	"encoding/json"
+	"fmt"
 	"log"
 	"net/http"
+	"os"
 	"time"
 
-	"github.com/gorilla/mux"
-	"gorm.io/driver/sqlite"
-	"gorm.io/gorm"
+	"database/sql"
+
+	_ "modernc.org/sqlite"
 )
 
-var Instance *gorm.DB
+var DB *sql.DB
 var err error
+var (
+	pwd, _ = os.Getwd()
+)
 
 type Timeframe struct {
 	ID       string `json:"id"`
@@ -30,76 +35,61 @@ type Config struct {
 }
 
 func Connect() {
-	Instance, err = gorm.Open(sqlite.Open("./internal/database/timetrack.sqlite"), &gorm.Config{})
+	DB, err = sql.Open("sqlite", pwd+"/timetrack.sqlite")
 	if err != nil {
 		log.Fatal(err)
 		panic("Cannot connect to DB")
 	}
 	log.Println("Connected to Database...")
 }
 
-func Migrate() {
-	Instance.AutoMigrate(&Timeframe{})
-	log.Println("Database Migration Completed...")
-}
-
 func checkIfEntryExists(entryID string) bool {
-	var entry Timeframe
-	Instance.First(&entry, entryID)
-	return entry.ID != ""
+	return true
 }
 
 func CreateEntry(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json")
-	var entry Timeframe
-	json.NewDecoder(r.Body).Decode(&entry)
-	Instance.Create(&entry)
-	json.NewEncoder(w).Encode(entry)
+
 }
 
 func GetEntryByID(w http.ResponseWriter, r *http.Request) {
-	entryID := mux.Vars(r)["id"]
-	if !checkIfEntryExists(entryID) {
-		json.NewEncoder(w).Encode("Entry Not Found!")
-		return
-	}
-	var entry Timeframe
-	Instance.First(&entry, entryID)
-	w.Header().Set("Content-Type", "application/json")
-	json.NewEncoder(w).Encode(entry)
+
 }
 
 func GetEntries(w http.ResponseWriter, r *http.Request) {
-	var entries []Timeframe
-	Instance.Find(&entries)
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(entries)
+	var timeframes []Timeframe = []Timeframe{}
+	var timef Timeframe
+
+	rows, _ := DB.Query("SELECT * FROM timeframes")
+
+	for rows.Next() {
+		timef = Timeframe{}
+		rows.Scan(&timef.ID, &timef.Year, &timef.Month, &timef.Day,
+			&timef.Start, &timef.End, &timef.Duration, &timef.Project)
+		timeframes = append(timeframes, timef)
+		log.Printf("ID: %s", timef.ID)
+	}
+
+	err = json.NewEncoder(w).Encode(&timeframes)
+	if err != nil {
+		fmt.Print(err)
+	}
 }
 
-func UpdateEntry(w http.ResponseWriter, r *http.Request) {
-	entryID := mux.Vars(r)["id"]
-	if !checkIfEntryExists(entryID) {
-		json.NewEncoder(w).Encode("Entry Not Found!")
-		return
+func GetVersion() {
+	var version string
+	err = DB.QueryRow("SELECT SQLITE_VERSION()").Scan(&version)
+
+	if err != nil {
+		log.Fatal(err)
 	}
-	var entry Timeframe
-	Instance.First(&entry, entryID)
-	json.NewDecoder(r.Body).Decode(&entry)
-	Instance.Save(&entry)
-	w.Header().Set("Content-Type", "application/json")
-	json.NewEncoder(w).Encode(entry)
+
+	fmt.Println(version)
+}
+
+func UpdateEntry(w http.ResponseWriter, r *http.Request) {
+
 }
 
 func DeleteEntry(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json")
-	entryID := mux.Vars(r)["id"]
-	if !checkIfEntryExists(entryID) {
-		w.WriteHeader(http.StatusNotFound)
-		json.NewEncoder(w).Encode("Entry Not Found!")
-		return
-	}
-	var entry Timeframe
-	Instance.Delete(&entry, entryID)
-	json.NewEncoder(w).Encode("Entry Deleted Succesfully!")
+
 }

internal/templates/index.html

@@ -7,7 +7,37 @@
     <link rel="stylesheet" href="/tailwind.css"/>
 </head>
 <body>
-    <h1 class="text-3xl font-bold text-teal-500">Hello World!</h1>
-    <button class="btn btn-primary">Button</button>
-</body>
+    <div class="navbar bg-base-100">
+        <div class="flex-1">
+            <a class="text-3xl font-bold px-3">TimeTracker</a>
+            <a class="btn btn-ghost text-xl">Days</a>
+            <a class="btn btn-ghost text-xl">Projects</a>
+            <a class="btn btn-ghost text-xl" href="/layout">Template Test</a>
+        </div>
+    </div>
+    <div class="container p-5">
+        <form>
+            <div class="join p-2 border-2 border-slate-500">
+                <div class="join-item px-2">
+                    <a class="text-xl">Start</a>
+                    <input type="time" id="start" name="start" min="06:00" max="20:00" required />
+                </div>
+                <div class="join-item px-2">
+                    <a class="text-xl">End</a>
+                    <input type="time" id="end" name="end" min="06:00" max="20:00" required />
+                </div>
+                <select class="join-item select w-full max-w-xs" name="project">
+                    <option disabled selected>Pick your project</option>
+                    <option>Homer</option>
+                    <option>Marge</option>
+                    <option>Bart</option>
+                    <option>Lisa</option>
+                    <option>Maggie</option>
+                </select>
+                <button class="btn join-item">Add</button>
+            </div>  
+        </form>
+        
+    </div>
+    </body>
 </html>