apiclient/sources.go

@@ -16,7 +16,6 @@ const (
 type Sources interface {
 	ListAll(jwt string, page int) (domain.SourcesResponse, error)
 	GetById(jwt string, id int64) (domain.SourcesResponse, error)
-	NewRss(jwt, name, url, sourceType string) (domain.SourcesResponse, error)
 }
 
 type sourceClient struct {
@@ -54,7 +53,7 @@ func (c sourceClient) ListAll(jwt string, page int) (domain.SourcesResponse, err
 		return bind, err
 	}
 
-	if resp.StatusCode != 200 {
+	if (resp.StatusCode != 200) {
 		return bind, errors.New(bind.Message)
 	}
 
@@ -70,33 +69,9 @@ func (c sourceClient) GetById(jwt string, id int64) (domain.SourcesResponse, err
 		return bind, err
 	}
 
-	if statusCode != 200 {
+	if (statusCode != 200) {
 		return bind, errors.New(bind.Message)
 	}
 
 	return bind, nil
 }
-
-func (c sourceClient) NewRss(jwt, name, url, sourceType string) (domain.SourcesResponse, error) {
-	param := domain.NewSourceParamRequest{
-		Name: name,
-		Url:  url,
-		Tags: "",
-	}
-	bind := domain.SourcesResponse{}
-	var endpoint string
-	if sourceType == domain.SourceCollectorRss {
-		endpoint = fmt.Sprintf("%s/%s/new/rss", c.serverAddress, SourcesBaseRoute)
-	}
-
-	statusCode, err := PostBodyUrlAuthorized(c.client, endpoint, jwt, param, &bind)
-	if err != nil {
-		return bind, err
-	}
-
-	if statusCode != 200 {
-		return bind, errors.New("got the wrong status code back from the API")
-	}
-
-	return bind, nil
-}

apiclient/util.go

@@ -58,35 +58,6 @@ func PostUrlAuthorized(client http.Client, endpoint, jwtToken string, t any) err
 	return nil
 }
 
-func PostBodyUrlAuthorized(client http.Client, endpoint, jwtToken string, body any, t any) (int, error) {
-	jsonBody, err := json.Marshal(body)
-	if err != nil {
-		return 0, err
-	}
-
-	req, err := http.NewRequest(http.MethodPost, endpoint, bytes.NewBuffer(jsonBody))
-	if err != nil {
-		return 0, err
-	}
-	req.Header.Add(HeaderAuthorization, fmt.Sprintf("%s %s", "Bearer", jwtToken))
-	req.Header.Add(HeaderContentType, ApplicationJson)
-
-	//response, err := http.Post(endpoint, ApplicationJson, bytes.NewBuffer(jsonBody))
-	response, err := client.Do(req)
-	if err != nil {
-		return response.StatusCode, err
-	}
-
-	defer response.Body.Close()
-	decoder := json.NewDecoder(response.Body)
-	err = decoder.Decode(&t)
-	if err != nil {
-		return response.StatusCode, err
-	}
-
-	return response.StatusCode, nil
-}
-
 func PostBodyUrl(client http.Client, endpoint string, body any, t any) error {
 	jsonBody, err := json.Marshal(body)
 	if err != nil {
@@ -108,22 +79,6 @@ func PostBodyUrl(client http.Client, endpoint string, body any, t any) error {
 	return nil
 }
 
-func PostQuery(client http.Client, endpoint string, t any) (int, error) {
-	response, err := http.Post(endpoint, ApplicationJson, nil)
-	if err != nil {
-		return response.StatusCode, err
-	}
-
-	defer response.Body.Close()
-	decoder := json.NewDecoder(response.Body)
-	err = decoder.Decode(&t)
-	if err != nil {
-		return response.StatusCode, err
-	}
-
-	return response.StatusCode, nil
-}
-
 func Get(client http.Client, endpoint, jwt string, t any) (int, error) {
 	req, err := http.NewRequest(http.MethodGet, endpoint, nil)
 	if err != nil {

components/bulma/form/input.templ

@@ -1,15 +0,0 @@
-package form
-
-templ TextInput(color, id, fieldType, placeholder string) {
-	if color == "" {
-		<input class={ "input" } name={ id } id={ id } type={ fieldType } placeholder={ placeholder }/>
-	} else {
-		<input class={ "input", color } name={ id } id={ id } type={ fieldType } placeholder={ placeholder }/>
-	}
-}
-
-templ Checkbox(text, id string) {
-	<label class="checkbox">
-		<input type="checkbox" id={ id }/> { text }
-	</label>
-}

components/bulma/form/new.templ

@@ -1,13 +0,0 @@
-package form
-
-type NewParam struct {
-	HxPost string
-}
-
-templ New(param NewParam) {
-	if param.HxPost != "" {
-		<form hx-post={ param.HxPost }>
-			{ children... }
-		</form>
-	}
-}

components/bulma/form/select.templ

@@ -1,33 +0,0 @@
-package form
-
-templ SelectOne(color string, isRound bool) {
-	if isRound {
-		<div class="select is-round">
-			<select>
-				{ children... }
-			</select>
-		</div>
-	} else {
-		<div class="select">
-			<select>
-				{ children... }
-			</select>
-		</div>
-	}
-}
-
-templ SelectOneItem(name string) {
-	<option>{ name }</option>
-}
-
-templ SelectMany(howManySelectable int, color string, isRound bool) {
-	<div class="select is-multiple">
-		<select multiple size="{ howManySelectable }">
-			{ children... }
-		</select>
-	</div>
-}
-
-templ SelectManyItem(name string) {
-	<option value={ name }>{ name }</option>
-}

components/bulma/form/textarea.templ

@@ -1,5 +0,0 @@
-package form
-
-templ TextArea(id, placeholder, color string) {
-    <textarea class={ "textarea", color } id={ id } placeholder={ placeholder }/>
-}

components/bulma/form/util.go

@@ -1,8 +0,0 @@
-package form
-
-const (
-	InputTypeText        = "text"
-	InputTypePassword    = "password"
-	InputTypeEmail       = "email"
-	InputTypePhoneNumber = "tel"
-)

components/bulma/notification.templ

@@ -1,7 +0,0 @@
-package bulma
-
-templ Notification(message, color string) {
-	<div class={ "notification", color }>
-		{ message }
-	</div>
-}

components/bulma/tags.templ

@@ -1,13 +0,0 @@
-package bulma
-
-templ Tag(message string) {
-	<span class={ "tag" }>{ message }</span>
-}
-
-templ TagColor(message, color string) {
-	<span class={ "tag", color }>{ message }</span>
-}
-
-templ TagColorSize(message, color, size string) {
-	<span class={ "tag", color, size }>{ message }</span>
-}

components/bulma/title.templ

@@ -1,49 +0,0 @@
-package bulma
-
-templ Title(message string) {
-	<h1 class="title">{ message }</h1>
-}
-
-templ Subitle(message string) {
-	<h2 class="subtitle">{ message }</h2>
-}
-
-templ H1(message string, isSubtitle bool) {
-	if isSubtitle {
-		<h1 class="subtitle is-1">{ message }</h1>
-	} else {
-		<h1 class="title is-1">{ message }</h1>
-	}
-}
-
-templ H2(message string, isSubtitle bool) {
-	if isSubtitle {
-		<h2 class="subtitle is-2">{ message }</h2>
-	} else {
-		<h2 class="title is-2">{ message }</h2>
-	}
-}
-
-templ H3(message string, isSubtitle bool) {
-	if isSubtitle {
-		<h3 class="subtitle is-3">{ message }</h3>
-	} else {
-		<h3 class="title is-3">{ message }</h3>
-	}
-}
-
-templ H4(message string, isSubtitle bool) {
-	if isSubtitle {
-		<h4 class="subtitle is-4">{ message }</h4>
-	} else {
-		<h4 class="title is-4">{ message }</h4>
-	}
-}
-
-templ H5(message string, isSubtitle bool) {
-	if isSubtitle {
-		<h5 class="subtitle is-5">{ message }</h5>
-	} else {
-		<h5 class="title is-5">{ message }</h5>
-	}
-}

components/templ-html/br.templ

@@ -1,5 +0,0 @@
-package templhtml
-
-templ Br(){
-    <br/>
-}

components/templ-html/href.templ

@@ -1,9 +0,0 @@
-package templhtml
-
-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>
-}

go.mod

@@ -3,7 +3,7 @@ module git.jamestombleson.com/jtom38/newsbot-portal
 go 1.22.1
 
 require (
-	git.jamestombleson.com/jtom38/newsbot-api v0.0.0-20240710142335-56199a795a2b // indirect
+	git.jamestombleson.com/jtom38/newsbot-api v0.0.0-20240603002809-9237369e5a76
 	github.com/a-h/templ v0.2.747
 	github.com/golang-jwt/jwt/v5 v5.2.1
 	github.com/joho/godotenv v1.5.1

go.sum

@@ -1,7 +1,5 @@
 git.jamestombleson.com/jtom38/newsbot-api v0.0.0-20240603002809-9237369e5a76 h1:B9t5fcfVerMjqnXXPUmYwdmUk76EoEL8x9IRehqg2c4=
 git.jamestombleson.com/jtom38/newsbot-api v0.0.0-20240603002809-9237369e5a76/go.mod h1:A3UdJyQ/IEy3utEwJiC4nbi0ohfgrUNRLTei2iZhLLA=
-git.jamestombleson.com/jtom38/newsbot-api v0.0.0-20240710142335-56199a795a2b h1:XAXD6OSFDzrJ2O1+wma/vnYfLJdcQZRD6NFjfjxjKv4=
-git.jamestombleson.com/jtom38/newsbot-api v0.0.0-20240710142335-56199a795a2b/go.mod h1:A3UdJyQ/IEy3utEwJiC4nbi0ohfgrUNRLTei2iZhLLA=
 github.com/a-h/templ v0.2.747 h1:D0dQ2lxC3W7Dxl6fxQ/1zZHBQslSkTSvl5FxP/CfdKg=
 github.com/a-h/templ v0.2.747/go.mod h1:69ObQIbrcuwPCU32ohNaWce3Cb7qM5GMiqN1K+2yop4=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

internal/handlers/handler.go

@@ -65,7 +65,6 @@ func NewServer(ctx context.Context, configs config.Configs, apiClient apiclient.
 	//sources.Use(ValidateJwtMiddleware(configs.JwtSecret))
 	sources.GET("", s.ListAllSources)
 	sources.GET("/add", s.AddSource)
-	sources.POST("/add", s.AddSourceAfter)
 
 	users := router.Group("/users")
 	users.GET("/login", s.UserLogin)

internal/handlers/sources.go

@@ -36,13 +36,3 @@ func (h *Handler) AddSource(c echo.Context) error {
 
 	return Render(c, http.StatusOK, sources.Add(models.AddSourcePayloadModel{}))
 }
-
-func (h *Handler) AddSourceAfter(c echo.Context) error {
-	name := c.FormValue("name")
-	url := c.FormValue("url")
-	resp, err := h.api.Sources.NewRss(GetJwtToken(c), name, url, "rss")
-	if err != nil {
-		return Render(c, http.StatusOK, sources.AddAfter(err.Error(), true))
-	}
-	return Render(c, http.StatusOK, sources.AddAfter(resp.Message, false))
-}

internal/views/articles/list.templ

@@ -1,9 +1,9 @@
 package articles
 
 import (
-	"git.jamestombleson.com/jtom38/newsbot-portal/components/bulma"
-	"git.jamestombleson.com/jtom38/newsbot-portal/internal/models"
 	"git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout"
+	"git.jamestombleson.com/jtom38/newsbot-portal/internal/models"
+	"git.jamestombleson.com/jtom38/newsbot-portal/internal/views/bulma"
 )
 
 templ List(model models.ListArticlesViewModel) {
@@ -11,6 +11,7 @@ templ List(model models.ListArticlesViewModel) {
 		@filterBar()
 		for _, item := range model.Items {
 			@bulma.ArticleCardWithThumbnail(item.Article.Title, item.Article.Thumbnail, item.Article.Url, item.Article.PubDate.String(), item.Source.DisplayName )
+			
 		}
 	}
 }

internal/views/bulma/button.templ

@@ -1,19 +1,22 @@
 package bulma
 
-// This creates a button that accepts children under it.
+templ Button(color string, isLight, isDark bool) {
-templ Button() {
+	if isLight {
-	<button type="button" class={ "button" }>
+		<button type="button" class={ "button", "is-light", color }>
 			{ children... }
 		</button>
 	}
-
+	if isDark {
-// Used to create a button and lets you define the color.
+		<button type="button" class={ "button", "is-dark", color }>
-// Accepts children.
+			{ children... }
-templ ButtonColor(color string) {
+		</button>
+	}
+	if !isLight && !isDark {
 		<button type="button" class={ "button", color }>
 		{ children... }
 	</button>
 	}
+}
 
 templ ButtonNewTab(url, text string) {
 	<button type="button" class="button">
@@ -21,6 +24,7 @@ templ ButtonNewTab(url, text string) {
 	</button>
 }
 
+
 templ ALink(url, title string) {
 	<a href={ templ.SafeURL(url) }>{ title }</a>
 }

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/new.templ

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

internal/views/bulma/form/util.go

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

internal/views/bulma/util.go

@@ -7,8 +7,4 @@ const (
 	ColorWarning = "is-warning"
 	ColorSuccess = "is-success"
 	ColorError   = "is-error"
-
-	SizeNormal = "is-normal"
-	SizeMedium = "is-medium"
-	SizeLarge  = "is-large"
 )

internal/views/home/index.templ

@@ -1,7 +1,7 @@
 package home
 
 import "git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout"
-import "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma"
+import "git.jamestombleson.com/jtom38/newsbot-portal/internal/views/bulma"
 
 templ Index() {
 	@layout.WithTemplate() {

internal/views/sources/add.templ

@@ -1,25 +1,18 @@
 package sources
 
 import (
-	"git.jamestombleson.com/jtom38/newsbot-portal/components/bulma"
-	"git.jamestombleson.com/jtom38/newsbot-portal/components/bulma/form"
 	"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"
 )
 
-var (
-	p = form.NewParam{
-		HxPost: "/sources/add",
-	}
-)
-
 templ Add(model models.AddSourcePayloadModel) {
 	@layout.WithTemplate() {
-		@bulma.H2("New Source", false)
+		<h2>New Source</h2>
-		<p>At this time only direct RSS links are allowed to be provided.</p>
+		<p>At this time only direct RSS links are allowed to be provided</p>
-		@form.New(p) {
+		@form.New("/sources/add") {
-			@form.TextInput("", "name", form.InputTypeText, "Name of the site")
+			@form.Input("", "url", "text")
-			@form.TextInput("", "url", form.InputTypeText, "RSS URL")
 			@form.Submit("Submit", bulma.ColorPrimary)
 		}
 	}

internal/views/sources/addAfter.templ

@@ -1,11 +0,0 @@
-package sources
-
-import "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma"
-
-templ AddAfter(message string, isError bool) {
-    if isError {
-        @bulma.Notification(message, bulma.ColorError)
-    } else {
-        @bulma.Notification("The requested source was added to the server", bulma.ColorSuccess)
-    }
-}

internal/views/sources/listAll.templ

@@ -1,21 +1,15 @@
 package sources
 
 import (
-	"git.jamestombleson.com/jtom38/newsbot-portal/components/bulma"
-	templhtml "git.jamestombleson.com/jtom38/newsbot-portal/components/templ-html"
 	"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() {
-		@bulma.Button() {
-			@templhtml.ALink("/sources/add", "New Source")
-		}
-		@templhtml.Br()
-		@templhtml.Br()
 		for _, item := range model.Items {
-			@bulma.ButtonColor(bulma.ColorPrimary) {
+			@bulma.Button(bulma.ColorPrimary, false, false) {
 				@bulma.ANewTab(item.Url, item.DisplayName)
 			}
 			<br/>

internal/views/users/afterLogin.templ

@@ -1,16 +1,17 @@
 package users
 
-import (
+import "git.jamestombleson.com/jtom38/newsbot-portal/internal/models"
-	"git.jamestombleson.com/jtom38/newsbot-portal/components/bulma"
-	"git.jamestombleson.com/jtom38/newsbot-portal/internal/models"
-)
 
 // This is returned after the user logs into the application.
 // It just returns a partial view because it will overlap with the existing template.
 templ AfterLogin(vm models.AfterLoginViewModel) {
 	if vm.Success {
-		@bulma.Notification(vm.Message, bulma.ColorSuccess)
+		<div class="notification is-success">
+			{ vm.Message }
+		</div>
 	} else {
-		@bulma.Notification(vm.Message, bulma.ColorError)
+		<div class="notification is-error">
+			{ vm.Message }
+		</div>
 	}
 }

internal/views/users/afterSignUp.templ

@@ -1,13 +1,15 @@
 package users
 
-import "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma"
-
 // This is returned after the user creates an account.
 // It just returns a partial view because it will overlap with the existing template.
 templ AfterSignUp(message string, success bool) {
 	if success {
-		@bulma.Notification(message, bulma.ColorSuccess)
+		<div class="notification is-success">
+			{ message }
+		</div>
 	} else {
-		@bulma.Notification(message, bulma.ColorError)
+        <div class="notification is-error">
+			{ message }
+		</div>
     }
 }

internal/views/users/login copy.templ

@@ -1,29 +1,23 @@
 package users
 
 import (
-	"git.jamestombleson.com/jtom38/newsbot-portal/components/bulma/form"
+	"git.jamestombleson.com/jtom38/newsbot-portal/internal/views/bulma/form"
 	"git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout"
 )
 
-var (
-	p = form.NewParam{
-		HxPost: "/users/login",
-	}
-)
-
 templ LoginNew() {
 	@layout.WithTemplate() {
-		@form.New(p) {
+		@form.New("/users/login") {
 			@form.Field() {
 				@form.Label("Username")
 				@form.Control() {
-					@form.TextInput("", "username", "text", "email address")
+					@form.Input("", "username", "text")
 				}
 			}
 			@form.Field(){
 				@form.Label("Password")
 				@form.Control(){
-					@form.TextInput("", "password", form.InputTypePassword, "")
+					@form.Input("", "password", form.InputTypePassword)
 				}
 			}
 			@form.Submit("Submit", "is-primary")

internal/views/users/logout.templ

@@ -1,7 +1,7 @@
 package users
 
 import "git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout"
-import "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma"
+import "git.jamestombleson.com/jtom38/newsbot-portal/internal/views/bulma"
 
 templ Logout() {
     @layout.WithTemplate(){

internal/views/users/profile.templ

@@ -1,19 +1,15 @@
 package users
 
-import (
+import "git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout"
-	"git.jamestombleson.com/jtom38/newsbot-portal/components/bulma"
+import "git.jamestombleson.com/jtom38/newsbot-portal/internal/views/bulma"
-	templhtml "git.jamestombleson.com/jtom38/newsbot-portal/components/templ-html"
-	"git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout"
-)
 
 templ Profile() {
 	@layout.WithTemplate() {
 		@bulma.Hero("Profile", "Here you can update your profile 😀")
 		
-		@bulma.H2("Sessions", false)
+		<button type="button" class="button">
-		@bulma.Button() {
+            <a href="/users/forcelogout">Logout Everywhere</a>
-			@templhtml.ALink("/users/forcelogout", "Terminate all active sessions")
+        Logout Everywhere</button>
-		}
+        <p class="subtitle">This will force all active sessions to stop working and require a new login.</p>
-		@bulma.Subitle("This will force you to login again as the application will give you a new session value.")
 	}
 }

internal/views/users/signup.templ

@@ -1,26 +1,23 @@
 package users
 
-import (
+import "git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout"
-	"git.jamestombleson.com/jtom38/newsbot-portal/components/bulma/form"
-	"git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout"
-)
 
 templ SignUp() {
 	@layout.WithTemplate() {
-		@form.New(form.NewParam{HxPost: "/users/signup"}) {
+		<form hx-post="/users/signup">
-			@form.Field(){
+			<div class="field">
-				@form.Label("Username")
+				<label class="label">Username</label>
-				@form.Control() {
+				<div class="control">
-					@form.TextInput("", "username", form.InputTypeText, "username or email address")
+					<input class="input" type="text" name="username" id="username"/>
-				}
+				</div>
-			}
+			</div>
-			@form.Field() {
+			<div class="field">
-				@form.Label("Password")
+				<label class="label">Password</label>
-				@form.Control() {
+				<div class="control">
-					@form.TextInput("", "password", form.InputTypePassword, "Nice strong password, like Ox!")
+					<input class="input" type="password" name="password" id="exampleInputPassword1"/>
-				}
+				</div>
-			}
+			</div>
-			@form.Submit("Submit", "")
+			<button type="submit" class="button is-primary">Submit</button>
-		}
+		</form>
 	}
 }