Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
61a2ebd
fix in dimensions, and size responsive
clarissaRun May 10, 2025
e425749
fixex scrollbar
clarissaRun May 10, 2025
1eedfad
prop carousel type unnecesary
clarissaRun May 10, 2025
bdb436d
remove prop carousel
clarissaRun May 10, 2025
587fc79
Listen order updated event to request order data
andres15alvarez May 14, 2025
aa90913
feature/notify-order-update-only-by-socket
andres15alvarez May 14, 2025
c7282ab
Merge branch 'dev' into fix/ECOM/fix-product-card
clarissaRun May 16, 2025
5fa76cc
added discount and badge categories
clarissaRun May 16, 2025
5bed843
added list of notifications and its icons
clarissaRun May 17, 2025
6370e70
fix in type expected in card
clarissaRun May 17, 2025
4e178aa
expected type fix
clarissaRun May 17, 2025
8587964
Upgrade sdk version and fix custom product type
andres15alvarez May 17, 2025
ceec4d3
Fix for only one promo instead of promo array
andres15alvarez May 17, 2025
76b99ad
Install microsoft fetch event and add event source for notifications
andres15alvarez May 17, 2025
0b5cae1
typeFeatures/ecom/notifications
andres15alvarez May 17, 2025
ff8481c
updatePasswordSchema: add newPassword rules
gus211 May 18, 2025
3eb8996
recoverPasswordSchema: add newPassword rules
gus211 May 18, 2025
36ef03a
checkoutSchema: phoneNumber no longer requires '+'
gus211 May 18, 2025
0d92e98
registerSchema: phoneNumber no longer requires '+'
gus211 May 18, 2025
5a30acc
fix in style badge color, mobile and catching event for counter
clarissaRun May 18, 2025
4c06ad0
fix in show login button, delay while is Loading auth
clarissaRun May 18, 2025
8efa6eb
Merge branch 'main' into fix/ECOM/notifications
clarissaRun May 18, 2025
9d94ad9
fix in navigation state log out in navbar
clarissaRun May 18, 2025
52b3914
changes requested in loading state and time in notification
clarissaRun May 18, 2025
33ee563
restore lines
clarissaRun May 18, 2025
6dc8206
Fix: Validate event type
andres15alvarez May 18, 2025
a5c8bdc
hotfix/validate-event-type
andres15alvarez May 18, 2025
b234d41
loginSchema: password length between 8 and 255
gus211 May 18, 2025
1ccca74
updatePasswordSchema: fix password inputs
gus211 May 18, 2025
aac8146
recoverPasswordSchema: fix password fields
gus211 May 18, 2025
49b299a
Merge branch 'dev' into fix/ECOM/notifications
clarissaRun May 18, 2025
941e006
registerSchema: rename fields, fix password validation
gus211 May 18, 2025
cca01a0
register/edit user: update schema usage
gus211 May 18, 2025
a3543ed
Merge remote-tracking branch 'origin/dev' into refactor/standardize-v…
gus211 May 18, 2025
501f940
counter validation, stream timeout
clarissaRun May 18, 2025
78ceab9
Standardize validation schemas
andres15alvarez May 18, 2025
4aa814a
Fix/ecom/notifications
andres15alvarez May 18, 2025
f5be884
general fixes in badge, order table, cardbutton
clarissaRun May 21, 2025
db43e42
fix in scroll
clarissaRun May 21, 2025
50bae63
discount amount fix
clarissaRun May 21, 2025
301ecc3
validation taking the event as a string msg
clarissaRun May 21, 2025
6dab2f6
restore name in variant style badge
clarissaRun May 21, 2025
b7e49af
hook for notifications
clarissaRun May 23, 2025
8a7d869
Hotfix/ecom/order card fix
andres15alvarez May 25, 2025
9b2a13b
Fix context
andres15alvarez May 25, 2025
62251a2
Standarize icons and bubbles in navbar
andres15alvarez May 25, 2025
7126ce8
Set navbar on top of the page
andres15alvarez May 25, 2025
449b0d9
Fix margin from navbar and recommenden products state
andres15alvarez May 25, 2025
4b5b697
Improve search
andres15alvarez May 25, 2025
44b4a7b
Fix loader in product presentation detail
andres15alvarez May 25, 2025
0858a89
Add missing component for order states
andres15alvarez May 25, 2025
21f5931
Update dependencies
andres15alvarez May 25, 2025
ae42df4
Install version 0.4.20 of sdk
andres15alvarez May 26, 2025
3d3619b
Format price to decimals
andres15alvarez May 26, 2025
67e51ae
Standarize currency to USD instead of VES
andres15alvarez May 26, 2025
01e329b
Refactor to use server components
andres15alvarez May 26, 2025
ca34de8
Update tests
andres15alvarez May 26, 2025
190689f
Hotfix/minor fixes
andres15alvarez May 26, 2025
53b51c9
Update sdk version to 0.4.21
andres15alvarez May 29, 2025
ab094e2
Hotfix/order details amounts
andres15alvarez May 29, 2025
b32cc73
Show errors when submit
andres15alvarez May 29, 2025
0a7a99e
Upgrade version to 1.0.0
andres15alvarez May 29, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions __tests__/page.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import Home from '@/app/(shop)/page';
import { describe, it, expect } from 'vitest';

describe('Home Page', () => {
it('displays the main heading', () => {
render(<Home />);
it('displays the main heading', async () => {
render(await Home());
const heading = screen.getByText('Pharmatech');
expect(heading).toBeTruthy(); // Check if the element exists
});
Expand Down
30 changes: 20 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ecommerce",
"version": "0.4.0",
"version": "1.0.0",
"private": true,
"scripts": {
"dev": "next dev",
Expand All @@ -18,12 +18,13 @@
"dependencies": {
"@headlessui/react": "^2.2.0",
"@heroicons/react": "^2.2.0",
"@microsoft/fetch-event-source": "^2.0.1",
"@next/third-parties": "^15.3.0",
"cloudinary": "^2.6.0",
"@pharmatech/sdk": "^0.4.16",
"@pharmatech/sdk": "^0.4.21",
"@radix-ui/react-slider": "^1.2.4",
"@react-google-maps/api": "^2.20.6",
"@types/google.maps": "^3.58.1",
"cloudinary": "^2.6.0",
"jwt-decode": "^4.0.0",
"lucide-react": "^0.477.0",
"next": "^15.3.0",
Expand Down
9 changes: 9 additions & 0 deletions public/icons/approved.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/icons/delivered_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/icons/delivery.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/icons/error.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/icons/in_update.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/icons/pickup_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/icons/updated.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 9 additions & 3 deletions src/app/(shop)/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,28 @@
'use client';

import { ReactNode } from 'react';
import { ReactNode, Suspense } from 'react';
import NavBar from '@/components/Navbar';
import Footer from '@/components/Footer';
import { useAuth } from '@/context/AuthContext';
import Loading from '../loading';

type ShopLayoutProps = {
children: ReactNode;
};

export default function ShopLayout({ children }: ShopLayoutProps) {
const { isLoading } = useAuth();

if (isLoading) return null;

return (
<div>
<div className="relative bg-white">
{/* Nav */}
<div className="relative z-50">
<div className="sticky top-0 z-50 bg-white">
<NavBar />
</div>
{children}
<Suspense fallback={<Loading />}>{children}</Suspense>
</div>
<Footer />
</div>
Expand Down
Loading