resolved merged conflicts, wrote more test cases. added eslint, prett…

…ier, and tslint config files
oslabs-beta · Sep 11, 2019 · 0b206b2 · 0b206b2
2 parents 49e4d11 + 8706220
commit 0b206b2
Show file tree

Hide file tree

Showing 13 changed files with 422 additions and 252 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/client/components/LandingPage.tsx b/src/client/components/LandingPage.tsx
@@ -19,11 +19,11 @@ const LandingPage = () => {
       <div>
       {Store.landingPageState ? <UploadPage /> :
        Store.landingPageState2 ? <UploadPage2/> :
-        <div>
+        <div className='mainDiv'>
           <div><img className='kubLogo' src={require('../assets/credsPage/kub.png')}/></div>
           <div className='text'>The All Seeing Kubernati</div>
         <img className='logo' src={require('../assets/credsPage/aws.png')} onClick={myFunctionA}/>
-        <img className='logo1' src={require("../assets/credsPage/azure2.png")} onClick={myFunctionG}/>
+        {/* <img className='logo1' src={require("../assets/credsPage/azure2.png")} onClick={myFunctionG}/> */}
         <img className='logo2' src={require("../assets/credsPage/google.png")} onClick={myFunctionG}/>
         </div>
     }

diff --git a/src/client/components/UploadPage.tsx b/src/client/components/UploadPage.tsx
@@ -6,23 +6,18 @@ const { ipcRenderer } = require('electron');
 const UploadPage = () => {
 
     const [Store, setStore] = useContext(StoreContext);
-
     ipcRenderer.on('clusterClient', (event: any, arg: any) => {
-        // add argument to store
-        // console.log('change gcp to store to',arg);
-        // console.log('Da Store before', Store);
-        // update gcp data to store
-        Store.gcp = arg;
-        // setStore({...Store, gcp: arg});
-        console.log('Da Store after', Store);
-        event.returnValue = 'done';
-        // console.log(argument);
+
+          setStore({...Store, clusters:arg});
+          event.returnValue = 'done';
+;
     })
 
     const handleInput = (e: React.FormEvent<HTMLInputElement>) => {
         setStore({...Store, credentials:e.currentTarget.value})
 
     }
+
     const handleBack = ()=>{
       setStore({...Store, landingPageState:false})
     }
@@ -45,21 +40,25 @@ const UploadPage = () => {
           // console.log(`this is landing page ${Store.landingPageState}`)
         }
     }
+
     const handleLoc = (event) => {
       setStore({...Store, gcploc: event.currentTarget.value});
     }
+
     return <div>{Store.uploadPageState ? <DisplayContainer /> :
         <div className='uploadDiv'>
             <div>
               <img className='kubUpload' src={require('../assets/credsPage/google.png')}/>
               <div className='kubUploadText'>Google Cloud Platform</div>
             </div>
 
-        <input className='uploadInput' type="text" onChange={handleInput} placeholder="Enter Cluster Info"/>
-        <button className='uploadButt' onClick={handleSubmit}> Submit </button>
-        <button className = 'backButton' onClick={handleBack}>  Back  </button>
-
-        <select className='loc' onChange={handleLoc}>
+        <input id="uploadEnterClustInfo" className='uploadInput' type="text" onChange={handleInput} placeholder="Enter Cluster Info"/>
+        <div id="uploadDivForSubmitandBackButts">
+        <button id="uploadSubmit" className='uploadButt' onClick={handleSubmit}> Submit </button>
+        &nbsp;
+        <button id="uploadBackButt" className = 'backButton' onClick={handleBack}>  Back  </button>
+        </div>
+        <select id="uploadSelectMenu" className='loc' onChange={handleLoc}>
         <option value='us-central1-a'>us-central1-a</option>
         <option value='us-central1-b'>us-central1-b</option>
         <option value='us-central1-c'>us-central1-c</option>

diff --git a/src/client/components/UploadPage2.tsx b/src/client/components/UploadPage2.tsx
@@ -50,12 +50,30 @@ const UploadPage = () => {
               <div className='kubUploadText'>The All Seeing Kubernati</div>
             </div>
         <input className='uploadInput' type="text" onChange={handleInput} placeholder="Enter Cluster Info"/>
-        <button className='uploadButt' onClick={handleSubmit}>Submit</button>
-        <button className = 'backButton' onClick={handleBack}>  Back  </button>
+        <div id="uploadPage2SubmitandBackButts">
+        <button id="uploadPage2Submit" className='uploadButt' onClick={handleSubmit}>Submit</button>
+        &nbsp;
+        <button id="uploadPage2BackButt" className = 'backButton' onClick={handleBack}>  Back  </button>
+        </div>
         {/* <select className='loc' onChange={handleLoc}>
-        <option value='us-central1-a'>us-central1-a</option>
-        <option value='us-central1-b'>us-central1-b</option>
-        <option value='us-central1-c'>us-central1-c</option>
+        <option value='US East (N.Virginia)'>us-central1-a</option>
+        <option value='US East (Ohio)'>us-central1-b</option>
+        <option value='US West (N. California)'>us-central1-c</option>
+        <option value='US West (Oregon)'>us-central1-c</option>
+        <option value='Asia Pacific (Hong Kong)'>us-central1-c</option>
+        <option value='Asia Pacific (Mumbai)'>us-central1-c</option>
+        <option value='Asia Pacific (Seoul)'>us-central1-c</option>
+        <option value='Asia Pacific (Singapore)'>us-central1-c</option>
+        <option value='Asia Pacific (Sydney)'>us-central1-c</option>
+        <option value='Asia Pacific (Tokyo)'>us-central1-c</option>
+        <option value='Canada (Central)'>us-central1-c</option>
+        <option value='EU (Frankfurt)'>us-central1-c</option>
+        <option value='EU (Ireland)'>us-central1-c</option>
+        <option value='EU (London)'>us-central1-c</option>
+        <option value='EU (Paris)'>us-central1-c</option>
+        <option value='EU (Stockholm)'>us-central1-c</option>
+        <option value='Middle East (Bahrain)'>us-central1-c</option>
+        <option value='South America (Sao Paulo)'>us-central1-c</option>
         </select> */}
 
         </div>

diff --git a/src/client/components/app.tsx b/src/client/components/app.tsx
@@ -9,13 +9,15 @@ import { StoreContextProvider } from '../../../store';
 import Visualizer from './visualizer'
 import Deploy from './gcpDeploy';
 import 'tachyons';
+import UploadPage from './UploadPage';
+import UploadPage2 from './UploadPage2';
 
 function App() {
   return (
     <StoreContextProvider>
   <div className='app'>
-    <LandingPage />
-
+    <LandingPage/>
+    
   </div>
 
   </StoreContextProvider>

diff --git a/src/client/components/gcpDeploy.tsx b/src/client/components/gcpDeploy.tsx
@@ -32,10 +32,10 @@ const gcpDeploy = () =>{
     return (
     <div>
         <div className="inputPageDeploy">
-        <input className='pa3 ba bg-lighest-blue' type="text" onChange={handleName} placeholder="cluster name"/>
+        <input id="deployClustName" className='clusterType' type="text" onChange={handleName} placeholder="cluster name"/>
         <div>
 
-        <select className='clusterType bg-silver tc ' onChange={handleType}>
+        <select id="deployChooseClustType" className='clusterType' onChange={handleType}>
         <option selected>Choose a cluster type</option>
         <option value='affordable'>affordable</option>
         <option value='standard'>standard</option>
@@ -45,7 +45,7 @@ const gcpDeploy = () =>{
         <option value='highly available'>highly available</option>
         </select>
 
-        <select className='loc' onChange={handleLoc}>
+        <select id='deployLoc' className='loc' onChange={handleLoc}>
         <option selected>Choose a location to host</option>
         <option value='us-central1-a'>us-central1-a</option>
         <option value='us-central1-b'>us-central1-b</option>
@@ -60,8 +60,8 @@ const gcpDeploy = () =>{
         </div>
 
         <div id='buts'>
-        <button className='uploadButtD' onClick={handleSubmit}> Submit </button>
-        <button className = 'backButtonD' onClick={handleBack}>  Back  </button>
+        <button id="deploySubmit" className='uploadButtD' onClick={handleSubmit}> Submit </button>
+        <button id="deployBack" className = 'uploadButtD' onClick={handleBack}>  Back  </button>
         </div>
         </div>
 

diff --git a/src/client/components/sidebar.tsx b/src/client/components/sidebar.tsx
@@ -13,9 +13,9 @@ const SideBar = () =>{
     }
     return(
         <div id='leSidebar'>
-            <p>Options</p>
-        <button onClick={handleDeploy}> Deploy! </button>
-        <button onClick ={handleBack}> Back </button>
+            {/* <p>Options</p> */}
+        <button className="SB" onClick={handleDeploy}> Deploy! </button>
+        <button className="SB" onClick ={handleBack}> Back </button>
         </div>
     )
 }