02fbca1 Refactor and simplify the project structure between the server and the · gordon

M cmd/cli/main.go +16 -3


@@ -3,14 +3,27 @@ package main
3	3		import (
4	4		"fmt"
5	5
6		-	"github.com/bnema/gordon/internal/app"
7	6		"github.com/bnema/gordon/internal/cli"
	7	+	"github.com/bnema/gordon/internal/cli/cmd"
	8	+	"github.com/spf13/cobra"
8	9		)
9	10
	11	+	var rootCmd = &cobra.Command{Use: "gordon"}
	12	+
	13	+	func InitializeCommands(a *cli.App) {
	14	+	// rootCmd.AddCommand(cmd.NewHelloCommand(a))
	15	+	rootCmd.AddCommand(cmd.NewPingCommand(a))
	16	+	}
	17	+
	18	+	func Execute(a *cli.App) {
	19	+	InitializeCommands(a)
	20	+	cobra.CheckErr(rootCmd.Execute())
	21	+	}
	22	+
10	23		func main() {
11		-	a, err := app.NewClientApp()
	24	+	a, err := cli.NewClientApp()
12	25		if err != nil {
13	26		fmt.Println("Error initializing app:", err)
14	27		}
15		-	cli.Execute(a)
	28	+	Execute(a)
16	29		}

 import (
 	"fmt"
-	"github.com/bnema/gordon/internal/app"
 	"github.com/bnema/gordon/internal/cli"
+	"github.com/bnema/gordon/internal/cli/cmd"
+	"github.com/spf13/cobra"
 )
+var rootCmd = &cobra.Command{Use: "gordon"}
+func InitializeCommands(a *cli.App) {
+	// rootCmd.AddCommand(cmd.NewHelloCommand(a))
+	rootCmd.AddCommand(cmd.NewPingCommand(a))
+}
+func Execute(a *cli.App) {
+	InitializeCommands(a)
+	cobra.CheckErr(rootCmd.Execute())
+}
 func main() {
-	a, err := app.NewClientApp()
+	a, err := cli.NewClientApp()
 	if err != nil {
 		fmt.Println("Error initializing app:", err)
 	}
-	cli.Execute(a)
+	Execute(a)
 }

M cmd/srv/main.go +6 -6


