Commit b41f51bd authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch 'develop' into 'main' 

Merging "develop" to "main" branch

Closes #28

See merge request !29
parents 6d3f9779 7d342cf2

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 




# Stage 1, based on Nginx, to have only the compiled app, ready for production with Nginx

FROM nginx:1.19.4

FROM nginx:1.27.3

#Copy ci-dashboard-dist

COPY ./dist/org.etsi.osl.tmf.web/ /usr/share/nginx/html/services

#Copy default nginx configuration

angular.json

+9 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
        "build": {

          "builder": "@angular-devkit/build-angular:browser",

          "options": {

            "allowedCommonJsDependencies": ["jwt-decode"],

            "allowedCommonJsDependencies": ["jwt-decode", "moment", "jsoneditor", "fast-sha256"],

            "outputPath": "dist/org.etsi.osl.tmf.web",

            "index": "src/index.html",

            "main": "src/main.ts",
@@ -56,7 +56,14 @@ 
                  "with": "src/environments/environment.prod.ts"

                }

              ],

              "optimization": true,

              "optimization": {

                "scripts": true,

                "styles": {

                  "minify": true,

                  "inlineCritical": false

                },

                "fonts": true

              },

              "outputHashing": "all",

              "sourceMap": false,

              "namedChunks": false,

package-lock.json

+7532 −14065

File changed.

Preview size limit exceeded, changes collapsed.

package.json

+40 −33
Original line number Diff line number Diff line
@@ -11,50 +11,56 @@ 
  },

  "private": true,

  "dependencies": {

    "@angular/animations": "~13.3.11",

    "@angular/cdk": "~13.3.9",

    "@angular/common": "~13.3.11",

    "@angular/compiler": "~13.3.11",

    "@angular/core": "~13.3.11",

    "@angular/forms": "~13.3.11",

    "@angular/localize": "^13.3.11",

    "@angular/material": "~13.3.9",

    "@angular/platform-browser": "~13.3.11",

    "@angular/platform-browser-dynamic": "~13.3.11",

    "@angular/router": "~13.3.11",

    "@danielmoncada/angular-datetime-picker": "~13.1.1",

    "@danielmoncada/angular-datetime-picker-moment-adapter": "~1.1.0",

    "@angular/animations": "^14.3.0",

    "@angular/cdk": "^14.2.7",

    "@angular/common": "^14.3.0",

    "@angular/compiler": "^14.3.0",

    "@angular/core": "^14.3.0",

    "@angular/forms": "^14.3.0",

    "@angular/localize": "^14.3.0",

    "@angular/material": "^14.2.7",

    "@angular/platform-browser": "^14.3.0",

    "@angular/platform-browser-dynamic": "^14.3.0",

    "@angular/router": "^14.3.0",

    "@danielmoncada/angular-datetime-picker": "~14.2.0",

    "@danielmoncada/angular-datetime-picker-moment-adapter": "~3.0.1",

    "@fortawesome/fontawesome-free": "~5.15.4",

    "@fullcalendar/angular": "~5.11.2",

    "@fullcalendar/core": "~5.11.2",

    "@fullcalendar/daygrid": "~5.11.2",

    "@fullcalendar/interaction": "~5.11.2",

    "@fullcalendar/list": "~5.11.2",

    "@fullcalendar/resource-timeline": "~5.11.2",

    "@fullcalendar/timegrid": "~5.11.2",

    "@iplab/ngx-file-upload": "~13.0.0",

    "@ng-bootstrap/ng-bootstrap": "~11.0.1",

    "ang-jsoneditor": "^1.10.5",

    "angular-oauth2-oidc": "~13.0.1",

    "@fullcalendar/angular": "~6.1.16",

    "@fullcalendar/core": "~6.1.15",

    "@fullcalendar/daygrid": "~6.1.15",

    "@fullcalendar/interaction": "~6.1.15",

    "@fullcalendar/list": "~6.1.15",

    "@fullcalendar/resource-timeline": "~6.1.15",

    "@fullcalendar/timegrid": "~6.1.15",

    "@iplab/ngx-file-upload": "~14.0.2",

    "@vimeo/player": "^2.29.0",

    "ang-jsoneditor": "~3.0.2",

    "angular-oauth2-oidc": "~14.0.1",

    "blockly": "git://github.com/google/blockly.git#6.20210701.0",

    "bootstrap": "~4.6.0",

    "jsoneditor": "^9.10.0",

    "chartjs-plugin-datalabels": "~2.2.0",

    "jsoneditor": "~9.10.0",

    "jwt-decode": "~2.2.0",

    "ngx-markdown": "~13.1.0",

    "ngx-progressbar": "~8.0.0",

    "ngx-toastr": "~14.3.0",

    "rxjs": "~6.6.7",

    "marked": "^15.0.8",

    "moment": "^2.30.1",

    "ng2-charts": "~3.1.2",

    "ngx-bootstrap": "~9.0.0",

    "ngx-markdown": "~14.0.1",

    "ngx-progressbar": "~9.0.0",

    "ngx-toastr": "~15.2.2",

    "rxjs": "~7.4.0",

    "tslib": "~2.0.0",

    "zone.js": "~0.11.8"

  },

  "devDependencies": {

    "@angular-devkit/build-angular": "~13.3.9",

    "@angular/cli": "~13.3.9",

    "@angular/compiler-cli": "~13.3.11",

    "@angular/language-service": "~13.3.11",

    "@angular-devkit/build-angular": "^14.2.13",

    "@angular/cli": "^14.2.13",

    "@angular/compiler-cli": "^14.3.0",

    "@angular/language-service": "^14.3.0",

    "@types/jasmine": "~3.3.8",

    "@types/jasminewd2": "~2.0.3",

    "@types/node": "~12.11.1",

    "@types/vimeo__player": "^2.18.3",

    "codelyzer": "~6.0.2",

    "jasmine-core": "~3.5.0",

    "jasmine-spec-reporter": "~5.0.0",
@@ -63,6 +69,7 @@ 
    "karma-coverage-istanbul-reporter": "~3.0.2",

    "karma-jasmine": "~4.0.0",

    "karma-jasmine-html-reporter": "~1.5.0",

    "ng-openapi-gen": "~0.53.0",

    "ng-swagger-gen": "^2.2.0",

    "protractor": "~7.0.0",

    "ts-node": "~7.0.0",

src/app/app-products.module.ts

+25 −33
Original line number Diff line number Diff line
@@ -49,15 +49,7 @@ import { AssignSubcategoriesComponent } from './p_product/admin/productCatalogMa 
        CommonModule,

        SharedModule,

        AppProductsRoutingModule,

  ],

  entryComponents: [

    DeleteProductCatalogsComponent,

    DeleteProductSpecsComponent,

    DeleteProductCategoriesComponent,

    DeleteProductOfferingComponent,

    AssignServiceSpecificationComponent,

    PreviewMarketPlaceItemComponent

  ],

    ]

})



export class AppProductsModule { }