compdemocracy · metasoarous · Dec 2, 2022 · Dec 6, 2021 · Dec 6, 2021 · Dec 6, 2021
diff --git a/.bundlewatch.config.js b/.bundlewatch.config.js
@@ -10,7 +10,7 @@ module.exports = {
   },
   "files": [
     {
-      "path": "client-admin/dist/*.js",
+      "path": "client-admin/dist/**/*.js",
       "maxSize": "180 kB",
     },
     {

diff --git a/.github/workflows/bundlewatch.yml b/.github/workflows/bundlewatch.yml
@@ -47,7 +47,9 @@ jobs:
       working-directory: client-admin
       run: |
         npm install
-        npm run build:webpack
+        cp polis.config.template.js polis.config.js
+        npm run build:prod
+        mv dist/static/js/admin_bundle.*.js dist/static/js/admin_bundle.xxxxxxxx.js
 
     - name: "Install & Build: client-participation"
       working-directory: client-participation

diff --git a/.github/workflows/cypress-tests.yml b/.github/workflows/cypress-tests.yml
@@ -57,7 +57,7 @@ jobs:
           echo EMAIL_TRANSPORT_TYPES=mailgun,aws-ses,nonexistent,maildev >> server/docker-dev.env
 
       - name: Ensure embed test html is served
-        run: cp e2e/cypress/fixtures/html/embed.html client-admin/embed.html
+        run: cp e2e/cypress/fixtures/html/embed.html client-admin/public/embed.html
 
       - name: Serve app via docker-compose
         run: docker-compose up --detach

diff --git a/client-admin/.babelrc b/client-admin/.babelrc
@@ -5,7 +5,7 @@
   ],
   "plugins": [
     ["@babel/plugin-proposal-decorators", { "legacy": true }],
-    ["@babel/plugin-proposal-class-properties", { "loose": true }],
+    ["@babel/plugin-proposal-class-properties"],
     "lodash",
     "@babel/plugin-transform-runtime"
   ]

diff --git a/client-admin/.codeclimate.yml b/client-admin/.codeclimate.yml
diff --git a/client-admin/.dockerignore b/client-admin/.dockerignore
@@ -26,15 +26,9 @@ Desktop.ini
 $RECYCLE.BIN/
 
 # App specific
-build
 dist
-coverage
 node_modules
-bower_components
-.tmp
-lib
 npm-debug.log
-.polis_s3_creds_client.json
 .env_dev
 
 # VCS

diff --git a/client-admin/.eslintignore b/client-admin/.eslintignore
diff --git a/client-admin/.gitignore b/client-admin/.gitignore
@@ -26,15 +26,8 @@ Desktop.ini
 $RECYCLE.BIN/
 
 # App specific
-build
 dist
-coverage
 node_modules
-bower_components
-.tmp
-lib
 npm-debug.log
-.polis_s3_creds_client.json
 .env_dev
 polis.config.js
-polis.config
diff --git a/client-admin/.jshintrc b/client-admin/.jshintrc
diff --git a/client-admin/.npmignore b/client-admin/.npmignore
diff --git a/client-admin/.nvmrc b/client-admin/.nvmrc
diff --git a/client-admin/.travis.yml b/client-admin/.travis.yml
diff --git a/client-admin/Dockerfile b/client-admin/Dockerfile
@@ -1,5 +1,4 @@
-# Gulp v3 stops us from upgrading beyond Node v11
-FROM node:11.15.0-alpine
+FROM node:14.14.0-alpine
 
 WORKDIR /app
 
@@ -13,4 +12,4 @@ COPY polis.config.template.js polis.config.js
 COPY . .
 
 ARG GIT_HASH
-RUN npm run deploy:prod
+RUN npm run build:prod
diff --git a/client-admin/README.md b/client-admin/README.md
@@ -1,21 +1,17 @@
-[![Build Status](https://travis-ci.org/pol-is/polisClientAdmin.svg?branch=master)](https://travis-ci.org/pol-is/polisClientAdmin) [![Code Climate](https://codeclimate.com/github/pol-is/polisClientAdmin/badges/gpa.svg)](https://codeclimate.com/github/pol-is/polisClientAdmin) [![Test Coverage](https://codeclimate.com/github/pol-is/polisClientAdmin/badges/coverage.svg)](https://codeclimate.com/github/vital-edu/sala-de-espera/coverage)
-
-Polis Admin Console
-===================
+# Polis Admin Console
 
 The below instructions are no longer officially supported; if you'd like to use them as a reference, we suggest you check out the official [Dockerfile](Dockerfile) to understand the latest build process and specific package versions.
 
 ---
 
-Configuration
--------------
+## Configuration
 
 Install the NVM following the instructions: [NVM Installation Guide](https://github.com/creationix/nvm#install-script).
 
 Them run the commands below to install the correct Node.JS version and the application dependencies.
 
 ```sh
-nvm install 8.17.0
+nvm install 14.14.0
 npm install
 ```
 
@@ -28,16 +24,14 @@ npm cache clear
 npm install
 ```
 
-Running Application
--------------------
+## Running Application
 
 ```sh
-nvm use 6.2.0
+nvm use 14.14.0
 npm start
 ```
 
-Running Tests
--------------
+## Running Tests
 
 We aspire to use the Jest Testing Framework. We welcome contributors to help us write tests!
 
@@ -46,32 +40,12 @@ We aspire to use the Jest Testing Framework. We welcome contributors to help us
 npm test
 ```
 
-Building and Deploying for Production
--------------------------------------
+## Building for Production
 
-To build static assets for a production deployment, run
+To build static assets into `dist/` for a production deployment, run
 
 ```sh
-gulp dist
+npm run build:prod
 ```
 
-As a convenience, the `npm deploy:prod` is provided for deploying to AWS S3 or via SCP to a static file server.
-For S3 deployment, place your AWS credentials in a JSON file at `.polis_s3_creds_client.json` that looks like this:
-
-```json
-{"key": "XXXXXXX", "secret": "YYYYYYY"}
-```
-
----
-
-### Icons from the Noun Project
-
-* Checklist by David Courey from the Noun Project
-* AI by mungang kim from the Noun Project
-* Science by Akriti Bhusal from the Noun Project
-* Success File by Ben Davis from the Noun Project
-
-### Collections to look into
-
-* https://thenounproject.com/vectorsmarket/collection/project-management-line-icon/?i=1326778
-
+Deployment is currently performed via Docker, and so no other deployment scripts are provided.
diff --git a/client-admin/dev-server.js b/client-admin/dev-server.js