From bb13d534b4f81c05bdfc44dfc559971e411ccf26 Mon Sep 17 00:00:00 2001 From: "Bennett, Jacob Daniel" Date: Fri, 23 Oct 2020 10:59:49 -0400 Subject: [PATCH 01/10] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 38 ++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..dd84ea7 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,38 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - OS: [e.g. iOS] + - Browser [e.g. chrome, safari] + - Version [e.g. 22] + +**Smartphone (please complete the following information):** + - Device: [e.g. iPhone6] + - OS: [e.g. iOS8.1] + - Browser [e.g. stock browser, safari] + - Version [e.g. 22] + +**Additional context** +Add any other context about the problem here. From bf54a0a8f39e081a86a068a594243c402eb05ae1 Mon Sep 17 00:00:00 2001 From: Justin Campbell Date: Tue, 27 Oct 2020 17:20:06 -0400 Subject: [PATCH 02/10] Revert "Merge pull request #92 from ECN/feature-conversational-ui" This reverts commit f1b67290d20def8a59f5da421435d08628ebcddb, reversing changes made to 7a8f5b7756a3506eb5b97c17838e2e222a9453e4. --- src/components/ItemBodyView/ItemBodyView.js | 42 +++++++++---- src/components/ParseError/ParseError.js | 61 ------------------- src/components/ParseError/ParseError.md | 36 ----------- src/components/ParseError/index.js | 1 - .../TimelineActionCard/TimelineActionCard.js | 8 +-- src/theme.js | 5 +- 6 files changed, 33 insertions(+), 120 deletions(-) delete mode 100644 src/components/ParseError/ParseError.js delete mode 100644 src/components/ParseError/ParseError.md delete mode 100644 src/components/ParseError/index.js diff --git a/src/components/ItemBodyView/ItemBodyView.js b/src/components/ItemBodyView/ItemBodyView.js index 4e5edce..19e48fb 100644 --- a/src/components/ItemBodyView/ItemBodyView.js +++ b/src/components/ItemBodyView/ItemBodyView.js @@ -1,12 +1,11 @@ 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/"; import MessageView from "../MessageView/"; -import ParseError from "../ParseError/"; import { objectIsEmpty } from "../../utilities"; export default function ItemBodyView({ item }) { @@ -32,23 +31,42 @@ export default function ItemBodyView({ item }) { 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)", } }, }) From 4e7968330eb15c9878e7e39da898894b61376273 Mon Sep 17 00:00:00 2001 From: "Bennett, Jacob Daniel" Date: Tue, 3 Nov 2020 10:09:12 -0500 Subject: [PATCH 03/10] Update Bug Issue Template --- .github/ISSUE_TEMPLATE/bug_report.md | 48 +++++++++++----------------- 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index dd84ea7..52e0afa 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -2,37 +2,25 @@ name: Bug report about: Create a report to help us improve title: '' -labels: '' +labels: bug assignees: '' --- -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Desktop (please complete the following information):** - - OS: [e.g. iOS] - - Browser [e.g. chrome, safari] - - Version [e.g. 22] - -**Smartphone (please complete the following information):** - - Device: [e.g. iPhone6] - - OS: [e.g. iOS8.1] - - Browser [e.g. stock browser, safari] - - Version [e.g. 22] - -**Additional context** -Add any other context about the problem here. + +## What Happened + +## Expected Behavior + +## Steps to Reproduce + +1. +2. +3. +### Logs + + From 887fc63d44b4360d95ba71da24e57c803dbad13f Mon Sep 17 00:00:00 2001 From: "Bennett, Jacob Daniel" Date: Tue, 3 Nov 2020 10:12:06 -0500 Subject: [PATCH 04/10] Add Feature request template --- .github/ISSUE_TEMPLATE/feature_request.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..217d4fc --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,19 @@ +--- +name: Feature request +about: Suggest an idea for the Webqueue2 project +title: '' +labels: feature-request +assignees: '' + +--- + + +## Problem + +## Proposal + +### Examples + + From b47418161a9bf0e7222c0f6603d27551c2f72a35 Mon Sep 17 00:00:00 2001 From: "Campbell, Justin" Date: Thu, 3 Dec 2020 09:53:03 -0500 Subject: [PATCH 05/10] Update feature_request.md --- .github/ISSUE_TEMPLATE/feature_request.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 217d4fc..c317b71 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,7 +1,7 @@ --- name: Feature request about: Suggest an idea for the Webqueue2 project -title: '' +title: '[FEATURE REQUEST]' labels: feature-request assignees: '' From 4e15c4b8dbef6a9cf31693039be1c59d7466923e Mon Sep 17 00:00:00 2001 From: "Campbell, Justin" Date: Thu, 3 Dec 2020 09:54:48 -0500 Subject: [PATCH 06/10] Update feature_request.md --- .github/ISSUE_TEMPLATE/feature_request.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index c317b71..88270cd 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,7 +1,7 @@ --- name: Feature request about: Suggest an idea for the Webqueue2 project -title: '[FEATURE REQUEST]' +title: '[' labels: feature-request assignees: '' From 796f7468ae0e2d4a97c064c3de98529c073b96e7 Mon Sep 17 00:00:00 2001 From: "Campbell, Justin" Date: Thu, 3 Dec 2020 10:07:47 -0500 Subject: [PATCH 07/10] Update issue templates --- .github/ISSUE_TEMPLATE/bug-report----.md | 41 ++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature-request---.md | 33 ++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 2 +- 3 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 .github/ISSUE_TEMPLATE/bug-report----.md create mode 100644 .github/ISSUE_TEMPLATE/feature-request---.md 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/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 88270cd..217d4fc 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,7 +1,7 @@ --- name: Feature request about: Suggest an idea for the Webqueue2 project -title: '[' +title: '' labels: feature-request assignees: '' From 1f3d730da121b7a5522a5e724d9528735511683e Mon Sep 17 00:00:00 2001 From: "Campbell, Justin" Date: Thu, 3 Dec 2020 10:09:54 -0500 Subject: [PATCH 08/10] Delete bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 52e0afa..0000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: bug -assignees: '' - ---- - - -## What Happened - -## Expected Behavior - -## Steps to Reproduce - -1. -2. -3. -### Logs - - From 6554ff5ce5a2c51aca55e5a407956186e39db921 Mon Sep 17 00:00:00 2001 From: "Campbell, Justin" Date: Thu, 3 Dec 2020 10:10:02 -0500 Subject: [PATCH 09/10] Delete feature_request.md --- .github/ISSUE_TEMPLATE/feature_request.md | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index 217d4fc..0000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for the Webqueue2 project -title: '' -labels: feature-request -assignees: '' - ---- - - -## Problem - -## Proposal - -### Examples - - From 5b15bd2cdd04df2c193b2ea1c15c42792fb73056 Mon Sep 17 00:00:00 2001 From: "Campbell, Justin" Date: Mon, 22 Feb 2021 13:29:05 -0500 Subject: [PATCH 10/10] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)