Folder changes

hai5nguy · Oct 19, 2017 · 5ae7d95 · 5ae7d95
1 parent 043598a
commit 5ae7d95
Show file tree

Hide file tree

Showing 16 changed files with 6 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# Progressive Web App
+# AKA Alpha Mu Omega App
 
-Description
+This is the mobile app for the Alpha Mu Omega chapter of AKA.
 
 ## Installation
 Node v7.10.1, npm v4.2.0

diff --git a/src/assets/AKACrest.jpg → frontend/src/assets/AKACrest.jpg b/src/assets/AKACrest.jpg → frontend/src/assets/AKACrest.jpg
diff --git a/src/assets/AMO Logo no circle.png → frontend/src/assets/AMO Logo no circle.png b/src/assets/AMO Logo no circle.png → frontend/src/assets/AMO Logo no circle.png
diff --git a/src/components/about.js → frontend/src/components/about.js b/src/components/about.js → frontend/src/components/about.js
diff --git a/src/components/menu.js → frontend/src/components/menu.js b/src/components/menu.js → frontend/src/components/menu.js
diff --git a/src/containers/Root.js → frontend/src/containers/Root.js b/src/containers/Root.js → frontend/src/containers/Root.js
diff --git a/src/index.html → frontend/src/index.html b/src/index.html → frontend/src/index.html
diff --git a/src/index.js → frontend/src/index.js b/src/index.js → frontend/src/index.js
diff --git a/src/pwa/icon.png → frontend/src/pwa/icon.png b/src/pwa/icon.png → frontend/src/pwa/icon.png
diff --git a/src/pwa/manifest.json → frontend/src/pwa/manifest.json b/src/pwa/manifest.json → frontend/src/pwa/manifest.json
diff --git a/src/pwa/serviceworker.js → frontend/src/pwa/serviceworker.js b/src/pwa/serviceworker.js → frontend/src/pwa/serviceworker.js
diff --git a/src/styles/app.scss → frontend/src/styles/app.scss b/src/styles/app.scss → frontend/src/styles/app.scss
diff --git a/src/styles/menu.scss → frontend/src/styles/menu.scss b/src/styles/menu.scss → frontend/src/styles/menu.scss
diff --git a/index.html b/index.html
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
   },
   "main": "index.js",
   "scripts": {
-    "start": "webpack-dev-server --hot --history-api-fallback --open"
+    "start": "webpack-dev-server --hot --history-api-fallback"
   },
   "repository": {
     "type": "git",

diff --git a/webpack.config.js b/webpack.config.js
@@ -1,5 +1,4 @@
 const webpack = require('webpack');
-const path = require('path');
 const { resolve } = require('path');
 
 
@@ -9,11 +8,11 @@ module.exports = {
     'app': [
       'babel-polyfill',
       'react-hot-loader/patch',
-      './src/index'
+      './frontend/src/index'
     ]
   },
   output: {
-    path: path.resolve(__dirname, './frontend/dist'),
+    path: resolve(__dirname, './frontend/dist'),
     filename: '[name].js'
   },
   module: {
@@ -40,7 +39,7 @@ module.exports = {
       },
       {
         test: [
-            resolve(__dirname, 'src/pwa/'),
+            resolve(__dirname, 'frontend/src/pwa/'),
         ],
         use: [ 'file-loader?name=[name].[ext]' ]                
       },