refactor: Update S3 breadcrumbs in index.html template

tttol · Jul 1, 2024 · dac544f · dac544f
1 parent fee8235
commit dac544f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/core/util/breadcrumbs.go b/core/util/breadcrumbs.go
@@ -8,7 +8,7 @@ import (
 func GenerateBreadcrumbs(path string) map[string]interface{} {
 	breadcrumbs := make(map[string]interface{})
 	parts := strings.Split(path, "/")
-	fullPath := ""
+	fullPath := "/s3"
 	for i, part := range parts {
 		if part == "" {
 			continue

diff --git a/core/util/object.go b/core/util/object.go
@@ -22,11 +22,9 @@ func GenerateS3Objects(r *http.Request, path string) ([]model.S3Object, error) {
 		obj.Name = entry.Name()
 		obj.FullPath = filepath.Join(r.URL.Path, entry.Name())
 		obj.IsDir = entry.IsDir()
-		slog.Info("S3Object", "data", obj)
 
 		s3Objects = append(s3Objects, obj)
 	}
-	slog.Info("S3Objects", "data", s3Objects)
 
 	return s3Objects, nil
 }
diff --git a/static/index.html b/static/index.html
@@ -17,11 +17,9 @@
         <div class="mx-auto w-3/4 p-3 bg-emerald-800 rounded-xl">
             <div class="flex justify-between">
                 <div class="text-lg">
-                    <a href="/s3" class="text-cyan-400 underline-offset-2 hover:opacity-60">s3://</a>
-                    {{range .}}
-                        {{if .IsDir}}
-                        <span> / <a href="{{.FullPath}}" class="text-cyan-400 underline-offset-2 hover:opacity-60">{{.Name}}</a></span>
-                        {{end}}
+                    <a href="/s3" class="text-cyan-400 underline-offset-2 hover:opacity-60">s3:</a>
+                    {{range $key, $value := .Breadcrumbs}}
+                        <span> / <a href="{{$value}}" class="text-cyan-400 underline-offset-2 hover:opacity-60">{{$key}}</a></span>
                     {{end}}
                 </div>
                 <div id="upload" class="inline-block bg-blue-500 text-white w-auto font-bold py-2 px-2 rounded-full mb-3 hover:opacity-60">

diff --git a/web/s3_controller.go b/web/s3_controller.go
@@ -27,7 +27,7 @@ func S3Handler(w http.ResponseWriter, r *http.Request) {
 
 	dataMap := map[string]interface{}{
 		"S3Objects":   s3Objects,
-		"breadcrumbs": "Some additional data",
+		"Breadcrumbs": util.GenerateBreadcrumbs(path),
 	}
 
 	tmpl, err := template.ParseFiles("static/index.html")
@@ -37,6 +37,7 @@ func S3Handler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	slog.Info("dataMap", "dataMap", dataMap)
 	tmpl.Execute(w, dataMap)
 }
 func download(path string) {