lift version

backend/dbRequest/dbRequest.go

@@ -1,6 +1,7 @@
 package dbRequest
 
 import (
+	"backend/models"
 	"fmt"
 	"net/http"
 
@@ -10,25 +11,22 @@ import (
 var DBCreate string = `CREATE TABLE IF NOT EXISTS users (
 						id INTEGER PRIMARY KEY AUTOINCREMENT,
 						username TEXT NOT NULL,
+						role TEXT NOT NULL,
 						password TEXT NOT NULL
 						);`
 
-var DBNewUser string = `INSERT INTO users (username, password) VALUES (?, ?)`
+var DBNewUser string = `INSERT INTO users (username, role, password) VALUES (?, ?, ?)`
-var DBQueryPassword string = `SELECT password FROM users WHERE username = ?`
+var DBQueryPassword string = `SELECT role, password FROM users WHERE username = ?`
 var DBUserLookup string = `SELECT EXISTS(SELECT 1 FROM users WHERE username = ?)`
 var DBRemoveUser string = `DELETE FROM users WHERE username = $1`
 
 func CheckDBError(c *gin.Context, username string, err error) bool {
 	if err != nil {
 		if err.Error() == "sql: no rows in result set" {
-			c.JSON(http.StatusBadRequest, gin.H{
+			c.JSON(http.StatusBadRequest, models.NewJsonErrorMessageResponse(fmt.Sprintf("no user '%s' found", username)))
-				"error": fmt.Sprintf("no user '%s' found", username),
-			})
 			return true
 		}
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-			"error": err.Error(),
-		})
 		return true
 	}
 	return false

backend/dist/cfg/defaultConfigurations.json

@@ -0,0 +1,28 @@
+{
+    "drivers":[{
+        "name":"ArtNet",
+        "description":"ArtNet Driver DMX over UDP/IP",
+        "executablePath":"bin/tecamino-driver-artNet-linux-arm64",
+        "workingDirectory":"bin",
+        "arguments":[
+            "-cfg './cfg'",
+            "-serverIp '127.0.0.1'",
+            "-serverPort 8100",
+            "-port 8200"
+        ]
+    },
+    {
+        "name":"OSC Driver",
+        "description":"OSC Driver Music Mixer over UDP/IP",
+        "executablePath":"bin/tecamino-driver-osc-linux-arm64",
+        "workingDirectory":"bin",
+        "arguments":[
+            "-cfg './cfg'",
+            "-serverIp '127.0.0.1'",
+            "-serverPort 8100",
+            "-port 8300"    
+        ]
+    } 
+
+    ]
+}

backend/drivers/drivers.go

@@ -0,0 +1,36 @@
+package drivers
+
+import (
+	"backend/models"
+	"encoding/json"
+	"net/http"
+	"os"
+
+	"github.com/gin-gonic/gin"
+)
+
+type DriverHandler struct {
+	driversConfig string
+}
+
+func NewDriverHandler(cfgDir string) *DriverHandler {
+	return &DriverHandler{driversConfig: cfgDir}
+}
+
+func (dH *DriverHandler) GetDriverList(c *gin.Context) {
+	content, err := os.ReadFile(dH.driversConfig)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
+		return
+	}
+
+	var data struct {
+		Drivers []models.Drivers `json:"drivers"`
+	}
+	err = json.Unmarshal(content, &data)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
+		return
+	}
+	c.JSON(http.StatusOK, data.Drivers)
+}

backend/login/login.go

@@ -19,25 +19,19 @@ import (
 func (lm *LoginManager) AddUser(c *gin.Context) {
 	body, err := io.ReadAll(c.Request.Body)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-			"error": err.Error(),
-		})
 		return
 	}
 
 	user := models.User{}
 	err = json.Unmarshal(body, &user)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-			"error": err.Error(),
-		})
 		return
 	}
 
 	if !user.IsValid() {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorMessageResponse("user empty"))
-			"error": "user empty",
-		})
 		return
 	}
 
@@ -54,20 +48,16 @@ func (lm *LoginManager) AddUser(c *gin.Context) {
 	}
 
 	if exists {
-		c.JSON(http.StatusOK, gin.H{
+		c.JSON(http.StatusOK, models.NewJsonErrorMessageResponse(fmt.Sprintf("user '%s' exists already", user.Name)))
-			"error": fmt.Sprintf("user '%s' exists already", user.Name),
-		})
 		return
 	}
 
 	hash, err := utils.HashPassword(user.Password)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-			"error": err.Error(),
-		})
 		return
 	}
-	if _, err := db.Exec(dbRequest.DBNewUser, user.Name, hash); dbRequest.CheckDBError(c, user.Name, err) {
+	if _, err := db.Exec(dbRequest.DBNewUser, user.Role, user.Name, hash); dbRequest.CheckDBError(c, user.Name, err) {
 		return
 	}
 
@@ -79,25 +69,19 @@ func (lm *LoginManager) AddUser(c *gin.Context) {
 func (lm *LoginManager) RemoveUser(c *gin.Context) {
 	body, err := io.ReadAll(c.Request.Body)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-			"error": err.Error(),
-		})
 		return
 	}
 
 	user := models.User{}
 	err = json.Unmarshal(body, &user)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-			"error": err.Error(),
-		})
 		return
 	}
 
 	if !user.IsValid() {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorMessageResponse("user empty"))
-			"error": "user empty",
-		})
 		return
 	}
 
@@ -108,14 +92,12 @@ func (lm *LoginManager) RemoveUser(c *gin.Context) {
 	defer db.Close()
 
 	var storedPassword string
-	if err := db.QueryRow(dbRequest.DBQueryPassword, user.Name).Scan(&storedPassword); dbRequest.CheckDBError(c, user.Name, err) {
+	if err := db.QueryRow(dbRequest.DBQueryPassword, user.Name).Scan(&storedPassword, &user.Role); dbRequest.CheckDBError(c, user.Name, err) {
 		return
 	}
 
 	if !utils.CheckPassword(user.Password, storedPassword) {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorMessageResponse("wrong password"))
-			"error": "wrong password",
-		})
 		return
 	}
 
@@ -131,27 +113,19 @@ func (lm *LoginManager) RemoveUser(c *gin.Context) {
 func (lm *LoginManager) Login(c *gin.Context) {
 	body, err := io.ReadAll(c.Request.Body)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-			"error": err.Error(),
-		})
 		return
 	}
 
 	user := models.User{}
 	err = json.Unmarshal(body, &user)
 	if err != nil {
-		fmt.Println(2)
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-
-		c.JSON(http.StatusBadRequest, gin.H{
-			"error": err.Error(),
-		})
 		return
 	}
 
 	if !user.IsValid() {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorMessageResponse("user empty"))
-			"error": "user empty",
-		})
 		return
 	}
 
@@ -162,41 +136,36 @@ func (lm *LoginManager) Login(c *gin.Context) {
 	defer db.Close()
 
 	var storedPassword string
-	if err := db.QueryRow(dbRequest.DBQueryPassword, user.Name).Scan(&storedPassword); dbRequest.CheckDBError(c, user.Name, err) {
+	if err := db.QueryRow(dbRequest.DBQueryPassword, user.Name).Scan(&user.Role, &storedPassword); dbRequest.CheckDBError(c, user.Name, err) {
 		return
 	}
 
 	if !utils.CheckPassword(user.Password, storedPassword) {
-		fmt.Println(2, user.Password)
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorMessageResponse("wrong password"))
-		c.JSON(http.StatusBadRequest, gin.H{
-			"error": "wrong password",
-		})
 		return
 	}
 
 	// Create token
 	token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
 		"username": user.Name,
-		"exp":      time.Now().Add(time.Hour * 72).Unix(), // expires in 72h
+		"role":     user.Role,
+		"exp":      time.Now().Add(time.Minute * 60).Unix(), // expires in 72h
 	})
 
 	secret, err := utils.GenerateJWTSecret(32) // 32 bytes = 256 bits
 	if err != nil {
-		c.JSON(http.StatusInternalServerError, gin.H{
+		c.JSON(http.StatusInternalServerError, models.NewJsonErrorMessageResponse("error generate jwt token"))
-			"error": "error generate jwt token"})
 		return
 	}
 
 	// Sign and get the complete encoded token as a string
 	tokenString, err := token.SignedString(secret)
 	if err != nil {
-		c.JSON(http.StatusInternalServerError, gin.H{
+		c.JSON(http.StatusInternalServerError, models.NewJsonErrorMessageResponse("Could not generate token"))
-			"error": "Could not generate token"})
 		return
 	}
 
 	c.JSON(http.StatusOK, models.User{
-		Name:  user.Name,
 		Token: tokenString,
 	})
 }

backend/login/manager.go

