Skip to content

Commit

Permalink
Change the Dashboard to a kanban view (#19)
Browse files Browse the repository at this point in the history
* Kanban view

* Updates in redux

* Delete .lock files

* Kanban with requirements and issues

* Updated react dnd library for drag and drop

* ESLint Fixes and Redux updates for Kanban

* Switch between list and kanban views

* CSS fies in kanban

* Fetch organization names for registration
  • Loading branch information
Yasmin Ansari authored Nov 12, 2021
1 parent 15a29bc commit 6917743
Show file tree
Hide file tree
Showing 60 changed files with 2,210 additions and 16,299 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package-lock.json
npm-debug.log*

.npmrc
*.lock

#IDE
.idea/
Expand Down
14 changes: 7 additions & 7 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ in one of these ways:
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.

A "User Product" is either (1) a "consumer product", which means any
A "User Project" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
Expand All @@ -307,29 +307,29 @@ is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.

"Installation Information" for a User Product means any methods,
"Installation Information" for a User Project means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
and execute modified versions of a covered work in that User Project from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.

If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
specifically for use in, a User Project, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
User Project is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
modified object code on the User Project (for example, the work has
been installed in ROM).

The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
the User Project in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Expand Down
15 changes: 11 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,26 @@
"@types/react-dom": "^16.8.4",
"i18next": "^15.1.3",
"i18next-browser-languagedetector": "^3.0.1",
"immutability-helper": "3.0.1",
"lodash": "^4.17.21",
"npm": "^6.9.0",
"polished": "^3.2.0",
"prop-types": "^15.7.2",
"react": "^16.7.0",
"react-beautiful-dnd": "12.2.0",
"react-dom": "^16.7.0",
"react-hot-loader": "^4.6.3",
"react-i18next": "^10.11.0",
"react-notifications": "^1.4.3",
"react-redux": "^7.1.0",
"react-router-dom": "^4.4.0-beta.8",
"react-scripts": "3.2.0",
"react-styleguidist": "^9.0.8",
"react-test-renderer": "^16.8.6",
"reactjs-popup": "^1.4.0",
"redux-saga": "^1.0.0",
"serve": "^11.0.0"
"serve": "^11.0.0",
"uuid": "3.3.3"
},
"devDependencies": {
"@babel/cli": "^7.2.3",
Expand All @@ -53,10 +57,13 @@
"enzyme": "^3.8.0",
"enzyme-adapter-react-16": "^1.13.1",
"enzyme-to-json": "^3.3.5",
"eslint": "^7.15.0",
"eslint": "^7.32.0",
"eslint-config-airbnb": "^18.2.1",
"eslint-import-resolver-webpack": "^0.13.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-react": "^7.22.0",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.27.0",
"eslint-plugin-react-hooks": "^4.3.0",
"file-loader": "^3.0.1",
"file-replace-loader": "^1.3.2",
"html-loader": "^0.5.5",
Expand Down
18 changes: 7 additions & 11 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,19 @@ import { routes } from './routes/routesConstants';
import { PrivateRoute } from './routes/Private.route';
import theme from './styles/theme';

const App = () => {
return (
const App = () => (
<Router>
<ThemeProvider theme={theme}>
<div className='app'>
<div className="app">
<CssBaseline />
<Route
exact
path='/'
render={() =>
oauthService.hasValidAccessToken() ? (
path="/"
render={() => (oauthService.hasValidAccessToken() ? (
<Redirect to={routes.DASHBOARD} />
) : (
) : (
<Redirect to={routes.LOGIN} />
)
}
))}
/>
<Route path={routes.LOGIN} component={Login} />
<Route path={routes.REGISTER} component={Register} />
Expand All @@ -44,7 +41,6 @@ const App = () => {
<Alerts />
</ThemeProvider>
</Router>
);
};
);

export default hot(module)(App);
4 changes: 1 addition & 3 deletions src/components/Alerts/Alerts.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ import { makeStyles, Snackbar } from '@material-ui/core';
import MuiAlert from '@material-ui/lab/Alert';
import { hideAlert } from '@redux/alert/actions/alert.actions';

const Alert = (props) => {
return <MuiAlert elevation={6} variant='filled' {...props} />;
};
const Alert = (props) => <MuiAlert elevation={6} variant="filled" {...props} />;

const useStyles = makeStyles((theme) => ({
root: {
Expand Down
8 changes: 4 additions & 4 deletions src/components/Copyright/Copyright.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,20 @@ const Copyright = () => {
const app = useContext(AppContext);

return (
<AppBar position='fixed' className={classes.root}>
<AppBar position="fixed" className={classes.root}>
<Toolbar className={classes.toolbar}>
<div className={classes.navs}>
<Support />
<Services />
</div>
<div>
<Typography
variant='body2'
align='center'
variant="body2"
align="center"
className={classes.copyright}
>
{'Copyright © '}
<Link color='inherit' href='https://example.com/' target='_blank'>
<Link color="inherit" href="https://example.com/" target="_blank">
{app.title}
</Link>{' '}
{new Date().getFullYear()}
Expand Down
26 changes: 14 additions & 12 deletions src/components/Copyright/Services.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React, { useState } from 'react';
import { makeStyles, Button, Link, Menu, MenuItem } from '@material-ui/core';
import {
makeStyles, Button, Link, Menu, MenuItem,
} from '@material-ui/core';

const useStyles = makeStyles((theme) => ({
link: {
Expand All @@ -24,16 +26,16 @@ const Services = () => {
return (
<div>
<Button
aria-controls='buildly-services-menu'
aria-haspopup='true'
color='primary'
variant='contained'
aria-controls="buildly-services-menu"
aria-haspopup="true"
color="primary"
variant="contained"
onClick={handleClick}
>
Buildly Services
</Button>
<Menu
id='buildly-services-menu'
id="buildly-services-menu"
anchorEl={anchorEl}
keepMounted
open={Boolean(anchorEl)}
Expand All @@ -50,19 +52,19 @@ const Services = () => {
<MenuItem onClick={handleClose}>
<Link
className={classes.link}
href='https://buildly.io/'
target='_blank'
rel='noopener'
href="https://buildly.io/"
target="_blank"
rel="noopener"
>
Open Source
</Link>
</MenuItem>
<MenuItem onClick={handleClose}>
<Link
className={classes.link}
href='https://buildly.io/'
target='_blank'
rel='noopener'
href="https://buildly.io/"
target="_blank"
rel="noopener"
>
Sales and Consulting
</Link>
Expand Down
32 changes: 17 additions & 15 deletions src/components/Copyright/Support.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React, { useState } from 'react';
import { makeStyles, Button, Link, Menu, MenuItem } from '@material-ui/core';
import {
makeStyles, Button, Link, Menu, MenuItem,
} from '@material-ui/core';
import { routes } from '@routes/routesConstants';

const useStyles = makeStyles((theme) => ({
Expand Down Expand Up @@ -28,16 +30,16 @@ const Support = () => {
return (
<div className={classes.root}>
<Button
aria-controls='buildly-support-menu'
aria-haspopup='true'
color='primary'
variant='contained'
aria-controls="buildly-support-menu"
aria-haspopup="true"
color="primary"
variant="contained"
onClick={handleClick}
>
Buildly Support
</Button>
<Menu
id='buildly-support-menu'
id="buildly-support-menu"
anchorEl={anchorEl}
keepMounted
open={Boolean(anchorEl)}
Expand All @@ -64,29 +66,29 @@ const Support = () => {
<MenuItem onClick={handleClose}>
<Link
className={classes.link}
href='https://buildly.io/developer-community/'
target='_blank'
rel='noopener'
href="https://buildly.io/developer-community/"
target="_blank"
rel="noopener"
>
Community
</Link>
</MenuItem>
<MenuItem onClick={handleClose}>
<Link
className={classes.link}
href='https://buildly.io/contact-us/'
target='_blank'
rel='noopener'
href="https://buildly.io/contact-us/"
target="_blank"
rel="noopener"
>
Contact us
</Link>
</MenuItem>
<MenuItem onClick={handleClose}>
<Link
className={classes.link}
href='https://buildly.io/'
target='_blank'
rel='noopener'
href="https://buildly.io/"
target="_blank"
rel="noopener"
>
Accessibility
</Link>
Expand Down
11 changes: 5 additions & 6 deletions src/components/InlineEditor/InlineEditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ export const InlineEditor = ({
setEditing(false); // Close the input
break;
default:
return;
}
};

Expand Down Expand Up @@ -107,21 +106,21 @@ export const InlineEditor = ({
<TextField
className={classes.textField}
tag={tag}
size='small'
variant='outlined'
size="small"
variant="outlined"
autoFocus={true}
ref={node}
name={`${id}`}
type='text'
type="text"
placeholder={placeholder}
value={text}
onChange={(event) => setText(event.target.value)}
/>
) : (
<Grid
container
direction='row'
alignItems='center'
direction="row"
alignItems="center"
className={`${classes.nonEditMode} ${!value && classes.placeholder}`}
onDoubleClick={() => setEditing(true)}
>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Loader/Loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const useStyles = makeStyles((theme) => ({

const Loader = (props) => {
const classes = useStyles();
let { open, setOpen } = props;
const { open, setOpen } = props;

const handleClose = () => {
setOpen(false);
Expand All @@ -23,7 +23,7 @@ const Loader = (props) => {
return (
<div>
<Backdrop className={classes.backdrop} open={open}>
<CircularProgress color='inherit' />
<CircularProgress color="inherit" />
</Backdrop>
</div>
);
Expand Down
10 changes: 5 additions & 5 deletions src/components/SocialLogin/GithubLogin.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React, { useRef } from 'react';
import { Button } from '@material-ui/core';
import { GitHub as GitHubIcon } from '@material-ui/icons';
import PopupWindow from './PopupWindow';
import { socialLogin } from '@redux/authuser/actions/authuser.actions';
import { providers, toQuery } from '@utils/socialLogin';
import PopupWindow from './PopupWindow';

const GithubLogin = ({ dispatch, history, disabled }) => {
const popup = useRef(null);
Expand All @@ -13,12 +13,12 @@ const GithubLogin = ({ dispatch, history, disabled }) => {
popup.current = PopupWindow.open(
'github-oauth-authorize',
`https://github.com/login/oauth/authorize?${search}`,
{ height: 800, width: 600 }
{ height: 800, width: 600 },
);

popup.current.then(
(data) => onSuccess(data),
(error) => onFailure(error)
(error) => onFailure(error),
);
};

Expand All @@ -37,8 +37,8 @@ const GithubLogin = ({ dispatch, history, disabled }) => {
return (
<Button
fullWidth
variant='contained'
color='secondary'
variant="contained"
color="secondary"
startIcon={<GitHubIcon />}
onClick={onBtnClick}
disabled={Boolean(disabled)}
Expand Down
4 changes: 2 additions & 2 deletions src/components/SocialLogin/PopupWindow.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ class PopupWindow {
}

if (
popup.location.href === this.url ||
popup.location.pathname === 'blank'
popup.location.href === this.url
|| popup.location.pathname === 'blank'
) {
return;
}
Expand Down
Loading

0 comments on commit 6917743

Please sign in to comment.