updated memory calculation and logo

controller/internal/web/server.go

@@ -184,6 +184,10 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "text/css")
 		w.Header().Set("Cache-Control", "public, max-age=3600")
 		fmt.Fprint(w, cssContent)
+	case path == "/static/felhom-logo.svg":
+		w.Header().Set("Content-Type", "image/svg+xml")
+		w.Header().Set("Cache-Control", "public, max-age=86400")
+		fmt.Fprint(w, felhomLogoSVG)
 	case strings.HasPrefix(path, "/static/assets/"):
 		s.serveAsset(w, r, strings.TrimPrefix(path, "/static/assets/"))
 	case strings.HasPrefix(path, "/apps/"):
@@ -388,18 +392,50 @@ func (s *Server) deployHandler(w http.ResponseWriter, _ *http.Request, name stri
 	}
 
 	stack, _ := s.stackMgr.GetStack(name)
+	alreadyDeployed := appCfg != nil && appCfg.Deployed
 
 	data := s.baseData("deploy", meta.DisplayName+" — Telepítés")
 	data["Stack"] = stack
 	data["Meta"] = meta
 	data["AppConfig"] = appCfg
-	data["AlreadyDeployed"] = appCfg != nil && appCfg.Deployed
+	data["AlreadyDeployed"] = alreadyDeployed
 	data["LogoURL"] = s.cfg.AppLogoURL(meta.Slug)
 	data["LogoPNGURL"] = s.cfg.AppLogoPNGURL(meta.Slug)
 	data["AppPageURL"] = s.cfg.AppPageURL(meta.Slug)
 	data["UserFields"] = meta.UserFacingFields()
 	data["AutoFields"] = meta.AutoGeneratedFields()
 
+	// Memory info for deploy page (only for non-deployed apps)
+	if !alreadyDeployed {
+		memInfo := map[string]interface{}{"Available": false}
+		totalMB, memErr := system.GetTotalMemoryMB()
+		if memErr == nil {
+			reservedMB := s.cfg.System.ReservedMemoryMB
+			usableMB := totalMB - reservedMB
+			committedReqMB, committedLimitMB := s.stackMgr.CommittedMemory()
+			newReqMB := stacks.ParseMemoryMB(meta.Resources.MemRequest)
+			newLimitMB := stacks.ParseMemoryMB(meta.Resources.MemLimit)
+			afterReqMB := committedReqMB + newReqMB
+			afterLimitMB := committedLimitMB + newLimitMB
+			percent := 0
+			if usableMB > 0 {
+				percent = afterReqMB * 100 / usableMB
+			}
+
+			memInfo["Available"] = true
+			memInfo["TotalMB"] = totalMB
+			memInfo["ReservedMB"] = reservedMB
+			memInfo["UsableMB"] = usableMB
+			memInfo["CommittedMB"] = committedReqMB
+			memInfo["NewRequestMB"] = newReqMB
+			memInfo["AfterMB"] = afterReqMB
+			memInfo["Percent"] = percent
+			memInfo["Blocked"] = newReqMB > 0 && afterReqMB > usableMB
+			memInfo["OvercommitWarn"] = newLimitMB > 0 && afterLimitMB > totalMB
+		}
+		data["MemoryInfo"] = memInfo
+	}
+
 	s.render(w, "deploy", data)
 }