@@ -37,7 +37,7 @@ func NewLoginManager(dir string) (*LoginManager, error) {
 		if err != nil {
 			return nil, err
 		}
-		_, err = db.Exec(dbRequest.DBNewUser, "admin", hash)
+		_, err = db.Exec(dbRequest.DBNewUser, "admin", "admin", hash)
 		if err != nil {
 			return nil, err
 		}

backend/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"backend/drivers"
 	"backend/login"
 	"backend/models"
 	secenes "backend/scenes"
@@ -27,6 +28,8 @@ func main() {
 	flag.Var(&allowOrigins, "allowOrigin", "Allowed origin (can repeat this flag)")
 
 	spa := flag.String("spa", "./dist/spa", "quasar spa files")
+	cfgDir := flag.String("cfg", "./cfg", "config dir")
+	driversCfg := flag.String("drivers", "defaultConfigurations.json", "drivers config file name")
 	workingDir := flag.String("workingDirectory", ".", "quasar spa files")
 	ip := flag.String("ip", "0.0.0.0", "server listening ip")
 	port := flag.Uint("port", 9500, "server listening port")
@@ -69,6 +72,9 @@ func main() {
 	//new scenes handler
 	scenesHandler := secenes.NewScenesHandler("")
 
+	//new scenes handler
+	driversHandler := drivers.NewDriverHandler(filepath.Join(*cfgDir, *driversCfg))
+
 	// new server
 	s := server.NewServer()
 
@@ -92,6 +98,7 @@ func main() {
 	api := s.Routes.Group("/api")
 	//set routes
 	api.GET("/loadScenes", scenesHandler.LoadScenes)
+	api.GET("/allDrivers", driversHandler.GetDriverList)
 	api.POST("/login", loginManager.Login)
 	api.POST("/user/add", loginManager.AddUser)
 	api.POST("/saveScene", scenesHandler.SaveScene)
@@ -104,7 +111,7 @@ func main() {
 	s.Routes.NoRoute(func(c *gin.Context) {
 		// Disallow fallback for /api paths
 		if strings.HasPrefix(c.Request.URL.Path, "/api") {
-			c.JSON(http.StatusNotFound, gin.H{"error": "API endpoint not found"})
+			c.JSON(http.StatusNotFound, models.NewJsonErrorMessageResponse("API endpoint not found"))
 			return
 		}
 		// Try to serve file from SPA directory

backend/models/drivers.go

@@ -0,0 +1,9 @@
+package models
+
+type Drivers struct {
+	Name             string   `json:"name"`
+	Description      string   `json:"description"`
+	ExecutablePath   string   `json:"executablePath,omitempty"`
+	WorkingDirectory string   `json:"workingDirectory,omitempty"`
+	Arguments        []string `json:"arguments,omitempty"`
+}

backend/models/jsonResponse.go

@@ -0,0 +1,20 @@
+package models
+
+type JsonResponse struct {
+	Error   bool   `json:"error,omitempty"`
+	Message string `json:"message,omitempty"`
+}
+
+func NewJsonErrorMessageResponse(msg string) JsonResponse {
+	return JsonResponse{
+		Error:   true,
+		Message: msg,
+	}
+}
+
+func NewJsonErrorResponse(err error) JsonResponse {
+	return JsonResponse{
+		Error:   true,
+		Message: err.Error(),
+	}
+}

backend/models/lightBar.go

@@ -1,3 +0,0 @@
-package models
-
-type LightBar []Value

backend/models/movingHead.go

@@ -1,3 +0,0 @@
-package models
-
-type MovingHead []Value

backend/models/user.go

@@ -2,6 +2,7 @@ package models
 
 type User struct {
 	Name     string `json:"user"`
+	Role     string `json:"role"`
 	Password string `json:"password,omitempty"`
 	Token    string `json:"token,omitempty"`
 }

backend/models/values.go

@@ -1,7 +1,9 @@
 package models
 
 type Values struct {
-	MovingHead *MovingHead `json:"movingHead"`
+	Stagelights []Value `json:"stageLights,omitempty"`
-	LightBar   *LightBar   `json:"lightBar"`
+	LightBar    []Value `json:"lightBar,omitempty"`
-	Value      any         `json:"value"`
+	FloogLights []Value `json:"floodLights,omitempty"`
+	MovingHead  []Value `json:"movingHead,omitempty"`
+	Value       any     `json:"value"`
 }

backend/scenes/scenes.go

@@ -31,45 +31,35 @@ func NewScenesHandler(dir string) *ScenesHandler {
 func (sh *ScenesHandler) SaveScene(c *gin.Context) {
 	body, err := io.ReadAll(c.Request.Body)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-			"error": err.Error(),
-		})
 		return
 	}
 
 	var scene models.Scene
 	err = json.Unmarshal(body, &scene)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-			"error": err.Error(),
-		})
 		return
 	}
 
 	if _, err := os.Stat(path.Join(sh.dir)); err != nil {
 		err := os.MkdirAll(sh.dir, 0755)
 		if err != nil {
-			c.JSON(http.StatusBadRequest, gin.H{
+			c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-				"error": err.Error(),
-			})
 			return
 		}
 	}
 
 	f, err := os.OpenFile(path.Join(sh.dir, scene.Name+".scene"), os.O_CREATE|os.O_TRUNC|os.O_RDWR, 0644)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-			"error": err.Error(),
-		})
 		return
 	}
 	defer f.Close()
 
 	_, err = f.Write(body)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-			"error": err.Error(),
-		})
 		return
 	}
 
@@ -81,26 +71,20 @@ func (sh *ScenesHandler) SaveScene(c *gin.Context) {
 func (sh *ScenesHandler) DeleteScene(c *gin.Context) {
 	body, err := io.ReadAll(c.Request.Body)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-			"error": err.Error(),
-		})
 		return
 	}
 
 	var scene models.Scene
 	err = json.Unmarshal(body, &scene)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-			"error": err.Error(),
-		})
 		return
 	}
 
 	err = os.Remove(path.Join(sh.dir, scene.Name+".scene"))
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-			"error": err.Error(),
-		})
 		return
 	}
 
@@ -114,26 +98,20 @@ func (sh *ScenesHandler) LoadScenes(c *gin.Context) {
 
 	files, err := utils.FindAllFiles("./scenes", ".scene")
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-			"error": err.Error(),
-		})
 		return
 	}
 
 	for _, f := range files {
 		content, err := os.ReadFile(f)
 		if err != nil {
-			c.JSON(http.StatusBadRequest, gin.H{
+			c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-				"error": err.Error(),
-			})
 			return
 		}
 		var scene models.Scene
 		err = json.Unmarshal(content, &scene)
 		if err != nil {
-			c.JSON(http.StatusBadRequest, gin.H{
+			c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-				"error": err.Error(),
-			})
 			return
 		}
 		sceneMap[scene.Name] = scene
@@ -160,9 +138,7 @@ func (sh *ScenesHandler) LoadScenes(c *gin.Context) {
 func (sh *ScenesHandler) LoadScene(c *gin.Context) {
 	body, err := io.ReadAll(c.Request.Body)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-			"error": err.Error(),
-		})
 		return
 	}
 
@@ -170,17 +146,13 @@ func (sh *ScenesHandler) LoadScene(c *gin.Context) {
 
 	err = json.Unmarshal(body, &scene)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-			"error": err.Error(),
-		})
 		return
 	}
 
 	files, err := utils.FindAllFiles("./scenes", ".scene")
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
+		c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-			"error": err.Error(),
-		})
 		return
 	}
 
@@ -190,24 +162,18 @@ func (sh *ScenesHandler) LoadScene(c *gin.Context) {
 		}
 		content, err := os.ReadFile(f)
 		if err != nil {
-			c.JSON(http.StatusBadRequest, gin.H{
+			c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-				"error": err.Error(),
-			})
 			return
 		}
 
 		err = json.Unmarshal(content, &scene)
 		if err != nil {
-			c.JSON(http.StatusBadRequest, gin.H{
+			c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
-				"error": err.Error(),
-			})
 			return
 		}
 		c.JSON(http.StatusOK, scene)
 		return
 	}
 
-	c.JSON(http.StatusBadRequest, gin.H{
+	c.JSON(http.StatusBadRequest, models.NewJsonErrorMessageResponse(fmt.Sprintf("scene '%s' not found", scene.Name)))
-		"error": fmt.Errorf("scene '%s' not found", scene.Name),
-	})
 }

package-lock.json

@@ -1,16 +1,18 @@
 {
   "name": "lightcontrol",
-  "version": "0.0.14",
+  "version": "0.0.21",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "lightcontrol",
-      "version": "0.0.14",
+      "version": "0.0.21",
       "hasInstallScript": true,
       "dependencies": {
         "@quasar/extras": "^1.16.4",
         "axios": "^1.10.0",
+        "jwt-decode": "^4.0.0",
+        "pinia": "^3.0.3",
         "quasar": "^2.16.0",
         "vue": "^3.4.18",
         "vue-router": "^4.0.12"
@@ -1939,6 +1941,30 @@
       "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==",
       "license": "MIT"
     },
+    "node_modules/@vue/devtools-kit": {
+      "version": "7.7.7",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.7.tgz",
+      "integrity": "sha512-wgoZtxcTta65cnZ1Q6MbAfePVFxfM+gq0saaeytoph7nEa7yMXoi6sCPy4ufO111B9msnw0VOWjPEFCXuAKRHA==",
+      "license": "MIT",
+      "dependencies": {
+        "@vue/devtools-shared": "^7.7.7",
+        "birpc": "^2.3.0",
+        "hookable": "^5.5.3",
+        "mitt": "^3.0.1",
+        "perfect-debounce": "^1.0.0",
+        "speakingurl": "^14.0.1",
+        "superjson": "^2.2.2"
+      }
+    },
+    "node_modules/@vue/devtools-shared": {
+      "version": "7.7.7",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.7.tgz",
+      "integrity": "sha512-+udSj47aRl5aKb0memBvcUG9koarqnxNM5yjuREvqwK6T3ap4mn3Zqqc17QrBFTqSMjr3HK1cvStEZpMDpfdyw==",
+      "license": "MIT",
+      "dependencies": {
+        "rfdc": "^1.4.1"
+      }
+    },
     "node_modules/@vue/eslint-config-prettier": {
       "version": "10.2.0",
       "resolved": "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-10.2.0.tgz",
@@ -2378,6 +2404,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/birpc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/birpc/-/birpc-2.5.0.tgz",
+      "integrity": "sha512-VSWO/W6nNQdyP520F1mhf+Lc2f8pjGQOtoHHm7Ze8Go1kX7akpVIrtTa0fn+HB0QJEDVacl6aO08YE0PgXfdnQ==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
     "node_modules/bl": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
@@ -2998,6 +3033,21 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/copy-anything": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-3.0.5.tgz",
+      "integrity": "sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==",
+      "license": "MIT",
+      "dependencies": {
+        "is-what": "^4.1.8"
+      },
+      "engines": {
+        "node": ">=12.13"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mesqueeb"
+      }
+    },
     "node_modules/core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
@@ -4398,6 +4448,12 @@
         "he": "bin/he"
       }
     },
+    "node_modules/hookable": {
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz",
+      "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==",
+      "license": "MIT"
+    },
     "node_modules/html-minifier-terser": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-7.2.0.tgz",
@@ -4696,6 +4752,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-what": {
+      "version": "4.1.16",
+      "resolved": "https://registry.npmjs.org/is-what/-/is-what-4.1.16.tgz",
+      "integrity": "sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.13"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mesqueeb"
+      }
+    },
     "node_modules/is-wsl": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
@@ -4819,6 +4887,15 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/jwt-decode": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-4.0.0.tgz",
+      "integrity": "sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/keyv": {
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -5132,6 +5209,12 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
+    "node_modules/mitt": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
+      "license": "MIT"
+    },
     "node_modules/mlly": {
       "version": "1.7.4",
       "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.4.tgz",
@@ -5560,6 +5643,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/perfect-debounce": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
+      "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==",
+      "license": "MIT"
+    },
     "node_modules/picocolors": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
@@ -5579,6 +5668,36 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/pinia": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/pinia/-/pinia-3.0.3.tgz",
+      "integrity": "sha512-ttXO/InUULUXkMHpTdp9Fj4hLpD/2AoJdmAbAeW2yu1iy1k+pkFekQXw5VpC0/5p51IOR/jDaDRfRWRnMMsGOA==",
+      "license": "MIT",
+      "dependencies": {
+        "@vue/devtools-api": "^7.7.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/posva"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.4.4",
+        "vue": "^2.7.0 || ^3.5.11"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/pinia/node_modules/@vue/devtools-api": {
+      "version": "7.7.7",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.7.tgz",
+      "integrity": "sha512-lwOnNBH2e7x1fIIbVT7yF5D+YWhqELm55/4ZKf45R9T8r9dE2AIOy8HKjfqzGsoTHFbWbr337O4E0A0QADnjBg==",
+      "license": "MIT",
+      "dependencies": {
+        "@vue/devtools-kit": "^7.7.7"
+      }
+    },
     "node_modules/pkg-types": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.1.tgz",
