feat(gnoweb): Add Source and Action button for realm explorer #5032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

Davphla wants to merge 19 commits into gnolang:master from Davphla:david/gnoweb/new-button

gno.land/pkg/gnoweb/components/view_directory.go

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -4,7 +4,6 @@ const DirectoryViewType ViewType = "dir-view"
  
    type DirData struct {

    	PkgPath     string

    	Files       []string

    	FileCounter int

    	FilesLinks  FilesLinks

    	Mode        ViewMode

    @@ -18,7 +17,7 @@ const (
  
    	DirLinkTypeFile

    )

    // Get the prefixed link depending on link type - Package Source Code or Package File

    // LinkPrefix returns the prefixed link depending on link type

    func (d DirLinkType) LinkPrefix(pkgPath string) string {

    	switch d {

    	case DirLinkTypeSource:

    @@ -29,28 +28,32 @@ func (d DirLinkType) LinkPrefix(pkgPath string) string {
  
    	return ""

    }

    // Files has to be an array with Link (prefixed) and Name (filename)

    // FullFileLink represents a package entry in the directory listing.

    type FullFileLink struct {

    	Link string

    	Name string

    }

    // FilesLinks has to be an array of FileLink

    // FilesLinks is a slice of FullFileLink

    type FilesLinks []FullFileLink

    func GetFullLinks(files []string, linkType DirLinkType, pkgPath string) FilesLinks {

    // buildFilesLinks creates FilesLinks from files

    func buildFilesLinks(files []string, linkType DirLinkType, pkgPath string) FilesLinks {

    	result := make(FilesLinks, len(files))

    	for i, file := range files {

    		result[i] = FullFileLink{Link: linkType.LinkPrefix(pkgPath) + file, Name: file}

    		result[i] = FullFileLink{

    			Link: linkType.LinkPrefix(pkgPath) + file,

    			Name: file,

    		}

    	}

    	return result

    }

    // DirectoryView creates a directory view

    func DirectoryView(pkgPath string, files []string, fileCounter int, linkType DirLinkType, mode ViewMode, readme ...Component) *View {

    	viewData := DirData{

    		PkgPath:     pkgPath,

    		Files:       files,

    		FilesLinks:  GetFullLinks(files, linkType, pkgPath),

    		FilesLinks:  buildFilesLinks(files, linkType, pkgPath),

    		FileCounter: fileCounter,

    		Mode:        mode,

    	}

gno.land/pkg/gnoweb/components/view_test.go

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -304,7 +304,7 @@ func TestDirectoryView(t *testing.T) {
  
    	assert.True(t, ok, "expected DirData type in component data")

    	assert.Equal(t, pkgPath, dirData.PkgPath, "expected PkgPath %s, got %s", pkgPath, dirData.PkgPath)

    	assert.Equal(t, len(files), len(dirData.Files), "expected %d files, got %d", len(files), len(dirData.Files))

    	assert.Equal(t, len(files), len(dirData.FilesLinks), "expected %d files, got %d", len(files), len(dirData.FilesLinks))

    	assert.Equal(t, fileCounter, dirData.FileCounter, "expected FileCounter %d, got %d", fileCounter, dirData.FileCounter)

    	assert.Equal(t, mode, dirData.Mode, "expected Mode %v, got %v", mode, dirData.Mode)

    @@ -347,52 +347,6 @@ func TestDirLinkType_LinkPrefix(t *testing.T) {
  
    	}

    }

    func TestGetFullLinks(t *testing.T) {

    	cases := []struct {

    		name     string

    		files    []string

    		linkType DirLinkType

    		pkgPath  string

    		expected FilesLinks

    	}{

    		{

    			name:     "Source link type with multiple files",

    			files:    []string{"file1.gno", "file2.gno"},

    			linkType: DirLinkTypeSource,

    			pkgPath:  "/r/test/pkg",

    			expected: FilesLinks{

    				{Link: "/r/test/pkg$source&file=file1.gno", Name: "file1.gno"},

    				{Link: "/r/test/pkg$source&file=file2.gno", Name: "file2.gno"},

    			},

    		},

    		{

    			name:     "File link type with multiple files",

    			files:    []string{"file1.gno", "file2.gno"},

    			linkType: DirLinkTypeFile,

    			pkgPath:  "/r/test/pkg",

    			expected: FilesLinks{

    				{Link: "file1.gno", Name: "file1.gno"},

    				{Link: "file2.gno", Name: "file2.gno"},

    			},

    		},

    		{

    			name:     "Empty files list",

    			files:    []string{},

    			linkType: DirLinkTypeSource,

    			pkgPath:  "/r/test/pkg",

    			expected: FilesLinks{},

    		},

    	}

    	for _, tc := range cases {

    		tc := tc

    		t.Run(tc.name, func(t *testing.T) {

    			result := GetFullLinks(tc.files, tc.linkType, tc.pkgPath)

    			assert.Equal(t, tc.expected, result)

    		})

    	}

    }

    func TestUserView(t *testing.T) {

    	data := UserData{

    		Username:   "testuser",

gno.land/pkg/gnoweb/components/views/directory.html

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,15 +11,20 @@ <h1 class="title b-content-h1">{{ $pkgpath }}</h1> @@
       <ul class="b-list">
         {{ range .FilesLinks }}
         <li>
-          <a class="line-clamp-2" href="{{ .Link }}">
-            <span class="c-with-icon">
-              <svg class="c-icon">
-                <use href="#ico-file"></use>
-              </svg>
-              <span class="name">{{ .Name }}</span>
-            </span>
-            <span>Open</span>
-          </a>
+          <div class="b-list-item-realm">
+            <a class="b-list-item-link" href="{{ .Link }}">
+              <span class="c-with-icon">
+                <svg class="c-icon">
+                  <use href="#ico-file"></use>
+                </svg>
+                <span class="name">{{ .Name }}</span>
+              </span>
+            </a>
+            <div class="b-list-item-actions">
+              <a href="{{ .Link }}$source" class="b-inline-btn">Source</a>
+              <a href="{{ .Link }}$help" class="b-inline-btn">Action</a>
+            </div>
+          </div>
         </li>
         {{ end }}
       </ul>
@@ Expand Down @@

gno.land/pkg/gnoweb/frontend/css/06-blocks.css

-Original file line number
+Diff line change
@@ Expand Up / @@ -806,6 +806,35 @@ @@
     	}
     }
+    .b-list-item-realm {
+    	display: flex;
+    	align-items: center;
+    	gap: var(--g-space-2);
+    	padding: var(--g-space-2);
+    	&:hover {
+    		background-color: var(--s-color-bg-surface-primary-hover);
+    	}
+    }
+    .b-list-item-link {
+    	flex: 1;
+    	min-width: 0;
+    	&:hover {
+    		background-color: transparent;
+    	}
+    	.c-icon {
+    		margin-inline-start: 0;
+    	}
+    }
+    .b-list-item-actions {
+    	display: flex;
+    	gap: var(--g-space-2);
+    }
     /* ===== USER COMPONENT ===== */
     .b-user-sidebar {
     	margin-block-start: var(--g-space-4);
@@ Expand Down @@

gno.land/pkg/gnoweb/public/main.css

Large diffs are not rendered by default.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(gnoweb): Add Source and Action button for realm explorer #5032

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

feat(gnoweb): Add Source and Action button for realm explorer #5032

Are you sure you want to change the base?

Uh oh!

feat(gnoweb): Add Source and Action button for realm explorer #5032

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!