diff --git a/README.md b/README.md index 0b31b4f..36e6329 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # webqueue2 A re-write of Purdue ECN's webqueue -![UI Snapshot](./docs/UI%20Snapshots/UI-Snapshot%202020-12-03%20at%208.10.32%20PM.png) +![UI Snapshot](./docs/UI%20Snapshots/UI-Snapshot%202020-09-22%20at%201.48.58%20PM.png) ## Stay Up To Date See what's being worked on with [the webqueue2 Project](https://github.itap.purdue.edu/ECN/webqueue2/projects/). diff --git a/api/ECNQueue.py b/api/ECNQueue.py index 8eb109c..df564fe 100644 --- a/api/ECNQueue.py +++ b/api/ECNQueue.py @@ -263,12 +263,6 @@ def __parseSections(self) -> list: for assignment in assignementLsit: sections.append(assignment) - # Checks for empty content within an item and returns and - if contentEnd <= contentStart: - blankInitialMessage = self.__initialMessageParsing([""]) - sections.append(blankInitialMessage) - return sections - # Checks for Directory Identifiers if self.__rawItem[contentStart] == "\n" and self.__rawItem[contentStart + 1].startswith("\t"): @@ -1355,4 +1349,4 @@ def loadQueues() -> list: for queue in getValidQueues(): queues.append(Queue(queue)) - return queues \ No newline at end of file + return queues diff --git a/api/requirements.txt b/api/requirements.txt index d87bdac..1aaa908 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -1,14 +1,22 @@ -# See: https://pip.pypa.io/en/stable/reference/pip_install/#example-requirements-file - -# General Utilities -gunicorn -pipdeptree -pylint - -# API -python-dotenv -Flask-RESTful -python-dateutil -Flask-JWT-Extended -# Prevent upgrade to 2.x until Flask-JWT-Extended is updated to support it -PyJWT == 1.* \ No newline at end of file +aniso8601==8.0.0 +astroid==2.4.2 +click==7.1.2 +Flask==1.1.2 +Flask-RESTful==0.3.8 +Flask-JWT-Extended==3.24.1 +gunicorn==20.0.4 +isort==4.3.21 +itsdangerous==1.1.0 +Jinja2==2.11.2 +lazy-object-proxy==1.4.3 +MarkupSafe==1.1.1 +mccabe==0.6.1 +pylint==2.5.3 +python-dateutil==2.8.1 +python-dotenv==0.15.0 +pytz==2020.1 +six==1.15.0 +toml==0.10.1 +typed-ast==1.4.1 +Werkzeug==1.0.1 +wrapt==1.12.1 diff --git a/docs/UI Snapshots/UI-Snapshot 2020-12-03 at 8.10.32 PM.png b/docs/UI Snapshots/UI-Snapshot 2020-12-03 at 8.10.32 PM.png deleted file mode 100644 index aa66e5d..0000000 Binary files a/docs/UI Snapshots/UI-Snapshot 2020-12-03 at 8.10.32 PM.png and /dev/null differ diff --git a/src/components/ItemTable/ItemTable.js b/src/components/ItemTable/ItemTable.js index 6c4df69..e45dc63 100644 --- a/src/components/ItemTable/ItemTable.js +++ b/src/components/ItemTable/ItemTable.js @@ -11,7 +11,7 @@ import { ArrowDownward, ArrowUpward } from "@material-ui/icons"; export default function ItemTable({ data, rowCanBeSelected }) { const [selectedRow, setSelectedRow] = useState({ queue: null, number: null}); - const theme = useTheme(); + const theme = useTheme(); const useStyles = makeStyles({ // Fully visible for active icons activeSortIcon: { @@ -57,8 +57,6 @@ export default function ItemTable({ data, rowCanBeSelected }) { { columns, data, - autoResetSortBy: false, - autoResetFilters: false, defaultColumn: { Filter: ({ column: { Header, setFilter } }) => { return ( @@ -70,7 +68,7 @@ export default function ItemTable({ data, rowCanBeSelected }) { } }, }, - useFilters, useFlexLayout, useSortBy, + useFilters, useFlexLayout, useSortBy, ); const { getTableProps, getTableBodyProps, headerGroups, rows, prepareRow, } = tableInstance; @@ -138,7 +136,7 @@ export default function ItemTable({ data, rowCanBeSelected }) { classes={{ root: (isSelected && rowCanBeSelected) ? classes.rowSelected : classes.bandedRows }} {...row.getRowProps()} > {row.cells.map(cell => ( -