2 luni în urmă · c6f2e756c4
--- a/.air.toml
+++ b/.air.toml
@@ -1,51 +0,0 @@
 
				-root = "."
			
 
				-testdata_dir = "testdata"
			
 
				-tmp_dir = "tmp"
			
 
				-
			
 
				-[build]
			
 
				-  args_bin = []
			
 
				-  bin = "./tmp/main 3000"
			
 
				-  cmd = "find . -type f -name '*.gen.*' -exec rm {} + & go build -o ./tmp/main ."
			
 
				-  delay = 1000
			
 
				-  exclude_dir = ["assets", "tmp", "vendor", "testdata"]
			
 
				-  exclude_file = []
			
 
				-  exclude_regex = ["gen.tpl","gen.css","gen.js"]
			
 
				-  exclude_unchanged = false
			
 
				-  follow_symlink = false
			
 
				-  full_bin = ""
			
 
				-  include_dir = []
			
 
				-  include_ext = ["go", "tpl", "tmpl", "html","css","js","json"]
			
 
				-  include_file = []
			
 
				-  kill_delay = "0s"
			
 
				-  log = "build-errors.log"
			
 
				-  poll = false
			
 
				-  poll_interval = 0
			
 
				-  post_cmd = []
			
 
				-  pre_cmd = []
			
 
				-  rerun = false
			
 
				-  rerun_delay = 500
			
 
				-  send_interrupt = false
			
 
				-  stop_on_error = false
			
 
				-
			
 
				-[color]
			
 
				-  app = ""
			
 
				-  build = "yellow"
			
 
				-  main = "magenta"
			
 
				-  runner = "green"
			
 
				-  watcher = "cyan"
			
 
				-
			
 
				-[log]
			
 
				-  main_only = false
			
 
				-  time = false
			
 
				-
			
 
				-[misc]
			
 
				-  clean_on_exit = false
			
 
				-
			
 
				-[proxy]
			
 
				-  app_port = 3000
			
 
				-  enabled = true
			
 
				-  proxy_port = 3001
			
 
				-
			
 
				-[screen]
			
 
				-  clear_on_rebuild = false
			
 
				-  keep_scroll = true
			
--- a/app/app.go
+++ b/app/app.go
@@ -1,36 +0,0 @@
 
				-package app
			
 
				-
			
 
				-import (
			
 
				-	"html/template"
			
 
				-
			
 
				-	"git.clearsky.net.au/cody/gex.git/app/route/home"
			
 
				-	"git.clearsky.net.au/cody/gex.git/pkg/render"
			
 
				-	"git.clearsky.net.au/cody/gex.git/pkg/sec"
			
 
				-	"git.clearsky.net.au/cody/gex.git/pkg/sess"
			
 
				-
			
 
				-	"git.clearsky.net.au/cody/gex.git/pkg/gen"
			
 
				-	"git.clearsky.net.au/cody/gex.git/pkg/srv"
			
 
				-)
			
 
				-
			
 
				-func Init() {
			
 
				-	gen.GeneratePages("app")
			
 
				-	render.Include = func(req *srv.Req, props render.Props, funcs render.Funcs) {
			
 
				-		props["Sess"] = req.Ctx["Sess"]
			
 
				-		funcs["Cody"] = func() template.HTML {
			
 
				-			return "GO Fuck yourself"
			
 
				-		}
			
 
				-	}
			
 
				-}
			
 
				-
			
 
				-func Middleware() {
			
 
				-	srv.AddMiddleware(sess.Middleware)
			
 
				-	srv.AddMiddleware(sec.Middleware)
			
 
				-
			
 
				-}
			
 
				-
			
 
				-func Routes() {
			
 
				-	type roles []string
			
 
				-	sec.Route("/{$}", roles{"Everyone"}, home.Index)
			
 
				-}
			
 
				-
			
 
				-// props and funcs to include with every render
			
--- a/app/layout/app.gen.tpl
+++ b/app/layout/app.gen.tpl
@@ -1,12 +0,0 @@
 
				-<html lang="en">
			
 
				-<head>
			
 
				-    <meta charset="UTF-8">
			
 
				-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
			
 
				-    <title>Document</title>
			
 
				-    <link rel="stylesheet" href="/app/pub/css/app.gen.css">
			
 
				-    
			
 
				-</head>
			
 
				-<body class="ICZvIYWz">
			
 
				-    
			
 
				-</body>
			
 
				-</html>
			
--- a/app/layout/app.tpl
+++ b/app/layout/app.tpl
@@ -1,12 +0,0 @@
 
				-<html lang="en">
			
 
				-<head>
			
 
				-    <meta charset="UTF-8">
			
 
				-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
			
 
				-    <title><block id="title">Document</block></title>
			
 
				-    <link rel="stylesheet" href="/app/pub/css/app.gen.css">
			
 
				-    <block id="head"></block>
			
 
				-</head>
			
 
				-<body>
			
 
				-    <block id="body"></block>
			
 
				-</body>
			
 
				-</html>
			
