浏览代码

Add button in activity view

Andrea Fazzi 6 年之前
父节点
当前提交
deea7dcf76
共有 2 个文件被更改,包括 26 次插入5 次删除
  1. 19 5
      handlers/handlers.go
  2. 7 0
      templates/activities_show.html.tpl

+ 19 - 5
handlers/handlers.go

@@ -30,9 +30,18 @@ type PathPattern struct {
 }
 }
 
 
 var (
 var (
-	signingKey    = []byte("secret")
-	store         = sessions.NewCookieStore([]byte("something-very-secret"))
-	jwtMiddleware = jwtmiddleware.New(jwtmiddleware.Options{
+	signingKey = []byte("secret")
+	store      = sessions.NewCookieStore([]byte("something-very-secret"))
+	jwtCookie  = jwtmiddleware.New(jwtmiddleware.Options{
+		ValidationKeyGetter: func(token *jwt.Token) (interface{}, error) {
+			return signingKey, nil
+		},
+		SigningMethod: jwt.SigningMethodHS256,
+		Extractor:     fromCookie,
+		ErrorHandler:  onError,
+	})
+
+	jwtHeader = jwtmiddleware.New(jwtmiddleware.Options{
 		ValidationKeyGetter: func(token *jwt.Token) (interface{}, error) {
 		ValidationKeyGetter: func(token *jwt.Token) (interface{}, error) {
 			return signingKey, nil
 			return signingKey, nil
 		},
 		},
@@ -61,7 +70,12 @@ var (
 // Generate CRUD handlers
 // Generate CRUD handlers
 func generateHandler(r *mux.Router, base string) {
 func generateHandler(r *mux.Router, base string) {
 	for _, pattern := range patterns {
 	for _, pattern := range patterns {
-		r.Handle(fmt.Sprintf(pattern.Path, base), jwtMiddleware.Handler(recoverHandler(modelHandler(base, fmt.Sprintf(pattern.Path, base), pattern.RedirectPath)))).Methods(pattern.Methods...)
+		r.Handle(
+			fmt.Sprintf(pattern.Path, base),
+			jwtCookie.Handler(recoverHandler(modelHandler(
+				base,
+				fmt.Sprintf(pattern.Path, base),
+				pattern.RedirectPath)))).Methods(pattern.Methods...)
 	}
 	}
 }
 }
 
 
@@ -81,7 +95,7 @@ func Handlers() *mux.Router {
 
 
 	// Dashboard
 	// Dashboard
 
 
-	r.Handle("/", jwtMiddleware.Handler(recoverHandler(dashboardHandler())))
+	r.Handle("/", jwtCookie.Handler(recoverHandler(dashboardHandler())))
 
 
 	// Generate model handlers
 	// Generate model handlers
 
 

+ 7 - 0
templates/activities_show.html.tpl

@@ -13,7 +13,13 @@
 	<h1>{{.Data.Subject.Name}} {{.Data.Class.Name}} {{.Data.Hours}}h</h1>
 	<h1>{{.Data.Subject.Name}} {{.Data.Class.Name}} {{.Data.Hours}}h</h1>
       </div>
       </div>
       <div class="col-md-4">
       <div class="col-md-4">
+
 	<div class="btn-group pull-right" role="group">
 	<div class="btn-group pull-right" role="group">
+	  <a href="/activities/add/?{{query "tpl_layout" "base" "tpl_content" "activities_add_update"}}" class="btn btn-success">
+	    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
+	    Crea
+	  </a>
+
 	  <a href="/activities/{{.Data.ID}}/update?{{query "tpl_layout" "base" "tpl_content" "activities_add_update" "update" "true"}}" class="btn btn-primary">
 	  <a href="/activities/{{.Data.ID}}/update?{{query "tpl_layout" "base" "tpl_content" "activities_add_update" "update" "true"}}" class="btn btn-primary">
 	    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
 	    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
 	    Modifica
 	    Modifica
@@ -25,6 +31,7 @@
 	    Elimina
 	    Elimina
 	  </button>
 	  </button>
 	</div>
 	</div>
+
       </div>
       </div>
     </div>
     </div>
   </div>
   </div>