From 259a0a594ee68409410eb96f4fdad6c9de822005 Mon Sep 17 00:00:00 2001
From: mrugesh mohapatra <me@raisedadead.com>
Date: Thu, 7 Jun 2018 17:45:30 +0530
Subject: [PATCH] fix(portfolio): User /:username routes as previously (#17470)

---
 common/app/routes/Profile/index.js      |  2 +-
 common/app/routes/Settings/Settings.jsx |  2 +-
 server/boot/{react.js => z-a-react.js}  |  7 ++-
 server/utils/constants.js               | 66 +++++++++++++++----------
 4 files changed, 48 insertions(+), 29 deletions(-)
 rename server/boot/{react.js => z-a-react.js} (96%)

diff --git a/common/app/routes/Profile/index.js b/common/app/routes/Profile/index.js
index ad70ccbc64..2ae2f541bf 100644
--- a/common/app/routes/Profile/index.js
+++ b/common/app/routes/Profile/index.js
@@ -3,5 +3,5 @@ import { types } from './redux';
 export { default } from './Profile.jsx';
 
 export const routes = {
-  [types.onRouteProfile]: '/portfolio/:username'
+  [types.onRouteProfile]: '/:username'
 };
diff --git a/common/app/routes/Settings/Settings.jsx b/common/app/routes/Settings/Settings.jsx
index 88779602ab..e03af489ee 100644
--- a/common/app/routes/Settings/Settings.jsx
+++ b/common/app/routes/Settings/Settings.jsx
@@ -77,7 +77,7 @@ export class Settings extends React.Component {
     return (
       <div className={ `${ns}-container` }>
         <FullWidthRow>
-          <Link to={ `/portfolio/${username}` }>
+          <Link to={ `/${username}` }>
             <Button
               block={ true }
               bsSize='lg'
diff --git a/server/boot/react.js b/server/boot/z-a-react.js
similarity index 96%
rename from server/boot/react.js
rename to server/boot/z-a-react.js
index e3d5647f43..e599b73d92 100644
--- a/server/boot/react.js
+++ b/server/boot/z-a-react.js
@@ -19,7 +19,7 @@ const isDev = process.env.NODE_ENV !== 'production';
 const routes = [
   '/settings',
   '/settings/*',
-  '/portfolio/:username'
+  '/:username'
 ];
 
 const devRoutes = [];
@@ -37,6 +37,11 @@ export default function reactSubRouter(app) {
     (req, res) => res.redirect(`/challenges/${req.params.dashedName}`)
   );
 
+  router.get(
+    '/portfolio/:redirectUsername',
+    (req, res) => res.redirect(`/${req.params.redirectUsername}`)
+  );
+
   // These routes are in production
   routes.forEach((route) => {
     router.get(route, serveReactApp);
diff --git a/server/utils/constants.js b/server/utils/constants.js
index 1b7fa857a4..4b3c8d6676 100644
--- a/server/utils/constants.js
+++ b/server/utils/constants.js
@@ -1,38 +1,52 @@
 export const blacklistedUsernames = [
-  'bonfire',
+  'about',
   'account',
-  'user',
+  'agile',
+  'api',
+  'bonfire',
+  'cats.json',
   'challenge',
   'challenges',
-  'completed-challenge',
-  'completed-zipline-or-basejump',
-  'completed-bonfire',
-  'map',
-  'learn-to-code',
-  'about',
-  'api',
-  'explorer',
-  'field-guide',
-  'completed-field-guide',
-  'jobs',
-  'nonprofits',
-  'sitemap.xml',
-  'get-help',
   'chat',
-  'twitch',
-  'get-pai',
+  'completed-bonfire',
+  'completed-challenge',
+  'completed-field-guide',
+  'completed-zipline-or-basejump',
+  'donate',
+  'events',
+  'explorer',
+  'external',
+  'field-guide',
+  'forgot',
+  'forum',
   'get-help',
+  'get-help',
+  'get-pai',
+  'guide',
+  'internal',
+  'jobs',
+  'jobs-form',
+  'learn-to-code',
+  'login',
+  'logout',
+  'map',
+  'news',
+  'nonprofits',
   'nonprofits',
   'nonproifts-form',
-  'jobs-form',
-  'unsubscribe',
-  'unsubscribed',
-  'cats.json',
-  'agile',
+  'open-api',
   'privacy',
-  'stories',
+  'privacy',
+  'reset',
+  'services',
   'signin',
   'signout',
-  'forgot',
-  'reset'
+  'sitemap.xml',
+  'stories',
+  'terms',
+  'twitch',
+  'unsubscribe',
+  'unsubscribed',
+  'user',
+  'wiki'
 ];