diff --git a/src/lib/components/TablaUsuarios.svelte b/src/lib/components/TablaUsuarios.svelte
index 9f7552f..34cdc3e 100644
--- a/src/lib/components/TablaUsuarios.svelte
+++ b/src/lib/components/TablaUsuarios.svelte
@@ -9,6 +9,8 @@
import Button from './ui/button/button.svelte';
import KeyIcon from '@lucide/svelte/icons/key';
import UserPen from '@lucide/svelte/icons/user-pen';
+ import Search from '@lucide/svelte/icons/search';
+ import Plus from '@lucide/svelte/icons/plus';
import { Tooltip } from './ui/tooltip';
import TooltipTrigger from './ui/tooltip/tooltip-trigger.svelte';
import TooltipContent from './ui/tooltip/tooltip-content.svelte';
@@ -19,6 +21,12 @@
import { fade } from 'svelte/transition';
import type { Unsubscriber } from 'svelte/store';
import Input from './ui/input/input.svelte';
+ import Trash_2 from '@lucide/svelte/icons/trash-2';
+ import BorrarUsuario from './BorrarUsuario.svelte';
+ import InputGroup from './ui/input-group/input-group.svelte';
+ import InputGroupAddon from './ui/input-group/input-group-addon.svelte';
+ import InputGroupInput from './ui/input-group/input-group-input.svelte';
+ import AgregarUsuario from './admin/AgregarUsuario.svelte';
interface Props {
usuarios: UserResponseDto[];
@@ -29,6 +37,9 @@
let open = $state(false);
let openModificarUsuario = $state(false);
+ let openBorrar = $state(false);
+ let usuarioBorrar: UserResponseDto | null = $state(null);
+
//si ponia contraseña en español quedaba muy largo el nombre
let usuarioCambioPass: UserResponseDto | null = $state(null);
@@ -84,12 +95,6 @@
return sortDirection === 'asc' ? '↑' : '↓';
}
- $effect(() => {
- if (!open) {
- usuarioCambioPass = null;
- }
- });
-
function handleCambiarContraseña(usuario: UserResponseDto) {
open = true;
usuarioCambioPass = usuario;
@@ -99,15 +104,22 @@
openModificarUsuario = true;
usuarioModificar = usuario;
}
+
+ function handleBorrar(usuario: UserResponseDto) {
+ openBorrar = true;
+ usuarioBorrar = usuario;
+ }
+
+let opencrearUsuario = $state(false);
+ // $inspect(usuarios);
-
-
+
+
+
+
+
+
@@ -129,38 +141,63 @@
- {#each usuariosFiltrados as usuario}
+ {#if usuariosFiltrados.length == 0}
- @
- {usuario.username}
-
+
+ No hay usuarios por el nombre de: {search}
- {usuario.displayName}
- {usuario.postsCount}
- {usuario.createdAt.replace('Z', ' ').replace('T', ' | ')}
-
-
-
-
-
-
- Recuperar Contraseña
-
-
-
-
-
-
-
- Modificar Usuario
-
-
-
-
-
- {/each}
+ {:else}
+ {#each usuariosFiltrados as usuario}
+
+ @
+ {usuario.username}
+
+
+ {usuario.displayName}
+ {usuario.postsCount}
+ {usuario.createdAt.replace('Z', ' ').replace('T', ' | ')}
+
+
+
+
+
+
+ Recuperar Contraseña
+
+
+
+
+
+
+
+ Modificar Usuario
+
+
+
+
+
+
+
+ {#if usuario.isAdmin}
+ No se pueden eliminar usuarios Admin
+ {:else}
+ Eliminar Usuario
+ {/if}
+
+
+
+
+ {/each}
+ {/if}
+
+
\ No newline at end of file
diff --git a/src/lib/components/admin/AgregarUsuario.svelte b/src/lib/components/admin/AgregarUsuario.svelte
new file mode 100644
index 0000000..f8a5e62
--- /dev/null
+++ b/src/lib/components/admin/AgregarUsuario.svelte
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/lib/components/ui/button/button.svelte b/src/lib/components/ui/button/button.svelte
index 2105474..a8296ae 100644
--- a/src/lib/components/ui/button/button.svelte
+++ b/src/lib/components/ui/button/button.svelte
@@ -4,15 +4,15 @@
import { type VariantProps, tv } from "tailwind-variants";
export const buttonVariants = tv({
- base: "focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive inline-flex shrink-0 items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium outline-none transition-all focus-visible:ring-[3px] disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ base: "focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive inline-flex shrink-0 items-center justify-center gap-2 rounded-md text-sm font-medium whitespace-nowrap transition-all outline-none focus-visible:ring-[3px] disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
variants: {
variant: {
- default: "bg-primary text-primary-foreground shadow-xs hover:bg-primary/90",
+ default: "bg-primary text-primary-foreground hover:bg-primary/90 shadow-xs",
destructive:
- "bg-destructive shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60 text-white",
+ "bg-destructive hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60 text-white shadow-xs",
outline:
- "bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 border",
- secondary: "bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80",
+ "bg-background hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 border shadow-xs",
+ secondary: "bg-secondary text-secondary-foreground hover:bg-secondary/80 shadow-xs",
ghost: "hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
link: "text-primary underline-offset-4 hover:underline",
},
diff --git a/src/lib/components/ui/command/command-dialog.svelte b/src/lib/components/ui/command/command-dialog.svelte
new file mode 100644
index 0000000..4bdb740
--- /dev/null
+++ b/src/lib/components/ui/command/command-dialog.svelte
@@ -0,0 +1,40 @@
+
+
+
+
+ {title}
+ {description}
+
+
+
+
+
diff --git a/src/lib/components/ui/command/command-empty.svelte b/src/lib/components/ui/command/command-empty.svelte
new file mode 100644
index 0000000..6726cd8
--- /dev/null
+++ b/src/lib/components/ui/command/command-empty.svelte
@@ -0,0 +1,17 @@
+
+
+
diff --git a/src/lib/components/ui/command/command-group.svelte b/src/lib/components/ui/command/command-group.svelte
new file mode 100644
index 0000000..104f817
--- /dev/null
+++ b/src/lib/components/ui/command/command-group.svelte
@@ -0,0 +1,32 @@
+
+
+
+ {#if heading}
+
+ {heading}
+
+ {/if}
+
+
diff --git a/src/lib/components/ui/command/command-input.svelte b/src/lib/components/ui/command/command-input.svelte
new file mode 100644
index 0000000..28d3dcf
--- /dev/null
+++ b/src/lib/components/ui/command/command-input.svelte
@@ -0,0 +1,26 @@
+
+
+
+
+
+
diff --git a/src/lib/components/ui/command/command-item.svelte b/src/lib/components/ui/command/command-item.svelte
new file mode 100644
index 0000000..5833416
--- /dev/null
+++ b/src/lib/components/ui/command/command-item.svelte
@@ -0,0 +1,20 @@
+
+
+
diff --git a/src/lib/components/ui/command/command-link-item.svelte b/src/lib/components/ui/command/command-link-item.svelte
new file mode 100644
index 0000000..ada6d2c
--- /dev/null
+++ b/src/lib/components/ui/command/command-link-item.svelte
@@ -0,0 +1,20 @@
+
+
+
diff --git a/src/lib/components/ui/command/command-list.svelte b/src/lib/components/ui/command/command-list.svelte
new file mode 100644
index 0000000..2d3a01a
--- /dev/null
+++ b/src/lib/components/ui/command/command-list.svelte
@@ -0,0 +1,17 @@
+
+
+
diff --git a/src/lib/components/ui/command/command-loading.svelte b/src/lib/components/ui/command/command-loading.svelte
new file mode 100644
index 0000000..19dd298
--- /dev/null
+++ b/src/lib/components/ui/command/command-loading.svelte
@@ -0,0 +1,7 @@
+
+
+
diff --git a/src/lib/components/ui/command/command-separator.svelte b/src/lib/components/ui/command/command-separator.svelte
new file mode 100644
index 0000000..35c4c95
--- /dev/null
+++ b/src/lib/components/ui/command/command-separator.svelte
@@ -0,0 +1,17 @@
+
+
+
diff --git a/src/lib/components/ui/command/command-shortcut.svelte b/src/lib/components/ui/command/command-shortcut.svelte
new file mode 100644
index 0000000..f3d6928
--- /dev/null
+++ b/src/lib/components/ui/command/command-shortcut.svelte
@@ -0,0 +1,20 @@
+
+
+
+ {@render children?.()}
+
diff --git a/src/lib/components/ui/command/command.svelte b/src/lib/components/ui/command/command.svelte
new file mode 100644
index 0000000..a1581f1
--- /dev/null
+++ b/src/lib/components/ui/command/command.svelte
@@ -0,0 +1,28 @@
+
+
+
diff --git a/src/lib/components/ui/command/index.ts b/src/lib/components/ui/command/index.ts
new file mode 100644
index 0000000..5435fbe
--- /dev/null
+++ b/src/lib/components/ui/command/index.ts
@@ -0,0 +1,37 @@
+import Root from "./command.svelte";
+import Loading from "./command-loading.svelte";
+import Dialog from "./command-dialog.svelte";
+import Empty from "./command-empty.svelte";
+import Group from "./command-group.svelte";
+import Item from "./command-item.svelte";
+import Input from "./command-input.svelte";
+import List from "./command-list.svelte";
+import Separator from "./command-separator.svelte";
+import Shortcut from "./command-shortcut.svelte";
+import LinkItem from "./command-link-item.svelte";
+
+export {
+ Root,
+ Dialog,
+ Empty,
+ Group,
+ Item,
+ LinkItem,
+ Input,
+ List,
+ Separator,
+ Shortcut,
+ Loading,
+ //
+ Root as Command,
+ Dialog as CommandDialog,
+ Empty as CommandEmpty,
+ Group as CommandGroup,
+ Item as CommandItem,
+ LinkItem as CommandLinkItem,
+ Input as CommandInput,
+ List as CommandList,
+ Separator as CommandSeparator,
+ Shortcut as CommandShortcut,
+ Loading as CommandLoading,
+};
diff --git a/src/lib/components/ui/dialog/dialog-content.svelte b/src/lib/components/ui/dialog/dialog-content.svelte
index 9d7c7f5..5c6ee6d 100644
--- a/src/lib/components/ui/dialog/dialog-content.svelte
+++ b/src/lib/components/ui/dialog/dialog-content.svelte
@@ -1,9 +1,11 @@
-
+
Close
{/if}
-
+
diff --git a/src/lib/components/ui/dialog/dialog-portal.svelte b/src/lib/components/ui/dialog/dialog-portal.svelte
new file mode 100644
index 0000000..ccfa79c
--- /dev/null
+++ b/src/lib/components/ui/dialog/dialog-portal.svelte
@@ -0,0 +1,7 @@
+
+
+
diff --git a/src/lib/components/ui/dialog/dialog-title.svelte b/src/lib/components/ui/dialog/dialog-title.svelte
index 067e55e..e4d4b34 100644
--- a/src/lib/components/ui/dialog/dialog-title.svelte
+++ b/src/lib/components/ui/dialog/dialog-title.svelte
@@ -12,6 +12,6 @@
diff --git a/src/lib/components/ui/dialog/dialog.svelte b/src/lib/components/ui/dialog/dialog.svelte
new file mode 100644
index 0000000..211672c
--- /dev/null
+++ b/src/lib/components/ui/dialog/dialog.svelte
@@ -0,0 +1,7 @@
+
+
+
diff --git a/src/lib/components/ui/dialog/index.ts b/src/lib/components/ui/dialog/index.ts
index dce1d9d..076cef5 100644
--- a/src/lib/components/ui/dialog/index.ts
+++ b/src/lib/components/ui/dialog/index.ts
@@ -1,5 +1,5 @@
-import { Dialog as DialogPrimitive } from "bits-ui";
-
+import Root from "./dialog.svelte";
+import Portal from "./dialog-portal.svelte";
import Title from "./dialog-title.svelte";
import Footer from "./dialog-footer.svelte";
import Header from "./dialog-header.svelte";
@@ -9,9 +9,6 @@ import Description from "./dialog-description.svelte";
import Trigger from "./dialog-trigger.svelte";
import Close from "./dialog-close.svelte";
-const Root = DialogPrimitive.Root;
-const Portal = DialogPrimitive.Portal;
-
export {
Root,
Title,
diff --git a/src/lib/head/Busqueda.svelte b/src/lib/head/Busqueda.svelte
new file mode 100644
index 0000000..3a6134d
--- /dev/null
+++ b/src/lib/head/Busqueda.svelte
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+ (open = true)}
+ class="max-w-0 transition-[max-width] duration-1000 ease-out group-hover:max-w-xs focus:max-w-xs"
+ />
+
+ Ctrl+K
+
+
+
+
+ {#if search}
+
+ {/if}
+
diff --git a/src/lib/head/Header.svelte b/src/lib/head/Header.svelte
index 145f2fb..838fbd1 100644
--- a/src/lib/head/Header.svelte
+++ b/src/lib/head/Header.svelte
@@ -9,6 +9,9 @@
import { apiBase } from '@/stores/url';
import { goto } from '$app/navigation';
import AvatarButton from './AvatarButton.svelte';
+ import Busqueda from './Busqueda.svelte';
+ import Avatar from '@/components/ui/avatar/avatar.svelte';
+ import AvatarImage from '@/components/ui/avatar/avatar-image.svelte';
let menuOpen = $state(false);
const toggleMenu = () => (menuOpen = !menuOpen);
@@ -48,7 +51,11 @@
-
+
+
{#if showCerrarSesion}
{#if $sesionStore !== null}
diff --git a/src/lib/hooks/borrarUsuario.ts b/src/lib/hooks/borrarUsuario.ts
new file mode 100644
index 0000000..1fa61a1
--- /dev/null
+++ b/src/lib/hooks/borrarUsuario.ts
@@ -0,0 +1,21 @@
+import { apiBase } from '@/stores/url';
+import { sesionStore } from '@/stores/usuario';
+import { get } from 'svelte/store';
+
+export async function borrarUsuario(id: string) {
+ try {
+ const req = await fetch(`${get(apiBase)}/api/users/${id}`, {
+ method: 'DELETE',
+ headers: {
+ Authorization: `Bearer ${get(sesionStore)?.accessToken}`
+ }
+ });
+
+ if (req.ok) {
+ return true;
+ }
+ return false;
+ } catch {
+ return false;
+ }
+}
diff --git a/src/lib/hooks/busquedaHashtags.ts b/src/lib/hooks/busquedaHashtags.ts
new file mode 100644
index 0000000..e45413e
--- /dev/null
+++ b/src/lib/hooks/busquedaHashtags.ts
@@ -0,0 +1,18 @@
+import { apiBase } from '@/stores/url';
+import { get } from 'svelte/store';
+
+export async function busquedaHashtags(htag: string) {
+ if (!htag) return null;
+ try {
+ const req = await fetch(`${get(apiBase)}/api/htag?q=${htag}`, {
+ method: 'GET'
+ });
+ if (req.ok) {
+ let data = await req.json();
+ return data;
+ }
+ return [];
+ } catch {
+ return null;
+ }
+}
diff --git a/src/lib/hooks/obtenerCantidadDeUsosdeHtag.ts b/src/lib/hooks/obtenerCantidadDeUsosdeHtag.ts
index 1289737..9f7e2fb 100644
--- a/src/lib/hooks/obtenerCantidadDeUsosdeHtag.ts
+++ b/src/lib/hooks/obtenerCantidadDeUsosdeHtag.ts
@@ -2,10 +2,11 @@ import { apiBase } from '@/stores/url';
import { sesionStore } from '@/stores/usuario';
import { get } from 'svelte/store';
-export async function obtenerCantidadDeUsosdeHtag(htag: string) {
+export async function obtenerCantidadDeUsosdeHtag(htag: string, fetch2?: Function) {
if (!htag) return null;
+ const fetchFn = fetch2 || fetch;
try {
- const req = await fetch(`${get(apiBase)}/api/posts/hashtag/${htag}`, {
+ const req = await fetchFn(`${get(apiBase)}/api/posts/hashtag/${htag}`, {
method: 'GET',
headers: {
Authorization: `Bearer ${get(sesionStore)?.accessToken}`
diff --git a/src/routes/(privado)/admin/+page.svelte b/src/routes/(privado)/admin/+page.svelte
index 956243c..c7df333 100644
--- a/src/routes/(privado)/admin/+page.svelte
+++ b/src/routes/(privado)/admin/+page.svelte
@@ -23,9 +23,11 @@
{#if page.data.usuarios.length === 0}
- No hay posts que mostar
+ No hay usuarios que mostar
{:else}
-
+ {#key page.data.usuarios}
+
+ {/key}
{/if}
diff --git a/src/routes/(privado)/admin/+page.ts b/src/routes/(privado)/admin/+page.ts
index 84c37d1..4808e7b 100644
--- a/src/routes/(privado)/admin/+page.ts
+++ b/src/routes/(privado)/admin/+page.ts
@@ -6,7 +6,8 @@ import type { UserResponseDto } from '../../../types.js';
export const ssr = false;
-export async function load({}) {
+export async function load({ depends, fetch }) {
+ depends('admin:load');
const response = await fetch(get(apiBase) + '/api/admin/users', {
method: 'GET',
headers: {
diff --git a/src/routes/htag/[htag]/+page.svelte b/src/routes/htag/[htag]/+page.svelte
index bc7cacc..e58b96a 100644
--- a/src/routes/htag/[htag]/+page.svelte
+++ b/src/routes/htag/[htag]/+page.svelte
@@ -5,11 +5,12 @@
import Card from '@/components/ui/card/card.svelte';
import type { Post } from '../../../types.js';
import ModalEditar from '../../[perfil]/modalEditar.svelte';
- import { fade } from 'svelte/transition';
- import { updatePostStore } from '@/stores/posts';
+ import { fade, slide } from 'svelte/transition';
+ import { posts, setPosts, updatePostStore } from '@/stores/posts';
import { updatePost } from '@/hooks/updatePost';
import Separator from '@/components/ui/separator/separator.svelte';
import { page } from '$app/state';
+ import { onMount } from 'svelte';
interface props {
data: {
@@ -23,11 +24,13 @@
let { data }: props = $props();
- let posts = $state(data.posts.response);
+ //seteo los posts en el store
+ $effect(() => setPosts(data.posts.response));
+
let postAModificar: Post | null = $state(null);
let postsfiltro = $derived(
- posts.filter((x) => {
+ $posts?.filter((x) => {
const regex = new RegExp(`#${data.htag}\\b`, 'gm');
return regex.test(x.content);
})
@@ -68,8 +71,10 @@
- {#each postsfiltro as post}
-
+ {#each postsfiltro as post (post.id)}
+
{/each}
diff --git a/src/routes/htag/[htag]/+page.ts b/src/routes/htag/[htag]/+page.ts
index a4c51d3..78cce78 100644
--- a/src/routes/htag/[htag]/+page.ts
+++ b/src/routes/htag/[htag]/+page.ts
@@ -1,10 +1,9 @@
import { obtenerCantidadDeUsosdeHtag } from '@/hooks/obtenerCantidadDeUsosdeHtag.js';
-import { error } from '@sveltejs/kit';
-export async function load({ params }) {
+export async function load({ params, fetch }) {
let { htag } = params;
- const posts = await obtenerCantidadDeUsosdeHtag(htag);
+ const posts = await obtenerCantidadDeUsosdeHtag(htag, fetch);
// if (cantidad == null || posts.lenght == 0) return error(404, 'no existe el #(hashtag)');
return { htag, posts };
}
diff --git a/src/types.d.ts b/src/types.d.ts
index e38ce95..f0d647e 100644
--- a/src/types.d.ts
+++ b/src/types.d.ts
@@ -90,6 +90,7 @@ export interface UserResponseDto {
followingCount: number;
createdAt: string;
postsCount: number;
+ isAdmin?: bool;
}
export interface UsersResponseDto {
response: {