Skip to content

Commit

Permalink
Merge pull request #6 from sarwar-asik/v2
Browse files Browse the repository at this point in the history
V2
  • Loading branch information
sarwar-asik committed Feb 27, 2024
2 parents 6126761 + 4954c2a commit 6e6a771
Show file tree
Hide file tree
Showing 9 changed files with 8,450 additions and 25 deletions.
Binary file added public/curved0.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 12 additions & 7 deletions src/app/(dashBoard)/profile/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import { EditOutlined } from "@ant-design/icons";
import Link from "next/link";
import BreadCumbUI from "@/components/ui/BreadCumbUI";
import LoadingData from "@/components/ui/Loader/LoadingData";
import ProfileUserSection from "@/components/profile/ProfileUserSection";
import ProfileInfo from "@/components/profile/ProfileInfo";

const { Content } = Layout;
const { Title, Text } = Typography;
Expand All @@ -17,7 +19,7 @@ const Profile = () => {
const user = getUserInfo() as any;
// console.log(user);
const { data, isLoading } = useProfileUserQuery(undefined);
console.log("🚀 ~ file: ~ data:", data);
// console.log("🚀 ~ file: ~ data:", data);

useEffect(() => {
if (!user?.role) {
Expand All @@ -28,9 +30,9 @@ const Profile = () => {
// const {role,email,img,contact} = data

return (
<>
<>

<BreadCumbUI
<BreadCumbUI
items={[
{
label: `${data?.role}`,
Expand All @@ -43,9 +45,9 @@ const Profile = () => {
]}
/>
{
isLoading&& <LoadingData/>
isLoading && <LoadingData />
}
<Layout style={{ minHeight: "100vh" }}>
{/* <Layout style={{ minHeight: "100vh" }}>
<Content style={{ padding: "24px" }}>
<Row gutter={16}>
<Col xs={24} sm={24} md={12} lg={8}>
Expand Down Expand Up @@ -73,8 +75,11 @@ const Profile = () => {
</Col>
</Row>
</Content>
</Layout>
</>
</Layout> */}

<ProfileUserSection profileData={data} />
<ProfileInfo profileData={data} />
</>
);
};

Expand Down
2 changes: 2 additions & 0 deletions src/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@
/* .ant-menu-horizontal {
border-bottom: none;
} */


15 changes: 12 additions & 3 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,29 @@ const HomePage = () => {

<CookieComponent />
{/* //! Float Icon */}
{/* <FloatButton.Group

{/*
<FloatButton.Group
trigger="click"
type="primary"
style={{ right: 24 }}
icon={<CommentOutlined style={{}} />}
>
<FloatButton icon={<CustomerServiceOutlined />} />
<FloatButton
badge={{ count: 12 }}
icon={<QuestionCircleOutlined />}
/>
<FloatButton icon={<CommentOutlined />} />
</FloatButton.Group> */}
</FloatButton.Group>
*/}


{/* //! main content */}

<CategoriesPage />
Expand Down
27 changes: 13 additions & 14 deletions src/components/Navbar/SideBarDashBoard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const SideBarDashBoard = ({
className="bg-secondary "
collapsed={collapsed}
onCollapse={(value) => setCollapsed(value)}
width={300}
width={250}
style={{
overflow: "auto",
height: "110vh",
Expand All @@ -34,25 +34,24 @@ const SideBarDashBoard = ({
left: 0,
top: 0,
bottom: 0,
padding:"10px 0 0 0",
padding: "10px 0 0 0",
// width: "70vw",
// background: "red",
// background:"",
}}
>
<Link
href={`/${role}`}
className={`font-semibold font-serif text-primary text-center px-2 ${
collapsed ? "text-[0.7rem]" : "text-[1.4rem]"
} h-[4rem]`}
// style={{
// color: "white",
// fontSize: "1rem",
// textAlign: "center",
// fontFamily: "serif",
// marginBottom: "1rem",
// marginTop: "10px",
// }}
href={`/${role}`}
className={`font-semibold font-serif text-primary text-center px-2 ${collapsed ? "text-[0.7rem]" : "text-[1.4rem]"
} h-[4rem]`}
// style={{
// color: "white",
// fontSize: "1rem",
// textAlign: "center",
// fontFamily: "serif",
// marginBottom: "1rem",
// marginTop: "10px",
// }}
>

</Link>
Expand Down
516 changes: 516 additions & 0 deletions src/components/profile/ProfileInfo.tsx

Large diffs are not rendered by default.

123 changes: 123 additions & 0 deletions src/components/profile/ProfileUserSection.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
"use client";

import React from 'react'
import "./profile.css";
import Image from 'next/image';

export default function ProfileUserSection({ profileData }: { profileData: any }) {
return (
<div> <div className=" w-full px-6 mx-auto">
<div className="relative flex items-center p-0 mt-6 overflow-hidden bg-center bg-cover min-h-75 rounded-2xl"
style={{
backgroundImage:
"url(https://images.pexels.com/photos/220182/pexels-photo-220182.jpeg?auto=compress&cs=tinysrgb&w=600)",
backgroundPositionY: '50%',
backgroundSize: 'cover', // Add this property
}}>
<span
className="absolute inset-y-0 w-full h-full bg-center bg-cover bg-gradient-to-tl from-purple700 to-pink500 opacity-60"></span>
</div>
<div
className="relative flex flex-col flex-auto min-w-0 p-4 mx-6 -mt-16 overflow-hidden break-words border-0 shadow-blur rounded-2xl bg-white/80 bg-clip-border backdrop-blur-2xl backdrop-saturate-200">
<div className="flex flex-wrap -mx-3">
<div className="flex-none w-auto max-w-full px-3">
<div
className="text-base ease-soft-in-out h-16.5 w-18.5 relative inline-flex items-center justify-center rounded-xl text-white transition-all duration-200">
<Image height={100} width={100} src={profileData?.img} alt="profile_image" className="w-full shadow-soft-sm
rounded-xl" />
</div>
</div>
<div className="bre flex-none w-auto max-w-full px-3 my-auto">
<div className="h-full">
<h1 className="mb-1">{profileData?.name}</h1>
<p className="mb-0 font-semibold leading-normal text-sm text-gray-500 uppercase">{profileData?.role}</p>
</div>
</div>
<div className="w-full max-w-full px-3 mx-auto mt-4 sm:my-auto sm:mr-0 md:w-1/2 md:flex-none lg:w-4/12">
<div className="relative right-0">
<ul className="relative flex flex-wrap p-1 list-none bg-transparent rounded-xl" nav-pills role="tablist">
<li className="z-30 flex-auto text-center">
<a className="z-30 block w-full px-0 py-1 mb-0 transition-all border-0 rounded-lg ease-soft-in-out bg-inherit text-slate-700"
nav-link href="javascript:;" role="tab" aria-selected="true">
<svg className="text-slate-700" width="16px" height="16px" viewBox="0 0 42 42" version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlnsXlink="http://www.w3.org/1999/xlink">
<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g transform="translate(-2319.000000, -291.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g transform="translate(1716.000000, 291.000000)">
<g transform="translate(603.000000, 0.000000)">
<path className="fill-slate-800"
d="M22.7597136,19.3090182 L38.8987031,11.2395234 C39.3926816,10.9925342 39.592906,10.3918611 39.3459167,9.89788265 C39.249157,9.70436312 39.0922432,9.5474453 38.8987261,9.45068056 L20.2741875,0.1378125 L20.2741875,0.1378125 C19.905375,-0.04725 19.469625,-0.04725 19.0995,0.1378125 L3.1011696,8.13815822 C2.60720568,8.38517662 2.40701679,8.98586148 2.6540352,9.4798254 C2.75080129,9.67332903 2.90771305,9.83023153 3.10122239,9.9269862 L21.8652864,19.3090182 C22.1468139,19.4497819 22.4781861,19.4497819 22.7597136,19.3090182 Z">
</path>
<path className="fill-slate-800"
d="M23.625,22.429159 L23.625,39.8805372 C23.625,40.4328219 24.0727153,40.8805372 24.625,40.8805372 C24.7802551,40.8805372 24.9333778,40.8443874 25.0722402,40.7749511 L41.2741875,32.673375 L41.2741875,32.673375 C41.719125,32.4515625 42,31.9974375 42,31.5 L42,14.241659 C42,13.6893742 41.5522847,13.241659 41,13.241659 C40.8447549,13.241659 40.6916418,13.2778041 40.5527864,13.3472318 L24.1777864,21.5347318 C23.8390024,21.7041238 23.625,22.0503869 23.625,22.429159 Z"
opacity="0.7"></path>
<path className="fill-slate-800"
d="M20.4472136,21.5347318 L1.4472136,12.0347318 C0.953235098,11.7877425 0.352562058,11.9879669 0.105572809,12.4819454 C0.0361450918,12.6208008 6.47121774e-16,12.7739139 0,12.929159 L0,30.1875 L0,30.1875 C0,30.6849375 0.280875,31.1390625 0.7258125,31.3621875 L19.5528096,40.7750766 C20.0467945,41.0220531 20.6474623,40.8218132 20.8944388,40.3278283 C20.963859,40.1889789 21,40.0358742 21,39.8806379 L21,22.429159 C21,22.0503869 20.7859976,21.7041238 20.4472136,21.5347318 Z"
opacity="0.7"></path>
</g>
</g>
</g>
</g>
</svg>
<span className="ml-1">App</span>
</a>
</li>
<li className="z-30 flex-auto text-center">
<a className="z-30 block w-full px-0 py-1 mb-0 transition-all border-0 rounded-lg ease-soft-in-out bg-inherit text-slate-700"
nav-link href="javascript:;" role="tab" aria-selected="false">
<svg className="text-slate-700" width="16px" height="16px" viewBox="0 0 40 44" version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlnsXlink="http://www.w3.org/1999/xlink">
<title>document</title>
<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g transform="translate(-1870.000000, -591.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g transform="translate(1716.000000, 291.000000)">
<g transform="translate(154.000000, 300.000000)">
<path className="fill-slate-800"
d="M40,40 L36.3636364,40 L36.3636364,3.63636364 L5.45454545,3.63636364 L5.45454545,0 L38.1818182,0 C39.1854545,0 40,0.814545455 40,1.81818182 L40,40 Z"
opacity="0.603585379"></path>
<path className="fill-slate-800"
d="M30.9090909,7.27272727 L1.81818182,7.27272727 C0.814545455,7.27272727 0,8.08727273 0,9.09090909 L0,41.8181818 C0,42.8218182 0.814545455,43.6363636 1.81818182,43.6363636 L30.9090909,43.6363636 C31.9127273,43.6363636 32.7272727,42.8218182 32.7272727,41.8181818 L32.7272727,9.09090909 C32.7272727,8.08727273 31.9127273,7.27272727 30.9090909,7.27272727 Z M18.1818182,34.5454545 L7.27272727,34.5454545 L7.27272727,30.9090909 L18.1818182,30.9090909 L18.1818182,34.5454545 Z M25.4545455,27.2727273 L7.27272727,27.2727273 L7.27272727,23.6363636 L25.4545455,23.6363636 L25.4545455,27.2727273 Z M25.4545455,20 L7.27272727,20 L7.27272727,16.3636364 L25.4545455,16.3636364 L25.4545455,20 Z">
</path>
</g>
</g>
</g>
</g>
</svg>
<span className="ml-1">Messages</span>
</a>
</li>
<li className="z-30 flex-auto text-center">
<a className="z-30 block w-full px-0 py-1 mb-0 transition-colors border-0 rounded-lg ease-soft-in-out bg-inherit text-slate-700"
nav-link href="javascript:;" role="tab" aria-selected="false">
<svg className="text-slate-700" width="16px" height="16px" viewBox="0 0 40 40" version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlnsXlink="http://www.w3.org/1999/xlink">
<title>settings</title>
<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g transform="translate(-2020.000000, -442.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g transform="translate(1716.000000, 291.000000)">
<g transform="translate(304.000000, 151.000000)">
<polygon className="fill-slate-800" opacity="0.596981957"
points="18.0883333 15.7316667 11.1783333 8.82166667 13.3333333 6.66666667 6.66666667 0 0 6.66666667 6.66666667 13.3333333 8.82166667 11.1783333 15.315 17.6716667">
</polygon>
<path className="fill-slate-800"
d="M31.5666667,23.2333333 C31.0516667,23.2933333 30.53,23.3333333 30,23.3333333 C29.4916667,23.3333333 28.9866667,23.3033333 28.48,23.245 L22.4116667,30.7433333 L29.9416667,38.2733333 C32.2433333,40.575 35.9733333,40.575 38.275,38.2733333 L38.275,38.2733333 C40.5766667,35.9716667 40.5766667,32.2416667 38.275,29.94 L31.5666667,23.2333333 Z"
opacity="0.596981957"></path>
<path className="fill-slate-800"
d="M33.785,11.285 L28.715,6.215 L34.0616667,0.868333333 C32.82,0.315 31.4483333,0 30,0 C24.4766667,0 20,4.47666667 20,10 C20,10.99 20.1483333,11.9433333 20.4166667,12.8466667 L2.435,27.3966667 C0.95,28.7083333 0.0633333333,30.595 0.00333333333,32.5733333 C-0.0583333333,34.5533333 0.71,36.4916667 2.11,37.89 C3.47,39.2516667 5.27833333,40 7.20166667,40 C9.26666667,40 11.2366667,39.1133333 12.6033333,37.565 L27.1533333,19.5833333 C28.0566667,19.8516667 29.01,20 30,20 C35.5233333,20 40,15.5233333 40,10 C40,8.55166667 39.685,7.18 39.1316667,5.93666667 L33.785,11.285 Z">
</path>
</g>
</g>
</g>
</g>
</svg>
<span className="ml-1">Settings</span>
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
</div ></div>
)
}
Loading

2 comments on commit 6e6a771

@vercel
Copy link

@vercel vercel bot commented on 6e6a771 Feb 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checks for Deployment have failed

ordain-interior – ./

@vercel
Copy link

@vercel vercel bot commented on 6e6a771 Mar 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

ordain-interior – ./

ordain-interior-sarwar-asik.vercel.app
ordain-interior-git-main-sarwar-asik.vercel.app

Please sign in to comment.