feat: New UI

Backed fixes and improvements

Dockerfile

@@ -1,9 +1,9 @@
-FROM docker.io/rust:1.68.2 as build
+FROM docker.io/rust:1.71.1 as build
 # Install and configure NODE using NVM
 RUN mkdir /usr/local/nvm
 ENV NVM_DIR /usr/local/nvm
-ENV NODE_VERSION 18.15.0
-RUN curl https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash \
+ENV NODE_VERSION 18.17.1
+RUN curl https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash \
     && . $NVM_DIR/nvm.sh \
     && nvm install $NODE_VERSION \
     && nvm alias default $NODE_VERSION \
@@ -21,12 +21,12 @@ RUN cd makoon/src-web; \
     pnpm build;
 RUN cargo build --release
 
-FROM debian:stable-slim
+FROM debian:bullseye-slim
 RUN mkdir /app
 WORKDIR /app
 COPY --from=build /build/target/release/makoon .
 ENV RUST_LOG="info"
-ENV MAKOON_DB_PATH="/app/data/makoon.db.json"
+ENV MAKOON_DB_PATH="/app/data/makoon.db"
 ENV MAKOON_SERVER_PORT=8080
 VOLUME /app/data
 CMD ["/app/makoon"]

README.md

@@ -73,24 +73,31 @@ docker build -t makoon:local .
 
 #### Internal Business Use [PolyForm Internal Use License 1.0.0](./LICENCE_INTERNAL_USE)
 
+### Can I use Makoon?
+- Can I use Makoon for personal project?\
+**Yes.**
+- Can I use Makoon for commercial project?\
+**Yes, if you sell own software managed by Makoon, not Makoon itself.**
+- Can I use Makoon commercially as a service (SaaS)\
+**No.** You are not allowed to sell or provide to your customers this software as a service.
+If you are interested in this kind of use, contact me. 
+
 # :camera: Screenshots
 
 ![1_screenshot](./doc/screenshots/1_login.png)
 
-![2_screenshot](./doc/screenshots/2_create_cluster_settings.png)
-
-![3_screenshot](./doc/screenshots/3_create_cluster.png)
+![2_screenshot](./doc/screenshots/2_1_create_cluster_settings.png)
 
-![4_screenshot](./doc/screenshots/4_create_cluster_nodes.png)
+![3_screenshot](./doc/screenshots/2_2_create_cluster_nodes.png)
 
-![5_screenshot](./doc/screenshots/5_create_cluster_apps.png)
+![4_screenshot](./doc/screenshots/3_list_of_clusters.png)
 
-![6_screenshot](./doc/screenshots/6_create_cluster_apps_edit.png)
+![5_screenshot](./doc/screenshots/4_1_cluster_details.png)
 
-![7_screenshot](./doc/screenshots/7_list.png)
+![6_screenshot](./doc/screenshots/4_2_helm_apps.png)
 
-![8_screenshot](./doc/screenshots/8_details_nodes.png)
+![7_screenshot](./doc/screenshots/4_3_add_chart.png)
 
-![9_screenshot](./doc/screenshots/9_details_apps.png)
+![8_screenshot](./doc/screenshots/4_4_workload.png)
 
-![10_screenshot](./doc/screenshots/10_details_logs.png)
+![9_screenshot](./doc/screenshots/4_5_logs.png)

makoon/Cargo.toml

@@ -4,21 +4,21 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-tokio = "1.27.0"
+tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] }
 actix-web = "4.3.1"
 actix-session = { version = "0.7.2", features = ["cookie-session"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 proxmox = { path = "../proxmox" }
-rust-embed = "6.6.1"
+rust-embed = "6.8.1"
 mime_guess = "2.0.4"
 typeshare = "1.0.1"
 chrono = { version = "0.4", features = ["serde"] }
-log = "0.4.17"
+log = "0.4.19"
 env_logger = "0.10.0"
-openssl = "0.10.50"
-pem = "2.0.1"
+openssl = "0.10.55"
+pem = "3.0.1"
 ssh-keys = "0.1.4"
 ssh2 = "0.9.4"
 rayon = "1.7.0"
-uuid = { version = "1.3.1", features = ["v4", "fast-rng"] }
+uuid = { version = "1.4.1", features = ["v4", "fast-rng"] }

makoon/src-web/package.json

@@ -9,31 +9,29 @@
     "update:dependencies": "ncu -u"
   },
   "dependencies": {
-    "@heroicons/react": "^2.0.17",
-    "@monaco-editor/react": "^4.5.0",
+    "@heroicons/react": "^2.0.18",
     "axios": "^1.4.0",
-    "formik": "^2.2.9",
-    "mobx": "^6.9.0",
-    "mobx-react-lite": "^3.4.3",
-    "monaco-editor": "^0.37.1",
+    "formik": "^2.4.3",
+    "mobx": "^6.10.0",
+    "mobx-react-lite": "^4.0.3",
     "primeicons": "^6.0.1",
-    "primereact": "^9.3.1",
+    "primereact": "^9.6.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router-dom": "^6.10.0",
-    "yup": "^1.1.1"
+    "react-router-dom": "^6.15.0",
+    "yup": "^1.2.0"
   },
   "devDependencies": {
-    "@types/node": "^18.16.2",
-    "@types/react": "^18.2.0",
-    "@types/react-dom": "^18.2.1",
-    "@vitejs/plugin-react": "^4.0.0",
-    "autoprefixer": "^10.4.14",
-    "npm-check-updates": "^16.10.9",
-    "postcss": "^8.4.23",
-    "sass": "^1.62.1",
-    "tailwindcss": "^3.3.2",
-    "typescript": "^5.0.4",
-    "vite": "^4.3.3"
+    "@types/node": "^20.5.4",
+    "@types/react": "^18.2.21",
+    "@types/react-dom": "^18.2.7",
+    "@vitejs/plugin-react": "^4.0.4",
+    "autoprefixer": "^10.4.15",
+    "npm-check-updates": "^16.13.1",
+    "postcss": "^8.4.28",
+    "sass": "^1.66.1",
+    "tailwindcss": "^3.3.3",
+    "typescript": "^5.1.6",
+    "vite": "^4.4.9"
   }
 }