diff --git a/dist/digitaler-frieden-a5c46ba2b4007edc.js b/dist/digitaler-frieden-a46945b7af60aeea.js similarity index 98% rename from dist/digitaler-frieden-a5c46ba2b4007edc.js rename to dist/digitaler-frieden-a46945b7af60aeea.js index fb79066..f2a6880 100644 --- a/dist/digitaler-frieden-a5c46ba2b4007edc.js +++ b/dist/digitaler-frieden-a46945b7af60aeea.js @@ -910,16 +910,16 @@ function __wbg_get_imports() { const ret = wasm.memory; return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper4594 = function(arg0, arg1, arg2) { - const ret = makeClosure(arg0, arg1, 617, __wbg_adapter_42); + imports.wbg.__wbindgen_closure_wrapper4788 = function(arg0, arg1, arg2) { + const ret = makeClosure(arg0, arg1, 624, __wbg_adapter_42); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper6267 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 788, __wbg_adapter_45); + imports.wbg.__wbindgen_closure_wrapper6487 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 794, __wbg_adapter_45); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper6571 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 813, __wbg_adapter_48); + imports.wbg.__wbindgen_closure_wrapper6791 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 819, __wbg_adapter_48); return addHeapObject(ret); }; diff --git a/dist/digitaler-frieden-a5c46ba2b4007edc_bg.wasm b/dist/digitaler-frieden-a46945b7af60aeea_bg.wasm similarity index 50% rename from dist/digitaler-frieden-a5c46ba2b4007edc_bg.wasm rename to dist/digitaler-frieden-a46945b7af60aeea_bg.wasm index 6d2b4f9..bb2c8c9 100644 Binary files a/dist/digitaler-frieden-a5c46ba2b4007edc_bg.wasm and b/dist/digitaler-frieden-a46945b7af60aeea_bg.wasm differ diff --git a/dist/index.html b/dist/index.html index 7a5f671..8c7583c 100644 --- a/dist/index.html +++ b/dist/index.html @@ -2,19 +2,19 @@ <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Digitaler Frieden</title> - <link rel="stylesheet" href="/styles-c782c03204eac356.css" integrity="sha384-lKsFrm3yCxlOJa6nYfgnRtJimTwIjnZK68/u4R8fJ2S8PnK/ztPTifgkmJunkXLb"> + <link rel="stylesheet" href="/styles-790afe2a8448ce4f.css" integrity="sha384-EsXQBT2+XeCh0YQ1OnhHBfYI32w+oQI1i6OEuKzRm3gHDlbFTi/vIhK8XOpPrW0t"> <link rel="icon" href="/favicon-928ba63f33046eed.ico" integrity="sha384-Neq57jnFrTfqAN1JvKAVVVcH1EW3//cZHmK2NRXRlNrxAZR6ErTvXzbOLSyHzkA4"> -<link rel="preload" href="/digitaler-frieden-a5c46ba2b4007edc_bg.wasm" crossorigin="anonymous" integrity="sha384-/nhi/WYlpgPDFVyMKRzDBKCI1Qicv5ZlcCkwhnMaOxoKHpJrW5Jyr6Zz0Ber9zG7" as="fetch" type="application/wasm"> -<link rel="modulepreload" href="/digitaler-frieden-a5c46ba2b4007edc.js" crossorigin="anonymous" integrity="sha384-EIZgdnciYSFZw+rqoQTDD554+YaSi3C2aQkRZOcabgZZfrw+h5AogdieogZZ1+wr"></head> +<link rel="preload" href="/digitaler-frieden-a46945b7af60aeea_bg.wasm" crossorigin="anonymous" integrity="sha384-U/7UNFoZnY+Sr8vCGT6tdip1lM96wbG2Y1WpnzK8l6gTBDM2ozTmHrjFOVC05D9j" as="fetch" type="application/wasm"> +<link rel="modulepreload" href="/digitaler-frieden-a46945b7af60aeea.js" crossorigin="anonymous" integrity="sha384-l/ijXtqMmltzylPhQmf23Bw4ACa18XnhwHhNVn6FJhHWESm5iOvZ9LA7dEJw3gNf"></head> <body class="bg-black text-white "> <script type="module"> -import init, * as bindings from '/digitaler-frieden-a5c46ba2b4007edc.js'; -init('/digitaler-frieden-a5c46ba2b4007edc_bg.wasm'); +import init, * as bindings from '/digitaler-frieden-a46945b7af60aeea.js'; +init('/digitaler-frieden-a46945b7af60aeea_bg.wasm'); window.wasmBindings = bindings; </script><script>"use strict"; diff --git a/dist/public/styles.css b/dist/public/styles.css index 8d2a487..6fc2a88 100644 --- a/dist/public/styles.css +++ b/dist/public/styles.css @@ -586,10 +586,6 @@ video { margin-bottom: 3rem; } -.mb-16 { - margin-bottom: 4rem; -} - .mb-20 { margin-bottom: 5rem; } @@ -602,6 +598,10 @@ video { margin-bottom: 1rem; } +.mb-5 { + margin-bottom: 1.25rem; +} + .mb-6 { margin-bottom: 1.5rem; } @@ -702,14 +702,35 @@ video { min-width: 14rem; } +.min-w-72 { + min-width: 18rem; +} + .max-w-36 { max-width: 9rem; } +.max-w-lg { + max-width: 32rem; +} + +.max-w-sm { + max-width: 24rem; +} + .max-w-xl { max-width: 36rem; } +.-translate-y-1 { + --tw-translate-y: -0.25rem; + transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)); +} + +.cursor-pointer { + cursor: pointer; +} + .flex-col { flex-direction: column; } @@ -989,6 +1010,10 @@ video { width: 14rem; } + .md\:w-auto { + width: auto; + } + .md\:min-w-56 { min-width: 14rem; } diff --git a/dist/styles-c782c03204eac356.css b/dist/styles-790afe2a8448ce4f.css similarity index 97% rename from dist/styles-c782c03204eac356.css rename to dist/styles-790afe2a8448ce4f.css index 8d2a487..6fc2a88 100644 --- a/dist/styles-c782c03204eac356.css +++ b/dist/styles-790afe2a8448ce4f.css @@ -586,10 +586,6 @@ video { margin-bottom: 3rem; } -.mb-16 { - margin-bottom: 4rem; -} - .mb-20 { margin-bottom: 5rem; } @@ -602,6 +598,10 @@ video { margin-bottom: 1rem; } +.mb-5 { + margin-bottom: 1.25rem; +} + .mb-6 { margin-bottom: 1.5rem; } @@ -702,14 +702,35 @@ video { min-width: 14rem; } +.min-w-72 { + min-width: 18rem; +} + .max-w-36 { max-width: 9rem; } +.max-w-lg { + max-width: 32rem; +} + +.max-w-sm { + max-width: 24rem; +} + .max-w-xl { max-width: 36rem; } +.-translate-y-1 { + --tw-translate-y: -0.25rem; + transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)); +} + +.cursor-pointer { + cursor: pointer; +} + .flex-col { flex-direction: column; } @@ -989,6 +1010,10 @@ video { width: 14rem; } + .md\:w-auto { + width: auto; + } + .md\:min-w-56 { min-width: 14rem; } diff --git a/public/styles.css b/public/styles.css index 8d2a487..6fc2a88 100644 --- a/public/styles.css +++ b/public/styles.css @@ -586,10 +586,6 @@ video { margin-bottom: 3rem; } -.mb-16 { - margin-bottom: 4rem; -} - .mb-20 { margin-bottom: 5rem; } @@ -602,6 +598,10 @@ video { margin-bottom: 1rem; } +.mb-5 { + margin-bottom: 1.25rem; +} + .mb-6 { margin-bottom: 1.5rem; } @@ -702,14 +702,35 @@ video { min-width: 14rem; } +.min-w-72 { + min-width: 18rem; +} + .max-w-36 { max-width: 9rem; } +.max-w-lg { + max-width: 32rem; +} + +.max-w-sm { + max-width: 24rem; +} + .max-w-xl { max-width: 36rem; } +.-translate-y-1 { + --tw-translate-y: -0.25rem; + transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)); +} + +.cursor-pointer { + cursor: pointer; +} + .flex-col { flex-direction: column; } @@ -989,6 +1010,10 @@ video { width: 14rem; } + .md\:w-auto { + width: auto; + } + .md\:min-w-56 { min-width: 14rem; } diff --git a/src/pages/clues.rs b/src/pages/clues.rs index d1e4508..08306c8 100644 --- a/src/pages/clues.rs +++ b/src/pages/clues.rs @@ -1,4 +1,4 @@ -use yew::{function_component, html, Html}; +use yew::{classes, function_component, html, Html}; use yew_router::components::Link; use crate::router::Route; @@ -29,9 +29,7 @@ pub fn Clues() -> Html { <svg class="w-8 " xmlns="http://www.w3.org/2000/svg" - height="currentHeight" viewBox="0 0 24 24" - width="currentWidth" fill="currentColor" > <path d="M0 0h24v24H0z" fill="none" /> @@ -60,9 +58,7 @@ pub fn Clues() -> Html { <svg class="text-primary w-10 absolute right-4" xmlns="http://www.w3.org/2000/svg" - height="currentHeight" viewBox="0 0 24 24" - width="currentWidth" fill="currentColor" > <path d="M0 0h24v24H0z" fill="none" /> @@ -75,9 +71,7 @@ pub fn Clues() -> Html { <svg class="w-10 text-danger" xmlns="http://www.w3.org/2000/svg" - height="currentHeight" viewBox="0 0 24 24" - width="currentWidth" fill="currentColor" > <path d="M0 0h24v24H0z" fill="none" /> @@ -91,9 +85,7 @@ pub fn Clues() -> Html { <svg class="w-10 text-danger" xmlns="http://www.w3.org/2000/svg" - height="currentHeight" viewBox="0 0 24 24" - width="currentWidth" fill="currentColor" > <path d="M0 0h24v24H0z" fill="none" /> @@ -112,9 +104,7 @@ pub fn Clues() -> Html { <svg class="text-primary w-10 absolute right-4" xmlns="http://www.w3.org/2000/svg" - height="currentHeight" viewBox="0 0 24 24" - width="currentWidth" fill="currentColor" > <path d="M0 0h24v24H0z" fill="none" /> @@ -127,9 +117,7 @@ pub fn Clues() -> Html { <svg class="w-10 text-danger" xmlns="http://www.w3.org/2000/svg" - height="currentHeight" viewBox="0 0 24 24" - width="currentWidth" fill="currentColor" > <path d="M0 0h24v24H0z" fill="none" /> @@ -143,9 +131,7 @@ pub fn Clues() -> Html { <svg class="w-10 text-danger" xmlns="http://www.w3.org/2000/svg" - height="currentHeight" viewBox="0 0 24 24" - width="currentWidth" fill="currentColor" > <path d="M0 0h24v24H0z" fill="none" /> @@ -156,26 +142,31 @@ pub fn Clues() -> Html { <p class="text-md">{ "+49 9876 543 210" }</p> </div> </div> - <div class="flex justify-center max-w-xl w-full mb-6"> - <div - class="bg-primary - hover:bg-primary-dark - hover:text-white - hover:-translate-y-1 - hover:cursor-pointer - transition duration-150 - font-bold text-xl - max-w-xl - rounded-md - text-black - text-center - w-full - min-h-16 - h-16 - flex justify-center items-center mb-16" + <div class="flex justify-center max-w-lg w-full mb-6"> + <Link<Route> + to={Route::Register} + classes={classes!( + "bg-primary", + "hover",":bg-primary-dark", + "hover",":text-white", + "hover",":-translate-y-1", + "hover",":cursor-pointer", + "transition", "duration-150", + "font-bold", "text-xl", + "max-w-sm", + "rounded-md", + "text-black", + "text-center", + "w-full", + "min-h-16", + "h-16", + "flex", + "justify-center", + "items-center", + )} > - <Link<Route> to={Route::Register}>{ "Weiter" }</Link<Route>> - </div> + { "Weiter" } + </Link<Route>> </div> </div> </div> diff --git a/src/pages/deceased.rs b/src/pages/deceased.rs index 6fe747a..3fb2391 100644 --- a/src/pages/deceased.rs +++ b/src/pages/deceased.rs @@ -29,9 +29,7 @@ pub fn Deceased() -> Html { <svg class="w-8 " xmlns="http://www.w3.org/2000/svg" - height="currentHeight" viewBox="0 0 24 24" - width="currentWidth" fill="currentColor" > <path d="M0 0h24v24H0z" fill="none" /> @@ -115,24 +113,27 @@ pub fn Deceased() -> Html { type="date" /> </div> - <div - class="bg-primary - hover:bg-primary-dark - hover:text-white - hover:-translate-y-1 - hover:cursor-pointer - transition duration-150 - font-bold text-xl - max-w-xl - rounded-md - text-black - text-center - w-full - h-16 - mt-8 flex justify-center items-center " + <Link<Route> + to={Route::Clues} + classes={yew::classes!( + "bg-primary", + "hover",":bg-primary-dark", + "hover",":text-white", + "hover",":-translate-y-1", + "hover",":cursor-pointer", + "transition", "duration-150", + "font-bold", "text-xl", + "max-w-sm", + "rounded-md", + "text-black", + "text-center", + "w-full", + "h-16", + "mt-8", "flex", "justify-center", "items-center", + )} > - <Link<Route> to={Route::Clues}>{ "Weiter" }</Link<Route>> - </div> + { "Weiter" } + </Link<Route>> </div> </div> } diff --git a/src/pages/home.rs b/src/pages/home.rs index 9c5d990..4d79d9f 100644 --- a/src/pages/home.rs +++ b/src/pages/home.rs @@ -1,4 +1,4 @@ -use yew::{function_component, html, Html}; +use yew::{classes, function_component, html, Html}; use yew_router::prelude::Link; use crate::router::Route; @@ -20,25 +20,32 @@ pub fn Home() -> Html { { "Mit uns finden Sie Ihre digitalen Spuren und können diese entfernen." } </p> </div> - <div - class="bg-primary - hover:bg-primary-dark - hover:text-white - hover:-translate-y-1 - hover:cursor-pointer - transition duration-150 - font-bold text-xl - max-w-xl - rounded-md - text-black - text-center - w-full - min-h-16 - h-16 - flex justify-center items-center" + <Link<Route> + to={Route::SignUp} + classes={classes!( + "bg-primary", + "hover:bg-primary-dark", + "hover:text-white", + "hover:-translate-y-1", + "hover:cursor-pointer", + "transition", + "duration-150", + "font-bold", + "text-xl", + "max-w-xl", + "rounded-md", + "text-black", + "text-center", + "w-full", + "min-h-16", + "h-16", + "flex", + "justify-center", + "items-center", + )} > - <Link<Route> to={Route::SignUp}>{ "Weiter" }</Link<Route>> - </div> + { "Weiter" } + </Link<Route>> <div class="flex flex-col items-center space-y-4"> <p class="text-center italic"> { "Mit der weiteren Nutzung stimmst du den folgenden Bedingungen zu:" } diff --git a/src/pages/register.rs b/src/pages/register.rs index 6b3b6d0..bf9d5c8 100644 --- a/src/pages/register.rs +++ b/src/pages/register.rs @@ -1,4 +1,4 @@ -use yew::{function_component, html, Html}; +use yew::{classes, function_component, html, Html}; use yew_router::components::Link; use crate::router::Route; @@ -29,9 +29,7 @@ pub fn Register() -> Html { <svg class="w-8 " xmlns="http://www.w3.org/2000/svg" - height="currentHeight" viewBox="0 0 24 24" - width="currentWidth" fill="currentColor" > <path d="M0 0h24v24H0z" fill="none" /> @@ -108,24 +106,27 @@ pub fn Register() -> Html { type="text" /> </div> - <div - class="bg-primary - hover:bg-primary-dark - hover:text-white - hover:-translate-y-1 - hover:cursor-pointer - transition duration-150 - font-bold text-xl - max-w-xl - rounded-md - text-black - text-center - w-full - h-16 - mt-20 flex justify-center items-center " + <Link<Route> + to={Route::Deceased} + classes={classes!( + "bg-primary", + "hover",":bg-primary-dark", + "hover",":text-white", + "hover",":-translate-y-1", + "hover",":cursor-pointer", + "transition", "duration-150", + "font-bold", "text-xl", + "max-w-sm", + "rounded-md", + "text-black", + "text-center", + "w-full", + "h-16", + "mt-20", "flex", "justify-center", "items-center", + )} > - <Link<Route> to={Route::Deceased}>{ "Weiter" }</Link<Route>> - </div> + { "Weiter" } + </Link<Route>> </div> </div> } diff --git a/src/pages/signup.rs b/src/pages/signup.rs index 5963288..5e62708 100644 --- a/src/pages/signup.rs +++ b/src/pages/signup.rs @@ -1,4 +1,4 @@ -use yew::{function_component, html, Html}; +use yew::{classes, function_component, html, Html}; use yew_router::components::Link; use crate::router::Route; @@ -29,9 +29,7 @@ pub fn SignUp() -> Html { <svg class="w-8 " xmlns="http://www.w3.org/2000/svg" - height="currentHeight" viewBox="0 0 24 24" - width="currentWidth" fill="currentColor" > <path d="M0 0h24v24H0z" fill="none" /> @@ -82,7 +80,28 @@ pub fn SignUp() -> Html { h-12 flex justify-center items-center" > - <Link<Route> to={Route::Verify}>{ "Weiter" }</Link<Route>> + <Link<Route> + to={Route::Verify} + classes={classes!( + "bg-primary", + "hover",":bg-primary-dark", + "hover",":text-white", + "hover",":-translate-y-1", + "hover",":cursor-pointer", + "transition", "duration-150", + "font-bold", "text-xl", + "max-w-36", + "rounded-md", + "text-black", + "text-center", + "w-full", + "min-h-12", + "h-12", + "flex", "justify-center", "items-center", + )} + > + { "Weiter" } + </Link<Route>> </div> </div> </div> diff --git a/src/pages/verify.rs b/src/pages/verify.rs index 0b6ed0f..58f4f45 100644 --- a/src/pages/verify.rs +++ b/src/pages/verify.rs @@ -1,4 +1,4 @@ -use yew::{function_component, html, Html}; +use yew::{classes, function_component, html, Html}; use yew_router::components::Link; use crate::router::Route; @@ -30,9 +30,7 @@ pub fn Verify() -> Html { <svg class="w-8 " xmlns="http://www.w3.org/2000/svg" - height="currentHeight" viewBox="0 0 24 24" - width="currentWidth" fill="currentColor" > <path d="M0 0h24v24H0z" fill="none" /> @@ -50,33 +48,36 @@ pub fn Verify() -> Html { </div> <div class="mt-24 md:mt-32 flex flex-col items-center"> <h3 class="text-3xl font-bold mb-6">{ "Verifizieren" }</h3> - <div class="flex flex-col items-start"> + <div class="flex flex-col items-start min-w-72 md:w-auto"> <p class="mb-3">{ "Bitte verifiziere deine E-Mail Adresse." }</p> <p class="mb-12">{ "Wir haben dir eine E-Mail geschickt." }</p> <p class="mb-8">{ "Dann geht es hier weiter." }</p> </div> <div class="flex justify-center max-w-xl w-full mb-6"> - <div - class="bg-primary - hover:bg-primary-dark - hover:text-white - hover:-translate-y-1 - hover:cursor-pointer - transition duration-150 - font-bold text-xl - max-w-36 - rounded-md - text-black - text-center - w-full - min-h-12 - h-12 - flex justify-center items-center mb-16" + <Link<Route> + to={Route::Register} + classes={classes!( + "bg-primary", + "hover",":bg-primary-dark", + "hover",":text-white", + "hover",":-translate-y-1", + "hover",":cursor-pointer", + "transition", "duration-150", + "font-bold", "text-xl", + "rounded-md", + "text-black", + "text-center", + "max-w-sm", + "w-full", + "min-h-12", + "h-12", + "flex", "justify-center", "items-center", + )} > - <Link<Route> to={Route::Register}>{ "Weiter" }</Link<Route>> - </div> + { "Weiter" } + </Link<Route>> </div> - <div class="flex flex-col items-start"> + <div class="flex flex-col items-start min-w-72 md:w-auto"> <p class="mb-1">{ "Noch keine E-Mail erhalten?" }</p> <p class="mb-4">{ "Spam Ordner schon überprüft?" }</p> <div