Skip to content

WJOAPGME #50

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

Merged
merged 1 commit into from
May 5, 2021
Merged

WJOAPGME #50

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
10 changes: 3 additions & 7 deletions client/src/pages/proposalManagement/ProposalManagement.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
align-content: flex-wrap;
}

.ProposalManagementOuter {
display: absolute;
}

.proposalManagementLeft{
margin-left: 2em;
width: 30%;
Expand Down Expand Up @@ -96,14 +92,14 @@

.linkNewDescription{
height:100%;
width: 100%;
width: 40%;
margin-right:3%;
padding-left: 1%;
}

.moneyNewDescription{
height:100%;
width: 70%;
width: 20%;
margin-right: 50%;
padding-left: 1%;
}
Expand Down Expand Up @@ -162,5 +158,5 @@ textarea:focus {

.genericProposalButton {
background: var(--black);
width: 100%;
width: 10%;
}
32 changes: 17 additions & 15 deletions client/src/pages/proposalManagement/ProposalManagement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ function ProposalManagement(props) {
if (PRIVILEGES === 'Admin') {
return (
<div className = "ProposalManagementOuter">
<div className="proposalManagement">
<div className="proposalManagement">
<div className="proposalManagementLeft">
<div className="icons">
<div className={enterEditingIconClassName}>
Expand All @@ -173,21 +173,21 @@ function ProposalManagement(props) {
title='Remove Selected Proposals' onClick={handleRemoveProposals}/>
</div>
</div>
<div className="proposal-list">
{proposals.map((proposal) => (
<Row
title={proposal.title}
description={proposal.description}
mode={deletingMode}
isManagement= {IS_MANAGEMENT}
vote={proposal.voted ? proposal.voted : ""}
proposalCheckboxOnClick = {() => {updateProposalDeleteIDs(proposal);}}
isChecked={proposal.checked}
/>
))}
</div>
<div className="proposal-list">
{proposals.map((proposal) => (
<Row
title={proposal.title}
description={proposal.description}
mode={deletingMode}
isManagement= {IS_MANAGEMENT}
vote={proposal.voted ? proposal.voted : ""}
proposalCheckboxOnClick = {() => {updateProposalDeleteIDs(proposal);}}
isChecked={proposal.checked}
/>
))}
</div>
</div>
</div>
{/* </div> */}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

KALEA WHAT IS THIS COMMENTING


<div className="proposalManagementRight">
<div className = "whiteBox">
Expand All @@ -206,6 +206,8 @@ function ProposalManagement(props) {
</div>
</div>
</div>
{removeModal}
</div>
)
} else {
return (
Expand Down
2 changes: 1 addition & 1 deletion db/tgif.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ VALUES
('Admin', 'Paola Noun', '[email protected]', 'Boss'),
('Admin', 'Jorge Morales', '[email protected]', 'CEO'),
('Voting Member', 'Kennedy Chung', '[email protected]', 'The Big Cheese'),
('Voting Member', 'Kalea', '[email protected]', 'The Big Cheese'),
('Admin', 'Kalea', '[email protected]', 'The Big Cheese'),

('Voting Member', 'Moe Sumino', '[email protected]', 'ASUC Representative'),
('Voting Member', 'Youjin Chung', '[email protected]', 'Faculty Representative'),
Expand Down