Skip to content

Update master to first beta release #141

Merged
merged 129 commits into from
Dec 4, 2020
+2,493 −1,364
Merged

Update master to first beta release #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
85cd6c2
Removed class from the Toolbar component that was causing ItemBodyVie…
Oct 23, 2020
a7720db
Change srot button to display both sorting directions at the same time.
Oct 23, 2020
bac7c01
Merge pull request #93 from ECN/feature-conversational-ui
campb303 Oct 27, 2020
7f29921
Fix multi queue loading in UI
Oct 27, 2020
997f9b9
Merge pull request #87 from ECN/bug-ItemViewAppBar-not-allowing-scrol…
campb303 Oct 27, 2020
7779ad4
Use RelativeTime component for time values in ItemTable
Oct 28, 2020
ac8570d
Merge pull request #95 from ECN/enhanvement-use-relative-time-in-item…
campb303 Oct 28, 2020
3bdb99f
Format item lastupdated time as iso8601
campb303 Oct 28, 2020
3398a82
Merge pull request #97 from ECN/use-iso8601-time-for-item-lastupdated
campb303 Oct 28, 2020
78d002e
Add column borders to ItemTable
Oct 29, 2020
e3f6b53
Merge pull request #98 from ECN/add-column-border-to-itemtable
campb303 Oct 29, 2020
9a6f781
Change TableCell border color according to theme type
Oct 29, 2020
51bb16f
Merge pull request #102 from ECN/update-itemtable-borders-for-darkmode
campb303 Oct 29, 2020
962a672
Add module level docs
Oct 29, 2020
6c44662
Remove debug comment
Oct 29, 2020
d0f9bc6
Add TODO for coral queue issues
Oct 29, 2020
0c28cfe
Update module docs
Oct 29, 2020
a507ac7
Add Item class doc block
Oct 29, 2020
4feaaad
Add Queue doc block
Oct 29, 2020
ab3cb8a
Update Item doc block
Oct 29, 2020
b1d258b
Permenantly add coral queue to queuesToIgnore
Oct 29, 2020
fea27fd
Update module doc block
Oct 29, 2020
202e04c
Remove getContent function /c no longer neede
Oct 29, 2020
0b8776b
Remove __getAssignedTo from Item b/c it is no longer needed
Oct 29, 2020
29f7dab
Add todo for queue iteration
Oct 29, 2020
b078ed9
Add comments for default date in getFormattedDate()
Oct 29, 2020
605d165
Merge pull request #103 from ECN/scruba-a-dub-dub-for-ECNQueue
campb303 Oct 29, 2020
c807416
implementation of QueueList class to store queue list info for /api/g…
Oct 30, 2020
c67c721
removal of QueueList class from ECNQueue.py and replaced with functio…
Oct 30, 2020
69bc887
Create QueueSelector component placeholder
Oct 30, 2020
a65c60a
pep8 formatting
Oct 30, 2020
3adbf91
pep8 fomatting
Oct 30, 2020
190c75f
Fixed sort toggle buttons to allow sort by direction of the icon sele…
Oct 30, 2020
c8782a4
Merge branch 'staging' into Enhancement-ItemTable-sortButton
wrigh393 Oct 30, 2020
f07895a
Separate building valid queue list and loading queues
Oct 30, 2020
50a899f
Create utility function for checking valid item names
Oct 30, 2020
aba6964
Add getQueueCounts() function
Oct 30, 2020
20b0c37
Move getQueues endpoint to get_queues
Oct 30, 2020
c23c678
Merge pull request #104 from ECN/Feature-Load-Queue-and-Length-of_Queue
campb303 Oct 30, 2020
9be5a9e
removed row selection code from branch
Oct 30, 2020
3b4ef18
Removed row selection code and merge changes from remote
Oct 30, 2020
496196e
Cleanup
Oct 30, 2020
e3eb945
Fixed row click
Oct 30, 2020
da2592d
Merge pull request #88 from ECN/Enhancement-ItemTable-sortButton
wrigh393 Oct 30, 2020
d93ed18
Fix date parsing error
Oct 30, 2020
989f148
Added styling to ItemTable to display what row is currently selected
Nov 2, 2020
1a4c22b
Changed TextField label font size to prevent overflowing parent
Nov 2, 2020
4f95eb1
Update component and docs
Nov 2, 2020
d728722
Implement QueueSelector component and modify API call for multiple qu…
Nov 2, 2020
b7726e0
Move selectedRow state variable to top of function definition
campb303 Nov 3, 2020
e7d1df5
Consolidate isSelected logic
campb303 Nov 3, 2020
52cd04e
Merge pull request #107 from ECN/enhancement-selected-row-styling
campb303 Nov 3, 2020
0f4b510
Merge pull request #110 from ECN/feature-create-queue-selector-component
campb303 Nov 3, 2020
ef1a12d
Add useEffect for /api/get_queues and QueueSelector
Nov 3, 2020
fb4b2e1
Merge pull request #112 from ECN/integreate-api-get_queues-and-QueueS…
campb303 Nov 3, 2020
2221f28
Fixed filter label overflow using useState and javascript event liste…
Nov 4, 2020
9ebecc8
Removed unused imports
Nov 4, 2020
4ae7083
Merge pull request #108 from ECN/bugfix-ItemTableFilter-label-overflow
campb303 Nov 4, 2020
0fc47e4
Add venv:freeze command
Nov 4, 2020
bd7daa7
Merge pull request #115 from ECN/add-venv-freeze-command
campb303 Nov 4, 2020
1de44ad
Add pyjwt to API requirements
Nov 4, 2020
3872dbe
Add venv:freeze docs
campb303 Nov 4, 2020
44865c2
Changed color of selected row to a color that is easier to see
Nov 4, 2020
0398df2
Add dotenv support to API
Nov 5, 2020
f6a15d3
Update gitignore to include api dotenv files
Nov 5, 2020
f9dd838
Add python-dotenv to pip requirements
Nov 5, 2020
982ce7b
Replace pyjwt with Flask-JWT-Extended
Nov 5, 2020
937dbc0
Added logic that removes selected row styling after ItemView is closed.
Nov 6, 2020
4e8fae4
Implement basic shared username/password auth using dotenv
Nov 8, 2020
dcf3c3d
Implement login, token generation and route protection with JWTs
Nov 8, 2020
271caab
Implement /tokens/refresh endpoint to get new access tokens
Nov 8, 2020
ba3c9b7
Update Login resource docs
Nov 10, 2020
b75f3d7
Make Item resource return tuple w/ quueue JSON and HTTP return code p…
Nov 10, 2020
5c5a100
Update Queue resource to return a tuple of data and HTTP response cod…
Nov 10, 2020
ffc049b
Correct refactoring error that broke Queue resource
Nov 10, 2020
5b752de
Update QueueList docs
Nov 11, 2020
4757b28
Add JWT_REFRESH_CRSF_HEADER for easier reference
Nov 11, 2020
4e40b02
Create base LoginForm -- nonfunctional
Nov 13, 2020
ca130f8
Create base auth utilities -- only login
Nov 13, 2020
50f03ec
Create AuthProvider component
Nov 13, 2020
4e79718
Create PrivateRoute component for checking auth
Nov 13, 2020
58e6b96
Move previous App component to AppView
Nov 13, 2020
d20a3b4
Update app entrypoint for auth routing
Nov 13, 2020
c3e9d2c
Include AuthProvider
Nov 13, 2020
34f56ae
Integrate API login and error handling
Nov 13, 2020
3334517
Add auth headers to API requests
Nov 14, 2020
27d51fa
Add view password toggle to login screen
Nov 15, 2020
8486ec5
Intensify login screen gradient
Nov 15, 2020
170a87d
Fix spelling error in token refresh endpoint
Nov 16, 2020
4a79cb4
Add token refresh function to auth utilities
Nov 16, 2020
64decd9
Add react-cookies to project
Nov 16, 2020
5f65436
Add CookieProvider
Nov 16, 2020
5e77e49
Remove debug calls
Nov 16, 2020
80804cf
Implement automatic token refresh
Nov 16, 2020
7e84b6e
Merge pull request #120 from ECN/feature-implement-authentication
campb303 Nov 16, 2020
2e6f87d
Merge branch 'staging' into enhancement-selected-row-styling
campb303 Nov 16, 2020
01a3653
Merge pull request #116 from ECN/enhancement-selected-row-styling
campb303 Nov 16, 2020
27bca3e
Fix ItemTable props/state issues causing failure to render
Nov 16, 2020
bc1484d
Stop auto population of text on menu item hover
Nov 17, 2020
68ec438
Disable open on focus
Nov 17, 2020
9979aa8
Update placeholder text
Nov 17, 2020
c216a17
Add label via start adornment w/ workaround
Nov 17, 2020
172480b
Refactor handler functions
Nov 17, 2020
983e852
Add visual spacing and use small outlined styling
Nov 17, 2020
18e0565
Auto highlight first matching queue
Nov 19, 2020
1743ecb
Consolidate queue count fetch and add visual loading state
Nov 19, 2020
cd85eee
Autofocus QueueSelector
Nov 19, 2020
2de2d34
Refactor queues to queueCounts
Nov 20, 2020
e7bc281
Add controlled values
Nov 20, 2020
f8fa092
Raise QueueSelector open state and optimize API calls
Nov 20, 2020
4ec7d5e
Merge pull request #126 from ECN/improve-QueueSelector
campb303 Nov 20, 2020
951e795
Add recent UI snapshots
campb303 Nov 23, 2020
a3d7885
Remove log for CSRF token
Nov 25, 2020
6c7b28e
Add jwt-decode to npm dependencies
Nov 25, 2020
2d60fef
Add auto refresh for access tokens
Nov 25, 2020
45037b9
Merge pull request #130 from ECN/fix-access-token-refresh
campb303 Nov 25, 2020
ce280ca
Add csrf ass cookie dependency to reduce renders
Nov 26, 2020
1e06378
Add clarifying comments
Nov 27, 2020
77c40a4
Add support for storing active queues across page reloads
Dec 1, 2020
1c8dedc
Update QueueSelector props
Dec 1, 2020
781cfd4
Merge pull request #131 from ECN/persist-active-queues-across-reloads
campb303 Dec 1, 2020
f3ff8b5
Create ItemHeaderView component w/o docs
Dec 2, 2020
f4dac2f
Add tabbed conversation and header view
Dec 2, 2020
a6d820f
Header date format implementation
Dec 3, 2020
78b1ebf
Update ECNQueue.py
benne238 Dec 3, 2020
8dbb8b5
Merge pull request #134 from ECN/Feature-Standardize-Date-Formats-In-…
campb303 Dec 3, 2020
e8bc3c5
Remove extra padding for use inside tabs
Dec 3, 2020
3891c05
Merge pull request #136 from ECN/create-item-header-view
campb303 Dec 3, 2020
0fd6f0a
Update UI Snapshot
Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,17 @@
# Testing
/coverage

# Productiom
# React Build Files
/build

# Misc
.DS_Store
# React local environment files
.env.local
.env.development.local
.env.test.local
.env.production.local

# Misc
.DS_Store
.vscode/

# Node Package Management
Expand All @@ -28,3 +30,4 @@ yarn-error.log*
/api/venv
__pycache__/
venv-manager.log
/api/.env
3 changes: 2 additions & 1 deletion Dev Environment Setup Guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,4 +252,5 @@ All of the tools in this project are accessible as an npm task so you can intera
| `kill:api` | Kills the runaway API process(es). |
| `venv:create` | This will create a virtual environment in `/api/venv` and install requirements from `/api/requirements.txt`. |
| `venv:delete` | This will delete the folder `/api/venv`. |
| `venv:reset` | This will run `venv:delete` then `venv:create`. |
| `venv:reset` | This will run `venv:delete` then `venv:create`. |
| `venv:freeze` | Regenerates the API requirements.txt file and mitigates [this pip bug](https://github.com/pypa/pip/issues/4022). |
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# webqueue2
A re-write of Purdue ECN's webqueue

![UI Snapshot](./docs/UI%20Snapshots/UI-Snapshot%202020-09-22%20at%201.48.58%20PM.png)
![UI Snapshot](./docs/UI%20Snapshots/UI-Snapshot%202020-12-03%20at%208.10.32%20PM.png)

## Stay Up To Date
See what's being worked on with [the webqueue2 Project](https://github.itap.purdue.edu/ECN/webqueue2/projects/).
Expand Down
Loading