Merge pull request #209 from labzero/feature/title-description

Update page titles and description

src/components/ErrorPage/ErrorPage.js

@@ -18,7 +18,7 @@ export function ErrorPage({ error }) {
   let errorMessage = null;
 
   if (error.status === 404) {
-    title = 'Page Not Found';
+    title = 'Page not found';
     content = 'Sorry, the page you were trying to view does not exist.';
   } else if (process.env.NODE_ENV !== 'production') {
     errorMessage = <pre>{error.stack}</pre>;

src/routes/helpers/render404.js

@@ -2,7 +2,7 @@ import React from 'react';
 import LayoutContainer from '../../components/Layout/LayoutContainer';
 import NotFound from '../not-found/NotFound';
 
-const title = 'Page Not Found';
+const title = 'Page not found';
 
 export default (context) => ({
   chunks: ['not-found'],

src/routes/helpers/rootAction.js

@@ -4,7 +4,9 @@ export default async ({ next }) => {
 
   // Provide default values for title, description etc.
   const title = 'Lunch';
-  if (route.title) {
+  if (route.fullTitle) {
+    route.title = route.fullTitle;
+  } else if (route.title) {
     route.title = `${title} | ${route.title}`;
   } else {
     route.title = title;

src/routes/login/index.js

@@ -25,6 +25,7 @@ function action(context) {
         <LoginContainer team={subdomain} next={next} />
       </LayoutContainer>
     ),
+    title: 'Log in',
   }));
 }
 

src/routes/main/invitation/create/index.js

@@ -27,5 +27,6 @@ export default (context) => {
         <Create success={success} token={token} />
       </LayoutContainer>
     ),
+    title: 'Invitation',
   };
 };

src/routes/main/invitation/new/index.js

@@ -20,5 +20,6 @@ export default (context) => {
         <New email={email} />
       </LayoutContainer>
     ),
+    title: 'Invitation',
   };
 };

src/routes/main/landing/index.js

@@ -22,5 +22,6 @@ export default (context) => {
         <Landing />
       </LayoutContainer>
     ),
+    fullTitle: 'Lunch – Team voting for nearby restaurants',
   }));
 };

src/routes/main/new-team/index.js

@@ -12,7 +12,7 @@ import LayoutContainer from '../../../components/Layout/LayoutContainer';
 import renderIfHasName from '../../helpers/renderIfHasName';
 import NewTeamContainer from './NewTeamContainer';
 
-const title = 'New Team';
+const title = 'New team';
 
 export default (context) => renderIfHasName(context, () => ({
   title,

src/routes/main/password/create/index.js

@@ -30,6 +30,7 @@ export default (context) => {
           <Create success={success} />
         </LayoutContainer>
       ),
+      title: 'Reset password',
     };
   });
 };

src/routes/main/password/edit/index.js

@@ -30,6 +30,7 @@ export default (context) => {
           <Edit token={token} />
         </LayoutContainer>
       ),
+      title: 'Reset password',
     };
   });
 };

src/routes/main/password/new/index.js

@@ -23,5 +23,6 @@ export default (context) => {
         <New email={email} />
       </LayoutContainer>
     ),
+    title: 'Reset password',
   }));
 };

src/routes/main/teams/index.js

@@ -8,4 +8,5 @@ import TeamsContainer from './TeamsContainer';
 export default (context) => renderIfHasName(context, () => ({
   chunks: ['teams'],
   component: <LayoutContainer path={context.pathname}><TeamsContainer /></LayoutContainer>,
+  title: 'My teams',
 }));

src/routes/main/users/create/index.js

@@ -23,6 +23,7 @@ export default (context) => {
           <Create />
         </LayoutContainer>
       ),
+      title: 'New user',
     };
   }
 

src/routes/main/users/new/index.js

@@ -24,7 +24,8 @@ export default (context) => {
         <LayoutContainer path={context.pathname}>
           <New email={email} />
         </LayoutContainer>
-      )
+      ),
+      title: 'New user',
     };
   }
 

src/server.js

@@ -358,7 +358,7 @@ const render = async (req, res, next) => {
     const data = { ...route,
       apikey: process.env.GOOGLE_CLIENT_APIKEY || '',
       title: route.title || 'Lunch',
-      description: 'An app for groups to decide on nearby lunch options.',
+      description: 'A simple lunch voting app for you and your team. Search nearby restaurants, add them to your list, vote for as many as you like, and decide on today’s pick!',
       body: '',
       root: generateUrl(req, req.get('host')),
     };

test/integration/other.spec.js

@@ -83,7 +83,7 @@ describe('other pages', () => {
       await page.goto('http://local.lunch.pink:3000/404');
       await page.waitForSelector('#app', helpers.waitOptions);
       const content = await page.content();
-      expect(content).to.contain('Page Not Found');
+      expect(content).to.contain('Page not found');
     });
   });
 });