Solve merge conflicts

one2nc · Feb 23, 2023 · 1c444fe · 1c444fe
2 parents 826b8f7 + d91ee5e
commit 1c444fe
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 52 deletions.
diff --git a/internal/render/alias.go b/internal/render/alias.go
@@ -17,7 +17,6 @@ func (Alias) Header(ns string) Header {
 	}
 }
 
-// Render renders a K8s resource to screen.
 // BOZO!! Pass in a row with pre-alloc fields??
 func (Alias) Render(o interface{}, ns string, r *Row) error {
 	a, ok := o.(AliasRes)

diff --git a/internal/view/help.go b/internal/view/help.go
@@ -60,12 +60,12 @@ func (h *Help) bindKeys() {
 func (h *Help) build() {
 	h.Clear()
 
-	sections := []string{"RESOURCE", "GENERAL", "NAVIGATION"}
+	sections := []string{"SERVICES", "GENERAL", "NAVIGATION"}
 	h.maxRows = len(h.showGeneral())
 	ff := []HelpFunc{
+		h.showServices,
 		h.hints,
 		h.showGeneral,
-		h.showNav,
 	}
 
 	var col int
@@ -79,39 +79,39 @@ func (h *Help) build() {
 	}
 }
 
-func (h *Help) showNav() model.MenuHints {
+func (h *Help) showServices() model.MenuHints {
 	return model.MenuHints{
 		{
-			Mnemonic:    "g",
-			Description: "Goto Top",
+			Mnemonic:    "s3",
+			Description: "view s3",
 		},
 		{
-			Mnemonic:    "Shift-g",
-			Description: "Goto Bottom",
+			Mnemonic:    "ec2",
+			Description: "View Ec2",
 		},
 		{
-			Mnemonic:    "Ctrl-b",
-			Description: "Page Up",
+			Mnemonic:    "vpc",
+			Description: "View VPC",
 		},
 		{
-			Mnemonic:    "Ctrl-f",
-			Description: "Page Down",
+			Mnemonic:    "subnet",
+			Description: "View Subnet",
 		},
 		{
-			Mnemonic:    "h",
-			Description: "Left",
+			Mnemonic:    "iam:u",
+			Description: "View IAM User",
 		},
 		{
-			Mnemonic:    "l",
-			Description: "Right",
+			Mnemonic:    "iam:r",
+			Description: "View IAM Role",
 		},
 		{
-			Mnemonic:    "k",
-			Description: "Up",
+			Mnemonic:    "iam:g",
+			Description: "View IAM User group",
 		},
 		{
-			Mnemonic:    "j",
-			Description: "Down",
+			Mnemonic:    "sg",
+			Description: "View Security Group",
 		},
 	}
 }
@@ -123,64 +123,61 @@ func (h *Help) showGeneral() model.MenuHints {
 			Description: "Help",
 		},
 		{
-			Mnemonic:    "Ctrl-a",
-			Description: "Aliases",
-		},
-		{
-			Mnemonic:    ":cmd",
-			Description: "Command mode",
+			Mnemonic:    "esc",
+			Description: "Back/Clear",
 		},
 		{
-			Mnemonic:    "/term",
-			Description: "Filter mode",
+			Mnemonic:    "tab",
+			Description: "toggle dropdown",
 		},
 		{
-			Mnemonic:    "esc",
-			Description: "Back/Clear",
+			Mnemonic:    "Ctrl-u",
+			Description: "Command Clear",
 		},
 		{
-			Mnemonic:    "tab",
-			Description: "Field Next",
+			Mnemonic:    "Ctrl-e",
+			Description: "Toggle Header",
 		},
+
 		{
-			Mnemonic:    "backtab",
-			Description: "Field Previous",
+			Mnemonic:    ":q",
+			Description: "Quit",
 		},
 		{
-			Mnemonic:    "Ctrl-r",
-			Description: "Reload",
+			Mnemonic:    "z",
+			Description: "Save csv",
 		},
 		{
-			Mnemonic:    "Ctrl-u",
-			Description: "Command Clear",
+			Mnemonic:    "g",
+			Description: "Goto Top",
 		},
 		{
-			Mnemonic:    "Ctrl-e",
-			Description: "Toggle Header",
+			Mnemonic:    "Shift-g",
+			Description: "Goto Bottom",
 		},
 		{
-			Mnemonic:    "Ctrl-g",
-			Description: "Toggle Crumbs",
+			Mnemonic:    "Ctrl-b",
+			Description: "Page Up",
 		},
 		{
-			Mnemonic:    ":q",
-			Description: "Quit",
+			Mnemonic:    "Ctrl-f",
+			Description: "Page Down",
 		},
 		{
-			Mnemonic:    "space",
-			Description: "Mark",
+			Mnemonic:    "h",
+			Description: "Left",
 		},
 		{
-			Mnemonic:    "Ctrl-space",
-			Description: "Mark Range",
+			Mnemonic:    "l",
+			Description: "Right",
 		},
 		{
-			Mnemonic:    "Ctrl-\\",
-			Description: "Mark Clear",
+			Mnemonic:    "k",
+			Description: "Up",
 		},
 		{
-			Mnemonic:    "Ctrl-s",
-			Description: "Save",
+			Mnemonic:    "j",
+			Description: "Down",
 		},
 	}
 }