-
Notifications
You must be signed in to change notification settings - Fork 49
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.
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
[Blueprint] - Add color wheel and modal ( in progress ) #2286
Merged
Rassl
merged 2 commits into
stakwork:master
from
MahtabBukhari:Blueprint_add_color_wheel_and_modal
Oct 3, 2024
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
/* eslint-disable */ | ||
import React from 'react' | ||
|
||
const ColorPickerIcon: React.FC<React.SVGProps<SVGSVGElement>> = (props) => ( | ||
<svg width="1em" height="1em" viewBox="0 0 8 8" fill="currentColor" xmlns="http://www.w3.org/2000/svg"> | ||
<path | ||
d="M5.5884 4.12155L3.88306 2.41429C3.8396 2.37079 3.80894 2.32471 3.79108 2.27605C3.77323 2.22738 3.7643 2.17524 3.7643 2.11963C3.7643 2.06401 3.77323 2.01206 3.79108 1.96379C3.80894 1.91553 3.8396 1.86964 3.88306 1.82614L5.5884 0.118886C5.63185 0.0753881 5.67788 0.0446995 5.72649 0.0268199C5.7751 0.00894031 5.82719 0 5.88275 0C5.9383 0 5.99019 0.00894031 6.0384 0.0268199C6.08662 0.0446995 6.13245 0.0753881 6.1759 0.118886L7.88125 1.82614C7.9247 1.86964 7.95536 1.91573 7.97321 1.96439C7.99107 2.01306 8 2.0652 8 2.12081C8 2.17643 7.99107 2.22838 7.97321 2.27664C7.95536 2.32491 7.9247 2.37079 7.88125 2.41429L6.1759 4.12155C6.13245 4.16505 6.08642 4.19574 6.03781 4.21362C5.9892 4.23149 5.93711 4.24043 5.88155 4.24043C5.826 4.24043 5.77412 4.23149 5.7259 4.21362C5.67768 4.19574 5.63185 4.16505 5.5884 4.12155ZM0 3.21787V0.804477C0 0.68544 0.0402151 0.585661 0.120645 0.505141C0.201076 0.424621 0.300743 0.384361 0.419648 0.384361H2.83035C2.94925 0.384361 3.04891 0.424621 3.12934 0.505141C3.20977 0.585661 3.24999 0.68544 3.24999 0.804477V3.21787C3.24999 3.3369 3.20977 3.43668 3.12934 3.5172C3.04891 3.59772 2.94925 3.63798 2.83035 3.63798H0.419648C0.300743 3.63798 0.201076 3.59772 0.120645 3.5172C0.0402151 3.43668 0 3.3369 0 3.21787ZM4.35715 7.57988V5.16649C4.35715 5.04746 4.39737 4.94768 4.4778 4.86716C4.55823 4.78664 4.65789 4.74638 4.77679 4.74638H7.18749C7.3064 4.74638 7.40607 4.78664 7.4865 4.86716C7.56693 4.94768 7.60714 5.04746 7.60714 5.16649V7.57988C7.60714 7.69892 7.56693 7.7987 7.4865 7.87922C7.40607 7.95974 7.3064 8 7.18749 8H4.77679C4.65789 8 4.55823 7.95974 4.4778 7.87922C4.39737 7.7987 4.35715 7.69892 4.35715 7.57988ZM0 7.57988V5.16649C0 5.04746 0.0402151 4.94768 0.120645 4.86716C0.201076 4.78664 0.300743 4.74638 0.419648 4.74638H2.83035C2.94925 4.74638 3.04891 4.78664 3.12934 4.86716C3.20977 4.94768 3.24999 5.04746 3.24999 5.16649V7.57988C3.24999 7.69892 3.20977 7.7987 3.12934 7.87922C3.04891 7.95974 2.94925 8 2.83035 8H0.419648C0.300743 8 0.201076 7.95974 0.120645 7.87922C0.0402151 7.7987 0 7.69892 0 7.57988Z" | ||
fill="currentColor" | ||
/> | ||
</svg> | ||
) | ||
|
||
export default ColorPickerIcon |
52 changes: 52 additions & 0 deletions
52
...lueprintModal/Body/Editor/ColorPickerPopover/ColorPickerPopoverView/ColorPicker/index.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
/* eslint-disable no-nested-ternary */ | ||
import styled from 'styled-components' | ||
import { Flex } from '~/components/common/Flex' | ||
|
||
import { colors } from '~/utils/colors' | ||
|
||
export const ColorPicker = () => ( | ||
<Wrapper direction="column" justify="flex-end"> | ||
<TableWrapper align="center" justify="center"> | ||
<p>this is color wrapper</p> | ||
</TableWrapper> | ||
</Wrapper> | ||
) | ||
|
||
const Wrapper = styled(Flex)` | ||
flex: 1; | ||
|
||
.title { | ||
font-size: 20px; | ||
color: ${colors.white}; | ||
font-family: Barlow; | ||
font-size: 22px; | ||
font-style: normal; | ||
font-weight: 600; | ||
line-height: normal; | ||
} | ||
|
||
.subtitle { | ||
color: ${colors.GRAY3}; | ||
font-family: Barlow; | ||
font-size: 13px; | ||
font-style: normal; | ||
font-weight: 400; | ||
line-height: normal; | ||
} | ||
|
||
& .filters { | ||
overflow-x: auto; | ||
} | ||
|
||
.load-more { | ||
margin: 8px auto; | ||
align-self: center; | ||
} | ||
` | ||
|
||
const TableWrapper = styled(Flex)` | ||
min-height: 0; | ||
overflow: auto; | ||
flex: 1; | ||
width: 100%; | ||
` |
125 changes: 125 additions & 0 deletions
125
...sContainer/BlueprintModal/Body/Editor/ColorPickerPopover/ColorPickerPopoverView/index.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,125 @@ | ||
import Tab from '@mui/material/Tab' | ||
import Tabs from '@mui/material/Tabs' | ||
import * as React from 'react' | ||
import styled from 'styled-components' | ||
import { Flex } from '~/components/common/Flex' | ||
import { colors } from '~/utils/colors' | ||
import { ColorPicker } from './ColorPicker' | ||
|
||
interface TabPanelProps { | ||
children?: React.ReactNode | ||
index: number | ||
value: number | ||
} | ||
|
||
const TabPanel = (props: TabPanelProps) => { | ||
const { children, value, index, ...other } = props | ||
|
||
return value === index ? ( | ||
<TabPanelWrapper | ||
aria-labelledby={`simple-tab-${index}`} | ||
hidden={value !== index} | ||
id={`simple-tabpanel-${index}`} | ||
role="tabpanel" | ||
{...other} | ||
> | ||
{children} | ||
</TabPanelWrapper> | ||
) : null | ||
} | ||
|
||
function a11yProps(index: number) { | ||
return { | ||
id: `simple-tab-${index}`, | ||
'aria-controls': `simple-tabpanel-${index}`, | ||
} | ||
} | ||
|
||
export const ColorPickerPopoverView = () => { | ||
const [value, setValue] = React.useState(0) | ||
|
||
const handleChange = (event: React.SyntheticEvent, newValue: number) => { | ||
setValue(newValue) | ||
} | ||
|
||
const tabs = [{ label: 'Color', component: ColorPicker }] | ||
|
||
return ( | ||
<Wrapper direction="column"> | ||
<StyledTabs aria-label="color picker" onChange={handleChange} value={value}> | ||
{tabs.map((tab, index) => ( | ||
<StyledTab key={tab.label} color={colors.white} disableRipple label={tab.label} {...a11yProps(index)} /> | ||
))} | ||
</StyledTabs> | ||
|
||
{tabs.map((tab, index) => ( | ||
<TabPanel key={tab.label} index={index} value={value}> | ||
<tab.component /> | ||
</TabPanel> | ||
))} | ||
</Wrapper> | ||
) | ||
} | ||
|
||
const StyledTabs = styled(Tabs)` | ||
&& { | ||
background: ${colors.modalBg}; | ||
border-radius: 9px 9px 0 0; | ||
.MuiTabs-indicator { | ||
width: 40px; | ||
background: ${colors.primaryBlue}; | ||
} | ||
} | ||
` | ||
|
||
const StyledTab = styled(Tab)` | ||
&& { | ||
padding: 20px 0 20px; | ||
color: ${colors.GRAY6}; | ||
margin-left: 30px; | ||
font-family: Barlow; | ||
font-size: 16px; | ||
font-style: normal; | ||
font-weight: 500; | ||
&.Mui-selected { | ||
color: ${colors.white}; | ||
} | ||
} | ||
` | ||
|
||
const TabPanelWrapper = styled(Flex)` | ||
display: flex; | ||
flex: 1; | ||
min-height: 572px; | ||
padding: 20px 0; | ||
max-height: 572px; | ||
overflow: auto; | ||
|
||
@media (max-width: 1024px) { | ||
width: 100%; | ||
min-height: 400px; | ||
max-height: 400px; | ||
} | ||
|
||
@media (max-width: 768px) { | ||
width: 100%; | ||
min-height: 300px; | ||
max-height: 300px; | ||
} | ||
|
||
@media (max-width: 480px) { | ||
width: 100%; | ||
min-height: 250px; | ||
max-height: 250px; | ||
} | ||
` | ||
|
||
const Wrapper = styled(Flex)` | ||
min-height: 0; | ||
flex: 1; | ||
overflow: hidden; | ||
|
||
@media (max-width: 768px) { | ||
padding: 3px; | ||
} | ||
` |
36 changes: 36 additions & 0 deletions
36
src/components/ModalsContainer/BlueprintModal/Body/Editor/ColorPickerPopover/index.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
import { ColorPickerPopoverView } from './ColorPickerPopoverView' | ||
import styled from 'styled-components' | ||
import { colors } from '~/utils' | ||
|
||
type Props = { | ||
isOpen: boolean | ||
} | ||
|
||
export const ColorPickerPopover = ({ isOpen }: Props) => ( | ||
<ModalBackground isOpen={isOpen}> | ||
<ModalContent> | ||
<ColorPickerPopoverView /> | ||
</ModalContent> | ||
</ModalBackground> | ||
) | ||
|
||
const ModalBackground = styled.div<{ isOpen: boolean }>` | ||
display: ${(props) => (props.isOpen ? 'block' : 'none')}; | ||
position: fixed; | ||
top: 0; | ||
left: 0; | ||
z-index: 2000; | ||
` | ||
|
||
const ModalContent = styled.div` | ||
position: fixed; | ||
top: 38%; | ||
left: 34%; | ||
transform: translate(-50%, -50%); | ||
background: ${colors.BG1}; | ||
width: 300px; | ||
height: 443px; | ||
z-index: 1001; | ||
border-radius: 8px; | ||
box-shadow: 0 5px 15px rgba(0, 0, 0, 0.3); | ||
` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
let's avoid this kinda naming, we should persue reusable naming, like blue, darkBlue etc, I will merge this, since we already have a mess with naming, just not for the future