diff --git a/README.md b/README.md index 491653ca5a..8d0a322fa6 100644 --- a/README.md +++ b/README.md @@ -36,9 +36,11 @@ Make sure you have Node 8 and `npm` 5 or greater. It's recommended you manage yo ### Viewing the Website -Open your web browser of choice and go to `https://localhost:3735/` +The root `/` is redirected to www.zooniverse.org because this frontend app is no longer used for the homepage. Point your browser to a subpath to view this app run locally. -If you want to _login_ via the Panoptes API and _view authenticated pages,_ then you'll need to set up and use `https://local.zooniverse.org:3735` instead of using localhost:3735. Otherwise, you'll run into CORS errors. (You need to add the hostname to your hosts file, pointing to local. Instructions are on [our Stackoverflow](https://stackoverflow.com/c/zooniverse/questions/109).) +Open your web browser of choice and go to `https://localhost:3735/lab` + +If you want to _login_ via the Panoptes API and _view authenticated pages,_ then you'll need to set up and use `https://local.zooniverse.org:3735/lab` instead of using localhost:3735. Otherwise, you'll run into CORS errors. (You need to add the hostname to your hosts file, pointing to local. Instructions are on [our Stackoverflow](https://stackoverflow.com/c/zooniverse/questions/109).) **Troubleshooting: web browser blocks local website** diff --git a/app/layout/account-bar.jsx b/app/layout/account-bar.jsx index 10054b5814..a2d4ca9793 100644 --- a/app/layout/account-bar.jsx +++ b/app/layout/account-bar.jsx @@ -143,14 +143,13 @@ export default class AccountBar extends React.Component {
- - +
{!!this.state.isMobile && - - + } - {ZOO_LOGO} - + {!this.state.isMobile && this.renderLinks()} diff --git a/app/pages/notifications/notification-section.spec.js b/app/pages/notifications/notification-section.spec.js index d4bc6d28d3..26f40c0746 100644 --- a/app/pages/notifications/notification-section.spec.js +++ b/app/pages/notifications/notification-section.spec.js @@ -47,10 +47,6 @@ describe('Notification Section', function() { assert.equal(wrapper.find('.notification-section__title').text(), 'Zooniverse'); }); - it('should link to the home page', function () { - assert.equal(wrapper.find('Link').prop('to'), '/'); - }); - it('shows the Zooniverse logo', function () { assert.equal(wrapper.find('ZooniverseLogo').length, 1); }); @@ -147,7 +143,7 @@ describe('Notification Section', function() { user={{ id: '1' }} />, { - context: { notificationsCounter }, + context: { notificationsCounter }, disableLifeCycleMethods: true } ); diff --git a/app/pages/profile/stats.cjsx b/app/pages/profile/stats.cjsx index 6956bc3cd5..39420effd7 100644 --- a/app/pages/profile/stats.cjsx +++ b/app/pages/profile/stats.cjsx @@ -3,5 +3,5 @@ React = require 'react' module.exports = (props) =>
-

Your classification stats are now displayed on your Zooniverse home page.

-
\ No newline at end of file +

Your classification stats are now displayed on your Zooniverse home page.

+ diff --git a/app/pages/profile/user.jsx b/app/pages/profile/user.jsx index bf6cbb0039..d7d2d5cf4c 100644 --- a/app/pages/profile/user.jsx +++ b/app/pages/profile/user.jsx @@ -82,9 +82,9 @@ class ProfileUser extends Component { ); } else { return ( - + - + ); } } diff --git a/app/router.jsx b/app/router.jsx index 2cf780936d..8c8506b5d7 100644 --- a/app/router.jsx +++ b/app/router.jsx @@ -95,9 +95,8 @@ class ExternalRedirect extends React.Component { export const routes = ( - + } /> -