-
+
+
diff --git a/src/lib/hooks/UsuariosAdmin.ts b/src/lib/hooks/UsuariosAdmin.ts
new file mode 100644
index 0000000..94e5ed3
--- /dev/null
+++ b/src/lib/hooks/UsuariosAdmin.ts
@@ -0,0 +1,25 @@
+import { apiBase } from '@/stores/url';
+import { sesionStore } from '@/stores/usuario';
+import { redirect } from '@sveltejs/kit';
+import { get } from 'svelte/store';
+import type { UserResponseDto } from '../../types';
+
+export async function fetchUsuariosAdmin(page: number, limit: number) {
+ let response = await fetch(get(apiBase) + `/api/admin/users?page=${page}&pageSize=${limit}`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ Authorization: `Bearer ${get(sesionStore)?.accessToken}`
+ }
+ });
+
+ if (response.status === 401) {
+ throw redirect(302, '/');
+ }
+
+ if (!response.ok) {
+ return { error: true };
+ }
+ const ret: { usuarios: UserResponseDto[]; hayMas: boolean } = await response.json();
+ return { ret, error: false };
+}
diff --git a/src/lib/hooks/busquedaAdminUsuarios.ts b/src/lib/hooks/busquedaAdminUsuarios.ts
index ce1b2d1..0234190 100644
--- a/src/lib/hooks/busquedaAdminUsuarios.ts
+++ b/src/lib/hooks/busquedaAdminUsuarios.ts
@@ -2,15 +2,19 @@ import { apiBase } from '@/stores/url';
import { sesionStore } from '@/stores/usuario';
import { get } from 'svelte/store';
-export async function busquedaAdminUsuarios(q: string) {
+export async function busquedaAdminUsuarios(q: string, limit = 5, page = 1) {
try {
- const response = await fetch(get(apiBase) + '/api/admin/users?q=' + q, {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- Authorization: `Bearer ${get(sesionStore)?.accessToken}`
+ const response = await fetch(
+ get(apiBase) +
+ `/api/admin/users${q ? `?q=${q}` : ''}${q ? '&' : '?'}page=${page}&pageSize=${limit}`,
+ {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ Authorization: `Bearer ${get(sesionStore)?.accessToken}`
+ }
}
- });
+ );
if (response.ok) {
return await response.json();
}
diff --git a/src/lib/hooks/loadMorePosts.ts b/src/lib/hooks/loadMorePosts.ts
index 8a89428..e7bd55f 100644
--- a/src/lib/hooks/loadMorePosts.ts
+++ b/src/lib/hooks/loadMorePosts.ts
@@ -1,5 +1,5 @@
import { get } from 'svelte/store';
-import { page, loadingPosts, PAGE_SIZE } from '@/stores/posts';
+import { page, loadingPosts, PAGE_SIZE, resetPosts } from '@/stores/posts';
import { appendPosts } from '@/stores/posts';
import { getPosts } from './getPosts';
diff --git a/src/lib/hooks/obtenerCantidadDeUsosdeHtag.ts b/src/lib/hooks/obtenerCantidadDeUsosdeHtag.ts
index 9f7e2fb..97384c7 100644
--- a/src/lib/hooks/obtenerCantidadDeUsosdeHtag.ts
+++ b/src/lib/hooks/obtenerCantidadDeUsosdeHtag.ts
@@ -2,14 +2,18 @@ import { apiBase } from '@/stores/url';
import { sesionStore } from '@/stores/usuario';
import { get } from 'svelte/store';
-export async function obtenerCantidadDeUsosdeHtag(htag: string, fetch2?: Function) {
+export async function obtenerCantidadDeUsosdeHtag(
+ htag: string,
+ fetch2?: Function,
+ page: number = 1,
+ limit: number = 20,) {
if (!htag) return null;
const fetchFn = fetch2 || fetch;
try {
- const req = await fetchFn(`${get(apiBase)}/api/posts/hashtag/${htag}`, {
+ const req = await fetchFn(`${get(apiBase)}/api/posts/hashtag/${htag}?page=${page}&pageSize=${limit}`, {
method: 'GET',
headers: {
- Authorization: `Bearer ${get(sesionStore)?.accessToken}`
+ Authorization: `Bearer ${get(sesionStore)?.accessToken || ''}`
}
});
if (req.ok) {
diff --git a/src/lib/hooks/obtenerPostPorId.ts b/src/lib/hooks/obtenerPostPorId.ts
index 8271b65..20ddb6a 100644
--- a/src/lib/hooks/obtenerPostPorId.ts
+++ b/src/lib/hooks/obtenerPostPorId.ts
@@ -16,7 +16,7 @@ export async function obtenerPostPorId(
const req = await fetchFn(`${get(apiBase)}/api/posts/${idpost}`, {
method: 'GET',
headers: {
- Authorization: `Bearer ${get(sesionStore)?.accessToken}`
+ Authorization: `Bearer ${get(sesionStore)?.accessToken || ''}`
}
});
let data = await req.json();
diff --git a/src/lib/hooks/obtenerRespuestasPorId.ts b/src/lib/hooks/obtenerRespuestasPorId.ts
index bf3264f..3877a52 100644
--- a/src/lib/hooks/obtenerRespuestasPorId.ts
+++ b/src/lib/hooks/obtenerRespuestasPorId.ts
@@ -15,7 +15,7 @@ export async function obtenerRespuestasPorId(
const req = await fetchFn(`${get(apiBase)}/api/posts/${id}/replies?page=${page}`, {
method: 'GET',
headers: {
- Authorization: `Bearer ${get(sesionStore)?.accessToken}`
+ Authorization: `Bearer ${get(sesionStore)?.accessToken || ''}`
}
});
if (req.ok) {
diff --git a/src/lib/stores/firebase.ts b/src/lib/stores/firebase.ts
index d032b93..df9204b 100644
--- a/src/lib/stores/firebase.ts
+++ b/src/lib/stores/firebase.ts
@@ -34,4 +34,4 @@ export function getFirebaseAuth(): Auth {
auth = getAuth(getFirebaseApp());
}
return auth;
-}
+}
\ No newline at end of file
diff --git a/src/lib/stores/posts.ts b/src/lib/stores/posts.ts
index cb19b9b..545f67b 100644
--- a/src/lib/stores/posts.ts
+++ b/src/lib/stores/posts.ts
@@ -1,7 +1,7 @@
import { writable } from 'svelte/store';
import type { Post } from '../../types';
-export const posts = writable
([]);
+export const posts = writable(null);
export const loadingPosts = writable(false);
export const page = writable(1);
diff --git a/src/lib/stores/usuario.ts b/src/lib/stores/usuario.ts
index 0436f16..c875be6 100644
--- a/src/lib/stores/usuario.ts
+++ b/src/lib/stores/usuario.ts
@@ -61,7 +61,7 @@ if (browser) {
const user = auth.currentUser;
if (user) {
- const token = await user.getIdToken(true);
+ const token = await user.getIdToken();
currentSesion.update((s) => {
if (s) {
return { ...s, accessToken: token };
@@ -72,6 +72,7 @@ if (browser) {
}
} catch (error) {
console.error('Error obteniendo token de Firebase:', error);
+ sesionStore.reset();
return false;
}
}
@@ -81,8 +82,14 @@ if (browser) {
const expirationTime = decoded.exp * 1000;
const currentTime = Date.now();
- const timeUntilExpiration = expirationTime - currentTime;
+ // Si el token ya expiró, hacer reset
+ if (expirationTime < currentTime) {
+ sesionStore.reset();
+ return false;
+ }
+
+ const timeUntilExpiration = expirationTime - currentTime;
return timeUntilExpiration <= 60 * 1000; // 1 minuto
};
@@ -117,7 +124,7 @@ if (browser) {
}
} catch (error) {
console.error('Error refrescando token:', error);
- currentSesion.set(null);
+ sesionStore.reset();
}
};
diff --git a/src/routes/(privado)/admin/+page.svelte b/src/routes/(privado)/admin/+page.svelte
index ea7a515..4a69be7 100644
--- a/src/routes/(privado)/admin/+page.svelte
+++ b/src/routes/(privado)/admin/+page.svelte
@@ -10,6 +10,7 @@
interface Prop {
data: {
usuarios?: UserResponseDto[];
+ hayMas: boolean;
error: boolean;
};
}
@@ -31,7 +32,7 @@
{#if data.usuarios?.length === 0}
No hay usuarios que mostar
{:else}
-
+
{/if}
diff --git a/src/routes/(privado)/admin/+page.ts b/src/routes/(privado)/admin/+page.ts
index 4808e7b..17ad0f9 100644
--- a/src/routes/(privado)/admin/+page.ts
+++ b/src/routes/(privado)/admin/+page.ts
@@ -1,28 +1,19 @@
-import { apiBase } from '@/stores/url.js';
-import { sesionStore } from '@/stores/usuario';
-import { redirect } from '@sveltejs/kit';
-import { get } from 'svelte/store';
-import type { UserResponseDto } from '../../../types.js';
+import type { PageLoad } from './$types.js';
+import { fetchUsuariosAdmin } from '@/hooks/UsuariosAdmin.js';
export const ssr = false;
-export async function load({ depends, fetch }) {
+export const load: PageLoad = async ({ depends }) => {
depends('admin:load');
- const response = await fetch(get(apiBase) + '/api/admin/users', {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- Authorization: `Bearer ${get(sesionStore)?.accessToken}`
- }
- });
- if (response.status === 401) {
- throw redirect(302, '/');
- }
- if (!response.ok) {
+ const result = await fetchUsuariosAdmin(1, 5);
+
+ if (result.error) {
return { error: true };
}
- const usuarios: UserResponseDto[] = await response.json();
-
- return { usuarios, error: false };
-}
+ return {
+ usuarios: result.ret?.usuarios,
+ hayMas: result.ret?.hayMas,
+ error: false
+ };
+};
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 6492f55..e303bf5 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -20,6 +20,8 @@
let mensajeError = $state('');
let sentinel: HTMLDivElement;
+ // $inspect($posts);
+
resetPosts();
$effect(() => {
loadMorePosts();
@@ -78,19 +80,13 @@
{/if}
- {#if $posts.length === 0 && $loadingPosts}
+ {#if $posts === null || $posts.length === 0}
Cargando
- {:else if $posts.length === 0}
-
-
- No hay Posts que mostrar
-
-
{:else}
{#each $posts as post (post.id)}
@@ -101,7 +97,7 @@
- {#if $loadingPosts && $posts.length > 0}
+ {#if $loadingPosts && $posts!.length > 0}
diff --git a/src/routes/[perfil]/+page.svelte b/src/routes/[perfil]/+page.svelte
index 50dd647..a79e792 100644
--- a/src/routes/[perfil]/+page.svelte
+++ b/src/routes/[perfil]/+page.svelte
@@ -54,7 +54,7 @@
`${$apiBase}/api/posts/user/${params.perfil}?page=${pageNumber}&pageSize=20`,
{
headers: {
- Authorization: `Bearer ${$sesionStore?.accessToken}`
+ Authorization: `Bearer ${$sesionStore?.accessToken || ''}`
}
}
);
diff --git a/src/routes/htag/[htag]/+page.svelte b/src/routes/htag/[htag]/+page.svelte
index 90b028b..b31e641 100644
--- a/src/routes/htag/[htag]/+page.svelte
+++ b/src/routes/htag/[htag]/+page.svelte
@@ -10,6 +10,26 @@
import { updatePost } from '@/hooks/updatePost';
import Separator from '@/components/ui/separator/separator.svelte';
import { page } from '$app/state';
+ import { obtenerCantidadDeUsosdeHtag } from '@/hooks/obtenerCantidadDeUsosdeHtag';
+
+ let currentPage = $state(1);
+ let loading = $state(false);
+
+ async function cargarPagina(pageNumber: number) {
+ loading = true;
+ const res = await obtenerCantidadDeUsosdeHtag(
+ data.htag,
+ fetch,
+ pageNumber,
+ 20
+ );
+
+ if (res) {
+ setPosts(res.response);
+ currentPage = pageNumber;
+ }
+ loading = false;
+ }
interface props {
data: {
@@ -78,6 +98,27 @@