diff --git a/.github/ISSUE_TEMPLATE/bug-report----.md b/.github/ISSUE_TEMPLATE/bug-report----.md new file mode 100644 index 0000000..04bdbad --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug-report----.md @@ -0,0 +1,41 @@ +--- +name: "Bug Report \U0001F41B " +about: Create a bug report for webqueue2. +title: '' +labels: bug +assignees: '' + +--- + + + + + + + +- [ ] I have searched the [issues](https://github.itap.purdue.edu/ECN/webqueue2/issues) of this repository and believe that this is not a duplicate. + +## What Happened + + + +## Expected Behavior + + + +## Steps to Reproduce + +1. +2. +3. + + +### Logs + + + + diff --git a/.github/ISSUE_TEMPLATE/feature-request---.md b/.github/ISSUE_TEMPLATE/feature-request---.md new file mode 100644 index 0000000..a48abaa --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature-request---.md @@ -0,0 +1,33 @@ +--- +name: "Feature Request \U0001F4EE" +about: Suggest a new idea for the project +title: '' +labels: feature-request +assignees: '' + +--- + + + + + + + +- [ ] I have searched the [issues](https://github.itap.purdue.edu/ECN/webqueue2/issues) of this repository and believe that this is not a duplicate. + +## Problem + + + +## Proposal + + + +### Examples + + + + diff --git a/README.md b/README.md index 0b31b4f..ead41cb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# webqueue2 -A re-write of Purdue ECN's webqueue +# webqueue2 Frontend +A ReactJS based web app to interact with the [webqueue2 API](https://github.itap.purdue.edu/ECN/webqueue2-api) ![UI Snapshot](./docs/UI%20Snapshots/UI-Snapshot%202020-12-03%20at%208.10.32%20PM.png) diff --git a/src/components/ItemBodyView/ItemBodyView.js b/src/components/ItemBodyView/ItemBodyView.js index 950f7ca..63ef7c5 100644 --- a/src/components/ItemBodyView/ItemBodyView.js +++ b/src/components/ItemBodyView/ItemBodyView.js @@ -1,7 +1,7 @@ import React from "react"; import PropTypes from "prop-types"; import { Timeline, TimelineItem, TimelineSeparator, TimelineConnector, TimelineContent, TimelineDot } from '@material-ui/lab'; -import { makeStyles } from "@material-ui/core"; +import { Typography, makeStyles } from "@material-ui/core"; import DirectoryInformation from "../DirectoryInformation/"; import Assignment from "../Assignment/"; import TimelineActionCard from "../TimelineActionCard/"; @@ -38,23 +38,42 @@ export default function ItemBodyView({ sections, loading }) { const generateTimelineItem = (section) => { switch (section.type) { case "directory_information": - return + return ( + + ); case "initial_message": - return + return ( + <> + + + ); case "edit": - return + return ( + + ); case "status": - return + return ( + <> + + {`${section.by} update the status to at ${Date(section.datetime)}`} + + {section.content.map((line) => {line})} + + ); case "assignment": - return + return ( + + ); case "reply_to_user": - return + return ( + + ); case "reply_from_user": - return - case "parse_error": - return + return ( + + ); default: - return `No match found for type: ${section.type}`; + return "No Match Found"; }; }; diff --git a/src/components/ParseError/ParseError.js b/src/components/ParseError/ParseError.js deleted file mode 100644 index 28dd626..0000000 --- a/src/components/ParseError/ParseError.js +++ /dev/null @@ -1,61 +0,0 @@ -import React from "react"; -import PropTypes from "prop-types"; -import { Typography, Paper, makeStyles, useTheme } from '@material-ui/core'; -import clsx from "clsx"; - -export default function ParseError({ file_path, expected, got, line_num }){ - - const theme = useTheme(); - - const useStyles = makeStyles({ - "Paper-root": { - overflow: "hidden" - }, - "headerColor": { - backgroundColor: theme.palette.parse_error.main - }, - "padding": { - padding: theme.spacing(1) - } - - }); - const classes = useStyles(); - - return( - -
- - Parsing Error - -
-
- - File Path: {file_path} - - - Line: {line_num} - - - Expected: {expected} - - - Got: {got} - -
- - ); -} - -ParseError.propTypes = { - "file_path": PropTypes.string, - "expected": PropTypes.string, - "got": PropTypes.string, - "line_num": PropTypes.number -}; - -ParseError.defaultProps = { - "file_path": "", - "expected": "", - "got": "", - "line_num": "" -}; \ No newline at end of file diff --git a/src/components/ParseError/ParseError.md b/src/components/ParseError/ParseError.md deleted file mode 100644 index 98b58a2..0000000 --- a/src/components/ParseError/ParseError.md +++ /dev/null @@ -1,36 +0,0 @@ -Displays a parsing error. - ---- - -```jsx -import { ThemeProvider } from "@material-ui/core/styles"; -import webqueue2Theme from "../../theme"; -import ParseError from "./ParseError"; - -const theme = webqueue2Theme(false); - -const demo_data = { - "type": "parse_error", - "datetime": "2020-10-23T00:45:32", - "file_path": "/home/pier/e/campb303/webqueue2/q-snapshot/ce/32", - "expected": "Did not encounter a reply-from-user ending delimiter", - "got": "765-869-4032 to assist please?\tThank you\n", - "line_num": 120 -}; - - - -``` -```jsx static - -``` \ No newline at end of file diff --git a/src/components/ParseError/index.js b/src/components/ParseError/index.js deleted file mode 100644 index 8a5ec40..0000000 --- a/src/components/ParseError/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from "./ParseError"; \ No newline at end of file diff --git a/src/components/TimelineActionCard/TimelineActionCard.js b/src/components/TimelineActionCard/TimelineActionCard.js index 1137b19..431cd3e 100644 --- a/src/components/TimelineActionCard/TimelineActionCard.js +++ b/src/components/TimelineActionCard/TimelineActionCard.js @@ -16,10 +16,6 @@ export default function TimelineActionCard({ type, datetime, by, content }){ "reply_to_user": { "verbage": "replied", "coloring": theme.palette.reply_to_user.main - }, - "status": { - "verbage": "updated the status", - "coloring": theme.palette.status.main } } @@ -58,9 +54,9 @@ TimelineActionCard.propTypes = { ]), /** ISO 8601 formatted time string. */ "datetime": PropTypes.string.isRequired, - /** The name of the person who added the action. */ + /** The name of the person who added the edit. */ "by": PropTypes.string.isRequired, - /** An array of strings containing the content of the action. */ + /** An array of strings containing the content of the edit. */ "content": PropTypes.array.isRequired }; diff --git a/src/theme.js b/src/theme.js index 52c59bd..685626a 100644 --- a/src/theme.js +++ b/src/theme.js @@ -26,11 +26,8 @@ export default function theme(darkMode = false) { "reply_to_user": { main: "rgba(99, 125, 255, 0.2)", }, - "status": { + "reply_from_user": { main: "rgba(99, 255, 151, 0.2)", - }, - "parse_error": { - main: "rgba(255, 99, 204, 0.2)", } }, })