diff --git a/src/Components/Artist/ArtistCard.jsx b/src/Components/Artist/ArtistCard.jsx index 3282d7b..e2ffce8 100644 --- a/src/Components/Artist/ArtistCard.jsx +++ b/src/Components/Artist/ArtistCard.jsx @@ -1,14 +1,21 @@ import React from "react"; -const ArtistCard = ({ clickk, setClickk, setCross, name }) => { +const ArtistCard = ({ + clickk, + setClickk, + setCross, + photoLink = "https://res.cloudinary.com/dhpqjrbha/image/upload/c_pad,b_auto:predominant,fl_preserve_transparency/v1710876326/sf7py4kekiyxmzcndxqp.jpg?_s=public-apps", + name, + profession = "Singer", +}) => { // const [clickk, setClickk] = useState(false); // console.log(clickk); const backFrame = "https://res.cloudinary.com/dhpqjrbha/image/upload/c_pad,b_auto:predominant,fl_preserve_transparency/v1711056518/Frame_2608596_hzjumh.jpg?_s=public-apps"; const frame = "https://res.cloudinary.com/dhpqjrbha/image/upload/c_pad,b_auto:predominant,fl_preserve_transparency/v1711056519/Group_2608667_reshtk.jpg?_s=public-apps"; - const photoLink = - "https://res.cloudinary.com/dhpqjrbha/image/upload/c_pad,b_auto:predominant,fl_preserve_transparency/v1710876326/sf7py4kekiyxmzcndxqp.jpg?_s=public-apps"; + // const photoLink = + // "https://res.cloudinary.com/dhpqjrbha/image/upload/c_pad,b_auto:predominant,fl_preserve_transparency/v1710876326/sf7py4kekiyxmzcndxqp.jpg?_s=public-apps"; return (
{
{ > {name}
-
- Singer +
+ {profession}
diff --git a/src/Components/Artist/ArtistPageAnimation.jsx b/src/Components/Artist/ArtistPageAnimation.jsx index 50a742f..b7ccb21 100644 --- a/src/Components/Artist/ArtistPageAnimation.jsx +++ b/src/Components/Artist/ArtistPageAnimation.jsx @@ -16,7 +16,7 @@ const ArtistPageAnimation = ({ first, second, third, setfirst, setsecond, setthi className={`relative w-[100%] transition-all duration-[1000ms] ease-in-out ${first || second || third ? "h-[50rem]" : " h-[25rem]"}`} >
{ return (
- + style={{ height: "auto", width: "100px" }} + > */} + Loading... {/*

Loading...

*/}
); diff --git a/src/Components/Loader/Loading.module.scss b/src/Components/Loader/Loading.module.scss index da60379..a949cd5 100644 --- a/src/Components/Loader/Loading.module.scss +++ b/src/Components/Loader/Loading.module.scss @@ -13,4 +13,5 @@ justify-content: center; align-items: center; overflow-x: hidden; + overflow-y: hidden; } diff --git a/src/Components/Loader/loader1.gif b/src/Components/Loader/loader1.gif new file mode 100644 index 0000000..9d0a4b2 Binary files /dev/null and b/src/Components/Loader/loader1.gif differ diff --git a/src/Pages/Artist/ArtistPage.jsx b/src/Pages/Artist/ArtistPage.jsx index 4697b75..8d35e6c 100644 --- a/src/Pages/Artist/ArtistPage.jsx +++ b/src/Pages/Artist/ArtistPage.jsx @@ -26,7 +26,7 @@ const ArtistPage = () => { const jaapi = "https://res.cloudinary.com/dhpqjrbha/image/upload/c_pad,b_auto:predominant,fl_preserve_transparency/v1711053903/OBJECTS_1_gvgj7g.jpg?_s=public-apps"; - const prevArtistData = [ + const UpArtistData = [ { id: 1, name: "Zubeen Garg", @@ -46,25 +46,69 @@ const ArtistPage = () => { "https://res.cloudinary.com/dhpqjrbha/image/upload/c_pad,b_auto:predominant,fl_preserve_transparency/v1710876326/sf7py4kekiyxmzcndxqp.jpg?_s=public-apps", }, ]; - - const UpArtistData = [ + const prevArtistData = [ { id: 1, - name: "Zubeen Garg", + name: "Dikshu Sharma", + profession: "Singer", photoLink: - "https://res.cloudinary.com/dhpqjrbha/image/upload/c_pad,b_auto:predominant,fl_preserve_transparency/v1710876326/sf7py4kekiyxmzcndxqp.jpg?_s=public-apps", + "https://res.cloudinary.com/dp92qug2f/image/upload/c_scale,w_760,f_auto,fl_lossy/v1677782744/posua/WhatsApp_Image_2023-03-03_at_00.15.12_nhe9xz.jpg", }, { id: 2, - name: "Zubeen Garg", + name: "Ranjit Gogoi", + profession: "Bihu Samrat", photoLink: - "https://res.cloudinary.com/dhpqjrbha/image/upload/c_pad,b_auto:predominant,fl_preserve_transparency/v1710876326/sf7py4kekiyxmzcndxqp.jpg?_s=public-apps", + "https://res.cloudinary.com/dp92qug2f/image/upload/c_scale,w_360,f_auto,fl_lossy/v1677783229/posua/DSC_0102_1_-min_obvt2f.jpg", }, { id: 3, + name: "Deusila", + profession: "Bihu Dol", + photoLink: + "https://assets.sentinelassam.com/h-upload/c_scale,w_360,f_auto,fl_lossy/2021/04/14/218865-bihu.webp?w=940&dpr=1.3", + }, + { + id: 4, + name: "Priyanka Bharali", + profession: "Singer", + photoLink: + "https://res.cloudinary.com/dp92qug2f/image/upload/c_scale,w_360,f_auto,fl_lossy/v1677513050/WhatsApp_Image_2023-02-27_at_20.35.22_ai2wby.jpg", + }, + { + id: 5, + name: "Tezpuriya Thespian", + profession: "Band", + photoLink: + "https://res.cloudinary.com/dp92qug2f/image/upload/v1677787106/posua/maxresdefault_edezq4.jpg", + }, + { + id: 6, name: "Zubeen Garg", + profession: "Singer", photoLink: - "https://res.cloudinary.com/dhpqjrbha/image/upload/c_pad,b_auto:predominant,fl_preserve_transparency/v1710876326/sf7py4kekiyxmzcndxqp.jpg?_s=public-apps", + "https://res.cloudinary.com/dp92qug2f/image/upload/c_scale,w_360,f_auto,fl_lossy/v1677785093/posua/Zubeen-Hospitalized-Shifted-to-ICU-for-24-Hours_1658305106491_1658305113562_1658305113562_fgv1gr.webp", + }, + { + id: 7, + name: "Neel Akash", + profession: "Singer", + photoLink: + "https://res.cloudinary.com/dp92qug2f/image/upload/c_scale,w_360,f_auto,fl_lossy/v1677785486/posua/278904714_3139465349627002_1271890122984205712_n.jpg_nmumpg.jpg", + }, + { + id: 8, + name: "Simanta Shekhar", + profession: "Singer", + photoLink: + "https://res.cloudinary.com/dp92qug2f/image/upload/c_scale,w_360,f_auto,fl_lossy/v1677785795/posua/artist_4642892-1500240408_vtmltu.jpg", + }, + { + id: 9, + name: "Manash Robin", + profession: "Singer", + photoLink: + "https://res.cloudinary.com/dp92qug2f/image/upload/v1677786083/posua/manas_sr8oab.jpg", }, ]; @@ -72,7 +116,7 @@ const ArtistPage = () => {
- {/* ************Previous Artist desktop view start1***************** */} + {/* ************Upcoming Artist desktop view start1***************** */}
{ setthird={setthird} />
- {/* ************Previous Artist desktop view end1***************** */} + {/* ************Upcoming Artist desktop view end1***************** */} - {/* ************Previous Artist mobile view start2***************** */} + {/* ************Upcoming Artist mobile view start2***************** */}
- {prevArtistData.map((profile) => { + {UpArtistData.map((profile) => { return ( {({ isActive }) => ( @@ -110,63 +154,67 @@ const ArtistPage = () => {
- {/* ************Previous Artist mobile view end2***************** */} + {/* ************Upcoming Artist mobile view end2***************** */} - {/*
- Art -
*/} - {/* ************Upcoming Artist desktop start***************** */} -
- - - + {/* ************Previous Artist desktop start***************** */} +
+ {prevArtistData.map((profile) => { + return ( + + ); + })}
- {/* ************Upcoming Artist desktop end***************** */} + {/* ************Previous Artist desktop end***************** */} - {/* ************Upcoming Artist mobile start***************** */} + {/* ************Previous Artist mobile start***************** */}
- {UpArtistData.map((profile) => { + {prevArtistData.map((profile) => { return ( {({ isActive }) => ( @@ -175,50 +223,116 @@ const ArtistPage = () => { style={{ overflowX: "unset" }} > {isActive ? setActive2(profile.id) : ""} - +
)} ); })} -
+
+
+
+
+
+
+
+
+
+
+
+
+
- {/* ************Upcoming Artist mobile start***************** */} + {/* ************Previous Artist mobile start***************** */} {/* *************Flower section start************** */}