Happy New Year!!!

zombispormedio · Dec 31, 2017 · 65f1d7e · 65f1d7e
1 parent 0e09fbc
commit 65f1d7e
Show file tree

Hide file tree

Showing 128 changed files with 12,428 additions and 12,165 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,3 +1,4 @@
 {
-    "presets": ["env", "react"]
-}
+	"presets": ["env", "react"],
+	"plugins": ["transform-object-rest-spread"]
+}
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,20 @@
+{
+	"env": {
+		"browser": true,
+		"commonjs": true,
+		"es6": true
+	},
+	"parserOptions": {
+		"ecmaFeatures": {
+			"experimentalObjectRestSpread": true,
+			"jsx": true
+		},
+		"sourceType": "module"
+	},
+	"plugins": ["react"],
+	"rules": {
+		"indent": ["error", "tab"],
+		"quotes": ["error", "double"],
+		"semi": ["error", "never"]
+	}
+}
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,6 @@ script:
   - npm run build
 deploy:
   provider: surge
-  project: ./build/
+  project: ./public/
   domain: awesome-pokedex.surge.sh
   skip_cleanup: true
diff --git a/README.md b/README.md
diff --git a/build/favicon.ico → assets/favicon.ico b/build/favicon.ico → assets/favicon.ico
diff --git a/assets/favicon.png b/assets/favicon.png
diff --git a/index.html → assets/index.html b/index.html → assets/index.html
@@ -3,17 +3,14 @@
 
 <head>
     <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>Awesome Bundle</title>
+    <title>Awesome Pokedex</title>
+    <link href="https://fonts.googleapis.com/css?family=VT323" rel="stylesheet">
 </head>
 
 <body>
     <div id="root"></div>
-    <!-- inject:before:js -->
-    <!-- endinject -->
-    <!-- inject:after:js -->
-    <!-- endinject -->
 </body>
 
 </html>