diff --git a/kanidmd_web_ui/src/favicon.svg b/artwork/favicon.svg similarity index 100% rename from kanidmd_web_ui/src/favicon.svg rename to artwork/favicon.svg diff --git a/artwork/logo-square.svg b/artwork/logo-square.svg new file mode 100644 index 000000000..445ed0603 --- /dev/null +++ b/artwork/logo-square.svg @@ -0,0 +1,252 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AUTHSTRALIA + PASSPORT + + + + + + KANIDM + + + + diff --git a/kanidmd/score/src/https/mod.rs b/kanidmd/score/src/https/mod.rs index 422ebca46..21bea8de3 100644 --- a/kanidmd/score/src/https/mod.rs +++ b/kanidmd/score/src/https/mod.rs @@ -162,6 +162,7 @@ async fn index_view(_req: tide::Request) -> tide::Result { + Kanidm @@ -170,7 +171,7 @@ async fn index_view(_req: tide::Request) -> tide::Result { - + diff --git a/kanidmd_web_ui/build_wasm_dev.sh b/kanidmd_web_ui/build_wasm_dev.sh index 7efe1a604..672e985bb 100755 --- a/kanidmd_web_ui/build_wasm_dev.sh +++ b/kanidmd_web_ui/build_wasm_dev.sh @@ -1,9 +1,10 @@ #!/bin/sh -wasm-pack build --dev --target web && \ - touch ./pkg/ANYTHING_HERE_WILL_BE_DELETED_ADD_TO_SRC && \ +wasm-pack build --dev --target web || exit 1 + +touch ./pkg/ANYTHING_HERE_WILL_BE_DELETED_ADD_TO_SRC && \ + cp -R ./src/img ./pkg/ && \ cp ./src/style.css ./pkg/style.css && \ cp ./src/wasmloader.js ./pkg/wasmloader.js && \ - cp ./src/favicon.svg ./pkg/favicon.svg && \ cp -a ./src/external ./pkg/external && \ rm ./pkg/.gitignore diff --git a/kanidmd_web_ui/build_wasm_release.sh b/kanidmd_web_ui/build_wasm_release.sh index 75dc58de7..1e8572027 100755 --- a/kanidmd_web_ui/build_wasm_release.sh +++ b/kanidmd_web_ui/build_wasm_release.sh @@ -1,10 +1,10 @@ #!/bin/sh -wasm-pack build --release --target web && \ - touch ./pkg/ANYTHING_HERE_WILL_BE_DELETED_ADD_TO_SRC && \ +wasm-pack build --release --target web || exit 1 + +touch ./pkg/ANYTHING_HERE_WILL_BE_DELETED_ADD_TO_SRC && \ + cp -R ./src/img ./pkg/ && cp ./src/style.css ./pkg/style.css && \ cp ./src/wasmloader.js ./pkg/wasmloader.js && \ - cp ./src/favicon.svg ./pkg/favicon.svg && \ - cp -a ./src/external ./pkg/external && \ rm ./pkg/.gitignore diff --git a/kanidmd_web_ui/pkg/img/favicon.png b/kanidmd_web_ui/pkg/img/favicon.png new file mode 100644 index 000000000..ca8cdfb7e Binary files /dev/null and b/kanidmd_web_ui/pkg/img/favicon.png differ diff --git a/kanidmd_web_ui/pkg/img/logo-square.svg b/kanidmd_web_ui/pkg/img/logo-square.svg new file mode 100644 index 000000000..334b289f1 --- /dev/null +++ b/kanidmd_web_ui/pkg/img/logo-square.svg @@ -0,0 +1,253 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AUTHSTRALIA + PASSPORT + + + + + + KANIDM + + + + diff --git a/kanidmd_web_ui/pkg/kanidmd_web_ui.js b/kanidmd_web_ui/pkg/kanidmd_web_ui.js index 3f78dbaa7..d896a6eef 100644 --- a/kanidmd_web_ui/pkg/kanidmd_web_ui.js +++ b/kanidmd_web_ui/pkg/kanidmd_web_ui.js @@ -370,9 +370,6 @@ async function init(input) { } const imports = {}; imports.wbg = {}; - imports.wbg.__wbg_modalhide_673016763df325bd = function() { return logError(function (arg0, arg1) { - modal_hide(getStringFromWasm0(arg0, arg1)); - }, arguments) }; imports.wbg.__wbindgen_json_serialize = function(arg0, arg1) { const obj = getObject(arg1); const ret = JSON.stringify(obj === undefined ? null : obj); @@ -381,6 +378,9 @@ async function init(input) { getInt32Memory0()[arg0 / 4 + 1] = len0; getInt32Memory0()[arg0 / 4 + 0] = ptr0; }; + imports.wbg.__wbg_modalhide_673016763df325bd = function() { return logError(function (arg0, arg1) { + modal_hide(getStringFromWasm0(arg0, arg1)); + }, arguments) }; imports.wbg.__wbindgen_string_new = function(arg0, arg1) { const ret = getStringFromWasm0(arg0, arg1); return addHeapObject(ret); @@ -869,16 +869,16 @@ async function init(input) { const ret = wasm.memory; return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper19763 = function() { return logError(function (arg0, arg1, arg2) { - const ret = makeClosure(arg0, arg1, 1252, __wbg_adapter_30); + imports.wbg.__wbindgen_closure_wrapper19774 = function() { return logError(function (arg0, arg1, arg2) { + const ret = makeClosure(arg0, arg1, 1253, __wbg_adapter_30); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbindgen_closure_wrapper21944 = function() { return logError(function (arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 1272, __wbg_adapter_33); + imports.wbg.__wbindgen_closure_wrapper21955 = function() { return logError(function (arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 1273, __wbg_adapter_33); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbindgen_closure_wrapper22383 = function() { return logError(function (arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 1299, __wbg_adapter_36); + imports.wbg.__wbindgen_closure_wrapper22397 = function() { return logError(function (arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 1300, __wbg_adapter_36); return addHeapObject(ret); }, arguments) }; diff --git a/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm b/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm index 2bbcc19f6..416c4809d 100644 Binary files a/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm and b/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm differ diff --git a/kanidmd_web_ui/pkg/style.css b/kanidmd_web_ui/pkg/style.css index fd8e34a1f..f1a9f294f 100644 --- a/kanidmd_web_ui/pkg/style.css +++ b/kanidmd_web_ui/pkg/style.css @@ -154,3 +154,8 @@ body { align-items: center; } +.kanidm_logo { + + width: 12.0em; + height: 12.0em; +} \ No newline at end of file diff --git a/kanidmd_web_ui/src/img/favicon.png b/kanidmd_web_ui/src/img/favicon.png new file mode 100644 index 000000000..ca8cdfb7e Binary files /dev/null and b/kanidmd_web_ui/src/img/favicon.png differ diff --git a/kanidmd_web_ui/src/img/logo-square.svg b/kanidmd_web_ui/src/img/logo-square.svg new file mode 100644 index 000000000..334b289f1 --- /dev/null +++ b/kanidmd_web_ui/src/img/logo-square.svg @@ -0,0 +1,253 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AUTHSTRALIA + PASSPORT + + + + + + KANIDM + + + + diff --git a/kanidmd_web_ui/src/login.rs b/kanidmd_web_ui/src/login.rs index 85b12e45f..4e2ed9f51 100644 --- a/kanidmd_web_ui/src/login.rs +++ b/kanidmd_web_ui/src/login.rs @@ -772,7 +772,10 @@ impl Component for LoginApp { html! {
-

{ "Kanidm Alpha 🦀" }

+
+ +

{ "Kanidm Alpha" }

+
{ self.view_state(ctx) }
diff --git a/kanidmd_web_ui/src/style.css b/kanidmd_web_ui/src/style.css index fd8e34a1f..f1a9f294f 100644 --- a/kanidmd_web_ui/src/style.css +++ b/kanidmd_web_ui/src/style.css @@ -154,3 +154,8 @@ body { align-items: center; } +.kanidm_logo { + + width: 12.0em; + height: 12.0em; +} \ No newline at end of file