Merge pull request #4 from RalphKemp/logic

Logic
RalphKemp · Feb 2, 2019 · fd6483e · fd6483e
2 parents b3aabdd + 3455b27
commit fd6483e
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 117 deletions.
diff --git a/src/components/Homepage.js b/src/components/Homepage.js
@@ -14,7 +14,7 @@ const MainDiv = styled.div`
 
 const Homepage = () => {
   return (
-    <MainDiv>
+        <MainDiv>
       <Inputs />
       <Results />
     </MainDiv>

diff --git a/src/components/Inputs.js b/src/components/Inputs.js
@@ -1,6 +1,6 @@
-import React from 'react';
-import Search from './Search';
-import styled from 'styled-components';
+import React from "react";
+import Search from "./Search";
+import styled from "styled-components";
 
 const MainInputsDiv = styled.div`
   height: 100vh;
@@ -23,6 +23,6 @@ const Inputs = () => {
       <Search />
     </MainInputsDiv>
   );
-}
+};
 
 export default Inputs;
diff --git a/src/components/Results.js b/src/components/Results.js
@@ -1,11 +1,11 @@
 import React, { Component } from "react";
 import { connect } from "react-redux";
 import styled from "styled-components";
-import { data } from '../data/words';
-// import uuidv1 from "uuid/v1";
+import { data } from "../data/words";
+import { puzzleSolver } from "../helpers/puzzleSolver";
 
 const MainResultsDiv = styled.div`
-  height: 100vh;
+  min-height: 100vh;
   width: 50vw;
   background-color: blue;
   color: white;
@@ -18,11 +18,6 @@ const WordsContainer = styled.div`
 `;
 
 class Results extends Component {
-
-  componentDidMount() {
-    console.log(data)
-  }
-
   renderWords(x, y) {
     return (
       <WordsContainer>
@@ -35,12 +30,16 @@ class Results extends Component {
   render() {
     return (
       <MainResultsDiv>
+        currently we're trying to go from COSY to RINK.
         {this.props.words ? (
           <div>
-            {this.renderWords(
+            {puzzleSolver(
               this.props.words.firstWord,
-              this.props.words.secondWord
-            )}
+              this.props.words.secondWord,
+              data
+            ).map(x => {
+              return <div key={x}>{x}</div>;
+            })}
           </div>
         ) : null}
       </MainResultsDiv>