Merge branch 'develop' into changes_by_almas_khan

Author: almaskhanwazir

client/components/Nav.jsx

@@ -637,6 +637,16 @@ class Nav extends React.PureComponent {
                 Español
               </button>
             </li>
+            <li className="nav__dropdown-item">
+              <button
+                onFocus={this.handleFocusForLang}
+                onBlur={this.handleBlur}
+                value="pt-BR"
+                onClick={(e) => this.handleLangSelection(e)}
+              >
+                Português
+              </button>
+            </li>
             <li className="nav__dropdown-item">
               <button
                 onFocus={this.handleFocusForLang}

client/i18n.js

@@ -1,17 +1,18 @@
 import i18n from 'i18next';
 import { initReactI18next } from 'react-i18next';
 import Backend from 'i18next-http-backend';
-import { enUS, es, ja, hi } from 'date-fns/locale';
+import { enUS, es, ja, hi, ptBR } from 'date-fns/locale';
 
 const fallbackLng = ['en-US'];
-const availableLanguages = ['en-US', 'es-419', 'ja', 'hi'];
+const availableLanguages = ['en-US', 'es-419', 'ja', 'hi', 'pt-BR'];
 
 export function languageKeyToLabel(lang) {
   const languageMap = {
     'en-US': 'English',
     'es-419': 'Español',
     ja: '日本語',
-    hi: 'हिन्दी'
+    hi: 'हिन्दी',
+    'pt-BR': 'Português'
   };
   return languageMap[lang];
 }
@@ -21,7 +22,8 @@ export function languageKeyToDateLocale(lang) {
     'en-US': enUS,
     'es-419': es,
     ja,
-    hi
+    hi,
+    'pt-BR': ptBR
   };
   return languageMap[lang];
 }

client/modules/User/pages/DashboardView.jsx

@@ -30,6 +30,10 @@ class DashboardView extends React.Component {
     super(props);
     this.closeAccountPage = this.closeAccountPage.bind(this);
     this.gotoHomePage = this.gotoHomePage.bind(this);
+    this.toggleCollectionCreate = this.toggleCollectionCreate.bind(this);
+    this.state = {
+      collectionCreateVisible: false
+    };
   }
 
   componentDidMount() {
@@ -68,15 +72,12 @@ class DashboardView extends React.Component {
     return this.props.user.username === this.props.params.username;
   }
 
-  isCollectionCreate() {
-    const path = this.props.location.pathname;
-    return /collections\/create$/.test(path);
+  toggleCollectionCreate() {
+    this.setState((prevState) => ({
+      collectionCreateVisible: !prevState.collectionCreateVisible
+    }));
   }
 
-  returnToDashboard = () => {
-    browserHistory.push(`/${this.ownerName()}/collections`);
-  };
-
   renderActionButton(tabKey, username, t) {
     switch (tabKey) {
       case TabKey.assets:
@@ -85,7 +86,7 @@ class DashboardView extends React.Component {
         return (
           this.isOwner() && (
             <React.Fragment>
-              <Button to={`/${username}/collections/create`}>
+              <Button onClick={this.toggleCollectionCreate}>
                 {t('DashboardView.CreateCollection')}
               </Button>
               <CollectionSearchbar />
@@ -148,10 +149,10 @@ class DashboardView extends React.Component {
             {this.renderContent(currentTab, username)}
           </div>
         </main>
-        {this.isCollectionCreate() && (
+        {this.state.collectionCreateVisible && (
           <Overlay
             title={this.props.t('DashboardView.CreateCollectionOverlay')}
-            closeOverlay={this.returnToDashboard}
+            closeOverlay={this.toggleCollectionCreate}
           >
             <CollectionCreate />
           </Overlay>

client/routes.jsx

@@ -98,8 +98,6 @@ const routes = (store) => (
       path="/:username/collections"
       component={mobileFirst(MobileDashboardView, DashboardView)}
     />
-
-    <Route path="/:username/collections/create" component={DashboardView} />
     <Route
       path="/:username/collections/:collection_id"
       component={CollectionView}

server/routes/server.routes.js

@@ -121,23 +121,6 @@ router.get('/about', (req, res) => {
   res.send(renderIndex());
 });
 
-router.get('/: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('/:username/collections/create', (req, res) => {
-  userExists(req.params.username, (exists) =>
-    exists ? res.send(renderIndex()) : get404Sketch((html) => res.send(html))
-  );
-});
-
 router.get('/:username/collections/:id', (req, res) => {
   collectionForUserExists(req.params.username, req.params.id, (exists) =>
     exists ? res.send(renderIndex()) : get404Sketch((html) => res.send(html))