From 0bffd72e36b1cb98458ebcc0d88ad727f3b25919 Mon Sep 17 00:00:00 2001 From: AhsanFarooqDev Date: Thu, 2 Jan 2025 14:35:30 +0500 Subject: [PATCH 01/24] fix vertical scroll on workspace planner page --- src/people/WorkSpacePlanner/index.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/people/WorkSpacePlanner/index.tsx b/src/people/WorkSpacePlanner/index.tsx index 15bd9d80..6bc9257b 100644 --- a/src/people/WorkSpacePlanner/index.tsx +++ b/src/people/WorkSpacePlanner/index.tsx @@ -15,7 +15,8 @@ const PlannerContainer = styled.div` padding: 0; height: calc(100vh - 65px); background: ${colors.light.grayish.G950}; - overflow: hidden; + overflow-y: auto; + overflow-x: hidden; `; const ContentArea = styled.div` @@ -54,7 +55,8 @@ const Column = styled.div` border-radius: 8px; display: flex; flex-direction: column; - max-height: 100%; + height: auto; + min-height: 500px; `; const ColumnHeader = styled.div` From 2bb6dfa7affd26f7c58b502189cd40c9aa276480 Mon Sep 17 00:00:00 2001 From: jordan-ae Date: Thu, 2 Jan 2025 10:37:03 +0100 Subject: [PATCH 02/24] chore: update time for debug function --- src/people/hiveChat/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/people/hiveChat/index.tsx b/src/people/hiveChat/index.tsx index 4cf1a6c3..3d001439 100644 --- a/src/people/hiveChat/index.tsx +++ b/src/people/hiveChat/index.tsx @@ -264,7 +264,7 @@ export const HiveChatView: React.FC = observer(() => { debounceUpdateTitle = setTimeout(() => { updateChatTitle(chatId, uuid, title, setIsUpdatingTitle); - }, 500); + }, 1500); }; const onTitleChange = (event: React.ChangeEvent) => { From dd9220fcffae0fb398100961076f5d457270c914 Mon Sep 17 00:00:00 2001 From: MahtabBukhari Date: Thu, 2 Jan 2025 15:46:03 +0500 Subject: [PATCH 03/24] Quick changes to h --- .../BountyComponents/BountySteps.tsx | 31 +++++++++++++++++-- src/components/common/TopEarners/index.tsx | 30 ++++++++++++++++++ src/pages/BountiesLandingPage/index.tsx | 26 +++++++--------- 3 files changed, 69 insertions(+), 18 deletions(-) diff --git a/src/components/BountyComponents/BountySteps.tsx b/src/components/BountyComponents/BountySteps.tsx index 08dcafad..858c38fa 100644 --- a/src/components/BountyComponents/BountySteps.tsx +++ b/src/components/BountyComponents/BountySteps.tsx @@ -27,6 +27,17 @@ const StepText = styled.span` font-weight: 500; `; +const StepLink = styled.a` + color: ${colors.light.text1}; + font-weight: 500; + text-decoration: none; + color: ${colors.light.blue1}; + &:hover { + color: ${colors.light.blue2}; + text-decoration: none; + } +`; + const StepTitle = styled.h6` font-size: 20px; font-family: 'Barlow'; @@ -37,6 +48,7 @@ const StepTitle = styled.h6` interface Step { text: string; + link?: string; } const steps: Step[] = [ @@ -44,7 +56,8 @@ const steps: Step[] = [ text: 'Sign up for a Sphinx by clicking the Get Sphinx button!' }, { - text: 'Check out the open bounties, by clicking bounties!' + text: 'Check out the', + link: 'https://community.sphinx.chat/bounties' }, { text: 'Reach out to the bounty provider by clicking "I can help!"' @@ -53,7 +66,7 @@ const steps: Step[] = [ text: 'Introduce yourself and get assigned' }, { - text: 'Compelte the work and get paid directly to your Sphinx Wallet!' + text: 'Complete the work and get paid directly to your Sphinx Wallet!' } ]; @@ -63,7 +76,19 @@ export const BountySteps: React.FC = () => ( {steps.map((step: Step, index: number) => ( {`Step ${index + 1}:`} - {step.text} + + {step.link ? ( + <> + {step.text}{' '} + + open bounties, by clicking bounties + + ! + + ) : ( + step.text + )} + ))} diff --git a/src/components/common/TopEarners/index.tsx b/src/components/common/TopEarners/index.tsx index 42889b7c..c75d7ee1 100644 --- a/src/components/common/TopEarners/index.tsx +++ b/src/components/common/TopEarners/index.tsx @@ -68,6 +68,31 @@ const ErrorContainer = styled.div` color: ${colors.light.red1}; `; +const ViewBountiesButton = styled.button` + margin-top: 60px; + padding: 12px 24px; + font-size: 16px; + font-weight: bold; + color: white; + background-color: ${colors.light.blue1}; + border: none; + border-radius: 8px; + cursor: pointer; + transition: background-color 0.3s; + display: block; + margin-left: auto; + margin-right: auto; + + &:hover { + background-color: ${colors.light.blue2}; + } + + &:focus { + outline: none; + box-shadow: 0 0 0 2px ${colors.light.blue2}; + } +`; + const TopEarners = observer(({ limit = 5, className, style, onError }: TopEarnersProps) => { const { leaderboard } = useStores(); const [error, setError] = useState(null); @@ -86,6 +111,10 @@ const TopEarners = observer(({ limit = 5, className, style, onError }: TopEarner fetchData(); }, [leaderboard, onError]); + const handleViewBountiesClick = () => { + window.open('https://community.sphinx.chat/bounties', '_blank'); + }; + if (error) { return ( @@ -111,6 +140,7 @@ const TopEarners = observer(({ limit = 5, className, style, onError }: TopEarner ))} + View Open Bounties ); }); diff --git a/src/pages/BountiesLandingPage/index.tsx b/src/pages/BountiesLandingPage/index.tsx index 9fdc08b6..2259e959 100644 --- a/src/pages/BountiesLandingPage/index.tsx +++ b/src/pages/BountiesLandingPage/index.tsx @@ -3,8 +3,6 @@ import React from 'react'; import styled from 'styled-components'; import { useIsMobile } from '../../hooks'; import { colors } from '../../config/colors'; -import { BountiesHeader, HeaderWrap, Leftheader } from '../tickets/style.ts'; -import { BountyHeaderContent } from '../tickets/workspace/workspaceHeader/WorkspaceHeaderStyles.tsx'; import TopEarners from '../../components/common/TopEarners/index.tsx'; import { BountyComponents } from '../../components/BountyComponents'; @@ -14,24 +12,29 @@ const BountiesLandingPage: React.FC = () => { const color = colors['light']; const Body = styled.div<{ isMobile: boolean }>` - flex: 1; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; height: ${(p: { isMobile: boolean }) => p.isMobile ? 'calc(100% - 105px)' : 'calc(100vh - 60px)'}; background: ${(p: { isMobile: boolean }) => (p.isMobile ? undefined : color.grayish.G950)}; width: 100%; overflow-x: hidden; overflow-y: auto; - display: flex; - flex-direction: column; `; const ContentWrapper = styled.div` max-width: 1400px; - min-height: 650px; - margin: 30px auto; width: 100%; - padding: 40px 40px 40px 30px; + padding: 40px; background: white; + box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1); + border-radius: 8px; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; `; const ContentGrid = styled.div` @@ -89,13 +92,6 @@ const BountiesLandingPage: React.FC = () => { return ( - - - - Bounties - - - From 0a24011c0f2c4330168e5d2449610f11181ebe34 Mon Sep 17 00:00:00 2001 From: MahtabBukhari Date: Thu, 2 Jan 2025 16:20:18 +0500 Subject: [PATCH 04/24] style text should be same at step --- src/pages/BountiesLandingPage/index.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/pages/BountiesLandingPage/index.tsx b/src/pages/BountiesLandingPage/index.tsx index 2259e959..c074f99e 100644 --- a/src/pages/BountiesLandingPage/index.tsx +++ b/src/pages/BountiesLandingPage/index.tsx @@ -80,13 +80,11 @@ const BountiesLandingPage: React.FC = () => { } p { - font-family: Barlow; margin-bottom: 16px; + font-weight: 500; line-height: 1.6; word-wrap: break-word; - max-width: 550px; - color: ${color.text2}; - font-size: 15px; + max-width: 560px; } `; From 6d0fc256230db55a3a8832d2100614ed90a5851b Mon Sep 17 00:00:00 2001 From: saithsab877 Date: Thu, 2 Jan 2025 19:31:04 +0500 Subject: [PATCH 05/24] feat: add view bounties button to workspace --- src/people/widgetViews/WorkspaceMission.tsx | 23 +++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/people/widgetViews/WorkspaceMission.tsx b/src/people/widgetViews/WorkspaceMission.tsx index b2770046..b6479146 100644 --- a/src/people/widgetViews/WorkspaceMission.tsx +++ b/src/people/widgetViews/WorkspaceMission.tsx @@ -428,6 +428,10 @@ const WorkspaceMission = () => { history.push(`/workspace/${uuid}/planner`); }; + const handleViewBounties = () => { + window.open('https://community.sphinx.chat/workspace/bounties', '_blank'); + }; + const handleUserRepoOptionClick = (repositoryId: number) => { setDisplayUserRepoOptions((prev: Record) => ({ ...prev, @@ -1091,6 +1095,25 @@ const WorkspaceMission = () => { /> )} + +