Skip to content
Merged
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
15 changes: 2 additions & 13 deletions src/components/About.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// Index.tsx

// import React from "react";
import React, { useState, useEffect } from "react";
import React from "react";
import Link from 'next/link';
import { connect, useSelector, useDispatch } from 'react-redux';
import { connect } from 'react-redux';
import {
CardGroup, Card, CardImg, CardText, CardBody, CardHeader,
CardTitle, CardSubtitle, Button, CardLink, CardDeck, CardColumns
Expand All @@ -14,16 +14,6 @@ import Index from "./Index";

const page = (props) => {
// console.log('12', props);
const dispatch = useDispatch()
const [refresh, setRefresh] = useState(true)
function toggleRefresh() { setRefresh(!refresh); }

const metis = useSelector((state: any) => state.phData?.metis)
const models = useSelector((state: any) => state.phData?.metis?.models)
const metamodels = useSelector((state: any) => state.phData?.metis?.metamodels)
const focusModel = useSelector((state: any) => state.phFocus?.focusModel)
const focusModelview = useSelector((state: any) => state.phFocus?.focusModelview)
const gojsmodel = useSelector((state: any) => state.phFocus?.gojsModel)

// useEffect(() => {
// // console.log('39', gojsmodel);
Expand Down Expand Up @@ -270,4 +260,3 @@ const page = (props) => {
}
export default Page(connect(state => state)(page));


23 changes: 2 additions & 21 deletions src/components/Index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// Index.tsx

// import React from "react";
import React, { useState, useEffect } from "react";
import React from "react";
import Link from 'next/link';
import { connect, useSelector, useDispatch } from 'react-redux';
import { connect } from 'react-redux';
Comment on lines +5 to +7
import {
CardGroup, Card, CardImg, CardText, CardBody, CardHeader,
CardTitle, CardSubtitle, Button, CardLink, CardDeck, CardColumns
Expand All @@ -19,23 +19,6 @@ import Project from "../components/Project";

const page = (props) => {
// console.log('12', props);
const dispatch = props.dispatch
const [refresh, setRefresh] = useState(true)
// function toggleRefresh() { setRefresh(!refresh); }
const toggleRefresh = props.toggleRefresh

/** * Get the state and metie from the store */
const phData = useSelector((state: any) => state.phData) // Selecting the whole redux store
const phFocus = useSelector((state: any) => state.phFocus) // Selecting the whole redux store
const metis = (phData) && phData.metis
const models = (metis) && metis.models // selecting the models array
const metamodels = (metis) && metis.metamodels
// console.log('26 dia', metis);

const focusModel = useSelector(focusModel => phFocus?.focusModel)
const focusModelview = useSelector(focusModelview => phFocus?.focusModelview)

let gojsmodel = phFocus?.gojsModel

// useEffect(() => {
// // console.log('39', gojsmodel);
Expand Down Expand Up @@ -532,5 +515,3 @@ const page = (props) => {

}
export default Page(connect(state => state)(page));