Merge branch 'master' of github.com:CS-Eevee/react-proto

refinedblessing · refinedblessing · commit 000d2bab91b8 · 2018-07-25T14:51:26.000-07:00
diff --git a/package.json b/package.json
@@ -19,7 +19,11 @@
     "electron": "^2.0.5",
     "react": "^16.2.0",
     "react-dom": "^16.2.0",
-    "react-rnd": "^8.0.2"
+    "react-redux": "^5.0.7",
+    "react-rnd": "^8.0.2",
+    "redux": "^4.0.0",
+    "redux-devtools-extension": "^2.13.5",
+    "redux-thunk": "^2.3.0"
   },
   "devDependencies": {
     "babel-core": "^6.26.0",
diff --git a/src/actionTypes/actionTypes.js b/src/actionTypes/actionTypes.js
@@ -0,0 +1 @@
+// exportconst ADD_COMPONENT = 'ADD_COMPONENT';
diff --git a/src/actions/components.js b/src/actions/components.js
@@ -0,0 +1 @@
+import * as types from '../constants/actionTypes.js';
diff --git a/src/components/App.js b/src/components/App.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 // import Rnd from 'react-rnd';
-import '../style.css';
+import Paper from '@material-ui/core/Paper';
+import Grid from '@material-ui/core/Grid';
 
 class App extends Component {
   render() {
@@ -12,7 +13,18 @@ class App extends Component {
     // };
     return (
       <div>
-        <h1>My react app</h1>
+        <Grid container spacing={0}>
+          <Grid item xs={3}>
+            <Paper>xs=3</Paper>
+          </Grid>
+          <Grid item xs={6}>
+            <Paper>asdfas=6</Paper>
+          </Grid>
+          <Grid item xs={3}>
+            <Paper>f=3</Paper>
+          </Grid>
+        </Grid>
+        <h1>My react grapple</h1>
       </div>
     );
   }
diff --git a/src/index.js b/src/index.js
@@ -1,6 +1,12 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import App from './components/App';
+import { Provider } from 'react-redux';
+import store from './store';
 import './style.css';
 
-ReactDOM.render(<App />, document.getElementById('app'));
+ReactDOM.render(
+   <Provider store={store}>
+      <App />
+   </Provider>, 
+document.getElementById('app'));
diff --git a/src/public/index.html b/src/public/index.html
@@ -6,6 +6,8 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <title>React Proto</title>
+  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
+  <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
 </head>
 
 <body>
diff --git a/src/reducers/componentReducer.js b/src/reducers/componentReducer.js
@@ -0,0 +1,10 @@
+import * as types from '../constants/actionTypes';
+
+export default (state = [], action) => {
+  let componets;
+
+	switch(action.type) {
+		default: 
+			return state;
+  }
+};
diff --git a/src/reducers/index.js b/src/reducers/index.js
@@ -0,0 +1,9 @@
+import { combineReducers } from 'redux';
+
+import componentReducer from './componentReducer.js';
+
+const reducers = combineReducers({
+  components: componentReducer
+})
+
+export default reducers;
diff --git a/src/store.js b/src/store.js
@@ -0,0 +1,8 @@
+import { createStore, applyMiddleware } from 'redux';
+import { composeWithDevTools } from 'redux-devtools-extension';
+
+const store = createStore(
+   reducers,
+)
+
+export default store;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+// exportconst ADD_COMPONENT = 'ADD_COMPONENT';`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+import * as types from '../constants/actionTypes.js';`