--- a/app/pub/css/app.gen.css
+++ b/app/pub/css/app.gen.css
--- a/app/route/home/home.go
+++ b/app/route/home/home.go
@@ -1,12 +0,0 @@
 
				-package home
			
 
				-
			
 
				-import (
			
 
				-	"git.clearsky.net.au/cody/gex.git/pkg/render"
			
 
				-	"git.clearsky.net.au/cody/gex.git/pkg/srv"
			
 
				-)
			
 
				-
			
 
				-func Index(req *srv.Req, res srv.Res) {
			
 
				-
			
 
				-	html := render.Template("./index.tpl", req)
			
 
				-	res.Send(html)
			
 
				-}
			
--- a/app/route/home/index.gen.tpl
+++ b/app/route/home/index.gen.tpl
@@ -1,16 +0,0 @@
 
				-<html lang="en">
			
 
				-<head>
			
 
				-    <meta charset="UTF-8">
			
 
				-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
			
 
				-    <title>Hello World</title>
			
 
				-    <link rel="stylesheet" href="/app/pub/css/app.gen.css">
			
 
				-    
			
 
				-</head>
			
 
				-<body class="ICZvIYWz">
			
 
				-    
			
 
				-        <h1 class="SJFOGsYd">Hello {{.Sess.User_name}}</h1>
			
 
				-        {{Cody}}
			
 
				-        
			
 
				-    
			
 
				-</body>
			
 
				-</html>
			
--- a/app/route/home/index.tpl
+++ b/app/route/home/index.tpl
@@ -1,8 +0,0 @@
 
				-<layout src="/app/layout/app.tpl">
			
 
				-    <block id="title">Hello World</block>
			
 
				-    <block id="body">
			
 
				-        <h1>Hello {{.Sess.User_name}}</h1>
			
 
				-        {{Cody}}
			
 
				-        
			
 
				-    </block>
			
 
				-</layout>
			
--- a/pkg/gen/css.go
+++ b/pkg/gen/css.go
--- a/pkg/gen/domquery/htmlquery.go
+++ b/pkg/gen/domquery/htmlquery.go
--- a/pkg/gen/domquery/node.go
+++ b/pkg/gen/domquery/node.go
--- a/pkg/gen/html.go
+++ b/pkg/gen/html.go
--- a/pkg/gen/img/img.go
+++ b/pkg/gen/img/img.go
--- a/pkg/gen/layout/main.go
+++ b/pkg/gen/layout/main.go
--- a/pkg/gen/main.go
+++ b/pkg/gen/main.go
--- a/pkg/gen/partial/partial.go
+++ b/pkg/gen/partial/partial.go
--- a/main.go
+++ b/main.go
@@ -1,22 +0,0 @@
 
				-package main
			
 
				-
			
 
				-import (
			
 
				-	"git.clearsky.net.au/cody/gex.git/app"
			
 
				-	"git.clearsky.net.au/cody/gex.git/pkg/srv"
			
 
				-	"git.clearsky.net.au/cody/gex.git/pkg/utils"
			
 
				-)
			
 
				-
			
 
				-func main() {
			
 
				-	// check cli arguments are set and correct
			
 
				-	utils.CheckArgs()
			
 
				-
			
 
				-	app.Init()
			
 
				-
			
 
				-	srv.InitRouter()
			
 
				-
			
 
				-	app.Middleware()
			
 
				-	app.Routes()
			
 
				-
			
 
				-	srv.StartServer()
			
 
				-
			
 
				-}
			
--- a/pkg/render/render.go
+++ b/pkg/render/render.go
--- a/pkg/sec/middleware.go
+++ b/pkg/sec/middleware.go
--- a/pkg/sec/secure.go
+++ b/pkg/sec/secure.go
--- a/pkg/sess/base64/base64url.go
+++ b/pkg/sess/base64/base64url.go
--- a/pkg/sess/config.go
+++ b/pkg/sess/config.go
--- a/pkg/sess/jwt/jwt.go
+++ b/pkg/sess/jwt/jwt.go
--- a/pkg/sess/middleware.go
+++ b/pkg/sess/middleware.go
--- a/pkg/sess/session.go
+++ b/pkg/sess/session.go
--- a/pkg/srv/middleware.go
+++ b/pkg/srv/middleware.go
--- a/pkg/srv/request.go
+++ b/pkg/srv/request.go
--- a/pkg/srv/response.go
+++ b/pkg/srv/response.go
--- a/pkg/srv/router.go
+++ b/pkg/srv/router.go
--- a/pkg/srv/server.go
+++ b/pkg/srv/server.go
--- a/pkg/utils/utils.go
+++ b/pkg/utils/utils.go