Skip to content

Commit

Permalink
Misc small tweaks (#41)
Browse files Browse the repository at this point in the history 
* page titles

* change urls
  • Loading branch information
@drewhammond
drewhammond authored Oct 17, 2022
1 parent 94728ff commit bdb83b7
Show file tree
Hide file tree
Showing 17 changed files with 107 additions and 89 deletions.
22 changes: 11 additions & 11 deletions internal/app/api/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,37 +34,37 @@ func (s *Service) RegisterRoutes() {
router.Use(corsMiddleware())
// nodes
router.GET("/nodes", s.getNodes)
router.GET("/node/:name", s.getNode)
router.GET("/nodes/:name", s.getNode)

// environments
router.GET("/environments", s.getEnvironments)
router.GET("/environment/:name", s.getEnvironment)
router.GET("/environments/:name", s.getEnvironment)

// roles
router.GET("/roles", s.getRoles)
router.GET("/role/:name", s.getRole)
router.GET("/roles/:name", s.getRole)

// cookbooks
router.GET("/cookbooks", s.getCookbooks)
router.GET("/cookbook/:name", s.getCookbook)
router.GET("/cookbook/:name/versions", s.getCookbookVersions)
router.GET("/cookbook/:name/:version", s.getCookbookVersion)
router.GET("/cookbooks/:name", s.getCookbook)
router.GET("/cookbooks/:name/versions", s.getCookbookVersions)
router.GET("/cookbooks/:name/:version", s.getCookbookVersion)

// groups
router.GET("/groups", s.getGroups)
router.GET("/groups/:name", s.getGroup)

// databags
router.GET("/databags", s.getDatabags)
router.GET("/databag/:name", s.getDatabagItems)
router.GET("/databag/:name/:item", s.getDatabagItemContent)
router.GET("/databags/:name", s.getDatabagItems)
router.GET("/databags/:name/:item", s.getDatabagItemContent)

// policies
router.GET("/policies", s.getPolicies)
router.GET("/policy/:name", s.getPolicy)
router.GET("/policy/:name/:revision", s.getPolicyRevision)
router.GET("/policies/:name", s.getPolicy)
router.GET("/policies/:name/:revision", s.getPolicyRevision)
router.GET("/policy-groups", s.getPolicyGroups)
router.GET("/policy-group/:name", s.getPolicyGroup)
router.GET("/policy-groups/:name", s.getPolicyGroup)

// misc
router.GET("/health", getHealth)
Expand Down
121 changes: 71 additions & 50 deletions internal/app/ui/routes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,33 +93,33 @@ func (s *Service) RegisterRoutes() {
c.Redirect(http.StatusFound, "/ui/nodes")
})
router.GET("/nodes", s.getNodes)
router.GET("/node/:name", s.getNode)
router.GET("/nodes/:name", s.getNode)

router.GET("/environments", s.getEnvironments)
router.GET("/environment/:name", s.getEnvironment)
router.GET("/environments/:name", s.getEnvironment)

router.GET("/roles", s.getRoles)
router.GET("/role/:name", s.getRole)
router.GET("/roles/:name", s.getRole)

router.GET("/databags", s.getDatabags)
router.GET("/databag/:name", s.getDatabagItems)
router.GET("/databag/:name/:item", s.getDatabagItemContent)
router.GET("/databags/:name", s.getDatabagItems)
router.GET("/databags/:name/:item", s.getDatabagItemContent)

router.GET("/cookbooks", s.getCookbooks)
router.GET("/cookbook/:name", s.getCookbook)
router.GET("/cookbook/:name/:version", s.getCookbookVersion)
router.GET("/cookbook/:name/:version/files", s.getCookbookFiles)
router.GET("/cookbook/:name/:version/file/*trail", s.getCookbookFile)
router.GET("/cookbook/:name/:version/recipes", s.getCookbookRecipes)
router.GET("/cookbooks/:name", s.getCookbook)
router.GET("/cookbooks/:name/:version", s.getCookbookVersion)
router.GET("/cookbooks/:name/:version/files", s.getCookbookFiles)
router.GET("/cookbooks/:name/:version/file/*trail", s.getCookbookFile)
router.GET("/cookbooks/:name/:version/recipes", s.getCookbookRecipes)

router.GET("/groups", s.getGroups)
router.GET("/groups/:name", s.getGroup)

router.GET("/policies", s.getPolicies)
router.GET("/policy/:name", s.getPolicy)
router.GET("/policy/:name/:revision", s.getPolicyRevision)
router.GET("/policies/:name", s.getPolicy)
router.GET("/policies/:name/:revision", s.getPolicyRevision)
router.GET("/policy-groups", s.getPolicyGroups)
router.GET("/policy-group/:name", s.getPolicyGroup)
router.GET("/policy-groups/:name", s.getPolicyGroup)
}
}

Expand All @@ -131,8 +131,9 @@ func (s *Service) getNode(c *gin.Context) {
}

c.HTML(http.StatusOK, "node", gin.H{
"node": node,
"title": node.Name,
"active_nav": "nodes",
"node": node,
"title": node.Name,
})
}

