Skip to content

Commit

Permalink
Merge branch 'aweeshathavishanka-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@nmdra
nmdra committed Oct 13, 2024
2 parents 8d5f70e + 89cf3d1 commit ec557d0
Show file tree
Hide file tree
Showing 5 changed files with 200 additions and 190 deletions.
8 changes: 4 additions & 4 deletions frontend/src/Components/Help/HelpHeroSection.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ const HelpHeroSection = () => {
<div className="max-w-screen-xl px-4 py-8 mx-auto text-center lg:py-16 lg:px-12">
<a
href="#"
className="inline-flex items-center justify-between px-1 py-1 pr-4 text-sm text-gray-700 bg-gray-100 rounded-full mb-7 dark:bg-gray-800 dark:text-white hover:bg-gray-200 dark:hover:bg-gray-700"
className="inline-flex items-center justify-between px-1 py-1 pr-4 text-sm text-gray-700 bg-gray-100 border rounded-full mb-7"
role="alert"
>
<span className="text-xs bg-[#d0ff57] rounded-full text-black px-4 py-1.5 mr-3">
New
</span>{' '}
<span className="text-sm font-medium">
<span className="text-sm font-medium text-black">
Need Instant Help? 🚀 Our Live Chat is Coming Soon
to Assist You in Real-Time! 👋
</span>
Expand All @@ -33,7 +33,7 @@ const HelpHeroSection = () => {
/>
</svg>
</a>
<h1 className="mb-4 text-4xl font-extrabold leading-none tracking-tight text-gray-900 md:text-5xl lg:text-6xl dark:text-white">
<h1 className="mb-4 text-4xl font-extrabold leading-none tracking-tight text-gray-900 md:text-5xl lg:text-6xl ">
We&apos;re Here to Help! 💬
</h1>
<p className="mb-8 text-lg font-normal text-gray-500 lg:text-xl sm:px-16 xl:px-48 dark:text-gray-400">
Expand Down Expand Up @@ -61,7 +61,7 @@ const HelpHeroSection = () => {
</Link>
<Link
to="https://cal.com/aweesha-thavishanka/30min"
className="inline-flex items-center justify-center px-5 py-3 text-base font-medium text-center text-gray-900 border border-gray-300 rounded-lg hover:bg-gray-100 focus:ring-4 focus:ring-gray-100 dark:text-white dark:border-gray-700 dark:hover:bg-gray-700 dark:focus:ring-gray-800"
className="inline-flex items-center justify-center px-5 py-3 text-base font-medium text-center text-black border border-gray-300 rounded-lg dark:text-black hover:bg-gray-100 focus:ring-4 focus:ring-gray-100 dark:text-white dark:border-gray-700 dark:hover:bg-gray-700 dark:focus:ring-gray-800"
>
<svg
className="w-5 h-5 mr-2 -ml-1"
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/Components/Help/SupportTicketHeroSection.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const SupportTicketHeroSection = () => {
</div>
<div className="grid px-4 py-8 mx-auto max-w-7xl lg:gap-8 xl:gap-0 lg:py-16 lg:grid-cols-12">
<div className="mr-auto place-self-center lg:col-span-7">
<h1 className="max-w-2xl mb-4 text-4xl font-extrabold leading-none tracking-tight md:text-5xl xl:text-6xl dark:text-white">
<h1 className="max-w-2xl mb-4 text-4xl font-extrabold leading-none tracking-tight md:text-5xl xl:text-6xl ">
Not what you were looking for?
</h1>
<p className="max-w-2xl mb-6 font-light text-gray-500 lg:mb-8 md:text-lg lg:text-xl dark:text-gray-400">
Expand Down Expand Up @@ -41,7 +41,7 @@ const SupportTicketHeroSection = () => {
</a>
<a
href="#"
className="inline-flex items-center justify-center px-5 py-3 text-base font-medium text-center text-gray-900 border border-gray-300 rounded-lg hover:bg-gray-100 focus:ring-4 focus:ring-gray-100 dark:text-white dark:border-gray-700 dark:hover:bg-gray-700 dark:focus:ring-gray-800"
className="inline-flex items-center justify-center px-5 py-3 text-base font-medium text-center text-gray-900 border border-gray-300 rounded-lg hover:bg-gray-100 focus:ring-4 focus:ring-gray-100 "
>
Go to Live Chat
</a>
Expand Down
10 changes: 7 additions & 3 deletions frontend/src/Components/Home/Hero.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ import { Search } from 'lucide-react'
const Hero = () => {
return (
<div>
<div className="absolute top-0 z-[-2] h-screen w-screen bg-white bg-[radial-gradient(100%_50%_at_50%_0%,#b8f724_0,#faffe5_50%,rgba(0,163,255,0)_100%)]"></div>
<div className="absolute inset-0 -z-10 h-full w-full bg-white bg-[linear-gradient(to_right,#8080800a_1px,transparent_1px),linear-gradient(to_bottom,#8080800a_1px,transparent_1px)] bg-[size:14px_24px]">
<div className="absolute left-0 right-0 top-0 -z-10 m-auto h-[310px] w-[310px] rounded-full bg-[#b8f724] opacity-20 blur-[100px]"></div>
</div>
<div className="max-w-5xl mx-auto h-[60vh] ">
<div className="flex flex-col justify-center md:py-[6rem] text-center gap-y-8">
<h1 className=" bg-[#f3ffc6] border border-[#b8f724] max-w-3xl mx-auto px-10 rounded-full py-1">
Expand All @@ -14,8 +16,10 @@ const Hero = () => {
BOX DELIVERY AT PRICES YOU&apos;ll LOVE
</h1>
<div className="max-w-5xl px-10 py-3 mx-auto border-2 rounded-full border-[#99DD05] flex items-center gap-3 hover:bg-[#f5fce6] hover:cursor-pointer">
<Search size={20} />
Explore the your marketplace
<a href="/shops" className="flex items-center ">
<Search size={20} />
Explore the your marketplace
</a>
</div>
</div>
</div>
Expand Down
24 changes: 12 additions & 12 deletions frontend/src/Pages/Customer/UserDashboard.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState, useEffect, useMemo } from 'react'
import { useState, useEffect, useMemo } from 'react'
import { Link } from 'react-router-dom'
import OrderTable from '../../Components/UserOrderTable'
// import Breadcrumbs from '../../Components/Breadcrumbs'
Expand Down Expand Up @@ -52,14 +52,14 @@ function Dashboard() {
}

return (
<div className="relative min-h-screen bg-neutral-100 pr-8 pl-8 pb-6 pt-6">
<div className="relative min-h-screen pt-6 pb-6 pl-8 pr-8 bg-neutral-100">
{/* Main Content */}
{/* <Breadcrumbs /> Breadcrumbs at the top */}
{/* Membership Banner */}
<div className="flex w-fit items-center max-md:flex-col gap-6 bg-gradient-to-tr from-green-800 to-green-600 text-white px-6 py-3.5 mx-6 rounded font-[sans-serif] mt-4 shadow-sm">
<p className="text-base flex-1 max-md:text-center">
Don't miss out on our amazing MEMBERSHIP PLANS! Upgrade to
Silver or Gold and enjoy exclusive benefits including
<p className="flex-1 text-base max-md:text-center">
Don&apos;t miss out on our amazing MEMBERSHIP PLANS! Upgrade
to Silver or Gold and enjoy exclusive benefits including
discounts and free delivery.
</p>
<div className="flex items-center">
Expand All @@ -76,19 +76,19 @@ function Dashboard() {
{/* Profile and Billing Section */}
<div className="flex flex-row gap-4 mt-4">
{/* Profile Section */}
<div className="flex basis-2/5 justify-between bg-white p-4 rounded-lg shadow-sm border-l-4 border-green-700">
<div className="flex justify-between p-4 bg-white border-l-4 border-green-700 rounded-lg shadow-sm basis-2/5">
<div className="flex flex-col">
<img
src={user.pic}
alt="Profile"
className="h-16 w-16 rounded-full object-cover"
className="object-cover w-16 h-16 rounded-full"
/>
<h2 className="text-xl font-semibold">
{user.firstname} {user.lastname}
</h2>
<Link
to="/settings"
className="text-md text-green-600 hover:underline"
className="text-green-600 text-md hover:underline"
>
Edit Profile
</Link>
Expand All @@ -112,7 +112,7 @@ function Dashboard() {
</div>

{/* Billing Address */}
<div className="flex basis-3/5 bg-white p-4 rounded-lg shadow-sm border-l-4 border-green-700">
<div className="flex p-4 bg-white border-l-4 border-green-700 rounded-lg shadow-sm basis-3/5">
<div className="flex flex-col">
<h3 className="text-sm font-semibold text-gray-500">
DEFAULT ADDRESS
Expand All @@ -139,14 +139,14 @@ function Dashboard() {
{/* Recent Orders */}
{/* Recent Orders */}
<ProductCarousel />
<div className="max-w-full mx-2 p-6 bg-white rounded-lg shadow-lg border-2 border-green-400 mt-6">
<div className="flex justify-between items-center mb-4">
<div className="max-w-full p-6 mx-2 mt-6 bg-white border-2 border-green-400 rounded-lg shadow-lg">
<div className="flex items-center justify-between mb-4">
<h2 className="text-lg font-semibold text-gray-900">
Recent Orders
</h2>
<Link
to="/orderhistory"
className="text-green-700 underline text-sm"
className="text-sm text-green-700 underline"
>
View All
</Link>
Expand Down
Loading

0 comments on commit ec557d0

Please sign in to comment.