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.

Sign up for GitHub

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

Updated design #15

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Updated design #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a3e6f11
Ui Design Updates
Omkar-Sonawane-23 Oct 4, 2024
b14a5ea
Fixed Product Buttons
Omkar-Sonawane-23 Oct 4, 2024
bab9e2b
Created News Section
Omkar-Sonawane-23 Oct 4, 2024
7bff6c9
Home Section Modified
Omkar-Sonawane-23 Oct 4, 2024
06769e8
review page
sandesh362 Oct 5, 2024
eebdf2c
added range slider
sandesh362 Oct 5, 2024
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
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<title>Vite + React</title>
</head>
<body>
<div id="root"></div>
<div id="root" class="scroll-smooth bg-gray-900"></div>
<script type="module" src="/src/main.jsx"></script>
</body>
</html>
71 changes: 71 additions & 0 deletions package-lock.json
View file
Open in desktop

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

2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
"phosphor-react": "^1.4.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-intersection-observer": "^9.13.1",
"react-range-slider-input": "^3.0.7",
"react-router-dom": "^6.4.2"
},
"devDependencies": {
Expand Down
13 changes: 10 additions & 3 deletions src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
import Navbar from "./components/layout/Navbar";
import Home from "./components/pages/home/Home";
import Home from "./pages/home/Home";
// import CTA from "./components/layout/CTA";
import Footer from "./components/layout/Footer";
import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
// import Agents from "./components/pages/Agents";
// import Agent from "./components/pages/Agent";
// import Maps from "./components/pages/Maps";
import { ShopContextProvider } from "./components/context/shop-context"
import { Shop } from "./components/pages/shop/shop"
import { Cart } from "./components/pages/cart/cart";
import { Shop } from "./pages/shop/shop"
import { Cart } from "./pages/cart/cart";
import Contact from "./pages/contact/Contact";
import About from "./pages/about/About";
import News from "./pages/news/News";



Expand All @@ -23,6 +26,10 @@ const App = () => {
<Route excat path="/" element={<Home />} />
<Route path="/shop" element={<Shop />} />
<Route path="/cart" element={<Cart />} />
<Route path="/contact" element={<Contact />} />
<Route path="/aboutus" element={<About />} />
<Route path="/news" element={<News />} />
<Route path="*" element={<h1>You Lost In the World of Valorant 😀</h1>} />
</Routes>
<Footer />
</div>
Expand Down
3 changes: 0 additions & 3 deletions src/components/layout/Footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ const Footer = () => (
</div>
<div className="mx-auto text-center max-w-[640px]">
<p className="mx-auto text-[#7e7e7e] text-[13px]">
© 2022 Riot Games, Inc. Riot Games, VALORANT, and any associated logos
are trademarks, service marks, and/or registered trademarks of Riot
Games, Inc.
</p>
</div>
</div>
Expand Down
47 changes: 0 additions & 47 deletions src/components/pages/home/Hero.jsx
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions src/components/pages/home/News.jsx
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions src/components/pages/shop/product.jsx
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions src/components/pages/shop/shop.jsx
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions src/components/utils/NewsCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React from "react";

const NewsCard = ({ date, category, title, imglink }) => (
<div className="news-card">
<div className="w-[30vw] min-w-[500px] h-auto relative mr-4">
<img src={imglink} alt="news1" className="w-[100%] h-auto relative" />
<div className="text-black font-semibold">
<span>{date}</span>
<span className="ml-4 text-primary">{category}</span>
<h3 className="my-2 font-bold text-[20px]">{title}</h3>
<div className="news-card m-3">
<div className="w-[30vw] min-w-[500px] h-[100%] relative mr-4 bg-gray-800 rounded-lg shadow-lg overflow-hidden transition-transform transform hover:scale-105">
<img src={imglink} alt={title} className="w-full h-48 object-cover" />
<div className="p-4 text-white">
<span className="text-gray-400 text-sm">{date}</span>
<span className="ml-4 text-blue-500 font-semibold">{category}</span>
<h3 className="my-2 font-bold text-lg">{title}</h3>
</div>
</div>
</div>
Expand Down
Loading