Page MenuHomePhorge
Files F2707951

No OneTemporary
Actions

Size
6 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/.maid/build.toml b/.maid/build.toml
index f1f38fa..adc8969 100644
--- a/.maid/build.toml
+++ b/.maid/build.toml
@@ -1,44 +1,44 @@
[env]
-VERSION='1.6.4'
+VERSION='1.7.0'
[tasks.build_all]
info = "build all"
script = [
# install packages
"apt-get update -yqq",
"apt-get install zip clang llvm -yqq",
# setup build
"mkdir build",
"export CC=\"/usr/bin/clang\"",
"export CXX=\"/usr/bin/clang++\"",
# build linux (x86_64)
"cargo zigbuild -r --color always",
"mv target/release/pmc build/pmc",
"zip build/pmc_%{env.VERSION}_linux_amd64.zip build/pmc",
"rm build/pmc",
# build macos (x86_64)
"cargo zigbuild -r --target x86_64-apple-darwin --color always",
"mv target/x86_64-apple-darwin/release/pmc build/pmc",
"zip build/pmc_%{env.VERSION}_darwin_amd64.zip build/pmc",
"rm build/pmc",
# build macos (aarch64)
"cargo zigbuild -r --target aarch64-apple-darwin --color always",
"mv target/aarch64-apple-darwin/release/pmc build/pmc",
"zip build/pmc_%{env.VERSION}_darwin_arm.zip build/pmc",
"rm build/pmc",
# post build
"ls -sh build",
]
[tasks.build_all.remote]
silent = false
exclusive = true
shell = "/bin/bash"
image = "themackabu/rust:zigbuild-1.75.0"
push = ["src", "lib", "Cargo.toml", "Cargo.lock", "build.rs"]
pull = "build"
diff --git a/Cargo.toml b/Cargo.toml
index c60c9cb..5347f4c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,51 +1,51 @@
[package]
name = "pmc"
-version = "1.6.4"
+version = "1.7.0"
edition = "2021"
license = "MIT"
repository = "https://lab.themackabu.dev/self/pmc"
description = "PMC is a simple and easy to use PM2 alternative"
[dependencies]
log = "0.4.20"
toml = "0.8.8"
home = "0.5.9"
warp = "0.3.6"
ryu = "1.0.16"
clap = "4.4.12"
cxx = "1.0.112"
bytes = "1.5.0"
tera = "1.19.1"
regex = "1.10.2"
libc = "0.2.151"
anyhow = "1.0.78"
colored = "2.1.0"
macros-rs = "0.5.0"
termcolor = "1.4.0"
rmp-serde = "1.1.2"
once_cell = "1.19.0"
static_dir = "0.2.0"
env_logger = "0.10.1"
merkle_hash = "3.5.0"
lazy_static = "1.4.0"
prometheus = "0.13.3"
serde_json = "1.0.109"
simple-logging = "2.0.2"
utoipa-rapidoc = "2.0.0"
pretty_env_logger = "0.5.0"
utoipa-swagger-ui = "5.0.0"
clap-verbosity-flag = "2.1.1"
global_placeholders = "0.1.0"
tokio = { version = "1.35.1", features = ["full"] }
psutil = { version = "3.2.2", features = ["serde"] }
tabled = { version = "0.15.0", features = ["ansi"] }
chrono = { version = "0.4.31", features = ["serde"] }
serde = { version = "1.0.193", features = ["derive"] }
utoipa = { version = "4.1.0", features = ["serde_yaml"] }
[build-dependencies]
tar = "0.4.40"
chrono = "0.4.31"
flate2 = "1.0.28"
cxx-build = "1.0.112"
reqwest = { version = "0.11.23", features = ["blocking"] }
diff --git a/Maidfile.toml b/Maidfile.toml
index 240a302..83ca431 100644
--- a/Maidfile.toml
+++ b/Maidfile.toml
@@ -1,29 +1,29 @@
import = [".maid/build.toml", ".maid/server.toml"]
[project]
name = "pmc"
-version = "1.6.4"
+version = "1.7.0"
[tasks]
clean = { script = ["rm -rf bin", "mkdir bin"] }
api = { script = ["maid install -q", "pmc daemon start --api"] }
webui = { script = ["maid install -q", "pmc daemon start --webui"] }
[tasks.build]
depends = ["clean"]
script = [
"cargo zigbuild --release",
"cp target/release/pmc bin/pmc"
]
[tasks.build.cache]
path = "src"
target = ["bin/pmc"]
[tasks.install]
script = [
"killall pmc",
"maid build -q",
"sudo cp bin/pmc /usr/local/bin",
"echo Copied binary!"
]
\ No newline at end of file
diff --git a/src/webui/src/components/react/login.tsx b/src/webui/src/components/react/login.tsx
index a81fc22..06cf537 100644
--- a/src/webui/src/components/react/login.tsx
+++ b/src/webui/src/components/react/login.tsx
@@ -1,78 +1,78 @@
import { $settings } from '@/store';
import { useState, Fragment } from 'react';
import favicon from '@/public/favicon.svg?url';
const Login = (props: { base: string }) => {
const [token, setToken] = useState('');
const [loginFailed, setLoginFailed] = useState(false);
const handleChange = (event: any) => setToken(event.target.value);
const handleSubmit = (event: any) => {
event.preventDefault();
$settings.setKey('token', token);
fetch(props.base + '/metrics', {
headers: { Authorization: 'token ' + token },
}).then((response) => {
if (response.status === 200) {
window.location.href = props.base;
} else {
setLoginFailed(true);
setTimeout(() => {
setLoginFailed(false);
}, 3000);
}
});
};
return (
<Fragment>
{loginFailed && (
<div className="-mb-[92px] sm:mx-auto sm:w-full sm:max-w-[480px] sm:rounded-lg bg-red-600 sm:border border-red-400/50 p-4 sm:mt-4 sm:-mb-[110px]">
<h3 className="text-sm font-medium text-white">Failed to login. Is the token correct?</h3>
</div>
)}
<div className="h-screen flex items-center -mt-10">
<div className="flex min-h-full flex-1 flex-col justify-center px-0 sm:px-6 lg:px-8">
<div className="sm:mx-auto sm:w-full sm:max-w-md">
- <img className="mx-auto h-10 w-auto" src={`.${favicon}`} alt="PMC" />
+ <img className="mx-auto h-10 w-auto" src={`${base}/${favicon}`} alt="PMC" />
<h2 className="mt-6 text-center text-2xl font-bold leading-9 tracking-tight text-zinc-200">Provide token to continue</h2>
</div>
<div className="mt-10 sm:mx-auto sm:w-full sm:max-w-[480px]">
<div className="px-5 py-6 rounded-lg bg-none sm:border border-zinc-700/30 sm:bg-zinc-900/10">
<form className="space-y-6" onSubmit={handleSubmit}>
<div>
<div>
<input
required
id="password"
name="password"
type="password"
value={token}
onChange={handleChange}
placeholder="••••••••••••••••"
autoComplete="current-password"
className="block w-full rounded-md border-0 bg-white/5 py-2 text-white shadow-sm ring-1 ring-inset ring-white/10 focus:ring-2 focus:ring-inset focus:ring-sky-500 sm:text-sm sm:leading-6 placeholder:text-zinc-600"
/>
</div>
</div>
<div>
<button
type="submit"
className="-mb-1 transition flex w-full justify-center rounded-md px-3 py-1.5 text-sm font-semibold leading-6 text-white shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 border focus:outline-none focus:ring-0 focus:ring-offset-0 focus:z-10 shrink-0 saturate-[110%] border-zinc-700 hover:border-zinc-600 bg-zinc-800 text-zinc-50 hover:bg-zinc-700">
Continue
</button>
</div>
</form>
</div>
</div>
</div>
</div>
</Fragment>
);
};
export default Login;

File Metadata

Mime Type
text/x-diff
Expires
Sun, Feb 1, 6:32 PM (1 d, 20 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
494884
Default Alt Text
(6 KB)

Event Timeline