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

initial changes to navbar #1

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link
href="https://fonts.googleapis.com/css2?family=Eagle+Lake&display=swap"
rel="stylesheet"
/>
<link href="https://fonts.cdnfonts.com/css/gilroy-bold" rel="stylesheet" />
<title>Xoxo</title>
<title>excel shop</title>
</head>
<body>
<div id="root"></div>
Expand Down
3,093 changes: 1,470 additions & 1,623 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion public/vite.svg

This file was deleted.

15 changes: 7 additions & 8 deletions src/Auth/Firebase.jsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import { initializeApp } from "firebase/app";
import { getAuth } from "firebase/auth";
const firebaseConfig = {
apiKey: "AIzaSyDIsoRKkgaKbBaaW9m_IP-8ipxF-19m0uk",
authDomain: "xoxo-db.firebaseapp.com",
projectId: "xoxo-db",
storageBucket: "xoxo-db.appspot.com",
messagingSenderId: "648019716902",
appId: "1:648019716902:web:bf83448bf3f9b3e689afe7",
measurementId: "G-XZH40XX5RY",
apiKey: "AIzaSyAiroY6DYVwp2jjiUXN4_2XWocoRTcfQdU",
authDomain: "xoxo-ff56e.firebaseapp.com",
projectId: "xoxo-ff56e",
storageBucket: "xoxo-ff56e.appspot.com",
messagingSenderId: "833114438740",
appId: "1:833114438740:web:8a80d64bfc973c4b2a41c1",
measurementId: "G-SEHMTLMEYV"
};

export const app = initializeApp(firebaseConfig);
export const auth = getAuth(app);
2 changes: 1 addition & 1 deletion src/assets/AllImages.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import HeroImg from "./Faith-1.png";
import HeroImg from "./burna.jpg";
import FakeAvatar from "./fakeAvatar.webp";
import spiralArrow from "./spiralArrow.png";
import about_xoxo from "./about_xoxo.jpg";
Expand Down
Binary file added src/assets/burna.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion src/assets/react.svg

This file was deleted.

9 changes: 4 additions & 5 deletions src/components/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { AiFillFacebook } from "react-icons/ai";

function Footer() {
return (
<footer className="relative bg-[#f289ff] bg-opacity-10 mt-20 w-full pt-8 pb-6 font-gilroyRegular">
<footer className="relative bg-[#27326d] bg-opacity-10 mt-20 w-full pt-8 pb-6 font-gilroyRegular">
<div className="max-w-7xl mx-auto px-4">
<div className="flex flex-wrap text-left lg:text-left">
<div className="w-full lg:w-6/12 px-4">
Expand Down Expand Up @@ -83,14 +83,13 @@ function Footer() {
target="_blank"
>
{" "}
Xoxo by
excel-tech
</a>
<a
href="https://www.creative-tim.com?ref=njs-profile"
className="text-blueGray-500 hover:text-blueGray-800"

>
{" "}
Faith❤️
Godswill
</a>
.
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Hero.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function Hero() {
data-aos="fade-in"
>
<p className="text-gray-400 text-left">
Absolutely Hot Collections🔥
Absolutely Hot Collections
</p>
<div className="flex flex-col gap-6 relative">
<h1 className="text-3xl sm:text-5xl xl:text-7xl leading-[1.2] my-6 font-gilroyBold text-left ">
Expand Down
10 changes: 5 additions & 5 deletions src/components/Navbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ function Navbar() {
}
};
return (
<header className="pt-10 px-5 max-w-7xl xl:px-0 mx-auto z-50">
<header className="pt-7 px-5 max-w-7xl xl:px-0 mx-auto z-50">
{/* <!-- component --> */}
<nav className=" items-center relative justify-between bg-white py-6 w-full hidden md:flex">
<nav className=" items-center relative justify-between bg-white py-3 w-full hidden md:flex">
<div className="flex gap-28 items-center">
<div>
<span className="font-eagle text-black cursor-pointer text-2xl">
Xoxo.
<span className="font-poppins font-bold text-black hover:border-l-slate-500 translate-x-1 transition cursor-pointer text-2xl">
Excel
</span>
</div>
<ul
Expand Down Expand Up @@ -103,7 +103,7 @@ function Navbar() {
<div className="flex justify-between items-center px-4 md:hidden mb-16 delay-150 ">
<div>
<span className="font-eagle text-black cursor-pointer text-2xl">
Xoxo.
Excel
</span>
</div>
<div className="flex gap-9 items-center justify-center">
Expand Down
2 changes: 1 addition & 1 deletion src/components/products.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function Products() {
</div>
<div className="grid px-5 mt-32 lg:mt-20 ">
{isLoading &&
[1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map((n) => (
[1, 2, 3, 4, 5, 6, 7, 8, 9, 10,11,12,13].map((n) => (
<div className="animate-pulse rounded-md p-4" key={n}>
<div className="rounded-md bg-slate-200 h-72 w-full "></div>
<div className="mt-4 flex justify-between">
Expand Down
6 changes: 3 additions & 3 deletions src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@tailwind utilities;

.span {
background: linear-gradient(to right, #ffbdf0, #f289ff, #ce7aff);
background: linear-gradient(to right, #4b72ac, #141314, #222024);
background-clip: text;
-webkit-text-fill-color: transparent;
}
Expand All @@ -16,7 +16,7 @@
padding: 15px;
}
nav .active {
text-decoration: underline;
text-decoration: none;
}
.mobilNav {
z-index: 9999;
Expand All @@ -28,5 +28,5 @@ nav .active {
grid-row-gap: 50px;
}
.btn {
background: linear-gradient(to bottom, #f0daef, #eff3ff);
background: linear-gradient(to bottom, #5cf82d, #eff3ff);
}
4 changes: 2 additions & 2 deletions src/pages/About.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function AboutUs() {
className="font-gilroyRegular md:text-xl mt-9 text-center"
data-aos="fade"
>
XOXO IS… WHERE FUN MEETS FASHION & CLASS AT AFFORDABLE PRICES!
EXCEL SHOP IS… WHERE FUN MEETS FASHION & CLASS AT AFFORDABLE PRICES!
</p>
<div className="mt-20 flex flex-col lg:flex-row bg-[#f289ff] bg-opacity-10 w-full rounded px-9 py-2 gap-10 items-center">
<img
Expand All @@ -30,7 +30,7 @@ function AboutUs() {
OUR LITTLE <br /> N I C H E
</h5>
<p className="font-gilroyRegular lg:text-left">
Welcome to Xoxo, where fashion meets quality and affordability.
Welcome to Excel shop, where fashion meets quality and affordability.
Our brand was founded in 2020 with the aim of providing our
customers with the latest fashion trends at accessible prices.
<br />
Expand Down
2 changes: 1 addition & 1 deletion src/pages/SignUp.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function Signup() {
<input
type="text"
name="name"
className="w-full h-14 mt-2 focus:border-[#f289ff] focus:outline-none focus:ring-0 rounded pl-4 border border-gray-300"
className="w-full h-14 mt-2 focus:border-[#908e91] focus:outline-none focus:ring-0 rounded pl-4 border border-gray-300"
value={values.name}
onChange={handleChange}
/>
Expand Down
2 changes: 1 addition & 1 deletion src/useQuery.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useQuery } from "react-query";
import axios from "axios";

const fetchData = () => {
return axios.get("https://fakestoreapiserver.reactbd.com/products");
return axios.get("https://fakestoreapi.com/products");
};

export const useAsync = () => {
Expand Down