Expand All @@ -148,12 +149,12 @@ func (s *Service) makeRunListURL(f string) string {
} else {
recipe = "default"
}
return fmt.Sprintf("cookbook/%s/_latest/file/recipes/%s.rb", cookbook, recipe)
return fmt.Sprintf("cookbooks/%s/_latest/file/recipes/%s.rb", cookbook, recipe)
}
if strings.HasPrefix(f, "role") {
r := strings.TrimPrefix(f, "role[")
r = strings.TrimSuffix(r, "]")
return fmt.Sprintf("role/%s", r)
return fmt.Sprintf("roles/%s", r)
}

return ""
Expand Down Expand Up @@ -193,8 +194,9 @@ func (s *Service) getRoles(c *gin.Context) {
return
}
c.HTML(http.StatusOK, "roles", goview.M{
"roles": roles.Roles,
"title": "All Nodes",
"roles": roles.Roles,
"active_nav": "roles",
"title": "All Roles",
})
}

Expand All @@ -210,8 +212,9 @@ func (s *Service) getRole(c *gin.Context) {
}
}
c.HTML(http.StatusOK, "role", goview.M{
"role": role,
"title": role.Name,
"role": role,
"active_nav": "roles",
"title": role.Name,
})
}

Expand All @@ -224,6 +227,7 @@ func (s *Service) getCookbook(c *gin.Context) {
c.HTML(http.StatusOK, "cookbook", goview.M{
"cookbook": cookbook,
"title": cookbook.Name,
"active_nav": "cookbooks",
"active_tab": "overview",
})
}
Expand Down Expand Up @@ -251,6 +255,7 @@ func (s *Service) getCookbookVersion(c *gin.Context) {
}
c.HTML(http.StatusOK, "cookbook", goview.M{
"active_tab": "overview",
"active_nav": "cookbooks",
"cookbook": cookbook,
"metadata": metadata,
"readme": readme,
Expand All @@ -271,6 +276,7 @@ func (s *Service) getCookbookFiles(c *gin.Context) {
c.HTML(http.StatusOK, "cookbook_file_list", goview.M{
"cookbook": cookbook,
"active_tab": "files",
"active_nav": "cookbooks",
"files": cookbook.RootFiles,
"title": cookbook.Name,
})
Expand All @@ -289,6 +295,7 @@ func (s *Service) getCookbookRecipes(c *gin.Context) {
c.HTML(http.StatusOK, "cookbook_recipes", goview.M{
"cookbook": cookbook,
"active_tab": "recipes",
"active_nav": "cookbooks",
"recipes": cookbook.Recipes,
"title": cookbook.Name,
})
Expand Down Expand Up @@ -322,6 +329,7 @@ func (s *Service) getCookbookFile(c *gin.Context) {
c.HTML(http.StatusOK, "cookbook_file", goview.M{
"cookbook": cookbook,
"active_tab": "files",
"active_nav": "cookbooks",
"file": file,
"path": path,
"title": cookbook.Name,
Expand All @@ -339,8 +347,9 @@ func (s *Service) getCookbooks(c *gin.Context) {
}

c.HTML(http.StatusOK, "cookbooks", goview.M{
"cookbooks": cookbooks.Cookbooks,
"title": "All Cookbooks",
"cookbooks": cookbooks.Cookbooks,
"active_nav": "cookbooks",
"title": "All Cookbooks",
})
}

Expand All @@ -355,6 +364,7 @@ func (s *Service) getEnvironments(c *gin.Context) {
}
c.HTML(http.StatusOK, "environments", goview.M{
"environments": environments,
"active_nav": "environments",
"title": "All Environments",
})
}
Expand All @@ -373,6 +383,7 @@ func (s *Service) getEnvironment(c *gin.Context) {
}
c.HTML(http.StatusOK, "environment", goview.M{
"environment": environment,
"active_nav": "environments",
"title": environment.Name,
})
}
Expand All @@ -387,8 +398,9 @@ func (s *Service) getDatabags(c *gin.Context) {
return
}
c.HTML(http.StatusOK, "databags", goview.M{
"databags": databags,
"title": "Showing all data bags",
"databags": databags,
"active_nav": "databags",
"title": "All Data Bags",
})
}

Expand All @@ -406,9 +418,10 @@ func (s *Service) getDatabagItems(c *gin.Context) {
}
}
c.HTML(http.StatusOK, "databag_items", goview.M{
"databag": name,
"items": items,
"title": "Data Bag Items",
"databag": name,
"items": items,
"active_nav": "databags",
"title": fmt.Sprintf("Data Bag %s - All Items", name),
})
}

Expand All @@ -426,10 +439,11 @@ func (s *Service) getDatabagItemContent(c *gin.Context) {
}
}
c.HTML(http.StatusOK, "databag_item_content", goview.M{
"databag": databag,
"item": item,
"content": content,
"title": "Data Bag Items",
"active_nav": "databags",
"databag": databag,
"item": item,
"content": content,
"title": fmt.Sprintf("Data Bag %s - %s", databag, item),
})
}

