diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 56d24d55..5a938021 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: Open Commercial CI on: push: branches: - - globodeoro + - master pull_request: types: [ opened, synchronize, reopened ] @@ -34,19 +34,19 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - name: Set up QEMU - if: ${{ github.ref_name == 'globodeoro' }} + if: ${{ github.ref_name == 'master' }} uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - if: ${{ github.ref_name == 'globodeoro' }} + if: ${{ github.ref_name == 'master' }} uses: docker/setup-buildx-action@v2 - name: Login to DockerHub - if: ${{ github.ref_name == 'globodeoro' }} + if: ${{ github.ref_name == 'master' }} uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push Docker image - if: ${{ github.ref_name == 'globodeoro' }} + if: ${{ github.ref_name == 'master' }} uses: docker/build-push-action@v3 with: context: . diff --git a/README.md b/README.md index 9ce26d17..7f0f91c8 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=sic-ops-web%3Asic-ops-web&metric=alert_status)](https://sonarcloud.io/summary/overall?id=sic-ops-web%3Asic-ops-web) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=ops-web%3Aops-web&metric=alert_status)](https://sonarcloud.io/summary/overall?id=ops-web%3Aops-web)

Open Commercial Operations Frontend

diff --git a/angular.json b/angular.json index 99ba9bde..466bf6c0 100644 --- a/angular.json +++ b/angular.json @@ -6,7 +6,7 @@ "version": 1, "newProjectRoot": "projects", "projects": { - "sic-ops-web": { + "ops-web": { "root": "", "sourceRoot": "src", "projectType": "application", @@ -77,18 +77,18 @@ "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { - "browserTarget": "sic-ops-web:build" + "browserTarget": "ops-web:build" }, "configurations": { "production": { - "browserTarget": "sic-ops-web:build:production" + "browserTarget": "ops-web:build:production" } } }, "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "sic-ops-web:build" + "browserTarget": "ops-web:build" } }, "test": { @@ -109,7 +109,7 @@ } } }, - "sic-ops-web-e2e": { + "ops-web-e2e": { "root": "e2e/", "projectType": "application", "prefix": "", @@ -118,11 +118,11 @@ "builder": "@angular-devkit/build-angular:protractor", "options": { "protractorConfig": "e2e/protractor.conf.js", - "devServerTarget": "sic-ops-web:serve" + "devServerTarget": "ops-web:serve" }, "configurations": { "production": { - "devServerTarget": "sic-ops-web:serve:production" + "devServerTarget": "ops-web:serve:production" } } } diff --git a/package-lock.json b/package-lock.json index dea9347e..10fe6310 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "sic-ops-web", + "name": "ops-web", "version": "0.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "sic-ops-web", + "name": "ops-web", "version": "0.0.0", "dependencies": { "@angular/animations": "^14.2.0", diff --git a/package.json b/package.json index 6968667e..ad172974 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "sic-ops-web", + "name": "ops-web", "version": "0.0.0", "engines": { "node": "16.13" diff --git a/sonar-project.properties b/sonar-project.properties index 973541f8..4e83e6dc 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,3 +1,3 @@ sonar.organization=open-commercial -sonar.projectKey=sic-ops-web:sic-ops-web +sonar.projectKey=ops-web:ops-web sonar.sources=. diff --git a/src/app/app.component.html b/src/app/app.component.html index d8721339..d665cc5e 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,5 +1,5 @@ -
+
Ambiente de QA
diff --git a/src/app/app.component.scss b/src/app/app.component.scss index 930f3907..4a10585a 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -2,7 +2,7 @@ @import "~bootstrap/scss/variables"; @import "~bootstrap/scss/mixins"; -.sic-ops-web-app { +.ops-web-app { height: 100%; padding: 0; &.menu-opened { diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 21e07da9..fbfd165c 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -9,7 +9,7 @@ import { StorageKeys, StorageService } from './services/storage.service'; }) export class AppComponent { envQA = environment.qa; - title = 'sic-ops-web'; + title = 'ops-web'; constructor(private storageService: StorageService) { this.checkAppVersion(); } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 92c68e82..6750a02c 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -8,7 +8,6 @@ import { LoginComponent } from './components/login/login.component'; import { SideNavComponent } from './components/side-nav/side-nav.component'; import { JwtInterceptor } from './interceptors/jwt.interceptor'; import { NgSelectModule } from '@ng-select/ng-select'; - import { HomeComponent } from './components/home/home.component'; import { PedidosComponent } from './components/pedidos/pedidos.component'; import { registerLocaleData } from '@angular/common'; @@ -66,7 +65,6 @@ import { RemitoComponent } from './components/remito/remito.component'; import { CuentasCorrientesClienteComponent } from './components/cuentas-corrientes-cliente/cuentas-corrientes-cliente.component'; import { CuentasCorrientesClienteHomeComponent } from './components/cuentas-corrientes-cliente-home/cuentas-corrientes-cliente-home.component'; import { ClienteComponent } from './components/cliente/cliente.component'; - import { NewOrUpdateUsuarioModalComponent } from './components/new-or-update-usuario-modal/new-or-update-usuario-modal.component'; import { OptionPickerModalComponent } from './components/option-picker-modal/option-picker-modal.component'; import { CuentaCorrienteClienteComponent } from './components/cuenta-corriente-cliente/cuenta-corriente-cliente.component'; @@ -88,7 +86,7 @@ import { NotasCreditoCompraComponent } from './components/notas-credito-compra/n import { NotasCreditoCompraHomeComponent } from './components/notas-credito-compra-home/notas-credito-compra-home.component'; import { NotasDebitoCompraHomeComponent } from './components/notas-debito-compra-home/notas-debito-compra-home.component'; import { NotasDebitoCompraComponent } from './components/notas-debito-compra/notas-debito-compra.component'; -import {ShareModule} from './modules/share.module'; +import { ShareModule } from './modules/share.module'; import { VerReciboComponent } from './components/ver-recibo/ver-recibo.component'; import { SelectableListComponent } from './components/selectable-list/selectable-list.component'; import { FacturaCompraComponent } from './components/factura-compra/factura-compra.component'; diff --git a/src/app/components/home/home.component.ts b/src/app/components/home/home.component.ts index dbbc2553..5f2d815b 100644 --- a/src/app/components/home/home.component.ts +++ b/src/app/components/home/home.component.ts @@ -10,7 +10,7 @@ export class HomeComponent { toggleMenu() { this.menuOpened = !this.menuOpened; - const elems = document.getElementsByClassName('sic-ops-web-app'); + const elems = document.getElementsByClassName('ops-web-app'); const appElement = elems.item(0); if (this.menuOpened && appElement) { appElement.classList.add('menu-opened'); diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts index e9df940b..c223e772 100644 --- a/src/environments/environment.production.ts +++ b/src/environments/environment.production.ts @@ -1,6 +1,6 @@ export const environment = { production: true, - apiUrl: 'https://api.globodeoro.com', + apiUrl: 'https://api.example.com', appVersion: 18, qa: false, }; diff --git a/src/karma.conf.js b/src/karma.conf.js index 8c6e3f4e..0adb51d0 100644 --- a/src/karma.conf.js +++ b/src/karma.conf.js @@ -16,7 +16,7 @@ module.exports = function (config) { clearContext: false // leave Jasmine Spec Runner output visible in browser }, coverageIstanbulReporter: { - dir: require('path').join(__dirname, '../coverage/sic-ops-web'), + dir: require('path').join(__dirname, '../coverage/ops-web'), reports: ['html', 'lcovonly', 'text-summary'], fixWebpackSourcePaths: true },