moved login to use my new form

internal/handlers/handler.go

@@ -71,8 +71,8 @@ func NewServer(ctx context.Context, configs config.Configs, apiClient apiclient.
 	users.POST("/login", s.UserAfterLogin)
 	users.GET("/signup", s.UserSignUp)
 	users.POST("/signup", s.UserAfterSignUp)
-	users.Use(ValidateJwtMiddleware(configs.JwtSecret))
 	users.GET("/logout", s.UsersLogout)
+	users.Use(ValidateJwtMiddleware(configs.JwtSecret))
 	users.GET("/profile", s.UserProfile)
 
 	s.Router = router

internal/handlers/users.go

@@ -11,7 +11,7 @@ import (
 )
 
 func (h *Handler) UserLogin(c echo.Context) error {
-	return Render(c, http.StatusOK, users.Login())
+	return Render(c, http.StatusOK, users.LoginNew())
 }
 
 func (h *Handler) UserAfterLogin(c echo.Context) error {

internal/views/bulma/button.templ

@@ -0,0 +1,34 @@
+package bulma
+
+templ Button(color string, isLight, isDark bool) {
+	if isLight {
+		<button type="button" class={ "button", "is-light", color }>
+			{ children... }
+		</button>
+	}
+	if isDark {
+		<button type="button" class={ "button", "is-dark", color }>
+			{ children... }
+		</button>
+	}
+	if !isLight && !isDark {
+		<button type="button" class={ "button", color }>
+		{ children... }
+	</button>
+	}
+}
+
+templ ButtonNewTab(url, text string) {
+	<button type="button" class="button">
+		<a href={ templ.SafeURL(url) } target="_blank" rel="noopener noreferrer">{ text }</a>
+	</button>
+}
+
+
+templ ALink(url, title string) {
+	<a href={ templ.SafeURL(url) }>{ title }</a>
+}
+
+templ ANewTab(url, text string) {
+	<a href={ templ.SafeURL(url) } target="_blank" rel="noopener noreferrer">{ text }</a>
+}

internal/views/bulma/form/control.templ

@@ -0,0 +1,8 @@
+package form
+
+// Div container to add a input field to.
+templ Control() {
+    <div class="control">
+        { children... }
+    </div>
+}

internal/views/bulma/form/field.templ

@@ -0,0 +1,8 @@
+package form
+
+// This creates a field that you can add a Label, Control or Input object.
+templ Field() {
+	<div class="field">
+		{ children... }
+	</div>
+}

internal/views/bulma/form/input.templ

@@ -0,0 +1,9 @@
+package form
+
+templ Input(color, id, fieldType string) {
+	if color == "" {
+		<input class={ "input" } id={ id } type={ fieldType }/>
+	} else {
+		<input class={ "input", color } id={ id } type={ fieldType }/>
+	}
+}

internal/views/bulma/form/label.templ

@@ -0,0 +1,6 @@
+package form
+
+// This will create a small bit of text to add context to the form.
+templ Label(text string) {
+	<label class="label">{ text }</label>
+}

internal/views/bulma/form/new.templ

@@ -0,0 +1,7 @@
+package form
+
+templ New(postUrl string) {
+    <form hx-post={ postUrl }>
+        { children... }
+    </form>
+}

internal/views/bulma/form/submit.templ

@@ -0,0 +1,5 @@
+package form
+
+templ Submit(text, color string) {
+    <button type="submit" class={ "button", color }>{ text }</button>
+}

internal/views/bulma/form/util.go

@@ -0,0 +1,6 @@
+package form
+
+const (
+	InputTypeText     = "text"
+	InputTypePassword = "password"
+)

internal/views/bulma/util.go

@@ -0,0 +1,10 @@
+package bulma
+
+const (
+	ColorPrimary = "is-primary"
+	ColorInfo    = "is-info"
+	ColorLink    = "is-link"
+	ColorWarning = "is-warning"
+	ColorSuccess = "is-success"
+	ColorError   = "is-error"
+)

internal/views/sources/add.templ

@@ -1,10 +1,19 @@
 package sources
 
-import "git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout"
+import (
-import "git.jamestombleson.com/jtom38/newsbot-portal/internal/models"
+	"git.jamestombleson.com/jtom38/newsbot-portal/internal/models"
+	"git.jamestombleson.com/jtom38/newsbot-portal/internal/views/bulma"
+	"git.jamestombleson.com/jtom38/newsbot-portal/internal/views/bulma/form"
+	"git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout"
+)
 
 templ Add(model models.AddSourcePayloadModel) {
 	@layout.WithTemplate() {
-		<form hx-post="/sources/add"></form>
+		<h2>New Source</h2>
+		<p>At this time only direct RSS links are allowed to be provided</p>
+		@form.New("/sources/add") {
+			@form.Input("", "url", "text")
+			@form.Submit("Submit", bulma.ColorPrimary)
+		}
 	}
 }

internal/views/sources/listAll.templ

@@ -1,12 +1,17 @@
 package sources
 
-import "git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout"
+import (
-import "git.jamestombleson.com/jtom38/newsbot-portal/internal/models"
+	"git.jamestombleson.com/jtom38/newsbot-portal/internal/models"
+	"git.jamestombleson.com/jtom38/newsbot-portal/internal/views/bulma"
+	"git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout"
+)
 
 templ ListAll(model models.ListAllSourcesViewModel) {
 	@layout.WithTemplate() {
 		for _, item := range model.Items {
-			<a href={ templ.SafeURL(item.Url) } target="_blank" rel="noopener noreferrer">{ item.DisplayName } - { item.Source } </a> 
+			@bulma.Button(bulma.ColorPrimary, false, false) {
+				@bulma.ANewTab(item.Url, item.DisplayName)
+			}
 			<br/>
 		}
 	}

internal/views/users/login copy.templ

@@ -0,0 +1,26 @@
+package users
+
+import (
+	"git.jamestombleson.com/jtom38/newsbot-portal/internal/views/bulma/form"
+	"git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout"
+)
+
+templ LoginNew() {
+	@layout.WithTemplate() {
+		@form.New("/users/login") {
+			@form.Field() {
+				@form.Label("Username")
+				@form.Control() {
+					@form.Input("", "username", "text")
+				}
+			}
+			@form.Field(){
+				@form.Label("Password")
+				@form.Control(){
+					@form.Input("", "password", form.InputTypePassword)
+				}
+			}
+			@form.Submit("Submit", "is-primary")
+		}
+	}
+}