Fix routes (#29)

SimplQ · Apr 24, 2020 · 5f2c556 · 5f2c556
1 parent 80da2a5
commit 5f2c556
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/simplq/firebase.json b/simplq/firebase.json
@@ -8,6 +8,10 @@
       "firebase.json",
       "**/.*",
       "**/node_modules/**"
-    ]
+    ],
+    "rewrites": [{
+      "source": "**",
+      "destination": "/index.html"
+      }]
   }
 }
diff --git a/simplq/src/components/Routes.jsx b/simplq/src/components/Routes.jsx
@@ -11,8 +11,8 @@ import Admin from "./page/admin/index";
 export default () => {
   return <Router>
       <Route path="/" exact component={CreateQueue} />
-      <Route path="/queue/:queueId/admin" component={Admin} />
-      <Route path="/join" component={JoinQueue} />
-      <Route path="/queue-status" component={QueueStatus} />
+      <Route path="/admin/:queueId" exact component={Admin} />
+      <Route path="/:queueId" exact component={JoinQueue} />
+      <Route path="/status/:queueId/:tokenId" exact component={QueueStatus} />
   </Router>
 }
diff --git a/simplq/src/components/page/CreateQueue.jsx b/simplq/src/components/page/CreateQueue.jsx
@@ -39,7 +39,7 @@ class CreateQueue extends React.Component {
 
   handleClick(name) {
       QueueService.createQueue(name).then( 
-        queueId => this.props.history.push("/queue/" + queueId + "/admin")
+        queueId => this.props.history.push("/admin/" + queueId)
       )
 
   }

diff --git a/simplq/src/components/page/QueueStatus.jsx b/simplq/src/components/page/QueueStatus.jsx
@@ -7,7 +7,7 @@ import CentralSection from "../CentralSection";
 function QueueStatus(props) {
   var aheadCount = 10;
 
-  return <CentralSection heading="Your Status">
+  return <CentralSection heading="Sit Tight!">
     <Typography variant="h5" align="center" color="textSecondary" component="p">
       There are {aheadCount} people ahead of you. Thanks for waiting!
     </Typography>