finalizing fixing refactor!!

9 files changed, 65 insertions, 16 deletions

diff --git a/README.md b/README.md
index 91bc1bd..0daf5db 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ conda activate swimmer
 Then build the frontend and run the Flask server:
 
 ```
-npm run build
+npm run build:dev
 ./cli.py flask run
 ```
 
@@ -51,6 +51,7 @@ Generate a new migration if you've modified the database:
 ## building the site
 
 ```
+npm run build:production
 ./cli.py site export --graph swimmer
 ```
 
diff --git a/cli/app/server/web.py b/cli/app/server/web.py
index 0436cd4..1a3b064 100644
--- a/cli/app/server/web.py
+++ b/cli/app/server/web.py
@@ -12,7 +12,7 @@ handler.setFormatter(formatter)
 logger.addHandler(handler)
 logging.getLogger().addHandler(logging.StreamHandler())
 
-from flask import Flask, Blueprint, send_from_directory, request
+from flask import Flask, send_from_directory, request
 from app.sql.common import db, connection_url
 
 from app.settings import app_cfg
@@ -25,8 +25,7 @@ def create_app(script_info=None):
   """
   functional pattern for creating the flask app
   """
-  logging.debug("Starting Flask app...")
-
+  logging.debug("Starting Swimmer server...")
   app = Flask(__name__, static_folder=app_cfg.DIR_STATIC, static_url_path='/static')
   app.config['SQLALCHEMY_DATABASE_URI'] = connection_url
   app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
@@ -45,9 +44,6 @@ def create_app(script_info=None):
   @app.errorhandler(404)
   def page_not_found(e):
     return app.send_static_file(index_html), 200
-    # path = os.path.join(os.path.dirname(__file__), './static/index.html')
-    # with open(path, "r") as f:
-    #   return f.read(), 200
 
   @app.route('/', methods=['GET'])
   def index():
diff --git a/cli/app/settings/app_cfg.py b/cli/app/settings/app_cfg.py
index 0d724c7..5fc4982 100644
--- a/cli/app/settings/app_cfg.py
+++ b/cli/app/settings/app_cfg.py
@@ -58,10 +58,7 @@ URL_MEDIA = join(URL_DATA, 'media')
 URL_UPLOADS = join(URL_DATA, 'uploads')
 URL_EXPORTS = join(URL_DATA, 'exports')
 
-if 'cli' in os.getcwd():
-  DIR_STATIC = os.path.abspath('../static')
-else:
-  DIR_STATIC = os.path.abspath('static')
+DIR_STATIC = join(DIR_APP, 'static')
 
 HASH_TREE_DEPTH = 3  # for sha256 subdirs
 HASH_BRANCH_SIZE = 3  # for sha256 subdirs
diff --git a/frontend/app/api/index.js b/frontend/app/api/index.js
index c3d0aa4..41cf624 100644
--- a/frontend/app/api/index.js
+++ b/frontend/app/api/index.js
@@ -1,5 +1,4 @@
 import { crud_actions } from 'app/api/crud.actions'
-import * as util from 'app/api/utils'
 
 /*
 for our crud events, create corresponding actions
@@ -14,8 +13,6 @@ so you can do ...
   folderActions.upload(12, form_data)
 */
 
-export { util }
-
 export const actions = [
   'graph',
   'page',
diff --git a/frontend/app/app.js b/frontend/app/router.js
index 8dbbd0f..8dbbd0f 100644
--- a/frontend/app/app.js
+++ b/frontend/app/router.js
diff --git a/frontend/app/views/page/components/tile.new.js b/frontend/app/views/page/components/tile.new.js
index fb609a5..b491fdd 100644
--- a/frontend/app/views/page/components/tile.new.js
+++ b/frontend/app/views/page/components/tile.new.js
@@ -35,7 +35,7 @@ class TileNew extends Component {
         graph={this.props.graph.show.res}
         page={this.props.page.show.res}
         initialData={null}
-        sortOrder={this.props.page.show.res.tiles.length}
+        sortOrder={this.props.page.show.res.tiles ? this.props.page.show.res.tiles.length : []}
         onSubmit={this.handleSubmit.bind(this)}
       />
     )
diff --git a/frontend/index.js b/frontend/index.js
index 393282c..8daf531 100644
--- a/frontend/index.js
+++ b/frontend/index.js
@@ -4,7 +4,7 @@ import { Provider } from 'react-redux'
 
 import Router from 'app/router'
 
-import { store, history } from '/store'
+import { store, history } from 'app/store'
 
 const container = document.createElement('div')
 container.classList.add('container')
diff --git a/package-lock.json b/package-lock.json
index 315c8a5..2787cd9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3962,6 +3962,41 @@
         "object.assign": "^4.1.0"
       }
     },
+    "babel-plugin-module-resolver": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-module-resolver/-/babel-plugin-module-resolver-4.0.0.tgz",
+      "integrity": "sha512-3pdEq3PXALilSJ6dnC4wMWr0AZixHRM4utpdpBR9g5QG7B7JwWyukQv7a9hVxkbGFl+nQbrHDqqQOIBtTXTP/Q==",
+      "requires": {
+        "find-babel-config": "^1.2.0",
+        "glob": "^7.1.6",
+        "pkg-up": "^3.1.0",
+        "reselect": "^4.0.0",
+        "resolve": "^1.13.1"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "resolve": {
+          "version": "1.17.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        }
+      }
+    },
     "babel-plugin-syntax-async-functions": {
       "version": "6.13.0",
       "resolved": "http://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
@@ -6237,6 +6272,15 @@
         }
       }
     },
+    "find-babel-config": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-1.2.0.tgz",
+      "integrity": "sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==",
+      "requires": {
+        "json5": "^0.5.1",
+        "path-exists": "^3.0.0"
+      }
+    },
     "find-cache-dir": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
@@ -8663,6 +8707,14 @@
         "find-up": "^3.0.0"
       }
     },
+    "pkg-up": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
+      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
+      "requires": {
+        "find-up": "^3.0.0"
+      }
+    },
     "posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -9608,6 +9660,11 @@
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
     },
+    "reselect": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.0.0.tgz",
+      "integrity": "sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA=="
+    },
     "resolve": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz",
diff --git a/package.json b/package.json
index fc24c4f..c6984ef 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "aws-sdk": "^2.631.0",
     "babel-eslint": "^10.1.0",
     "babel-loader": "^8.0.6",
+    "babel-plugin-module-resolver": "^4.0.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
     "babel-plugin-transform-object-rest-spread": "^6.23.0",