Skip to content

Commit

Permalink
Merge branch 'develop' into 216-userdashboard
Browse files Browse the repository at this point in the history
  • Loading branch information
JohanMejia77 authored Jan 12, 2024
2 parents 3b1a80d + 945ff5f commit 1c97ba5
Show file tree
Hide file tree
Showing 34 changed files with 1,727 additions and 988 deletions.
196 changes: 49 additions & 147 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"eslint": "8.54.0",
"eslint-config-next": "14.0.3",
"firebase": "^10.6.0",
"framer-motion-ticker": "^1.0.19",
"next": "14.0.3",
"next-themes": "0.2.1",
"postcss": "8.4.31",
Expand Down
Binary file added public/images/loading/loading.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 7 additions & 3 deletions src/app/container_page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Categories from '~/components/categories/categories';
import { usePathname } from 'next/navigation';
import CookieConsent from '~/components/cookieConsent/CookieConsent';
import ViewProducts from '~/components/viewProducts';
import LoadingStore from '~/components/loading/loadingStore';

type ContainerPageProps = {
children: React.ReactNode;
Expand All @@ -20,8 +21,11 @@ export function ContainerPage({
children,
}: ContainerPageProps) {
const pathname = usePathname();
const isLoading = false; // Reemplazar esto con el estado de loading real

return (
<>
<LoadingStore loading={isLoading} error={undefined} />
{/* nav === true? */}
{typeof nav === 'boolean' && nav ? <NavBar /> : nav}
{header && header}
Expand All @@ -35,6 +39,6 @@ export function ContainerPage({
{footer && <Footer />}
{/* Renderizar en todas las páginas hasta que el usuario lo cierre. La condición debe estar almacenada en localStorage */}
<CookieConsent />
</>
);
}
</>
);
}
4 changes: 2 additions & 2 deletions src/app/dashboardAdmin/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import CardCategories from "~/components/componetsDashboard/Cards/CardCategories
import CardBrands from "~/components/componetsDashboard/Cards/CardBrands";


export default function landing() {
export default function Landing() {
return (
<>
<NavBar />
Expand Down Expand Up @@ -46,4 +46,4 @@ export default function landing() {
</main>
</>
);
}
};
21 changes: 21 additions & 0 deletions src/assets/icons/Eye.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// icon:207-eye | Icomoon https://icomoon.io/ | Keyamoon
import * as React from "react";

function Eye(props: React.SVGProps<SVGSVGElement>) {
return (
<svg
viewBox="0 0 16 16"
fill="currentColor"
height="1em"
width="1em"
{...props}
>
<path
fill="currentColor"
d="M8 3C4.511 3 1.486 5.032 0 8c1.486 2.968 4.511 5 8 5s6.514-2.032 8-5c-1.486-2.968-4.511-5-8-5zm3.945 2.652c.94.6 1.737 1.403 2.335 2.348a7.594 7.594 0 01-2.335 2.348 7.326 7.326 0 01-7.889 0A7.615 7.615 0 011.721 8a7.594 7.594 0 012.52-2.462 4 4 0 107.518 0c.062.037.124.075.185.114zM8 6.5a1.5 1.5 0 11-3.001-.001A1.5 1.5 0 018 6.5z"
/>
</svg>
);
}

export default Eye;
27 changes: 27 additions & 0 deletions src/assets/icons/EyeBlocked.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// icon:210-eye-blocked | Icomoon https://icomoon.io/ | Keyamoon
import * as React from "react";

function EyeBlocked(props: React.SVGProps<SVGSVGElement>) {
return (
<svg
viewBox="0 0 16 16"
fill="currentColor"
height="1em"
width="1em"
{...props}
>
<path
fill="currentColor"
d="M14.78.22a.75.75 0 00-1.061 0L10.56 3.379a8.815 8.815 0 00-2.561-.378c-3.489 0-6.514 2.032-8 5a9.176 9.176 0 002.703 3.236L.218 13.721a.75.75 0 001.06 1.061l13.5-13.5a.75.75 0 000-1.061zM6.5 5a1.5 1.5 0 011.421 1.019L6.019 7.921A1.5 1.5 0 016.5 5zM1.721 8a7.594 7.594 0 012.52-2.462A3.981 3.981 0 004 6.907c0 .858.27 1.652.73 2.303l-.952.952A7.625 7.625 0 011.721 8zM12 6.906c0-.424-.066-.833-.189-1.217l-5.028 5.028A4 4 0 0012 6.906z"
/>
<path
fill="currentColor"
d="M12.969 4.531l-1.084 1.084.059.037c.94.6 1.737 1.403 2.335 2.348a7.594 7.594 0 01-2.335 2.348 7.326 7.326 0 01-5.725.933l-1.201 1.201A8.808 8.808 0 008 13c3.489 0 6.514-2.032 8-5a9.142 9.142 0 00-3.031-3.469z"
/>
</svg>
);
}

export default EyeBlocked;


2 changes: 1 addition & 1 deletion src/assets/icons/icon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const Icon = ({ icon }: DynamicIconProps): JSX.Element => {
}, [icon]);

if (!LoadedComponent) {
return <div>Cargando...</div>;
return <div></div>; // borré el Cargando... que molestaba en el login por ahora
}

return LoadedComponent;
Expand Down
2 changes: 1 addition & 1 deletion src/components/cards/ProductCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export function ProductCard({
}

return (
<Link className="px-10 py-6 shadow-md hover:shadow-xl rounded-md overflow-hidden bg-white w-[270px] min-h-[415px] relative space-y-3 dark:text-text-lm dark:bg-secondary-dm"
<Link className="px-10 py-6 shadow-md hover:shadow-xl rounded-md overflow-hidden bg-white w-[270px] min-h-[415px] relative space-y-3 dark:text-text-lm dark:bg-secondary-dm mt-2"
href={`/products/${id}`}>
<Image
src={imageSrc}
Expand Down
2 changes: 1 addition & 1 deletion src/components/cards/reviewsCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const Reviews: React.FC<ReviewsProps> = ({
};

return ( // cambio de 320 a 1920 max
<div className="flex flex-col max-w-[1920px] bg-white m-5 p-4 lg:shadow-md rounded-lg h-72 justify-around dark:bg-primary-dm">
<div className="flex flex-col max-w-[1920px] bg-white m-5 p-4 lg:shadow-md rounded-lg h-72 justify-around dark:bg-primary-dm mt-10">
<div>
<Icon icon="quotationMarks" />
</div>
Expand Down
Loading

0 comments on commit 1c97ba5

Please sign in to comment.