feat: add organization page

Chia-Network · Mar 18, 2022 · fb2e0b3 · fb2e0b3
1 parent c4960d4
commit fb2e0b3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/src/components/blocks/LeftNav.js b/src/components/blocks/LeftNav.js
@@ -8,7 +8,7 @@ import {
   Modal,
   Body,
 } from '../../components';
-import { Link } from 'react-router-dom';
+import { Link, useHistory } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 import { FormattedMessage, useIntl } from 'react-intl';
 import { getMyOrgUid } from '../../utils/getMyOrgUid';
@@ -66,6 +66,7 @@ const StyledTitleContainer = styled('div')`
 `;
 
 const LeftNav = withTheme(({ children }) => {
+  const history = useHistory();
   const [confirmCreateOrgIsVisible, setConfirmCreateOrgIsVisible] =
     useState(false);
   const [createOrgIsVisible, setCreateOrgIsVisible] = useState(false);
@@ -89,12 +90,11 @@ const LeftNav = withTheme(({ children }) => {
     return () => clearTimeout(intervalId);
   }, [myOrgIsNotCreated, myOrgIsCreatedButNotSubscribed, createOrgIsVisible]);
 
-  const isUnitsPage = window.location.pathname.includes('/units');
-  const isProjectsPage = window.location.pathname.includes('/projects');
-  const isMyRegistryPage = window.location.search.includes('myRegistry=true');
-  const isOrganizationPage = window.location.pathname.includes('/organization');
-
-  console.log('window.location.pathname', window.location.pathname);
+  const isUnitsPage = history.location.pathname.includes('/units');
+  const isProjectsPage = history.location.pathname.includes('/projects');
+  const isMyRegistryPage = history.location.search.includes('myRegistry=true');
+  const isOrganizationPage =
+    history.location.pathname.includes('/organization');
 
   return (
     <Container>
@@ -166,7 +166,7 @@ const LeftNav = withTheme(({ children }) => {
                 <OrganizationIcon height={20} width={20} />
               )}
               <ButtonText>
-                <FormattedMessage id="Organization" />
+                <FormattedMessage id="organization" />
               </ButtonText>
             </StyledTitleContainer>
             {!myOrgIsNotCreated && !myOrgIsCreatedButNotSubscribed && (

diff --git a/src/translations/tokens/en-US.json b/src/translations/tokens/en-US.json
@@ -323,5 +323,6 @@
   "creating-organization": "Creating Organization",
   "public-address": "Public Address",
   "address-qr-code": "Address QR Code",
-  "my-organization": "My Organization"
+  "my-organization": "My Organization",
+  "organization": "Organization"
 }
diff --git a/src/translations/tokens/es.json b/src/translations/tokens/es.json
@@ -299,5 +299,6 @@
   "creating-organization": "Creación de Organización",
   "public-address": "Direccion publica",
   "address-qr-code": "Dirección Código QR",
-  "my-organization": "Mi organización"
+  "my-organization": "Mi organización",
+  "organization": "Organización"
 }
diff --git a/src/translations/tokens/ja.json b/src/translations/tokens/ja.json
@@ -292,5 +292,6 @@
   "creating-organization": "組織の作成",
   "public-address": "パブリックアドレス",
   "address-qr-code": "住所QRコード",
-  "my-organization": "私の組織"
+  "my-organization": "私の組織",
+  "organization": "組織"
 }