Merge remote-tracking branch 'origin/enhancement-consolidate-api-endp…

…oints' into staging

api/api.py

@@ -41,7 +41,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"
@@ -242,12 +242,14 @@ def get(self) -> tuple:
                 tuple: Queues and item counts as JSON and HTTP response code.
         """
         return (ECNQueue.getQueueCounts(), 200)
-
-api.add_resource(Login, "/login")
-api.add_resource(RefreshAccessToken, "/tokens/refresh")
-api.add_resource(Item, "/api/<string:queue>/<int:number>")
-api.add_resource(Queue, "/api/<string:queues>")
-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/<string:queue>/<int:number>")
+api.add_resource(Queue, "/api/data/<string:queues>")
+api.add_resource(QueueList, "/api/data/get_queues")
 
 if __name__ == "__main__":
     app.run()

package.json

@@ -1,6 +1,6 @@
 {
   "name": "webqueue2",
-  "homepage": "/qwebtest/",
+  "homepage": "/webqueue/q2",
   "proxy": "http://localhost:5000/",
   "version": "0.1.0",
   "private": true,

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;
-}
+}

src/components/AppView/AppView.js

@@ -43,7 +43,7 @@ export default function AppView({ setDarkMode }){
 			if (selectedQueues.length === 1){
 				queuesToLoad = selectedQueues[0].name;
 			}
-			else if (selectedQueues.length > 0){
+			else {
 				selectedQueues.forEach( (queue, index) => (
 					index === 0
 						? queuesToLoad += queue.name
@@ -142,4 +142,4 @@ export default function AppView({ setDarkMode }){
 
 AppView.propTypes = {};
 
-AppView.defaultProps = {};
+AppView.defaultProps = {};

src/components/ItemTable/ItemTable.js

@@ -65,7 +65,6 @@ export default function ItemTable({ data, rowCanBeSelected, loading }) {
             { Header: 'Department', accessor: 'department' },
             { Header: 'Building', accessor: 'building' },
             { Header: 'Date Received', accessor: 'dateReceived', sortInverted: true, Cell: ({ value }) => <RelativeTime value={value} /> },
-
         ], []);
     const tableInstance = useTable(
         {

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,
-};
+};

src/index.js

@@ -20,7 +20,7 @@ ReactDOM.render(
       <CookiesProvider>
         <AuthProvider>
           <ItemProvider>
-            <Router>
+            <Router basename={process.env.PUBLIC_URL}>
               <App />
             </Router>
           </ItemProvider>