removes sass and immutability helper

minaorangina · Oct 31, 2017 · 857003d · 857003d
1 parent be18d60
commit 857003d
Show file tree

Hide file tree

Showing 9 changed files with 8,137 additions and 32 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,18 +39,15 @@
     "css-loader": "^0.25.0",
     "dotenv": "^4.0.0",
     "express": "^4.14.0",
-    "immutability-helper": "^2.0.0",
     "lodash.isequal": "^4.5.0",
     "moment": "^2.15.1",
     "morgan": "^1.7.0",
-    "node-sass": "^3.10.1",
     "react": "^15.3.2",
     "react-dom": "^15.3.2",
     "react-redux": "^4.4.5",
     "redux": "^3.6.0",
     "redux-thunk": "^2.1.0",
     "request": "^2.75.0",
-    "sass-loader": "^4.0.2",
     "soap": "0.11.4",
     "socket.io": "^1.5.0",
     "style-loader": "^0.13.1",

diff --git a/src/js/app.js b/src/js/app.js
@@ -5,7 +5,7 @@ import { store }          from './store.js';
 import { getArrivals }    from './actions.js';
 import ArrivalsContainer       from './containers/arrivals.js';
 
-require('../scss/main.scss');
+require('../styles.css');
 
 const { direction } = store.getState();
 store.dispatch(getArrivals('train', direction));

diff --git a/src/js/components/arrivals.js b/src/js/components/arrivals.js
@@ -5,6 +5,7 @@ import Card from './card';
 const Arrivals = ({ train, dlr, direction, changeDirection }) => {
 
     const headerText = (direction === 'home' ? 'Going home' : 'Going to work');
+    const headerIcon = (direction === 'home' ? 0x1f3E0 : 0x1f680);
 
     const renderArrivals = (direction) => {
         if (direction === 'home') {
@@ -55,6 +56,7 @@ const Arrivals = ({ train, dlr, direction, changeDirection }) => {
             <h3 className="header">
             <i className={ direction === 'home' ? 'ion-android-home' : 'ion-briefcase' } />
                 { headerText }
+                { String.fromCharCode(headerIcon) }
             </h3>
             { renderArrivals(direction) }
             <button

diff --git a/src/scss/_base.scss b/src/scss/_base.scss
diff --git a/src/scss/main.scss b/src/scss/main.scss
diff --git a/src/scss/_styles.scss → src/styles.css b/src/scss/_styles.scss → src/styles.css
@@ -1,3 +1,9 @@
+@import url(https://fonts.googleapis.com/css?family=Roboto:400,300,500);
+
+body {
+    font-family: Roboto, sans-serif;
+    font-size: 20px;
+}
 
 .container {
   max-width: 500px;
@@ -40,32 +46,29 @@ h2, h3 {
     margin: 10px;
 }
 
-.arrival-item {
-    &.cancelled {
-        text-decoration: line-through;
-    }
+.arrival-item.cancelled {
+    text-decoration: line-through;
 }
 
 .info {
     font-size: 0.8em;
     font-style: italic;
-    &.delayed {
-        color: rgb(228, 151, 19);
-        font-weight: bold;
-    }
-    &.cancelled {
-        color: rgb(158, 7, 16);
-        font-weight: bold;
-    }
 }
-
+.info.delayed {
+    color: rgb(228, 151, 19);
+    font-weight: bold;
+}
+.info.cancelled {
+    color: rgb(158, 7, 16);
+    font-weight: bold;
+}
 .ion-android-home, .ion-briefcase {
     font-size: 32px;
-    &::after {
-        content: ' ';
-    }
-}
 
+}
+.ion-android-home::after, .ion-briefcase::after {
+    content: ' ';
+}
 button {
     outline: none;
     display: block;

diff --git a/webpack.dev.config.js b/webpack.dev.config.js
@@ -17,7 +17,7 @@ module.exports = {
     module: {
         rules: [
             { test: /\.js$/, exclude: /node_modules/, use: 'babel-loader' },
-            { test: /\.s?css$/, use: ['style-loader', 'css-loader', 'sass-loader'] }
+            { test: /\.css$/, use: ['style-loader', 'css-loader'] }
         ]
     },
     devServer: {

diff --git a/webpack.production.config.js b/webpack.production.config.js
@@ -17,8 +17,8 @@ module.exports = {
                 exclude: /node_modules/
             },
             {
-                test: /\.scss$/,
-                loaders: ["style-loader", "css-loader", "sass-loader"]
+                test: /\.css$/,
+                loaders: ["style-loader", "css-loader"]
             }
         ]
     },