Merge pull request #9 from typomedia/send_email

Send email

Author: typomedia

.gitignore

@@ -1,4 +1,5 @@
 .idea/
 .vscode/
 dist/
-*.boltdb
+*.boltdb
+tmp/

Makefile

@@ -1,13 +1,14 @@
-build:
-	go mod tidy
+build: tidy
 	go build -ldflags "-s -w" -o dist/ .
 
-run:
+tidy:
 	go mod tidy
-	go run main.go
 
-compile:
-	go mod tidy
+run: tidy
+	go install github.com/air-verse/air@latest
+	air
+
+compile: tidy
 	GOOS=linux GOARCH=amd64 go build -ldflags "-s -w" -o dist/patchouli-linux-amd64 .
 	GOOS=darwin GOARCH=amd64 go build -ldflags "-s -w" -o dist/patchouli-macos-amd64 .
 	GOOS=windows GOARCH=amd64 go build -ldflags "-s -w" -o dist/patchouli-windows-amd64.exe .

app/app.go

@@ -0,0 +1,27 @@
+package app
+
+var app *Application
+
+type Application struct {
+	Name         string
+	Version      string
+	Author       string
+	Description  string
+	MailTemplate string
+}
+
+func new() *Application {
+	app = &Application{}
+	app.Name = "Patchouli"
+	app.Version = "0.2.0"
+	app.Author = "Philipp Speck <[email protected]>"
+	app.Description = "Patch Management Planner"
+
+	return app
+}
+func GetApp() *Application {
+	if app == nil {
+		app = new()
+	}
+	return app
+}

app/handler/config/edit.go

