From adf338cb9fcc06e8cffe9e68408faf2c4bb2df48 Mon Sep 17 00:00:00 2001
From: mikenatsu <michaelgonzalezsantamaria@gmail.com>
Date: Thu, 2 Sep 2021 01:59:47 -0400
Subject: [PATCH 1/2] fix: random vaultid only twice

---
 src/components/create_vault/index.js      | 13 ++-----------
 src/components/mainAppLayout/appHeader.js | 17 +++--------------
 src/utils/generate-id.js                  |  9 +++++++++
 3 files changed, 14 insertions(+), 25 deletions(-)
 create mode 100644 src/utils/generate-id.js

diff --git a/src/components/create_vault/index.js b/src/components/create_vault/index.js
index f5fe7a9..782c278 100644
--- a/src/components/create_vault/index.js
+++ b/src/components/create_vault/index.js
@@ -8,20 +8,11 @@ import TemplateDisplay from './vault_constructors/templateDisplayConstructor'
 import InformationBoxContainer from './vault_constructors/informationBoxContainer'
 import { useHistory } from "react-router-dom"
 import { connect } from 'react-redux';
+import { makeid } from '../../utils/generate-id';
 import TemplateInputArea from './vault_constructors/templateInputArea';
 
 const CustomVaultBuild = (props) => {
-    let history = useHistory();
-
-    function makeid(length) {
-        var result           = '';
-        var characters       = 'abcdefghijklmnopqrstuvwxyz0123456789';
-        var charactersLength = characters.length;
-        for ( var i = 0; i < length; i++ ) {
-           result += characters.charAt(Math.floor(Math.random() * charactersLength));
-        }
-        return result;
-    }
+    const history = useHistory();
 
     useEffect(()=>{
         console.log('create_vault useeffect rendered. vaultid: ', props.vaultid)
diff --git a/src/components/mainAppLayout/appHeader.js b/src/components/mainAppLayout/appHeader.js
index 538500c..91929a4 100644
--- a/src/components/mainAppLayout/appHeader.js
+++ b/src/components/mainAppLayout/appHeader.js
@@ -6,24 +6,14 @@ import { setVaultID } from "../../actions";
 import AboutPage from "../about_page/index";
 import CustomVaultBuild from "../create_vault/index";
 import TestPage from "./testPage";
+import { makeid } from "../../utils/generate-id";
 
 const MainAppHeader = (props) => {
 
   const [activeItem, setActiveItem] = useState("vault-viewer");
-  const newVault = makeid(8)  
   let history = useHistory()
   // let vaultID = null
 
-  function makeid(length) {
-    var result = "";
-    var characters = "abcdefghijklmnopqrstuvwxyz0123456789";
-    var charactersLength = characters.length;
-    for (var i = 0; i < length; i++) {
-      result += characters.charAt(Math.floor(Math.random() * charactersLength));
-    }
-    return result;
-  }
-
   useEffect(() => {
     console.log("mainAppHeader useeffect ran");
   }, [activeItem]);
@@ -60,8 +50,7 @@ const MainAppHeader = (props) => {
 
         <Menu.Item
           onClick={(syntheticE, menuProps) => {
-            
-            console.log('menu clicked  ', newVault)
+            history.push("/vaultID/" + makeid(8))
             
             // props.setVaultID(newVault);
             setActiveItem(menuProps.name);
@@ -71,7 +60,7 @@ const MainAppHeader = (props) => {
           className="top-menu-btn"
         >
           <Link
-            to={"/vaultID/" + makeid(8)}
+            to={"/vaultID/" + makeid(8) }
           >
             Create your own vault
           </Link>
diff --git a/src/utils/generate-id.js b/src/utils/generate-id.js
new file mode 100644
index 0000000..5553edc
--- /dev/null
+++ b/src/utils/generate-id.js
@@ -0,0 +1,9 @@
+export const makeid = (length) => {
+	var result = '';
+	var characters = 'abcdefghijklmnopqrstuvwxyz0123456789';
+	var charactersLength = characters.length;
+	for (var i = 0; i < length; i++) {
+		result += characters.charAt(Math.floor(Math.random() * charactersLength));
+	}
+	return result;
+};

From c6b77e58ee53e8ac522b9cd0b7d0b65daedb5a9d Mon Sep 17 00:00:00 2001
From: mikenatsu <michaelgonzalezsantamaria@gmail.com>
Date: Thu, 2 Sep 2021 02:02:37 -0400
Subject: [PATCH 2/2] refactor: repeated makeid functions

---
 .../vault_constructors/templateInputArea.js           | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/components/create_vault/vault_constructors/templateInputArea.js b/src/components/create_vault/vault_constructors/templateInputArea.js
index f4c5d24..dea6224 100644
--- a/src/components/create_vault/vault_constructors/templateInputArea.js
+++ b/src/components/create_vault/vault_constructors/templateInputArea.js
@@ -8,6 +8,7 @@ import { Formik, Form, Field } from 'formik';
 import Modal from '@material-ui/core/Modal';
 import Backdrop from '@material-ui/core/Backdrop';
 import Fade from '@material-ui/core/Fade';
+import { makeid } from '../../../utils/generate-id';
 
 const TemplateInputArea = (props) => {
     let history = useHistory()
@@ -114,16 +115,6 @@ const TemplateInputArea = (props) => {
         showPasswordDisplay(false) 
     }
 
-    function makeid(length) {
-        var result           = '';
-        var characters       = 'abcdefghijklmnopqrstuvwxyz0123456789';
-        var charactersLength = characters.length;
-        for ( var i = 0; i < length; i++ ) {
-           result += characters.charAt(Math.floor(Math.random() * charactersLength));
-        }
-        return result;
-    }
-
     const generateEditPassword = () => {
         console.log('generate Edit Password loaded')
         if ((passwordDisplay) && (!(postStatus))) {