Expand All @@ -443,8 +457,9 @@ func (s *Service) getGroups(c *gin.Context) {
return
}
c.HTML(http.StatusOK, "groups", goview.M{
"content": groups,
"title": "All Groups",
"content": groups,
"active_nav": "groups",
"title": "All Groups",
})
}

Expand All @@ -459,8 +474,9 @@ func (s *Service) getGroup(c *gin.Context) {
return
}
c.HTML(http.StatusOK, "group", goview.M{
"content": group,
"title": "All Groups",
"content": group,
"active_nav": "groups",
"title": fmt.Sprintf("Groups - %s", name),
})
}

Expand All @@ -474,8 +490,9 @@ func (s *Service) getPolicies(c *gin.Context) {
return
}
c.HTML(http.StatusOK, "policies", goview.M{
"content": policies,
"title": "All Policies",
"content": policies,
"active_nav": "policies",
"title": "All Policies",
})
}

Expand All @@ -490,9 +507,10 @@ func (s *Service) getPolicy(c *gin.Context) {
return
}
c.HTML(http.StatusOK, "policy", goview.M{
"name": name,
"policy": policy,
"title": "Policy",
"name": name,
"policy": policy,
"active_nav": "policies",
"title": fmt.Sprintf("Policy > %s", name),
})
}

Expand All @@ -508,10 +526,11 @@ func (s *Service) getPolicyRevision(c *gin.Context) {
return
}
c.HTML(http.StatusOK, "policy-revision", goview.M{
"name": name,
"revision": revision,
"policy": policy,
"title": "Policy",
"active_nav": "policies",
"name": name,
"revision": revision,
"policy": policy,
"title": fmt.Sprintf("%s > %s", name, revision),
})
}

Expand All @@ -525,8 +544,9 @@ func (s *Service) getPolicyGroups(c *gin.Context) {
return
}
c.HTML(http.StatusOK, "policy-groups", goview.M{
"content": policyGroups,
"title": "All Policy Groups",
"content": policyGroups,
"active_nav": "policies",
"title": "All Policy Groups",
})
}

Expand All @@ -541,8 +561,9 @@ func (s *Service) getPolicyGroup(c *gin.Context) {
return
}
c.HTML(http.StatusOK, "policy-group", goview.M{
"name": name,
"policies": policyGroup.Policies,
"title": "Policy group",
"active_nav": "policies",
"name": name,
"policies": policyGroup.Policies,
"title": fmt.Sprintf("Policy groups > %s", name),
})
}
2 changes: 1 addition & 1 deletion internal/app/ui/templates/cookbook_recipes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h4>Recipes</h4>
<ul class="list-unstyled">
{{ range .recipes }}
<li>
<a href="/ui/cookbook/{{ $.cookbook.Metadata.Name }}/{{ $.cookbook.Metadata.Version }}/file/{{ .Path }}">{{ .Name }}</a>
<a href="/ui/cookbooks/{{ $.cookbook.Metadata.Name }}/{{ $.cookbook.Metadata.Version }}/file/{{ .Path }}">{{ .Name }}</a>
</li>
{{ end }}
</ul>
Expand Down
2 changes: 1 addition & 1 deletion internal/app/ui/templates/cookbooks.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ <h2>Cookbooks</h2>
<li>
<span class="">{{$versions.Name}}</span>
{{range .Versions}}
<span class="badge text-bg-light"><a href="/ui/cookbook/{{$versions.Name}}/{{.}}">{{.}}</a></span>
<span class="badge text-bg-light"><a href="/ui/cookbooks/{{$versions.Name}}/{{.}}">{{.}}</a></span>
{{end}}
</li>
{{end}}
Expand Down
2 changes: 1 addition & 1 deletion internal/app/ui/templates/databag_items.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<h2 class="databag-headline">{{.databag}}</h2>
<ul id="databag-list" class="list-unstyled">
{{range $name, $url := .items}}
<li><a href="/ui/databag/{{$.databag}}/{{$name}}/">{{$name}}</a></li>
<li><a href="/ui/databags/{{$.databag}}/{{$name}}/">{{$name}}</a></li>
{{end}}
</ul>
{{end}}
2 changes: 1 addition & 1 deletion internal/app/ui/templates/databags.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<h2>Data Bags</h2>
<ul id="databag-list" class="list-unstyled">
{{range $name, $url := .databags}}
<li><a href="/ui/databag/{{$name}}">{{$name}}</a></li>
<li><a href="/ui/databags/{{$name}}">{{$name}}</a></li>
{{end}}
</ul>
{{end}}
2 changes: 1 addition & 1 deletion internal/app/ui/templates/environments.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<h2>Environments</h2>
<ul id="environment-list" class="list-unstyled">
{{range $name, $url := .environments }}
<li><a href="/ui/environment/{{$name}}">{{$name}}</a></li>
<li><a href="/ui/environments/{{$name}}">{{$name}}</a></li>
{{end}}
</ul>
{{end}}
Loading

0 comments on commit bdb83b7

Please sign in to comment.