Use http-server package to serve client app

padloc · Sep 1, 2019 · 0b72b47 · 0b72b47
1 parent 4945d5b
commit 0b72b47
Show file tree

Hide file tree

Showing 4 changed files with 99 additions and 30 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ packages/cordova/platforms
 packages/cordova/plugins
 packages/cordova/www
 packages/cordova/dist
+data
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,17 +7,15 @@ services:
                 - SERVER_URL=$PL_SERVER_URL
                 - CLIENT_URL=$PL_CLIENT_URL
         ports:
-            - 8080:8080
-            - 3000:3000
+            - $PL_CLIENT_PORT:8080
+            - $PL_SERVER_PORT:3000
         environment:
             - PL_EMAIL_USER
             - PL_EMAIL_SERVER
             - PL_EMAIL_PORT
             - PL_EMAIL_PASSWORD
             - PL_EMAIL_FROM
             - PL_REPORT_ERRORS
-            - PL_SERVER_URL=http://192.168.1.8:3000
-            - PL_CLIENT_URL=http://192.168.1.8:8081
         volumes:
             - ./data:/data
             - ./docs:/docs

diff --git a/packages/app/package-lock.json b/packages/app/package-lock.json
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -6,10 +6,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@padloc/core": "^3.0.0",
-   	"@padloc/locale": "^3.0.0",
+    "@padloc/locale": "^3.0.0",
     "@webcomponents/webcomponentsjs": "^2.0.0",
     "autosize": "^4.0.2",
     "date-fns": "^1.30.1",
+    "http-server": "^0.11.1",
     "jsqr": "^1.2.0",
     "lit-element": "^2.1.0",
     "lit-html": "^1.0.0",
@@ -51,8 +52,7 @@
   "description": "Padloc UI",
   "scripts": {
     "build": "webpack",
-    "start": "cd build/pwa && polymer serve -p $PL_CLIENT_PORT --hostname 0.0.0.0",
-    "dev": "webpack-dev-server",
-    "sw": "workbox injectManifest workbox-config.js"
+    "start": "http-server dist -s -p $PL_CLIENT_PORT --proxy $PL_CLIENT_URL?",
+    "dev": "webpack-dev-server"
   }
 }