diff --git a/api/api.py b/api/api.py index 0cbd771..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" @@ -186,11 +186,11 @@ 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(QueueList, "/api/get_queues") +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/data/get_queues") if __name__ == "__main__": app.run() \ No newline at end of file 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, diff --git a/src/auth/utilities.js b/src/auth/utilities.js index 8800954..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("/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("/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 +} diff --git a/src/components/AppView/AppView.js b/src/components/AppView/AppView.js index 75c7c60..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/${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 = {}; 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/components/QueueSelector/QueueSelector.js b/src/components/QueueSelector/QueueSelector.js index aa1a816..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/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 +}; 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') );