chore(app): add building for dev

Author: yarl

package.json

@@ -8,6 +8,7 @@
     "start-live": "webpack-dev-server --content-base src --progress --colors",
     "start": "webpack --watch --content-base src --progress --colors",
     "build": "webpack --content-base src --progress",
+    "build-dev": "set NODE_ENV=dev&&webpack --content-base src --progress",
     "test": "echo OK"
   },
   "devDependencies": {

src/components/toolbar/toolbar.js

@@ -30,7 +30,7 @@ function controller($mdToast, $state, $window, WikiService, wikidata) {
         $mdToast.show($mdToast.simple()
           .position('top right')
           .textContent(`${item.label} is not an architectural structure or territorial entity`)
-          .hideDelay(3000000));
+          .hideDelay(2000));
       }
     });
   }
@@ -44,11 +44,11 @@ function controller($mdToast, $state, $window, WikiService, wikidata) {
 
   function login() {
     vm.loading = true;
-    $window.location.pathname = '/login';
+    $window.location.pathname = `${$window.__env.baseUrl}/login`;
   }
 
   function logout() {
-    $window.location.pathname = '/logout';
+    $window.location.pathname = `${$window.__env.baseUrl}/logout`;
   }
 }
 

src/index_dev.ejs

@@ -11,6 +11,7 @@
 (function (window) {
   window.__env = window.__env || {};
   window.__env.name = 'dev';
+  window.__env.baseUrl = '/monumental';
 }(this));
 </script>
 </body>

src/index_local.ejs

@@ -11,6 +11,7 @@
 (function (window) {
   window.__env = window.__env || {};
   window.__env.name = 'local';
+  window.__env.baseUrl = '';
 }(this));
 </script>
 </body>

src/services/wiki.service.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 
-const WikiService = function ($http, $httpParamSerializerJQLike, $q, wikidata) {
+const WikiService = function ($http, $httpParamSerializerJQLike, $q, $window, wikidata) {
   const service = {
     addCategory,
     getArticleHeader,
@@ -131,7 +131,7 @@ const WikiService = function ($http, $httpParamSerializerJQLike, $q, wikidata) {
   }
 
   function getToken() {
-    return $http.get('/api', {
+    return $http.get(`${$window.__env.baseUrl}/api`, {
       params: {
         action: 'query',
         meta: 'tokens',
@@ -148,7 +148,7 @@ const WikiService = function ($http, $httpParamSerializerJQLike, $q, wikidata) {
   function setClaim(params) {
     return $http({
       method: 'POST',
-      url: '/api',
+      url: `${$window.__env.baseUrl}/api`,
       data: $httpParamSerializerJQLike(angular.extend({ use_auth: true }, params)),
       headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
     }).then((response) => {

webpack.config.js

@@ -59,8 +59,8 @@ var config = {
 var ENV = process.env.NODE_ENV;
 if (ENV === 'prod' || ENV === 'dev') {
   config.output = {
-    path: path.join(__dirname, 'app', 'dist'),
-    publicPath: 'dist/',
+    path: path.join(__dirname, 'monumental', 'static', 'assets'),
+    publicPath: 'assets/',
     filename: 'bundle.min.js?v=' + package.version
   };
   config.plugins = [