Merge pull request #6 from insight-platform/develop

Develop
insight-platform · Oct 26, 2023 · b9769f1 · b9769f1
2 parents 7a61742 + 4442444
commit b9769f1
Show file tree

Hide file tree

Showing 104 changed files with 1,699 additions and 397 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -21,15 +21,15 @@
           "error",
           {
             "type": "attribute",
-            "prefix": "sf",
+            "prefix": "savant",
             "style": "camelCase"
           }
         ],
         "@angular-eslint/component-selector": [
           "error",
           {
             "type": "element",
-            "prefix": "sf",
+            "prefix": "savant",
             "style": "kebab-case"
           }
         ],

diff --git a/Dockerfile b/Dockerfile
@@ -3,9 +3,11 @@ WORKDIR /tmp/savant-metadata-explorer
 COPY package.json package-lock.json /tmp/savant-metadata-explorer/
 RUN npm install
 COPY . /tmp/savant-metadata-explorer
+RUN npm run build:savant-lib
 RUN npm run build:prod
 
 FROM nginx:1.17.1-alpine
+COPY --from=build /tmp/savant-metadata-explorer/dist/savant-lib /usr/share/nginx/html
 COPY --from=build /tmp/savant-metadata-explorer/dist/savant-metadata-explorer /usr/share/nginx/html
 
 COPY default.conf /etc/nginx/conf.d/default.conf.template

diff --git a/README.md b/README.md
@@ -1,4 +1,12 @@
 # SavantMetadataExplorer
 
+### Run locally
+
+1. $ npm install
+2. $ npm run build:savant-lib
+3. $ npm run start
+
+### Run in Docker
+
 1. $ docker build -t savant-image .
 2. $ docker run --name savant-container --env API_URL=http://176.120.24.131:16686/ -d -p 8080:80 savant-image
diff --git a/angular.json b/angular.json
@@ -3,7 +3,7 @@
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
-    "SavantFrame": {
+    "SavantMetadataExplorer": {
       "projectType": "application",
       "schematics": {
         "@schematics/angular:component": {
@@ -12,7 +12,7 @@
       },
       "root": "",
       "sourceRoot": "src",
-      "prefix": "sf",
+      "prefix": "savant",
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
@@ -44,8 +44,8 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "1mb",
-                  "maximumError": "10mb"
+                  "maximumWarning": "5mb",
+                  "maximumError": "15mb"
                 },
                 {
                   "type": "anyComponentStyle",
@@ -73,18 +73,18 @@
           },
           "configurations": {
             "production": {
-              "browserTarget": "SavantFrame:build:production"
+              "browserTarget": "SavantMetadataExplorer:build:production"
             },
             "development": {
-              "browserTarget": "SavantFrame:build:development"
+              "browserTarget": "SavantMetadataExplorer:build:development"
             }
           },
           "defaultConfiguration": "development"
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "SavantFrame:build"
+            "browserTarget": "SavantMetadataExplorer:build"
           }
         },
         "test": {
@@ -117,6 +117,48 @@
           }
         }
       }
+    },
+    "savant-lib": {
+      "projectType": "library",
+      "root": "projects/savant-lib",
+      "sourceRoot": "projects/savant-lib/src",
+      "prefix": "savant-lib",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:ng-packagr",
+          "options": {
+            "project": "projects/savant-lib/ng-package.json"
+          },
+          "configurations": {
+            "production": {
+              "tsConfig": "projects/savant-lib/tsconfig.lib.prod.json"
+            },
+            "development": {
+              "tsConfig": "projects/savant-lib/tsconfig.lib.json"
+            }
+          },
+          "defaultConfiguration": "production"
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "tsConfig": "projects/savant-lib/tsconfig.spec.json",
+            "polyfills": [
+              "zone.js",
+              "zone.js/testing"
+            ]
+          }
+        },
+        "lint": {
+          "builder": "@angular-eslint/builder:lint",
+          "options": {
+            "lintFilePatterns": [
+              "projects/savant-lib/**/*.ts",
+              "projects/savant-lib/**/*.html"
+            ]
+          }
+        }
+      }
     }
   },
   "cli": {