commit 0adb7c37830097f1164ba886be87e540398aae8b · dunkirk.sh/core

+2 -1

routes/handler.go

···

       56
       56
        
       		auth: auth,

     

       57
       57
        
       	}

     

       58
       58
        
       

     

       59
       59
       +
       	r.Get("/", h.Timeline)

     

       60
       60
       +
       

     

       59
       61
        
       	r.Group(func(r chi.Router) {

     

       60
       60
       -
       		r.Use(h.AuthMiddleware)

     

       61
       62
        
       		r.Get("/login", h.Login)

     

       62
       63
        
       		r.Post("/login", h.Login)

     

       63
       64
        
       	})

+17 -1

routes/routes.go

···

       464
       464
        
       		}

     

       465
       465
        
       

     

       466
       466
        
       		log.Printf("successfully saved session for %s (%s)", atSession.Handle, atSession.Did)

     

       467
       467
       -
       		http.Redirect(w, r, "/", http.StatusPermanentRedirect)

     

       467
       467
       +
       		http.Redirect(w, r, "/", http.StatusSeeOther)

     

       468
       468
        
       		return

     

       469
       469
        
       	}

     

       470
       470
        
       }

     
···

       564
       564
        
       		w.WriteHeader(http.StatusOK)

     

       565
       565
        
       	}

     

       566
       566
        
       }

     

       567
       567
       +
       

     

       568
       568
       +
       func (h *Handle) Timeline(w http.ResponseWriter, r *http.Request) {

     

       569
       569
       +
       	session, err := h.s.Get(r, "bild-session")

     

       570
       570
       +
       	user := make(map[string]string)

     

       571
       571
       +
       	if err != nil || session.IsNew {

     

       572
       572
       +
       		// user is not logged in

     

       573
       573
       +
       	} else {

     

       574
       574
       +
       		user["handle"] = session.Values["handle"].(string)

     

       575
       575
       +
       		user["did"] = session.Values["did"].(string)

     

       576
       576
       +
       	}

     

       577
       577
       +
       

     

       578
       578
       +
       	if err := h.t.ExecuteTemplate(w, "timeline", user); err != nil {

     

       579
       579
       +
       		log.Println(err)

     

       580
       580
       +
       		return

     

       581
       581
       +
       	}

     

       582
       582
       +
       }

+12

templates/layouts/topbar.html

···

       1
       1
       +
       <nav>

     

       2
       2
       +
           <ul>

     

       3
       3
       +
               {{ if . }}

     

       4
       4
       +
               <li>logged in as

     

       5
       5
       +
                 <a href="/@{{ .handle }}">{{ .handle }}</a> (with {{ .did }})

     

       6
       6
       +
               </li>

     

       7
       7
       +
               {{ else }}

     

       8
       8
       +
               <li><a href="/login">login</a></li>

     

       9
       9
       +
               {{ end }}

     

       10
       10
       +
           </ul>

     

       11
       11
       +
       </nav>

     

       12
       12
       +

+14

templates/timeline.html

···

       1
       1
       +
       {{ define "timeline" }}

     

       2
       2
       +
       <html>

     

       3
       3
       +
       {{ template "layouts/head" . }}

     

       4
       4
       +
       

     

       5
       5
       +
         <header>

     

       6
       6
       +
           <h1>timeline</h1>

     

       7
       7
       +
         </header>

     

       8
       8
       +
         <body>

     

       9
       9
       +
           <main>

     

       10
       10
       +
             {{ template "layouts/topbar" . }}

     

       11
       11
       +
           </main>

     

       12
       12
       +
         </body>

     

       13
       13
       +
       </html>

     

       14
       14
       +
       {{ end }}