eslint and styling files at root dir

m-santa1718 · Sep 24, 2015 · 1c068fd · 1c068fd
1 parent 812de32
commit 1c068fd
Show file tree

Hide file tree

Showing 9 changed files with 105 additions and 105 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,7 @@
+{
+  "extends": "eslint-config-airbnb-es5",
+  "rules": {
+    "quotes": [2, "double", "avoid-escape"],
+    "no-console": 0
+  }
+}
diff --git a/conf.js b/conf.js
diff --git a/entry.jsx b/entry.jsx
@@ -1,22 +1,17 @@
-var React = require('react');
-var routes = require('./routes');
+var React = require("react");
+var routes = require("./routes");
 
 // Require React-Router
-var Router = require('react-router');
-var Route = Router.Route;
-var NotFoundRoute = Router.NotFoundRoute;
-var DefaultRoute = Router.DefaultRoute;
-var Link = Router.Link;
-var RouteHandler = Router.RouteHandler;
+var Router = require("react-router");
 
-var analytics = require('./utils/analytics');
+var analytics = require("./utils/analytics");
 
 window.React = React; // For chrome dev tool support
 
 var flux = require("./fluxy");
 
-Router.run(routes, Router.HistoryLocation, function (Handler, state) {
-    React.render(<Handler flux={ flux }/>, document.body);
-    analytics.pageView(state.path);
+Router.run(routes, Router.HistoryLocation, function(Handler, state) {
+  React.render(<Handler flux={ flux }/>, document.body);
+  analytics.pageView(state.path);
 });
 
diff --git a/fluxy.js b/fluxy.js
@@ -1,3 +1,5 @@
+var _ = require("lodash");
+
 var Fluxxor = require("fluxxor");
 var ParkingStore = require("./flux/parking/ParkingStore");
 var ParkingActions = require("./flux/parking/ParkingActions");
@@ -20,6 +22,7 @@ var AppActions = require("./flux/app/AppActions");
 var ToastStore = require("./flux/toast/ToastStore");
 var ToastActions = require("./flux/toast/ToastActions");
 
+
 var stores = {
   ParkingStore: new ParkingStore(),
   OpinionStore: new OpinionStore(),
@@ -50,4 +53,4 @@ flux.on("dispatch", function(type, payload) {
   }
 });
 
-module.exports = flux;
+module.exports = flux;
diff --git a/package.json b/package.json
@@ -36,11 +36,15 @@
     "webpack": "^1.8.9"
   },
   "devDependencies": {
+    "babel-core": "^5.1.10",
+    "babel-eslint": "^4.1.3",
+    "babel-loader": "^5.0.0",
+    "eslint": "^1.5.1",
+    "eslint-config-airbnb-es5": "^1.0.8",
+    "eslint-plugin-react": "^3.4.2",
     "express": "^4.12.3",
     "react-hot-loader": "^1.2.5",
-    "webpack-dev-server": "^1.7.0",
-    "babel-core": "^5.1.10",
-    "babel-loader": "^5.0.0"
+    "webpack-dev-server": "^1.7.0"
   },
   "scripts": {
     "dev": "node_modules/.bin/supervisor --ignore build/ -e jsx server & node hotLoadServer.js",

diff --git a/routes.jsx b/routes.jsx
@@ -1,21 +1,17 @@
 /** @jsx React.DOM */
 
-var React = require('react');
+var React = require("react");
 
 // Require view components. One for each route.
-var App = require('./components/Application');
-var Default = require('./components/Default');
-var Map = require('./components/Map');
-var Parking = require('./components/Parking');
-var NewParking = require('./components/NewParking');
-var Modal = require('./components/Modal');
+var App = require("./components/Application");
+var Default = require("./components/Default");
+var Parking = require("./components/Parking");
+var NewParking = require("./components/NewParking");
+var Modal = require("./components/Modal");
 
-var Router = require('react-router');
+var Router = require("react-router");
 var Route = Router.Route;
-var NotFoundRoute = Router.NotFoundRoute;
 var DefaultRoute = Router.DefaultRoute;
-var Link = Router.Link;
-var RouteHandler = Router.RouteHandler;
 
 var Routes = (
   <Route handler={ App }>
@@ -26,4 +22,4 @@ var Routes = (
   </Route>
 );
 
-module.exports = Routes;
+module.exports = Routes;
diff --git a/server.js b/server.js
@@ -1,38 +1,38 @@
 // Stupid simple server
-var express = require('express');
-var webpack = require('webpack');
-var WebpackDevServer = require('webpack-dev-server');
-var config = require('./webpack.config');
+var express = require("express");
+var webpack = require("webpack");
+var WebpackDevServer = require("webpack-dev-server");
+var config = require("./webpack.config");
 
 var app = express();
-var port = 3004;
+// var port = 3004;
 var webPackPort = 3005;
 
-app.get("/*", function (req, res) {
-    res.end("<!DOCTYPE html>\n"+
-"<html>\n" +
-"  <head>\n" +
-"    <meta charset='utf-8'/>\n" +
-"    <title>Hello React</title>\n" +
-"  </head>\n" +
-"  <body>\n" +
-"    <div id='content'></div>\n" +
-"    <script src='http://localhost:" + webPackPort +"/build/bundle.js'></script>\n" +
-"  </body>\n" +
-"</html>");
+app.get("/*", function(req, res) {
+  res.end("<!DOCTYPE html>\n" +
+  "<html>\n" +
+  "  <head>\n" +
+  "    <meta charset='utf-8'/>\n" +
+  "    <title>Motoparking.club</title>\n" +
+  "  </head>\n" +
+  "  <body>\n" +
+  "    <div id='content'></div>\n" +
+  "    <script src='http://localhost:" + webPackPort + "/build/bundle.js'></script>\n" +
+  "  </body>\n" +
+  "</html>");
 });
 
-//app.listen(port, function () {
+// app.listen(port, function () {
 //    console.log("Server listening on port " + port);
-//});
+// });
 
 new WebpackDevServer(webpack(config), {
   publicPath: config.output.publicPath,
   hot: true
-}).listen(webPackPort, 'localhost', function (err, result) {
+}).listen(webPackPort, "localhost", function(err) {
   if (err) {
     console.log(err);
   }
 
-  console.log('Listening at localhost:' + webPackPort);
+  console.log("Listening at localhost:" + webPackPort);
 });
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,47 +1,47 @@
-
-var webpack = require('webpack');
+var webpack = require("webpack");
+var path = require("path");
 
 module.exports = {
   // Entry point for static analyzer:
   entry: [
-    'webpack-dev-server/client?http://localhost:3005',
-    'webpack/hot/only-dev-server',
-    './entry.jsx',
+    "webpack-dev-server/client?http://localhost:3005",
+    "webpack/hot/only-dev-server",
+    "./entry.jsx"
   ],
 
   output: {
-    path: __dirname + '/build/',
-    filename: '[name].js',
-    publicPath: 'http://localhost:3005/build/'
+    path: path.join(__dirname, "/build/"),
+    filename: "[name].js",
+    publicPath: "http://localhost:3005/build/"
   },
 
   resolve: {
     // Allow to omit extensions when requiring these files
-    extensions: ['', '.js', '.jsx'],
+    extensions: ["", ".js", ".jsx"],
     root: __dirname
   },
 
   module: {
     loaders: [
       // Pass *.jsx files through jsx-loader transform
-      { test: /\.jsx$/, loaders: ['react-hot', 'jsx'] },
-      { test: /\.css$/, loader: "style!css" },
-      { test: /\.png$/, loader: "file" },
-      { test: /\.jpg$/, loader: "file" },
-      { test: /\.gif/, loader: "file" },
-      { test: /\.(ttf|eot|svg|woff|ttf)(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "file-loader" },
-      //{	test: "png|jpg|jpeg|gif|svg", loader: "url-loader?limit=10000",}
-      { test: /\.scss$/, loader: "style!css!sass"},
-      { test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader'}
+      {test: /\.jsx$/, loaders: ["react-hot", "jsx"]},
+      {test: /\.css$/, loader: "style!css"},
+      {test: /\.png$/, loader: "file"},
+      {test: /\.jpg$/, loader: "file"},
+      {test: /\.gif/, loader: "file"},
+      {test: /\.(ttf|eot|svg|woff|ttf)(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "file-loader"},
+      // {	test: "png|jpg|jpeg|gif|svg", loader: "url-loader?limit=10000",}
+      {test: /\.scss$/, loader: "style!css!sass"},
+      {test: /\.js$/, exclude: /node_modules/, loader: "babel-loader"}
 
     ]
   },
   plugins: [
     new webpack.HotModuleReplacementPlugin(),
     new webpack.DefinePlugin({
-        GA_TRACKING_CODE: undefined,
-        DEBUG: true,
-        YANDEX_API_KEY: JSON.stringify("AHMEKVUBAAAAdcQIfQIA6t3GMOs3_4bbwjkyhyBbjTpnP0cAAAAAAAAAAACGT93VehWe6n5wXG-tL7Gv_61nSw==")
+      // GA_TRACKING_CODE: undefined,
+      DEBUG: true,
+      YANDEX_API_KEY: JSON.stringify("AHMEKVUBAAAAdcQIfQIA6t3GMOs3_4bbwjkyhyBbjTpnP0cAAAAAAAAAAACGT93VehWe6n5wXG-tL7Gv_61nSw==")
     })
   ]
-};
+};
diff --git a/webpack.deploy.config.js b/webpack.deploy.config.js
@@ -1,37 +1,39 @@
 var config = require("./webpack.config");
-var webpack = require('webpack');
+var webpack = require("webpack");
+var path = require("path");
 
-
-config["entry"] = [
-    './entry.jsx',
+config.entry = [
+  "./entry.jsx"
 ];
-config["output"] = {
-    path: __dirname + '/static/build/',
-    filename: '[name].js',
-    publicPath: '/static/build/',
-    chunkFilename: "[id].js"
+
+config.output = {
+  path: path.join(__dirname, "/build/"),
+  filename: "[name].js",
+  publicPath: "/static/build/",
+  chunkFilename: "[id].js"
 };
 
-config["module"] = {
-    loaders: [
-        // Pass *.jsx files through jsx-loader transform
-        {test: /\.jsx$/, loaders: ['jsx']},
-      { test: /\.css$/, loader: "style!css" },
-        {test: /\.png$/, loader: "file"},
-        {test: /\.jpg$/, loader: "file"},
-        {test: /\.(ttf|eot|svg|woff|ttf)(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "file-loader"}
-        //{	test: "png|jpg|jpeg|gif|svg", loader: "url-loader?limit=10000",}
+config.module = {
+  loaders: [
+    // Pass *.jsx files through jsx-loader transform
+    {test: /\.jsx$/, loaders: ["jsx"]},
+    {test: /\.css$/, loader: "style!css"},
+    {test: /\.png$/, loader: "file"},
+    {test: /\.jpg$/, loader: "file"},
+    {test: /\.(ttf|eot|svg|woff|ttf)(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "file-loader"}
+    // {	test: "png|jpg|jpeg|gif|svg", loader: "url-loader?limit=10000",}
 
-    ]
+  ]
 };
-config["plugins"] = [
-    new webpack.optimize.UglifyJsPlugin({minimize: true}),
-    new webpack.DefinePlugin({
-        GA_TRACKING_CODE: JSON.stringify('UA-59996600-1'),
-        DEBUG: false,
-        YANDEX_API_KEY: JSON.stringify("AHMEKVUBAAAAdcQIfQIA6t3GMOs3_4bbwjkyhyBbjTpnP0cAAAAAAAAAAACGT93VehWe6n5wXG-tL7Gv_61nSw==")
-    })
+
+config.plugins = [
+  new webpack.optimize.UglifyJsPlugin({minimize: true}),
+  new webpack.DefinePlugin({
+    GA_TRACKING_CODE: JSON.stringify("UA-59996600-1"),
+    DEBUG: false,
+    YANDEX_API_KEY: JSON.stringify("AHMEKVUBAAAAdcQIfQIA6t3GMOs3_4bbwjkyhyBbjTpnP0cAAAAAAAAAAACGT93VehWe6n5wXG-tL7Gv_61nSw==")
+  })
 
 ];
 
-module.exports = config;
+module.exports = config;