diff --git a/client/modules/App/App.jsx b/client/modules/App/App.jsx
index f9a8de34..346ea411 100644
--- a/client/modules/App/App.jsx
+++ b/client/modules/App/App.jsx
@@ -35,7 +35,7 @@ class App extends React.Component {
return (
{/* FIXME: remove false */}
- {this.state.isMounted && !window.devToolsExtension && getConfig('NODE_ENV') === 'development' && }
+ {false && this.state.isMounted && !window.devToolsExtension && getConfig('NODE_ENV') === 'development' && }
{this.props.children}
);
diff --git a/client/routes.jsx b/client/routes.jsx
index 3584099f..a9d5632c 100644
--- a/client/routes.jsx
+++ b/client/routes.jsx
@@ -27,7 +27,7 @@ const checkAuth = (store) => {
// TODO: This short-circuit seems unnecessary - using the mobile navigator (future) should prevent this from being called
const onRouteChange = (store) => {
const path = window.location.pathname;
- if (path.includes('/mobile')) return;
+ if (path.includes('/mobile/preview')) return;
store.dispatch(stopSketch());
};
diff --git a/server/routes/server.routes.js b/server/routes/server.routes.js
index d39f93e2..7fab75fc 100644
--- a/server/routes/server.routes.js
+++ b/server/routes/server.routes.js
@@ -145,54 +145,4 @@ router.get('/:username/collections', (req, res) => {
});
-// Mobile Routes
-if (process.env.MOBILE_ENABLED) {
- router.get('/mobile', (req, res) => res.send(renderIndex()));
-
- router.get('/mobile/preview', (req, res) => res.send(renderIndex()));
-
- router.get('/mobile/preferences', (req, res) => res.send(renderIndex()));
-
- router.get('/mobile/:username/sketches', (req, res) => {
- userExists(req.params.username, fallback404(res));
- });
-
- router.get('/mobile/:username/sketches/:project_id', (req, res) => {
- projectForUserExists(req.params.username, req.params.project_id, fallback404(res));
- });
-
- router.get('/mobile/:username/assets', (req, res) => {
- userExists(req.params.username, (exists) => {
- const isLoggedInUser = req.user && req.user.username === req.params.username;
- const canAccess = exists && isLoggedInUser;
- return canAccess ?
- res.send(renderIndex()) :
- get404Sketch(html => res.send(html));
- });
- });
-
- router.get('/mobile/:username/collections/create', (req, res) => {
- userExists(req.params.username, (exists) => {
- const isLoggedInUser = req.user && req.user.username === req.params.username;
- const canAccess = exists && isLoggedInUser;
- return canAccess ?
- res.send(renderIndex()) :
- get404Sketch(html => res.send(html));
- });
- });
-
-
- router.get('/mobile/:username/collections', (req, res) => {
- userExists(req.params.username, fallback404(res));
- });
-
- router.get('/mobile/:username/collections/create', (req, res) => {
- userExists(req.params.username, fallback404(res));
- });
-
- router.get('/mobile/:username/collections/:id', (req, res) => {
- collectionForUserExists(req.params.username, req.params.id, fallback404(res));
- });
-}
-
export default router;
diff --git a/server/server.js b/server/server.js
index d82aa6d8..c9794925 100644
--- a/server/server.js
+++ b/server/server.js
@@ -132,6 +132,10 @@ app.get(
// isomorphic rendering
app.use('/', serverRoutes);
+if (process.env.MOBILE_ENABLED) {
+ app.use('/mobile', serverRoutes);
+}
+
app.use(assetRoutes);
app.use('/', embedRoutes);