@@ -9,26 +9,26 @@ import (
9	9
10	10		"github.com/labstack/echo/v4"
11	11
12		-	"github.com/bnema/gordon/internal/app"
13	12		"github.com/bnema/gordon/internal/httpserve"
	13	+	"github.com/bnema/gordon/internal/server"
14	14		"github.com/bnema/gordon/pkg/docker"
15	15		)
16	16
17		-	func cleanup(a *app.App) {
18		-	if err := app.CloseDB(a); err != nil {
	17	+	func cleanup(a *server.App) {
	18	+	if err := server.CloseDB(a); err != nil {
19	19		log.Fatal("Failed to close and backup database:", err)
20	20		}
21	21		}
22	22
23	23		func main() {
24		-	a := app.NewServerApp()
	24	+	a := server.NewServerApp()
25	25
26		-	_, err := app.InitializeDB(a)
	26	+	_, err := server.InitializeDB(a)
27	27		if err != nil {
28	28		log.Fatal("Failed to initialize database:", err)
29	29		}
30	30
31		-	_, err = app.HandleNewTokenInitialization(a)
	31	+	_, err = server.HandleNewTokenInitialization(a)
32	32		if err != nil {
33	33		log.Print(err)
34	34		}

 	"github.com/labstack/echo/v4"
-	"github.com/bnema/gordon/internal/app"
 	"github.com/bnema/gordon/internal/httpserve"
+	"github.com/bnema/gordon/internal/server"
 	"github.com/bnema/gordon/pkg/docker"
 )
-func cleanup(a *app.App) {
+func cleanup(a *server.App) {
-	if err := app.CloseDB(a); err != nil {
+	if err := server.CloseDB(a); err != nil {
 		log.Fatal("Failed to close and backup database:", err)
 	}
 }
 func main() {
-	a := app.NewServerApp()
+	a := server.NewServerApp()
-	_, err := app.InitializeDB(a)
+	_, err := server.InitializeDB(a)
 	if err != nil {
 		log.Fatal("Failed to initialize database:", err)
 	}
-	_, err = app.HandleNewTokenInitialization(a)
+	_, err = server.HandleNewTokenInitialization(a)
 	if err != nil {
 		log.Print(err)
 	}

A internal/cli/appcli.go +18 -0

@@ -0,0 +1,18 @@
	1	+	package cli
	2	+
	3	+	type App struct {
	4	+	Config Config
	5	+	}
	6	+
	7	+	type Config struct {
	8	+	General GeneralConfig `yaml:"General"`
	9	+	Http HttpConfig `yaml:"Http"`
	10	+	}
	11	+
	12	+	type GeneralConfig struct {
	13	+	Token string `yaml:"token"`
	14	+	}
	15	+
	16	+	type HttpConfig struct {
	17	+	BackendURL string `yaml:"backendURL"`
	18	+	}

@@ -0,0 +1,18 @@
	1	+	package cli
	2	+
	3	+	type App struct {
	4	+	Config Config
	5	+	}
	6	+
	7	+	type Config struct {
	8	+	General GeneralConfig `yaml:"General"`
	9	+	Http HttpConfig `yaml:"Http"`
	10	+	}
	11	+
	12	+	type GeneralConfig struct {
	13	+	Token string `yaml:"token"`
	14	+	}
	15	+
	16	+	type HttpConfig struct {
	17	+	BackendURL string `yaml:"backendURL"`
	18	+	}

D internal/cli/cli.go +0 -19

@@ -1,19 +0,0 @@
1	-	package cli
2	-
3	-	import (
4	-	"github.com/bnema/gordon/internal/app"
5	-	"github.com/bnema/gordon/internal/cli/cmd"
6	-	"github.com/spf13/cobra"
7	-	)
8	-
9	-	var rootCmd = &cobra.Command{Use: "gordon"}
10	-
11	-	func InitializeCommands(a *app.App) {
12	-	// rootCmd.AddCommand(cmd.NewHelloCommand(a))
13	-	rootCmd.AddCommand(cmd.NewPingCommand(a))
14	-	}
15	-
16	-	func Execute(a *app.App) {
17	-	InitializeCommands(a)
18	-	cobra.CheckErr(rootCmd.Execute())
19	-	}

@@ -1,19 +0,0 @@
1	-	package cli
2	-
3	-	import (
4	-	"github.com/bnema/gordon/internal/app"
5	-	"github.com/bnema/gordon/internal/cli/cmd"
6	-	"github.com/spf13/cobra"
7	-	)
8	-
9	-	var rootCmd = &cobra.Command{Use: "gordon"}
10	-
11	-	func InitializeCommands(a *app.App) {
12	-	// rootCmd.AddCommand(cmd.NewHelloCommand(a))
13	-	rootCmd.AddCommand(cmd.NewPingCommand(a))
14	-	}
15	-
16	-	func Execute(a *app.App) {
17	-	InitializeCommands(a)
18	-	cobra.CheckErr(rootCmd.Execute())
19	-	}

M internal/cli/cmd/ping.go +3 -2


@@ -3,13 +3,14 @@ package cmd
3	3		import (
4	4		"fmt"
5	5
6		-	"github.com/bnema/gordon/internal/app"
	6	+	"github.com/bnema/gordon/internal/cli"
7	7		"github.com/bnema/gordon/internal/cli/handler"
8	8		"github.com/bnema/gordon/internal/common"
	9	+
9	10		"github.com/spf13/cobra"
10	11		)
11	12
12		-	func NewPingCommand(a app.App) cobra.Command {
	13	+	func NewPingCommand(a cli.App) cobra.Command {
13	14		return &cobra.Command{
14	15		Use: "ping",
15	16		Short: "Send a ping request to the backend",


@@ -3,13 +3,14 @@ package cmd
3		import (	3		import (
4		"fmt"	4		"fmt"
5			5
6	-	"github.com/bnema/gordon/internal/app"	6	+	"github.com/bnema/gordon/internal/cli"
7		"github.com/bnema/gordon/internal/cli/handler"	7		"github.com/bnema/gordon/internal/cli/handler"
8		"github.com/bnema/gordon/internal/common"	8		"github.com/bnema/gordon/internal/common"
			9	+
9		"github.com/spf13/cobra"	10		"github.com/spf13/cobra"
10		)	11		)
11			12
12	-	func NewPingCommand(a app.App) cobra.Command {	13	+	func NewPingCommand(a cli.App) cobra.Command {
13		return &cobra.Command{	14		return &cobra.Command{
14		Use: "ping",	15		Use: "ping",
15		Short: "Send a ping request to the backend",	16		Short: "Send a ping request to the backend",

M internal/cli/cmd/serve.go +2 -2


@@ -3,14 +3,14 @@
3	3		package cmd
4	4
5	5		import (
6		-	"github.com/bnema/gordon/internal/app"
7	6		"github.com/bnema/gordon/internal/cli/handler"
	7	+	"github.com/bnema/gordon/internal/server"
8	8		"github.com/spf13/cobra"
9	9		)
10	10
11	11		// execute cmd/srv/main.go main function
12	12
13		-	func NewServeCommand(a app.App) cobra.Command {
	13	+	func NewServeCommand(a server.App) cobra.Command {
14	14		return &cobra.Command{
15	15		Use: "serve",
16	16		Short: "Start the gordon server",

 package cmd
 import (
-	"github.com/bnema/gordon/internal/app"
 	"github.com/bnema/gordon/internal/cli/handler"
+	"github.com/bnema/gordon/internal/server"
 	"github.com/spf13/cobra"
 )
 // execute cmd/srv/main.go main function
-func NewServeCommand(a *app.App) *cobra.Command {
+func NewServeCommand(a *server.App) *cobra.Command {
 	return &cobra.Command{
 		Use:   "serve",
 		Short: "Start the gordon server",

M internal/cli/handler/http.go +3 -3


@@ -7,7 +7,7 @@ import (
7	7		"io"
8	8		"net/http"
9	9
10		-	"github.com/bnema/gordon/internal/app"
	10	+	"github.com/bnema/gordon/internal/cli"
11	11		"github.com/bnema/gordon/internal/common"
12	12		)
13	13

@@ -39,9 +39,9 @@ type Response struct {
39	39		}
40	40
41	41		// SendHTTPRequest sends the HTTP request
42		-	func SendHTTPRequest(a app.App, rp common.RequestPayload, endpoint string) (*Response, error) {
	42	+	func SendHTTPRequest(a cli.App, rp common.RequestPayload, endpoint string) (*Response, error) {
43	43		apiUrl := a.Config.Http.BackendURL + "/api"
44		-	token := a.Config.General.GordonToken
	44	+	token := a.Config.General.Token
45	45
46	46		// Prepare the entire RequestPayload, not just the inner Payload
47	47		jsonPayload, err := json.Marshal(rp)


@@ -7,7 +7,7 @@ import (
7		"io"	7		"io"
8		"net/http"	8		"net/http"
9			9
10	-	"github.com/bnema/gordon/internal/app"	10	+	"github.com/bnema/gordon/internal/cli"
11		"github.com/bnema/gordon/internal/common"	11		"github.com/bnema/gordon/internal/common"
12		)	12		)
13			13

@@ -39,9 +39,9 @@ type Response struct {
39		}	39		}
40			40
41		// SendHTTPRequest sends the HTTP request	41		// SendHTTPRequest sends the HTTP request
42	-	func SendHTTPRequest(a app.App, rp common.RequestPayload, endpoint string) (*Response, error) {	42	+	func SendHTTPRequest(a cli.App, rp common.RequestPayload, endpoint string) (*Response, error) {
43		apiUrl := a.Config.Http.BackendURL + "/api"	43		apiUrl := a.Config.Http.BackendURL + "/api"
44	-	token := a.Config.General.GordonToken	44	+	token := a.Config.General.Token
45			45
46		// Prepare the entire RequestPayload, not just the inner Payload	46		// Prepare the entire RequestPayload, not just the inner Payload
47		jsonPayload, err := json.Marshal(rp)	47		jsonPayload, err := json.Marshal(rp)

M internal/cli/handler/startserver.go +2 -2

@@ -1,9 +1,9 @@
1	1		package handler
2	2
3		-	import "github.com/bnema/gordon/internal/app"
	3	+	import "github.com/bnema/gordon/internal/server"
4	4
5	5		// execute cmd/srv/main.go main function
6	6
7		-	func StartServer(a *app.App) error {
	7	+	func StartServer(a *server.App) error {
8	8		return nil
9	9		}

@@ -1,9 +1,9 @@
1		package handler	1		package handler
2			2
3	-	import "github.com/bnema/gordon/internal/app"	3	+	import "github.com/bnema/gordon/internal/server"
4			4
5		// execute cmd/srv/main.go main function	5		// execute cmd/srv/main.go main function
6			6
7	-	func StartServer(a *app.App) error {	7	+	func StartServer(a *server.App) error {
8		return nil	8		return nil
9		}	9		}

R internal/app/newclient.go → internal/cli/newclient.go +2 -2 renamed, 96% similar

@@ -1,4 +1,4 @@
1		-	package app
	1	+	package cli
2	2
3	3		import (
4	4		"fmt"

@@ -86,7 +86,7 @@ func (config Config) LoadClientConfig() (Config, error) {
86	86		fmt.Printf("Config file not found, creating it at %s\n", configFilePath)
87	87
88	88		config.Http.BackendURL = readUserInput("Enter the backend URL (e.g. https://gordon.mydomain.com):")
89		-	config.General.GordonToken = readUserInput("Enter the token (check your backend config.yml):")
	89	+	config.General.Token = readUserInput("Enter the token (check your backend config.yml):")
90	90
91	91		err = config.SaveConfig()
92	92		if err != nil {

@@ -1,4 +1,4 @@
1	-	package app	1	+	package cli
2			2
3		import (	3		import (
4		"fmt"	4		"fmt"

@@ -86,7 +86,7 @@ func (config Config) LoadClientConfig() (Config, error) {
86		fmt.Printf("Config file not found, creating it at %s\n", configFilePath)	86		fmt.Printf("Config file not found, creating it at %s\n", configFilePath)
87			87
88		config.Http.BackendURL = readUserInput("Enter the backend URL (e.g. https://gordon.mydomain.com):")	88		config.Http.BackendURL = readUserInput("Enter the backend URL (e.g. https://gordon.mydomain.com):")
89	-	config.General.GordonToken = readUserInput("Enter the token (check your backend config.yml):")	89	+	config.General.Token = readUserInput("Enter the token (check your backend config.yml):")
90			90
91		err = config.SaveConfig()	91		err = config.SaveConfig()
92		if err != nil {	92		if err != nil {

M internal/db/queries/account.go +4 -4

@@ -1,11 +1,11 @@
1	1		package queries
2	2
3	3		import (
4		-	"github.com/bnema/gordon/internal/app"
5	4		"github.com/bnema/gordon/internal/db"
	5	+	"github.com/bnema/gordon/internal/server"
6	6		)
7	7
8		-	func createDBAccount(a app.App) (db.Account, error) {
	8	+	func createDBAccount(a server.App) (db.Account, error) {
9	9		account := &db.Account{
10	10		ID: generateUUID(),
11	11		}

@@ -17,7 +17,7 @@ func createDBAccount(a app.App) (db.Account, error) {
17	17		return account, err
18	18		}
19	19
20		-	func CheckDBAccountExists(a *app.App, accountID string) (bool, error) {
	20	+	func CheckDBAccountExists(a *server.App, accountID string) (bool, error) {
21	21		var exists bool
22	22		err := a.DB.QueryRow("SELECT EXISTS(SELECT 1 FROM account WHERE id = ?)", accountID).Scan(&exists)
23	23		if err != nil {

@@ -26,7 +26,7 @@ func CheckDBAccountExists(a *app.App, accountID string) (bool, error) {
26	26		return exists, nil
27	27		}
28	28
29		-	func PopulateAccountFromDB(a *app.App) error {
	29	+	func PopulateAccountFromDB(a *server.App) error {
30	30		rows, err := a.DB.Query("SELECT id, user_id FROM account")
31	31		if err != nil {
32	32		return err

 package queries
 import (
-	"github.com/bnema/gordon/internal/app"
 	"github.com/bnema/gordon/internal/db"
+	"github.com/bnema/gordon/internal/server"
 )
-func createDBAccount(a *app.App) (*db.Account, error) {
+func createDBAccount(a *server.App) (*db.Account, error) {
 	account := &db.Account{
 		ID: generateUUID(),
 	}
 	return account, err
 }
-func CheckDBAccountExists(a *app.App, accountID string) (bool, error) {
+func CheckDBAccountExists(a *server.App, accountID string) (bool, error) {
 	var exists bool
 	err := a.DB.QueryRow("SELECT EXISTS(SELECT 1 FROM account WHERE id = ?)", accountID).Scan(&exists)
 	if err != nil {
 	return exists, nil
 }
-func PopulateAccountFromDB(a *app.App) error {
+func PopulateAccountFromDB(a *server.App) error {
 	rows, err := a.DB.Query("SELECT id, user_id FROM account")
 	if err != nil {
 		return err

M internal/db/queries/inspectdb.go +2 -2


@@ -3,11 +3,11 @@ package queries
3	3		import (
4	4		"fmt"
5	5
6		-	"github.com/bnema/gordon/internal/app"
	6	+	"github.com/bnema/gordon/internal/server"
7	7		)
8	8
9	9		// InspectInMemoryDB inspects the in-memory database. (for debug purpose)
10		-	func InspectInMemoryDB(a *app.App) error {
	10	+	func InspectInMemoryDB(a *server.App) error {
11	11		memDb := a.DB
12	12		// Query the sqlite_master table to get a list of all tables
13	13		rows, err := memDb.Query("SELECT name FROM sqlite_master WHERE type='table'")


@@ -3,11 +3,11 @@ package queries
3		import (	3		import (
4		"fmt"	4		"fmt"
5			5
6	-	"github.com/bnema/gordon/internal/app"	6	+	"github.com/bnema/gordon/internal/server"
7		)	7		)
8			8
9		// InspectInMemoryDB inspects the in-memory database. (for debug purpose)	9		// InspectInMemoryDB inspects the in-memory database. (for debug purpose)
10	-	func InspectInMemoryDB(a *app.App) error {	10	+	func InspectInMemoryDB(a *server.App) error {
11		memDb := a.DB	11		memDb := a.DB
12		// Query the sqlite_master table to get a list of all tables	12		// Query the sqlite_master table to get a list of all tables
13		rows, err := memDb.Query("SELECT name FROM sqlite_master WHERE type='table'")	13		rows, err := memDb.Query("SELECT name FROM sqlite_master WHERE type='table'")

M internal/db/queries/provider.go +3 -3

@@ -1,11 +1,11 @@
1	1		package queries
2	2
3	3		import (
4		-	"github.com/bnema/gordon/internal/app"
5	4		"github.com/bnema/gordon/internal/db"
	5	+	"github.com/bnema/gordon/internal/server"
6	6		)
7	7
8		-	func createDBGitHubProvider(a app.App, userInfo GithubUserInfo) error {
	8	+	func createDBGitHubProvider(a server.App, userInfo GithubUserInfo) error {
9	9		provider := &db.Provider{
10	10		ID: generateUUID(),
11	11		Email: userInfo.Emails[0],

@@ -20,7 +20,7 @@ func createDBGitHubProvider(a app.App, userInfo GithubUserInfo) error {
20	20		return err
21	21		}
22	22
23		-	func PopulateProviderFromDB(a *app.App) error {
	23	+	func PopulateProviderFromDB(a *server.App) error {
24	24		rows, err := a.DB.Query("SELECT id, account_id, name, login, avatar_url, profile_url, email FROM provider")
25	25		if err != nil {
26	26		return err

 package queries
 import (
-	"github.com/bnema/gordon/internal/app"
 	"github.com/bnema/gordon/internal/db"
+	"github.com/bnema/gordon/internal/server"
 )
-func createDBGitHubProvider(a *app.App, userInfo *GithubUserInfo) error {
+func createDBGitHubProvider(a *server.App, userInfo *GithubUserInfo) error {
 	provider := &db.Provider{
 		ID:         generateUUID(),
 		Email:      userInfo.Emails[0],
 	return err
 }
-func PopulateProviderFromDB(a *app.App) error {
+func PopulateProviderFromDB(a *server.App) error {
 	rows, err := a.DB.Query("SELECT id, account_id, name, login, avatar_url, profile_url, email FROM provider")
 	if err != nil {
 		return err

M internal/db/queries/sessions.go +7 -7


@@ -5,12 +5,12 @@ import (
5	5		"fmt"
6	6		"time"
7	7
8		-	"github.com/bnema/gordon/internal/app"
9	8		"github.com/bnema/gordon/internal/db"
	9	+	"github.com/bnema/gordon/internal/server"
10	10		)
11	11
12	12		// createSession creates a session for the user.
13		-	func createDBSession(a *app.App, browserInfo string, accessToken string, accountID string) error {
	13	+	func createDBSession(a *server.App, browserInfo string, accessToken string, accountID string) error {
14	14		expireTime := time.Now().Add(time.Hour * 24).Format(time.RFC3339)
15	15		sessions := &db.Sessions{
16	16		ID: generateUUID(),

@@ -32,7 +32,7 @@ func createDBSession(a *app.App, browserInfo string, accessToken string, account
32	32		}
33	33
34	34		// GetDBUserSession gets the user session from the database based on the access token and browser info.
35		-	func GetDBUserSession(a app.App, accessToken string, browserInfo string) (db.Sessions, error) {
	35	+	func GetDBUserSession(a server.App, accessToken string, browserInfo string) (db.Sessions, error) {
36	36		query := "SELECT sessions.id, sessions.account_id, sessions.access_token, sessions.browser_info, sessions.expires, sessions.is_online FROM sessions INNER JOIN account ON sessions.account_id = account.id INNER JOIN provider ON account.id = provider.account_id WHERE sessions.access_token = ? AND sessions.browser_info = ?"
37	37		err := a.DB.QueryRow(query, accessToken, browserInfo).Scan(&a.DBTables.Sessions.ID, &a.DBTables.Sessions.AccountID, &a.DBTables.Sessions.AccessToken, &a.DBTables.Sessions.BrowserInfo, &a.DBTables.Sessions.Expires, &a.DBTables.Sessions.IsOnline)
38	38		if err != nil {

@@ -45,7 +45,7 @@ func GetDBUserSession(a app.App, accessToken string, browserInfo string) (db.S
45	45		return &a.DBTables.Sessions, nil
46	46		}
47	47
48		-	func updateDBSession(a *app.App, accessToken string, browserInfo string) error {
	48	+	func updateDBSession(a *server.App, accessToken string, browserInfo string) error {
49	49		expireTime := time.Now().Add(time.Hour * 24).Format(time.RFC3339)
50	50		query := "UPDATE sessions SET access_token = ?, expires = ? WHERE id = ?"
51	51		_, err := a.DB.Exec(query, accessToken, expireTime, a.DBTables.Sessions.ID)

@@ -56,7 +56,7 @@ func updateDBSession(a *app.App, accessToken string, browserInfo string) error {
56	56		return nil
57	57		}
58	58
59		-	func CreateOrUpdateDBSession(a *app.App, accessToken string, browserInfo string) error {
	59	+	func CreateOrUpdateDBSession(a *server.App, accessToken string, browserInfo string) error {
60	60		// Check if the session exists using the access token and browser info
61	61		session, err := GetDBUserSession(a, accessToken, browserInfo)
62	62		if err != nil && err != sql.ErrNoRows {

@@ -83,7 +83,7 @@ func CreateOrUpdateDBSession(a *app.App, accessToken string, browserInfo string)
83	83		}
84	84
85	85		// SessionCleaner, time as a string
86		-	func SessionCleaner(a *app.App, currentTime string) error {
	86	+	func SessionCleaner(a *server.App, currentTime string) error {
87	87		query := "DELETE FROM sessions WHERE expires < ?"
88	88		_, err := a.DB.Exec(query, currentTime)
89	89		if err != nil {

@@ -93,7 +93,7 @@ func SessionCleaner(a *app.App, currentTime string) error {
93	93		return nil
94	94		}
95	95
96		-	func GetSessionExpiration(a *app.App, accountID string, sessionID string, currentTime time.Time) (time.Time, error) {
	96	+	func GetSessionExpiration(a *server.App, accountID string, sessionID string, currentTime time.Time) (time.Time, error) {
97	97		var expirationTime string
98	98		// with userID and sessionID we can get the expiration time
99	99		query := "SELECT expires FROM sessions WHERE account_id = ? AND id = ?"

 	"fmt"
 	"time"
-	"github.com/bnema/gordon/internal/app"
 	"github.com/bnema/gordon/internal/db"
+	"github.com/bnema/gordon/internal/server"
 )
 // createSession creates a session for the user.
-func createDBSession(a *app.App, browserInfo string, accessToken string, accountID string) error {
+func createDBSession(a *server.App, browserInfo string, accessToken string, accountID string) error {
 	expireTime := time.Now().Add(time.Hour * 24).Format(time.RFC3339)
 	sessions := &db.Sessions{
 		ID:          generateUUID(),
 }
 // GetDBUserSession gets the user session from the database based on the access token and browser info.
-func GetDBUserSession(a *app.App, accessToken string, browserInfo string) (*db.Sessions, error) {
+func GetDBUserSession(a *server.App, accessToken string, browserInfo string) (*db.Sessions, error) {
 	query := "SELECT sessions.id, sessions.account_id, sessions.access_token, sessions.browser_info, sessions.expires, sessions.is_online FROM sessions INNER JOIN account ON sessions.account_id = account.id INNER JOIN provider ON account.id = provider.account_id WHERE sessions.access_token = ? AND sessions.browser_info = ?"
 	err := a.DB.QueryRow(query, accessToken, browserInfo).Scan(&a.DBTables.Sessions.ID, &a.DBTables.Sessions.AccountID, &a.DBTables.Sessions.AccessToken, &a.DBTables.Sessions.BrowserInfo, &a.DBTables.Sessions.Expires, &a.DBTables.Sessions.IsOnline)
 	if err != nil {
 	return &a.DBTables.Sessions, nil
 }
-func updateDBSession(a *app.App, accessToken string, browserInfo string) error {
+func updateDBSession(a *server.App, accessToken string, browserInfo string) error {
 	expireTime := time.Now().Add(time.Hour * 24).Format(time.RFC3339)
 	query := "UPDATE sessions SET access_token = ?, expires = ? WHERE id = ?"
 	_, err := a.DB.Exec(query, accessToken, expireTime, a.DBTables.Sessions.ID)
 	return nil
 }
-func CreateOrUpdateDBSession(a *app.App, accessToken string, browserInfo string) error {
+func CreateOrUpdateDBSession(a *server.App, accessToken string, browserInfo string) error {
 	// Check if the session exists using the access token and browser info
 	session, err := GetDBUserSession(a, accessToken, browserInfo)
 	if err != nil && err != sql.ErrNoRows {
 }
 // SessionCleaner, time as a string
-func SessionCleaner(a *app.App, currentTime string) error {
+func SessionCleaner(a *server.App, currentTime string) error {
 	query := "DELETE FROM sessions WHERE expires < ?"
 	_, err := a.DB.Exec(query, currentTime)
 	if err != nil {
 	return nil
 }
-func GetSessionExpiration(a *app.App, accountID string, sessionID string, currentTime time.Time) (time.Time, error) {
+func GetSessionExpiration(a *server.App, accountID string, sessionID string, currentTime time.Time) (time.Time, error) {
 	var expirationTime string
 	// with userID and sessionID we can get the expiration time
 	query := "SELECT expires FROM sessions WHERE account_id = ? AND id = ?"

M internal/db/queries/user.go +7 -7


@@ -4,8 +4,8 @@ import (
4	4		"database/sql"
5	5		"fmt"
6	6
7		-	"github.com/bnema/gordon/internal/app"
8	7		"github.com/bnema/gordon/internal/db"
	8	+	"github.com/bnema/gordon/internal/server"
9	9		"github.com/google/uuid"
10	10		)
11	11

@@ -22,7 +22,7 @@ type GithubUserInfo struct {
22	22		}
23	23
24	24		// CreateUser creates a new user along with the associated account, provider, and session.
25		-	func CreateUser(a app.App, accessToken string, browserInfo string, userInfo GithubUserInfo) error {
	25	+	func CreateUser(a server.App, accessToken string, browserInfo string, userInfo GithubUserInfo) error {
26	26		// Check if a user already exists. If so, return an error.
27	27		if exists, err := CheckDBUserExists(a); err != nil \|\| exists {
28	28		return fmt.Errorf("error checking user or user already exists: %v", err)

@@ -57,7 +57,7 @@ func CreateUser(a app.App, accessToken string, browserInfo string, userInfo Gi
57	57		return createDBSession(a, browserInfo, accessToken, account.ID)
58	58		}
59	59
60		-	func createDBUser(a app.App, userInfo GithubUserInfo) (*db.User, error) {
	60	+	func createDBUser(a server.App, userInfo GithubUserInfo) (*db.User, error) {
61	61		user := &db.User{
62	62		ID: generateUUID(),
63	63		Name: userInfo.Login,

@@ -71,7 +71,7 @@ func createDBUser(a app.App, userInfo GithubUserInfo) (*db.User, error) {
71	71		return user, err
72	72		}
73	73
74		-	func CheckDBUserExists(a *app.App) (bool, error) {
	74	+	func CheckDBUserExists(a *server.App) (bool, error) {
75	75		var userID string
76	76		err := a.DB.QueryRow("SELECT id FROM user").Scan(&userID)
77	77		if err != nil {

@@ -89,7 +89,7 @@ func CheckDBUserExists(a *app.App) (bool, error) {
89	89		}
90	90
91	91		// If there is already a user, we compare the login and email to see if it is the same user
92		-	func CheckDBUserIsGood(a app.App, userInfo GithubUserInfo) (bool, error) {
	92	+	func CheckDBUserIsGood(a server.App, userInfo GithubUserInfo) (bool, error) {
93	93		login := userInfo.Login
94	94		email := userInfo.Emails[0]
95	95

@@ -110,7 +110,7 @@ func CheckDBUserIsGood(a app.App, userInfo GithubUserInfo) (bool, error) {
110	110		return false, nil
111	111		}
112	112
113		-	func UpdateUser(a app.App, accessToken string, browserInfo string, userInfo GithubUserInfo) (*db.User, error) {
	113	+	func UpdateUser(a server.App, accessToken string, browserInfo string, userInfo GithubUserInfo) (*db.User, error) {
114	114
115	115		err := CreateOrUpdateDBSession(a, accessToken, browserInfo)
116	116		if err != nil {

@@ -129,7 +129,7 @@ func UpdateUser(a app.App, accessToken string, browserInfo string, userInfo Gi
129	129
130	130		}
131	131
132		-	func GetAccountCount(a *app.App) (int, error) {
	132	+	func GetAccountCount(a *server.App) (int, error) {
133	133		var count int
134	134		err := a.DB.QueryRow("SELECT COUNT(*) FROM account").Scan(&count)
135	135		if err != nil {

 	"database/sql"
 	"fmt"
-	"github.com/bnema/gordon/internal/app"
 	"github.com/bnema/gordon/internal/db"
+	"github.com/bnema/gordon/internal/server"
 	"github.com/google/uuid"
 )
 }
 // CreateUser creates a new user along with the associated account, provider, and session.
-func CreateUser(a *app.App, accessToken string, browserInfo string, userInfo *GithubUserInfo) error {
+func CreateUser(a *server.App, accessToken string, browserInfo string, userInfo *GithubUserInfo) error {
 	// Check if a user already exists. If so, return an error.
 	if exists, err := CheckDBUserExists(a); err != nil || exists {
 		return fmt.Errorf("error checking user or user already exists: %v", err)
 	return createDBSession(a, browserInfo, accessToken, account.ID)
 }
-func createDBUser(a *app.App, userInfo *GithubUserInfo) (*db.User, error) {
+func createDBUser(a *server.App, userInfo *GithubUserInfo) (*db.User, error) {
 	user := &db.User{
 		ID:    generateUUID(),
 		Name:  userInfo.Login,
 	return user, err
 }
-func CheckDBUserExists(a *app.App) (bool, error) {
+func CheckDBUserExists(a *server.App) (bool, error) {
 	var userID string
 	err := a.DB.QueryRow("SELECT id FROM user").Scan(&userID)
 	if err != nil {
 }
 // If there is already a user, we compare the login and email to see if it is the same user
-func CheckDBUserIsGood(a *app.App, userInfo *GithubUserInfo) (bool, error) {
+func CheckDBUserIsGood(a *server.App, userInfo *GithubUserInfo) (bool, error) {
 	login := userInfo.Login
 	email := userInfo.Emails[0]
 	return false, nil
 }
-func UpdateUser(a *app.App, accessToken string, browserInfo string, userInfo *GithubUserInfo) (*db.User, error) {
+func UpdateUser(a *server.App, accessToken string, browserInfo string, userInfo *GithubUserInfo) (*db.User, error) {
 	err := CreateOrUpdateDBSession(a, accessToken, browserInfo)
 	if err != nil {
 }
-func GetAccountCount(a *app.App) (int, error) {
+func GetAccountCount(a *server.App) (int, error) {
 	var count int
 	err := a.DB.QueryRow("SELECT COUNT(*) FROM account").Scan(&count)
 	if err != nil {

M internal/httpserve/handler/adminroutes.go +5 -5


@@ -5,8 +5,8 @@ import (
5	5
6	6		"net/http"
7	7
8		-	"github.com/bnema/gordon/internal/app"
9	8		"github.com/bnema/gordon/internal/httpserve/middleware"
	9	+	"github.com/bnema/gordon/internal/server"
10	10		"github.com/bnema/gordon/internal/templating/render"
11	11		"github.com/labstack/echo/v4"
12	12		)

@@ -17,7 +17,7 @@ var (
17	17		)
18	18
19	19		// GetLocalizedData returns the data for the localization
20		-	func GetLocalizedData(c echo.Context, a *app.App) (map[string]interface{}, error) {
	20	+	func GetLocalizedData(c echo.Context, a *server.App) (map[string]interface{}, error) {
21	21		lang := c.Get(middleware.LangKey)
22	22
23	23		if lang == nil {

@@ -34,7 +34,7 @@ func GetLocalizedData(c echo.Context, a *app.App) (map[string]interface{}, error
34	34		}
35	35
36	36		// renderAdminPage is a generalized function to render admin pages
37		-	func renderAdminPage(c echo.Context, a *app.App, templateName string) error {
	37	+	func renderAdminPage(c echo.Context, a *server.App, templateName string) error {
38	38		data, err := GetLocalizedData(c, a)
39	39		if err != nil {
40	40		return err

@@ -54,11 +54,11 @@ func renderAdminPage(c echo.Context, a *app.App, templateName string) error {
54	54		}
55	55
56	56		// AdminRoute is the route for the admin panel
57		-	func AdminRoute(c echo.Context, a *app.App) error {
	57	+	func AdminRoute(c echo.Context, a *server.App) error {
58	58		return renderAdminPage(c, a, "index.gohtml")
59	59		}
60	60
61	61		// AdminManagerRoute is the route of the manager page
62		-	func AdminManagerRoute(c echo.Context, a *app.App) error {
	62	+	func AdminManagerRoute(c echo.Context, a *server.App) error {
63	63		return renderAdminPage(c, a, "manager.gohtml")
64	64		}

 	"net/http"
-	"github.com/bnema/gordon/internal/app"
 	"github.com/bnema/gordon/internal/httpserve/middleware"
+	"github.com/bnema/gordon/internal/server"
 	"github.com/bnema/gordon/internal/templating/render"
 	"github.com/labstack/echo/v4"
 )
 )
 // GetLocalizedData returns the data for the localization
-func GetLocalizedData(c echo.Context, a *app.App) (map[string]interface{}, error) {
+func GetLocalizedData(c echo.Context, a *server.App) (map[string]interface{}, error) {
 	lang := c.Get(middleware.LangKey)
 	if lang == nil {
 }
 // renderAdminPage is a generalized function to render admin pages
-func renderAdminPage(c echo.Context, a *app.App, templateName string) error {
+func renderAdminPage(c echo.Context, a *server.App, templateName string) error {
 	data, err := GetLocalizedData(c, a)
 	if err != nil {
 		return err
 }
 // AdminRoute is the route for the admin panel
-func AdminRoute(c echo.Context, a *app.App) error {
+func AdminRoute(c echo.Context, a *server.App) error {
 	return renderAdminPage(c, a, "index.gohtml")
 }
 // AdminManagerRoute is the route of the manager page
-func AdminManagerRoute(c echo.Context, a *app.App) error {
+func AdminManagerRoute(c echo.Context, a *server.App) error {
 	return renderAdminPage(c, a, "manager.gohtml")
 }

M internal/httpserve/handler/containers.go +9 -9


@@ -6,7 +6,7 @@ import (
6	6		"sync"
7	7		"time"
8	8
9		-	"github.com/bnema/gordon/internal/app"
	9	+	"github.com/bnema/gordon/internal/server"
10	10		"github.com/bnema/gordon/internal/templating/load"
11	11		"github.com/bnema/gordon/internal/templating/render"
12	12		"github.com/bnema/gordon/pkg/docker"

@@ -69,7 +69,7 @@ type HumanReadableContainer struct {
69	69		}
70	70
71	71		// renderHTML is a generalized function to render HTML
72		-	func renderHTML(c echo.Context, a *app.App, path, templateName string, data map[string]interface{}) error {
	72	+	func renderHTML(c echo.Context, a *server.App, path, templateName string, data map[string]interface{}) error {
73	73		rendererData, err := render.GetHTMLRenderer(path, templateName, a.TemplateFS, a)
74	74		if err != nil {
75	75		return err

@@ -82,7 +82,7 @@ func renderHTML(c echo.Context, a *app.App, path, templateName string, data map[
82	82		}
83	83
84	84		// ActionSuccess returns the success HTML fragment
85		-	func ActionSuccess(a *app.App) string {
	85	+	func ActionSuccess(a *server.App) string {
86	86		successFragment, err := load.Fragment(a, "success")
87	87		if err != nil {
88	88		fmt.Println(err)

@@ -93,7 +93,7 @@ func ActionSuccess(a *app.App) string {
93	93		}
94	94
95	95		// ImageManagerComponent handles the /image-manager route (HTMX route)
96		-	func ImageManagerComponent(c echo.Context, a *app.App) error {
	96	+	func ImageManagerComponent(c echo.Context, a *server.App) error {
97	97		images, err := docker.ListContainerImages()
98	98		if err != nil {
99	99		return sendError(c, err)

@@ -127,7 +127,7 @@ func ImageManagerComponent(c echo.Context, a *app.App) error {
127	127		}
128	128
129	129		// ImageManagerDelete handles the /image-manager/delete route
130		-	func ImageManagerDelete(c echo.Context, a *app.App) error {
	130	+	func ImageManagerDelete(c echo.Context, a *server.App) error {
131	131		//
132	132		ShortID := c.Param("ID")
133	133

@@ -149,7 +149,7 @@ func ImageManagerDelete(c echo.Context, a *app.App) error {
149	149		}
150	150
151	151		// ContainerManagerComponent handles the /container-manager route
152		-	func ContainerManagerComponent(c echo.Context, a *app.App) error {
	152	+	func ContainerManagerComponent(c echo.Context, a *server.App) error {
153	153		containers, err := docker.ListRunningContainers()
154	154		if err != nil {
155	155		return sendError(c, err)

@@ -196,7 +196,7 @@ func ContainerManagerComponent(c echo.Context, a *app.App) error {
196	196		}
197	197
198	198		// ContainerManagerDelete handles the /container-manager/delete route
199		-	func ContainerManagerDelete(c echo.Context, a *app.App) error {
	199	+	func ContainerManagerDelete(c echo.Context, a *server.App) error {
200	200		err := docker.RemoveContainer(c.Param("ID"))
201	201		if err != nil {
202	202		return sendError(c, err)

@@ -205,7 +205,7 @@ func ContainerManagerDelete(c echo.Context, a *app.App) error {
205	205		}
206	206
207	207		// ContainerManagerStop handles the /container-manager/stop route
208		-	func ContainerManagerStop(c echo.Context, a *app.App) error {
	208	+	func ContainerManagerStop(c echo.Context, a *server.App) error {
209	209		// Stop the container gracefully with a timeout
210	210		stopped, err := docker.StopContainerGracefully(c.Param("ID"), 3*time.Second)
211	211		if err != nil {

@@ -225,7 +225,7 @@ func ContainerManagerStop(c echo.Context, a *app.App) error {
225	225		}
226	226
227	227		// ContainerManagerStart handles the /container-manager/start route
228		-	func ContainerManagerStart(c echo.Context, a *app.App) error {
	228	+	func ContainerManagerStart(c echo.Context, a *server.App) error {
229	229		err := docker.StartContainer(c.Param("ID"))
230	230		if err != nil {
231	231		return sendError(c, err)


@@ -6,7 +6,7 @@ import (
6		"sync"	6		"sync"
7		"time"	7		"time"
8			8
9	-	"github.com/bnema/gordon/internal/app"	9	+	"github.com/bnema/gordon/internal/server"
10		"github.com/bnema/gordon/internal/templating/load"	10		"github.com/bnema/gordon/internal/templating/load"
11		"github.com/bnema/gordon/internal/templating/render"	11		"github.com/bnema/gordon/internal/templating/render"
12		"github.com/bnema/gordon/pkg/docker"	12		"github.com/bnema/gordon/pkg/docker"

@@ -69,7 +69,7 @@ type HumanReadableContainer struct {
69		}	69		}
70			70
71		// renderHTML is a generalized function to render HTML	71		// renderHTML is a generalized function to render HTML
72	-	func renderHTML(c echo.Context, a *app.App, path, templateName string, data map[string]interface{}) error {	72	+	func renderHTML(c echo.Context, a *server.App, path, templateName string, data map[string]interface{}) error {
73		rendererData, err := render.GetHTMLRenderer(path, templateName, a.TemplateFS, a)	73		rendererData, err := render.GetHTMLRenderer(path, templateName, a.TemplateFS, a)
74		if err != nil {	74		if err != nil {
75		return err	75		return err

@@ -82,7 +82,7 @@ func renderHTML(c echo.Context, a *app.App, path, templateName string, data map[
82		}	82		}
83			83
84		// ActionSuccess returns the success HTML fragment	84		// ActionSuccess returns the success HTML fragment
85	-	func ActionSuccess(a *app.App) string {	85	+	func ActionSuccess(a *server.App) string {
86		successFragment, err := load.Fragment(a, "success")	86		successFragment, err := load.Fragment(a, "success")
87		if err != nil {	87		if err != nil {
88		fmt.Println(err)	88		fmt.Println(err)

@@ -93,7 +93,7 @@ func ActionSuccess(a *app.App) string {
93		}	93		}
94			94
95		// ImageManagerComponent handles the /image-manager route (HTMX route)	95		// ImageManagerComponent handles the /image-manager route (HTMX route)
96	-	func ImageManagerComponent(c echo.Context, a *app.App) error {	96	+	func ImageManagerComponent(c echo.Context, a *server.App) error {
97		images, err := docker.ListContainerImages()	97		images, err := docker.ListContainerImages()
98		if err != nil {	98		if err != nil {
99		return sendError(c, err)	99		return sendError(c, err)

@@ -127,7 +127,7 @@ func ImageManagerComponent(c echo.Context, a *app.App) error {
127		}	127		}
128			128
129		// ImageManagerDelete handles the /image-manager/delete route	129		// ImageManagerDelete handles the /image-manager/delete route
130	-	func ImageManagerDelete(c echo.Context, a *app.App) error {	130	+	func ImageManagerDelete(c echo.Context, a *server.App) error {
131		//	131		//
132		ShortID := c.Param("ID")	132		ShortID := c.Param("ID")
133			133

@@ -149,7 +149,7 @@ func ImageManagerDelete(c echo.Context, a *app.App) error {
149		}	149		}
150			150
151		// ContainerManagerComponent handles the /container-manager route	151		// ContainerManagerComponent handles the /container-manager route
152	-	func ContainerManagerComponent(c echo.Context, a *app.App) error {	152	+	func ContainerManagerComponent(c echo.Context, a *server.App) error {
153		containers, err := docker.ListRunningContainers()	153		containers, err := docker.ListRunningContainers()
154		if err != nil {	154		if err != nil {
155		return sendError(c, err)	155		return sendError(c, err)

@@ -196,7 +196,7 @@ func ContainerManagerComponent(c echo.Context, a *app.App) error {
196		}	196		}
197			197
198		// ContainerManagerDelete handles the /container-manager/delete route	198		// ContainerManagerDelete handles the /container-manager/delete route
199	-	func ContainerManagerDelete(c echo.Context, a *app.App) error {	199	+	func ContainerManagerDelete(c echo.Context, a *server.App) error {
200		err := docker.RemoveContainer(c.Param("ID"))	200		err := docker.RemoveContainer(c.Param("ID"))
201		if err != nil {	201		if err != nil {
202		return sendError(c, err)	202		return sendError(c, err)

@@ -205,7 +205,7 @@ func ContainerManagerDelete(c echo.Context, a *app.App) error {
205		}	205		}
206			206
207		// ContainerManagerStop handles the /container-manager/stop route	207		// ContainerManagerStop handles the /container-manager/stop route
208	-	func ContainerManagerStop(c echo.Context, a *app.App) error {	208	+	func ContainerManagerStop(c echo.Context, a *server.App) error {
209		// Stop the container gracefully with a timeout	209		// Stop the container gracefully with a timeout
210		stopped, err := docker.StopContainerGracefully(c.Param("ID"), 3*time.Second)	210		stopped, err := docker.StopContainerGracefully(c.Param("ID"), 3*time.Second)
211		if err != nil {	211		if err != nil {

@@ -225,7 +225,7 @@ func ContainerManagerStop(c echo.Context, a *app.App) error {
225		}	225		}
226			226
227		// ContainerManagerStart handles the /container-manager/start route	227		// ContainerManagerStart handles the /container-manager/start route
228	-	func ContainerManagerStart(c echo.Context, a *app.App) error {	228	+	func ContainerManagerStart(c echo.Context, a *server.App) error {
229		err := docker.StartContainer(c.Param("ID"))	229		err := docker.StartContainer(c.Param("ID"))
230		if err != nil {	230		if err != nil {
231		return sendError(c, err)	231		return sendError(c, err)

M internal/httpserve/handler/createcontainer.go +3 -3


@@ -4,7 +4,7 @@ import (
4	4		"fmt"
5	5		"net/http"
6	6
7		-	"github.com/bnema/gordon/internal/app"
	7	+	"github.com/bnema/gordon/internal/server"
8	8		"github.com/bnema/gordon/internal/templating/render"
9	9		"github.com/bnema/gordon/pkg/docker"
10	10		"github.com/bnema/gordon/pkg/sanitize"

@@ -21,7 +21,7 @@ func FromShortIDToImageID(ShortID string) (string, error) {
21	21		}
22	22
23	23		// CreateContainerRoute is the route for creating a new container
24		-	func CreateContainerGET(c echo.Context, a *app.App) error {
	24	+	func CreateContainerGET(c echo.Context, a *server.App) error {
25	25		// Retreive the ShortID of the image from the URL
26	26		ShortID := c.Param("ID")
27	27

@@ -67,7 +67,7 @@ func CreateContainerGET(c echo.Context, a *app.App) error {
67	67		}
68	68
69	69		// CreateContainerPOST handles the create container form submission
70		-	func CreateContainerPOST(c echo.Context, a *app.App) error {
	70	+	func CreateContainerPOST(c echo.Context, a *server.App) error {
71	71		// Retreive the ShortID of the image from the URL
72	72		ShortID := c.Param("ID")
73	73


@@ -4,7 +4,7 @@ import (
4		"fmt"	4		"fmt"
5		"net/http"	5		"net/http"
6			6
7	-	"github.com/bnema/gordon/internal/app"	7	+	"github.com/bnema/gordon/internal/server"
8		"github.com/bnema/gordon/internal/templating/render"	8		"github.com/bnema/gordon/internal/templating/render"
9		"github.com/bnema/gordon/pkg/docker"	9		"github.com/bnema/gordon/pkg/docker"
10		"github.com/bnema/gordon/pkg/sanitize"	10		"github.com/bnema/gordon/pkg/sanitize"

@@ -21,7 +21,7 @@ func FromShortIDToImageID(ShortID string) (string, error) {
21		}	21		}
22			22
23		// CreateContainerRoute is the route for creating a new container	23		// CreateContainerRoute is the route for creating a new container
24	-	func CreateContainerGET(c echo.Context, a *app.App) error {	24	+	func CreateContainerGET(c echo.Context, a *server.App) error {
25		// Retreive the ShortID of the image from the URL	25		// Retreive the ShortID of the image from the URL
26		ShortID := c.Param("ID")	26		ShortID := c.Param("ID")
27			27

@@ -67,7 +67,7 @@ func CreateContainerGET(c echo.Context, a *app.App) error {
67		}	67		}
68			68
69		// CreateContainerPOST handles the create container form submission	69		// CreateContainerPOST handles the create container form submission
70	-	func CreateContainerPOST(c echo.Context, a *app.App) error {	70	+	func CreateContainerPOST(c echo.Context, a *server.App) error {
71		// Retreive the ShortID of the image from the URL	71		// Retreive the ShortID of the image from the URL
72		ShortID := c.Param("ID")	72		ShortID := c.Param("ID")
73			73

M internal/httpserve/handler/editcontainer.go +3 -3


@@ -5,7 +5,7 @@ import (
5	5		"log"
6	6		"strings"
7	7
8		-	"github.com/bnema/gordon/internal/app"
	8	+	"github.com/bnema/gordon/internal/server"
9	9		"github.com/bnema/gordon/internal/templating/render"
10	10		"github.com/bnema/gordon/pkg/docker"
11	11		"github.com/labstack/echo/v4"

@@ -34,7 +34,7 @@ func generateOrderedYAML(infoMap map[string]interface{}) (string, error) {
34	34		}
35	35
36	36		// ContainerManagerEditGET displays the edit container view
37		-	func ContainerManagerEditGET(c echo.Context, a *app.App) error {
	37	+	func ContainerManagerEditGET(c echo.Context, a *server.App) error {
38	38		containerID := c.Param("ID")
39	39
40	40		// Get the container info

@@ -149,7 +149,7 @@ func (tq *TransactionQueue) Execute() error {
149	149		}
150	150
151	151		// ContainerManagerEditPOST handles the edit container form submission
152		-	func ContainerManagerEditPOST(c echo.Context, a *app.App) error {
	152	+	func ContainerManagerEditPOST(c echo.Context, a *server.App) error {
153	153		tq := &TransactionQueue{}
154	154		oldContainerID := c.Param("ID")
155	155


@@ -5,7 +5,7 @@ import (
5		"log"	5		"log"
6		"strings"	6		"strings"
7			7
8	-	"github.com/bnema/gordon/internal/app"	8	+	"github.com/bnema/gordon/internal/server"
9		"github.com/bnema/gordon/internal/templating/render"	9		"github.com/bnema/gordon/internal/templating/render"
10		"github.com/bnema/gordon/pkg/docker"	10		"github.com/bnema/gordon/pkg/docker"
11		"github.com/labstack/echo/v4"	11		"github.com/labstack/echo/v4"

@@ -34,7 +34,7 @@ func generateOrderedYAML(infoMap map[string]interface{}) (string, error) {
34		}	34		}
35			35
36		// ContainerManagerEditGET displays the edit container view	36		// ContainerManagerEditGET displays the edit container view
37	-	func ContainerManagerEditGET(c echo.Context, a *app.App) error {	37	+	func ContainerManagerEditGET(c echo.Context, a *server.App) error {
38		containerID := c.Param("ID")	38		containerID := c.Param("ID")
39			39
40		// Get the container info	40		// Get the container info

@@ -149,7 +149,7 @@ func (tq *TransactionQueue) Execute() error {
149		}	149		}
150			150
151		// ContainerManagerEditPOST handles the edit container form submission	151		// ContainerManagerEditPOST handles the edit container form submission
152	-	func ContainerManagerEditPOST(c echo.Context, a *app.App) error {	152	+	func ContainerManagerEditPOST(c echo.Context, a *server.App) error {
153		tq := &TransactionQueue{}	153		tq := &TransactionQueue{}
154		oldContainerID := c.Param("ID")	154		oldContainerID := c.Param("ID")
155			155

M internal/httpserve/handler/endpoints.go +4 -4


@@ -6,13 +6,13 @@ import (
6	6		"io"
7	7		"net/http"
8	8
9		-	"github.com/bnema/gordon/internal/app"
10	9		"github.com/bnema/gordon/internal/common"
	10	+	"github.com/bnema/gordon/internal/server"
11	11		"github.com/labstack/echo/v4"
12	12		)
13	13
14	14		// Handle GET on /api/hello endpoint
15		-	func GetHello(c echo.Context, a *app.App) error {
	15	+	func GetHello(c echo.Context, a *server.App) error {
16	16		return c.JSON(http.StatusOK, "Hello, World!")
17	17		}
18	18

@@ -21,13 +21,13 @@ type InfoResponse struct {
21	21		Version string `json:"version"`
22	22		}
23	23
24		-	func (info InfoResponse) Populate(a app.App) {
	24	+	func (info InfoResponse) Populate(a server.App) {
25	25		info.Uptime = a.GetUptime()
26	26		info.Version = a.Config.GetVersion()
27	27		}
28	28
29	29		// Handle GET on /api/ping endpoint
30		-	func GetInfos(c echo.Context, a *app.App) error {
	30	+	func GetInfos(c echo.Context, a *server.App) error {
31	31		fmt.Println("GET /api/ping")
32	32		body, _ := io.ReadAll(c.Request().Body)
33	33		fmt.Println("Request Body:", string(body))

 	"io"
 	"net/http"
-	"github.com/bnema/gordon/internal/app"
 	"github.com/bnema/gordon/internal/common"
+	"github.com/bnema/gordon/internal/server"
 	"github.com/labstack/echo/v4"
 )
 // Handle GET on /api/hello endpoint
-func GetHello(c echo.Context, a *app.App) error {
+func GetHello(c echo.Context, a *server.App) error {
 	return c.JSON(http.StatusOK, "Hello, World!")
 }
 	Version string `json:"version"`
 }
-func (info *InfoResponse) Populate(a *app.App) {
+func (info *InfoResponse) Populate(a *server.App) {
 	info.Uptime = a.GetUptime()
 	info.Version = a.Config.GetVersion()
 }
 // Handle GET on /api/ping endpoint
-func GetInfos(c echo.Context, a *app.App) error {
+func GetInfos(c echo.Context, a *server.App) error {
 	fmt.Println("GET /api/ping")
 	body, _ := io.ReadAll(c.Request().Body)
 	fmt.Println("Request Body:", string(body))

M internal/httpserve/handler/oauth.go +16 -12


@@ -8,9 +8,9 @@ import (
8	8		"net/http"
9	9		"os"
10	10
11		-	"github.com/bnema/gordon/internal/app"
12	11		"github.com/bnema/gordon/internal/db"
13	12		"github.com/bnema/gordon/internal/db/queries"
	13	+	"github.com/bnema/gordon/internal/server"
14	14		"github.com/bnema/gordon/internal/templating/render"
15	15		"github.com/gorilla/sessions"
16	16		_ "github.com/joho/godotenv/autoload"

@@ -21,17 +21,21 @@ import (
21	21		var urlToken string
22	22
23	23		// compareGordonToken compares the token from the URL query parameter with the one from the config.yml
24		-	func CompareGordonToken(c echo.Context, a *app.App) error {
25		-	configToken := a.Config.General.GordonToken
	24	+	func CompareGordonToken(c echo.Context, a *server.App) error {
	25	+	configToken, err := a.Config.GetToken()
	26	+	if err != nil {
	27	+	return err
	28	+	}
	29	+
26	30		if urlToken != configToken {
27		-	// if token is not present or does not match the one from the config.yml
28		-	return fmt.Errorf("token is not valid")
	31	+	return fmt.Errorf("token is empty or not valid")
29	32		}
	33	+
30	34		return nil
31	35		}
32	36
33	37		// RenderLoginPage renders the login.html template
34		-	func RenderLoginPage(c echo.Context, a *app.App) error {
	38	+	func RenderLoginPage(c echo.Context, a *server.App) error {
35	39		urlToken = c.QueryParam("token")
36	40		data := map[string]interface{}{
37	41		"Title": "Login",

@@ -53,7 +57,7 @@ func RenderLoginPage(c echo.Context, a *app.App) error {
53	57		}
54	58
55	59		// StartOAuthGithub starts the Github OAuth flow
56		-	func StartOAuthGithub(c echo.Context, a *app.App) error {
	60	+	func StartOAuthGithub(c echo.Context, a *server.App) error {
57	61		// Check if the session is already here and valid before going for the oauth flow
58	62		sess, err := getSession(c)
59	63		if err != nil {

@@ -85,7 +89,7 @@ type Sessions struct {
85	89		}
86	90
87	91		// OAuthCallback handles the callback response from Github OAuth
88		-	func OAuthCallback(c echo.Context, a *app.App) error {
	92	+	func OAuthCallback(c echo.Context, a *server.App) error {
89	93		redirectPath := a.Config.Admin.Path
90	94
91	95		accessToken, encodedState, err := parseQueryParams(c)

@@ -150,7 +154,7 @@ func getSession(c echo.Context) (*sessions.Session, error) {
150	154		}
151	155
152	156		// handleUser handles the user creation or update
153		-	func handleUser(c echo.Context, a app.App, accessToken, browserInfo string, userInfo queries.GithubUserInfo) (*db.User, error) {
	157	+	func handleUser(c echo.Context, a server.App, accessToken, browserInfo string, userInfo queries.GithubUserInfo) (*db.User, error) {
154	158		userExists, err := queries.CheckDBUserExists(a)
155	159		if err != nil {
156	160		return nil, fmt.Errorf("could not check if user exists: %w", err)

@@ -191,7 +195,7 @@ func handleUser(c echo.Context, a *app.App, accessToken, browserInfo string, use
191	195		}
192	196
193	197		// createUser creates a new user in the database
194		-	func createUser(a app.App, accessToken, browserInfo string, userInfo queries.GithubUserInfo) (*db.User, error) {
	198	+	func createUser(a server.App, accessToken, browserInfo string, userInfo queries.GithubUserInfo) (*db.User, error) {
195	199		err := queries.CreateUser(a, accessToken, browserInfo, userInfo)
196	200		if err != nil {
197	201		return nil, fmt.Errorf("could not create user: %w", err)

@@ -200,7 +204,7 @@ func createUser(a app.App, accessToken, browserInfo string, userInfo queries.G
200	204		}
201	205
202	206		// updateUser updates an existing user in the database
203		-	func updateUser(a app.App, accessToken, browserInfo string, userInfo queries.GithubUserInfo) (*db.User, error) {
	207	+	func updateUser(a server.App, accessToken, browserInfo string, userInfo queries.GithubUserInfo) (*db.User, error) {
204	208		user, err := queries.UpdateUser(a, accessToken, browserInfo, userInfo)
205	209		if err != nil {
206	210		return nil, fmt.Errorf("could not update user: %w", err)

@@ -254,7 +258,7 @@ func fetchGithubAPI(url string, authHeader string, result interface{}) error {
254	258		}
255	259
256	260		// githubGetUserDetails gets the user details from the Github API using the access token
257		-	func githubGetUserDetails(c echo.Context, a app.App) (userInfo queries.GithubUserInfo, err error) {
	261	+	func githubGetUserDetails(c echo.Context, a server.App) (userInfo queries.GithubUserInfo, err error) {
258	262		accessToken := c.QueryParam("access_token")
259	263
260	264		// Fetch user info

 	"net/http"
 	"os"
-	"github.com/bnema/gordon/internal/app"
 	"github.com/bnema/gordon/internal/db"
 	"github.com/bnema/gordon/internal/db/queries"
+	"github.com/bnema/gordon/internal/server"
 	"github.com/bnema/gordon/internal/templating/render"
 	"github.com/gorilla/sessions"
 	_ "github.com/joho/godotenv/autoload"
 var urlToken string
 // compareGordonToken compares the token from the URL query parameter with the one from the config.yml
-func CompareGordonToken(c echo.Context, a *app.App) error {
+func CompareGordonToken(c echo.Context, a *server.App) error {
-	configToken := a.Config.General.GordonToken
+	configToken, err := a.Config.GetToken()
+	if err != nil {
+		return err
+	}
 	if urlToken != configToken {
-		// if token is not present or does not match the one from the config.yml
+		return fmt.Errorf("token is empty or not valid")
-		return fmt.Errorf("token is not valid")
 	}
 	return nil
 }
 // RenderLoginPage renders the login.html template
-func RenderLoginPage(c echo.Context, a *app.App) error {
+func RenderLoginPage(c echo.Context, a *server.App) error {
 	urlToken = c.QueryParam("token")
 	data := map[string]interface{}{
 		"Title": "Login",
 }
 // StartOAuthGithub starts the Github OAuth flow
-func StartOAuthGithub(c echo.Context, a *app.App) error {
+func StartOAuthGithub(c echo.Context, a *server.App) error {
 	// Check if the session is already here and valid before going for the oauth flow
 	sess, err := getSession(c)
 	if err != nil {
 }
 // OAuthCallback handles the callback response from Github OAuth
-func OAuthCallback(c echo.Context, a *app.App) error {
+func OAuthCallback(c echo.Context, a *server.App) error {
 	redirectPath := a.Config.Admin.Path
 	accessToken, encodedState, err := parseQueryParams(c)
 }
 // handleUser handles the user creation or update
-func handleUser(c echo.Context, a *app.App, accessToken, browserInfo string, userInfo *queries.GithubUserInfo) (*db.User, error) {
+func handleUser(c echo.Context, a *server.App, accessToken, browserInfo string, userInfo *queries.GithubUserInfo) (*db.User, error) {
 	userExists, err := queries.CheckDBUserExists(a)
 	if err != nil {
 		return nil, fmt.Errorf("could not check if user exists: %w", err)
 }
 // createUser creates a new user in the database
-func createUser(a *app.App, accessToken, browserInfo string, userInfo *queries.GithubUserInfo) (*db.User, error) {
+func createUser(a *server.App, accessToken, browserInfo string, userInfo *queries.GithubUserInfo) (*db.User, error) {
 	err := queries.CreateUser(a, accessToken, browserInfo, userInfo)
 	if err != nil {
 		return nil, fmt.Errorf("could not create user: %w", err)
 }
 // updateUser updates an existing user in the database
-func updateUser(a *app.App, accessToken, browserInfo string, userInfo *queries.GithubUserInfo) (*db.User, error) {
+func updateUser(a *server.App, accessToken, browserInfo string, userInfo *queries.GithubUserInfo) (*db.User, error) {
 	user, err := queries.UpdateUser(a, accessToken, browserInfo, userInfo)
 	if err != nil {
 		return nil, fmt.Errorf("could not update user: %w", err)
 }
 // githubGetUserDetails gets the user details from the Github API using the access token
-func githubGetUserDetails(c echo.Context, a *app.App) (userInfo *queries.GithubUserInfo, err error) {
+func githubGetUserDetails(c echo.Context, a *server.App) (userInfo *queries.GithubUserInfo, err error) {
 	accessToken := c.QueryParam("access_token")
 	// Fetch user info

M internal/httpserve/handler/static.go +2 -2


@@ -4,12 +4,12 @@ import (
4	4		"net/http"
5	5		"os"
6	6
7		-	"github.com/bnema/gordon/internal/app"
	7	+	"github.com/bnema/gordon/internal/server"
8	8		"github.com/labstack/echo/v4"
9	9		)
10	10
11	11		// StaticRoute serves static files from the embedded filesystem
12		-	func StaticRoute(c echo.Context, a *app.App) error {
	12	+	func StaticRoute(c echo.Context, a *server.App) error {
13	13		// Set the cache-control header based on PROD environment variable
14	14		if os.Getenv("PROD") == "true" {
15	15		c.Response().Header().Set("Cache-Control", "public, max-age=86400")


@@ -4,12 +4,12 @@ import (
4		"net/http"	4		"net/http"
5		"os"	5		"os"
6			6
7	-	"github.com/bnema/gordon/internal/app"	7	+	"github.com/bnema/gordon/internal/server"
8		"github.com/labstack/echo/v4"	8		"github.com/labstack/echo/v4"
9		)	9		)
10			10
11		// StaticRoute serves static files from the embedded filesystem	11		// StaticRoute serves static files from the embedded filesystem
12	-	func StaticRoute(c echo.Context, a *app.App) error {	12	+	func StaticRoute(c echo.Context, a *server.App) error {
13		// Set the cache-control header based on PROD environment variable	13		// Set the cache-control header based on PROD environment variable
14		if os.Getenv("PROD") == "true" {	14		if os.Getenv("PROD") == "true" {
15		c.Response().Header().Set("Cache-Control", "public, max-age=86400")	15		c.Response().Header().Set("Cache-Control", "public, max-age=86400")

M internal/httpserve/handler/uploadcontainerimage.go +3 -3


@@ -5,7 +5,7 @@ import (
5	5		"io"
6	6		"net/http"
7	7
8		-	"github.com/bnema/gordon/internal/app"
	8	+	"github.com/bnema/gordon/internal/server"
9	9		"github.com/bnema/gordon/internal/templating/render"
10	10		"github.com/bnema/gordon/pkg/store"
11	11		"github.com/labstack/echo/v4"

@@ -14,7 +14,7 @@ import (
14	14		const MaxUploadSize = 1024 * 1024 * 1024 // 1GB
15	15
16	16		// UploadImageHandler handles the /upload-image route to show the form
17		-	func UploadImageGETHandler(c echo.Context, a *app.App) error {
	17	+	func UploadImageGETHandler(c echo.Context, a *server.App) error {
18	18		data := map[string]interface{}{
19	19		"Title": "Upload Image",
20	20		}

@@ -32,7 +32,7 @@ func UploadImageGETHandler(c echo.Context, a *app.App) error {
32	32		}
33	33
34	34		// UploadImageHandler handles the /upload-image
35		-	func UploadImagePOSTHandler(c echo.Context, a *app.App) error {
	35	+	func UploadImagePOSTHandler(c echo.Context, a *server.App) error {
36	36		// Set upload size limit
37	37		c.Request().Body = http.MaxBytesReader(c.Response(), c.Request().Body, MaxUploadSize)
38	38		if err := c.Request().ParseMultipartForm(MaxUploadSize); err != nil {


@@ -5,7 +5,7 @@ import (
5		"io"	5		"io"
6		"net/http"	6		"net/http"
7			7
8	-	"github.com/bnema/gordon/internal/app"	8	+	"github.com/bnema/gordon/internal/server"
9		"github.com/bnema/gordon/internal/templating/render"	9		"github.com/bnema/gordon/internal/templating/render"
10		"github.com/bnema/gordon/pkg/store"	10		"github.com/bnema/gordon/pkg/store"
11		"github.com/labstack/echo/v4"	11		"github.com/labstack/echo/v4"

@@ -14,7 +14,7 @@ import (
14		const MaxUploadSize = 1024 * 1024 * 1024 // 1GB	14		const MaxUploadSize = 1024 * 1024 * 1024 // 1GB
15			15
16		// UploadImageHandler handles the /upload-image route to show the form	16		// UploadImageHandler handles the /upload-image route to show the form
17	-	func UploadImageGETHandler(c echo.Context, a *app.App) error {	17	+	func UploadImageGETHandler(c echo.Context, a *server.App) error {
18		data := map[string]interface{}{	18		data := map[string]interface{}{
19		"Title": "Upload Image",	19		"Title": "Upload Image",
20		}	20		}

@@ -32,7 +32,7 @@ func UploadImageGETHandler(c echo.Context, a *app.App) error {
32		}	32		}
33			33
34		// UploadImageHandler handles the /upload-image	34		// UploadImageHandler handles the /upload-image
35	-	func UploadImagePOSTHandler(c echo.Context, a *app.App) error {	35	+	func UploadImagePOSTHandler(c echo.Context, a *server.App) error {
36		// Set upload size limit	36		// Set upload size limit
37		c.Request().Body = http.MaxBytesReader(c.Response(), c.Request().Body, MaxUploadSize)	37		c.Request().Body = http.MaxBytesReader(c.Response(), c.Request().Body, MaxUploadSize)
38		if err := c.Request().ParseMultipartForm(MaxUploadSize); err != nil {	38		if err := c.Request().ParseMultipartForm(MaxUploadSize); err != nil {

M internal/httpserve/middleware/commondata.go +2 -2

@@ -1,11 +1,11 @@
1	1		package middleware
2	2
3	3		import (
4		-	"github.com/bnema/gordon/internal/app"
	4	+	"github.com/bnema/gordon/internal/server"
5	5		"github.com/labstack/echo/v4"
6	6		)
7	7
8		-	func SetCommonDataMiddleware(a *app.App) echo.MiddlewareFunc {
	8	+	func SetCommonDataMiddleware(a *server.App) echo.MiddlewareFunc {
9	9		return func(next echo.HandlerFunc) echo.HandlerFunc {
10	10		return func(c echo.Context) error {
11	11		// TODO: set common data

@@ -1,11 +1,11 @@
1		package middleware	1		package middleware
2			2
3		import (	3		import (
4	-	"github.com/bnema/gordon/internal/app"	4	+	"github.com/bnema/gordon/internal/server"
5		"github.com/labstack/echo/v4"	5		"github.com/labstack/echo/v4"
6		)	6		)
7			7
8	-	func SetCommonDataMiddleware(a *app.App) echo.MiddlewareFunc {	8	+	func SetCommonDataMiddleware(a *server.App) echo.MiddlewareFunc {
9		return func(next echo.HandlerFunc) echo.HandlerFunc {	9		return func(next echo.HandlerFunc) echo.HandlerFunc {
10		return func(c echo.Context) error {	10		return func(c echo.Context) error {
11		// TODO: set common data	11		// TODO: set common data

M internal/httpserve/middleware/requirelogin.go +6 -6


@@ -6,15 +6,15 @@ import (
6	6		"net/http"
7	7		"time"
8	8
9		-	"github.com/bnema/gordon/internal/app"
10	9		"github.com/bnema/gordon/internal/db/queries"
	10	+	"github.com/bnema/gordon/internal/server"
11	11
12	12		// "github.com/labstack/echo-contrib/session"
13	13		"github.com/labstack/echo-contrib/session"
14	14		"github.com/labstack/echo/v4"
15	15		)
16	16
17		-	func RequireLogin(a *app.App) echo.MiddlewareFunc {
	17	+	func RequireLogin(a *server.App) echo.MiddlewareFunc {
18	18		return func(next echo.HandlerFunc) echo.HandlerFunc {
19	19		return func(c echo.Context) error {
20	20		if err := validateSessionAndUser(c, a); err != nil {

@@ -26,7 +26,7 @@ func RequireLogin(a *app.App) echo.MiddlewareFunc {
26	26		}
27	27		}
28	28
29		-	func validateSessionAndUser(c echo.Context, a *app.App) error {
	29	+	func validateSessionAndUser(c echo.Context, a *server.App) error {
30	30		sess, err := session.Get("session", c)
31	31		if err != nil {
32	32		return err

@@ -59,7 +59,7 @@ func validateSessionAndUser(c echo.Context, a *app.App) error {
59	59		return nil
60	60		}
61	61
62		-	func redirectToLogin(c echo.Context, a *app.App) error {
	62	+	func redirectToLogin(c echo.Context, a *server.App) error {
63	63		return c.Redirect(http.StatusSeeOther, a.Config.Admin.Path+"/login")
64	64		}
65	65

@@ -74,7 +74,7 @@ func isCookieExpired(c echo.Context) (bool, error) {
74	74		return time.Now().After(cookie.Expires), nil
75	75		}
76	76
77		-	func isSessionExpiredInDB(a *app.App, userID string, sessionID string) (bool, error) {
	77	+	func isSessionExpiredInDB(a *server.App, userID string, sessionID string) (bool, error) {
78	78		currentTime := time.Now()
79	79		expirationTime, err := queries.GetSessionExpiration(a, userID, sessionID, currentTime)
80	80		if err != nil {

@@ -84,7 +84,7 @@ func isSessionExpiredInDB(a *app.App, userID string, sessionID string) (bool, er
84	84		return currentTime.After(expirationTime), nil
85	85		}
86	86
87		-	func isAccountIDInDB(a *app.App, accountID string) (bool, error) {
	87	+	func isAccountIDInDB(a *server.App, accountID string) (bool, error) {
88	88		accountExists, err := queries.CheckDBAccountExists(a, accountID)
89	89		if err != nil {
90	90		return false, err

 	"net/http"
 	"time"
-	"github.com/bnema/gordon/internal/app"
 	"github.com/bnema/gordon/internal/db/queries"
+	"github.com/bnema/gordon/internal/server"
 	// "github.com/labstack/echo-contrib/session"
 	"github.com/labstack/echo-contrib/session"
 	"github.com/labstack/echo/v4"
 )
-func RequireLogin(a *app.App) echo.MiddlewareFunc {
+func RequireLogin(a *server.App) echo.MiddlewareFunc {
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
 			if err := validateSessionAndUser(c, a); err != nil {
 	}
 }
-func validateSessionAndUser(c echo.Context, a *app.App) error {
+func validateSessionAndUser(c echo.Context, a *server.App) error {
 	sess, err := session.Get("session", c)
 	if err != nil {
 		return err
 	return nil
 }
-func redirectToLogin(c echo.Context, a *app.App) error {
+func redirectToLogin(c echo.Context, a *server.App) error {
 	return c.Redirect(http.StatusSeeOther, a.Config.Admin.Path+"/login")
 }
 	return time.Now().After(cookie.Expires), nil
 }
-func isSessionExpiredInDB(a *app.App, userID string, sessionID string) (bool, error) {
+func isSessionExpiredInDB(a *server.App, userID string, sessionID string) (bool, error) {
 	currentTime := time.Now()
 	expirationTime, err := queries.GetSessionExpiration(a, userID, sessionID, currentTime)
 	if err != nil {
 	return currentTime.After(expirationTime), nil
 }
-func isAccountIDInDB(a *app.App, accountID string) (bool, error) {
+func isAccountIDInDB(a *server.App, accountID string) (bool, error) {
 	accountExists, err := queries.CheckDBAccountExists(a, accountID)
 	if err != nil {
 		return false, err

M internal/httpserve/middleware/requiretoken.go +3 -3


@@ -4,12 +4,12 @@ import (
4	4		"fmt"
5	5		"strings"
6	6
7		-	"github.com/bnema/gordon/internal/app"
	7	+	"github.com/bnema/gordon/internal/server"
8	8		"github.com/labstack/echo/v4"
9	9		)
10	10
11	11		// RequireToken is a middleware that checks for a valid token in the request
12		-	func RequireToken(a *app.App) echo.MiddlewareFunc {
	12	+	func RequireToken(a *server.App) echo.MiddlewareFunc {
13	13		return func(next echo.HandlerFunc) echo.HandlerFunc {
14	14		return func(c echo.Context) error {
15	15		if err := validateToken(c, a); err != nil {

@@ -20,7 +20,7 @@ func RequireToken(a *app.App) echo.MiddlewareFunc {
20	20		}
21	21		}
22	22
23		-	func validateToken(c echo.Context, a *app.App) error {
	23	+	func validateToken(c echo.Context, a *server.App) error {
24	24		token := c.Request().Header.Get("Authorization")
25	25		if token == "" {
26	26		return echo.ErrUnauthorized


@@ -4,12 +4,12 @@ import (
4		"fmt"	4		"fmt"
5		"strings"	5		"strings"
6			6
7	-	"github.com/bnema/gordon/internal/app"	7	+	"github.com/bnema/gordon/internal/server"
8		"github.com/labstack/echo/v4"	8		"github.com/labstack/echo/v4"
9		)	9		)
10			10
11		// RequireToken is a middleware that checks for a valid token in the request	11		// RequireToken is a middleware that checks for a valid token in the request
12	-	func RequireToken(a *app.App) echo.MiddlewareFunc {	12	+	func RequireToken(a *server.App) echo.MiddlewareFunc {
13		return func(next echo.HandlerFunc) echo.HandlerFunc {	13		return func(next echo.HandlerFunc) echo.HandlerFunc {
14		return func(c echo.Context) error {	14		return func(c echo.Context) error {
15		if err := validateToken(c, a); err != nil {	15		if err := validateToken(c, a); err != nil {

@@ -20,7 +20,7 @@ func RequireToken(a *app.App) echo.MiddlewareFunc {
20		}	20		}
21		}	21		}
22			22
23	-	func validateToken(c echo.Context, a *app.App) error {	23	+	func validateToken(c echo.Context, a *server.App) error {
24		token := c.Request().Header.Get("Authorization")	24		token := c.Request().Header.Get("Authorization")
25		if token == "" {	25		if token == "" {
26		return echo.ErrUnauthorized	26		return echo.ErrUnauthorized

M internal/httpserve/router.go +7 -7

@@ -1,15 +1,15 @@
1	1		package httpserve
2	2
3	3		import (
4		-	"github.com/bnema/gordon/internal/app"
5	4		"github.com/bnema/gordon/internal/httpserve/handler"
6	5		"github.com/bnema/gordon/internal/httpserve/middleware"
	6	+	"github.com/bnema/gordon/internal/server"
7	7		_ "github.com/joho/godotenv/autoload"
8	8		"github.com/labstack/echo/v4"
9	9		)
10	10
11	11		// RegisterRoutes registers all routes for the application
12		-	func RegisterRoutes(e echo.Echo, a app.App) *echo.Echo {
	12	+	func RegisterRoutes(e echo.Echo, a server.App) *echo.Echo {
13	13		// --- Register API endpoints --- //
14	14		bindAPIEndpoints(e, a)
15	15		AdminPath := a.Config.Admin.Path

@@ -42,7 +42,7 @@ func RegisterRoutes(e echo.Echo, a app.App) *echo.Echo {
42	42		}
43	43
44	44		// bindAPIEndpoints expose /api endpoints and speaks only JSON
45		-	func bindAPIEndpoints(e echo.Echo, a app.App) {
	45	+	func bindAPIEndpoints(e echo.Echo, a server.App) {
46	46		apiGroup := e.Group("/api")
47	47		apiGroup.Use(middleware.RequireToken(a))
48	48		apiGroup.GET("/hello", func(c echo.Context) error {

@@ -54,14 +54,14 @@ func bindAPIEndpoints(e echo.Echo, a app.App) {
54	54		}
55	55
56	56		// bindStaticRoute bind static path
57		-	func bindStaticRoute(e echo.Echo, a app.App, path string) {
	57	+	func bindStaticRoute(e echo.Echo, a server.App, path string) {
58	58		e.GET(path, func(c echo.Context) error {
59	59		return handler.StaticRoute(c, a)
60	60		})
61	61		}
62	62
63	63		// bindLoginRoute binds all login routes
64		-	func bindLoginRoute(e echo.Echo, a app.App, adminPath string) {
	64	+	func bindLoginRoute(e echo.Echo, a server.App, adminPath string) {
65	65		e.GET(adminPath+"/login", func(c echo.Context) error {
66	66		return handler.RenderLoginPage(c, a)
67	67		})

@@ -77,7 +77,7 @@ func bindLoginRoute(e echo.Echo, a app.App, adminPath string) {
77	77		}
78	78
79	79		// bindAdminRoute binds all admin routes
80		-	func bindAdminRoute(e echo.Echo, a app.App, adminPath string) {
	80	+	func bindAdminRoute(e echo.Echo, a server.App, adminPath string) {
81	81		adminGroup := e.Group(adminPath)
82	82		// Since login is behind the admin path, we cannot use group middleware
83	83		adminGroup.GET("", func(c echo.Context) error {

@@ -90,7 +90,7 @@ func bindAdminRoute(e echo.Echo, a app.App, adminPath string) {
90	90		}
91	91
92	92		// bindHTMXEndpoints binds all HTMX endpoints
93		-	func bindHTMXEndpoints(e echo.Echo, a app.App) {
	93	+	func bindHTMXEndpoints(e echo.Echo, a server.App) {
94	94		// Create a group for /htmx endpoints
95	95		htmxGroup := e.Group("/htmx")
96	96

 package httpserve
 import (
-	"github.com/bnema/gordon/internal/app"
 	"github.com/bnema/gordon/internal/httpserve/handler"
 	"github.com/bnema/gordon/internal/httpserve/middleware"
+	"github.com/bnema/gordon/internal/server"
 	_ "github.com/joho/godotenv/autoload"
 	"github.com/labstack/echo/v4"
 )
 // RegisterRoutes registers all routes for the application
-func RegisterRoutes(e *echo.Echo, a *app.App) *echo.Echo {
+func RegisterRoutes(e *echo.Echo, a *server.App) *echo.Echo {
 	// --- Register API endpoints --- //
 	bindAPIEndpoints(e, a)
 	AdminPath := a.Config.Admin.Path
 }
 // bindAPIEndpoints expose /api endpoints and speaks only JSON
-func bindAPIEndpoints(e *echo.Echo, a *app.App) {
+func bindAPIEndpoints(e *echo.Echo, a *server.App) {
 	apiGroup := e.Group("/api")
 	apiGroup.Use(middleware.RequireToken(a))
 	apiGroup.GET("/hello", func(c echo.Context) error {
 }
 // bindStaticRoute bind static path
-func bindStaticRoute(e *echo.Echo, a *app.App, path string) {
+func bindStaticRoute(e *echo.Echo, a *server.App, path string) {
 	e.GET(path, func(c echo.Context) error {
 		return handler.StaticRoute(c, a)
 	})
 }
 // bindLoginRoute binds all login routes
-func bindLoginRoute(e *echo.Echo, a *app.App, adminPath string) {
+func bindLoginRoute(e *echo.Echo, a *server.App, adminPath string) {
 	e.GET(adminPath+"/login", func(c echo.Context) error {
 		return handler.RenderLoginPage(c, a)
 	})
 }
 // bindAdminRoute binds all admin routes
-func bindAdminRoute(e *echo.Echo, a *app.App, adminPath string) {
+func bindAdminRoute(e *echo.Echo, a *server.App, adminPath string) {
 	adminGroup := e.Group(adminPath)
 	// Since login is behind the admin path, we cannot use group middleware
 	adminGroup.GET("", func(c echo.Context) error {
 }
 // bindHTMXEndpoints binds all HTMX endpoints
-func bindHTMXEndpoints(e *echo.Echo, a *app.App) {
+func bindHTMXEndpoints(e *echo.Echo, a *server.App) {
 	// Create a  group for /htmx endpoints
 	htmxGroup := e.Group("/htmx")

R internal/app/app.go → internal/server/appserver.go +3 -3 renamed, 98% similar

@@ -1,4 +1,4 @@
1		-	package app
	1	+	package server
2	2
3	3		import (
4	4		"database/sql"

@@ -42,7 +42,7 @@ type GeneralConfig struct {
42	42		BuildDir string // come from env
43	43		BuildVersion string // come from env
44	44		StorageDir string `yaml:"storageDir"` // = buildir/storage
45		-	GordonToken string `yaml:"gordonToken"`
	45	+	Token string `yaml:"token"`
46	46		}
47	47
48	48		type HttpConfig struct {

@@ -167,7 +167,7 @@ func (config *Config) UpdateConfig() error {
167	167		}
168	168
169	169		func (config *Config) GetToken() (string, error) {
170		-	token := config.General.GordonToken
	170	+	token := config.General.Token
171	171		if token == "" {
172	172		return "", fmt.Errorf("no token found in config.yml")
173	173		}

@@ -1,4 +1,4 @@
1	-	package app	1	+	package server
2			2
3		import (	3		import (
4		"database/sql"	4		"database/sql"

@@ -42,7 +42,7 @@ type GeneralConfig struct {
42		BuildDir string // come from env	42		BuildDir string // come from env
43		BuildVersion string // come from env	43		BuildVersion string // come from env
44		StorageDir string `yaml:"storageDir"` // = buildir/storage	44		StorageDir string `yaml:"storageDir"` // = buildir/storage
45	-	GordonToken string `yaml:"gordonToken"`	45	+	Token string `yaml:"token"`
46		}	46		}
47			47
48		type HttpConfig struct {	48		type HttpConfig struct {

@@ -167,7 +167,7 @@ func (config *Config) UpdateConfig() error {
167		}	167		}
168			168
169		func (config *Config) GetToken() (string, error) {	169		func (config *Config) GetToken() (string, error) {
170	-	token := config.General.GordonToken	170	+	token := config.General.Token
171		if token == "" {	171		if token == "" {
172		return "", fmt.Errorf("no token found in config.yml")	172		return "", fmt.Errorf("no token found in config.yml")
173		}	173		}

R internal/app/newserver.go → internal/server/newserver.go +2 -1 renamed, 98% similar

@@ -1,4 +1,4 @@
1		-	package app
	1	+	package server
2	2
3	3		import (
4	4		"fmt"

@@ -17,6 +17,7 @@ func NewServerApp() *App {
17	17		if err != nil {
18	18		log.Fatalf("Failed to load configuration: %v", err)
19	19		}
	20	+
20	21		// Append build dir to storage dir
21	22		config.General.StorageDir = fmt.Sprintf("%s/%s", config.General.BuildDir, config.General.StorageDir)
22	23

@@ -1,4 +1,4 @@
1	-	package app	1	+	package server
2			2
3		import (	3		import (
4		"fmt"	4		"fmt"

@@ -17,6 +17,7 @@ func NewServerApp() *App {
17		if err != nil {	17		if err != nil {
18		log.Fatalf("Failed to load configuration: %v", err)	18		log.Fatalf("Failed to load configuration: %v", err)
19		}	19		}
			20	+
20		// Append build dir to storage dir	21		// Append build dir to storage dir
21		config.General.StorageDir = fmt.Sprintf("%s/%s", config.General.BuildDir, config.General.StorageDir)	22		config.General.StorageDir = fmt.Sprintf("%s/%s", config.General.BuildDir, config.General.StorageDir)
22			23

R internal/app/sqliteclose.go → internal/server/sqliteclose.go +1 -1 renamed, 95% similar

@@ -1,4 +1,4 @@
1		-	package app
	1	+	package server
2	2
3	3		// CloseAndSaveDB closes the in-memory database and backup the database file if there is any modification.
4	4		func CloseDB(a *App) error {

@@ -1,4 +1,4 @@
1	-	package app	1	+	package server
2			2
3		// CloseAndSaveDB closes the in-memory database and backup the database file if there is any modification.	3		// CloseAndSaveDB closes the in-memory database and backup the database file if there is any modification.
4		func CloseDB(a *App) error {	4		func CloseDB(a *App) error {

R internal/app/sqliteinit.go → internal/server/sqliteinit.go +1 -1 renamed, 99% similar

@@ -1,4 +1,4 @@
1		-	package app
	1	+	package server
2	2
3	3		import (
4	4		"database/sql"

@@ -1,4 +1,4 @@
1	-	package app	1	+	package server
2			2
3		import (	3		import (
4		"database/sql"	4		"database/sql"

R internal/app/tokeninit.go → internal/server/tokeninit.go +2 -2 renamed, 96% similar

@@ -1,4 +1,4 @@
1		-	package app
	1	+	package server
2	2
3	3		import (
4	4		"crypto/rand"

@@ -32,7 +32,7 @@ func HandleNewTokenInitialization(a *App) (string, error) {
32	32		fmt.Printf("Login with the new token: %s\n", token)
33	33
34	34		// Store the token in the config file
35		-	a.Config.General.GordonToken = token
	35	+	a.Config.General.Token = token
36	36		err = a.Config.UpdateConfig()
37	37		if err != nil {
38	38		return "", fmt.Errorf("failed to save config: %v", err)

@@ -1,4 +1,4 @@
1	-	package app	1	+	package server
2			2
3		import (	3		import (
4		"crypto/rand"	4		"crypto/rand"

@@ -32,7 +32,7 @@ func HandleNewTokenInitialization(a *App) (string, error) {
32		fmt.Printf("Login with the new token: %s\n", token)	32		fmt.Printf("Login with the new token: %s\n", token)
33			33
34		// Store the token in the config file	34		// Store the token in the config file
35	-	a.Config.General.GordonToken = token	35	+	a.Config.General.Token = token
36		err = a.Config.UpdateConfig()	36		err = a.Config.UpdateConfig()
37		if err != nil {	37		if err != nil {
38		return "", fmt.Errorf("failed to save config: %v", err)	38		return "", fmt.Errorf("failed to save config: %v", err)

M internal/templating/load/loadfragment.go +2 -2


@@ -4,11 +4,11 @@ import (
4	4		"fmt"
5	5		"io"
6	6
7		-	"github.com/bnema/gordon/internal/app"
	7	+	"github.com/bnema/gordon/internal/server"
8	8		)
9	9
10	10		// LoadFragment loads a specific HTML fragment from the app's TemplateFS
11		-	func Fragment(a *app.App, fragmentName string) (string, error) {
	11	+	func Fragment(a *server.App, fragmentName string) (string, error) {
12	12		filePath := fmt.Sprintf("html/fragments/%s.gohtml", fragmentName)
13	13
14	14		// Open the file


@@ -4,11 +4,11 @@ import (
4		"fmt"	4		"fmt"
5		"io"	5		"io"
6			6
7	-	"github.com/bnema/gordon/internal/app"	7	+	"github.com/bnema/gordon/internal/server"
8		)	8		)
9			9
10		// LoadFragment loads a specific HTML fragment from the app's TemplateFS	10		// LoadFragment loads a specific HTML fragment from the app's TemplateFS
11	-	func Fragment(a *app.App, fragmentName string) (string, error) {	11	+	func Fragment(a *server.App, fragmentName string) (string, error) {
12		filePath := fmt.Sprintf("html/fragments/%s.gohtml", fragmentName)	12		filePath := fmt.Sprintf("html/fragments/%s.gohtml", fragmentName)
13			13
14		// Open the file	14		// Open the file

M internal/templating/render/cmdparams.go +2 -2


@@ -4,12 +4,12 @@ import (
4	4		"fmt"
5	5		"strings"
6	6
7		-	"github.com/bnema/gordon/internal/app"
	7	+	"github.com/bnema/gordon/internal/server"
8	8		"github.com/bnema/gordon/pkg/docker"
9	9		)
10	10
11	11		// FromInputsToCmdParams transforms the inputs map into a ContainerCommandParams struct
12		-	func FromInputsToCmdParams(inputs map[string]string, a *app.App) (docker.ContainerCommandParams, error) {
	12	+	func FromInputsToCmdParams(inputs map[string]string, a *server.App) (docker.ContainerCommandParams, error) {
13	13		volumeStr := inputs["volumes"]
14	14		volumeSlice := strings.Split(volumeStr, ",")
15	15


@@ -4,12 +4,12 @@ import (
4		"fmt"	4		"fmt"
5		"strings"	5		"strings"
6			6
7	-	"github.com/bnema/gordon/internal/app"	7	+	"github.com/bnema/gordon/internal/server"
8		"github.com/bnema/gordon/pkg/docker"	8		"github.com/bnema/gordon/pkg/docker"
9		)	9		)
10			10
11		// FromInputsToCmdParams transforms the inputs map into a ContainerCommandParams struct	11		// FromInputsToCmdParams transforms the inputs map into a ContainerCommandParams struct
12	-	func FromInputsToCmdParams(inputs map[string]string, a *app.App) (docker.ContainerCommandParams, error) {	12	+	func FromInputsToCmdParams(inputs map[string]string, a *server.App) (docker.ContainerCommandParams, error) {
13		volumeStr := inputs["volumes"]	13		volumeStr := inputs["volumes"]
14		volumeSlice := strings.Split(volumeStr, ",")	14		volumeSlice := strings.Split(volumeStr, ",")
15			15

M internal/templating/render/html.go +3 -3


@@ -7,7 +7,7 @@ import (
7	7		"io/fs"
8	8		"path"
9	9
10		-	"github.com/bnema/gordon/internal/app"
	10	+	"github.com/bnema/gordon/internal/server"
11	11		)
12	12
13	13		type Renderer struct {

@@ -17,7 +17,7 @@ type Renderer struct {
17	17		}
18	18
19	19		// Render function renders the template with the given data
20		-	func (r Renderer) Render(data interface{}, a app.App) (string, error) {
	20	+	func (r Renderer) Render(data interface{}, a server.App) (string, error) {
21	21		if r.ParseError != nil {
22	22		return "", fmt.Errorf("failed to parse template: %w", r.ParseError)
23	23

@@ -43,7 +43,7 @@ func (r Renderer) Render(data interface{}, a app.App) (string, error) {
43	43		}
44	44
45	45		// GetHTMLRenderer function returns a new Renderer instance
46		-	func GetHTMLRenderer(mainPath string, filename string, fs fs.FS, a app.App, fragmentsPath ...string) (Renderer, error) {
	46	+	func GetHTMLRenderer(mainPath string, filename string, fs fs.FS, a server.App, fragmentsPath ...string) (Renderer, error) {
47	47		// Full path to the main template
48	48		fullPath := path.Join(mainPath, filename)
49	49		// Check if the file exists in the provided fs.FS using fs.Open


@@ -7,7 +7,7 @@ import (
7		"io/fs"	7		"io/fs"
8		"path"	8		"path"
9			9
10	-	"github.com/bnema/gordon/internal/app"	10	+	"github.com/bnema/gordon/internal/server"
11		)	11		)
12			12
13		type Renderer struct {	13		type Renderer struct {

@@ -17,7 +17,7 @@ type Renderer struct {
17		}	17		}
18			18
19		// Render function renders the template with the given data	19		// Render function renders the template with the given data
20	-	func (r Renderer) Render(data interface{}, a app.App) (string, error) {	20	+	func (r Renderer) Render(data interface{}, a server.App) (string, error) {
21		if r.ParseError != nil {	21		if r.ParseError != nil {
22		return "", fmt.Errorf("failed to parse template: %w", r.ParseError)	22		return "", fmt.Errorf("failed to parse template: %w", r.ParseError)
23			23

@@ -43,7 +43,7 @@ func (r Renderer) Render(data interface{}, a app.App) (string, error) {
43		}	43		}
44			44
45		// GetHTMLRenderer function returns a new Renderer instance	45		// GetHTMLRenderer function returns a new Renderer instance
46	-	func GetHTMLRenderer(mainPath string, filename string, fs fs.FS, a app.App, fragmentsPath ...string) (Renderer, error) {	46	+	func GetHTMLRenderer(mainPath string, filename string, fs fs.FS, a server.App, fragmentsPath ...string) (Renderer, error) {
47		// Full path to the main template	47		// Full path to the main template
48		fullPath := path.Join(mainPath, filename)	48		fullPath := path.Join(mainPath, filename)
49		// Check if the file exists in the provided fs.FS using fs.Open	49		// Check if the file exists in the provided fs.FS using fs.Open

M internal/templating/render/localization.go +3 -3


@@ -3,14 +3,14 @@ package render
3	3		import (
4	4		"fmt"
5	5
6		-	"github.com/bnema/gordon/internal/app"
	6	+	"github.com/bnema/gordon/internal/server"
7	7		"gopkg.in/yaml.v3"
8	8		)
9	9
10	10		type Localizations map[string]map[string]map[string]interface{}
11	11
12	12		// GetLocalization function returns the localization for the given language
13		-	func GetLocalization(lang string, a *app.App) (map[string]interface{}, error) {
	13	+	func GetLocalization(lang string, a *server.App) (map[string]interface{}, error) {
14	14		// 1. Check if the language is supported
15	15		supportedLanguages := []string{"en", "fr"} // Add more languages here
16	16		if !contains(supportedLanguages, lang) {

@@ -38,7 +38,7 @@ func GetLocalization(lang string, a *app.App) (map[string]interface{}, error) {
38	38		}
39	39
40	40		// getLocalizations function returns the localizations from the strings.yml file
41		-	func getLocalizations(a *app.App) (Localizations, error) {
	41	+	func getLocalizations(a *server.App) (Localizations, error) {
42	42		var loc Localizations
43	43
44	44		err := yaml.Unmarshal(a.LocYML, &loc)


@@ -3,14 +3,14 @@ package render
3		import (	3		import (
4		"fmt"	4		"fmt"
5			5
6	-	"github.com/bnema/gordon/internal/app"	6	+	"github.com/bnema/gordon/internal/server"
7		"gopkg.in/yaml.v3"	7		"gopkg.in/yaml.v3"
8		)	8		)
9			9
10		type Localizations map[string]map[string]map[string]interface{}	10		type Localizations map[string]map[string]map[string]interface{}
11			11
12		// GetLocalization function returns the localization for the given language	12		// GetLocalization function returns the localization for the given language
13	-	func GetLocalization(lang string, a *app.App) (map[string]interface{}, error) {	13	+	func GetLocalization(lang string, a *server.App) (map[string]interface{}, error) {
14		// 1. Check if the language is supported	14		// 1. Check if the language is supported
15		supportedLanguages := []string{"en", "fr"} // Add more languages here	15		supportedLanguages := []string{"en", "fr"} // Add more languages here
16		if !contains(supportedLanguages, lang) {	16		if !contains(supportedLanguages, lang) {

@@ -38,7 +38,7 @@ func GetLocalization(lang string, a *app.App) (map[string]interface{}, error) {
38		}	38		}
39			39
40		// getLocalizations function returns the localizations from the strings.yml file	40		// getLocalizations function returns the localizations from the strings.yml file
41	-	func getLocalizations(a *app.App) (Localizations, error) {	41	+	func getLocalizations(a *server.App) (Localizations, error) {
42		var loc Localizations	42		var loc Localizations
43			43
44		err := yaml.Unmarshal(a.LocYML, &loc)	44		err := yaml.Unmarshal(a.LocYML, &loc)

M pkg/htmx/htmlfragments.go +2 -2


@@ -5,12 +5,12 @@ import (
5	5		"fmt"
6	6
7	7		"github.com/PuerkitoBio/goquery"
8		-	"github.com/bnema/gordon/internal/app"
	8	+	"github.com/bnema/gordon/internal/server"
9	9		"github.com/bnema/gordon/internal/templating/render"
10	10		)
11	11
12	12		// GetHTMLFragmentByID returns the HTML fragment with the specified id
13		-	func GetHTMLFragmentByID(id string, data interface{}, a *app.App) (string, error) {
	13	+	func GetHTMLFragmentByID(id string, data interface{}, a *server.App) (string, error) {
14	14		// 1. Render the template
15	15		renderer, err := render.GetHTMLRenderer("html/fragments", "components.gohtml", a.TemplateFS, a)
16	16		if err != nil {


@@ -5,12 +5,12 @@ import (
5		"fmt"	5		"fmt"
6			6
7		"github.com/PuerkitoBio/goquery"	7		"github.com/PuerkitoBio/goquery"
8	-	"github.com/bnema/gordon/internal/app"	8	+	"github.com/bnema/gordon/internal/server"
9		"github.com/bnema/gordon/internal/templating/render"	9		"github.com/bnema/gordon/internal/templating/render"
10		)	10		)
11			11
12		// GetHTMLFragmentByID returns the HTML fragment with the specified id	12		// GetHTMLFragmentByID returns the HTML fragment with the specified id
13	-	func GetHTMLFragmentByID(id string, data interface{}, a *app.App) (string, error) {	13	+	func GetHTMLFragmentByID(id string, data interface{}, a *server.App) (string, error) {
14		// 1. Render the template	14		// 1. Render the template
15		renderer, err := render.GetHTMLRenderer("html/fragments", "components.gohtml", a.TemplateFS, a)	15		renderer, err := render.GetHTMLRenderer("html/fragments", "components.gohtml", a.TemplateFS, a)
16		if err != nil {	16		if err != nil {

M pkg/store/storeimages.go +3 -3


@@ -6,7 +6,7 @@ import (
6	6		"os"
7	7		"path/filepath"
8	8
9		-	"github.com/bnema/gordon/internal/app"
	9	+	"github.com/bnema/gordon/internal/server"
10	10		"github.com/bnema/gordon/pkg/docker"
11	11		"github.com/docker/docker/api/types"
12	12		)

@@ -17,13 +17,13 @@ type StorageConfig struct {
17	17		Images []types.ImageSummary
18	18		}
19	19
20		-	func NewStorageConfig(config app.Config) StorageConfig {
	20	+	func NewStorageConfig(config server.Config) StorageConfig {
21	21		return &StorageConfig{
22	22		StorageDir: config.General.StorageDir,
23	23		}
24	24		}
25	25
26		-	func SaveImageToStorage(config *app.Config, filename string, buf io.Reader) (string, error) {
	26	+	func SaveImageToStorage(config *server.Config, filename string, buf io.Reader) (string, error) {
27	27		// Check if the folder exist if not create it
28	28		if _, err := os.Stat(config.General.StorageDir); os.IsNotExist(err) {
29	29		err := os.MkdirAll(config.General.StorageDir, 0755)


@@ -6,7 +6,7 @@ import (
6		"os"	6		"os"
7		"path/filepath"	7		"path/filepath"
8			8
9	-	"github.com/bnema/gordon/internal/app"	9	+	"github.com/bnema/gordon/internal/server"
10		"github.com/bnema/gordon/pkg/docker"	10		"github.com/bnema/gordon/pkg/docker"
11		"github.com/docker/docker/api/types"	11		"github.com/docker/docker/api/types"
12		)	12		)

@@ -17,13 +17,13 @@ type StorageConfig struct {
17		Images []types.ImageSummary	17		Images []types.ImageSummary
18		}	18		}
19			19
20	-	func NewStorageConfig(config app.Config) StorageConfig {	20	+	func NewStorageConfig(config server.Config) StorageConfig {
21		return &StorageConfig{	21		return &StorageConfig{
22		StorageDir: config.General.StorageDir,	22		StorageDir: config.General.StorageDir,
23		}	23		}
24		}	24		}
25			25
26	-	func SaveImageToStorage(config *app.Config, filename string, buf io.Reader) (string, error) {	26	+	func SaveImageToStorage(config *server.Config, filename string, buf io.Reader) (string, error) {
27		// Check if the folder exist if not create it	27		// Check if the folder exist if not create it
28		if _, err := os.Stat(config.General.StorageDir); os.IsNotExist(err) {	28		if _, err := os.Stat(config.General.StorageDir); os.IsNotExist(err) {
29		err := os.MkdirAll(config.General.StorageDir, 0755)	29		err := os.MkdirAll(config.General.StorageDir, 0755)