diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index c84d1c8..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "type": "node", - "request": "launch", - "name": "Launch Program", - "skipFiles": [ - "/**" - ], - "program": "${workspaceFolder}\\start" - } - ] -} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index 55620f1..0000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "version": "2.0.0", - "tasks": [ - { - "type": "npm", - "script": "build", - "group": "build", - "problemMatcher": [], - "label": "npm: build", - "detail": "react-scripts build" - } - ] -} \ No newline at end of file diff --git a/.gitignore b/client/.gitignore similarity index 100% rename from .gitignore rename to client/.gitignore diff --git a/package-lock.json b/client/package-lock.json similarity index 99% rename from package-lock.json rename to client/package-lock.json index 77929f0..8568aff 100644 --- a/package-lock.json +++ b/client/package-lock.json @@ -1,5 +1,5 @@ { - "name": "team-6", + "name": "TaskBlaster", "version": "0.1.0", "lockfileVersion": 1, "requires": true, @@ -1078,6 +1078,19 @@ "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-10.1.0.tgz", "integrity": "sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg==" }, + "@date-io/core": { + "version": "1.3.13", + "resolved": "https://registry.npmjs.org/@date-io/core/-/core-1.3.13.tgz", + "integrity": "sha512-AlEKV7TxjeK+jxWVKcCFrfYAk8spX9aCyiToFIiLPtfQbsjmRGLIhb5VZgptQcJdHtLXo7+m0DuurwFgUToQuA==" + }, + "@date-io/date-fns": { + "version": "1.3.13", + "resolved": "https://registry.npmjs.org/@date-io/date-fns/-/date-fns-1.3.13.tgz", + "integrity": "sha512-yXxGzcRUPcogiMj58wVgFjc9qUYrCnnU9eLcyNbsQCmae4jPuZCDoIBR21j8ZURsM7GRtU62VOw5yNd4dDHunA==", + "requires": { + "@date-io/core": "^1.3.13" + } + }, "@emotion/hash": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz", @@ -1335,6 +1348,19 @@ "@babel/runtime": "^7.4.4" } }, + "@material-ui/pickers": { + "version": "3.2.10", + "resolved": "https://registry.npmjs.org/@material-ui/pickers/-/pickers-3.2.10.tgz", + "integrity": "sha512-B8G6Obn5S3RCl7hwahkQj9sKUapwXWFjiaz/Bsw1fhYFdNMnDUolRiWQSoKPb1/oKe37Dtfszoywi1Ynbo3y8w==", + "requires": { + "@babel/runtime": "^7.6.0", + "@date-io/core": "1.x", + "@types/styled-jsx": "^2.2.8", + "clsx": "^1.0.2", + "react-transition-group": "^4.0.0", + "rifm": "^0.7.0" + } + }, "@material-ui/styles": { "version": "4.9.6", "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.9.6.tgz", @@ -1785,6 +1811,14 @@ "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz", "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==" }, + "@types/styled-jsx": { + "version": "2.2.8", + "resolved": "https://registry.npmjs.org/@types/styled-jsx/-/styled-jsx-2.2.8.tgz", + "integrity": "sha512-Yjye9VwMdYeXfS71ihueWRSxrruuXTwKCbzue4+5b2rjnQ//AtyM7myZ1BEhNhBQ/nL/RE7bdToUoLln2miKvg==", + "requires": { + "@types/react": "*" + } + }, "@types/testing-library__dom": { "version": "6.14.0", "resolved": "https://registry.npmjs.org/@types/testing-library__dom/-/testing-library__dom-6.14.0.tgz", @@ -2478,6 +2512,37 @@ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz", "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==" }, + "axios": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", + "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", + "requires": { + "follow-redirects": "1.5.10" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "follow-redirects": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "requires": { + "debug": "=3.1.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, "axobject-query": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.1.2.tgz", @@ -4257,6 +4322,11 @@ } } }, + "date-fns": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.12.0.tgz", + "integrity": "sha512-qJgn99xxKnFgB1qL4jpxU7Q2t0LOn1p8KMIveef3UZD7kqjT3tpFNNdXJelEHhE+rUgffriXriw/sOSU+cS1Hw==" + }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -5256,9 +5326,9 @@ "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" }, "eventemitter3": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz", - "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==" + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz", + "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==" }, "events": { "version": "3.1.0", @@ -6904,9 +6974,9 @@ "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=" }, "http-proxy": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz", - "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "requires": { "eventemitter3": "^4.0.0", "follow-redirects": "^1.0.0", @@ -11793,6 +11863,14 @@ "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz", "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=" }, + "rifm": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/rifm/-/rifm-0.7.0.tgz", + "integrity": "sha512-DSOJTWHD67860I5ojetXdEQRIBvF6YcpNe53j0vn1vp9EUb9N80EiZTxgP+FkDKorWC8PZw052kTF4C1GOivCQ==", + "requires": { + "@babel/runtime": "^7.3.1" + } + }, "rimraf": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", diff --git a/package.json b/client/package.json similarity index 86% rename from package.json rename to client/package.json index a8133d7..bd6b8c5 100644 --- a/package.json +++ b/client/package.json @@ -1,13 +1,16 @@ { - "name": "team-6", + "name": "TaskBlaster", "version": "0.1.0", "private": true, "dependencies": { + "@date-io/date-fns": "^1.3.13", "@material-ui/core": "^4.9.9", "@material-ui/icons": "^4.9.1", + "@material-ui/pickers": "^3.2.10", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.5.0", "@testing-library/user-event": "^7.2.1", + "date-fns": "^2.12.0", "react": "^16.13.1", "react-dom": "^16.13.1", "react-router-dom": "^5.1.2", diff --git a/client/public/favicon.ico b/client/public/favicon.ico new file mode 100644 index 0000000..0aa3627 Binary files /dev/null and b/client/public/favicon.ico differ diff --git a/public/index.html b/client/public/index.html similarity index 100% rename from public/index.html rename to client/public/index.html diff --git a/client/public/logo192.png b/client/public/logo192.png new file mode 100644 index 0000000..b1f940d Binary files /dev/null and b/client/public/logo192.png differ diff --git a/client/public/logo512.png b/client/public/logo512.png new file mode 100644 index 0000000..f8a43ec Binary files /dev/null and b/client/public/logo512.png differ diff --git a/public/manifest.json b/client/public/manifest.json similarity index 84% rename from public/manifest.json rename to client/public/manifest.json index 080d6c7..23fad9f 100644 --- a/public/manifest.json +++ b/client/public/manifest.json @@ -1,6 +1,6 @@ { - "short_name": "React App", - "name": "Create React App Sample", + "short_name": "TaskBlaster", + "name": "TaskBlaster Project Management Tool", "icons": [ { "src": "favicon.ico", diff --git a/public/robots.txt b/client/public/robots.txt similarity index 100% rename from public/robots.txt rename to client/public/robots.txt diff --git a/client/src/api/TaskAPI.js b/client/src/api/TaskAPI.js new file mode 100644 index 0000000..ce55ba4 --- /dev/null +++ b/client/src/api/TaskAPI.js @@ -0,0 +1,55 @@ +import React from 'react'; +import Task from '../components/Task'; + +const API_URL = 'http://localhost:8080'; +const HEADERS = { + 'Accept' : 'application/json', + 'Content-Type' : 'application/json;charset=UTF-8' +}; + +class TaskAPI { + + async getAllTasks(removeTask) { + const response = await fetch(`${API_URL}/tasks`); + console.log(`GET: ${response.status}`); + const responseJson = await response.json(); + + var taskComponents = []; + for (let [key, taskData] of Object.entries(responseJson)) { + taskComponents[key] = + + } + return taskComponents; + } + + // TODO: Add a username to the params + async postTask(taskJson) { + const postOptions = { + method: 'POST', + headers: HEADERS, + body: JSON.stringify(taskJson) + }; + const response = await fetch(`${API_URL}/addtask`, postOptions); + console.log(`POST: ${response.status}`); + const responseJson = await response.json(); + return responseJson; + } + + async deleteTask(id) { + const deleteOptions = { + method: 'DELETE' + }; + await fetch(`${API_URL}/delete/${id}`, deleteOptions) + .then(response => { + console.log(`DELETE: ${response.status}`); + }); + } +} + +export default new TaskAPI(); diff --git a/client/src/components/AddTaskDialog.js b/client/src/components/AddTaskDialog.js new file mode 100644 index 0000000..d89fd9a --- /dev/null +++ b/client/src/components/AddTaskDialog.js @@ -0,0 +1,168 @@ +import React from 'react'; +import Dialog from '@material-ui/core/Dialog'; +import DialogActions from '@material-ui/core/DialogActions'; +import DialogContent from '@material-ui/core/DialogContent'; +import DialogContentText from '@material-ui/core/DialogContentText'; +import DialogTitle from '@material-ui/core/DialogTitle'; +import Button from '@material-ui/core/Button'; +import TextField from '@material-ui/core/TextField'; +import DateFnsUtils from '@date-io/date-fns'; +import EventNoteIcon from '@material-ui/icons/EventNote'; +import IconButton from '@material-ui/core/IconButton'; +import Box from '@material-ui/core/Box'; +import Task from './Task'; +import { DateTimePicker, MuiPickersUtilsProvider } from '@material-ui/pickers'; +import TaskService from '../api/TaskAPI'; + +class AddTaskDialog extends React.Component { + constructor(props) { + super(props); + this.state = { + title: "", + subTaskFields: [], + // Subtasks is a map of index -> text + subTasks: {}, + showDatePicker: false, + selectedDate: new Date(), + }; + } + + // Send the task data back to the Tasks component + submitHandler = (event) => { + event.preventDefault(); + var dueDate; + this.state.showDatePicker ? dueDate = this.state.selectedDate : dueDate = null; + // Create JSON to POST + var taskJson = { + title: this.state.title, + subTasks: Object.values(this.state.subTasks), + dueDate: dueDate + }; + TaskService.postTask(taskJson) + .then((taskId) => { + // if we succesfully POSTed a task, lets grab its ID and render it + var task = this.createTask(taskId, this.state.title, this.state.subTasks, dueDate); + this.props.addTask(task); + }) + .catch((error) => console.log(error)); + } + + // Create a Task component and return it + createTask = (id, title, subTasks, dueDate) => { + if (dueDate !== null) { + const formattedDueDate = `${dueDate.toLocaleString('default', {month: 'long'})} ${dueDate.getDate()}`; + return () + } else { + return () + } + } + + // Handles changes to title and subtask the fields + changeHandler = (event) => { + this.setState({ + ...this.state, + [event.target.name]: event.target.value, + }); + } + + // Handles selected date from date picker + handleDateChange = (selectedDate) => { + this.setState({ + selectedDate: selectedDate + }) + } + + addSubTaskText = (event) => { + this.setState({ + subTasks: { + ...this.state.subTasks, + [event.target.name]: event.target.value + } + }) + } + + addSubTaskField = () => { + this.setState({ + subTaskFields: [ + ...this.state.subTaskFields, + + ] + }); + } + + render() { + return ( + + +
+ + Add New Task + + + + + + {this.state.subTaskFields} + + + + + + + this.setState({showDatePicker: !this.state.showDatePicker})}> + + + + {this.state.showDatePicker ? + + + : + null + } + +
+ + + ) + } +} + +export default AddTaskDialog; diff --git a/client/src/components/App.js b/client/src/components/App.js new file mode 100644 index 0000000..1663b5a --- /dev/null +++ b/client/src/components/App.js @@ -0,0 +1,27 @@ +import React from 'react'; +import Home from './Home'; +import Tasks from './Tasks'; +import Login from './Login'; +import SignUp from './SignUp'; +import { Route, Switch } from 'react-router-dom'; + +function App() { + return ( + + + + + + + + + + + + + + + ); +} + +export default App; diff --git a/src/components/Appbar/Appbar.js b/client/src/components/Appbar.js similarity index 58% rename from src/components/Appbar/Appbar.js rename to client/src/components/Appbar.js index c548341..e114593 100644 --- a/src/components/Appbar/Appbar.js +++ b/client/src/components/Appbar.js @@ -10,9 +10,13 @@ import IconButton from '@material-ui/core/IconButton'; import MenuIcon from '@material-ui/icons/Menu'; import ChevronLeftIcon from '@material-ui/icons/ChevronLeft'; import ChevronRightIcon from '@material-ui/icons/ChevronRight'; +import Button from '@material-ui/core/Button'; +import Grid from '@material-ui/core/Grid'; import { makeStyles, useTheme } from '@material-ui/core/styles'; import { MenuList, MenuItem } from '@material-ui/core'; import { Link } from 'react-router-dom'; +import * as logo from '../images/logo_no_bg.png'; +import { withRouter } from "react-router-dom" const drawerWidth = 240; @@ -56,29 +60,38 @@ const useStyles = makeStyles((theme) => ({ ...theme.mixins.toolbar, justifyContent: 'flex-end', }, - content: { - flexGrow: 1, - padding: theme.spacing(3), - transition: theme.transitions.create('margin', { - easing: theme.transitions.easing.sharp, - duration: theme.transitions.duration.leavingScreen, - }), - marginLeft: -drawerWidth, - }, - contentShift: { - transition: theme.transitions.create('margin', { - easing: theme.transitions.easing.easeOut, - duration: theme.transitions.duration.enteringScreen, - }), - marginLeft: 0, + button: { + color: "white", }, + logo: { + height: "auto", + width: "auto", + maxHeight: "64px", + maxWidth: "250px", + paddingTop: "8px" + } })); -export default function Appbar() { +function Appbar(props) { const classes = useStyles(); const theme = useTheme(); const [open, setOpen] = React.useState(false); + const changeTitle = () => { + switch(window.location.pathname) { + case '/': + return 'Home'; + case '/tasks': + return 'My Tasks'; + case '/login': + return 'Login'; + case '/signup': + return 'Sign Up'; + default: + return 'Home'; + } + } + const handleDrawerOpen = () => { setOpen(true); }; @@ -86,31 +99,48 @@ export default function Appbar() { const handleDrawerClose = () => { setOpen(false); }; - + + let title = changeTitle(); return (
- - - - - - - TaskBlaster - - - + + + + + + + + + + logo + + + {title} + + {/* Pad out the middle of the appbar */} + + + + + + + + + + + + logo +
+ ) +} diff --git a/client/src/components/Login.js b/client/src/components/Login.js new file mode 100644 index 0000000..5e7472f --- /dev/null +++ b/client/src/components/Login.js @@ -0,0 +1,101 @@ +import React from 'react'; +import { makeStyles } from '@material-ui/core/styles'; +import Box from '@material-ui/core/Box'; +import Typography from '@material-ui/core/Typography'; +import Button from '@material-ui/core/Button'; +import TextField from '@material-ui/core/TextField'; +import FormControlLabel from '@material-ui/core/FormControlLabel'; +import Checkbox from '@material-ui/core/Checkbox'; +import { CssBaseline } from '@material-ui/core'; + +const useStyles = makeStyles(theme => ({ + content: { + padding: theme.spacing(10), + backgroundColor: "#282c34", + minHeight: "100vh", + display: "flex", + flexGrow: 1, + flexDirection: "column", + alignItems: "center", + }, + typography: { + color: "white" + }, + field: { + + }, + submit: { + margin: theme.spacing(3, 0, 2) + }, + label: { + color: "white" + }, + controlLabel: { + color: "white" + } +})); + +// TODO +const doLogin = () => { + console.log("Logging in"); +} + +// TODO +const changeHandler = () => { + console.log("Handle change"); +} + +function Login() { + document.title = "Login | TaskBlaster" + + const classes = useStyles(); + return ( + + + {document.title.split("|")[0]} +
+ + + } + label="Remember me" + /> + + +
+ ) +} + +export default Login; diff --git a/client/src/components/SignUp.js b/client/src/components/SignUp.js new file mode 100644 index 0000000..74bc32a --- /dev/null +++ b/client/src/components/SignUp.js @@ -0,0 +1,134 @@ +import React from 'react'; +import { makeStyles } from '@material-ui/core/styles'; +import { CssBaseline } from '@material-ui/core'; +import Box from '@material-ui/core/Box'; +import Typography from '@material-ui/core/Typography'; +import Button from '@material-ui/core/Button'; +import TextField from '@material-ui/core/TextField'; +import Grid from '@material-ui/core/Grid'; +import Link from '@material-ui/core/Link'; +import FormControlLabel from '@material-ui/core/FormControlLabel'; + +const useStyles = makeStyles(theme => ({ + content: { + padding: theme.spacing(10), + backgroundColor: "#282c34", + minHeight: "100vh", + display: "flex", + flexGrow: 1, + flexDirection: "column", + alignItems: "center", + }, + typography: { + color: "white" + }, + field: { + + }, + submit: { + margin: theme.spacing(3, 0, 2) + }, + label: { + color: "white" + }, + controlLabel: { + color: "white" + } +})); + +// TODO +const doSignUp = () => { + console.log("Signed up user"); +} + +// TODO +const changeHandler = () => { + console.log("Handle change"); +} + +function SignUp() { + document.title = "Sign Up | TaskBlaster" + + const classes = useStyles(); + return ( + + + {document.title.split("|")[0]} +
+ + + + + + + + + + + + + + + + + + Already have an account? Sign in + + + + +
+ + ) +} + +export default SignUp; diff --git a/client/src/components/Task.js b/client/src/components/Task.js new file mode 100644 index 0000000..b86b407 --- /dev/null +++ b/client/src/components/Task.js @@ -0,0 +1,95 @@ +import React from 'react'; +import Card from '@material-ui/core/Card'; +import CardContent from '@material-ui/core/CardContent'; +import CardActions from '@material-ui/core/CardActions'; +import Typography from '@material-ui/core/Typography'; +import Button from '@material-ui/core/Button'; +import List from '@material-ui/core/List'; +import ListItem from '@material-ui/core/ListItem'; +import ListItemIcon from '@material-ui/core/ListItemIcon'; +import EventNoteIcon from '@material-ui/icons/EventNote'; +import ListItemText from '@material-ui/core/ListItemText'; +import { withStyles } from '@material-ui/core/styles'; +import { Checkbox } from '@material-ui/core'; + +const styles = theme => ({ + card: { + minWidth: 275, + margin: "5px 0", + }, + cardTypography: { + fontSize: "calc(4px + 2vmin)", + }, + dateContainer: { + position: "fixed", + bottom: theme.spacing(1), + right: theme.spacing(1) + } +}); + +class Task extends React.Component { + constructor() { + super(); + this.state = { + checked: [], + } + } + + handleCheck = (index) => () => { + const currentIndex = this.state.checked.indexOf(index); + const newChecked = [...this.state.checked]; + + if (currentIndex === -1) { + newChecked.push(index); + } else { + newChecked.splice(currentIndex, 1); + } + + this.setState({ + checked: newChecked + }); + } + + render () { + const { classes } = this.props; + + return ( + + + + {this.props.title} + + + {Object.keys(this.props.subTasks).map((index) => { + return ( + + + + + + + ); + })} + + + + {/* Arrow function because we don't want the function to run when the Task component is created */} + + {/* TODO: Implement done button */} + + {this.props.dueDate === undefined ? null : } + + + )} +} + +export default withStyles(styles)(Task); diff --git a/src/components/Tasks/Tasks.js b/client/src/components/Tasks.js similarity index 61% rename from src/components/Tasks/Tasks.js rename to client/src/components/Tasks.js index 57cb8bd..22a145e 100644 --- a/src/components/Tasks/Tasks.js +++ b/client/src/components/Tasks.js @@ -1,12 +1,11 @@ import React from 'react'; -import Appbar from '../Appbar/Appbar'; import AddIcon from '@material-ui/icons/Add'; import Fab from '@material-ui/core/Fab'; -import Box from '@material-ui/core/Box'; -import Task from '../Task/Task'; -import AddTaskDialog from '../AddTaskDialog/AddTaskDialog'; +import Grid from '@material-ui/core/Grid'; +import AddTaskDialog from './AddTaskDialog'; import Typography from '@material-ui/core/Typography'; -import { withStyles, withTheme } from '@material-ui/core/styles'; +import TaskAPI from '../api/TaskAPI'; +import { withStyles } from '@material-ui/core/styles'; const styles = theme => ({ content: { @@ -46,24 +45,32 @@ class Tasks extends React.Component { showDialog: false } this.removeTask = this.removeTask.bind(this); + document.title = "My Tasks | TaskBlaster"; } - addTask(value) { + componentDidMount() { + TaskAPI.getAllTasks(this.removeTask.bind(this)) + .then(taskComponents => { + this.setState({ + tasks: taskComponents + }) + }); + } + + // Add a newly created task to the rendered list + addTask(task) { this.setState({ tasks: [ ...this.state.tasks, - + task ] }); this.hideDialog(); } removeTask(key) { + console.log(`Attempting to delete Task id = ${key}`); + TaskAPI.deleteTask(key); this.setState({ tasks: this.state.tasks.filter(task => task.props.number !== key) @@ -87,14 +94,22 @@ class Tasks extends React.Component { return (
- {this.state.tasks.length === 0 ? There are no tasks to show! : null} {/* Container for the tasks */} - - {this.state.tasks.map(task => task)} - + + + {this.state.tasks.map((task, index) => { + return task; + })}; + + - {/* Bind hideDialog to this Tasks reference, otherwise the close button on the dialog will be NPE */} - {this.state.showDialog ? : null} + {this.state.showDialog ? + : null}
) } diff --git a/src/components/Images/logo.svg b/client/src/images/logo.svg similarity index 100% rename from src/components/Images/logo.svg rename to client/src/images/logo.svg diff --git a/client/src/images/logo_no_bg.png b/client/src/images/logo_no_bg.png new file mode 100644 index 0000000..bee7925 Binary files /dev/null and b/client/src/images/logo_no_bg.png differ diff --git a/src/index.css b/client/src/index.css similarity index 100% rename from src/index.css rename to client/src/index.css diff --git a/src/index.js b/client/src/index.js similarity index 62% rename from src/index.js rename to client/src/index.js index 9fbd0a1..b960458 100644 --- a/src/index.js +++ b/client/src/index.js @@ -2,12 +2,16 @@ import React from 'react'; import ReactDOM from 'react-dom'; import * as serviceWorker from './serviceWorker'; import './index.css'; -import App from './components/App/App'; +import { BrowserRouter } from 'react-router-dom'; +import App from './components/App'; +import Appbar from './components/Appbar'; ReactDOM.render( - + + {/* Appbar shows above whatever the component is, chosen by Switch */} + - , + , document.getElementById('root') ); diff --git a/src/serviceWorker.js b/client/src/serviceWorker.js similarity index 100% rename from src/serviceWorker.js rename to client/src/serviceWorker.js diff --git a/src/setupTests.js b/client/src/setupTests.js similarity index 100% rename from src/setupTests.js rename to client/src/setupTests.js diff --git a/src/components/App/App.test.js b/client/src/test/App.test.js similarity index 87% rename from src/components/App/App.test.js rename to client/src/test/App.test.js index 6222103..52ddaa6 100644 --- a/src/components/App/App.test.js +++ b/client/src/test/App.test.js @@ -1,6 +1,6 @@ import React from 'react'; import { render } from '@testing-library/react'; -import App from './App'; +import App from '../components/App'; // test('renders learn react link', () => { // const { getByText } = render(); diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index bcd5dfd..0000000 Binary files a/public/favicon.ico and /dev/null differ diff --git a/public/logo192.png b/public/logo192.png deleted file mode 100644 index fc44b0a..0000000 Binary files a/public/logo192.png and /dev/null differ diff --git a/public/logo512.png b/public/logo512.png deleted file mode 100644 index a4e47a6..0000000 Binary files a/public/logo512.png and /dev/null differ diff --git a/server/.gitignore b/server/.gitignore new file mode 100644 index 0000000..a2a3040 --- /dev/null +++ b/server/.gitignore @@ -0,0 +1,31 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/** +!**/src/test/** + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ + +### VS Code ### +.vscode/ diff --git a/server/.mvn/wrapper/MavenWrapperDownloader.java b/server/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..e76d1f3 --- /dev/null +++ b/server/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/server/.mvn/wrapper/maven-wrapper.jar b/server/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..2cc7d4a Binary files /dev/null and b/server/.mvn/wrapper/maven-wrapper.jar differ diff --git a/server/.mvn/wrapper/maven-wrapper.properties b/server/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..642d572 --- /dev/null +++ b/server/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/server/mvnw b/server/mvnw new file mode 100644 index 0000000..a16b543 --- /dev/null +++ b/server/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/server/mvnw.cmd b/server/mvnw.cmd new file mode 100644 index 0000000..c8d4337 --- /dev/null +++ b/server/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/server/pom.xml b/server/pom.xml new file mode 100644 index 0000000..68fac2c --- /dev/null +++ b/server/pom.xml @@ -0,0 +1,62 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.3.0.RELEASE + + + com.group6 + taskblaster + 0.0.1-SNAPSHOT + taskblaster + CSC 394 Project + + + 1.8 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-data-rest + + + org.springframework.boot + spring-boot-starter-web + + + + com.h2database + h2 + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/server/src/main/java/com/group6/taskblaster/TaskblasterApplication.java b/server/src/main/java/com/group6/taskblaster/TaskblasterApplication.java new file mode 100644 index 0000000..ecaeca0 --- /dev/null +++ b/server/src/main/java/com/group6/taskblaster/TaskblasterApplication.java @@ -0,0 +1,15 @@ +package com.group6.taskblaster; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; + +@EnableJpaRepositories +@SpringBootApplication +public class TaskblasterApplication { + + public static void main(String[] args) { + SpringApplication.run(TaskblasterApplication.class, args); + } + +} diff --git a/server/src/main/java/com/group6/taskblaster/task/Task.java b/server/src/main/java/com/group6/taskblaster/task/Task.java new file mode 100644 index 0000000..3868e84 --- /dev/null +++ b/server/src/main/java/com/group6/taskblaster/task/Task.java @@ -0,0 +1,47 @@ +package com.group6.taskblaster.task; + +import java.util.Date; +import java.util.List; +import javax.persistence.ElementCollection; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +@Entity +public class Task { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + private String title; + + @ElementCollection(targetClass=String.class) + private List subTasks; + + private String dueDate; + + public Task() { } + + public Task(String title, List subTasks, String dueDate) { + this.title = title; + this.subTasks = subTasks; + this.dueDate = dueDate; + } + + public long getId() { return this.id; } + public String getTitle() { return this.title; } + public List getSubTasks() { return subTasks; } + public String getDueDate() { return this.dueDate; } + + public void setId(final long id) { this.id = id; } + public void setTitle(final String title) { this.title = title; } + public void setSubTasks(final List subTasks) { this.subTasks = subTasks; } + public void setDueDate(final String date) { this.dueDate = date; } + + @Override + public String toString() { + return "Task(" + this.title + ")"; + } +} diff --git a/server/src/main/java/com/group6/taskblaster/task/TaskCommandLineRunner.java b/server/src/main/java/com/group6/taskblaster/task/TaskCommandLineRunner.java new file mode 100644 index 0000000..a2beb40 --- /dev/null +++ b/server/src/main/java/com/group6/taskblaster/task/TaskCommandLineRunner.java @@ -0,0 +1,27 @@ +package com.group6.taskblaster.task; + +import java.util.ArrayList; +import java.util.Date; +import org.springframework.boot.CommandLineRunner; +import org.springframework.stereotype.Component; + +@Component +public class TaskCommandLineRunner implements CommandLineRunner { + + private final TaskRepository repository; + + public TaskCommandLineRunner(TaskRepository repository) { + this.repository = repository; + } + + @Override + public void run(String ... strings) throws Exception { + ArrayList subtasks = new ArrayList(); + subtasks.add("sub1"); + subtasks.add("sub2"); + Task t1 = new Task("Title1", subtasks, "May 2"); + Task t2 = new Task("Title2", subtasks, "May 30"); + // repository.save(t1); + // repository.save(t2); + } +} diff --git a/server/src/main/java/com/group6/taskblaster/task/TaskController.java b/server/src/main/java/com/group6/taskblaster/task/TaskController.java new file mode 100644 index 0000000..1b91727 --- /dev/null +++ b/server/src/main/java/com/group6/taskblaster/task/TaskController.java @@ -0,0 +1,43 @@ +package com.group6.taskblaster.task; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.rest.webmvc.ResourceNotFoundException; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +// allow access to our React Node server running on port 3000 +@CrossOrigin(origins = "http://localhost:3000" ) +@RestController +public class TaskController { + + @Autowired + private TaskRepository repository; + + @GetMapping("/tasks") + public List getAllTasks() { + return repository.findAll(); + } + + @PostMapping("/addtask") + public long postTask(@RequestBody Task task) { + repository.save(task); + // return the JPA generated ID + return task.getId(); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteTask(@PathVariable Long id) { + Task task = repository.findById(id).orElseThrow(() -> new ResourceNotFoundException("Task with id " + id + " not found")); + repository.delete(task); + return new ResponseEntity<>(id, HttpStatus.OK); + } +} diff --git a/server/src/main/java/com/group6/taskblaster/task/TaskRepository.java b/server/src/main/java/com/group6/taskblaster/task/TaskRepository.java new file mode 100644 index 0000000..a2e3787 --- /dev/null +++ b/server/src/main/java/com/group6/taskblaster/task/TaskRepository.java @@ -0,0 +1,7 @@ +package com.group6.taskblaster.task; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.rest.core.annotation.RepositoryRestResource; + +@RepositoryRestResource +interface TaskRepository extends JpaRepository { } \ No newline at end of file diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/server/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/server/src/test/java/com/group6/taskblaster/TaskblasterApplicationTests.java b/server/src/test/java/com/group6/taskblaster/TaskblasterApplicationTests.java new file mode 100644 index 0000000..bc4968e --- /dev/null +++ b/server/src/test/java/com/group6/taskblaster/TaskblasterApplicationTests.java @@ -0,0 +1,13 @@ +package com.group6.taskblaster; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class TaskblasterApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/src/components/AddTaskDialog/AddTaskDialog.js b/src/components/AddTaskDialog/AddTaskDialog.js deleted file mode 100644 index a851d63..0000000 --- a/src/components/AddTaskDialog/AddTaskDialog.js +++ /dev/null @@ -1,65 +0,0 @@ -import React from 'react'; -import Dialog from '@material-ui/core/Dialog'; -import DialogActions from '@material-ui/core/DialogActions'; -import DialogContent from '@material-ui/core/DialogContent'; -import DialogContentText from '@material-ui/core/DialogContentText'; -import DialogTitle from '@material-ui/core/DialogTitle'; -import Button from '@material-ui/core/Button'; -import { TextField } from '@material-ui/core'; - -class AddTaskDialog extends React.Component { - constructor(props) { - super(props); - this.state = { - title: "", - }; - } - - submitHandler = (event) => { - event.preventDefault(); - this.props.addTask(this.state.title); - } - - changeHandler = (event) => { - this.setState({ title: event.target.value }); - } - - render() { - return ( -
- -
- - Add New Task - - - - - - - - - - -
- -
- ) - } -} - -export default AddTaskDialog; diff --git a/src/components/App/App.js b/src/components/App/App.js deleted file mode 100644 index 28183ee..0000000 --- a/src/components/App/App.js +++ /dev/null @@ -1,37 +0,0 @@ -import React from 'react'; -import Appbar from '../Appbar/Appbar'; -import { Route, BrowserRouter, Switch } from 'react-router-dom'; -import logo from '../Images/logo.svg'; -import Tasks from '../Tasks/Tasks'; -import './App.css'; - -function App() { - return ( -
- - - - - - - - - - -
- ); -} - -function Home() { - return ( -
- -
- logo - Home -
-
- ); -} - -export default App; diff --git a/src/components/Task/Task.js b/src/components/Task/Task.js deleted file mode 100644 index 7a8478b..0000000 --- a/src/components/Task/Task.js +++ /dev/null @@ -1,38 +0,0 @@ -import React from 'react'; -import Card from '@material-ui/core/Card'; -import CardContent from '@material-ui/core/CardContent'; -import CardActions from '@material-ui/core/CardActions'; -import Typography from '@material-ui/core/Typography'; -import Button from '@material-ui/core/Button'; -import { withStyles } from '@material-ui/core/styles'; - -const styles = theme => ({ - card: { - minWidth: 275, - margin: "5px 0", - }, - cardTypography: { - fontSize: "calc(4px + 2vmin)", - } -}); - -class Task extends React.Component { - render () { - const { classes } = this.props; - - return ( - - - - {this.props.value} - - - - {/* Arrow function because we don't want the function to run when the Task component is created */} - - - - )} -} - -export default withStyles(styles)(Task);