jtom38/newsbot-portal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

features/git-submodule #5

Merged
jtom38 merged 6 commits from features/git-submodule into main 2024-07-15 15:36:26 -07:00
Conversation 0 Commits 6 Files Changed 45 +48 -37
15 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6121cbce4d - Show all commits

2
internal/views/articles/list.templ
View File

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

2
internal/views/articles/table.templ
View File

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

2
internal/views/home/about.templ
View File

@ -1,8 +1,8 @@
package home package home
import "git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout" 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/models" import "git.jamestombleson.com/jtom38/newsbot-portal/internal/models"
import "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma"
templ About(vm models.HomeAboutViewModel) { templ About(vm models.HomeAboutViewModel) {
@layout.WithTemplate(vm.HeaderMetaTags){ @layout.WithTemplate(vm.HeaderMetaTags){

4
internal/views/home/index.templ
View File

@ -1,8 +1,8 @@
package home package home
import ( import (
b "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma" b "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma"
bl "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma/layout" bl "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma/layout"
"git.jamestombleson.com/jtom38/newsbot-portal/internal/models" "git.jamestombleson.com/jtom38/newsbot-portal/internal/models"
"git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout" "git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout"
) )

2
internal/views/layout/header.templ
View File

@ -1,6 +1,6 @@
package layout package layout
import "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma" import "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma"
import "git.jamestombleson.com/jtom38/newsbot-portal/internal/models" import "git.jamestombleson.com/jtom38/newsbot-portal/internal/models"
templ header(meta models.HeaderMetaTags) { templ header(meta models.HeaderMetaTags) {

23
internal/views/layout/withTemplate.templ
View File

@ -1,24 +1,25 @@
package layout package layout
import ( import (
"git.jamestombleson.com/jtom38/newsbot-portal/components/bulma" "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma"
bl "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma/layout" bl "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma/layout"
"git.jamestombleson.com/jtom38/newsbot-portal/internal/models" "git.jamestombleson.com/jtom38/newsbot-portal/internal/models"
"git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma/html"
) )
templ WithTemplate(meta models.HeaderMetaTags) { templ WithTemplate(meta models.HeaderMetaTags) {
<!DOCTYPE html> @html.Doctype()
<html lang="en"> @html.New("en") {
<head> @html.NewHeader() {
@header(meta) @header(meta)
</head> }
<body> @html.NewBody(){
@navBar() @navBar()
<br/> @html.Br()
@bl.Container(bulma.BreakpointDefault) { @bl.Container(bulma.BreakpointDefault) {
{ children... } { children... }
@footer()
} }
</body> @footer()
</html> }
}
} }

6
internal/views/sources/add.templ
View File

@ -1,9 +1,9 @@
package sources package sources
import ( import (
"git.jamestombleson.com/jtom38/newsbot-portal/components/bulma" "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma"
bf "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma/form" bf "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma/form"
bl "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma/layout" bl "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma/layout"
"git.jamestombleson.com/jtom38/newsbot-portal/internal/models" "git.jamestombleson.com/jtom38/newsbot-portal/internal/models"
"git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout" "git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout"
) )

2
internal/views/sources/addAfter.templ
View File

@ -1,6 +1,6 @@
package sources package sources
import "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma" import "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma"
templ AddAfter(message string, isError bool) { templ AddAfter(message string, isError bool) {
if isError { if isError {

26
internal/views/sources/listAll.templ
View File

@ -1,8 +1,8 @@
package sources package sources
import ( import (
"git.jamestombleson.com/jtom38/newsbot-portal/components/bulma" "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma"
bh "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma/html" bh "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma/html"
"git.jamestombleson.com/jtom38/newsbot-portal/internal/models" "git.jamestombleson.com/jtom38/newsbot-portal/internal/models"
"git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout" "git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout"
) )
@ -12,13 +12,23 @@ templ ListAll(model models.ListAllSourcesViewModel) {
@bulma.Button() { @bulma.Button() {
@bh.ALink("/sources/add", "New Source") @bh.ALink("/sources/add", "New Source")
} }
@bh.Br() @bulma.Table() {
@bh.Br() @bulma.TableHeader() {
for _, item := range model.Items { @bulma.TableHeaderData("Name")
@bulma.ButtonColor(bulma.ColorPrimary) { @bulma.TableHeaderData("Source")
@bulma.ANewTab(item.Url, item.DisplayName) @bulma.TableHeaderData("Visit")
}
for _, item := range model.Items {
@bulma.TableRow() {
@bulma.TableData(item.DisplayName)
@bulma.TableData(item.Source)
@bulma.TableDataChildren() {
@bulma.Button() {
@bulma.ANewTab(item.Url, item.DisplayName)
}
}
}
} }
<br/>
} }
} }
} }

2
internal/views/users/afterLogin.templ
View File

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

2
internal/views/users/afterSignUp.templ
View File

@ -1,6 +1,6 @@
package users package users
import "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma" import "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma"
// This is returned after the user creates an account. // This is returned after the user creates an account.
// It just returns a partial view because it will overlap with the existing template. // It just returns a partial view because it will overlap with the existing template.

2
internal/views/users/login copy.templ
View File

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

2
internal/views/users/logout.templ
View File

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

6
internal/views/users/profile.templ
View File

@ -1,9 +1,9 @@
package users package users
import ( import (
"git.jamestombleson.com/jtom38/newsbot-portal/components/bulma" "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma"
bh "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma/html" bh "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma/html"
bl "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma/layout" bl "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma/layout"
"git.jamestombleson.com/jtom38/newsbot-portal/internal/models" "git.jamestombleson.com/jtom38/newsbot-portal/internal/models"
"git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout" "git.jamestombleson.com/jtom38/newsbot-portal/internal/views/layout"
) )

2
internal/views/users/signup.templ
View File

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