Merge pull request #283 from Build-Squad/28th-Mar-Feedback

28th march feedback
Build-Squad · Apr 1, 2024 · 5d5c6c4 · 5d5c6c4
2 parents d1c11af + 57fcb91
commit 5d5c6c4
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 19 deletions.
diff --git a/src/ui/app/business/components/elevateSection/index.tsx b/src/ui/app/business/components/elevateSection/index.tsx
@@ -16,13 +16,13 @@ const TABS = [
 
 const FirstTabComponent = () => {
   const [articleImage1, setArticleImage1] = useState(
-    "https://xfluencer.s3.eu-west-2.amazonaws.com/static/inf_cards2.png"
+    "https://xfluencer.s3.eu-west-2.amazonaws.com/static/explorepg.png"
   );
 
   const [currentImage1Index, setCurrentImage1Index] = useState(0);
 
   const Image1 = [
-    "https://xfluencer.s3.eu-west-2.amazonaws.com/static/inf_cards2.png",
+    "https://xfluencer.s3.eu-west-2.amazonaws.com/static/explorepg.png",
     "https://xfluencer.s3.eu-west-2.amazonaws.com/static/inf_cards5.png",
   ];
 

diff --git a/src/ui/app/components/navbar/index.tsx b/src/ui/app/components/navbar/index.tsx
@@ -273,6 +273,16 @@ export default function Navbar({ setCategoryOpen, categoryOpen }: NavbarProps) {
     router.push(`/login?role=${roleQueryParams}`);
   };
 
+  const getButtonVariant = (type: string) => {
+    // A temp hack considering if the user is not logged in,
+    // only business owner will view the influencer's profile
+    if (!user?.loggedIn && pathname.includes("influencer/profile")) {
+      if (type == "influencer") return "outlined";
+      if (type == "business") return "contained";
+    }
+    return pathname.includes(type) ? "contained" : "outlined";
+  };
+
   return (
     <AppBar
       position="static"
@@ -314,9 +324,7 @@ export default function Navbar({ setCategoryOpen, categoryOpen }: NavbarProps) {
             }}
           >
             <Button
-              variant={
-                pathname.includes("influencer") ? "contained" : "outlined"
-              }
+              variant={getButtonVariant("influencer")}
               color="secondary"
               sx={{
                 borderRadius: "20px",
@@ -328,7 +336,7 @@ export default function Navbar({ setCategoryOpen, categoryOpen }: NavbarProps) {
               For Influencer
             </Button>
             <Button
-              variant={pathname.includes("business") ? "contained" : "outlined"}
+              variant={getButtonVariant("business")}
               color="secondary"
               sx={{
                 borderRadius: "20px",

diff --git a/src/ui/app/influencer/profile/[id]/_referrals/index.tsx b/src/ui/app/influencer/profile/[id]/_referrals/index.tsx
@@ -107,7 +107,7 @@ export default function Referrals({}: Props) {
           </Grid>
           <Grid item xs={6} sm={6} md={6} lg={6}>
             <Typography variant="h4" fontWeight={"bold"}>
-              {getTotalEarnings()} Tokens
+              {getTotalEarnings()} Points
             </Typography>
             <Typography>Total Earnings</Typography>
           </Grid>
@@ -281,7 +281,7 @@ export default function Referrals({}: Props) {
                       sx={{
                         borderRadius: "100%",
                         px: 1,
-                        mt:0.5,
+                        mt: 0.5,
                         color: "white",
                         backgroundColor: "black",
                         height: "fit-content",
@@ -294,13 +294,52 @@ export default function Referrals({}: Props) {
                   </Box>
                 );
               })}
-              <ul style={{ marginTop: "0px" }}>
-                <li>Upto 100 followers - 100 points</li>
-                <li>1000 followers - 200 points</li>
-                <li>10000 followers - 500 points</li>
-                <li>100000 followers - 1000 points</li>
-                <li>More than 1000000 followers - 10000 points</li>
-              </ul>
+              <Table>
+                <TableHead>
+                  <TableRow>
+                    <TableCell>
+                      <Typography
+                        sx={{
+                          fontWeight: "bold",
+                        }}
+                      >
+                        No. Of Followers
+                      </Typography>
+                    </TableCell>
+                    <TableCell>
+                      <Typography
+                        sx={{
+                          fontWeight: "bold",
+                        }}
+                      >
+                        Points
+                      </Typography>
+                    </TableCell>
+                  </TableRow>
+                </TableHead>
+                <TableBody>
+                  <TableRow>
+                    <TableCell>Upto 100</TableCell>
+                    <TableCell>100</TableCell>
+                  </TableRow>
+                  <TableRow>
+                    <TableCell>Upto 1000</TableCell>
+                    <TableCell>200</TableCell>
+                  </TableRow>
+                  <TableRow>
+                    <TableCell>Upto 10000</TableCell>
+                    <TableCell>500</TableCell>
+                  </TableRow>
+                  <TableRow>
+                    <TableCell>Upto 100000</TableCell>
+                    <TableCell>1000</TableCell>
+                  </TableRow>
+                  <TableRow>
+                    <TableCell>{">="} 1000000</TableCell>
+                    <TableCell>10000</TableCell>
+                  </TableRow>
+                </TableBody>
+              </Table>
               <Box>
                 <Typography
                   variant="caption"

diff --git a/src/ui/app/login/page.tsx b/src/ui/app/login/page.tsx
@@ -47,7 +47,7 @@ const Login: React.FC = () => {
     if (isTwitterUserLoggedIn) {
       const redirectRoute =
         user?.user?.role?.name == "business_owner"
-          ? "/business"
+          ? "/business/explore"
           : "/influencer";
       router.push(redirectRoute);
     }
@@ -126,8 +126,8 @@ const Login: React.FC = () => {
           </Typography>
           <Typography variant="caption" sx={{ lineHeight: "2px" }}>
             {loginAs == "Business"
-              ? "Discover a world of opportunity on our marketplace, where you can connect with top influencers on X to elevate your brand's presence. Browse through a variety of services, from tweets to retweets and more, all priced in Solana – the trusted cryptocurrency for secure transactions."
-              : "Monetize your X influence with our marketplace. Set your rates in Solana and showcase your services to businesses eager to connect with you. Link your X account to get started!"}
+              ? "Discover a world of opportunity on our marketplace, where you can connect with top influencers or creators on X. Browse through a variety of services, from tweets, retweets and many more."
+              : "Monetize your X influence with our marketplace. Set your rates and showcase your services to businesses eager to connect with you. Link your X account to get started!"}
           </Typography>
         </Box>
 

diff --git a/src/ui/src/components/profileComponents/serviceCard/index.tsx b/src/ui/src/components/profileComponents/serviceCard/index.tsx
@@ -200,7 +200,7 @@ export default function ServiceCard({
                 sx={{
                   display: "flex",
                   alignItems: "center",
-                  justifyContent: "center",
+                  justifyContent: "flex-end",
                   width: "100%",
                 }}
               >