remove rootless docker

lescuer97 · Jan 26, 2025 · cfb1496 · cfb1496
1 parent 136eb05
commit cfb1496
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 3 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: ScribeMD/[email protected]
+      # - uses: ScribeMD/[email protected]
       - uses: actions/setup-go@v5
         with:
           go-version: '1.22.1'

diff --git a/internal/database/mock_db/admin.go b/internal/database/mock_db/admin.go
@@ -1,8 +1,11 @@
 package mockdb
 
 import (
+	"slices"
+
 	"github.com/lescuer97/nutmix/api/cashu"
 	"github.com/lescuer97/nutmix/internal/database"
+	"github.com/lescuer97/nutmix/internal/utils"
 )
 
 func (m *MockDB) SaveNostrAuth(auth database.NostrLoginAuth) error {
@@ -48,3 +51,50 @@ func (m *MockDB) GetMintMeltBalanceByTime(time int64) (database.MintMeltBalance,
 	}
 	return mintmeltbalance, nil
 }
+func (m *MockDB) AddLiquiditySwap(swap utils.LiquiditySwap) error {
+	m.LiquiditySwap = append(m.LiquiditySwap, swap)
+	return nil
+
+}
+func (m *MockDB) ChangeLiquiditySwapState(id string, state utils.SwapState) error {
+	var liquiditySwaps []utils.LiquiditySwap
+	for i := 0; i < len(m.LiquiditySwap); i++ {
+		if m.LiquiditySwap[i].Id == id {
+			liquiditySwaps[i].State = state
+		}
+
+	}
+
+	return nil
+}
+
+func (m *MockDB) GetLiquiditySwapById(id string) (utils.LiquiditySwap, error) {
+	var liquiditySwaps []utils.LiquiditySwap
+	for i := 0; i < len(m.LiquiditySwap); i++ {
+
+		if m.LiquiditySwap[i].Id == id {
+			liquiditySwaps = append(liquiditySwaps, m.LiquiditySwap[i])
+
+		}
+
+	}
+
+	return liquiditySwaps[0], nil
+}
+
+func (m *MockDB) GetAllLiquiditySwaps() ([]utils.LiquiditySwap, error) {
+	return m.LiquiditySwap, nil
+}
+
+func (m *MockDB) GetLiquiditySwapsByStates(states []utils.SwapState) ([]utils.LiquiditySwap, error) {
+	var liquiditySwaps []utils.LiquiditySwap
+	for i := 0; i < len(m.LiquiditySwap); i++ {
+		if slices.Contains(states, m.LiquiditySwap[i].State) {
+			liquiditySwaps = append(liquiditySwaps, m.LiquiditySwap[i])
+		}
+
+	}
+
+	return liquiditySwaps, nil
+
+}
diff --git a/internal/database/mock_db/main.go b/internal/database/mock_db/main.go
@@ -19,6 +19,7 @@ type MockDB struct {
 	MintRequest   []cashu.MintRequestDB
 	RecoverSigDB  []cashu.RecoverSigDB
 	NostrAuth     []database.NostrLoginAuth
+	LiquiditySwap []utils.LiquiditySwap
 	Seeds         []cashu.Seed
 	Config        utils.Config
 	ErrorToReturn error

diff --git a/internal/routes/admin/pages.go b/internal/routes/admin/pages.go
@@ -98,8 +98,9 @@ func LigthningLiquidityPage(logger *slog.Logger, mint *mint.Mint) gin.HandlerFun
 			// c.HTML(400,"", nil)
 			return
 		}
+		amount := strconv.FormatUint(milillisatBalance/1000, 10)
 
-		err = templates.LiquidityDashboard(c.Query("swapForm"), string(milillisatBalance/1000)).Render(ctx, c.Writer)
+		err = templates.LiquidityDashboard(c.Query("swapForm"), amount).Render(ctx, c.Writer)
 
 		if err != nil {
 			c.Error(err)

diff --git a/internal/routes/admin/templates/liquidity.templ b/internal/routes/admin/templates/liquidity.templ
@@ -74,14 +74,15 @@ templ ListOfSwaps(swaps []utils.LiquiditySwap) {
 		<tbody>
 			for _, item := range swaps {
 				{{ unixTime := time.Unix(int64(item.Expiration), 0) }}
+				{{ formattedDate := unixTime.Format(time.UnixDate) }}
 				{{ amount := strconv.FormatUint(item.Amount, 10) }}
 				{{ liquidityType := item.Type.ToString() }}
 				{{ state := item.State.ToString() }}
 				{{ url := "liquidity/" + item.Id }}
 				<tr>
 					<th scope="row">{ amount }</th>
 					<td class="request-row">{ liquidityType }</td>
-					<td class="time">{ unixTime.Format(time.UnixDate) }</td>
+					<td class="time">{ formattedDate }</td>
 					<td class="request-row">{ state }</td>
 					<td class="request-row"><a href={ templ.URL(url) }>INFO</a></td>
 				</tr>