Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feedback #1

Open
wants to merge 108 commits into
base: feedback
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
1916a33
Setting up GitHub Classroom Feedback
github-classroom[bot] Sep 25, 2023
74c88ba
feat(project-setup): create develop branch and implement the code layout
Emybel Sep 26, 2023
dc8199d
Merge pull request #2 from 202306-NEA-DZ-FEW/develop
Emybel Sep 26, 2023
53137c4
feat(util folder and constants folder): working on fetching
samiraTbl Sep 27, 2023
ab951ab
feat: navbar feature configueration
HamidAhmidat Sep 27, 2023
abfabde
style: gg
samiraTbl Sep 27, 2023
ad76fc4
Merge pull request #16 from 202306-NEA-DZ-FEW/fetch-data
Emybel Sep 27, 2023
7a4c95c
Merge branch 'develop' into hero-page
merzoukfatima Sep 27, 2023
9ac54da
feat(herogrid component): add images and the Grid
merzoukfatima Sep 28, 2023
6f0c6ef
feat(project): install firebase
Emybel Sep 28, 2023
27f87fe
feat(herogrid): improve grid
merzoukfatima Sep 28, 2023
714a504
fix(cart-function): work on fetch data
Emybel Sep 28, 2023
08127bf
feat(cart): fetch data
Emybel Sep 28, 2023
6f1118a
feat(filter component): add button and dropdown
merzoukfatima Sep 29, 2023
3c7dccf
refactor(cart-function): add signInAnonymously function
Emybel Sep 29, 2023
b091606
feat(footer): initialise footer
Emybel Sep 29, 2023
5111999
feat(footer): create and style the footer
Emybel Sep 29, 2023
e1ba421
refactor(project-structure): resstructure the project
Emybel Sep 29, 2023
e273d9f
Merge branch 'develop' into hero-page
merzoukfatima Sep 29, 2023
18a2b8a
feat: adding a navbar and a logo components
HamidAhmidat Sep 29, 2023
f45dbaa
feat(herogrid): add link to products page and change style
merzoukfatima Sep 29, 2023
fab3a3f
refactor(footer-feature): add the Layout file
Emybel Sep 29, 2023
652dd55
Merge branch 'develop' into filter
merzoukfatima Sep 29, 2023
ad14c7e
Merge pull request #18 from 202306-NEA-DZ-FEW/footer
Emybel Sep 29, 2023
6567a7f
Merge branch 'develop' into navbar
Emybel Sep 29, 2023
d010f84
Merge pull request #19 from 202306-NEA-DZ-FEW/navbar
Emybel Sep 29, 2023
3706461
Merge pull request #20 from 202306-NEA-DZ-FEW/hero-page
Emybel Sep 29, 2023
baa1615
feat: add a dropdown hover effect to navbar
HamidAhmidat Sep 29, 2023
b3785eb
Merge branch 'navbar' of github.com:202306-NEA-DZ-FEW/e-commerce-proj…
HamidAhmidat Sep 29, 2023
3b4c2f2
feat: style the navbar
HamidAhmidat Sep 29, 2023
d059bc7
Merge branch 'navbar' of github.com:202306-NEA-DZ-FEW/e-commerce-proj…
Emybel Sep 29, 2023
25a4988
feat(product-card-component): create a product card component and fet…
Emybel Sep 29, 2023
7bad741
feat(filter component): improve filter component
merzoukfatima Sep 30, 2023
4d9720e
refactor(project): remove Layout file
Emybel Sep 30, 2023
4c58f1d
fix(layout file bug): delete Layout file
Emybel Sep 30, 2023
ce183e6
fix(layout file): delete layout file
Emybel Sep 30, 2023
368f83a
fix(index): resolve merge conflicts
Emybel Sep 30, 2023
05acd98
Merge pull request #22 from 202306-NEA-DZ-FEW/feature-card-product
Emybel Sep 30, 2023
4884178
refactor(project): adding manually some missing code
Emybel Sep 30, 2023
fa00966
Merge branch 'develop' of github.com:202306-NEA-DZ-FEW/e-commerce-pro…
Emybel Sep 30, 2023
e843abd
Merge pull request #23 from 202306-NEA-DZ-FEW/filter
Emybel Sep 30, 2023
6c9fbb6
fix(footer componenent): fix errors
merzoukfatima Sep 30, 2023
5d2afb4
Merge branch 'develop' of github.com:202306-NEA-DZ-FEW/e-commerce-pro…
merzoukfatima Sep 30, 2023
7f6aec6
feat(product-card-list): create Product Card List and fill it with Da…
Emybel Sep 30, 2023
2e7119b
fix(productcard component): add missing keyword
merzoukfatima Sep 30, 2023
dca0793
feat(product page): add product page
merzoukfatima Sep 30, 2023
e68088b
fix(product page): project page debugging
Emybel Sep 30, 2023
9c2070c
feat(context): add context
merzoukfatima Sep 30, 2023
0aa093c
feat(product card list component): create card list in the home page …
Emybel Sep 30, 2023
d5fc79b
refactor(foter feature): justify the footer styling
Emybel Sep 30, 2023
7e13f1b
Merge pull request #27 from 202306-NEA-DZ-FEW/product-page
merzoukfatima Sep 30, 2023
b12b3fa
Merge pull request #28 from 202306-NEA-DZ-FEW/context
merzoukfatima Sep 30, 2023
e5bf463
Merge branch 'develop' of github.com:202306-NEA-DZ-FEW/e-commerce-pro…
Emybel Sep 30, 2023
3404b1c
fix(product page): resolve merging conflicts
Emybel Sep 30, 2023
5ea3ee6
Merge pull request #29 from 202306-NEA-DZ-FEW/cardlist
Emybel Sep 30, 2023
b99a79c
refactor(hero grid): adjust herogrid and index
merzoukfatima Sep 30, 2023
0558e48
Merge branch 'develop' into All-features
merzoukfatima Sep 30, 2023
8f370f1
feat(componenets): fix components all over the pages
merzoukfatima Oct 1, 2023
19b0517
fix(herogrid): remove { from link
merzoukfatima Oct 1, 2023
6b12f1e
feat(firebase functions): add product function
Emybel Oct 1, 2023
7f75a4c
fix(filter componenet and products page): fix filter component
merzoukfatima Oct 1, 2023
a9ae4d3
feat(cart component): add cart component and page
merzoukfatima Oct 1, 2023
aa18d14
feat(herogrid): adding images
samiraTbl Oct 1, 2023
48ac9e2
fix(cart component): fix cart component
merzoukfatima Oct 1, 2023
bed1ab6
Merge pull request #30 from 202306-NEA-DZ-FEW/All-features
merzoukfatima Oct 1, 2023
9d127bd
feat(home page): justify style in home pag
Emybel Oct 1, 2023
ea7bc0b
Merge branch 'All-features' of github.com:202306-NEA-DZ-FEW/e-commerc…
Emybel Oct 1, 2023
f265de6
feat(cart component and page): add delete and get data from firebase
merzoukfatima Oct 1, 2023
955ccd7
Merge pull request #31 from 202306-NEA-DZ-FEW/styling
merzoukfatima Oct 2, 2023
3a94829
feat(cart component): add delete item and delete All
merzoukfatima Oct 2, 2023
48c65d4
Delete public/images/pngwing.com (13).png:Zone.Identifier
merzoukfatima Oct 2, 2023
e768146
Delete public/images/pngwing.com (16).png:Zone.Identifier
merzoukfatima Oct 2, 2023
29c3484
Delete public/images/pngwing.com (6).png:Zone.Identifier
merzoukfatima Oct 2, 2023
162941c
Delete public/images/pngwing.com (5).png:Zone.Identifier
merzoukfatima Oct 2, 2023
f5449c4
Delete public/images/pngwing.com (19).png:Zone.Identifier
merzoukfatima Oct 2, 2023
9b7d38f
Delete public/images/pngwing.com (23).png:Zone.Identifier
merzoukfatima Oct 2, 2023
1ef465e
Delete public/images/pngwing.com (24).png:Zone.Identifier
merzoukfatima Oct 2, 2023
b56d068
Delete public/images/pngwing.com (25).png:Zone.Identifier
merzoukfatima Oct 2, 2023
6431a35
Delete public/images/pngwing.com (4).png:Zone.Identifier
merzoukfatima Oct 2, 2023
33a702a
Merge pull request #32 from 202306-NEA-DZ-FEW/styling
merzoukfatima Oct 2, 2023
164283f
Merge branch 'All-features' of github.com:202306-NEA-DZ-FEW/e-commerc…
merzoukfatima Oct 2, 2023
e4a0fac
feat(user auth): add anonymos user Auth
merzoukfatima Oct 2, 2023
33acb33
Merge pull request #33 from 202306-NEA-DZ-FEW/All-features
merzoukfatima Oct 2, 2023
d278109
feat(the file name is nav.jsx): i added the seae
samiraTbl Oct 2, 2023
b44654d
Merge branch 'styling' of github.com:202306-NEA-DZ-FEW/e-commerce-pro…
samiraTbl Oct 2, 2023
4123dd9
Merge branch 'All-features' of github.com:202306-NEA-DZ-FEW/e-commerc…
Emybel Oct 2, 2023
cc678b2
fix(search feature): fix search bar bg color
merzoukfatima Oct 2, 2023
f17d6df
Merge branch 'All-features' into styling
merzoukfatima Oct 2, 2023
0b63535
Merge pull request #35 from 202306-NEA-DZ-FEW/styling
merzoukfatima Oct 2, 2023
dee9ca6
Merge pull request #36 from 202306-NEA-DZ-FEW/All-features
merzoukfatima Oct 2, 2023
30843d7
Update index.js
Emybel Oct 2, 2023
e722f86
Update HeroGrid.jsx
Emybel Oct 2, 2023
0bcc985
Update CartComponent.jsx
Emybel Oct 2, 2023
da87bfc
style(home page): add image
Emybel Oct 2, 2023
be37483
feat(project): finalisation
Emybel Oct 2, 2023
977c6e0
Update [productId].jsx
Emybel Oct 2, 2023
8e98d5c
Update [productId].jsx
Emybel Oct 2, 2023
e64e947
refactor(cart component): update checkout function
merzoukfatima Oct 2, 2023
c94ca98
Merge branch 'develop' of github.com:202306-NEA-DZ-FEW/e-commerce-pro…
merzoukfatima Oct 2, 2023
0ed09ae
Merge pull request #38 from 202306-NEA-DZ-FEW/develop
merzoukfatima Oct 2, 2023
6421967
fix(index): add link
merzoukfatima Oct 2, 2023
c010c23
refactor: fix teammate name
merzoukfatima Oct 2, 2023
a7b7519
Merge pull request #39 from 202306-NEA-DZ-FEW/develop
merzoukfatima Oct 2, 2023
cd5764a
feat: change navbar
merzoukfatima Oct 2, 2023
a22ec3c
build: delete "styled-jsx"
merzoukfatima Oct 2, 2023
e1ca418
build: update package.json
merzoukfatima Oct 2, 2023
1e08497
Update Nav.jsx
merzoukfatima Nov 7, 2023
799ed5c
Update Nav.jsx
merzoukfatima Nov 7, 2023
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
12 changes: 11 additions & 1 deletion next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,15 @@
const nextConfig = {
reactStrictMode: true,
}

module.exports = nextConfig

module.exports = {
images: {
remotePatterns: [
{
protocol: "https",
hostname: "**",
},
],
},
}
1,200 changes: 975 additions & 225 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,19 @@
"autoprefixer": "10.4.16",
"eslint": "8.50.0",
"eslint-config-next": "13.5.2",
"firebase": "^10.4.0",
"next": "13.5.2",
"postcss": "8.4.30",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-icons": "^4.11.0",
"tailwindcss": "3.3.3"
},
"devDependencies": {
"@commitlint/cli": "^17.7.1",
"@commitlint/config-conventional": "^17.7.0",
"cz-conventional-changelog": "^3.3.0",
"daisyui": "^3.8.1",
"husky": "^8.0.0",
"lint-staged": "^14.0.1",
"prettier": "^3.0.3"
Expand Down
Binary file added public/images/All-categories.jpg
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/images/category_electronic.png
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/images/category_jewelry.png
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/images/category_men_clothing.png
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/images/category_women_clothes.png
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/images/women-Tshirt.png
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/images/women-bag.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
123 changes: 123 additions & 0 deletions src/components/Hero Grid/HeroGrid.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
import React, { useEffect, useState } from "react"
import { API } from "@/util/API"
import { CATEGORIES } from "@/constants"
import Link from "next/link"
import { useCategory } from "@/context/CategoryContext"
import Image from "next/image"

export default function HeroGrid(categories) {
const { setDefaultCategory, defaultCategory } = useCategory()

const handleCategoryClick = (categoryKey) => {
setDefaultCategory(categories[categoryKey])
}

return (
<div className="min-h-screen p-8 lg:p-16 grid grid-cols-1 grid-rows-5 gap-4 h-full w-full lg:grid-cols-7 lg:grid-rows-3">
<div
className="hero min-h- lg:col-span-7"
style={{ backgroundImage: "url(/images/All-categories.jpg)" }}
>
<div className="hero-overlay bg-opacity-60"></div>
<div className="hero-content text-center text-neutral-content">
<div className="max-w-md">
<h1 className="mb-5 text-5xl font-bold"> Shop at Dz Express</h1>
<p className="mb-5">
Explore Fashion, Electronics, and Jewelry - Your One-Stop
E-commerce Destination!
</p>
<Link href={`/products`}>
<button className="btn btn-primary">Check All here!</button>
</Link>
</div>
</div>
</div>

<div
onClick={() => handleCategoryClick("0")}
className="hero lg:col-span-5 lg:row-start-2 bg-tiffany-blue"
>
<Link href={`/products`}>
{" "}
<div className="hero-content text-left font-bold text-2xl font-mono text-black">
<div className="flex flex-col">
{categories[0]}
<p className="text-l my-3 text-white font-normal">
{" "}
#Laptops #Smatphones and more...
</p>
</div>
<Image
className="object-cover h-58 w-86"
src="/images/category_electronic.png"
alt="Placeholder Image"
width={200}
height={100}
/>
</div>
</Link>{" "}
</div>

<div
onClick={() => handleCategoryClick("1")}
className="hero lg:col-span-2 lg:col-start-6 lg:row-start-2 bg-mint-green"
>
<Link href={`/products`}>
<div className="hero-content text-center font-bold text-2xl font-mono text-black">
<Image
src="/images/category_jewelry.png"
alt="Placeholder Image"
width={200}
height={100}
/>
{categories[1]}
</div>
</Link>{" "}
</div>

<div
onClick={() => handleCategoryClick("2")}
className="hero lg:col-span-3 lg:row-start-3 bg-mint-cream"
>
<Link href={`/products`}>
<div className="hero-content text-center font-bold text-2xl font-mono text-black">
<Image
src="/images/category_men_clothing.png"
alt="Placeholder Image"
width={200}
height={100}
/>

{categories[2]}
</div>
</Link>{" "}
</div>

<div
onClick={() => handleCategoryClick("3")}
className="hero lg:col-span-4 lg:col-start-4 lg:row-start-3 bg-zomp"
>
<Link href={`/products`}>
{" "}
<div className="hero-content text-center font-bold text-2xl font-mono text-black">
<div className="flex flex-col">
{categories[3]}
<p className="text-l my-3 text-white font-normal">
{" "}
#Dresses #Shoes #Bags and more...
</p>
</div>

<Image
className="object-none h-48 w-96"
src="/images/category_women_clothes.png"
alt="Placeholder Image"
width={200}
height={200}
/>
</div>
</Link>
</div>
</div>
)
}
15 changes: 15 additions & 0 deletions src/components/Layout.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from "react"
import Nav from "./Nav/Nav"
import Footer from "./footer/Footer"

const Layout = ({ children }) => {
return (
<div>
<Nav />
<main> {children} </main>
<Footer />
</div>
)
}

export default Layout
14 changes: 14 additions & 0 deletions src/components/Nav/Logo.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import Link from "next/link"

const Logo = () => {
return (
<Link href="/">
<button className="font-bold text-2xl tracking-wide md:hover:tracking-widest transform-all ease-in-out duration-500 font-mono text-black z-50">
<span className="text-emerald-400">Dz</span>Express
<span className="text-emerald-400">.</span>
</button>
</Link>
)
}

export default Logo
51 changes: 51 additions & 0 deletions src/components/Nav/MobileMenu.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import React from "react"
import { useState } from "react"
import { AiOutlineClose } from "react-icons/ai"
import { FiMenu } from "react-icons/fi"
import Link from "next/link"
const MobileMenu = () => {
const [showMenu, setShowMenu] = useState(false)
function handleOpenMenu() {
setShowMenu(true)
}
function handleCloseMenu() {
setShowMenu(false)
}
return (
<div>
<div
className={`${
showMenu ? "block" : "hidden"
} flex flex-col gap-10 justify-center absolute h-[100vh] w-[100%] overflow-x-hidden top-0 right-0 bg-neutral text-neutral-content`}
>
<div className="w-full text-center">
<button onClick={handleCloseMenu} className="btn btn-ghost btn-sm">
<AiOutlineClose className="text-2xl" />
</button>
</div>
<Link href="/" className="btn btn-ghost btn-sm p-10">
Home
</Link>
<hr className=" bg-neutral-content w-full" />
<Link href="/products" className="btn btn-ghost btn-sm p-10">
All Products
</Link>
<hr className=" bg-neutral-content w-full" />
<Link href="/categories" className="btn btn-ghost btn-sm p-10">
categories
</Link>
<hr className=" bg-neutral-content w-full" />
</div>
<div className="px-2 mx-2 lg:hidden flex-1 gap-2 ">
<button
onClick={handleOpenMenu}
className="btn btn-ghost btn-sm btn-square "
>
<FiMenu className="text-2xl" />
</button>
</div>
</div>
)
}

export default MobileMenu
Loading