Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions src/components/create_vault/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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))) {
Expand Down
17 changes: 3 additions & 14 deletions src/components/mainAppLayout/appHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down Expand Up @@ -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);
Expand All @@ -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>
Expand Down
9 changes: 9 additions & 0 deletions src/utils/generate-id.js
Original file line number Diff line number Diff line change
@@ -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;
};