Merge branch 'v1.0.2-dev' into 'master'

V1.0.2 dev Closes #75 See merge request cploutarchou/MicroGO!47
cploutarchou · Aug 3, 2022 · 04221b2 · 04221b2
2 parents c92c77d + 42831a4
commit 04221b2
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 38 deletions.
diff --git a/terminal/cli/auth.go b/terminal/cli/auth.go
@@ -96,15 +96,15 @@ func doAuth() error {
 	if err != nil {
 		gracefullyExit(err)
 	}
-	err = copyTemplateFile("templates/views/login.jet", micro.RootPath+"/views/login.jet")
+	err = copyTemplateFile("templates/views/login.html", micro.RootPath+"/views/login.html")
 	if err != nil {
 		gracefullyExit(err)
 	}
-	err = copyTemplateFile("templates/views/forgot.jet", micro.RootPath+"/views/forgot.jet")
+	err = copyTemplateFile("templates/views/forgot.html", micro.RootPath+"/views/forgot.html")
 	if err != nil {
 		gracefullyExit(err)
 	}
-	err = copyTemplateFile("templates/views/reset-password.jet", micro.RootPath+"/views/reset-password.jet")
+	err = copyTemplateFile("templates/views/reset-password.html", micro.RootPath+"/views/reset-password.html")
 	if err != nil {
 		gracefullyExit(err)
 	}

diff --git a/terminal/cli/templates/env.txt b/terminal/cli/templates/env.txt
@@ -15,12 +15,12 @@ SERVER_NAME=localhost
 SECURE=false
 
 # database config - postgres or mysql
-DATABASE_TYPE=
-DATABASE_HOST=
-DATABASE_PORT=
-DATABASE_USER=
-DATABASE_PASS=
-DATABASE_NAME=
+DATABASE_TYPE=postgres
+DATABASE_HOST=localhost
+DATABASE_PORT=5432
+DATABASE_USER=postgres
+DATABASE_PASS=password
+DATABASE_NAME=microGo
 DATABASE_SSL_MODE=disable
 DATABASE_TIME_ZONE=UTC
 

diff --git a/terminal/cli/templates/handlers/auth-handlers.go.txt b/terminal/cli/templates/handlers/auth-handlers.go.txt
@@ -2,18 +2,20 @@ package handlers
 
 import (
 	"app/data"
-	"github.com/cploutarchou/MicroGO/mailer"
-	"github.com/cploutarchou/MicroGO/url_signer"
 	"crypto/sha256"
 	"encoding/base64"
 	"fmt"
-	"github.com/CloudyKit/jet/v6"
+	"github.com/cploutarchou/MicroGO/mailer"
+	"github.com/cploutarchou/MicroGO/url_signer"
 	"net/http"
 	"time"
 )
 
 func (h *Handlers) UserLogin(w http.ResponseWriter, r *http.Request) {
-	err := h.APP.Render.Page(w, r, "login", nil, nil)
+	_data := map[string]interface{}{
+		"Title": "Login",
+	}
+	err := h.APP.Render.Page(w, r, "login", "main", nil, _data)
 	if err != nil {
 		h.APP.ErrorLog.Println(err)
 	}
@@ -149,7 +151,10 @@ func (h *Handlers) Logout(w http.ResponseWriter, r *http.Request) {
 }
 
 func (h *Handlers) Forgot(w http.ResponseWriter, r *http.Request) {
-	err := h.render(w, r, "forgot", nil, nil)
+	_data := map[string]interface{}{
+		"Title": "Forgot password",
+	}
+	err := h.render(w, r, "forgot", "main", nil, _data)
 	if err != nil {
 		h.APP.ErrorLog.Println("Something went wrong unable to render page : ", err)
 		h.APP.Error500(w, r)
@@ -192,7 +197,7 @@ func (h *Handlers) PostForgot(w http.ResponseWriter, r *http.Request) {
 		Template:       "reset-password",
 		TemplateFormat: mailer.HTMLTemplateFormat,
 		Data:           msgData,
-		From:           "christos@cpdevlabs.com",
+		From:           "cploutarchou@gmail.com",
 	}
 	h.APP.Mailer.Jobs <- msg
 	res := <-h.APP.Mailer.Results
@@ -229,10 +234,11 @@ func (h *Handlers) ResetPasswordForm(w http.ResponseWriter, r *http.Request) {
 	}
 	// Display the form
 	encEmail, _ := h.encrypt(email)
-	vars := make(jet.VarMap)
-	vars.Set("email", encEmail)
-
-	err := h.render(w, r, "reset-password", vars, nil)
+	_data := map[string]interface{}{
+		"Title": "Forgot password",
+		"email": encEmail,
+	}
+	err := h.render(w, r, "reset-password", "main", nil, _data)
 	if err != nil {
 		h.APP.ErrorLog.Println("Something went wrong unable to render page : ", err)
 		h.APP.ErrorUnauthorized(w, r)

diff --git a/...al/cli/templates/views/reset-password.jet → ...l/cli/templates/views/reset-password.html b/...al/cli/templates/views/reset-password.jet → ...l/cli/templates/views/reset-password.html
@@ -1,23 +1,12 @@
-{{extends "./layouts/base.jet"}}
-
-{{block browserTitle()}}
-Form
-{{end}}
-
-{{block css()}} {{end}}
-
-{{block pageContent()}}
 <h2 class="mt-5 text-center">Reset Password</h2>
 
-{{if .Error != ""}}
+{{if .Error }}
 <div class="alert alert-danger text-center">
-    {{.Error}}
 </div>
 {{end}}
 
-{{if .Flash != ""}}
+{{if .Flash }}
 <div class="alert alert-info text-center">
-    {{.Flash}}
 </div>
 {{end}}
 
@@ -26,7 +15,7 @@ <h2 class="mt-5 text-center">Reset Password</h2>
       action="/users/reset-password"
       class="d-block needs-validation"
       autocomplete="off" novalidate=""
-      onkeydown="return event.key != 'Enter';"
+      onkeydown="return event.key !== 'Enter';"
 >
 
     <input type="hidden" name="csrf_token" value="{{.CSRFToken}}">
@@ -46,23 +35,20 @@ <h2 class="mt-5 text-center">Reset Password</h2>
 
     <hr>
 
-    <button class="btn btn-primary" onclick="val()" >Reset Password</button>
+    <button class="btn btn-primary" onclick="val()">Reset Password</button>
 
 </form>
 
 <hr>
 
 
-
 <div class="text-center">
     <a class="btn btn-outline-secondary" href="/">Back...</a>
 </div>
 
 
 <p>&nbsp;</p>
-{{end}}
 
-{{ block js()}}
 <script>
     function val() {
         let form = document.getElementById("reset_form");
@@ -81,4 +67,3 @@ <h2 class="mt-5 text-center">Reset Password</h2>
         form.submit();
     }
 </script>
-{{end}}