Merge pull request #476 from us3r-network/u3-dev

beta.12
degencast · Jan 23, 2024 · ca8cb69 · ca8cb69
2 parents fa0c156 + e661729
commit ca8cb69
Show file tree

Hide file tree

Showing 21 changed files with 213 additions and 178 deletions.
diff --git a/apps/u3/src/components/common/assets/imgs/logo-icon.svg b/apps/u3/src/components/common/assets/imgs/logo-icon.svg
diff --git a/apps/u3/src/components/common/button/ColorButton.tsx b/apps/u3/src/components/common/button/ColorButton.tsx
@@ -9,7 +9,7 @@ export default function ColorButton({
   return (
     <Button
       className={cn(
-        'h-[48px] p-[12px] gap-[8px] rounded-[12px] text-white text-[16px] font-bold bg-[linear-gradient(90deg,_#CD62FF_0%,_#62AAFF_100%)]',
+        'h-[48px] p-[12px] gap-[8px] rounded-[12px] text-white text-[16px] font-bold bg-[#5057AA] hover:bg-[#454C99]',
         className
       )}
       {...props}

diff --git a/apps/u3/src/components/dapp/launcher/DappMenu.tsx b/apps/u3/src/components/dapp/launcher/DappMenu.tsx
@@ -110,6 +110,7 @@ const ListInner = styled.div`
   overflow-y: auto;
 `;
 const Title = styled.div`
+  width: 40px;
   font-weight: 400;
   font-size: 12px;
   line-height: 14px;

diff --git a/apps/u3/src/components/dapp/launcher/imgs/explore-dapps.png b/apps/u3/src/components/dapp/launcher/imgs/explore-dapps.png
diff --git a/apps/u3/src/components/layout/menu.tsx b/apps/u3/src/components/layout/menu.tsx
@@ -38,7 +38,7 @@ export default function Menu() {
         ) : (
           <span
             className={
-              'w-[fit-content] flex px-[4px] py-[2px] items-center rounded-[22px] bg-[linear-gradient(52deg,_#CD62FF_35.31%,_#62AAFF_89.64%)] text-[#ffffff] text-[10px] font-medium'
+              'w-[fit-content] flex px-[4px] py-[2px] items-center rounded-[22px] bg-[#454C99] text-[#ffffff] text-[10px] font-medium'
             }
           >
             Alpha

diff --git a/apps/u3/src/components/notification/NotificationModal.tsx b/apps/u3/src/components/notification/NotificationModal.tsx
@@ -227,7 +227,12 @@ export function FarcasterNotificationItem({
       break;
     case MessageType.LINK_ADD:
       return (
-        <NotificationItem>
+        <NotificationItem
+          onClick={() => {
+            navigate(`/u/${userData.userName}.fcast`);
+            setOpenNotificationModal(false);
+          }}
+        >
           <Avatar src={userData.pfp} />
           <UserActionWraper>
             <UserAction>
@@ -348,7 +353,12 @@ function LensNotificationItem({
       break;
     case LensNotificationType.NEW_FOLLOWER:
       return (
-        <NotificationItem>
+        <NotificationItem
+          onClick={() => {
+            navigate(`/u/${notification.followers[0].handle.fullHandle}.lens`);
+            setOpenNotificationModal(false);
+          }}
+        >
           <Avatar src={getAvatar(notification.followers[0])} />
           <UserActionWraper>
             <UserAction>
@@ -368,7 +378,12 @@ function LensNotificationItem({
       break;
     case LensNotificationType.NEW_MENTION:
       return (
-        <NotificationItem>
+        <NotificationItem
+          onClick={() => {
+            navigate(`/social/post-detail/lens/${notification.publication.id}`);
+            setOpenNotificationModal(false);
+          }}
+        >
           <Avatar src={getAvatar(notification.publication.by)} />
           <UserActionWraper>
             <UserAction>

diff --git a/apps/u3/src/components/profile/ProfileFollowBtn.tsx b/apps/u3/src/components/profile/ProfileFollowBtn.tsx
@@ -172,7 +172,6 @@ export default function ProfileFollowBtn({
 }
 
 const Wrapper = styled(SocialButtonPrimary)`
-  color: #000;
   font-family: Baloo Bhai 2;
   font-size: 12px;
   font-style: normal;

diff --git a/apps/u3/src/components/social/PostCard.tsx b/apps/u3/src/components/social/PostCard.tsx
@@ -324,9 +324,9 @@ const Handle = styled.div`
 export const PostCardShowMoreWrapper = styled.div`
   > button {
     border: none;
-    background: linear-gradient(87deg, #cd62ff 0%, #62aaff 100%);
+    background: #454c99;
     -webkit-background-clip: text;
-    color: transparent;
+    color: #fff;
     padding: 0;
     cursor: pointer;
   }
@@ -477,12 +477,12 @@ export const PostCardNftWrapper = styled.div`
     > button {
       cursor: pointer;
       border-radius: 10px;
-      background: linear-gradient(81deg, #cd62ff 0%, #62aaff 100%);
+      background: #454c99;
       padding: 10px 20px;
       border: none;
       outline: none;
       color: inherit;
-      color: #000;
+      color: #fff;
       font-family: Rubik;
       font-size: 16px;
       font-style: normal;

diff --git a/apps/u3/src/components/social/PostReply.tsx b/apps/u3/src/components/social/PostReply.tsx
@@ -55,10 +55,7 @@ const PostReplyWrapper = styled.div<{
   cursor: ${(props) => (props.disabled ? '' : 'pointer')};
 
   color: #718096;
-  background: ${(props) =>
-    props.replied
-      ? 'linear-gradient(78deg, #cd62ff 0%, #62aaff 100%)'
-      : 'initial'};
+  background: ${(props) => (props.replied ? '#454C99' : 'initial')};
   background-clip: ${(props) => (props.replied ? 'text' : 'initial')};
   -webkit-background-clip: ${(props) => (props.replied ? 'text' : 'initial')};
   -webkit-text-fill-color: ${(props) =>
@@ -77,16 +74,13 @@ const PostReplyWrapper = styled.div<{
     align-items: center;
     justify-content: center;
     border-radius: 50%;
-    background: ${(props) =>
-      props.hover
-        ? 'linear-gradient(45deg, rgba(205, 98, 255, 0.20) 0%, rgba(98, 170, 255, 0.20) 100%);'
-        : 'transparent'};
+    background: ${(props) => (props.hover ? '#454C99' : 'transparent')};
   }
   &:hover {
     ${(props) =>
       !props.disabled &&
       `
-      background: linear-gradient(78deg, #cd62ff 0%, #62aaff 100%);
+      background: #454C99;
       background-clip: text;
       -webkit-background-clip: text;
       -webkit-text-fill-color: transparent;

diff --git a/apps/u3/src/components/social/button/SocialButton.tsx b/apps/u3/src/components/social/button/SocialButton.tsx
@@ -1,7 +1,8 @@
 import styled from 'styled-components';
-import { ButtonPrimary } from '../../common/button/ButtonBase';
+import ColorButton from '@/components/common/button/ColorButton';
+import { ButtonPrimaryLine } from '@/components/common/button/ButtonBase';
 
-export const SocialButtonPrimary = styled(ButtonPrimary)`
+export const SocialButtonPrimary = styled(ColorButton)`
   height: 40px;
   padding: 10px 20px;
   box-sizing: border-box;
@@ -11,26 +12,19 @@ export const SocialButtonPrimary = styled(ButtonPrimary)`
   gap: 10px;
   flex-shrink: 0;
   border-radius: 10px;
-  background: linear-gradient(87deg, #cd62ff 0%, #62aaff 100%);
 
-  color: #000;
+  color: #fff;
   font-family: Rubik;
   font-size: 16px;
   font-style: normal;
   font-weight: 700;
   line-height: normal;
 `;
 
-export const SocialButtonPrimaryLine = styled(SocialButtonPrimary)`
-  border: 1px solid #cd62ff;
-
+export const SocialButtonPrimaryLine = styled(ButtonPrimaryLine)`
   font-family: Baloo Bhai 2;
   font-size: 12px;
   font-style: normal;
   font-weight: 700;
   line-height: normal;
-  background: linear-gradient(83deg, #cd62ff 0%, #62aaff 100%);
-  background-clip: text;
-  -webkit-background-clip: text;
-  -webkit-text-fill-color: transparent;
 `;
diff --git a/apps/u3/src/components/social/farcaster/FCastReply.tsx b/apps/u3/src/components/social/farcaster/FCastReply.tsx
@@ -8,7 +8,7 @@ import useLogin from '@/hooks/shared/useLogin';
 
 import { FCastChannelPicker } from '@/components/social/farcaster/FCastChannelPicker';
 import FarcasterInput from '@/components/social/farcaster/FarcasterInput';
-import { Button } from '@/components/ui/button';
+import ColorButton from '@/components/common/button/ColorButton';
 
 export function ReplyCast({
   replyAction,
@@ -63,8 +63,8 @@ export function ReplyCast({
             disabled
           />
           <div className="flex-grow" />
-          <Button
-            className="h-10 rounded-[10px] text-black text-[16px] bg-gradient-to-r from-[#cd62ff] to-[#62aaff]"
+          <ColorButton
+            className="h-10 rounded-[10px] text-[16px]"
             onClick={() => {
               if (!isLoginU3) {
                 loginU3();
@@ -74,7 +74,7 @@ export function ReplyCast({
             }}
           >
             Reply
-          </Button>
+          </ColorButton>
         </div>
       </div>
     </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,7 @@ export default function Menu() { @@
             ) : (
               <span
                 className={
-                  'w-[fit-content] flex px-[4px] py-[2px] items-center rounded-[22px] bg-[linear-gradient(52deg,_#CD62FF_35.31%,_#62AAFF_89.64%)] text-[#ffffff] text-[10px] font-medium'
+                  'w-[fit-content] flex px-[4px] py-[2px] items-center rounded-[22px] bg-[#454C99] text-[#ffffff] text-[10px] font-medium'
                 }
               >
                 Alpha
@@ Expand Down @@