Skip to content
Snippets Groups Projects
Commit 05b73ded authored by Amanda Pollyanna da Silva Rodrigues's avatar Amanda Pollyanna da Silva Rodrigues
Browse files

Merge branch 'issue-6/layout' into 'develop'

Issue #6: FIX comments user

See merge request !12
parents 41bb3bef 02609669
Branches
No related tags found
1 merge request!12Issue #6: FIX comments user
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
fetch('http://localhost:3000/getAllImplant', { fetch('http://localhost:3000/getAllImplant', {
headers: { 'Authorization': `Bearer ${token}` } headers: { 'Authorization': `Bearer ${token}` }
}), }),
fetch(`http://localhost:3000/getUser/${currentUserId}`, { // Nova requisição para os dados do usuário fetch(`http://localhost:3000/getUser/${currentUserId}`, {
headers: { 'Authorization': `Bearer ${token}` } headers: { 'Authorization': `Bearer ${token}` }
}) })
]); ]);
...@@ -51,9 +51,10 @@ ...@@ -51,9 +51,10 @@
if (!implantsRes.ok) throw new Error('Erro ao carregar implantes'); if (!implantsRes.ok) throw new Error('Erro ao carregar implantes');
if (!userRes.ok) throw new Error('Erro ao carregar dados do usuário'); if (!userRes.ok) throw new Error('Erro ao carregar dados do usuário');
// Armazena dados resquitados
const transactions = await txRes.json() as Purchase[]; const transactions = await txRes.json() as Purchase[];
const implants = await implantsRes.json() as Implant[]; const implants = await implantsRes.json() as Implant[];
currentUser = await userRes.json(); // Armazena os dados do usuário currentUser = await userRes.json();
// Filtra só as transações do usuário logado // Filtra só as transações do usuário logado
const userTx = transactions.filter(t => t.user_id === currentUserId); const userTx = transactions.filter(t => t.user_id === currentUserId);
...@@ -209,107 +210,6 @@ ...@@ -209,107 +210,6 @@
} }
</style> </style>
<!--
<h1>Meus implantes</h1>
{#if loading}
<p>Carregando...</p>
{:else if error}
<p class="error">{error}</p>
{:else if allPurchases.length === 0}
<p>Você ainda não possui implantes comprados.</p>
{:else}
<div class="filter-container">
<button
class="filter-btn"
class:active={activeCategory === 'all'}
on:click={() => activeCategory = 'all'}>
Todos
</button>
{#each categories as cat}
<button
class="filter-btn"
class:active={activeCategory === cat}
on:click={() => activeCategory = cat}>
{cat}
</button>
{/each}
<a href="/store"><strong>COMPRAR</strong></a>
</div>
<div class="cards-container">
{#each getFiltered() as p (p.implant_id)}
<Card
title={p.implant.name}
bodyPart={p.implant.bodyPart}
price={Number(p.implant.price)}
cyberCost={Number(p.implant.cyberCost)}
showButton={false}
id={p.implant_id}
boughtIds={[]}
/>
{/each}
</div>
{/if}-->
<!--
<div class="window">
<div class="navegation">
<div class="nav-header">
<h2>MENU</h2>
</div>
<div class="nav-section">
<a href="/store" class="nav-button"><strong>Store</strong></a>
</div>
<div class="nav-section">
<h3>Filtrar implantes</h3>
<button
class="filter-btn"
class:active={activeCategory === 'all'}
on:click={() => activeCategory = 'all'}>
Todos
</button>
{#each categories as cat}
<button
class="filter-btn"
class:active={activeCategory === cat}
on:click={() => activeCategory = cat}>
{cat}
</button>
{/each}
</div>
</div>
<div class="main-content">
<h1>Meus implantes</h1>
{#if loading}
<p>Carregando...</p>
{:else if error}
<p class="error">{error}</p>
{:else if allPurchases.length === 0}
<p>Você ainda não possui implantes comprados.</p>
{:else}
<div class="cards-container">
{#each getFiltered() as p (p.implant_id)}
<Card
title={p.implant.name}
bodyPart={p.implant.bodyPart}
price={Number(p.implant.price)}
cyberCost={Number(p.implant.cyberCost)}
showButton={false}
id={p.implant_id}
boughtIds={[]}
/>
{/each}
</div>
{/if}
</div>
</div>-->
<div class="window"> <div class="window">
<div class="navegation"> <div class="navegation">
...@@ -356,6 +256,7 @@ ...@@ -356,6 +256,7 @@
</div> </div>
</div> </div>
<!-- Cards dos Implantes -->
<div class="main-content"> <div class="main-content">
{#if loading} {#if loading}
<p>Carregando...</p> <p>Carregando...</p>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment