From 9cb49bf271a6674f87a2d65963cd477ca4618758 Mon Sep 17 00:00:00 2001 From: benne238 Date: Tue, 2 Feb 2021 15:28:02 -0500 Subject: [PATCH 1/9] update api according to git issue 170: consolidate API endpoints under one path --- api/api.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/api.py b/api/api.py index 0cbd771..5f72aa9 100644 --- a/api/api.py +++ b/api/api.py @@ -186,10 +186,10 @@ def get(self) -> tuple: -api.add_resource(Login, "/login") -api.add_resource(RefreshAccessToken, "/tokens/refresh") -api.add_resource(Item, "/api//") -api.add_resource(Queue, "/api/") +api.add_resource(Login, "/api/login") +api.add_resource(RefreshAccessToken, "/api/tokens/refresh") +api.add_resource(Item, "/api/data//") +api.add_resource(Queue, "/api/data/") api.add_resource(QueueList, "/api/get_queues") if __name__ == "__main__": From c02fae399432795881c846e8ed3b00db4e98a0d3 Mon Sep 17 00:00:00 2001 From: benne238 Date: Tue, 2 Feb 2021 16:02:28 -0500 Subject: [PATCH 2/9] updated /api/get_queues endpoint to /api/data/get_queues --- api/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/api.py b/api/api.py index 5f72aa9..5a52767 100644 --- a/api/api.py +++ b/api/api.py @@ -190,7 +190,7 @@ def get(self) -> tuple: api.add_resource(RefreshAccessToken, "/api/tokens/refresh") api.add_resource(Item, "/api/data//") api.add_resource(Queue, "/api/data/") -api.add_resource(QueueList, "/api/get_queues") +api.add_resource(QueueList, "/api/data/get_queues") if __name__ == "__main__": app.run() \ No newline at end of file From db580eefb0fc01014b81c00e337d80af0871f33e Mon Sep 17 00:00:00 2001 From: Justin Campbell Date: Wed, 3 Feb 2021 12:35:03 -0500 Subject: [PATCH 3/9] Update refresh token path --- api/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/api.py b/api/api.py index 5a52767..04a6373 100644 --- a/api/api.py +++ b/api/api.py @@ -38,7 +38,7 @@ # Restrict cookies using SameSite=strict flag app.config["JWT_COOKIE_SAMESITE"] = "strict" # Restrict refresh tokens to /token/refresh endpoint -app.config["JWT_REFRESH_COOKIE_PATH"] = '/tokens/refresh' +app.config["JWT_REFRESH_COOKIE_PATH"] = '/api/tokens/refresh' # Set the cookie key for CRSF validation string # This is the default value. Adding it for easy reference app.config["JWT_REFRESH_CSRF_HEADER_NAME"] = "X-CSRF-TOKEN" From 1b0fafb95ca9e76aca204be806bc59cff4662447 Mon Sep 17 00:00:00 2001 From: wrigh393 Date: Wed, 3 Feb 2021 12:50:20 -0500 Subject: [PATCH 4/9] Update hompage entry --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8b496df..1934448 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "webqueue2", - "homepage": "/qwebtest/", + "homepage": "/webqueue/q2", "proxy": "http://localhost:5000/", "version": "0.1.0", "private": true, From 311ad72a2c6d79d7eba63de8c698a1b749577345 Mon Sep 17 00:00:00 2001 From: wrigh393 Date: Wed, 3 Feb 2021 13:17:29 -0500 Subject: [PATCH 5/9] Updated auth utilities paths --- src/auth/utilities.js | 4 ++-- src/components/ItemTable/ItemTable.js | 5 +---- src/index.js | 14 +++++++------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/auth/utilities.js b/src/auth/utilities.js index 8800954..db19113 100644 --- a/src/auth/utilities.js +++ b/src/auth/utilities.js @@ -17,7 +17,7 @@ export async function login(username, password){ body: JSON.stringify({ "username": username, "password": password}) }; - let loginResponse = await fetch("/login", loginInit); + let loginResponse = await fetch("/api/login", loginInit); let data = await loginResponse.json(); if (data === null){ @@ -44,7 +44,7 @@ export async function refresh(csrf_refresh_token){ headers: {'X-CSRF-TOKEN': csrf_refresh_token}, }; - let refreshResponse = await fetch("/tokens/refresh", refreshInit); + let refreshResponse = await fetch("/api/tokens/refresh", refreshInit); let data = await refreshResponse.json(); if (data === null){ diff --git a/src/components/ItemTable/ItemTable.js b/src/components/ItemTable/ItemTable.js index d94dc72..55881b9 100644 --- a/src/components/ItemTable/ItemTable.js +++ b/src/components/ItemTable/ItemTable.js @@ -52,10 +52,7 @@ export default function ItemTable({ data, rowCanBeSelected }) { { Header: 'Department', accessor: 'department' }, { Header: 'Building', accessor: 'building' }, { Header: 'Date Received', accessor: 'dateReceived', sortInverted: true, Cell: ({ value }) => }, - { Header: 'Last Updated', accessor: 'lastUpdated', }, - { Header: 'Department', accessor: 'department' }, - { Header: 'Building', accessor: 'building' }, - { Header: 'Date Received', accessor: 'dateReceived', }, + ], []); const tableInstance = useTable( { diff --git a/src/index.js b/src/index.js index 799ad12..b0707de 100644 --- a/src/index.js +++ b/src/index.js @@ -15,13 +15,13 @@ export const history = createBrowserHistory({ ReactDOM.render( - - - - - - - + + + + + + + , document.getElementById('root') ); From 7cac01a4df1d3b42081ddeb60eaf325889e0d47e Mon Sep 17 00:00:00 2001 From: wrigh393 Date: Wed, 3 Feb 2021 13:20:58 -0500 Subject: [PATCH 6/9] Updated API routes --- src/components/AppView/AppView.js | 2 +- src/components/QueueSelector/QueueSelector.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/AppView/AppView.js b/src/components/AppView/AppView.js index 75c7c60..5018059 100644 --- a/src/components/AppView/AppView.js +++ b/src/components/AppView/AppView.js @@ -41,7 +41,7 @@ export default function AppView({ setDarkMode }){ myHeaders.append("Authorization", `Bearer ${access_token}`); let requestOptions = { headers: myHeaders }; - const apiResponse = await fetch(`/api/${queuesToLoad}`, requestOptions); + const apiResponse = await fetch(`/api/data/${queuesToLoad}`, requestOptions); const queueJson = await apiResponse.json(); setQueues(queueJson); } else { diff --git a/src/components/QueueSelector/QueueSelector.js b/src/components/QueueSelector/QueueSelector.js index aa1a816..d3fb031 100644 --- a/src/components/QueueSelector/QueueSelector.js +++ b/src/components/QueueSelector/QueueSelector.js @@ -22,7 +22,7 @@ const getQueueCounts = async (access_token) => { myHeaders.append("Authorization", `Bearer ${access_token}`); let requestOptions = { headers: myHeaders }; - const apiResponse = await fetch(`/api/get_queues`, requestOptions); + const apiResponse = await fetch(`/api/data/get_queues`, requestOptions); const queueCountJson = await apiResponse.json(); return queueCountJson; From 1a84209f5bc9984704cb8a916cc5b7563489a6c6 Mon Sep 17 00:00:00 2001 From: "Campbell, Justin" Date: Thu, 4 Feb 2021 14:22:39 -0500 Subject: [PATCH 7/9] Prepend API calls with subdirectory path --- src/auth/utilities.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/auth/utilities.js b/src/auth/utilities.js index db19113..2a318e8 100644 --- a/src/auth/utilities.js +++ b/src/auth/utilities.js @@ -17,7 +17,7 @@ export async function login(username, password){ body: JSON.stringify({ "username": username, "password": password}) }; - let loginResponse = await fetch("/api/login", loginInit); + let loginResponse = await fetch(`${process.env.PUBLIC_URL}/api/login`, loginInit); let data = await loginResponse.json(); if (data === null){ @@ -44,7 +44,7 @@ export async function refresh(csrf_refresh_token){ headers: {'X-CSRF-TOKEN': csrf_refresh_token}, }; - let refreshResponse = await fetch("/api/tokens/refresh", refreshInit); + let refreshResponse = await fetch(`${process.env.PUBLIC_URL}/api/tokens/refresh`, refreshInit); let data = await refreshResponse.json(); if (data === null){ @@ -56,4 +56,4 @@ export async function refresh(csrf_refresh_token){ } return data.access_token || false; -} \ No newline at end of file +} From 1a91015486bcc8c54f11c30d01d324feeb0e431f Mon Sep 17 00:00:00 2001 From: "Campbell, Justin" Date: Thu, 4 Feb 2021 14:23:53 -0500 Subject: [PATCH 8/9] Prepend API calls with subdirectory path --- src/components/AppView/AppView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/AppView/AppView.js b/src/components/AppView/AppView.js index 5018059..e849647 100644 --- a/src/components/AppView/AppView.js +++ b/src/components/AppView/AppView.js @@ -41,7 +41,7 @@ export default function AppView({ setDarkMode }){ myHeaders.append("Authorization", `Bearer ${access_token}`); let requestOptions = { headers: myHeaders }; - const apiResponse = await fetch(`/api/data/${queuesToLoad}`, requestOptions); + const apiResponse = await fetch(`${process.env.PUBLIC_URL}/api/data/${queuesToLoad}`, requestOptions); const queueJson = await apiResponse.json(); setQueues(queueJson); } else { @@ -140,4 +140,4 @@ export default function AppView({ setDarkMode }){ AppView.propTypes = {}; -AppView.defaultProps = {}; \ No newline at end of file +AppView.defaultProps = {}; From c3792a0323bfb6594a543617b0ebe2dc1c8639a6 Mon Sep 17 00:00:00 2001 From: "Campbell, Justin" Date: Thu, 4 Feb 2021 14:25:09 -0500 Subject: [PATCH 9/9] Update QueueSelector.js --- src/components/QueueSelector/QueueSelector.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/QueueSelector/QueueSelector.js b/src/components/QueueSelector/QueueSelector.js index d3fb031..e39fb87 100644 --- a/src/components/QueueSelector/QueueSelector.js +++ b/src/components/QueueSelector/QueueSelector.js @@ -22,7 +22,7 @@ const getQueueCounts = async (access_token) => { myHeaders.append("Authorization", `Bearer ${access_token}`); let requestOptions = { headers: myHeaders }; - const apiResponse = await fetch(`/api/data/get_queues`, requestOptions); + const apiResponse = await fetch(`${process.env.PUBLIC_URL}/api/data/get_queues`, requestOptions); const queueCountJson = await apiResponse.json(); return queueCountJson; @@ -173,4 +173,4 @@ QueueSelector.propTypes = { "value": PropTypes.array.isRequired, /** Function to update state variable that manages selected queues. */ "setValue": PropTypes.func.isRequired, -}; \ No newline at end of file +};