Merge pull request #6 from OrcaPracticas/config

FIX: Restructuracion de carpetas
OrcaPracticas · Jun 2, 2018 · 48c3b39 · 48c3b39
2 parents be22ce6 + 7e477cc
commit 48c3b39
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 2 deletions.
diff --git a/app/index.js → src/app/index.js b/app/index.js → src/app/index.js
diff --git a/app/stylesheets/index.scss → src/app/stylesheets/index.scss b/app/stylesheets/index.scss → src/app/stylesheets/index.scss
diff --git a/app/stylesheets/settings/_variables.scss → src/app/stylesheets/settings/_variables.scss b/app/stylesheets/settings/_variables.scss → src/app/stylesheets/settings/_variables.scss
diff --git a/app/stylesheets/template/_pokedex.scss → src/app/stylesheets/template/_pokedex.scss b/app/stylesheets/template/_pokedex.scss → src/app/stylesheets/template/_pokedex.scss
diff --git a/app/stylesheets/template/_pokemon.scss → src/app/stylesheets/template/_pokemon.scss b/app/stylesheets/template/_pokemon.scss → src/app/stylesheets/template/_pokemon.scss
diff --git a/app/stylesheets/template/_type.scss → src/app/stylesheets/template/_type.scss b/app/stylesheets/template/_type.scss → src/app/stylesheets/template/_type.scss
diff --git a/webpack/webpack.development.config.js b/webpack/webpack.development.config.js
@@ -16,7 +16,7 @@ const MANIFEST = require("../public/js/modules-manifest.json");
  */
 const CONFIG = {
     entry: {
-        pokedex: PATH.resolve(__dirname, "../app"),
+        pokedex: PATH.resolve(__dirname, "../src/app"),
     },
     output: {
         path: PATH.resolve(__dirname, "../public/js"),

diff --git a/webpack/webpack.production.config.js b/webpack/webpack.production.config.js
@@ -16,7 +16,7 @@ const MANIFEST = require("../public/js/modules-manifest.json");
  */
 const CONFIG = {
     entry: {
-        pokedex: PATH.resolve(__dirname, "../app"),
+        pokedex: PATH.resolve(__dirname, "../src/app"),
     },
     output: {
         path: PATH.resolve(__dirname, "../public/js"),