Merge branch 'develop' of github.com:oSoc17/ishare into develop

.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "react-app"
+}

.travis.yml

@@ -1,2 +1,12 @@
 language: node_js
 node_js: node
+script:
+ - npm test
+ - npm run lint
+deploy:
+  provider: firebase
+  on:
+    branch: develop
+  token:
+    secure: "GS79zf4LkXMykpAmkHvUM56+qTtrTfTaa1E+2dCBziQHPfaMHJPvP/41Qmz5lzj9aPAxtdi7O1jr8WIQYlbM/gjmZhikz+ph91w1qbf0eMAE4kLK885hvjSb2pu6LAMvg6TZyu4ntjcaumjKle7Hia1EjfU0tfgYuFc+4Q1SM6w2YhIfZF8TyKU4wGGBOLzvchVEMZUsVswMlepcQ8xI5Azj5fymleUVP9CWonIZn2IoJPnrnDt93ndBiY0d7I3Ym+n5rADMi+G/nz6jgQun//Sbh12hMBgspPuSe+3Gfmn0qQyAv85JgkvR8pj23L0sFFdP+I+lC7lHdxkbeerY5X8rYQZKR8QwB1uzPKiwC4nuEJnUPaq3FS7afepmbqk7j138YpdZmq1BMUR9Pm5hzcd6Shg6OyD54c031L5qB12+fVY1f0t5M+u/ORhsAGiOgMaWajiWntf90U3OlYh9jKPJDOMoK2BNdsCUKelzuF3lQzrLAzvQwuEIXCA5colX06r0jXsNG9GrUbnbybv8QxOikc5p3SjbUdqXA8MSmR73T4ucqn3LqXD6XIiguxal62N5NylNFT+oEAeIDBCKIIFpCz4oTT2AS1Cq2ayhQYUwKRJfdLlH8fHai+CepDfrCRf1UsVSWmR5lJvKKsP0Vpu4JEystsTs4iP9caVoP8g="
+cache: yarn

README.md

@@ -1,4 +1,27 @@
-# ishare
+# iShare
 
 [![Build Status](https://travis-ci.org/oSoc17/ishare.svg?branch=develop)](https://travis-ci.org/oSoc17/istwaar)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
+![Dependencies Status](https://david-dm.org/osoc17/ishare.svg)
+
+> Educational web app that teaches history based on human stories
+
+## Local development
+
+### Install dependencies
+
+```shell
+npm install # or yarn
+```
+
+### Run the dev server
+
+```
+npm start
+```
+
+### Build for production
+
+```
+npm run build
+```

package.json

@@ -1,10 +1,10 @@
 {
-  "name": "test",
+  "name": "ishare",
   "version": "0.1.0",
-  "private": true,
   "dependencies": {
     "connected-react-router": "^4.2.3",
     "firebase": "^4.1.3",
+    "node-sass-chokidar": "^0.0.3",
     "react": "^15.6.1",
     "react-dom": "^15.6.1",
     "react-redux": "^5.0.5",
@@ -15,9 +15,17 @@
     "redux-thunk": "^2.2.0"
   },
   "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
+    "build-css": "node-sass-chokidar src/ -o src/",
+    "watch-css": "npm run build-css && node-sass-chokidar src/ -o src/ --watch --recursive",
+    "start-js": "react-scripts start",
+    "start": "npm-run-all -p watch-css start-js",
+    "build": "npm run build-css && react-scripts build",
     "test": "react-scripts test --env=jsdom",
-    "eject": "react-scripts eject"
+    "eject": "react-scripts eject",
+    "lint": "eslint src/"
+  },
+  "devDependencies": {
+    "node-sass": "^4.5.3",
+    "npm-run-all": "^4.0.2"
   }
 }

src/containers/App.css

@@ -1 +0,0 @@
-

src/containers/App.scss

@@ -0,0 +1 @@
+

src/index.css

@@ -1,5 +1,4 @@
-body {
+* {
   margin: 0;
   padding: 0;
-  font-family: sans-serif;
-}
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; }

src/index.scss

@@ -0,0 +1,7 @@
+@import './variables.scss';
+
+* {
+  margin: 0;
+  padding: 0;
+  font-family: $font-stack;
+}

src/variables.scss

@@ -0,0 +1,3 @@
+$font-stack: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans,
+  Ubuntu, Cantarell, "Helvetica Neue", sans-serif, "Apple Color Emoji",
+  "Segoe UI Emoji", "Segoe UI Symbol";