Edits project name

2020-09-23 17:21:58 -04:00 · 2020-09-23 17:21:58 -04:00 · b1264b3c00
parent 24e4bf1ea7
commit b1264b3c00
6 changed files with 26 additions and 69 deletions
--- a/.sonarcloud.properties
+++ b/.sonarcloud.properties
@ -1,5 +1,5 @@
 sonar.organization=sartography
-sonar.projectKey=sartography_cr-connect-frontend
+sonar.projectKey=sartography_covid19-testing-kiosk
 sonar.host.url=https://sonarcloud.io
 sonar.javascript.lcov.reportPaths=coverage/lcov.info
 sonar.typescript.tsconfigPath=tsconfig.json
--- a/README.md
+++ b/README.md
@ -1,8 +1,8 @@
-# sartography/cr-connect-frontend
-[![Build Status](https://travis-ci.com/sartography/cr-connect-frontend.svg?branch=master)](https://travis-ci.com/sartography/cr-connect-frontend)
-[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=sartography_cr-connect-frontend&metric=coverage)](https://sonarcloud.io/dashboard?id=sartography_cr-connect-frontend)
+# sartography/covid19-testing-kiosk
+[![Build Status](https://travis-ci.com/sartography/covid19-testing-kiosk.svg?branch=master)](https://travis-ci.com/sartography/covid19-testing-kiosk)
+[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=sartography_covid19-testing-kiosk&metric=coverage)](https://sonarcloud.io/dashboard?id=sartography_covid19-testing-kiosk)

-# CR Connect Frontend
+# UVA COVID19 Testing Kiosk
 This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.3.15.

 ## Development server
--- a/angular.json
+++ b/angular.json
@ -3,7 +3,7 @@
  "version": 1,
  "newProjectRoot": "projects",
  "projects": {
-    "cr-connect-frontend": {
+    "covid19-testing-kiosk": {
      "projectType": "application",
      "schematics": {
        "@schematics/angular:component": {
@ -17,7 +17,7 @@
        "build": {
          "builder": "@angular-devkit/build-angular:browser",
          "options": {
-            "outputPath": "dist/cr-connect-frontend",
+            "outputPath": "dist/covid19-testing-kiosk",
            "index": "src/index.html",
            "main": "src/main.ts",
            "polyfills": "src/polyfills.ts",
@ -103,18 +103,18 @@
        "serve": {
          "builder": "@angular-devkit/build-angular:dev-server",
          "options": {
-            "browserTarget": "cr-connect-frontend:build"
+            "browserTarget": "covid19-testing-kiosk:build"
          },
          "configurations": {
            "production": {
-              "browserTarget": "cr-connect-frontend:build:production"
+              "browserTarget": "covid19-testing-kiosk:build:production"
            }
          }
        },
        "extract-i18n": {
          "builder": "@angular-devkit/build-angular:extract-i18n",
          "options": {
-            "browserTarget": "cr-connect-frontend:build"
+            "browserTarget": "covid19-testing-kiosk:build"
          }
        },
        "test": {
@ -131,9 +131,6 @@
            "styles": [
              "src/styles.scss"
            ],
-            "scripts": [
-              "node_modules/marked/lib/marked.js"
-            ],
            "codeCoverageExclude": [
              "src/polyfills.ts",
              "src/test.ts",
@ -158,18 +155,18 @@
          "builder": "@angular-devkit/build-angular:protractor",
          "options": {
            "protractorConfig": "e2e/protractor.conf.js",
-            "devServerTarget": "cr-connect-frontend:serve"
+            "devServerTarget": "covid19-testing-kiosk:serve"
          },
          "configurations": {
            "production": {
-              "devServerTarget": "cr-connect-frontend:serve:production"
+              "devServerTarget": "covid19-testing-kiosk:serve:production"
            }
          }
        }
      }
    }
  },
-  "defaultProject": "cr-connect-frontend",
+  "defaultProject": "covid19-testing-kiosk",
  "cli": {
    "analytics": "39bf12a6-4921-4c8d-bd17-8df6300cf98a"
  }
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@ -6,84 +6,44 @@ services:
    ports:
      - "5432:5432"
    environment:
-      - POSTGRES_USER=crc_user
-      - POSTGRES_PASSWORD=crc_pass
-      - POSTGRES_MULTIPLE_DATABASES=crc_test,pb_test
+      - POSTGRES_USER=covid_user
+      - POSTGRES_PASSWORD=covid_pass
+      - POSTGRES_MULTIPLE_DATABASES=covid_test
    healthcheck:
      test: ["CMD", "pg_isready"]
      interval: 10s
      timeout: 5s
      retries: 10

-  pb:
-    container_name: pb
-    depends_on:
-       - db
-    image: sartography/protocol-builder-mock:$E2E_TAG
-    environment:
-      - APPLICATION_ROOT=/
-      - CORS_ALLOW_ORIGINS=localhost:5000,backend:5000,localhost:5002,bpmn:5002,localhost:4200,frontend:4200
-      - DB_HOST=db
-      - DB_NAME=pb_test
-      - DB_PASSWORD=crc_pass
-      - DB_PORT=5432
-      - DB_USER=crc_user
-      - PORT0=5001
-      - UPGRADE_DB=true
-    ports:
-      - "5001:5001"
-    command: ./wait-for-it.sh db:5432 -t 0 -- ./docker_run.sh
-
  backend:
    container_name: backend
    depends_on:
       - db
-       - pb
-    image: sartography/cr-connect-workflow:$E2E_TAG
+    image: sartography/uva-covid19-testing-communicator:$E2E_TAG
    environment:
      - APPLICATION_ROOT=/
-      - CORS_ALLOW_ORIGINS=localhost:5002,bpmn:5002,localhost:4200,frontend:4200
+      - CORS_ALLOW_ORIGINS=localhost:4200,frontend:4200
      - DB_HOST=db
-      - DB_NAME=crc_test
-      - DB_PASSWORD=crc_pass
+      - DB_NAME=covid_test
+      - DB_PASSWORD=covid_pass
      - DB_PORT=5432
-      - DB_USER=crc_user
+      - DB_USER=covid_user
      - DEVELOPMENT=true
-      - LDAP_URL=mock
-      - PB_BASE_URL=http://pb:5001/v2.0/
-      - PB_ENABLED=true
      - PORT0=5000
      - PRODUCTION=false
-      - RESET_DB=true
      - TESTING=false
      - UPGRADE_DB=true
    ports:
      - "5000:5000"
-    command: ./wait-for-it.sh pb:5001 -t 0 -- ./docker_run.sh
+    command: ./wait-for-it.sh db:5432 -t 0 -- ./docker_run.sh


-#  bpmn:
-#    container_name: bpmn
-#    depends_on:
-#       - db
-#       - backend
-#    image: sartography/cr-connect-bpmn:dev
-#    environment:
-#      - API_URL=http://localhost:5000/api/v1.0
-#      - BASE_HREF=/bpmn/
-#      - DEPLOY_URL=/bpmn/
-#      - HOME_ROUTE=home
-#      - PORT0=5002
-#      - PRODUCTION=false
-#    ports:
-#      - "5002:5002"
-#
 #  frontend:
 #    container_name: frontend
 #    depends_on:
 #       - db
 #       - backend
-#    image: sartography/cr-connect-frontend:dev
+#    image: sartography/uva-covid19-testing-kiosk:dev
 #    environment:
 #      - API_URL=http://localhost:5000/api/v1.0
 #      - BASE_HREF=/app/
--- a/package.json
+++ b/package.json
@ -1,5 +1,5 @@
 {
-  "name": "cr-connect-frontend",
+  "name": "covid19-testing-kiosk",
  "version": "0.0.0",
  "scripts": {
    "ng": "ng",
@ -17,7 +17,7 @@
    "backend:build": "cd docker && docker-compose pull && docker-compose build && cd ..",
    "backend:start": "cd docker && docker-compose up -d --force-recreate && cd ..",
    "backend": "npm run backend:stop && npm run backend:build && npm run backend:start",
-    "env": "chmod +x ./docker/substitute-env-variables.sh && ./docker/substitute-env-variables.sh src/index.html PRODUCTION,API_URL,IRB_URL,HOME_ROUTE,BASE_HREF,DEPLOY_URL,PORT0,GOOGLE_ANALYTICS_KEY,SENTRY_KEY,TITLE",
+    "env": "chmod +x ./docker/substitute-env-variables.sh && ./docker/substitute-env-variables.sh src/index.html PRODUCTION,API_URL,BASE_HREF,DEPLOY_URL,PORT0,GOOGLE_ANALYTICS_KEY,TITLE",
    "ci": "npm run lint && npm run test:coverage && sonar-scanner && npm run env && npm run backend && npm run e2e"
  },
  "private": true,
--- a/sonar-project.properties
+++ b/sonar-project.properties
@ -1,5 +1,5 @@
 sonar.organization=sartography
-sonar.projectKey=sartography_cr-connect-frontend
+sonar.projectKey=sartography_covid19-testing-kiosk
 sonar.host.url=https://sonarcloud.io
 sonar.javascript.lcov.reportPaths=coverage/lcov.info
 sonar.typescript.tsconfigPath=tsconfig.json