Merge pull request 'develop' (#12) from develop into main

Reviewed-on: #12

core.go

@@ -36,6 +36,7 @@ var cacheC CacheConfig
 var db *gorm.DB
 var mailer *Mailer
 var basePath string
+var runMode string
 var disableEvents bool = false
 
 //go:embed all:template
@@ -107,11 +108,13 @@ func (app *App) Run(router *httprouter.Router) {
 	}
 	useHttps, _ := strconv.ParseBool(useHttpsStr)
 
-	fmt.Printf("Welcome to Goffee\n")
+	if runMode == "dev" {
-	if useHttps {
+		fmt.Printf("Welcome to Goffee\n")
-		fmt.Printf("Listening on https \nWaiting for requests...\n")
+		if useHttps {
-	} else {
+			fmt.Printf("Listening on https \nWaiting for requests...\n")
-		fmt.Printf("Listening on port %s\nWaiting for requests...\n", portNumber)
+		} else {
+			fmt.Printf("Listening on port %s\nWaiting for requests...\n", portNumber)
+		}
 	}
 
 	// check if use letsencrypt
@@ -177,7 +180,7 @@ func (app *App) RegisterRoutes(routes []Route, router *httprouter.Router) *httpr
 		}
 	}
 
-	// check if use letsencrypt
+	// check if enable core services
 	UseCoreServicesStr := os.Getenv("App_USE_CORESERVICES")
 	if UseCoreServicesStr == "" {
 		UseCoreServicesStr = "false"
@@ -571,6 +574,10 @@ func (app *App) SetBasePath(path string) {
 	basePath = path
 }
 
+func (app *App) SetRunMode(runmode string) {
+	runMode = runmode
+}
+
 func DisableEvents() {
 	disableEvents = true
 }

template/components/content_dropdown.go

@@ -10,6 +10,7 @@ type ContentDropdown struct {
 type ContentDropdownItem struct {
 	Text       string
 	Link       string
+	ID         string
 	IsDisabled bool
 	IsActive   bool
 }

template/components/content_dropdown.html

@@ -1,5 +1,5 @@
 {{define "content_dropdown_item"}}
-    <li><a class="dropdown-item {{if eq .IsActive true}}active{{end}} {{if eq .IsDisabled true}}disabled{{end}}" href="{{.Link}}">{{.Text}}</a></li>
+    <li><a {{ if .ID }}id="{{.ID}}"{{end}} class="dropdown-item {{if eq .IsActive true}}active{{end}} {{if eq .IsDisabled true}}disabled{{end}}" href="{{.Link}}">{{.Text}}</a></li>
 {{end}}
 
 {{define "content_dropdown"}}

template/components/content_href.go

@@ -3,6 +3,7 @@ package components
 type ContentHref struct {
 	Text       string
 	Link       string
+	Target     string // _blank  _parent  _self _top
 	Icon       string
 	IsButton   bool
 	TypeClass  string // type primary, secondary, success, danger, warning, info, light, dark, link

template/components/content_href.html

@@ -1,5 +1,6 @@
 {{define "content_href"}}
-    <a class="{{if eq .IsButton true}} btn btn-{{.TypeClass}}{{end}} {{if eq .IsDisabled true}}disabled{{end}}" 
+    <a class="{{if eq .IsButton true}} btn btn-{{.TypeClass}}{{end}} {{if eq .IsDisabled true}}disabled{{end}}"
+        {{if .Target}} target="{{.Target}}"{{end}} 
         href="{{.Link}}" {{if eq .IsButton true}}role="button"{{end}} {{if eq .IsDisabled true}}aria-disabled="true"{{end}}>
         {{.Text}}
     </a>