diff --git a/.gitignore b/.gitignore index 1a3d861..34e5572 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.swp .swp main +dsn diff --git a/:w b/:w deleted file mode 100644 index 802d7c7..0000000 --- a/:w +++ /dev/null @@ -1,45 +0,0 @@ -package init - -/* -Copyright (C) 2022 Rawley Fowler - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see .Rawley Fowler, 2022 -*/ - -import ( - "github.com/gin-gonic/gin" - "gitlab.com/rawleyifowler/site-rework/controllers" - "net/http" -) - -// Initializes all routes from the controller package -func InitializeRoutes(router *gin.Engine) { - router.NoRoute(ServePage("not_found.tmpl")) - blogGroup := router.Group("/blog") - controllers.RegisterBlogGroup(blogGroup) - router.GET("/", ServePage("index.tmpl")) - router.GET("/resume", ServePage("resume.tmpl")) - router.GET("/contact", ServePage("contact.tmpl")) -} - -// Returns a handler function to serve a page based on the template that is inputted -func ServePage(temp string) gin.HandlerFunc { - return func(c *gin.Context) { - c.HTML( - http.StatusOK, - temp, - gin.H{}, - ) - } -} diff --git a/utils/dsn.go b/utils/dsn.go index 4c3e7cd..a3cebeb 100644 --- a/utils/dsn.go +++ b/utils/dsn.go @@ -29,5 +29,8 @@ func LoadDSN(dsnPath string) string { defer file.Close() reader := bufio.NewScanner(file) // The dsn should be the first line of the file - return reader.Text() + if reader.Scan() { + return reader.Text() + } + panic(dsnPath + " is empty...") }