Compare commits
	
		
			4 Commits
		
	
	
		
			master
			...
			6d6aff50b3
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					6d6aff50b3 | ||
| 
						 | 
					a6be73765a | ||
| 
						 | 
					ddc9e51831 | ||
| 
						 | 
					dc450e26dd | 
@@ -13,13 +13,28 @@ type Get struct {
 | 
			
		||||
	App *app.App
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (g *Get) ShowHome(w http.ResponseWriter, _ *http.Request) {
 | 
			
		||||
func (g *Get) ShowHome(w http.ResponseWriter, r *http.Request) {
 | 
			
		||||
	type dataStruct struct {
 | 
			
		||||
		CsrfToken       string
 | 
			
		||||
		IsAuthenticated bool
 | 
			
		||||
		Test            string
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	CsrfToken, err := security.GenerateCsrfToken(w, r)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	isAuthenticated := true
 | 
			
		||||
	user, err := models.CurrentUser(g.App, r)
 | 
			
		||||
	if err != nil || user.Id == 0 {
 | 
			
		||||
		isAuthenticated = false
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	data := dataStruct{
 | 
			
		||||
		CsrfToken:       CsrfToken,
 | 
			
		||||
		Test:            "Hello World!",
 | 
			
		||||
		IsAuthenticated: isAuthenticated,
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	templating.RenderTemplate(w, "templates/pages/home.html", data)
 | 
			
		||||
@@ -28,6 +43,7 @@ func (g *Get) ShowHome(w http.ResponseWriter, _ *http.Request) {
 | 
			
		||||
func (g *Get) ShowRegister(w http.ResponseWriter, r *http.Request) {
 | 
			
		||||
	type dataStruct struct {
 | 
			
		||||
		CsrfToken       string
 | 
			
		||||
		IsAuthenticated bool
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	CsrfToken, err := security.GenerateCsrfToken(w, r)
 | 
			
		||||
@@ -35,8 +51,15 @@ func (g *Get) ShowRegister(w http.ResponseWriter, r *http.Request) {
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	isAuthenticated := true
 | 
			
		||||
	user, err := models.CurrentUser(g.App, r)
 | 
			
		||||
	if err != nil || user.Id == 0 {
 | 
			
		||||
		isAuthenticated = false
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	data := dataStruct{
 | 
			
		||||
		CsrfToken:       CsrfToken,
 | 
			
		||||
		IsAuthenticated: isAuthenticated,
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	templating.RenderTemplate(w, "templates/pages/register.html", data)
 | 
			
		||||
@@ -45,6 +68,7 @@ func (g *Get) ShowRegister(w http.ResponseWriter, r *http.Request) {
 | 
			
		||||
func (g *Get) ShowLogin(w http.ResponseWriter, r *http.Request) {
 | 
			
		||||
	type dataStruct struct {
 | 
			
		||||
		CsrfToken       string
 | 
			
		||||
		IsAuthenticated bool
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	CsrfToken, err := security.GenerateCsrfToken(w, r)
 | 
			
		||||
@@ -58,8 +82,3 @@ func (g *Get) ShowLogin(w http.ResponseWriter, r *http.Request) {
 | 
			
		||||
 | 
			
		||||
	templating.RenderTemplate(w, "templates/pages/login.html", data)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (g *Get) Logout(w http.ResponseWriter, r *http.Request) {
 | 
			
		||||
	models.LogoutUser(g.App, w, r)
 | 
			
		||||
	http.Redirect(w, r, "/", http.StatusFound)
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -50,3 +50,8 @@ func (p *Post) Register(w http.ResponseWriter, r *http.Request) {
 | 
			
		||||
 | 
			
		||||
	http.Redirect(w, r, "/login", http.StatusFound)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (p *Post) Logout(w http.ResponseWriter, r *http.Request) {
 | 
			
		||||
	models.LogoutUser(p.App, w, r)
 | 
			
		||||
	http.Redirect(w, r, "/", http.StatusFound)
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -25,7 +25,7 @@ func RunAllMigrations(app *app.App) error {
 | 
			
		||||
		Id:         1,
 | 
			
		||||
		UserId:     1,
 | 
			
		||||
		AuthToken:  "migrate",
 | 
			
		||||
		RememberMe: false,
 | 
			
		||||
		RememberMe: true, // Booleans must be true to migrate properly
 | 
			
		||||
		CreatedAt:  time.Now(),
 | 
			
		||||
	}
 | 
			
		||||
	err = database.Migrate(app, session)
 | 
			
		||||
 
 | 
			
		||||
@@ -22,12 +22,11 @@ func Get(app *app.App) {
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
	staticHandler := http.FileServer(http.FS(staticFS))
 | 
			
		||||
	http.Handle("/static/", http.StripPrefix("/static/", staticHandler))
 | 
			
		||||
	http.Handle("GET /static/", http.StripPrefix("/static/", staticHandler))
 | 
			
		||||
	slog.Info("serving static files from embedded file system /static")
 | 
			
		||||
 | 
			
		||||
	// Pages
 | 
			
		||||
	http.HandleFunc("/", getController.ShowHome)
 | 
			
		||||
	http.HandleFunc("/login", getController.ShowLogin)
 | 
			
		||||
	http.HandleFunc("/register", getController.ShowRegister)
 | 
			
		||||
	http.HandleFunc("/logout", getController.Logout)
 | 
			
		||||
	http.HandleFunc("GET /", getController.ShowHome)
 | 
			
		||||
	http.HandleFunc("GET /login", getController.ShowLogin)
 | 
			
		||||
	http.HandleFunc("GET /register", getController.ShowRegister)
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -15,6 +15,7 @@ func Post(app *app.App) {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// User authentication
 | 
			
		||||
	http.HandleFunc("/register-handle", middleware.Csrf(postController.Register))
 | 
			
		||||
	http.HandleFunc("/login-handle", middleware.Csrf(postController.Login))
 | 
			
		||||
	http.HandleFunc("POST /register-handle", middleware.Csrf(postController.Register))
 | 
			
		||||
	http.HandleFunc("POST /login-handle", middleware.Csrf(postController.Login))
 | 
			
		||||
	http.HandleFunc("POST /logout", middleware.Csrf(postController.Logout))
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -6,6 +6,21 @@
 | 
			
		||||
    <link href="/static/css/style.css" rel="stylesheet">
 | 
			
		||||
</head>
 | 
			
		||||
<body>
 | 
			
		||||
<div class="navbar">
 | 
			
		||||
    {{ if .IsAuthenticated }}
 | 
			
		||||
    <form action="/logout" method="post">
 | 
			
		||||
        <input name="csrf_token" type="hidden" value="{{ .CsrfToken }}">
 | 
			
		||||
        <input type="submit" value="Logout">
 | 
			
		||||
    </form>
 | 
			
		||||
    {{ else }}
 | 
			
		||||
    <form action="/login" method="get">
 | 
			
		||||
        <input type="submit" value="Login">
 | 
			
		||||
    </form>
 | 
			
		||||
    <form action="/register" method="get">
 | 
			
		||||
        <input type="submit" value="Register">
 | 
			
		||||
    </form>
 | 
			
		||||
    {{ end }}
 | 
			
		||||
</div>
 | 
			
		||||
{{ template "content" . }}
 | 
			
		||||
<div class="footer-container">
 | 
			
		||||
    <footer>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user