diff options
Diffstat (limited to 'main.go')
-rw-r--r-- | main.go | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -10,6 +10,7 @@ import ( | |||
10 | "fagott.pw/grilist/frontend" | 10 | "fagott.pw/grilist/frontend" |
11 | "fagott.pw/grilist/grilist" | 11 | "fagott.pw/grilist/grilist" |
12 | "fagott.pw/grilist/modules/lists" | 12 | "fagott.pw/grilist/modules/lists" |
13 | "fagott.pw/grilist/modules/grils" | ||
13 | 14 | ||
14 | "github.com/julienschmidt/httprouter" | 15 | "github.com/julienschmidt/httprouter" |
15 | _ "github.com/lib/pq" | 16 | _ "github.com/lib/pq" |
@@ -18,16 +19,13 @@ import ( | |||
18 | var app *grilist.Grilist | 19 | var app *grilist.Grilist |
19 | 20 | ||
20 | func index(w http.ResponseWriter, r *http.Request, _ httprouter.Params) { | 21 | func index(w http.ResponseWriter, r *http.Request, _ httprouter.Params) { |
21 | user, err := app.Charakterin.GetUserFromRequest(r) | 22 | _, err := app.Charakterin.GetUserFromRequest(r) |
22 | if err != nil { | 23 | if err != nil { |
23 | http.Redirect(w, r, "/login", 302) | 24 | http.Redirect(w, r, "/login", 302) |
24 | return | 25 | return |
25 | } | 26 | } |
26 | 27 | ||
27 | data := make(map[string]interface{}) | 28 | http.Redirect(w, r, "/dashboard", 302) |
28 | |||
29 | data["username"] = user.GetName() | ||
30 | app.Renderer.RenderPage("index", w, data) | ||
31 | } | 29 | } |
32 | 30 | ||
33 | func loadModule(mod grilist.Module) error { | 31 | func loadModule(mod grilist.Module) error { |
@@ -35,6 +33,7 @@ func loadModule(mod grilist.Module) error { | |||
35 | return fmt.Errorf("module with name %s already exists", mod.Name()) | 33 | return fmt.Errorf("module with name %s already exists", mod.Name()) |
36 | } | 34 | } |
37 | app.Modules[mod.Name()] = mod | 35 | app.Modules[mod.Name()] = mod |
36 | mod.Init(app) | ||
38 | return nil | 37 | return nil |
39 | } | 38 | } |
40 | 39 | ||
@@ -71,12 +70,14 @@ func main() { | |||
71 | router.HandlerFunc("GET", "/register", login.DisplayRegistration) | 70 | router.HandlerFunc("GET", "/register", login.DisplayRegistration) |
72 | router.HandlerFunc("POST", "/register", login.Register) | 71 | router.HandlerFunc("POST", "/register", login.Register) |
73 | router.GET("/", index) | 72 | router.GET("/", index) |
73 | router.GET("/dashboard", viewDashboard) | ||
74 | 74 | ||
75 | fs := http.FileServer(http.Dir("assets")) | 75 | fs := http.FileServer(http.Dir("assets")) |
76 | http.Handle("/assets/", http.StripPrefix("/assets/", fs)) | 76 | http.Handle("/assets/", http.StripPrefix("/assets/", fs)) |
77 | http.Handle("/", router) | 77 | http.Handle("/", router) |
78 | 78 | ||
79 | // Module laden | 79 | // Module laden |
80 | loadModule(grils.New()) | ||
80 | loadModule(lists.New()) | 81 | loadModule(lists.New()) |
81 | 82 | ||
82 | log.Fatal(http.ListenAndServe(":8080", nil)) | 83 | log.Fatal(http.ListenAndServe(":8080", nil)) |