Merge pull request #6 from moleculemaker/lambert8/bugfix/remove-marvinjs-dependency

fix: remove marvinjs dependency to fix failing build

Author: bodom0015

.github/workflows/docker.yml

@@ -5,9 +5,8 @@ name: Docker
 #   latest and develop
 # - when a pull request is created and updated  to make sure the
 #   Dockerfile is still valid.
-# To be able to push to dockerhub, this execpts the following
+# To be able to push to dockerhub, this expects the following
 # secrets to be set in the project:
-# - NPM_TOKEN : NPM auth token for accessing private chemaxon NPM registry
 # - DOCKERHUB_USERNAME : username that can push to the org
 # - DOCKERHUB_PASSWORD : password asscoaited with the username
 on:
@@ -42,7 +41,6 @@ jobs:
 
       - name: Authenticate with private NPM package
         run: |
-          echo "//hub.chemaxon.com/artifactory/api/npm/npm/:_auth=${{ secrets.NPM_TOKEN }}" > $HOME/.npmrc
           echo "//npm.pkg.github.com/:_authToken=${{ secrets.GITHUB_TOKEN }}" >> $HOME/.npmrc
           echo "npmrc_path=$HOME/.npmrc" >> "$GITHUB_ENV"
 
@@ -94,4 +92,6 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args:
-            configuration=staging
+            configuration=staging
+          secret-files: |
+            NPMRC=${{env.npmrc_path}}

.npmrc

@@ -1,2 +1 @@
-@chemaxon:registry=https://hub.chemaxon.com/artifactory/api/npm/npm/
-@moleculemaker:registry=https://npm.pkg.github.com/
+@moleculemaker:registry=https://npm.pkg.github.com/

Dockerfile

@@ -5,7 +5,7 @@
 #
 
 # Use official node image as the base image
-FROM --platform=$BUILDPLATFORM node:22 as build
+FROM --platform=$BUILDPLATFORM node:22 AS build
 
 # Set the working directory
 WORKDIR /usr/local/app
@@ -19,6 +19,7 @@ COPY package.json package-lock.json ./
 
 # Install all the dependencies
 RUN --mount=type=secret,id=NPMRC npm install
+RUN npm install
 
 # Add the source code to app
 COPY angular.json entrypoint.sh tsconfig*.json package*.json proxy.conf.json tailwind.config.js ./

README.md

@@ -33,18 +33,6 @@ This repo includes a library that helps build frontend application quickly.
 
 ## Development server
 
-For marvin.js license add the following lines to the ~/.npmrc file:
-```
-@chemaxon:registry=https://hub.chemaxon.com/artifactory/api/npm/npm/
-hub.chemaxon.com/artifactory/api/npm/npm/:_auth="<auth>"
-hub.chemaxon.com/artifactory/api/npm/npm/:_password="<password>"
-hub.chemaxon.com/artifactory/api/npm/npm/:username=<user>
-hub.chemaxon.com/artifactory/api/npm/npm/:email=<email>
-hub.chemaxon.com/artifactory/api/npm/npm/:always-auth=true
-```
-
-MMLI members can reach out to developers for the secrets. Non-MMLI members will need to make their own arrangements for a MarvinJS license.
-
 Run `npm start` for a dev server. Navigate to `http://localhost:4200/`. The application will automatically reload if you change any of the source files.
 
 ## Code scaffolding

angular.json

@@ -32,26 +32,16 @@
             "inlineStyleLanguage": "scss",
             "assets": [
               "src/favicon.ico",
-              "src/assets",
-              {
-                "glob": "**/*",
-                "input": "node_modules/@chemaxon/marvinjs",
-                "output": "./assets/marvin-js"
-              }
+              "src/assets"
             ],
             "styles": [
               "src/app/css/primeng_theme.scss",
               "node_modules/primeng/resources/primeng.min.css",
               "node_modules/primeicons/primeicons.css",
               "src/styles.scss",
-              "src/app/css/styles.scss",
-              "node_modules/@chemaxon/marvinjs/gui/css/editor.css"
+              "src/app/css/styles.scss"
             ],
             "scripts": [
-              "node_modules/@chemaxon/marvinjs/gui/lib/promise-1.0.0.min.js",
-              "node_modules/@chemaxon/marvinjs/js/marvinjslauncher.js",
-              "node_modules/@chemaxon/marvinjs/js/util.js",
-              "node_modules/@chemaxon/marvinjs/js/webservices.js",
               "node_modules/chart.js/dist/chart.js"
             ],
             "browser": "src/main.ts"
@@ -140,26 +130,16 @@
             "inlineStyleLanguage": "scss",
             "assets": [
               "src/favicon.ico",
-              "src/assets",
-              {
-                "glob": "**/*",
-                "input": "node_modules/@chemaxon/marvinjs",
-                "output": "./assets/marvin-js"
-              }
+              "src/assets"
             ],
             "styles": [
               "node_modules/primeng/resources/themes/lara-light-blue/theme.css",
               "node_modules/primeng/resources/primeng.min.css",
               "node_modules/primeicons/primeicons.css",
               "src/styles.scss",
-              "src/app/css/styles.scss",
-              "node_modules/@chemaxon/marvinjs/gui/css/editor.css"
+              "src/app/css/styles.scss"
             ],
             "scripts": [
-              "node_modules/@chemaxon/marvinjs/gui/lib/promise-1.0.0.min.js",
-              "node_modules/@chemaxon/marvinjs/js/marvinjslauncher.js",
-              "node_modules/@chemaxon/marvinjs/js/util.js",
-              "node_modules/@chemaxon/marvinjs/js/webservices.js"
             ]
           }
         }

docker-compose.marvin.yaml

@@ -8,7 +8,6 @@ secrets:
 networks:
   proxy:
 
-
 services:
   cleandb:
     image: moleculemaker/cleandb-frontend:localdev

docker-compose.yaml

@@ -29,7 +29,6 @@
     "@angular/platform-browser": "^18.2.7",
     "@angular/platform-browser-dynamic": "^18.2.7",
     "@angular/router": "^18.2.7",
-    "@chemaxon/marvinjs": "^23.11.0",
     "@ngrx/store": "^1.0.0",
     "chart.js": "^3",
     "ngx-matomo-client": "^6.3.1",

package-lock.json

@@ -1,26 +1 @@
-{
-  "/rest-v1": {
-    "localTarget": "http://localhost:8080",
-    "target": "https://marvinjs.backend.mmli1.ncsa.illinois.edu",
-    "secure": true,
-    "changeOrigin": true
-  },
-  "/demo.html": {
-    "localTarget": "http://localhost:8080",
-    "target": "https://marvinjs.backend.mmli1.ncsa.illinois.edu",
-    "secure": true,
-    "changeOrigin": true
-  },
-  "/gui": {
-    "localTarget": "http://localhost:8080",
-    "target": "https://marvinjs.backend.mmli1.ncsa.illinois.edu",
-    "secure": true,
-    "changeOrigin": true
-  },
-  "/js": {
-    "localTarget": "http://localhost:8080",
-    "target": "https://marvinjs.backend.mmli1.ncsa.illinois.edu",
-    "secure": true,
-    "changeOrigin": true
-  }
-}
+{}