From 4098c930466914229f06ba9a0c4066e9ef7d3acf Mon Sep 17 00:00:00 2001 From: Kalea Chu Date: Wed, 5 May 2021 12:02:46 -0700 Subject: [PATCH] WJOAPGME --- .../proposalManagement/ProposalManagement.css | 10 ++---- .../proposalManagement/ProposalManagement.js | 32 ++++++++++--------- db/tgif.sql | 2 +- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/client/src/pages/proposalManagement/ProposalManagement.css b/client/src/pages/proposalManagement/ProposalManagement.css index ff73d60..ad1a5d8 100644 --- a/client/src/pages/proposalManagement/ProposalManagement.css +++ b/client/src/pages/proposalManagement/ProposalManagement.css @@ -6,10 +6,6 @@ align-content: flex-wrap; } -.ProposalManagementOuter { - display: absolute; -} - .proposalManagementLeft{ margin-left: 2em; width: 30%; @@ -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%; } @@ -162,5 +158,5 @@ textarea:focus { .genericProposalButton { background: var(--black); - width: 100%; + width: 10%; } \ No newline at end of file diff --git a/client/src/pages/proposalManagement/ProposalManagement.js b/client/src/pages/proposalManagement/ProposalManagement.js index 6a5efe1..6dbc471 100644 --- a/client/src/pages/proposalManagement/ProposalManagement.js +++ b/client/src/pages/proposalManagement/ProposalManagement.js @@ -157,7 +157,7 @@ function ProposalManagement(props) { if (PRIVILEGES === 'Admin') { return (
-
+
@@ -173,21 +173,21 @@ function ProposalManagement(props) { title='Remove Selected Proposals' onClick={handleRemoveProposals}/>
-
- {proposals.map((proposal) => ( - {updateProposalDeleteIDs(proposal);}} - isChecked={proposal.checked} - /> - ))} -
+
+ {proposals.map((proposal) => ( + {updateProposalDeleteIDs(proposal);}} + isChecked={proposal.checked} + /> + ))} +
-
+ {/*
*/}
@@ -206,6 +206,8 @@ function ProposalManagement(props) {
+ {removeModal} + ) } else { return ( diff --git a/db/tgif.sql b/db/tgif.sql index 0b40177..5151a17 100644 --- a/db/tgif.sql +++ b/db/tgif.sql @@ -77,7 +77,7 @@ VALUES ('Admin', 'Paola Noun', 'paolanoun@berkeley.edu', 'Boss'), ('Admin', 'Jorge Morales', 'jorge.morales@berkeley.edu', 'CEO'), ('Voting Member', 'Kennedy Chung', 'kennedychung@berkeley.edu', 'The Big Cheese'), - ('Voting Member', 'Kalea', 'kaleachu@berkeley.edu', 'The Big Cheese'), + ('Admin', 'Kalea', 'kaleachu@berkeley.edu', 'The Big Cheese'), ('Voting Member', 'Moe Sumino', 'moe_sumino@berkeley.edu', 'ASUC Representative'), ('Voting Member', 'Youjin Chung', 'youjin.chung@berkeley.edu', 'Faculty Representative'),