@@ -5954,6 +6073,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/rfdc": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+      "license": "MIT"
+    },
     "node_modules/rollup": {
       "version": "4.40.1",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.1.tgz",
@@ -6865,6 +6990,15 @@
         "source-map": "^0.6.0"
       }
     },
+    "node_modules/speakingurl": {
+      "version": "14.0.1",
+      "resolved": "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz",
+      "integrity": "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/stack-trace": {
       "version": "1.0.0-pre2",
       "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-1.0.0-pre2.tgz",
@@ -6980,6 +7114,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/superjson": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.2.tgz",
+      "integrity": "sha512-5JRxVqC8I8NuOUjzBbvVJAKNM8qoVuH0O77h4WInc/qC2q5IreqKxYwgkga3PfA22OayK2ikceb/B26dztPl+Q==",
+      "license": "MIT",
+      "dependencies": {
+        "copy-anything": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
     "node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lightcontrol",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "description": "A Tecamino App",
   "productName": "Light Control",
   "author": "A. Zuercher",
@@ -17,6 +17,8 @@
   "dependencies": {
     "@quasar/extras": "^1.16.4",
     "axios": "^1.10.0",
+    "jwt-decode": "^4.0.0",
+    "pinia": "^3.0.3",
     "quasar": "^2.16.0",
     "vue": "^3.4.18",
     "vue-router": "^4.0.12"

quasar.config.ts

@@ -11,7 +11,7 @@ export default defineConfig((/* ctx */) => {
     // app boot file (/src/boot)
     // --> boot files are part of "main.js"
     // https://v2.quasar.dev/quasar-cli-vite/boot-files
-    boot: ['websocket', 'axios'],
+    boot: ['websocket', 'axios', 'auth'],
 
     // https://v2.quasar.dev/quasar-cli-vite/quasar-config-file#css
     css: ['app.scss'],

src/boot/auth.ts

@@ -0,0 +1,13 @@
+import { boot } from 'quasar/wrappers';
+import { createPinia } from 'pinia';
+import { useUserStore } from 'src/vueLib/login/userStore';
+import type { QVueGlobals } from 'quasar';
+
+export default boot(({ app }) => {
+  const $q = app.config.globalProperties.$q as QVueGlobals;
+  const pinia = createPinia();
+  app.use(pinia);
+  const useStore = useUserStore();
+  useStore.initStore($q);
+  useStore.loadFromStorage();
+});

src/boot/axios.ts

@@ -2,19 +2,29 @@ import { boot } from 'quasar/wrappers';
 import axios from 'axios';
 
 const host = window.location.hostname;
-const port = 8100;
+const portDbm = 8100;
+const portApp = 9500;
 
-const api = axios.create({
+const dbmApi = axios.create({
-  baseURL: `http://${host}:${port}`,
+  baseURL: `http://${host}:${portDbm}`,
   timeout: 30000,
   headers: {
     'Content-Type': 'application/json',
   },
 });
 
+const appApi = axios.create({
+  baseURL: `http://${host}:${portApp}/api`,
+  timeout: 10000,
+  headers: {
+    'Content-Type': 'application/json',
+  },
+});
+
 export default boot(({ app }) => {
   app.config.globalProperties.$axios = axios;
-  app.config.globalProperties.$api = api;
+  app.config.globalProperties.$dbmApi = dbmApi;
+  app.config.globalProperties.$appApi = appApi;
 });
 
-export { axios, api };
+export { axios, dbmApi, appApi };

src/components/lights/FloodPanel.vue

@@ -0,0 +1,98 @@
+<template>
+  <div>
+    <q-card>
+      <div class="q-pt-md text-black text-bold text-center">{{ cardTitle }}</div>
+      <q-card-section class="row items-start">
+        <div class="column justify-center q-mr-xs" style="height: 200px">
+          <q-btn
+            @click="changeState"
+            round
+            :color="brightness > 0 ? 'yellow' : 'blue'"
+            icon="lightbulb"
+            style="position: relative"
+          />
+        </div>
+        <LightSlider
+          mainTitle="Dimmer"
+          :dbm-path="props.path + ':Brightness'"
+          :opacity="0.5"
+          class="q-ma-sm"
+        ></LightSlider>
+        <LightSlider
+          mainTitle="Red"
+          :dbm-path="props.path + ':Red'"
+          color="red"
+          :opacity="0.8"
+          class="q-ma-sm"
+        ></LightSlider>
+        <LightSlider
+          mainTitle="Green"
+          :dbm-path="props.path + ':Green'"
+          :opacity="0.8"
+          color="green"
+          class="q-ma-sm"
+        ></LightSlider>
+        <LightSlider
+          mainTitle="Blue"
+          :dbm-path="props.path + ':Blue'"
+          :opacity="0.8"
+          color="blue"
+          class="q-ma-sm"
+        ></LightSlider>
+      </q-card-section>
+    </q-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+import LightSlider from './LightSlider.vue';
+import { onMounted, onUnmounted } from 'vue';
+import { unsubscribe, subscribeToPath } from 'src/vueLib/services/websocket';
+import { useNotify } from 'src/vueLib/general/useNotify';
+import { updateValue } from 'src/vueLib/dbm/dbmTree';
+import { removeAllSubscriptions } from 'src/vueLib/models/Subscriptions';
+import { catchError } from 'src/vueLib/models/error';
+
+const props = defineProps({
+  cardTitle: {
+    type: String,
+    default: '',
+  },
+  path: {
+    type: String,
+    required: true,
+  },
+});
+const { NotifyResponse } = useNotify();
+const brightness = updateValue(NotifyResponse, props.path + ':Brightness');
+const state = updateValue(NotifyResponse, props.path + ':State');
+
+onMounted(() => {
+  subscribeToPath(NotifyResponse, props.path + ':.*');
+});
+
+onUnmounted(() => {
+  unsubscribe([
+    {
+      path: props.path,
+      depth: 0,
+    },
+  ]).catch((err) => {
+    NotifyResponse(catchError(err), 'error');
+  });
+  removeAllSubscriptions();
+});
+
+function changeState() {
+  if (brightness.value === 0) {
+    if (state.value === 0) {
+      brightness.value = 255;
+      return;
+    }
+    brightness.value = state.value;
+    return;
+  }
+  state.value = brightness.value;
+  brightness.value = 0;
+}
+</script>

src/components/lights/FloodPanels.vue

@@ -0,0 +1,18 @@
+<template>
+  <div class="">
+    <q-card>
+      <div class="row items-start">
+        <q-card-section>
+          <FloodPanel card-title="Left" path="FloodPanels:001" />
+        </q-card-section>
+        <q-card-section>
+          <FloodPanel card-title="Right" path="FloodPanels:002" />
+        </q-card-section>
+      </div>
+    </q-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+import FloodPanel from './FloodPanel.vue';
+</script>

src/components/lights/LightBarCBL.vue

@@ -56,10 +56,6 @@
           color="blue"
           class="q-ma-sm"
         ></LightSlider>
-        <div class="colums q-ma-xl">
-          <q-btn color="secondary" @click="settings = !settings" icon="settings">Settings</q-btn>
-          <SettingDialog :settings-dialog="settings"></SettingDialog>
-        </div>
       </q-card-section>
     </q-card>
   </div>
@@ -67,16 +63,14 @@
 
 <script setup lang="ts">
 import LightSlider from './LightSlider.vue';
-import { ref, onMounted, onUnmounted } from 'vue';
+import { onMounted, onUnmounted } from 'vue';
 import { unsubscribe, subscribeToPath } from 'src/vueLib/services/websocket';
-import SettingDialog from 'src/components/lights/SettingDomeLight.vue';
 import { useNotify } from 'src/vueLib/general/useNotify';
 import { updateValue } from 'src/vueLib/dbm/dbmTree';
 import { removeAllSubscriptions } from 'src/vueLib/models/Subscriptions';
 import { catchError } from 'src/vueLib/models/error';
 
 const { NotifyResponse } = useNotify();
-const settings = ref(false);
 const brightness = updateValue(NotifyResponse, 'LightBar:Brightness');
 const state = updateValue(NotifyResponse, 'LightBar:State');
 onMounted(() => {

src/components/lights/MovingHead.vue

@@ -26,7 +26,7 @@ select
           :toggle-high-low="true"
           dbm-path="MovingHead:Brightness"
           dbm-path2="MovingHead:BrightnessFine"
-          dbm-path3="MovingHead:Strobe"
+          dbm-path3="MovingHead:Strobe'"
           :dbm-value3="255"
           :opacity="0.5"
           class="q-ma-md"
@@ -114,14 +114,13 @@ import { findSubscriptionByPath, removeAllSubscriptions } from 'src/vueLib/model
 import { catchError } from 'src/vueLib/models/error';
 
 const { NotifyResponse } = useNotify();
-const brightness = updateBrightnessValue('MovingHead:Brightness');
-const state = updateValue(NotifyResponse, 'MovingHead:State');
 const settings = ref<Settings>({
   show: false,
   reversePan: false,
   reverseTilt: false,
-  startAddress: 0,
 });
+const brightness = updateBrightnessValue('MovingHead:Brightness');
+const state = updateValue(NotifyResponse, 'MovingHead:State');
 
 onMounted(() => {
   settings.value.reversePan = LocalStorage.getItem('reversePan') ?? false;

src/components/lights/SettingMovingHead.vue

@@ -21,13 +21,6 @@
           >{{ settings.reversePan ? 'Reversed Pan' : 'Normal Pan' }}</q-btn
         >
       </q-card-section>
-      <q-card-section>
-        <q-input
-          type="number"
-          label="Start Address"
-          v-model:model-value="settings.startAddress"
-        ></q-input>
-      </q-card-section>
       <q-card-actions align="right">
         <q-btn flat label="Cancel" v-close-popup />
         <q-btn flat label="Save" @click="saveSettings" />
@@ -45,7 +38,6 @@ const settings = defineModel<Settings>('settings', {
     show: false,
     reversePan: false,
     reverseTilt: false,
-    startAddress: 0,
   },
   required: true,
 });

src/components/lights/StageLight.vue

@@ -0,0 +1,117 @@
+<template>
+  <div>
+    <q-card>
+      <div class="q-pt-md text-black text-bold text-center">{{ cardTitle }}</div>
+      <q-card-section class="row items-start">
+        <div class="column justify-center q-mr-xs" style="height: 200px">
+          <q-btn
+            @click="changeState"
+            round
+            :color="brightness > 0 ? 'yellow' : 'blue'"
+            icon="lightbulb"
+            style="position: relative"
+          />
+        </div>
+        <LightSlider
+          mainTitle="Dimmer"
+          :dbm-path="props.path + ':Brightness'"
+          :opacity="0.5"
+          class="q-ma-sm"
+        ></LightSlider>
+        <LightSlider
+          mainTitle="Strobe"
+          :dbm-path="props.path + ':Strobe'"
+          :opacity="0.5"
+          class="q-ma-sm"
+        ></LightSlider>
+        <LightSlider
+          mainTitle="DimmerFade"
+          :dbm-path="props.path + ':DimmerFade'"
+          :opacity="0.5"
+          :step="50"
+          class="q-ma-sm"
+        ></LightSlider>
+        <LightSlider
+          mainTitle="Red"
+          :dbm-path="props.path + ':Red'"
+          color="red"
+          :opacity="0.8"
+          class="q-ma-sm"
+        ></LightSlider>
+        <LightSlider
+          mainTitle="Green"
+          :dbm-path="props.path + ':Green'"
+          :opacity="0.8"
+          color="green"
+          class="q-ma-sm"
+        ></LightSlider>
+        <LightSlider
+          mainTitle="Blue"
+          :dbm-path="props.path + ':Blue'"
+          :opacity="0.8"
+          color="blue"
+          class="q-ma-sm"
+        ></LightSlider>
+        <LightSlider
+          mainTitle="White"
+          :dbm-path="props.path + ':White'"
+          :opacity="0.5"
+          class="q-ma-sm"
+        ></LightSlider>
+      </q-card-section>
+    </q-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+import LightSlider from './LightSlider.vue';
+import { onMounted, onUnmounted } from 'vue';
+import { unsubscribe, subscribeToPath } from 'src/vueLib/services/websocket';
+import { useNotify } from 'src/vueLib/general/useNotify';
+import { updateValue } from 'src/vueLib/dbm/dbmTree';
+import { removeAllSubscriptions } from 'src/vueLib/models/Subscriptions';
+import { catchError } from 'src/vueLib/models/error';
+
+const props = defineProps({
+  cardTitle: {
+    type: String,
+    default: '',
+  },
+  path: {
+    type: String,
+    required: true,
+  },
+});
+const { NotifyResponse } = useNotify();
+const brightness = updateValue(NotifyResponse, props.path + ':Brightness');
+const state = updateValue(NotifyResponse, props.path + ':State');
+
+onMounted(() => {
+  subscribeToPath(NotifyResponse, props.path + ':.*');
+});
+
+onUnmounted(() => {
+  unsubscribe([
+    {
+      path: props.path,
+      depth: 0,
+    },
+  ]).catch((err) => {
+    NotifyResponse(catchError(err), 'error');
+  });
+  removeAllSubscriptions();
+});
+
+function changeState() {
+  if (brightness.value === 0) {
+    if (state.value === 0) {
+      brightness.value = 255;
+      return;
+    }
+    brightness.value = state.value;
+    return;
+  }
+  state.value = brightness.value;
+  brightness.value = 0;
+}
+</script>

src/components/lights/StageLights.vue

@@ -0,0 +1,18 @@
+<template>
+  <div class="">
+    <q-card>
+      <div class="row items-start">
+        <q-card-section>
+          <StageLight card-title="Left" path="StageLights:001" />
+        </q-card-section>
+        <q-card-section>
+          <StageLight card-title="Right" path="StageLights:002" />
+        </q-card-section>
+      </div>
+    </q-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+import StageLight from './StageLight.vue';
+</script>

src/components/scenes/ScenesPage.vue

@@ -27,8 +27,10 @@
         />
         <div class="q-py-md">
           <div class="q-gutter-sm">
-            <q-checkbox v-model="newScene.movingHead" label="Moving Head" />
+            <q-checkbox v-model="newScene.stageLights" label="Stage Lights" />
             <q-checkbox v-model="newScene.lightBar" label="Light Bar" />
+            <q-checkbox v-model="newScene.floodPanels" label="Flood Panels" />
+            <q-checkbox v-model="newScene.movingHead" label="Moving Head" />
           </div>
         </div>
       </q-card-section>
@@ -52,6 +54,7 @@
   >
     <q-btn
       rounded
+      no-caps
       color="primary"
       :class="['q-ma-md', 'text-bold', 'text-white']"
       @click="openDialog('add')"
@@ -102,6 +105,7 @@
     <div>No scenes available</div>
     <q-btn
       rounded
+      no-caps
       color="primary"
       :class="['q-ma-md', 'text-bold', 'text-white']"
       @click="openDialog('add')"
@@ -114,13 +118,13 @@
 import { onMounted, reactive, ref } from 'vue';
 import type { Scene } from 'src/models/Scene';
 import type { Set } from 'src/vueLib/models/Set';
-import axios from 'axios';
+import { dbmApi } from 'src/boot/axios';
-import { api } from 'src/boot/axios';
 import { useNotify } from 'src/vueLib/general/useNotify';
 import Dialog from 'src/components/dialog/OkDialog.vue';
 import { setValues } from 'src/vueLib/services/websocket';
 import DialogFrame from 'src/vueLib/dialog/DialogFrame.vue';
 import { catchError } from 'src/vueLib/models/error';
+import { appApi } from 'src/boot/axios';
 
 const { NotifyResponse, NotifyDialog } = useNotify();
 const sceneDialog = ref();
@@ -130,26 +134,17 @@ const editIndex = ref(-1);
 const dialogLabel = ref('');
 const newScene = reactive<Scene>({
   name: '',
-  movingHead: false,
+  stageLights: false,
   lightBar: false,
+  floodPanels: false,
+  movingHead: false,
 });
 
 const scenes = ref<Scene[]>([]);
-const host = window.location.hostname;
-const port = 9500;
-const baseURL = `http://${host}:${port}`;
-
-const quasarApi = axios.create({
-  baseURL: baseURL,
-  timeout: 10000,
-  headers: {
-    'Content-Type': 'application/json',
-  },
-});
 
 onMounted(() => {
-  quasarApi
+  appApi
-    .get('/api/loadScenes')
+    .get('/loadScenes')
     .then((resp) => {
       if (resp.data) {
         scenes.value = resp.data;
@@ -166,9 +161,8 @@ function removeScene(name: string) {
     .then((res) => {
       if (res) {
         scenes.value = scenes.value.filter((s) => s.name !== name);
-
+        appApi
-        quasarApi
+          .delete('/deleteScene', {
-          .delete('/api/deleteScene', {
             data: { name },
           })
           .then((res) => {
@@ -190,8 +184,11 @@ function openDialog(dialogType: string, scene?: Scene, index?: number) {
       dialog.value = 'add';
       dialogLabel.value = 'Add Scene';
       newScene.name = '';
-      newScene.movingHead = true;
+      newScene.stageLights = true;
       newScene.lightBar = true;
+      newScene.floodPanels = true;
+      newScene.movingHead = true;
+
       break;
     case 'edit':
       if (!scene) return;
@@ -205,8 +202,8 @@ function openDialog(dialogType: string, scene?: Scene, index?: number) {
       if (!scene) return;
       dialog.value = 'load';
       dialogLabel.value = 'Load Scene';
-      quasarApi
+      appApi
-        .post('/api/loadScene', scene)
+        .post('/loadScene', scene)
         .then((res) => {
           if (res.data) {
             Object.assign(newScene, JSON.parse(JSON.stringify(res.data)));
@@ -236,9 +233,9 @@ const saveScene = async () => {
         return;
       }
 
-      if (newScene.movingHead) {
+      if (newScene.stageLights) {
         sendValues.push({
-          path: 'MovingHead',
+          path: 'StageLights',
           query: { depth: 0 },
         });
       }
@@ -250,9 +247,23 @@ const saveScene = async () => {
         });
       }
 
+      if (newScene.floodPanels) {
+        sendValues.push({
+          path: 'FloodPanels',
+          query: { depth: 0 },
+        });
+      }
+
+      if (newScene.movingHead) {
+        sendValues.push({
+          path: 'MovingHead',
+          query: { depth: 0 },
+        });
+      }
+
       if (sendValues.length > 0) {
         try {
-          const res = await api.post('/json_data', { get: sendValues });
+          const res = await dbmApi.post('/json_data', { get: sendValues });
           newScene.values = res.data.get;
         } catch (err) {
           NotifyResponse(err as Error, 'error');
@@ -266,8 +277,8 @@ const saveScene = async () => {
       // Sort alphabetically by scene name
       scenes.value.sort((a, b) => a.name.localeCompare(b.name));
 
-      quasarApi
+      appApi
-        .post('/api/saveScene', JSON.stringify(newScene))
+        .post('/saveScene', JSON.stringify(newScene))
         .then((res) => {
           if (res.data) {
             NotifyResponse(res.data);
@@ -285,9 +296,9 @@ const saveScene = async () => {
         return;
       }
 
-      if (newScene.movingHead) {
+      if (newScene.stageLights) {
         sendValues.push({
-          path: 'MovingHead',
+          path: 'StageLights',
           query: { depth: 0 },
         });
       }
@@ -299,9 +310,23 @@ const saveScene = async () => {
         });
       }
 
+      if (newScene.floodPanels) {
+        sendValues.push({
+          path: 'FloodPanels',
+          query: { depth: 0 },
+        });
+      }
+
+      if (newScene.movingHead) {
+        sendValues.push({
+          path: 'MovingHead',
+          query: { depth: 0 },
+        });
+      }
+
       if (sendValues.length > 0) {
         try {
-          const res = await api.post('/json_data', { get: sendValues });
+          const res = await dbmApi.post('/json_data', { get: sendValues });
           newScene.values = res.data.get;
         } catch (err) {
           NotifyResponse(err as Error, 'error');
@@ -313,8 +338,8 @@ const saveScene = async () => {
       scenes.value.sort((a, b) => a.name.localeCompare(b.name));
       scenes.value = [...scenes.value];
 
-      quasarApi
+      appApi
-        .post('/api/saveScene', JSON.stringify(newScene))
+        .post('/saveScene', JSON.stringify(newScene))
         .then((res) => {
           if (res.data) {
             NotifyResponse(res.data);
@@ -333,11 +358,17 @@ const saveScene = async () => {
         newScene.values?.forEach((element) => {
           if (!element.path) return;
 
-          if (newScene.movingHead && element.path.includes('MovingHead'))
+          if (newScene.stageLights && element.path.includes('StageLights'))
             setPaths.push({ uuid: element.uuid, path: element.path, value: element.value });
 
           if (newScene.lightBar && element.path.includes('LightBar'))
             setPaths.push({ uuid: element.uuid, path: element.path, value: element.value });
+
+          if (newScene.floodPanels && element.path.includes('FloodPanels'))
+            setPaths.push({ uuid: element.uuid, path: element.path, value: element.value });
+
+          if (newScene.movingHead && element.path.includes('MovingHead'))
+            setPaths.push({ uuid: element.uuid, path: element.path, value: element.value });
         });
 
         setValues(setPaths)

src/layouts/MainLayout.vue

@@ -10,10 +10,11 @@
         />
         <q-btn flat dense round icon="menu" aria-label="Menu" @click="toggleLeftDrawer" />
 
-        <q-toolbar-title> Light Control </q-toolbar-title>
+        <q-toolbar-title> {{ productName }} </q-toolbar-title>
 
         <div>Version {{ version }}</div>
         <q-btn dense icon="refresh" square class="q-px-md q-ml-md" @click="refresh" />
+        <LoginMenu />
       </q-toolbar>
     </q-header>
 
@@ -25,9 +26,12 @@
         <q-item to="/scenes" clickable v-ripple @click="closeDrawer">
           <q-item-section>Scenes</q-item-section>
         </q-item>
-        <q-item to="/data" clickable v-ripple @click="closeDrawer">
+        <q-item v-if="autorized" to="/data" clickable v-ripple @click="closeDrawer">
           <q-item-section>Data</q-item-section>
         </q-item>
+        <q-item to="/services" clickable v-ripple @click="closeDrawer">
+          <q-item-section>Services</q-item-section>
+        </q-item>
       </q-list>
     </q-drawer>
     <q-page-container>
@@ -38,10 +42,14 @@
 
 <script setup lang="ts">
 import logo from 'src/assets/LOGO_CF-ICON_color.svg';
-import { ref } from 'vue';
+import { computed, ref } from 'vue';
-import { version } from '../..//package.json';
+import { version, productName } from '../../package.json';
+import LoginMenu from 'src/vueLib/login/LoginMenu.vue';
+import { useUserStore } from 'src/vueLib/login/userStore';
 
 const leftDrawerOpen = ref(false);
+const user = useUserStore();
+const autorized = computed(() => !!user.isAuthorizedAs(['admin']));
 
 function toggleLeftDrawer() {
   leftDrawerOpen.value = !leftDrawerOpen.value;

src/models/MovingHead.ts

@@ -14,5 +14,4 @@ export type Settings = {
   show: boolean;
   reversePan: boolean;
   reverseTilt: boolean;
-  startAddress: number;
 };

src/models/Scene.ts

@@ -3,7 +3,9 @@ import type { Value } from '../vueLib/models/Value';
 export interface Scene {
   name: string;
   description?: string;
-  movingHead: boolean;
+  stageLights: boolean;
   lightBar: boolean;
+  floodPanels: boolean;
+  movingHead: boolean;
   values?: Value[];
 }

src/pages/DataPage.vue

@@ -5,14 +5,14 @@
 
 <script setup lang="ts">
 import DBMTree from 'src/vueLib/dbm/DBMTree.vue';
-import { api } from 'src/boot/axios';
+import { dbmApi } from 'src/boot/axios';
 import { useNotify } from 'src/vueLib/general/useNotify';
 import { catchError } from 'src/vueLib/models/error';
 
 const { NotifyResponse } = useNotify();
 
 function saveDBM() {
-  api
+  dbmApi
     .get('saveData')
     .then((resp) => NotifyResponse(resp.data))
     .catch((err) => NotifyResponse(catchError(err), 'error'));

src/pages/MainPage.vue

@@ -1,16 +1,24 @@
 <template>
   <q-page>
     <q-tabs v-model="tab">
-      <q-tab name="movingHead" label="Moving Head" />
+      <q-tab no-caps name="stageLights" label="Stage Lights" />
-      <q-tab name="lightBar" label="Light Bar" />
+      <q-tab no-caps name="movingHead" label="Moving Head" />
+      <q-tab no-caps name="lightBar" label="Light Bar" />
+      <q-tab no-caps name="floodPanels" label="Flood Panels" />
     </q-tabs>
     <q-tab-panels v-model="tab" animated class="text-white">
-      <q-tab-panel name="movingHead">
+      <q-tab-panel name="stageLights">
-        <moving-head />
+        <stage-lights />
       </q-tab-panel>
       <q-tab-panel name="lightBar">
         <LightBar />
       </q-tab-panel>
+      <q-tab-panel name="floodPanels">
+        <FloodPanels />
+      </q-tab-panel>
+      <q-tab-panel name="movingHead">
+        <moving-head />
+      </q-tab-panel>
     </q-tab-panels>
   </q-page>
 </template>
@@ -18,6 +26,8 @@
 <script setup lang="ts">
 import MovingHead from 'src/components/lights/MovingHead.vue';
 import LightBar from 'src/components/lights/LightBarCBL.vue';
+import FloodPanels from 'src/components/lights/FloodPanels.vue';
+import StageLights from 'src/components/lights/StageLights.vue';
 import { ref, onMounted, watch } from 'vue';
 const tab = ref('movingHead');
 const STORAGE_KEY = 'lastTabUsed';

src/pages/ServicesPage.vue

@@ -0,0 +1,60 @@
+<template>
+  <q-card>
+    <q-card-section>
+      <div class="text-bold text-primary">Services</div>
+    </q-card-section>
+    <q-card-section>
+      <q-table v-if="driverRows?.length > 0" :rows="driverRows" :columns="columns"> </q-table>
+      <div v-else class="q-pa-md text-grey text-center">
+        <div>No services available</div>
+        <q-btn
+          no-caps
+          rounded
+          color="primary"
+          :class="['q-ma-md', 'text-bold', 'text-white']"
+          :disable="userStore.user?.role !== 'admin'"
+          @click="addNewDriver"
+          >Add First Service</q-btn
+        >
+      </div>
+    </q-card-section>
+  </q-card>
+  <service-dialog ref="refServiceDialog"></service-dialog>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref } from 'vue';
+import type { QTableProps } from 'quasar';
+import { useUserStore } from 'src/vueLib/login/userStore';
+import ServiceDialog from 'src/vueLib/services/dialog/ServiceDialog.vue';
+
+const userStore = useUserStore();
+const refServiceDialog = ref();
+const driverRows = reactive([]);
+
+const columns = [
+  { name: 'path', label: 'Path', field: 'path', align: 'left' },
+  {
+    name: 'type',
+    label: 'Type',
+    field: 'type',
+    align: 'left',
+  },
+  {
+    name: 'value',
+    label: 'Value',
+    field: 'value',
+    align: 'left',
+  },
+  {
+    name: 'drivers',
+    label: 'Drivers',
+    field: 'drivers',
+    align: 'center',
+  },
+] as QTableProps['columns'];
+
+function addNewDriver() {
+  refServiceDialog.value.open();
+}
+</script>

src/router/index.ts

@@ -19,7 +19,9 @@ import routes from './routes';
 export default defineRouter(function (/* { store, ssrContext } */) {
   const createHistory = process.env.SERVER
     ? createMemoryHistory
-    : (process.env.VUE_ROUTER_MODE === 'history' ? createWebHistory : createWebHashHistory);
+    : process.env.VUE_ROUTER_MODE === 'history'
+      ? createWebHistory
+      : createWebHashHistory;
 
   const Router = createRouter({
     scrollBehavior: () => ({ left: 0, top: 0 }),
@@ -30,6 +32,5 @@ export default defineRouter(function (/* { store, ssrContext } */) {
     // quasar.conf.js -> build -> publicPath
     history: createHistory(process.env.VUE_ROUTER_BASE),
   });
-
   return Router;
 });

src/router/routes.ts

@@ -6,8 +6,16 @@ const routes: RouteRecordRaw[] = [
     component: () => import('layouts/MainLayout.vue'),
     children: [
       { path: '', component: () => import('pages/MainPage.vue') },
-      { path: '/data', component: () => import('pages/DataPage.vue') },
+      {
+        path: '/data',
+        component: () => import('pages/DataPage.vue'),
+        meta: { requiresAuth: true, requiresAdmin: true },
+      },
       { path: '/scenes', component: () => import('components/scenes/ScenesPage.vue') },
+      {
+        path: '/services',
+        component: () => import('pages/ServicesPage.vue'),
+      },
     ],
   },
 

src/vueLib/dbm/DataTable.vue

@@ -60,7 +60,12 @@
         </q-td>
       </template>
     </q-table>
-    <RenameDialog width="400px" button-ok-label="Rename" ref="renameDialog" />
+    <RenameDialog
+      dialogLabel="Rename Datapoint"
+      width="400px"
+      button-ok-label="Rename"
+      ref="renameDialog"
+    />
     <UpdateDialog width="400px" button-ok-label="Write" ref="updateDialog" />
     <UpdateDriver width="400px" ref="updateDriverDialog" />
     <UpdateDatatype
@@ -89,7 +94,6 @@ const updateDriverDialog = ref();
 const updateDatatype = ref();
 
 const openDialog = (sub: Subscribe, type?: string) => {
-  console.log(11, sub);
   if (sub.path?.split(':')[0] === 'System' && sub.path !== 'DBM') return;
   switch (type) {
     case 'type':
@@ -103,7 +107,7 @@ const openDialog = (sub: Subscribe, type?: string) => {
       updateDialog.value?.open(ref(sub), type);
       break;
     case 'drivers':
-      if (sub.type === 'NONE') return;
+      if (sub.path === 'DBM' || sub.type === 'NONE') return;
       updateDriverDialog.value?.open(sub);
       break;
   }

src/vueLib/dbm/SubMenu.vue

@@ -102,7 +102,7 @@
     </q-list>
   </q-menu>
   <RenameDatapoint :dialogLabel="label" width="700px" button-ok-label="Rename" ref="renameDialog" />
-  <AddDialog :dialogLabel="label" width="700px" button-ok-label="Add" ref="addDialog" />
+  <AddDialog :dialogLabel="label" width="750px" button-ok-label="Add" ref="addDialog" />
   <RemoveDialog :dialogLabel="label" width="350px" button-ok-label="Remove" ref="removeDialog" />
   <CopyDialog :dialogLabel="label" width="300px" button-ok-label="Copy" ref="copyDialog" />
   <UpdateDatapoint

src/vueLib/dbm/dialog/AddDatapoint.vue

@@ -1,5 +1,10 @@
 <template>
-  <DialogFrame ref="Dialog" :width="props.width" :header-title="props.dialogLabel">
+  <DialogFrame
+    ref="Dialog"
+    :width="props.width"
+    :height="props.height"
+    :header-title="props.dialogLabel"
+  >
     <q-card-section
       v-if="props.dialogLabel"
       class="text-bold text-left q-mb-none q-pb-none"
@@ -37,9 +42,11 @@
         filled
         v-model="addingForm.value"
       ></q-input>
-      <q-btn no-caps class="q-mb-xl q-mx-xl q-px-lg" @click="onSubmit" color="primary">{{
+      <div class="row justify-end">
-        props.buttonOkLabel
+        <q-btn no-caps class="q-mb-xl q-mx-xl q-px-lg" @click="onSubmit" color="primary">{{
-      }}</q-btn>
+          props.buttonOkLabel
+        }}</q-btn>
+      </div>
     </q-form>
   </DialogFrame>
 </template>
@@ -132,6 +139,10 @@ const props = defineProps({
     type: String,
     default: '300px',
   },
+  height: {
+    type: String,
+    default: '650px',
+  },
 });
 
 function getDatapoint(uuid: string) {

src/vueLib/dbm/dialog/CopyDatapoint.vue

@@ -1,5 +1,10 @@
 <template>
-  <DialogFrame ref="Dialog" :width="props.width" :header-title="props.dialogLabel">
+  <DialogFrame
+    ref="Dialog"
+    :width="props.width"
+    :height="props.height"
+    :header-title="props.dialogLabel"
+  >
     <q-card-section
       v-if="props.dialogLabel"
       class="text-bold text-left q-mb-none q-pb-none"
@@ -27,9 +32,11 @@
       >
       </q-input>
       <div class="q-mx-sm">
-        <q-btn no-caps class="q-mb-xl q-ml-lg q-px-lg" @click="onSubmit" color="primary">{{
+        <div class="row justify-end">
-          props.buttonOkLabel
+          <q-btn no-caps class="q-mb-xl q-mr-md q-px-lg" @click="onSubmit" color="primary">{{
-        }}</q-btn>
+            props.buttonOkLabel
+          }}</q-btn>
+        </div>
       </div>
     </q-form>
   </DialogFrame>
@@ -117,6 +124,10 @@ const props = defineProps({
     type: String,
     default: '300px',
   },
+  height: {
+    type: String,
+    default: '400px',
+  },
 });
 
 function getDatapoint(uuid: string) {

src/vueLib/dbm/dialog/DriverDialog.vue

@@ -1,19 +1,23 @@
 <template>
-  <DialogFrame ref="Dialog" :width="props.width" :header-title="localDialogLabel">
+  <DialogFrame
+    ref="Dialog"
+    :width="props.width"
+    :height="props.height"
+    :header-title="localDialogLabel"
+  >
     <q-card-section
-      v-if="props.dialogLabel || localDialogLabel"
+      v-if="dialogLabel"
       class="text-bold text-left q-mb-none q-pb-none"
       :class="'text-' + props.labelColor"
-      >{{ props.dialogLabel || localDialogLabel }}</q-card-section
+      >{{ dialogLabel }}
-    >
+    </q-card-section>
     <q-card-section v-if="props.text" class="text-center" style="white-space: pre-line">{{
       props.text
     }}</q-card-section>
     <q-form ref="form">
-      <q-card-section class="q-gutter-xs row q-col-gutter-xs">
+      <q-card-section class="q-gutter-xs row q-col-gutter-xs q-ml-sm">
         <div>
           <q-select
-            class="col-8"
             filled
             label="Driver Name"
             type="text"
@@ -24,7 +28,6 @@
             v-model="driverForm.type"
           />
           <q-input
-            class="col-8"
             filled
             label="Bus"
             type="text"
@@ -35,18 +38,17 @@
           />
           <q-input
             v-if="driverForm.isAddress"
-            class="col-8"
             filled
             dense
             label="Address"
             type="number"
             name="Address"
+            @keyup.enter="updateDriver"
             v-model.number="driverForm.address"
           />
         </div>
         <div v-if="!driverForm.isAddress" class="q-gutter-xs row q-col-gutter-xs">
           <q-input
-            class="col-8"
             filled
             dense
             label="Subscribe"
@@ -55,21 +57,21 @@
             v-model="driverForm.subscribe"
           />
           <q-input
-            class="col-8"
             filled
             dense
             label="Publish"
             type="text"
             name="Address"
+            @keyup.enter="updateDriver"
             v-model="driverForm.publish"
           />
         </div>
       </q-card-section>
     </q-form>
-    <q-card-actions class="text-primary">
+    <q-card-actions align="right" class="text-primary">
       <q-btn v-if="props.buttonCancelLabel" flat :label="props.buttonCancelLabel" v-close-popup />
       <q-btn
-        class="q-mb-xl q-ml-lg q-px-lg"
+        class="q-mb-xl q-mr-lg"
         v-if="props.buttonOkLabel"
         color="primary"
         no-caps
@@ -82,10 +84,10 @@
 </template>
 
 <script setup lang="ts">
-import { reactive, ref, watch } from 'vue';
+import { reactive, ref, watch, computed } from 'vue';
 import DialogFrame from '../../dialog/DialogFrame.vue';
 import type { Driver } from '../../models/Drivers';
-import { setRequest } from 'src/vueLib/models/Request';
+import { deleteRequest, setRequest } from 'src/vueLib/models/Request';
 import { addRawSubscriptions } from 'src/vueLib/models/Subscriptions';
 import { convertToSubscribe, type RawSubs } from 'src/vueLib/models/Subscribe';
 import { useNotify } from 'src/vueLib/general/useNotify';
@@ -95,6 +97,7 @@ import { updateDriverTable, type DriverTableRow } from 'src/vueLib/models/driver
 const { NotifyResponse } = useNotify();
 
 const Dialog = ref();
+const dialogLabel = computed(() => props.dialogLabel || localDialogLabel.value);
 const options = ['ArtNetDriver', 'OSCDriver'];
 const driverForm = reactive({
   type: 'ArtNetDriver',
@@ -130,6 +133,10 @@ const props = defineProps({
     type: String,
     default: '300px',
   },
+  height: {
+    type: String,
+    default: '480px',
+  },
 });
 
 const localDialogLabel = ref('');
@@ -138,6 +145,7 @@ let dpUuid = '';
 const form = ref();
 const address = ref();
 const topic = ref();
+const edit = ref(false);
 
 watch(
   () => driverForm.type,
@@ -158,13 +166,20 @@ const open = (uuid: string, drvs: DriverTableRow, type: 'add' | 'edit') => {
   switch (type) {
     case 'add':
       localDialogLabel.value = 'Add Driver';
-      driverForm.type = 'ArtNetDriver';
+      edit.value = false;
-      driverForm.isAddress = true;
+      Object.assign(driverForm, {
+        type: 'ArtNetDriver',
+        bus: '',
+        isAddress: true,
+        address: 0,
+        subscribe: '',
+        publish: '',
+      });
       break;
     case 'edit':
       localDialogLabel.value = 'Edit Driver';
-      driverForm.type = drvs.type;
+      edit.value = true;
-      driverForm.bus = drvs.bus;
+      fillDriverFormFromRow(drvs);
   }
 
   dpUuid = uuid;
@@ -177,9 +192,9 @@ const open = (uuid: string, drvs: DriverTableRow, type: 'add' | 'edit') => {
   Dialog.value?.open();
 };
 
-function updateDriver() {
+async function updateDriver() {
-  form.value?.validate();
+  const valid = await form.value?.validate();
-  if (!driverForm.type || !driverForm.bus) {
+  if (!valid) {
     NotifyResponse('Please fill in all required fields', 'warning');
     return;
   }
@@ -191,6 +206,15 @@ function updateDriver() {
     topic.value = { subscribe: [driverForm.subscribe], publish: [driverForm.publish] };
   }
 
+  if (edit.value) {
+    deleteRequest(dpUuid, '', driver.value)
+      .then((resp) => {
+        resp.forEach((set) => {
+          updateDriverTable(convertToSubscribe(set));
+        });
+      })
+      .catch((err) => NotifyResponse(err, 'error'));
+  }
   setRequest('', undefined, undefined, undefined, dpUuid, {
     type: driverForm.type,
     buses: [
@@ -216,6 +240,14 @@ function updateDriver() {
     });
 }
 
+function fillDriverFormFromRow(drvs: DriverTableRow) {
+  driverForm.type = drvs.type;
+  driverForm.bus = drvs.buses?.[0]?.name ?? '';
+  driverForm.address = drvs.buses?.[0]?.address?.[0] ?? -1;
+  driverForm.subscribe = drvs.topic?.subscribe?.[0] ?? '';
+  driverForm.publish = drvs.topic?.publish?.[0] ?? '';
+}
+
 defineExpose({ open });
 </script>
 

src/vueLib/dbm/dialog/RemoveDatapoint.vue

@@ -8,12 +8,14 @@
     </q-card-section>
     <div class="text-center text-bold text-primary">
       Do you want to remove Datapoint
-      <br />
+      <br /><br />
       '{{ datapoint.path ?? '' }}'
     </div>
-    <q-btn no-caps class="q-ma-md" filled color="negative" @click="remove">{{
+    <div class="row justify-end">
-      props.buttonOkLabel
+      <q-btn no-caps class="q-ma-lg q-mr-xl" filled color="negative" @click="remove">{{
-    }}</q-btn>
+        props.buttonOkLabel
+      }}</q-btn>
+    </div>
   </DialogFrame>
 </template>
 

src/vueLib/dbm/dialog/RenameDatapoint.vue

@@ -1,5 +1,10 @@
 <template>
-  <DialogFrame ref="Dialog" :width="props.width" :header-title="props.dialogLabel">
+  <DialogFrame
+    ref="Dialog"
+    :width="props.width"
+    :height="props.height"
+    :header-title="props.dialogLabel"
+  >
     <q-card-section
       v-if="props.dialogLabel"
       class="text-bold text-left q-mb-none q-pb-none"
@@ -26,7 +31,7 @@
         :rules="[(val) => !!val || 'Path is required']"
       >
       </q-input>
-      <div class="q-mx-sm">
+      <div class="row justify-end q-mr-lg">
         <q-btn no-caps class="q-mb-xl q-ml-lg q-px-lg" @click="onSubmit" color="primary">{{
           props.buttonOkLabel
         }}</q-btn>
@@ -95,7 +100,6 @@ function onSubmit() {
           )
             .then((res) => {
               addRawSubscriptions(res as RawSubs);
-              console.log(80, res);
               buildTree(convertToSubscribes(res as RawSubs));
               UpdateTable();
             })
@@ -127,6 +131,10 @@ const props = defineProps({
     type: String,
     default: '300px',
   },
+  height: {
+    type: String,
+    default: '400px',
+  },
 });
 
 function getDatapoint(uuid: string) {

src/vueLib/dbm/dialog/UpdateDatatype.vue

@@ -1,10 +1,17 @@
 <template>
-  <DialogFrame ref="Dialog" :width="props.width" :header-title="props.dialogLabel">
+  <DialogFrame
+    ref="Dialog"
+    :width="props.width"
+    :height="props.height"
+    :header-title="props.dialogLabel"
+  >
     <q-card-section
       v-if="props.dialogLabel"
       class="text-bold text-left q-mb-none q-pb-none"
       :class="'text-' + props.labelColor"
-      >DBM:{{ datapoint.path }}
+      >{{
+        datapoint.uuid === '00000000-0000-0000-0000-000000000000' ? 'DBM' : 'DBM:' + datapoint.path
+      }}
     </q-card-section>
     <q-form ref="datatypeForm" class="q-gutter-md">
       <q-input
@@ -12,7 +19,7 @@
         filled
         dense
         v-model="currentDatatype"
-        label="Current Path"
+        label="Current Datatype"
         label-color="primary"
         readonly
       >
@@ -20,6 +27,7 @@
       <q-select
         class="q-mt-lg q-mt-none q-pl-md q-mx-lg"
         popup-content-class="small-dropdown"
+        label="New Datatype"
         filled
         dense
         v-model="selectedDatatype"
@@ -27,7 +35,7 @@
         option-label="label"
       >
       </q-select>
-      <div class="q-mx-sm">
+      <div class="row justify-end q-mr-lg">
         <q-btn no-caps class="q-mb-xl q-ml-lg q-px-lg" @click="onSubmit" color="primary">{{
           props.buttonOkLabel
         }}</q-btn>
@@ -114,6 +122,10 @@ const props = defineProps({
     type: String,
     default: '300px',
   },
+  height: {
+    type: String,
+    default: '340px',
+  },
 });
 
 async function getDatapoint(uuid: string) {

src/vueLib/dbm/dialog/UpdateDriverDialog.vue

@@ -1,5 +1,10 @@
 <template>
-  <DialogFrame ref="Dialog" :width="props.width" :header-title="datapoint?.path">
+  <DialogFrame
+    ref="Dialog"
+    :width="props.width"
+    :height="props.height"
+    :header-title="'DBM:' + datapoint?.path"
+  >
     <q-card-section
       v-if="props.dialogLabel || localDialogLabel"
       class="text-bold text-left q-mb-none q-pb-none"
@@ -44,12 +49,16 @@
       <q-menu ref="contextMenuRef" context-menu>
         <q-list>
           <q-item>
-            <q-item-section class="cursor-pointer" @click="handleRow(driver, 'edit')">
+            <q-item-section v-close-popup class="cursor-pointer" @click="handleRow(driver, 'edit')">
               Edit
             </q-item-section>
           </q-item>
           <q-item>
-            <q-item-section class="text-negative cursor-pointer" @click="deleteDriver(driver)">
+            <q-item-section
+              v-close-popup
+              class="text-negative cursor-pointer"
+              @click="deleteDriver(driver)"
+            >
               Delete
             </q-item-section>
           </q-item>
@@ -59,7 +68,7 @@
     <q-card-section v-if="props.text" class="text-center" style="white-space: pre-line">{{
       props.text
     }}</q-card-section>
-    <q-card-actions align="left" class="text-primary">
+    <q-card-actions align="right" class="text-primary">
       <q-btn v-if="props.buttonCancelLabel" flat :label="props.buttonCancelLabel" v-close-popup>
       </q-btn>
       <q-btn
@@ -120,6 +129,10 @@ const props = defineProps({
     type: String,
     default: '300px',
   },
+  height: {
+    type: String,
+    default: '500px',
+  },
 });
 
 const datapoint = ref();

src/vueLib/dbm/dialog/UpdateValueDialog.vue

@@ -1,5 +1,10 @@
 <template>
-  <DialogFrame ref="Dialog" :width="props.width" :header-title="datapoint?.path">
+  <DialogFrame
+    ref="Dialog"
+    :width="props.width"
+    :height="props.height"
+    :header-title="datapoint?.path"
+  >
     <q-card-section
       v-if="props.dialogLabel || localDialogLabel"
       class="text-bold text-left q-mb-none q-pb-none"
@@ -45,11 +50,11 @@
     <q-card-section v-if="props.text" class="text-center" style="white-space: pre-line">{{
       props.text
     }}</q-card-section>
-    <q-card-actions align="left" class="text-primary">
+    <q-card-actions align="right" class="text-primary">
       <q-btn v-if="props.buttonCancelLabel" flat :label="props.buttonCancelLabel" v-close-popup>
       </q-btn>
       <q-btn
-        class="q-mb-xl q-ml-lg q-mt-none"
+        class="q-mb-xl q-mr-lg q-mt-none"
         v-if="props.buttonOkLabel"
         color="primary"
         no-caps
@@ -104,6 +109,10 @@ const props = defineProps({
     type: String,
     default: '300px',
   },
+  height: {
+    type: String,
+    default: '350px',
+  },
 });
 
 const open = (sub: Ref<Subscribe>) => {

src/vueLib/dialog/DialogFrame.vue

@@ -7,18 +7,30 @@
     :no-refocus="!minMaxState"
     :seamless="!minMaxState"
   >
-    <q-card class="layout" :style="cardStyle" v-touch-pan.mouse.prevent.stop="handlePan">
+    <q-card class="layout" :style="cardStyle">
-      <div :class="props.headerTitle ? 'row items-center justify-between' : ''">
+      <!-- Draggable Header -->
-        <div v-if="headerTitle" class="q-mx-sm q-mt-xs text-left text-bold text-caption">
+      <div
-          {{ props.headerTitle }}
+        class="dialog-header row items-center justify-between bg-grey-1"
+        v-touch-pan.mouse.prevent.stop="handlePan"
+      >
+        <div v-if="headerTitle" class="text-left text-bold text-caption q-mx-sm">
+          {{ headerTitle }}
         </div>
-        <div class="row justify-end q-mx-sm q-mt-xs">
+        <div class="row justify-end q-mx-sm">
-          <q-btn dense flat :icon="minMaxIcon" size="md" @click="minMax()"></q-btn>
+          <q-btn dense flat :icon="minMaxIcon" size="md" @click="minMax" />
-          <q-btn dense flat icon="close" size="md" v-close-popup></q-btn>
+          <q-btn dense flat icon="close" size="md" v-close-popup />
         </div>
       </div>
-      <q-separator color="black" class="q-my-none" />
+
-      <div class="scrollArea"><slot /></div>
+      <q-separator color="black" />
+
+      <!-- Content Slot -->
+      <div class="scrollArea">
+        <slot />
+      </div>
+
+      <!-- Resize Handle -->
+      <div v-if="!minMaxState" class="resize-handle" @mousedown.prevent="startResizing" />
     </q-card>
   </q-dialog>
 </template>
@@ -29,54 +41,107 @@ import { ref, computed } from 'vue';
 const dialogRef = ref();
 const open = () => dialogRef.value?.show();
 const close = () => dialogRef.value?.hide();
+defineExpose({ open, close });
 
+const props = defineProps({
+  headerTitle: { type: String, default: '' },
+  width: { type: String, default: '400' },
+  height: { type: String, default: '250' },
+});
+
+// Fullscreen toggle
 const minMaxIcon = ref('fullscreen');
 const minMaxState = ref(false);
 function minMax() {
-  if (minMaxState.value) {
-    minMaxIcon.value = 'fullscreen';
-  } else {
-    minMaxIcon.value = 'fullscreen_exit';
-  }
   minMaxState.value = !minMaxState.value;
+  minMaxIcon.value = minMaxState.value ? 'fullscreen_exit' : 'fullscreen';
 }
 
-const props = defineProps({
+// Position and Size
-  headerTitle: {
-    type: String,
-    default: '',
-  },
-  width: {
-    type: String,
-    default: '300px',
-  },
-});
-
 const position = ref({ x: 0, y: 0 });
+const width = ref(parseInt(props.width));
+const height = ref(parseInt(props.height));
 
-// This makes the dialog draggable
+// Dragging (only from header)
 const handlePan = (details: { delta: { x: number; y: number } }) => {
-  position.value.x += details.delta.x;
+  if (!minMaxState.value) {
-  position.value.y += details.delta.y;
+    position.value.x += details.delta.x;
+    position.value.y += details.delta.y;
+  }
 };
 
-const cardStyle = computed(() => ({
+// Resizing
-  width: props.width,
+const isResizing = ref(false);
-  transform: `translate(${position.value.x}px, ${position.value.y}px)`,
+function startResizing(e: MouseEvent) {
-}));
+  isResizing.value = true;
+  const startX = e.clientX;
+  const startY = e.clientY;
+  const startWidth = width.value;
+  const startHeight = height.value;
 
-defineExpose({ open, close });
+  function onMouseMove(e: MouseEvent) {
+    width.value = Math.max(200, startWidth + e.clientX - startX);
+    height.value = Math.max(200, startHeight + e.clientY - startY);
+  }
+
+  function onMouseUp() {
+    isResizing.value = false;
+    window.removeEventListener('mousemove', onMouseMove);
+    window.removeEventListener('mouseup', onMouseUp);
+  }
+
+  window.addEventListener('mousemove', onMouseMove);
+  window.addEventListener('mouseup', onMouseUp);
+}
+
+// Styles
+const cardStyle = computed(() => {
+  if (minMaxState.value) {
+    return {};
+  }
+
+  return {
+    width: `${width.value}px`,
+    height: `${height.value}px`,
+    transform: `translate(${position.value.x}px, ${position.value.y}px)`,
+  };
+});
 </script>
 
 <style scoped>
 .layout {
-  border-radius: 10px;
+  position: relative;
   display: flex;
   flex-direction: column;
+  border-radius: 10px;
+  background-color: white;
 }
+
+/* Draggable header */
+.dialog-header {
+  padding: 8px 0;
+  background: #f5f5f5;
+  cursor: move;
+  user-select: none;
+}
+
+/* Scrollable content */
 .scrollArea {
-  overflow-y: auto;
   flex: 1 1 auto;
   min-height: 0;
+  overflow-y: auto;
+  padding: 16px;
+}
+
+/* Resize handle in bottom right */
+.resize-handle {
+  position: absolute;
+  width: 16px;
+  height: 16px;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.1);
+  cursor: nwse-resize;
+  z-index: 10;
 }
 </style>

src/vueLib/general/useNotify.ts

@@ -22,6 +22,19 @@ export function useNotify() {
         break;
     }
 
+    if (response instanceof Error) {
+      const resp = response as Response;
+      if (resp.response?.data?.error) {
+        $q?.notify({
+          message: resp.response.data.message as string,
+          color: color,
+          position: 'bottom-right',
+          icon: icon,
+          timeout: timeout,
+        });
+        return;
+      }
+    }
     if (response) {
       const message = typeof response === 'string' ? response : (response.message ?? '');
       if (message === '') {

src/vueLib/login/LoginForm.vue

@@ -0,0 +1,109 @@
+<template>
+  <DialogFrame ref="Dialog" width="300px" height="380px" header-title="Login">
+    <div class="text-black"></div>
+    <q-form ref="refForm">
+      <q-item-section class="q-gutter-md q-pa-md">
+        <q-card :class="['q-gutter-xs q-items-center q-pa-lg', { shake: shake }]">
+          <div class="text-h5 text-primary text-center">{{ productName }}</div>
+          <q-input
+            ref="refUserInput"
+            dense
+            filled
+            type="text"
+            label="User"
+            v-model="user"
+            :rules="[(val) => !!val || 'User is required']"
+          ></q-input>
+          <q-input
+            dense
+            filled
+            type="password"
+            label="Password"
+            v-model="password"
+            @keyup.enter="onSubmit"
+            :rules="[(val) => !!val || 'Password is required']"
+          ></q-input>
+          <div class="q-pt-sm q-mr-md row justify-end">
+            <q-btn color="primary" label="Login" @click="onSubmit"></q-btn>
+          </div>
+        </q-card>
+      </q-item-section>
+    </q-form>
+  </DialogFrame>
+</template>
+
+<script setup lang="ts">
+import { productName } from '../../../package.json';
+import { ref, nextTick } from 'vue';
+import DialogFrame from '../dialog/DialogFrame.vue';
+import { useNotify } from '../general/useNotify';
+import { useLogin } from './login';
+
+const { NotifyResponse } = useNotify();
+const Dialog = ref();
+const refForm = ref();
+const refUserInput = ref();
+const user = ref('');
+const password = ref('');
+const { login } = useLogin();
+
+const shake = ref(false);
+
+const open = () => {
+  Dialog.value?.open();
+  nextTick(() => {
+    refUserInput.value?.focus();
+  }).catch((err) => console.error(err));
+};
+
+const onSubmit = () => {
+  refForm.value?.validate().then((success: boolean) => {
+    if (success) {
+      login(user.value, password.value)
+        .then(() => {
+          NotifyResponse("logged in as '" + user.value + "'");
+          Dialog.value.close();
+        })
+        .catch((err) => {
+          NotifyResponse(err, 'error');
+          shake.value = true;
+          setTimeout(() => {
+            shake.value = false;
+          }, 500);
+        });
+    } else {
+      NotifyResponse('error submitting login form', 'error');
+    }
+  });
+};
+
+defineExpose({ open });
+</script>
+
+<style scoped>
+@keyframes shake {
+  0% {
+    transform: translateX(0);
+  }
+  20% {
+    transform: translateX(-8px);
+  }
+  40% {
+    transform: translateX(8px);
+  }
+  60% {
+    transform: translateX(-6px);
+  }
+  80% {
+    transform: translateX(6px);
+  }
+  100% {
+    transform: translateX(0);
+  }
+}
+
+.shake {
+  animation: shake 0.4s ease;
+  border: 2px solid #f44336;
+}
+</style>

src/vueLib/login/LoginMenu.vue

@@ -0,0 +1,43 @@
+<template>
+  <div class="q-gutter-md">
+    <q-btn dense flat round icon="person" :color="userStore.user ? 'green' : ''">
+      <q-menu ref="refLoginMenu">
+        <q-list style="min-width: 100px">
+          <q-item v-if="userStore.user" class="text-primary">{{ userStore.user?.username }}</q-item>
+          <q-item clickable v-close-popup @click="openLogin">
+            <q-item-section class="text-primary">{{ loginText }}</q-item-section>
+          </q-item>
+        </q-list>
+      </q-menu>
+    </q-btn>
+  </div>
+  <LoginForm ref="refLoginForm"></LoginForm>
+</template>
+
+<script setup lang="ts">
+import LoginForm from './LoginForm.vue';
+import { computed, ref } from 'vue';
+import { useLogin } from './login';
+import { useUserStore } from './userStore';
+import { useNotify } from '../general/useNotify';
+
+const userStore = useUserStore();
+const userLogin = useLogin();
+const { NotifyResponse } = useNotify();
+
+const loginText = computed(() => {
+  return userStore.user ? 'Logout' : 'Login';
+});
+
+const refLoginForm = ref();
+
+function openLogin() {
+  if (userStore.user) {
+    const username = userStore.user.username;
+    userLogin.logout();
+    NotifyResponse("user '" + username + "' logged out", 'warning');
+    return;
+  }
+  refLoginForm.value?.open();
+}
+</script>

src/vueLib/login/login.ts

@@ -0,0 +1,31 @@
+import { appApi } from 'src/boot/axios';
+import { useUserStore } from './userStore';
+
+const useStore = useUserStore();
+
+export function useLogin() {
+  async function login(user: string, password: string) {
+    await appApi
+      .post('/login', { user: user, password: password })
+      .then((resp) => {
+        useStore.setToken(resp.data.token);
+      })
+      .catch((err) => {
+        throw err;
+      });
+  }
+
+  function logout() {
+    useStore.logout();
+  }
+
+  function isTokenValid() {
+    const token = localStorage.getItem('token');
+    if (token === null) return false;
+    const payload = JSON.parse(atob(token.split('.')[1] ?? ''));
+    const currentTime = Math.floor(Date.now() / 1000);
+    return payload.exp > currentTime;
+  }
+
+  return { login, logout, isTokenValid };
+}

src/vueLib/login/userStore.ts

@@ -0,0 +1,80 @@
+import { defineStore } from 'pinia';
+import { jwtDecode } from 'jwt-decode';
+import type { QVueGlobals } from 'quasar';
+
+interface JwtPayload {
+  id: string;
+  role: string;
+  username: string;
+  exp?: number;
+  iat?: number;
+}
+
+interface UserState {
+  token: string | null;
+  user: JwtPayload | null;
+}
+
+let $q = <QVueGlobals>{};
+
+export const useUserStore = defineStore('user', {
+  state: (): UserState => ({
+    token: null,
+    user: null,
+  }),
+  getters: {
+    isAuthenticated: (state): boolean => !!state.token && !!state.user,
+  },
+  actions: {
+    isAuthorizedAs(roles: string[]) {
+      return !!this.token && !!this.user && roles.includes(this.user.role);
+    },
+    setToken(token: string) {
+      try {
+        const decoded = jwtDecode<JwtPayload>(token);
+        this.token = token;
+        this.user = decoded;
+        localStorage.setItem('token', token);
+
+        if (decoded.exp) {
+          const timeUntilExpiry = decoded.exp * 1000 - Date.now();
+          if (timeUntilExpiry > 0) {
+            setTimeout(() => {
+              this.logout();
+            }, timeUntilExpiry);
+          } else {
+            this.logout();
+          }
+        }
+      } catch (err) {
+        console.error('Invalid token:', err);
+        this.logout();
+      }
+    },
+    logout() {
+      $q?.notify({
+        message: "user '" + this.user?.username + "' logged out",
+        color: 'orange',
+        position: 'bottom-right',
+        icon: 'warning',
+        timeout: 5000,
+      });
+      this.token = null;
+      this.user = null;
+      localStorage.removeItem('token');
+
+      setTimeout(() => {
+        window.location.href = '/';
+      }, 5000);
+    },
+    loadFromStorage() {
+      const token = localStorage.getItem('token');
+      if (token) {
+        this.setToken(token);
+      }
+    },
+    initStore(q: QVueGlobals) {
+      $q = q;
+    },
+  },
+});

src/vueLib/models/Request.ts

@@ -2,7 +2,7 @@ import type { Driver } from './Drivers';
 import type { Gets } from './Get';
 import type { Sets } from './Set';
 import type { Subs } from './Subscribe';
-import { api } from 'src/boot/axios';
+import { dbmApi } from 'src/boot/axios';
 
 export type Request = {
   get?: Gets;
@@ -25,7 +25,7 @@ export async function getRequest(
     payload = { path: path, query: { depth: depth } };
   }
 
-  const resp = await api.post(query, {
+  const resp = await dbmApi.post(query, {
     get: [payload],
   });
 
@@ -37,7 +37,7 @@ export async function getRequest(
 }
 
 export async function getRequests(gets: Gets): Promise<Gets> {
-  const resp = await api.post(query, {
+  const resp = await dbmApi.post(query, {
     get: gets,
   });
 
@@ -49,7 +49,7 @@ export async function getRequests(gets: Gets): Promise<Gets> {
 }
 
 export async function rawSetsRequest(sets: Sets): Promise<Sets> {
-  const resp = await api.post(query, {
+  const resp = await dbmApi.post(query, {
     set: sets,
   });
 
@@ -79,7 +79,7 @@ export async function setRequest(
     rename: rename,
   };
 
-  const resp = await api.post(query, {
+  const resp = await dbmApi.post(query, {
     set: [payload],
   });
 
@@ -91,7 +91,7 @@ export async function setRequest(
 }
 
 export async function setsRequest(sets: Sets): Promise<Sets> {
-  const resp = await api.post(query, {
+  const resp = await dbmApi.post(query, {
     set: sets,
   });
 
@@ -114,7 +114,7 @@ export async function deleteRequest(
   } else if (path) {
     payload = { path: path, driver: driver };
   }
-  const resp = await api.delete('/json_data', {
+  const resp = await dbmApi.delete('/json_data', {
     data: {
       set: [payload],
     },

src/vueLib/models/Response.ts

@@ -11,4 +11,10 @@ export type Response = {
   publish?: Pubs;
   error?: boolean;
   message?: string;
+  response?: {
+    data?: {
+      error?: boolean;
+      message?: string;
+    };
+  };
 };

src/vueLib/models/driverTable.ts

@@ -1,9 +1,13 @@
 import { reactive, ref } from 'vue';
 import type { QTableColumn } from 'quasar';
 import type { Subscribe } from './Subscribe';
+import type { Bus } from './Bus';
+import type { Topic } from './Topic';
 
 export type DriverTableRow = {
   type: string;
+  buses?: Bus[];
+  topic?: Topic;
   bus: string;
   address?: number | undefined;
   subscribe?: string;

src/vueLib/services/dialog/ServiceDialog.vue

@@ -0,0 +1,38 @@
+<template>
+  <DialogFrame ref="refDialog" width="500px" header-title="Add new Service">
+    <div class="row justify-center">
+      <q-select class="col-4" :options="opts" v-model="option"></q-select>
+    </div>
+    <!-- <q-table :rows="driverRows"> </q-table> -->
+  </DialogFrame>
+</template>
+
+<script setup lang="ts">
+import DialogFrame from 'src/vueLib/dialog/DialogFrame.vue';
+import { ref } from 'vue';
+import { useNotify } from 'src/vueLib/general/useNotify';
+import { appApi } from 'src/boot/axios';
+
+const { NotifyResponse } = useNotify();
+
+const refDialog = ref();
+const driverRows = ref([]);
+const opts = ref();
+const option = ref('Choose new service');
+
+interface conf {
+  name: string;
+}
+function open() {
+  appApi
+    .get('/allDrivers')
+    .then((resp) => {
+      driverRows.value = resp.data;
+      opts.value = resp.data.map((item: conf) => item.name);
+    })
+    .catch((err) => NotifyResponse(err, 'error'));
+  refDialog.value.open();
+}
+
+defineExpose({ open });
+</script>