diff --git a/internal/views/articles/list.templ b/internal/views/articles/list.templ index 51b059e..80a4c94 100644 --- a/internal/views/articles/list.templ +++ b/internal/views/articles/list.templ @@ -1,7 +1,7 @@ package articles 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/views/layout" ) diff --git a/internal/views/articles/table.templ b/internal/views/articles/table.templ index 1f52d9d..1848c8b 100644 --- a/internal/views/articles/table.templ +++ b/internal/views/articles/table.templ @@ -1,7 +1,7 @@ package articles 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/views/layout" ) diff --git a/internal/views/home/about.templ b/internal/views/home/about.templ index 92d96bf..16e9ad4 100644 --- a/internal/views/home/about.templ +++ b/internal/views/home/about.templ @@ -1,8 +1,8 @@ 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/models" +import "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma" templ About(vm models.HomeAboutViewModel) { @layout.WithTemplate(vm.HeaderMetaTags){ diff --git a/internal/views/home/index.templ b/internal/views/home/index.templ index 29ee09a..07b3576 100644 --- a/internal/views/home/index.templ +++ b/internal/views/home/index.templ @@ -1,8 +1,8 @@ package home import ( - b "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma" - bl "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma/layout" + b "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma" + 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/views/layout" ) diff --git a/internal/views/layout/header.templ b/internal/views/layout/header.templ index 1bd026b..ec4ba1c 100644 --- a/internal/views/layout/header.templ +++ b/internal/views/layout/header.templ @@ -1,6 +1,6 @@ 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" templ header(meta models.HeaderMetaTags) { diff --git a/internal/views/layout/withTemplate.templ b/internal/views/layout/withTemplate.templ index 83ed5bc..8db3dd9 100644 --- a/internal/views/layout/withTemplate.templ +++ b/internal/views/layout/withTemplate.templ @@ -1,24 +1,25 @@ package layout import ( - "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma" - bl "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma/layout" + "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma" + bl "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma/layout" "git.jamestombleson.com/jtom38/newsbot-portal/internal/models" + "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma/html" ) templ WithTemplate(meta models.HeaderMetaTags) { - - - + @html.Doctype() + @html.New("en") { + @html.NewHeader() { @header(meta) - - + } + @html.NewBody(){ @navBar() -
+ @html.Br() @bl.Container(bulma.BreakpointDefault) { { children... } - @footer() } - - + @footer() + } + } } diff --git a/internal/views/sources/add.templ b/internal/views/sources/add.templ index 6e343ac..2e2e4f8 100644 --- a/internal/views/sources/add.templ +++ b/internal/views/sources/add.templ @@ -1,9 +1,9 @@ package sources import ( - "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma" - bf "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma/form" - bl "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma/layout" + "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma" + bf "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma/form" + 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/views/layout" ) diff --git a/internal/views/sources/addAfter.templ b/internal/views/sources/addAfter.templ index c0d9046..3db31ee 100644 --- a/internal/views/sources/addAfter.templ +++ b/internal/views/sources/addAfter.templ @@ -1,6 +1,6 @@ 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) { if isError { diff --git a/internal/views/sources/listAll.templ b/internal/views/sources/listAll.templ index d590a47..b74ccc3 100644 --- a/internal/views/sources/listAll.templ +++ b/internal/views/sources/listAll.templ @@ -1,8 +1,8 @@ package sources import ( - "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma" - bh "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma/html" + "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma" + 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/views/layout" ) @@ -12,13 +12,23 @@ templ ListAll(model models.ListAllSourcesViewModel) { @bulma.Button() { @bh.ALink("/sources/add", "New Source") } - @bh.Br() - @bh.Br() - for _, item := range model.Items { - @bulma.ButtonColor(bulma.ColorPrimary) { - @bulma.ANewTab(item.Url, item.DisplayName) + @bulma.Table() { + @bulma.TableHeader() { + @bulma.TableHeaderData("Name") + @bulma.TableHeaderData("Source") + @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) + } + } + } } -
} } } diff --git a/internal/views/users/afterLogin.templ b/internal/views/users/afterLogin.templ index 1c0a0e1..821992d 100644 --- a/internal/views/users/afterLogin.templ +++ b/internal/views/users/afterLogin.templ @@ -1,7 +1,7 @@ package users 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" ) diff --git a/internal/views/users/afterSignUp.templ b/internal/views/users/afterSignUp.templ index 699dbf6..0ea2b30 100644 --- a/internal/views/users/afterSignUp.templ +++ b/internal/views/users/afterSignUp.templ @@ -1,6 +1,6 @@ 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. // It just returns a partial view because it will overlap with the existing template. diff --git a/internal/views/users/login copy.templ b/internal/views/users/login copy.templ index 42f21b1..f86df3c 100644 --- a/internal/views/users/login copy.templ +++ b/internal/views/users/login copy.templ @@ -1,7 +1,7 @@ package users 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/models" ) diff --git a/internal/views/users/logout.templ b/internal/views/users/logout.templ index 6e9a8ba..ad99c9b 100644 --- a/internal/views/users/logout.templ +++ b/internal/views/users/logout.templ @@ -1,7 +1,7 @@ package users 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/views/layout" ) diff --git a/internal/views/users/profile.templ b/internal/views/users/profile.templ index 012d592..25fe507 100644 --- a/internal/views/users/profile.templ +++ b/internal/views/users/profile.templ @@ -1,9 +1,9 @@ package users import ( - "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma" - bh "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma/html" - bl "git.jamestombleson.com/jtom38/newsbot-portal/components/bulma/layout" + "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma" + bh "git.jamestombleson.com/jtom38/newsbot-portal/templ-bulma/html" + 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/views/layout" ) diff --git a/internal/views/users/signup.templ b/internal/views/users/signup.templ index bac667b..b7745be 100644 --- a/internal/views/users/signup.templ +++ b/internal/views/users/signup.templ @@ -1,7 +1,7 @@ package users 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/views/layout" )