diff --git a/input.css b/input.css index b5c61c9..efddc90 100644 --- a/input.css +++ b/input.css @@ -1,3 +1,7 @@ @tailwind base; @tailwind components; @tailwind utilities; + +.active-link { + @apply text-third border-b; +} diff --git a/src/app.rs b/src/app.rs index a291298..b7332a4 100644 --- a/src/app.rs +++ b/src/app.rs @@ -32,11 +32,19 @@ pub fn App() -> impl IntoView { #[component] pub fn Navigation() -> impl IntoView { + let location = use_location(); + view! { } } diff --git a/src/models/link.rs b/src/models/link.rs index 13cf7ba..575feea 100644 --- a/src/models/link.rs +++ b/src/models/link.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] pub struct Link { - id: u64, + pub id: u64, pub link: String, pub name: String, position: i64, @@ -38,4 +38,54 @@ impl Link { .fetch_all(crate::database::get_db()) .await } + + #[cfg(feature = "ssr")] + pub async fn move_position( + link_id: String, + direction: String, + ) -> Result { + let link = sqlx::query!( + "SELECT id, name, link, position, created_at FROM links WHERE id = ?", + link_id + ) + .map(|x| Self { + id: x.id, + name: x.name, + link: x.link, + position: x.position, + created_at: x.created_at.format("%d/%m/%Y %H:%M").to_string(), + }) + .fetch_one(crate::database::get_db()) + .await; + + match link { + Ok(link) => { + let position = link.position; + let flow = match direction.as_str() { + "prev" => -1, + "next" => 1, + _ => 0, + }; + let _ = sqlx::query!( + "UPDATE links SET position = ? WHERE position = ?", + position - flow, + position + flow + ) + .execute(crate::database::get_db()) + .await; + + sqlx::query!( + "UPDATE links SET position = ? WHERE id = ?", + position + flow, + link_id + ) + .execute(crate::database::get_db()) + .await + } + Err(_) => { + print!("Error position"); + panic!("not fount") + } + } + } } diff --git a/src/routes/link.rs b/src/routes/link.rs index 81a17d4..619dde6 100644 --- a/src/routes/link.rs +++ b/src/routes/link.rs @@ -1,6 +1,8 @@ +use ev::MouseEvent; use leptos::*; -//use leptos_meta::*; +use leptos_meta::*; use leptos_router::*; +use wasm_bindgen::JsCast; #[server(GetLinksAction, "/api", "GetJson")] #[tracing::instrument] @@ -27,18 +29,33 @@ pub async fn add_value(name: String, link: String) -> Result<(), ServerFnError> #[component] pub fn Links() -> impl IntoView { let (show, set_show) = create_signal(false); + let (edit, set_edit) = create_signal(false); + let link_action = create_server_action::(); let result = link_action.version(); let reset_form = create_rw_signal(""); let links = create_resource( move || (result.get()), move |_| async move { + logging::log!("fetch"); reset_form.set(""); set_show.set(false); get_links().await }, ); + create_effect(move |_| { + logging::log!("here .refetch() runs effect instead of get_q_sort.get()"); + logging::log!("{:?}", links.get()); + }); + + async fn move_click_position(id: String) { + logging::log!("move click {}", id); + change_position(id, "prev".to_string()) + .await + .expect("REASON"); + } + let form = move || { show.get().then(|| { view! {
@@ -79,7 +96,9 @@ pub fn Links() -> impl IntoView { key=|(i, _)| *i children=move |(_, link)| { let link = create_rw_signal(link); - view!{} + view!{ + + } }/> } }))} @@ -87,7 +106,8 @@ pub fn Links() -> impl IntoView { -
+
+
@@ -97,8 +117,42 @@ pub fn Links() -> impl IntoView { } } +#[server(MoveLinkAction, "/api")] +pub async fn change_position(link_id: String, direction: String) -> Result<(), ServerFnError> { + crate::models::Link::move_position(link_id, direction) + .await + .map(|_| ()) + .map_err(|x| { + let err = format!("Error while posting a comment: {x:?}"); + tracing::error!("{err}"); + ServerFnError::ServerError("Could not post a comment, try again later".into()) + }) +} + #[component] -fn Link(link: RwSignal) -> impl IntoView { +fn Link( + link: RwSignal, + edit: ReadSignal, + links: Resource, +) -> impl IntoView { + /*let result = move_link.version(); + let _ = create_resource( + move || (result.get()), + move |_| async move { + logging::log!("move"); + //set_reload.update(|n| *n += 1); + //links.refetch(); + }, + );*/ + + //let on_click = move |event: MouseEvent| { + //.dyn_into::().unwrap(); + //let dataset = element.dataset(); + //logging::log!("move {:?}", element); + //let _ = move_link.dispatch(()); + //links.refetch(); + //}; + view! {
  • ) -> impl IntoView { href={move || link.with(|x| x.link.to_string())}> {move || link.with(|x| x.name.to_string())} + {move || { + edit.get().then(|| { + view! {
    + + + + +
    } + }) + }}
  • } } + +#[component] +fn MoveButton( + id: String, + value: String, + label: String, + links: Resource, +) -> impl IntoView { + let move_link = create_server_action::(); + + view! { + + + + + + } +} diff --git a/src/routes/value.rs b/src/routes/value.rs index 5d24e16..757975a 100644 --- a/src/routes/value.rs +++ b/src/routes/value.rs @@ -1,5 +1,5 @@ use leptos::*; -//use leptos_meta::*; +use leptos_meta::*; use leptos_router::*; use crate::models::OPTIONS; diff --git a/style/output.css b/style/output.css new file mode 100644 index 0000000..5857f08 --- /dev/null +++ b/style/output.css @@ -0,0 +1,805 @@ +/* +! tailwindcss v3.4.1 | MIT License | https://tailwindcss.com +*/ + +/* +1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4) +2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116) +*/ + +*, +::before, +::after { + box-sizing: border-box; + /* 1 */ + border-width: 0; + /* 2 */ + border-style: solid; + /* 2 */ + border-color: #e5e7eb; + /* 2 */ +} + +::before, +::after { + --tw-content: ''; +} + +/* +1. Use a consistent sensible line-height in all browsers. +2. Prevent adjustments of font size after orientation changes in iOS. +3. Use a more readable tab size. +4. Use the user's configured `sans` font-family by default. +5. Use the user's configured `sans` font-feature-settings by default. +6. Use the user's configured `sans` font-variation-settings by default. +7. Disable tap highlights on iOS +*/ + +html, +:host { + line-height: 1.5; + /* 1 */ + -webkit-text-size-adjust: 100%; + /* 2 */ + -moz-tab-size: 4; + /* 3 */ + -o-tab-size: 4; + tab-size: 4; + /* 3 */ + font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + /* 4 */ + font-feature-settings: normal; + /* 5 */ + font-variation-settings: normal; + /* 6 */ + -webkit-tap-highlight-color: transparent; + /* 7 */ +} + +/* +1. Remove the margin in all browsers. +2. Inherit line-height from `html` so users can set them as a class directly on the `html` element. +*/ + +body { + margin: 0; + /* 1 */ + line-height: inherit; + /* 2 */ +} + +/* +1. Add the correct height in Firefox. +2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655) +3. Ensure horizontal rules are visible by default. +*/ + +hr { + height: 0; + /* 1 */ + color: inherit; + /* 2 */ + border-top-width: 1px; + /* 3 */ +} + +/* +Add the correct text decoration in Chrome, Edge, and Safari. +*/ + +abbr:where([title]) { + -webkit-text-decoration: underline dotted; + text-decoration: underline dotted; +} + +/* +Remove the default font size and weight for headings. +*/ + +h1, +h2, +h3, +h4, +h5, +h6 { + font-size: inherit; + font-weight: inherit; +} + +/* +Reset links to optimize for opt-in styling instead of opt-out. +*/ + +a { + color: inherit; + text-decoration: inherit; +} + +/* +Add the correct font weight in Edge and Safari. +*/ + +b, +strong { + font-weight: bolder; +} + +/* +1. Use the user's configured `mono` font-family by default. +2. Use the user's configured `mono` font-feature-settings by default. +3. Use the user's configured `mono` font-variation-settings by default. +4. Correct the odd `em` font sizing in all browsers. +*/ + +code, +kbd, +samp, +pre { + font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; + /* 1 */ + font-feature-settings: normal; + /* 2 */ + font-variation-settings: normal; + /* 3 */ + font-size: 1em; + /* 4 */ +} + +/* +Add the correct font size in all browsers. +*/ + +small { + font-size: 80%; +} + +/* +Prevent `sub` and `sup` elements from affecting the line height in all browsers. +*/ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* +1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297) +2. Correct table border color inheritance in all Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016) +3. Remove gaps between table borders by default. +*/ + +table { + text-indent: 0; + /* 1 */ + border-color: inherit; + /* 2 */ + border-collapse: collapse; + /* 3 */ +} + +/* +1. Change the font styles in all browsers. +2. Remove the margin in Firefox and Safari. +3. Remove default padding in all browsers. +*/ + +button, +input, +optgroup, +select, +textarea { + font-family: inherit; + /* 1 */ + font-feature-settings: inherit; + /* 1 */ + font-variation-settings: inherit; + /* 1 */ + font-size: 100%; + /* 1 */ + font-weight: inherit; + /* 1 */ + line-height: inherit; + /* 1 */ + color: inherit; + /* 1 */ + margin: 0; + /* 2 */ + padding: 0; + /* 3 */ +} + +/* +Remove the inheritance of text transform in Edge and Firefox. +*/ + +button, +select { + text-transform: none; +} + +/* +1. Correct the inability to style clickable types in iOS and Safari. +2. Remove default button styles. +*/ + +button, +[type='button'], +[type='reset'], +[type='submit'] { + -webkit-appearance: button; + /* 1 */ + background-color: transparent; + /* 2 */ + background-image: none; + /* 2 */ +} + +/* +Use the modern Firefox focus style for all focusable elements. +*/ + +:-moz-focusring { + outline: auto; +} + +/* +Remove the additional `:invalid` styles in Firefox. (https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737) +*/ + +:-moz-ui-invalid { + box-shadow: none; +} + +/* +Add the correct vertical alignment in Chrome and Firefox. +*/ + +progress { + vertical-align: baseline; +} + +/* +Correct the cursor style of increment and decrement buttons in Safari. +*/ + +::-webkit-inner-spin-button, +::-webkit-outer-spin-button { + height: auto; +} + +/* +1. Correct the odd appearance in Chrome and Safari. +2. Correct the outline style in Safari. +*/ + +[type='search'] { + -webkit-appearance: textfield; + /* 1 */ + outline-offset: -2px; + /* 2 */ +} + +/* +Remove the inner padding in Chrome and Safari on macOS. +*/ + +::-webkit-search-decoration { + -webkit-appearance: none; +} + +/* +1. Correct the inability to style clickable types in iOS and Safari. +2. Change font properties to `inherit` in Safari. +*/ + +::-webkit-file-upload-button { + -webkit-appearance: button; + /* 1 */ + font: inherit; + /* 2 */ +} + +/* +Add the correct display in Chrome and Safari. +*/ + +summary { + display: list-item; +} + +/* +Removes the default spacing and border for appropriate elements. +*/ + +blockquote, +dl, +dd, +h1, +h2, +h3, +h4, +h5, +h6, +hr, +figure, +p, +pre { + margin: 0; +} + +fieldset { + margin: 0; + padding: 0; +} + +legend { + padding: 0; +} + +ol, +ul, +menu { + list-style: none; + margin: 0; + padding: 0; +} + +/* +Reset default styling for dialogs. +*/ + +dialog { + padding: 0; +} + +/* +Prevent resizing textareas horizontally by default. +*/ + +textarea { + resize: vertical; +} + +/* +1. Reset the default placeholder opacity in Firefox. (https://github.com/tailwindlabs/tailwindcss/issues/3300) +2. Set the default placeholder color to the user's configured gray 400 color. +*/ + +input::-moz-placeholder, textarea::-moz-placeholder { + opacity: 1; + /* 1 */ + color: #9ca3af; + /* 2 */ +} + +input::placeholder, +textarea::placeholder { + opacity: 1; + /* 1 */ + color: #9ca3af; + /* 2 */ +} + +/* +Set the default cursor for buttons. +*/ + +button, +[role="button"] { + cursor: pointer; +} + +/* +Make sure disabled buttons don't get the pointer cursor. +*/ + +:disabled { + cursor: default; +} + +/* +1. Make replaced elements `display: block` by default. (https://github.com/mozdevs/cssremedy/issues/14) +2. Add `vertical-align: middle` to align replaced elements more sensibly by default. (https://github.com/jensimmons/cssremedy/issues/14#issuecomment-634934210) + This can trigger a poorly considered lint error in some tools but is included by design. +*/ + +img, +svg, +video, +canvas, +audio, +iframe, +embed, +object { + display: block; + /* 1 */ + vertical-align: middle; + /* 2 */ +} + +/* +Constrain images and videos to the parent width and preserve their intrinsic aspect ratio. (https://github.com/mozdevs/cssremedy/issues/14) +*/ + +img, +video { + max-width: 100%; + height: auto; +} + +/* Make elements with the HTML hidden attribute stay hidden by default */ + +[hidden] { + display: none; +} + +*, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; + --tw-translate-x: 0; + --tw-translate-y: 0; + --tw-rotate: 0; + --tw-skew-x: 0; + --tw-skew-y: 0; + --tw-scale-x: 1; + --tw-scale-y: 1; + --tw-pan-x: ; + --tw-pan-y: ; + --tw-pinch-zoom: ; + --tw-scroll-snap-strictness: proximity; + --tw-gradient-from-position: ; + --tw-gradient-via-position: ; + --tw-gradient-to-position: ; + --tw-ordinal: ; + --tw-slashed-zero: ; + --tw-numeric-figure: ; + --tw-numeric-spacing: ; + --tw-numeric-fraction: ; + --tw-ring-inset: ; + --tw-ring-offset-width: 0px; + --tw-ring-offset-color: #fff; + --tw-ring-color: rgb(59 130 246 / 0.5); + --tw-ring-offset-shadow: 0 0 #0000; + --tw-ring-shadow: 0 0 #0000; + --tw-shadow: 0 0 #0000; + --tw-shadow-colored: 0 0 #0000; + --tw-blur: ; + --tw-brightness: ; + --tw-contrast: ; + --tw-grayscale: ; + --tw-hue-rotate: ; + --tw-invert: ; + --tw-saturate: ; + --tw-sepia: ; + --tw-drop-shadow: ; + --tw-backdrop-blur: ; + --tw-backdrop-brightness: ; + --tw-backdrop-contrast: ; + --tw-backdrop-grayscale: ; + --tw-backdrop-hue-rotate: ; + --tw-backdrop-invert: ; + --tw-backdrop-opacity: ; + --tw-backdrop-saturate: ; + --tw-backdrop-sepia: ; +} + +::backdrop { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; + --tw-translate-x: 0; + --tw-translate-y: 0; + --tw-rotate: 0; + --tw-skew-x: 0; + --tw-skew-y: 0; + --tw-scale-x: 1; + --tw-scale-y: 1; + --tw-pan-x: ; + --tw-pan-y: ; + --tw-pinch-zoom: ; + --tw-scroll-snap-strictness: proximity; + --tw-gradient-from-position: ; + --tw-gradient-via-position: ; + --tw-gradient-to-position: ; + --tw-ordinal: ; + --tw-slashed-zero: ; + --tw-numeric-figure: ; + --tw-numeric-spacing: ; + --tw-numeric-fraction: ; + --tw-ring-inset: ; + --tw-ring-offset-width: 0px; + --tw-ring-offset-color: #fff; + --tw-ring-color: rgb(59 130 246 / 0.5); + --tw-ring-offset-shadow: 0 0 #0000; + --tw-ring-shadow: 0 0 #0000; + --tw-shadow: 0 0 #0000; + --tw-shadow-colored: 0 0 #0000; + --tw-blur: ; + --tw-brightness: ; + --tw-contrast: ; + --tw-grayscale: ; + --tw-hue-rotate: ; + --tw-invert: ; + --tw-saturate: ; + --tw-sepia: ; + --tw-drop-shadow: ; + --tw-backdrop-blur: ; + --tw-backdrop-brightness: ; + --tw-backdrop-contrast: ; + --tw-backdrop-grayscale: ; + --tw-backdrop-hue-rotate: ; + --tw-backdrop-invert: ; + --tw-backdrop-opacity: ; + --tw-backdrop-saturate: ; + --tw-backdrop-sepia: ; +} + +.static { + position: static; +} + +.m-2 { + margin: 0.5rem; +} + +.m-5 { + margin: 1.25rem; +} + +.mx-auto { + margin-left: auto; + margin-right: auto; +} + +.my-0 { + margin-top: 0px; + margin-bottom: 0px; +} + +.my-5 { + margin-top: 1.25rem; + margin-bottom: 1.25rem; +} + +.mb-1 { + margin-bottom: 0.25rem; +} + +.mt-3 { + margin-top: 0.75rem; +} + +.mt-5 { + margin-top: 1.25rem; +} + +.block { + display: block; +} + +.inline-block { + display: inline-block; +} + +.flex { + display: flex; +} + +.hidden { + display: none; +} + +.h-screen { + height: 100vh; +} + +.w-12 { + width: 3rem; +} + +.w-60 { + width: 15rem; +} + +.w-72 { + width: 18rem; +} + +.min-w-60 { + min-width: 15rem; +} + +.flex-1 { + flex: 1 1 0%; +} + +.flex-col { + flex-direction: column; +} + +.flex-wrap { + flex-wrap: wrap; +} + +.justify-end { + justify-content: flex-end; +} + +.justify-center { + justify-content: center; +} + +.justify-between { + justify-content: space-between; +} + +.gap-5 { + gap: 1.25rem; +} + +.rounded-full { + border-radius: 9999px; +} + +.rounded-lg { + border-radius: 0.5rem; +} + +.rounded-b-lg { + border-bottom-right-radius: 0.5rem; + border-bottom-left-radius: 0.5rem; +} + +.rounded-bl-lg { + border-bottom-left-radius: 0.5rem; +} + +.rounded-br-lg { + border-bottom-right-radius: 0.5rem; +} + +.border { + border-width: 1px; +} + +.border-third { + --tw-border-opacity: 1; + border-color: rgb(252 68 61 / var(--tw-border-opacity)); +} + +.border-transparent { + border-color: transparent; +} + +.bg-prim { + --tw-bg-opacity: 1; + background-color: rgb(38 41 45 / var(--tw-bg-opacity)); +} + +.bg-prim-light { + --tw-bg-opacity: 1; + background-color: rgb(43 47 51 / var(--tw-bg-opacity)); +} + +.bg-third { + --tw-bg-opacity: 1; + background-color: rgb(252 68 61 / var(--tw-bg-opacity)); +} + +.p-6 { + padding: 1.5rem; +} + +.px-2 { + padding-left: 0.5rem; + padding-right: 0.5rem; +} + +.px-5 { + padding-left: 1.25rem; + padding-right: 1.25rem; +} + +.py-1 { + padding-top: 0.25rem; + padding-bottom: 0.25rem; +} + +.py-2 { + padding-top: 0.5rem; + padding-bottom: 0.5rem; +} + +.py-3 { + padding-top: 0.75rem; + padding-bottom: 0.75rem; +} + +.py-4 { + padding-top: 1rem; + padding-bottom: 1rem; +} + +.pb-6 { + padding-bottom: 1.5rem; +} + +.text-center { + text-align: center; +} + +.text-2xl { + font-size: 1.5rem; + line-height: 2rem; +} + +.text-lg { + font-size: 1.125rem; + line-height: 1.75rem; +} + +.text-xl { + font-size: 1.25rem; + line-height: 1.75rem; +} + +.text-second-dark { + --tw-text-opacity: 1; + color: rgb(146 148 150 / var(--tw-text-opacity)); +} + +.transition-colors { + transition-property: color, background-color, border-color, text-decoration-color, fill, stroke; + transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); + transition-duration: 150ms; +} + +.red { + color: red; +} + +.hover\:border-b:hover { + border-bottom-width: 1px; +} + +.hover\:bg-prim-lightest:hover { + --tw-bg-opacity: 1; + background-color: rgb(46 50 53 / var(--tw-bg-opacity)); +} + +.hover\:bg-third-light:hover { + --tw-bg-opacity: 1; + background-color: rgb(249 102 98 / var(--tw-bg-opacity)); +} + +.hover\:text-third:hover { + --tw-text-opacity: 1; + color: rgb(252 68 61 / var(--tw-text-opacity)); +} + +.focus\:border-third:focus { + --tw-border-opacity: 1; + border-color: rgb(252 68 61 / var(--tw-border-opacity)); +} + +@media (prefers-color-scheme: dark) { + .dark\:bg-prim { + --tw-bg-opacity: 1; + background-color: rgb(38 41 45 / var(--tw-bg-opacity)); + } + + .dark\:text-second { + --tw-text-opacity: 1; + color: rgb(254 254 254 / var(--tw-text-opacity)); + } +} diff --git a/tailwind.config.js b/tailwind.config.js index d19f568..235d7cd 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -16,8 +16,8 @@ module.exports = { dark: "#929496", }, third: { - light: "#FC443D", - DEFAULT: "#F74E49", + light: "#F96662", + DEFAULT: "#FC443D", }, fourth: { light: "#FFD885",