-
Notifications
You must be signed in to change notification settings - Fork 3
Chore update categories #57
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
Open
CijeTheCreator
wants to merge
159
commits into
himspired1:main
Choose a base branch
from
CijeTheCreator:chore-update-categories
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
159 commits
Select commit
Hold shift + click to select a range
ee7df1c
Merge pull request #1 from himspired1/feat-navbar
CMI-James 47a4941
Merge pull request #2 from himspired1/feat-navbar
CMI-James fd3db35
Merge pull request #3 from himspired1/feat-footer
CMI-James b625384
Merge pull request #4 from himspired1/feat-footer
CMI-James d9583c6
Merge pull request #5 from himspired1/feat-footer
CMI-James 3c3e2c4
feat: built the contactus page
davedumto 4cb75d9
feat:Worked on the responsiveness of the contact us page
davedumto 00262c4
Built about us page
ebubechi-ihediwa 77ed6ee
Merge branch 'main' of https://github.com/himspired1/himspired into f…
ebubechi-ihediwa 09c6e70
Merge pull request #7 from himspired1/feat/about-us
davedumto 4b5a986
Merge branch 'main' into feat-newsletter
davedumto be3472e
Merge pull request #6 from himspired1/feat-newsletter
davedumto 5e425ec
fix: improved the responsiveness
CMI-James a083511
fix: improved the responsiveness
CMI-James 6e2b49e
fix: improved the responsiveness
CMI-James 16ab9fa
fix: improved the responsiveness
CMI-James 55530f8
fix: added the fonts
CMI-James d3e4bbe
fix: added the fonts
CMI-James 4ecf124
Merge pull request #8 from himspired1/feat-footer
CMI-James 9e21a08
fix: added the autoflow
CMI-James a4fb0b1
Merge pull request #9 from himspired1/feat/contactus
davedumto 5801c32
chore: made some fixes to the contact us page
davedumto a1a6a61
chore: made a little change in the contact us page
davedumto afe311c
chore: added width to the email address input
davedumto 5cb6ba7
feat: built the loader component
davedumto f10dd71
chore: made the loader to finish animating before homepage is displayed
davedumto f845717
Built shop page
ebubechi-ihediwa 1cc6687
chore: made a few changes to the code
davedumto dc55619
Merge pull request #11 from himspired1/feat/Loader
davedumto b208587
Merge pull request #10 from himspired1/feat/shop
davedumto 02f86ec
fix: updated the work
CMI-James dd229e4
Merge branch 'main' into feat-footer
CMI-James 516c194
Merge pull request #12 from himspired1/feat-footer
CMI-James 86b5b36
feat: created the home product section
CMI-James 165aa38
feat: created the home product section
CMI-James ab63cb1
feat: created home product page exp 1
CMI-James d81edb9
Merge pull request #13 from himspired1/feat-product
davedumto a60f4f2
Merge pull request #14 from himspired1/feat-product-test
davedumto 95a435e
fix: update homepage product
CMI-James 8e84f55
fix: update homepage product
CMI-James 70eb390
Merge pull request #15 from himspired1/chibuike
CMI-James 1756590
feat: added some components
CMI-James 57aa0e4
feat: added some components
CMI-James 4b60e85
feat: added some components
CMI-James db3a5ac
feat: added shop component
CMI-James 1220558
feat: added some components
CMI-James afac80d
feat: added some components
CMI-James e50bada
feat: added some components
CMI-James 3521ed8
Merge pull request #16 from himspired1/chibuike
CMI-James fe0b8f1
feat: Add shop page, product details page, and product card with anim…
ebubechi-ihediwa 7d642a7
Changed width of product description
ebubechi-ihediwa dc31824
Built cart page and it's component
ebubechi-ihediwa 699ac12
Set up redux and cart system
ebubechi-ihediwa 8f86303
Made requested changes
ebubechi-ihediwa 1af17e4
Merge pull request #17 from himspired1/feat/shop
davedumto 58aa24e
Made changes to layout file for fixing scrolling issue
ebubechi-ihediwa 6ce50e2
Merge pull request #18 from himspired1/feat/shop
davedumto 00a51fa
chore: made some changes
davedumto 41b3f7e
updated the product component
CMI-James c245fea
Working sanity integration
ebubechi-ihediwa 41c121e
updated the carousel
CMI-James fc67608
updated the carousel
CMI-James 0da5d04
made the navbar sticky
CMI-James 9b39379
made the navbar sticky
CMI-James f72de14
made the navbar sticky
CMI-James 9b78d2d
Merge branch 'main' of https://github.com/himspired1/himspired
CMI-James 49a991a
i no get
CMI-James 227cc6f
Merge pull request #19 from himspired1/feat/shop
CMI-James d6c53f7
Merge pull request #20 from himspired1/chibuike
CMI-James 294e1f8
added a readme
CMI-James b7773df
added more animations
CMI-James a3d39f9
created 404 page
CMI-James 060b73f
Merge pull request #21 from himspired1/chibuike
CMI-James 5c0c9e6
created 404 page
CMI-James 2e77e5c
created 404 page
CMI-James 8e99c48
Merge pull request #22 from himspired1/chibuike
CMI-James cac44c0
chore: made some changes
davedumto 7fd391b
fixed dispatch issue
CMI-James a319de1
removed the zipped file
CMI-James 5c5c3d0
Merge pull request #24 from himspired1/chibuike
CMI-James e3b32b6
chore: making some fixes
davedumto d0a5e3c
Merge branch 'main' of https://github.com/himspired1/himspired into c…
davedumto 0c6809a
Merge pull request #23 from himspired1/chore-made-some-changes
davedumto 3cefe69
Modify: Pulled in updated code from main branch
ebubechi-ihediwa c3ddef7
Feat: Created Sanity hooks
ebubechi-ihediwa 8f0c95b
Feat: Integrated sanity to home screen
ebubechi-ihediwa f461afa
Integrated cloth api in shop page
ebubechi-ihediwa 897377a
Integrated product details api
ebubechi-ihediwa 8cdb64b
Synced cart page with cart store
ebubechi-ihediwa 2261443
Built checkout page
ebubechi-ihediwa ed4fcc0
Handled size descrepancies
ebubechi-ihediwa 11cc3c7
Implemented form validation for checkout
ebubechi-ihediwa 8f87aca
Resolved npm build error
ebubechi-ihediwa 0d463c7
Merge pull request #25 from himspired1/feat/shop
davedumto 776c39c
merging main
davedumto 9f54edf
chore: fixed build errors
davedumto 46eca4a
chore: bug fix
davedumto 20e0a3d
feat: built the backend for the checkout and the admin dashboard and …
davedumto a05c910
chore: bug fix
davedumto 362f950
chore: passed product image to admin for easy identification of order…
davedumto b105ad0
chore: bug fix
davedumto 8d007a2
chore: fixed checkout layout
davedumto d77a562
chore: implemented newsletter endpoint and did some cleanup on the app.
davedumto 4aefa75
feat: built contact us endpoint and integrated
davedumto 330640d
chore: fixed layout issue
davedumto a09502c
feat: optimize MongoDB performance with pooling and indexing
davedumto 46a05b1
chore: fixed some ui bugs
davedumto bebb7cd
chore: making production bug fixes
davedumto 2ec23e9
chore: making bug fixes for production
davedumto c57838f
chore: added form support for the checkout form, and added the nigeri…
davedumto 42981d3
feat: added security to the admin login
davedumto 2ce6ba3
feat: making improvements for production
davedumto 22f5cb9
chore: addressed code rabbit ai requested changes
davedumto 3040c2f
Merge pull request #29 from himspired1/feat-making-production-improve…
davedumto 9316257
feat: making production reaady improvements
davedumto 3867ceb
feat: made some producton ready changes
davedumto 7772e1f
chore: addressed code rabbit ai requested changes
davedumto edd8965
Merge pull request #31 from himspired1/feat-making-prod-improvements
davedumto 52308db
feat: fix production bugs
davedumto d55e2d7
chore: making some fixes for prod
davedumto 6e341b2
chore: fixing bugs
davedumto 730e398
chore: making production fixes
davedumto c0750e1
chore: addressed coderabbit reviewin
davedumto 3ba3850
chore: doing cleanup
davedumto 2ffb7dc
chore: addressed code rabbit review
davedumto 61aec68
chore: fix build errors
davedumto 523780c
chore: fixed coderabbits review
davedumto cde8d2f
chore: addressed code rabbit review
davedumto bfad802
chore: made some fixesand then addressed code rabbit review
davedumto 01ba1d2
chore: addressed code rabbit review
davedumto 8077425
chore: fixed build issue
davedumto 0e345f7
chore: addressed code rabbit review
davedumto c92d9c4
Merge pull request #35 from himspired1/feat-making-prod-fixes1
davedumto 5c01bb1
chore: made some prod fixes to the ui
davedumto 14e3a57
chore: added vercel analytics
davedumto 6afdc04
chore: made ui fixes on the admin page
davedumto a055e70
feat: implemented caching with redis
davedumto ca718c2
chore: fixed the build error
davedumto e70d7ed
chore: addresed code rabbit ai review
davedumto 8617a43
chore: re activated the auto email for customers to keep trsack of ho…
davedumto cb6cac7
chore: addressed code rabbit comments
davedumto a5c8955
Merge pull request #36 from himspired1/feat-added-redis-caching
davedumto bab7d8d
chore: made some ui fixes
davedumto 2c99dfd
Merge pull request #37 from himspired1/chore-made-ui-fixes
davedumto 655237b
chore: made a minor fix
davedumto 0e18d8d
Merge pull request #38 from himspired1/chore-made-ui-fixes
davedumto db0ef6a
chore: made a fix
davedumto 6dd53ae
Merge pull request #39 from himspired1/chore-made-ui-fixes
davedumto b55f15a
chore: improving seo
davedumto 0c58a00
feat: created a flexible delivery fee system
davedumto 9d29b59
feat: implemented an analytics dashboard on the admin for keeping tra…
davedumto a21056e
chore: addressed code rabbit comments
davedumto 03b9771
Merge pull request #40 from himspired1/chore-made-ui-fixes
davedumto fa4dc8f
merging main
davedumto 82841d8
chore: addressed code rabbits comments
davedumto 2ece99b
Merge pull request #41 from himspired1/feat-implement-flexible-logist…
davedumto 152098a
Update shop navigation from brand-based to product-type categories
CijeTheCreator 2a02e2e
Update products data to focus on thrift product types
CijeTheCreator ff60332
Update home products carousel to use product-type categories
CijeTheCreator File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,169 @@ | ||
| This is a [Next.js](https://nextjs.org) project bootstrapped with [`create-next-app`](https://nextjs.org/docs/app/api-reference/cli/create-next-app). | ||
| # Himspired - Fashion E-commerce Website | ||
|
|
||
| ## Getting Started | ||
| ## Overview | ||
|
|
||
| Himspired is a premium fashion e-commerce platform that bridges the gap between thrift and luxury fashion. The brand offers a curated collection of clothing items across four main categories: Thrifts, Luxury, Vintage, and Modern. With a sleek, modern design and smooth user experience, Himspired aims to redefine style by making premium fashion accessible to everyone. | ||
|
|
||
| ## Features | ||
|
|
||
| - **Interactive Product Carousel**: Smooth, animated carousel showcasing different product categories | ||
| - **Responsive Design**: Fully responsive layout that adapts to all device sizes | ||
| - **Animated UI Elements**: Subtle animations and transitions for an engaging user experience | ||
| - **Category Navigation**: Easy navigation between different product categories | ||
| - **Loader Animation**: Branded loading animation for a polished first impression | ||
| - **Newsletter Subscription**: Email subscription functionality with validation | ||
| - **About Us Section**: Brand story and team showcase | ||
| - **Contact Form**: User-friendly contact form for inquiries | ||
|
|
||
| ## Technologies Used | ||
|
|
||
| First, run the development server: | ||
| - **Next.js 14**: React framework with App Router for server-side rendering and routing | ||
| - **TypeScript**: Type-safe JavaScript for better development experience | ||
| - **Tailwind CSS**: Utility-first CSS framework for styling | ||
| - **Framer Motion**: Animation library for smooth transitions and effects | ||
| - **Embla Carousel**: Lightweight carousel component | ||
| - **Lucide React**: Modern icon set | ||
| - **Geist Fonts**: Typography from Vercel's design system | ||
| - **Shadcn UI**: Reusable UI components | ||
|
|
||
| ```bash | ||
| npm run dev | ||
| # or | ||
| yarn dev | ||
| # or | ||
| pnpm dev | ||
| # or | ||
| bun dev | ||
| ## Project Structure | ||
|
|
||
| ```text | ||
| src/ | ||
| ├── app/ # Next.js App Router | ||
| │ ├── _Home/ # Home page components | ||
| │ ├── about/ # About page | ||
| │ ├── cart/ # Shopping cart | ||
| │ ├── contact/ # Contact page | ||
| │ ├── shop/ # Shop page | ||
| │ ├── globals.css # Global styles | ||
| │ └── layout.tsx # Root layout | ||
| ├── components/ # Reusable components | ||
| │ ├── common/ # Common UI elements | ||
| │ ├── layout/ # Layout components | ||
| │ ├── pages/ # Page-specific components | ||
| │ ├── product/ # Product-related components | ||
| │ └── ui/ # UI components from shadcn | ||
| ├── constants/ # Constants and configuration | ||
| ├── data/ # Data files | ||
| ├── hooks/ # Custom React hooks | ||
| ├── lib/ # Utility functions | ||
| └── redux/ # State management | ||
| ``` | ||
|
|
||
| Open [http://localhost:3000](http://localhost:3000) with your browser to see the result. | ||
| ### Key Components | ||
|
|
||
| - **Products.tsx**: Main product carousel with category navigation | ||
| - **ProductSection.tsx**: Reusable component for displaying products in a grid | ||
| - **Loader.tsx**: Loading animation with brand name reveal | ||
| - **Newsletter.tsx**: Newsletter subscription component | ||
| - **Navbar.tsx**: Navigation bar with responsive design | ||
| - **Footer.tsx**: Site footer with links and social media | ||
|
|
||
| ## Getting Started | ||
|
|
||
| ### Prerequisites | ||
|
|
||
| - Node.js 18.x or higher | ||
| - npm or yarn | ||
|
|
||
| ### Installation | ||
|
|
||
| 1. Clone the repository: | ||
|
|
||
| ```bash | ||
| git clone <https://github.com/yourusername/himspired.git> | ||
| cd himspired | ||
| ``` | ||
|
|
||
| 2. Install dependencies: | ||
|
|
||
| ```bash | ||
| npm install | ||
|
|
||
| # or | ||
|
|
||
| yarn install | ||
| ``` | ||
|
|
||
| 3. Run the development server: | ||
|
|
||
| ```bash | ||
| npm run dev | ||
|
|
||
| # or | ||
|
|
||
| yarn dev | ||
| ``` | ||
|
|
||
| 4. Open [http://localhost:3000](http://localhost:3000) in your browser to see the application. | ||
|
|
||
| ## Usage | ||
|
|
||
| ### Home Page | ||
|
|
||
| The home page features a product carousel showcasing different categories. Users can: | ||
|
|
||
| - Navigate between categories using the dots or arrow buttons | ||
| - View products in a responsive grid layout | ||
| - Hover over products for subtle animations | ||
| - Add products to cart | ||
|
|
||
| ### Shop Page | ||
|
|
||
| The shop page allows users to browse all products with filtering options: | ||
|
|
||
| - Filter by category (All, Thrift, Luxury, Senators) | ||
| - View product details | ||
| - Add products to cart | ||
|
|
||
| ### About Page | ||
|
|
||
| Learn about the Himspired brand story, vision, and team members. | ||
|
|
||
| ### Contact Page | ||
|
|
||
| Get in touch with the Himspired team through the contact form. | ||
|
|
||
| ## Design Features | ||
|
|
||
| ### Animations | ||
|
|
||
| - Smooth transitions between product categories | ||
| - Subtle hover effects on product cards | ||
| - Loading animation with brand name reveal | ||
| - Fade-in animations for section titles | ||
|
|
||
| ### Responsive Design | ||
|
|
||
| You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file. | ||
| - Mobile-first approach with breakpoints for different device sizes | ||
| - Adaptive product grid that shows 1-4 items based on screen width | ||
| - Collapsible navigation menu on mobile devices | ||
|
|
||
| This project uses [`next/font`](https://nextjs.org/docs/app/building-your-application/optimizing/fonts) to automatically optimize and load [Geist](https://vercel.com/font), a new font family for Vercel. | ||
| ## Future Enhancements | ||
|
|
||
| ## Learn More | ||
| - User authentication and account management | ||
| - Product filtering and search functionality | ||
| - Wishlist feature | ||
| - Product detail pages | ||
| - Shopping cart functionality | ||
| - Checkout process | ||
| - Order tracking | ||
|
|
||
| To learn more about Next.js, take a look at the following resources: | ||
| ## Contributing | ||
|
|
||
| - [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API. | ||
| - [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial. | ||
| 1. Fork the repository | ||
| 2. Create your feature branch (`git checkout -b feature/amazing-feature`) | ||
| 3. Commit your changes (`git commit -m 'Add some amazing feature'`) | ||
| 4. Push to the branch (`git push origin feature/amazing-feature`) | ||
| 5. Open a Pull Request | ||
|
|
||
| You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js) - your feedback and contributions are welcome! | ||
| ## License | ||
|
|
||
| ## Deploy on Vercel | ||
| This project is licensed under the MIT License - see the LICENSE file for details. | ||
|
|
||
| The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js. | ||
| ## Acknowledgements | ||
|
|
||
| Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/building-your-application/deploying) for more details. | ||
| - Design inspiration from modern fashion e-commerce platforms | ||
| - Icons from Lucide React | ||
| - UI components from shadcn/ui | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "$schema": "https://ui.shadcn.com/schema.json", | ||
| "style": "new-york", | ||
| "rsc": true, | ||
| "tsx": true, | ||
| "tailwind": { | ||
| "config": "tailwind.config.ts", | ||
| "css": "src/app/globals.css", | ||
| "baseColor": "neutral", | ||
| "cssVariables": true, | ||
| "prefix": "" | ||
| }, | ||
| "aliases": { | ||
| "components": "@/components", | ||
| "utils": "@/lib/utils", | ||
| "ui": "@/components/ui", | ||
| "lib": "@/lib", | ||
| "hooks": "@/hooks" | ||
| }, | ||
| "iconLibrary": "lucide" | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Outdated category references conflict with PR objectives
Line 116 still references the old brand-based categories (Thrift, Luxury, Senators) which should be updated to the new product-type categories (Polos, T-Shirts, Jeans, Shirts) according to the PR objectives.
Apply this diff to align with the stated category changes:
📝 Committable suggestion
🤖 Prompt for AI Agents