@@ -4,6 +4,7 @@ import (
 	"github.com/gofiber/fiber/v2"
 	"github.com/typomedia/patchouli/app/store/boltdb"
 	"github.com/typomedia/patchouli/app/structs"
+	"golang.org/x/crypto/bcrypt"
 )
 
 func Edit(c *fiber.Ctx) error {
@@ -16,7 +17,13 @@ func Edit(c *fiber.Ctx) error {
 
 	var config structs.Config
 	db.Get("main", &config, "config")
-
+	if config.Smtp.Password != "" {
+		passwordHash, err := bcrypt.GenerateFromPassword([]byte(config.Smtp.Password), bcrypt.DefaultCost)
+		if err != nil {
+			return err
+		}
+		config.Smtp.Password = string(passwordHash)
+	}
 	defer db.Close()
 	return c.Render("app/views/config/edit", fiber.Map{
 		"Config": config,

app/handler/dashboard/filter/operator.go

@@ -0,0 +1,92 @@
+package filter
+
+import (
+	"encoding/json"
+	"sort"
+	"time"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/typomedia/patchouli/app/helper"
+	"github.com/typomedia/patchouli/app/store/boltdb"
+	"github.com/typomedia/patchouli/app/structs"
+)
+
+func Operator(c *fiber.Ctx) error {
+	id := c.Params("id")
+	db := boltdb.New()
+
+	err := db.SetBucket("machine")
+	if err != nil {
+		return err
+	}
+
+	machines, _ := db.GetAllByOperatorId(id, "machine")
+
+	Machines := structs.Machines{}
+	for _, v := range machines {
+		machine := structs.Machine{}
+		err = json.Unmarshal(v, &machine)
+		if err != nil {
+			return err
+		}
+
+		lastUpdate, _ := db.GetLastByName(machine.Id, "history")
+
+		update := structs.Update{}
+		err = json.Unmarshal(lastUpdate, &update)
+		if err != nil {
+			log.Error(err)
+		}
+
+		machine.Update = update
+
+		Machines = append(Machines, machine)
+
+	}
+
+	// sort machines by oldest update first
+	sort.Sort(structs.ByDate(Machines))
+
+	err = db.SetBucket("config")
+	if err != nil {
+		return err
+	}
+
+	var config structs.Config
+	db.Get("main", &config, "config")
+
+	defer db.Close()
+
+	interval := config.General.Interval
+	for i := range Machines {
+		currentDate := time.Now()
+
+		if Machines[i].Update.Date == "" {
+			Machines[i].Update.Date = "0000-00-00"
+			Machines[i].Status = "danger"
+			continue
+		}
+
+		Machines[i].Update.Date = helper.UnixToDateString(Machines[i].Update.Date)
+
+		date, err := time.Parse("2006-01-02", Machines[i].Update.Date)
+		if err != nil {
+			log.Error(err)
+		}
+
+		Machines[i].Days = int(currentDate.Sub(date).Hours() / 24)
+		if Machines[i].Days > interval {
+			Machines[i].Status = "danger"
+		} else if Machines[i].Days > interval/3 {
+			Machines[i].Status = "warning"
+		} else {
+			Machines[i].Status = "success"
+		}
+		Machines[i].Days = interval - int(currentDate.Sub(date).Hours()/24)
+
+	}
+	return c.Render("app/views/dashboard/list", fiber.Map{
+		"Machines": Machines,
+	})
+}

app/handler/dashboard/list.go

@@ -2,13 +2,14 @@ package dashboard
 
 import (
 	"encoding/json"
+	"sort"
+	"time"
+
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/log"
 	"github.com/typomedia/patchouli/app/helper"
 	"github.com/typomedia/patchouli/app/store/boltdb"
 	"github.com/typomedia/patchouli/app/structs"
-	"sort"
-	"time"
 )
 
 func List(c *fiber.Ctx) error {
@@ -31,15 +32,18 @@ func List(c *fiber.Ctx) error {
 
 		lastUpdate, _ := db.GetLastByName(machine.Id, "history")
 
-		update := structs.Update{}
-		err = json.Unmarshal(lastUpdate, &update)
-		if err != nil {
-			log.Error(err)
+		if lastUpdate != nil {
+			update := structs.Update{}
+			err = json.Unmarshal(lastUpdate, &update)
+			if err != nil {
+				log.Error(err)
+			}
+			machine.Update = update
 		}
 
-		machine.Update = update
-
-		Machines = append(Machines, machine)
+		if !machine.Inactive {
+			Machines = append(Machines, machine)
+		}
 
 	}
 
@@ -56,7 +60,7 @@ func List(c *fiber.Ctx) error {
 
 	defer db.Close()
 
-	interval := config.Interval
+	interval := config.General.Interval
 	for i := range Machines {
 		currentDate := time.Now()
 

app/handler/machine/activate.go

@@ -0,0 +1,35 @@
+package machine
+
+import (
+	"github.com/gofiber/fiber/v2"
+	"github.com/typomedia/patchouli/app/store/boltdb"
+	"github.com/typomedia/patchouli/app/structs"
+)
+
+func Activate(c *fiber.Ctx) error {
+	machineId := c.Params("id")
+
+	db := boltdb.New()
+
+	err := db.SetBucket("machine")
+	if err != nil {
+		return err
+	}
+	defer db.Close()
+
+	var machine structs.Machine
+	err = db.Get(machineId, &machine, "machine")
+	if err != nil {
+		return err
+	}
+
+	machine.Inactive = false
+
+	err = db.Set(machineId, machine, "machine")
+
+	if err != nil {
+		return err
+	}
+
+	return c.Redirect("/machine")
+}

app/handler/machine/deactivate.go

@@ -0,0 +1,34 @@
+package machine
+
+import (
+	"github.com/gofiber/fiber/v2"
+	"github.com/typomedia/patchouli/app/store/boltdb"
+	"github.com/typomedia/patchouli/app/structs"
+)
+
+func Deactivate(c *fiber.Ctx) error {
+	machineId := c.Params("id")
+
+	db := boltdb.New()
+
+	err := db.SetBucket("machine")
+	if err != nil {
+		return err
+	}
+	defer db.Close()
+
+	var machine structs.Machine
+	err = db.Get(machineId, &machine, "machine")
+	if err != nil {
+		return err
+	}
+
+	machine.Inactive = true
+	err = db.Set(machineId, machine, "machine")
+
+	if err != nil {
+		return err
+	}
+
+	return c.Redirect("/machine")
+}

app/handler/machine/filter/operator.go

@@ -0,0 +1,40 @@
+package filter
+
+import (
+	"encoding/json"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/typomedia/patchouli/app/store/boltdb"
+	"github.com/typomedia/patchouli/app/structs"
+)
+
+func Operator(c *fiber.Ctx) error {
+	id := c.Params("id")
+	db := boltdb.New()
+
+	// set bucket
+	err := db.SetBucket("machine")
+	if err != nil {
+		return err
+	}
+
+	machines, _ := db.GetAllByOperatorId(id, "machine")
+
+	Machines := structs.Machines{}
+
+	for _, v := range machines {
+		machine := structs.Machine{}
+		err = json.Unmarshal(v, &machine)
+		if err != nil {
+			return err
+		}
+		Machines = append(Machines, machine)
+
+	}
+
+	defer db.Close()
+
+	return c.Render("app/views/machine/list", fiber.Map{
+		"Machines": Machines,
+	})
+}

app/handler/machine/list.go

@@ -2,6 +2,7 @@ package machine
 
 import (
 	"encoding/json"
+
 	"github.com/gofiber/fiber/v2"
 	"github.com/typomedia/patchouli/app/store/boltdb"
 	"github.com/typomedia/patchouli/app/structs"
@@ -19,17 +20,24 @@ func List(c *fiber.Ctx) error {
 	machines, _ := db.GetAll("machine")
 
 	Machines := structs.Machines{}
+	inactiveMachines := structs.Machines{}
 
 	for _, v := range machines {
 		machine := structs.Machine{}
 		err = json.Unmarshal(v, &machine)
 		if err != nil {
 			return err
 		}
-		Machines = append(Machines, machine)
+		if machine.Inactive {
+			inactiveMachines = append(inactiveMachines, machine)
+		} else {
+			Machines = append(Machines, machine)
 
+		}
 	}
 
+	Machines = append(Machines, inactiveMachines...)
+
 	defer db.Close()
 
 	return c.Render("app/views/machine/list", fiber.Map{