@@ -3,7 +3,7 @@ package layouts
33import (
44 " fmt"
55 " github.com/go-chi/chi/v5"
6- " github.com/nicolashery/simply-shared-notes/app/access"
6+ acc " github.com/nicolashery/simply-shared-notes/app/access"
77 " github.com/nicolashery/simply-shared-notes/app/db"
88 " github.com/nicolashery/simply-shared-notes/app/identity"
99 " github.com/nicolashery/simply-shared-notes/app/rctx"
@@ -30,7 +30,7 @@ templ Space() {
3030 }
3131}
3232
33- templ navBar (route string , space *db.Space , access *access .Access , identity *identity.Identity ) {
33+ templ navBar (route string , space *db.Space , access *acc .Access , identity *identity.Identity ) {
3434 <div class =" navbar bg-base-100 px-4 border-b-2 border-base-300 mb-6" >
3535 <div class =" navbar-start" >
3636 <div >
@@ -48,7 +48,7 @@ templ navBar(route string, space *db.Space, access *access.Access, identity *ide
4848 </div >
4949}
5050
51- templ navMenu (route string , space *db.Space , access *access .Access ) {
51+ templ navMenu (route string , space *db.Space , access *acc .Access ) {
5252 <div class =" drawer" >
5353 <input id =" nav-drawer" type =" checkbox" class =" drawer-toggle" />
5454 <div class =" drawer-content" >
@@ -159,7 +159,7 @@ templ navMenu(route string, space *db.Space, access *access.Access) {
159159 Activity
160160 </a >
161161 </li >
162- if access.IsAdmin ( ) {
162+ if access.Can (acc. Action_ViewTokens ) {
163163 <li >
164164 <a
165165 href ={ templ.URL (fmt.Sprintf (" /s/%s /share" , access.Token )) }
@@ -182,6 +182,8 @@ templ navMenu(route string, space *db.Space, access *access.Access) {
182182 Share
183183 </a >
184184 </li >
185+ }
186+ if access.Can (acc.Action_UpdateSpace ) {
185187 <li >
186188 <a
187189 href ={ templ.URL (fmt.Sprintf (" /s/%s /settings" , access.Token )) }
@@ -211,7 +213,7 @@ templ navMenu(route string, space *db.Space, access *access.Access) {
211213 </div >
212214}
213215
214- templ userMenu (access *access .Access , identity *identity.Identity ) {
216+ templ userMenu (access *acc .Access , identity *identity.Identity ) {
215217 <div class =" drawer drawer-end" >
216218 <input id =" user-drawer" type =" checkbox" class =" drawer-toggle" />
217219 <div class =" drawer-content" >
@@ -240,7 +242,7 @@ templ userMenu(access *access.Access, identity *identity.Identity) {
240242 <div >{ helpers.IdentityName (identity) }</div >
241243 <div class =" text-xs font-normal" >{ helpers.RoleLabel (access) }</div >
242244 </li >
243- if ! access.IsView ( ) {
245+ if access.Can (acc. Action_UpdateMember ) {
244246 <li >
245247 <a
246248 href ={ templ.URL (fmt.Sprintf (" /s/%s /members/%s /edit" , access.Token , identity.Member .PublicID )) }
0 commit comments