Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(open-spark): fixed issue which discussed during demo call #2736

Merged
merged 1 commit into from
Dec 12, 2024
Merged

fix(open-spark): fixed issue which discussed during demo call #2736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/open-spark/components/card/Card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const CardWithCheckBox: React.FC<CardBoxPropsModel> = props => {
<Card
className="border_radius_all"
onClick={handleOnclick}
boxShadow={'0px 20px 25px 0px rgba(0, 0, 0, 0.1)'}
>
<CardBody
padding={'20px 10px'}
Expand Down
19 changes: 11 additions & 8 deletions apps/open-spark/pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ const Homepage = () => {
})
const [preferencesTags, setPreferencesTags] = useState<string[]>([])
const totalEnergyText = role === ROLE.PRODUCER ? 'Produced' : 'Consumption'
const currentAndPreffernceTest = role === ROLE.PRODUCER ? 'My Preferences' : 'Current Trade'

const payloadStartDate = parseAndFormatDate(startDate)
const payloadEndDate = parseAndFormatDate(endDate)
Expand Down Expand Up @@ -233,7 +234,7 @@ const Homepage = () => {
>
<HStack>
<Typography
text="Current Trade"
text={currentAndPreffernceTest}
fontSize="15"
fontWeight="600"
/>
Expand Down Expand Up @@ -308,12 +309,14 @@ const Homepage = () => {
fontSize="14px"
fontWeight="600"
/>
<Typography
text={latestStatus?.status === 'RECEIVED' ? 'Pending' : 'Completed'}
fontSize="12px"
fontWeight="600"
color={latestStatus?.status === 'RECEIVED' ? '#BD942B' : '#5EC401'}
/>
{currentStatusData.length < 0 ? (
<Typography
text={latestStatus?.status === 'RECEIVED' ? 'Pending' : 'Completed'}
fontSize="12px"
fontWeight="600"
color={latestStatus?.status === 'RECEIVED' ? '#BD942B' : '#5EC401'}
/>
) : null}
</Flex>
<Divider />
<Box mt={'10px'}>
Expand All @@ -338,7 +341,7 @@ const Homepage = () => {
<BecknButton
children={role === ROLE.CONSUMER ? 'Buy' : 'Sell'}
handleClick={() => router.push(role === ROLE.PRODUCER ? '/sellingPreference' : '/buyingPreference')}
sx={{ marginTop: '30px' }}
sx={{ marginTop: '100px' }}
/>
</Box>
<SelectDate
Expand Down
4 changes: 3 additions & 1 deletion apps/open-spark/pages/myTrades.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,16 @@ const MyTrades = () => {
className="hideScroll"
maxH={'calc(100vh - 80px)'}
overflowY="scroll"
pb={'20px'}
>
<Flex
gap="1rem"
flexDirection={'column'}
>
{tradeList.map(trade => {
{tradeList.map((trade, index) => {
return (
<Card
key={index}
handleOnclick={() => handleOnCardClick(trade)}
childComponent={() => {
return (
Expand Down
1 change: 1 addition & 0 deletions apps/open-spark/pages/welcome.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ const welcome = () => {
margin={{ base: '0px', lg: '150px', md: '100px' }}
flexDir={'column'}
rowGap={'10px'}
marginTop={'200px'}
>
<BecknButton
dataTest={'consumer_button'}
Expand Down