Updates to improve usability of GlycanDetail

.github/frontend_test.yml

@@ -0,0 +1,23 @@
+name: Privateer Web App Frontend Test
+
+on:
+  pull_request:
+    branches: [ "webapp" ]
+    paths:
+      - webapp/**
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Build frontend
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20.x
+      - run: |
+          export NODE_OPTIONS=--max-old-space-size=8192
+          cd webapp
+          npm ci
+          npm run test

.github/workflows/frontend.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
     branches: [ "webapp" ]
     paths: 
-      - webserver/**
+      - webapp/**
 
 
 jobs:
@@ -18,7 +18,7 @@ jobs:
           node-version: 20.x
       - run: |
           export NODE_OPTIONS=--max-old-space-size=8192
-          cd webserver
+          cd webapp
           npm ci
           npm run build 
           cp ../.htaccess dist

.github/workflows/frontend_lint.yml

@@ -0,0 +1,25 @@
+name: Privateer Web App Frontend Lint
+
+on:
+  pull_request:
+    branches: [ "webapp" ]
+    paths: 
+      - webapp/**
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Build frontend
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20.x
+      - run: |
+          export NODE_OPTIONS=--max-old-space-size=8192
+          cd webapp
+          npm ci
+          npm run lint
+          npm run prettier
+

.github/workflows/frontend_merge.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ "webapp" ]
     paths: 
-      - webserver/**
+      - webapp/**
 
 
 jobs:
@@ -18,7 +18,7 @@ jobs:
           node-version: 20.x
       - run: |
           export NODE_OPTIONS=--max-old-space-size=8192
-          cd webserver
+          cd webapp
           npm ci
           npm run build 
           cp ../.htaccess dist
@@ -33,6 +33,6 @@ jobs:
           password: ${{ secrets.ftp_password }}
           protocol: ftps
           port: 21
-          local-dir: webserver/public_html/
+          local-dir: webapp/public_html/
           server-dir: ${{ secrets.ftp_server_dir }}/
 

build.sh

@@ -1,24 +1,11 @@
-# source /Applications/ccp4-8.0/bin/ccp4.setup-sh 
-# source ~/Development/privateer/emsdk/emsdk_env.sh
-source /opt/xtal/ccp4-8.0/bin/ccp4.setup-sh 
-source ~/dev/privateer_wasm/emsdk/emsdk_env.sh
+source /Applications/ccp4-8.0/bin/ccp4.setup-sh 
+source ~/Development/privateer/emsdk/emsdk_env.sh
+# source /opt/xtal/ccp4-8.0/bin/ccp4.setup-sh 
+# source ~/dev/privateer_wasm/emsdk/emsdk_env.sh
 
 emcmake cmake .
-emmake make -j 
+emmake make -j
 
-# cp privateer.js webserver/api/privateer.js
-# cp privateer.wasm webserver/api/privateer.wasm
-# cp privateer.data webserver/api/privateer.data
-
-mv privateer.js webserver/src/wasm/privateer.js
-mv privateer.wasm webserver/src/wasm/privateer.wasm
-cp privateer.data webserver/public/privateer.data
-
-
-# mv privateer.js web/privateer/privateer/src/wasm/privateer.js
-# mv privateer.wasm web/privateer/privateer/src/wasm/privateer.wasm
-# mv privateer.data web/privateer/privateer/src/wasm/privateer.data
-
-# cp web/privateer/privateer/src/wasm/privateer.data web/privateer/privateer/public/privateer.data
-# cp web/privateer/privateer/src/wasm/privateer.wasm web/privateer/privateer/public/privateer.wasm
-# cp web/privateer/privateer/src/wasm/privateer.js web/privateer/privateer/public/privateer.js
+mv privateer.js webapp/src/wasm/privateer.js
+mv privateer.wasm webapp/src/wasm/privateer.wasm
+cp privateer.data webapp/public/privateer.data