Lotta of freaking changes 😎😎😎

No chnages in code or implementation, just file &
codebase re-arrangements. Factoring for wails
desktop app.

Signed-off-by: tobigiwa <[email protected]>

Author: tobyweb3x

desktop/LiScreMon.desktop LiScreMon.desktop

@@ -1,11 +1,13 @@
-module frontend
+module agent
 
 go 1.22.1
 
 replace pkg v0.0.0 => ../pkg
 
 require (
 	github.com/a-h/templ v0.2.747
+	github.com/go-echarts/go-echarts/v2 v2.4.0-rc2
+	github.com/google/uuid v1.6.0
 	pkg v0.0.0
 )
 
@@ -14,7 +16,6 @@ require (
 	github.com/gen2brain/beeep v0.0.0-20240516210008-9c006672e7f4 // indirect
 	github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
-	github.com/google/uuid v1.6.0 // indirect
 	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
 	github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af // indirect
 	golang.org/x/sys v0.21.0 // indirect

frontend/go.mod agent/go.mod

@@ -2,8 +2,12 @@ github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc h1:7D+Bh06CRPCJO3gr
 github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/a-h/templ v0.2.747 h1:D0dQ2lxC3W7Dxl6fxQ/1zZHBQslSkTSvl5FxP/CfdKg=
 github.com/a-h/templ v0.2.747/go.mod h1:69ObQIbrcuwPCU32ohNaWce3Cb7qM5GMiqN1K+2yop4=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/gen2brain/beeep v0.0.0-20240516210008-9c006672e7f4 h1:ygs9POGDQpQGLJPlq4+0LBUmMBNox1N4JSpw+OETcvI=
 github.com/gen2brain/beeep v0.0.0-20240516210008-9c006672e7f4/go.mod h1:0W7dI87PvXJ1Sjs0QPvWXKcQmNERY77e8l7GFhZB/s4=
+github.com/go-echarts/go-echarts/v2 v2.4.0-rc2 h1:Od2aC5TsRf+HKoh0MHkdg2zIUXPfzB9GC4kEWTLSHAk=
+github.com/go-echarts/go-echarts/v2 v2.4.0-rc2/go.mod h1:56YlvzhW/a+du15f3S2qUGNDfKnFOeJSThBIrVFHDtI=
 github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4 h1:qZNfIGkIANxGv/OqtnntR4DfOY2+BgwR60cAcu/i3SE=
 github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4/go.mod h1:kW3HQ4UdaAyrUCSSDR4xUzBKW6O2iA4uHhk7AtyYp10=
 github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
@@ -14,8 +18,14 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af h1:6yITBqGTE2lEeTPG04SN9W+iWHCRyHqlVYILiSXziwk=
 github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af/go.mod h1:4F09kP5F+am0jAwlQLddpoMDM+iewkxxt6nxUQ5nq5o=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
 golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
+gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

frontend/go.sum agent/go.sum

@@ -1,4 +1,4 @@
-package webserver
+package backend
 
 import (
 	"context"

pkg/chart/barchart.go agent/internal/backend/chart/barchart.go

@@ -1,4 +1,4 @@
-package webserver
+package backend
 
 import (
 	"fmt"

pkg/chart/barchat.appStat.go agent/internal/backend/chart/barchat.appStat.go

@@ -1,16 +1,16 @@
-package webserver
+package backend
 
 import (
+	"agent/internal/backend/chart"
 	"context"
 	"errors"
 	"fmt"
 	"net/http"
-	"pkg/chart"
 	helperFuncs "pkg/helper"
 	"pkg/types"
 	"strings"
 
-	views "views/components"
+	views "agent/internal/frontend/components"
 
 	"github.com/a-h/templ"
 )

pkg/chart/barchat.weekStat.go agent/internal/backend/chart/barchat.weekStat.go

@@ -1,10 +1,10 @@
-package webserver
+package backend
 
 import (
+	views "agent/internal/frontend/components"
 	"context"
 	"log/slog"
 	"net/http"
-	views "views/components"
 )
 
 func (a *App) IndexPageHandler(w http.ResponseWriter, r *http.Request) {

pkg/chart/chart.go agent/internal/backend/chart/chart.go

@@ -1,4 +1,4 @@
-package webserver
+package backend
 
 import (
 	"context"
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	views "views/components"
+	views "agent/internal/frontend/components"
 
 	"github.com/a-h/templ"
 	"github.com/google/uuid"
@@ -235,6 +235,10 @@ func (a *App) newAppLimitHandler(w http.ResponseWriter, r *http.Request) {
 	hours, minutes := time.Duration(hrs)*time.Hour, time.Duration(min)*time.Minute
 
 	task.AppLimit.Limit = hours.Hours() + minutes.Hours()
+	if task.AppLimit.Limit <= 0 {
+		a.clientError(w, http.StatusBadRequest, fmt.Errorf("cannot watch for zero-time limit"))
+		return
+	}
 	task.AppLimit.Today = helperFuncs.Today()
 	task.UUID = uuid.New()
 
@@ -243,16 +247,22 @@ func (a *App) newAppLimitHandler(w http.ResponseWriter, r *http.Request) {
 		ReminderAndLimitRequest: task,
 	}
 
-	if _, err = a.commWithDaemonService(msg); err != nil {
+	if msg, err = a.commWithDaemonService(msg); err != nil {
 		if strings.Contains(err.Error(), types.ErrLimitAppExist.Error()) {
+			// return
 		}
 
 		a.serverError(w, err)
 		return
 	}
-	fmt.Println(r.Method)
-	http.Redirect(w, r, "/appLimits", http.StatusCreated)
 
+	allDailyAppLimitTask := msg.ReminderAndLimitResponse.AllTask
+	if len(allDailyAppLimitTask) == 0 {
+		views.RenderTasks(true, templ.NopComponent).Render(context.TODO(), w)
+		return
+	}
+
+	views.RenderTasks(false, views.AppLimitTasks(allDailyAppLimitTask)).Render(context.TODO(), w)
 }
 
 func (a *App) removeTask(w http.ResponseWriter, r *http.Request) {

pkg/chart/piechart.dayStat.go agent/internal/backend/chart/piechart.dayStat.go

@@ -1,14 +1,14 @@
-package webserver
+package backend
 
 import (
+	"agent/internal/backend/chart"
+	views "agent/internal/frontend/components"
 	"context"
 	"errors"
 	"fmt"
 	"net/http"
-	"pkg/chart"
 	"pkg/types"
 	"strings"
-	views "views/components"
 
 	"github.com/a-h/templ"
 )

pkg/chart/piechart.go agent/internal/backend/chart/piechart.go

@@ -1,4 +1,4 @@
-package webserver
+package backend
 
 import (
 	"fmt"

browser/server/closeConn.handler.go agent/internal/backend/closeConn.handler.go

@@ -1,18 +1,18 @@
-package webserver
+package backend
 
 import (
+	"agent/internal/backend/chart"
 	"context"
 	"errors"
 	"fmt"
 	"net/http"
-	"pkg/chart"
 	"pkg/types"
 	"strings"
 	"time"
 
 	helperFuncs "pkg/helper"
 
-	views "views/components"
+	views "agent/internal/frontend/components"
 
 	"github.com/a-h/templ"
 )

browser/server/errors.go agent/internal/backend/errors.go

@@ -1,4 +1,4 @@
-package webserver
+package backend
 
 import "net/http"
 
@@ -8,7 +8,7 @@ func (a *App) Routes() *http.ServeMux {
 	tmp := http.FileServer(http.Dir("/tmp/"))
 	mux.Handle("/tmp/", http.StripPrefix("/tmp", tmp))
 
-	fs := http.FileServer(http.Dir("../frontend/assets"))
+	fs := http.FileServer(http.Dir("../agent/internal/frontend/assets"))
 	mux.Handle("/assets/", http.StripPrefix("/assets", fs))
 
 	// screentimePage

browser/server/handler.day.dayStat.go agent/internal/backend/handler.day.dayStat.go

@@ -1,4 +1,4 @@
-package webserver
+package backend
 
 import (
 	"bytes"

browser/server/handler.page.index.go agent/internal/backend/handler.page.index.go

@@ -11,15 +11,15 @@ templ TasksPage(taskType string, allApps []types.AppIconCategoryAndCmdLine) {
 			<link rel="stylesheet" href="/assets/styles/index.css"/>
 			<link rel="stylesheet" href="/assets/styles/tasks.css"/>
 			<link rel="stylesheet" href="/assets/styles/dd.min.css"/>
-			<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.13.3/themes/base/jquery-ui.min.css" crossorigin="anonymous" referrerpolicy="no-referrer"/>
-			// <link rel="styleshhet" href="/assets/styles/jquery-ui.css"/>
-			<script src="assets/javascript/script.out.js"></script>
-			<script src="assets/libraries/htmx.min.js"></script>
-			<script src="assets/libraries/dd.min.js"></script>
-			<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.13.3/jquery-ui.min.js" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-			// <script src="assets/libraries/jquery-ui.js"></script>
-			<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-			// <script src="assets/libraries/jquery-3.7.1.js"></script>
+			// <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.13.3/themes/base/jquery-ui.min.css" crossorigin="anonymous" referrerpolicy="no-referrer"/>
+			<link rel="stylesheet" href="/assets/styles/jquery-ui.min.css"/>
+			<script src="/assets/javascript/script.out.js"></script>
+			<script src="/assets/libraries/htmx.min.js"></script>
+			<script src="/assets/libraries/dd.min.js"></script>
+			// <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+			<script src="/assets/libraries/jquery-3.7.1.js"></script>
+			// <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.13.3/jquery-ui.min.js" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+			<script src="/assets/libraries/jquery-ui.js"></script>
 			<title>ScreenTime</title>
 		</head>
 		<body>
@@ -77,22 +77,25 @@ templ reminderAndLimitDialog(allApps []types.AppIconCategoryAndCmdLine) {
 				modal: true,
 				buttons: {
 					"Create AppLimit": function() {
-						console.log(form[0]);
-						form[0].submit();
+						// $("#appLimit-form")[0];
+						// htmx.trigger(form, 'submit');
+						appLimitdialog.dialog( "close" );
+						console.log(createLimitButton)
+						var createLimitButton = $("#appLimit-form .submit")[0];
+						createLimitButton.click()
 					},
 					Cancel: function() {
 						appLimitdialog.dialog( "close" );
 					}
 				},
 				close: function() {
-					form[ 0 ].reset();
+					form[0].reset();
 				}
 			});
 
 			form = appLimitdialog.find( "form" );
 
 			$("#limit-dialog__btn").button().click(function() {
-				console.log("clicked");
 				appLimitdialog.dialog("open");
 			});
 	</script>
@@ -294,7 +297,7 @@ templ reminderDialog() {
 templ limitDialog(allApp []types.AppIconCategoryAndCmdLine) {
 	// <dialog class="limit-dialog">
 	<div id="appLimit-dialog">
-		<form hx-post="/newAppLimit" hx-swap="none" hx-select-oob="#task-holder:outerHTML">
+		<form id="appLimit-form" hx-post="/newAppLimit" hx-swap="none" hx-select-oob="#task-holder:outerHTML">
 			<select
 				name="app"
 				is="ms-dropdown"
@@ -350,7 +353,7 @@ templ limitDialog(allApp []types.AppIconCategoryAndCmdLine) {
 				</div>
 			</div>
 			<div class="button-container">
-				<button type="submit">Create Limit</button>
+				<button class="submit" type="submit">Create Limit</button>
 				<button
 					class="close-modal"
 					formmethod="dialog"