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

Updated UI for dropdowns and button positioning in the course resourc… #111

Open
wants to merge 1 commit into
base: DOPE
Choose a base branch
from
Open

Updated UI for dropdowns and button positioning in the course resourc… #111

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
74 changes: 54 additions & 20 deletions src/components/CourseResource/CourseResourceContainer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ const CourseResourceContainer = () => {
const renderModuleDropdown = (modulesList) => {
if(modulesList.length !== 0){
return(
<Select
<ResourcesCustomSelect
style={{
// marginLeft: 'auto',
// alignSelf: 'end',
Expand All @@ -274,7 +274,7 @@ const CourseResourceContainer = () => {
{modulesList?.map((module_) => {
return <Select.Option key={module_}>{module_}</Select.Option>
})}
</Select>
</ResourcesCustomSelect>
)
}
return(
Expand All @@ -284,11 +284,12 @@ const CourseResourceContainer = () => {

const renderProfDropDown = () => {
return(
<Select
<ResourcesCustomSelect
style={{
// marginLeft: 'auto',
// alignSelf: 'end'
marginRight: '2rem'
marginRight: '2rem',
width: '8rem'
}}
placeholder="Select Prof"
showArrow
Expand All @@ -298,17 +299,19 @@ const CourseResourceContainer = () => {
{profPerModule[currentModule]?.map((prof) =>{
return <Select.Option key={prof}>{prof}</Select.Option>
})}
</Select>
</ResourcesCustomSelect>
)
}

const renderYearDropDown = (yearsList) => {
if(yearsList.length !== 0){
return(
<Select
// style={{
// alignSelf: 'end',
// }}
<ResourcesCustomSelect
style={{
// alignSelf: 'end',
width: '8rem',
}}
dropdownClassName='custom-dropdown'
placeholder="Select Year"
showArrow
onChange={handleYearChange}
Expand All @@ -318,7 +321,7 @@ const CourseResourceContainer = () => {
{yearPerProf[selectedProf]?.map((year_) =>{
return <Select.Option key={year_}>{year_}</Select.Option>
})}
</Select>
</ResourcesCustomSelect>
)
}
return null
Expand All @@ -329,31 +332,37 @@ const CourseResourceContainer = () => {

return (
<>
<Header>
<Header
style={{
justifyContent: 'space-between'
// alignContent: 'end'
}}
>
<h1 style={{ fontSize: '1.25rem' }}>Resources</h1>

<ButtonContainer>
<ButtonSquare
type="primary"
onClick={redirectContribute}
icon={<CloudUpload size="16" />}
>
Upload
</ButtonSquare>

{isMobileS ? (
<CourseContentRequestIcon
code={code}
type="resources"
style={{ marginRight: '0.75rem' , marginLeft: '0.75rem'}}
style={{ marginRight: '0rem' , marginLeft: '0.75rem'}}
/>
) : (
<CourseContentRequest
code={code}
type="resources"
style={{ marginRight: '0.75rem' , marginLeft: '0.75rem'}}
style={{ marginRight: '0rem' , marginLeft: '0.75rem'}}
/>
)}

<ButtonSquare
type="primary"
onClick={redirectContribute}
icon={<CloudUpload size="16" />}
>
Upload
</ButtonSquare>
</ButtonContainer>
</Header>
<Header
Expand Down Expand Up @@ -430,3 +439,28 @@ const Header = styled.div`
margin: 1rem 0;
`

const ResourcesCustomSelect = styled(Select)`
&& {


.ant-select-selector {
background-color: ${({ theme }) => theme.darksecondary};
color: ${({ theme }) => theme.textColor};
border-radius: 7px;
border: none;
align-items: center;
height: 35px;
}
.ant-select-arrow{
color: ${({ theme }) => theme.textColor};
}

.custom-dropdown .ant-select-dropdown.ant-select-dropdown-placement-bottomLeft {
background-color: green !important;
padding: 0;
margin: 0;
border-radius: 30px;
}

}
`