Replace home route with dashboard

pithfun · Mar 30, 2024 · 7232c04 · 7232c04
1 parent 4b3d7e7
commit 7232c04
Show file tree

Hide file tree

Showing 9 changed files with 179 additions and 228 deletions.
diff --git a/pkg/routes/dashboard.go b/pkg/routes/dashboard.go
diff --git a/pkg/routes/router.go b/pkg/routes/router.go
@@ -16,8 +16,7 @@ import (
 )
 
 const (
-	routeNameDashboard = "dashboard"
-	routeNameHome      = "home"
+	routeNameHome = "home"
 )
 
 // BuildRouter builds the router.
@@ -76,7 +75,4 @@ func BuildRouter(c *services.Container) {
 func userRoutes(g *echo.Group, ctr controller.Controller) {
 	home := home{Controller: ctr}
 	g.GET("/", home.Get).Name = routeNameHome
-
-	dashboard := dashboard{Controller: ctr}
-	g.GET("/d", dashboard.Get).Name = routeNameDashboard
 }
diff --git a/static/css/global.css b/static/css/global.css
diff --git a/static/js/store.js b/static/js/store.js
@@ -27,7 +27,7 @@ document.addEventListener('alpine:init', () => {
       if (__provider__?.isPhantom) {
         __provider__.on('connect', (pub_key) => {
           if (pub_key) {
-            this.init_wallet();
+            this.init_wallet(pub_key);
           } else {
             this.clean_up();
           }

diff --git a/templates/components/core.tmpl b/templates/components/core.tmpl
@@ -14,7 +14,6 @@
 
 {{define "js"}}
 	<script defer src="{{file "js/alpinejs-3.13.7.min.js"}}"></script>
-	<script type="text/javascript" src="{{file "js/core.global.js"}}"></script>
 	<script type="text/javascript" src="{{file "js/preset-wind.global.js"}}"></script>
 	<script src="{{file "js/htmx-1.9.3.min.js"}}"></script>
 	<script src="{{file "js/store.js"}}"></script>
@@ -24,4 +23,5 @@
 			presets: [() => window.__unocss_runtime.presets.presetWind()]
 		}
 	</script>
+	<script type="text/javascript" src="{{file "js/core.global.js"}}"></script>	
 {{end}}
diff --git a/templates/components/css.tmpl b/templates/components/css.tmpl
@@ -2,19 +2,17 @@
   <link rel="stylesheet" type="text/css" href="{{file "css/tailwind.min.css"}}">
   <link rel="stylesheet" type="text/css" href="{{file "css/fonts.css"}}">
   <link rel="stylesheet" type="text/css" href="{{file "css/tiny.min.css"}}">
-  <link rel="stylesheet" type="text/css" href="{{file "css/global.css"}}">
 
   <style>
     :root {
-      font-family: 'Inter', var(--tiny-font-family);
+      font-family: Inter, system-ui,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,Helvetica,Arial,'Helvetica Neue',sans-serif,var(--tiny-font-family-emoji);
       font-size: 14px;
       height: 100%;
       margin: 0;
     }
     body {
       background: var(--tiny-background-color);
       color: var(--tiny-color);
-      font-family: Inter, system-ui,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,Helvetica,Arial,'Helvetica Neue',sans-serif,var(--tiny-font-family-emoji);
       font-size: 1rem;
       font-weight: var(--tiny-font-weight);
       font-feature-settings: 'liga' 1, 'calt' 1, 'ss01' 1, 'ss02' 1, 'ss03' 1;

diff --git a/templates/pages/dashboard.tmpl b/templates/pages/dashboard.tmpl