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

New project popup #22

Merged
merged 4 commits into from
Oct 2, 2020
Merged

New project popup #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2e9b96
added new component NewProjectPopup
Yash-g17 Oct 1, 2020
08af223
used the add new project button
Yash-g17 Oct 1, 2020
b85f859
Resolved Issues
Yash-g17 Oct 1, 2020
2ad563d
Added new component NewProjectPopup
Yash-g17 Oct 1, 2020
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
4,998 changes: 2,659 additions & 2,339 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"@testing-library/user-event": "^7.1.2",
"@types/jest": "^24.0.0",
"@types/node": "^12.0.0",
"@types/react": "^16.9.0",
"@types/react-custom-scrollbars": "^4.0.7",
"@types/react-dom": "^16.9.0",
"@types/react-native": "^0.63.13",
Expand All @@ -23,7 +22,6 @@
"react-scripts": "3.4.1",
"styled-components": "^5.1.1",
"typescript": "~3.7.2"

},
"scripts": {
"start": "react-scripts start",
Expand All @@ -47,6 +45,7 @@
]
},
"devDependencies": {
"@types/react": "^16.9.49",
"@types/react-router-dom": "^5.1.5",
"@typescript-eslint/parser": "^3.7.1",
"eslint-config-airbnb": "^18.2.0",
Expand Down
Binary file added src/colorPalette.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 9 additions & 10 deletions src/components/DashboardProjectCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import Card from '@material-ui/core/Card';
import CardContent from '@material-ui/core/CardContent';
import Button from '@material-ui/core/Button';
import CssBaseline from '@material-ui/core/CssBaseline';
import NewProjectPopup from './NewProjectPopup';

const useStyles = makeStyles((theme: Theme) =>
createStyles({
Expand All @@ -26,7 +27,7 @@ const useStyles = makeStyles((theme: Theme) =>
justifyContent: 'center',
margin: '1em',
backgroundColor: '#0F4C75',
borderRadius: '10px'
borderRadius: '10px',
},
project: {
width: '10vw',
Expand All @@ -36,39 +37,39 @@ const useStyles = makeStyles((theme: Theme) =>
justifyContent: 'center',
margin: '1em',
backgroundColor: '#BBE1FA',
borderRadius: '10px'
borderRadius: '10px',
},
projectbtn: {
width: '10vw',
height: '10vh',
color: '#0F4C75',
backgroundColor: '#BBE1FA',
borderRadius: '10px'
borderRadius: '10px',
},
taskboards: {
display: 'grid',
gridTemplateColumns: '20% 20% 20% 20%',
gridGap: '1em',
backgroundColor: '#0F4C75',
borderRadius: '5px'
borderRadius: '5px',
},
taskboard: {
height: '13vh',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
margin: '1em',
borderRadius: '10px'
borderRadius: '10px',
},
taskboardbtn: {
width: '15vw',
height: '15vh',
color: 'white',
backgroundColor: '#1B262C'
backgroundColor: '#1B262C',
},
active: {
backgroundColor: '#0F4C75',
borderRadius: '5px'
borderRadius: '5px',
},
})
);
Expand Down Expand Up @@ -168,9 +169,7 @@ const DashboardProjectCard = ({ id }: ID) => {
<div className={classes.projects}>
<Card className={classes.addproject}>
<CardContent>
<Button className={classes.projectbtn} style={{ fontSize: '65px', color: 'white', backgroundColor: '#0F4C75', paddingTop: '0.25em', }}>
+
</Button>
<NewProjectPopup />
</CardContent>
</Card>
{projects.map((project: Project) => {
Expand Down
22 changes: 22 additions & 0 deletions src/components/NewProjectPopup.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
::-webkit-scrollbar-track {
width: 5px;
margin-right: 2px;
box-shadow: inset;
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
border-radius: 10px;
background-color: transparent;
}

::-webkit-scrollbar {
width: 5px;
margin-right: 2px;
background-color: transparent;
}

::-webkit-scrollbar-thumb {
margin-right: 2px;
border-radius: 5px;
box-shadow: inset;
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
background-color: #1B262C;
}
2 changes: 1 addition & 1 deletion src/components/NotifPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import IconButton from '@material-ui/core/IconButton';
import styled from 'styled-components';
import { Dimensions } from 'react-native';
import './NotifPanel.css';
import { Modal, Box, Paper } from '@material-ui/core';
import { Modal, Paper } from '@material-ui/core';

// const styles = require(../css/NotifPanel.css);

Expand Down
Loading