renamed red-ui-app to red-ui
This commit is contained in:
Timo Bejan
parent
1a036f65d2
commit
aea7dcd435
@ -1,12 +0,0 @@
|
||||
{
|
||||
"fileServerFolder": ".",
|
||||
"fixturesFolder": "./src/fixtures",
|
||||
"integrationFolder": "./src/integration",
|
||||
"modifyObstructiveCode": false,
|
||||
"pluginsFile": "./src/plugins/index",
|
||||
"supportFile": "./src/support/index.ts",
|
||||
"video": true,
|
||||
"videosFolder": "../../dist/cypress/apps/red-ui-app-e2e/videos",
|
||||
"screenshotsFolder": "../../dist/cypress/apps/red-ui-app-e2e/screenshots",
|
||||
"chromeWebSecurity": false
|
||||
}
|
||||
@ -1,4 +0,0 @@
|
||||
{
|
||||
"name": "Using fixtures to represent data",
|
||||
"email": "hello@cypress.io"
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
import { getGreeting } from '../support/app.po';
|
||||
|
||||
describe('red-ui-app', () => {
|
||||
beforeEach(() => cy.visit('/'));
|
||||
|
||||
it('should display welcome message', () => {
|
||||
// Custom command example, see `../support/commands.ts` file
|
||||
cy.login('my-email@something.com', 'myPassword');
|
||||
|
||||
// Function helper example, see `../support/app.po.ts` file
|
||||
getGreeting().contains('Welcome to red-ui-app!');
|
||||
});
|
||||
});
|
||||
@ -1,22 +0,0 @@
|
||||
// ***********************************************************
|
||||
// This example plugins/index.js can be used to load plugins
|
||||
//
|
||||
// You can change the location of this file or turn off loading
|
||||
// the plugins file with the 'pluginsFile' configuration option.
|
||||
//
|
||||
// You can read more here:
|
||||
// https://on.cypress.io/plugins-guide
|
||||
// ***********************************************************
|
||||
|
||||
// This function is called when a project is opened or re-opened (e.g. due to
|
||||
// the project's config changing)
|
||||
|
||||
const { preprocessTypescript } = require('@nrwl/cypress/plugins/preprocessor');
|
||||
|
||||
module.exports = (on, config) => {
|
||||
// `on` is used to hook into various events Cypress emits
|
||||
// `config` is the resolved Cypress config
|
||||
|
||||
// Preprocess Typescript file using Nx helper
|
||||
on('file:preprocessor', preprocessTypescript(config));
|
||||
};
|
||||
@ -1 +0,0 @@
|
||||
export const getGreeting = () => cy.get('h1');
|
||||
@ -1,31 +0,0 @@
|
||||
// ***********************************************
|
||||
// This example commands.js shows you how to
|
||||
// create various custom commands and overwrite
|
||||
// existing commands.
|
||||
//
|
||||
// For more comprehensive examples of custom
|
||||
// commands please read more here:
|
||||
// https://on.cypress.io/custom-commands
|
||||
// ***********************************************
|
||||
// eslint-disable-next-line @typescript-eslint/no-namespace
|
||||
declare namespace Cypress {
|
||||
interface Chainable<Subject> {
|
||||
login(email: string, password: string): void;
|
||||
}
|
||||
}
|
||||
//
|
||||
// -- This is a parent command --
|
||||
Cypress.Commands.add('login', (email, password) => {
|
||||
console.log('Custom command example: Login', email, password);
|
||||
});
|
||||
//
|
||||
// -- This is a child command --
|
||||
// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
|
||||
//
|
||||
//
|
||||
// -- This is a dual command --
|
||||
// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
|
||||
//
|
||||
//
|
||||
// -- This will overwrite an existing command --
|
||||
// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
|
||||
@ -1,17 +0,0 @@
|
||||
// ***********************************************************
|
||||
// This example support/index.js is processed and
|
||||
// loaded automatically before your test files.
|
||||
//
|
||||
// This is a great place to put global configuration and
|
||||
// behavior that modifies Cypress.
|
||||
//
|
||||
// You can change the location of this file or turn off
|
||||
// automatically serving support files with the
|
||||
// 'supportFile' configuration option.
|
||||
//
|
||||
// You can read more here:
|
||||
// https://on.cypress.io/configuration
|
||||
// ***********************************************************
|
||||
|
||||
// Import commands.js using ES2015 syntax:
|
||||
import './commands';
|
||||
@ -1,10 +0,0 @@
|
||||
{
|
||||
"extends": "./tsconfig.json",
|
||||
"compilerOptions": {
|
||||
"sourceMap": false,
|
||||
"outDir": "../../dist/out-tsc",
|
||||
"allowJs": true,
|
||||
"types": ["cypress", "node"]
|
||||
},
|
||||
"include": ["src/**/*.ts", "src/**/*.js"]
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
{
|
||||
"extends": "../../tsconfig.base.json",
|
||||
"files": [],
|
||||
"include": [],
|
||||
"references": [
|
||||
{
|
||||
"path": "./tsconfig.e2e.json"
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -1,5 +0,0 @@
|
||||
{
|
||||
"extends": "../../tslint.json",
|
||||
"linterOptions": { "exclude": ["!**/*"] },
|
||||
"rules": {}
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
module.exports = {
|
||||
name: 'red-ui-app',
|
||||
name: 'red-ui',
|
||||
preset: '../../jest.config.js',
|
||||
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
|
||||
globals: {
|
||||
@ -12,7 +12,7 @@ module.exports = {
|
||||
],
|
||||
},
|
||||
},
|
||||
coverageDirectory: '../../coverage/apps/red-ui-app',
|
||||
coverageDirectory: '../../coverage/apps/red-ui',
|
||||
snapshotSerializers: [
|
||||
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
|
||||
'jest-preset-angular/build/AngularSnapshotSerializer.js',
|
||||
@ -16,10 +16,10 @@ describe('AppComponent', () => {
|
||||
expect(app).toBeTruthy();
|
||||
});
|
||||
|
||||
it(`should have as title 'red-ui-app'`, () => {
|
||||
it(`should have as title 'red-ui'`, () => {
|
||||
const fixture = TestBed.createComponent(AppComponent);
|
||||
const app = fixture.componentInstance;
|
||||
expect(app.title).toEqual('red-ui-app');
|
||||
expect(app.title).toEqual('red-ui');
|
||||
});
|
||||
|
||||
it('should render title', () => {
|
||||
@ -27,7 +27,7 @@ describe('AppComponent', () => {
|
||||
fixture.detectChanges();
|
||||
const compiled = fixture.nativeElement;
|
||||
expect(compiled.querySelector('h1').textContent).toContain(
|
||||
'Welcome to red-ui-app!'
|
||||
'Welcome to red-ui!'
|
||||
);
|
||||
});
|
||||
});
|
||||
@ -6,5 +6,5 @@ import { Component } from '@angular/core';
|
||||
styleUrls: ['./app.component.scss'],
|
||||
})
|
||||
export class AppComponent {
|
||||
title = 'red-ui-app';
|
||||
title = 'red-ui';
|
||||
}
|
||||
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
@ -61,7 +61,7 @@ public class PlanSpec {
|
||||
public Plan createDockerBuildPlan() {
|
||||
return new Plan(project(), "Redaction UI", new BambooKey("UI"))
|
||||
.description("Docker build for Redaction UI.").stages(
|
||||
new Stage("Build Stage").jobs(creatGinCloudPlatformImagesJob("red-ui-app")))
|
||||
new Stage("Build Stage").jobs(creatGinCloudPlatformImagesJob("red-ui")))
|
||||
.stages(new Stage("Upstream Push Stage").jobs(creatGinCloudPlatformUpstreamJob()))
|
||||
.linkedRepositories("RED / ui").triggers(new BitbucketServerTrigger()).planBranchManagement(
|
||||
new PlanBranchManagement().createForVcsBranch()
|
||||
|
||||
@ -15,7 +15,7 @@ COPY . .
|
||||
## Build the angular app in production mode and store the artifacts in dist folder
|
||||
RUN yarn lint
|
||||
RUN npm version patch --no-git-tag-version
|
||||
RUN yarn build --prod --project=red-ui-app
|
||||
RUN yarn build --prod --project=red-ui
|
||||
### STAGE 2: Setup ###
|
||||
|
||||
FROM nginx:1.17.6-alpine
|
||||
@ -27,6 +27,6 @@ COPY docker/common/nginx/default.conf /etc/nginx/conf.d/
|
||||
RUN rm -rf /usr/share/nginx/html/*
|
||||
|
||||
## From ‘builder’ stage copy over the artifacts in dist folder to default nginx public folder
|
||||
COPY --from=builder /ng-app/dist/apps/red-ui-app /usr/share/nginx/html
|
||||
COPY docker/red-ui-app/docker-entrypoint.sh /
|
||||
COPY --from=builder /ng-app/dist/apps/red-ui /usr/share/nginx/html
|
||||
COPY docker/red-ui/docker-entrypoint.sh /
|
||||
CMD ["/docker-entrypoint.sh"]
|
||||
6
nx.json
6
nx.json
@ -22,12 +22,8 @@
|
||||
}
|
||||
},
|
||||
"projects": {
|
||||
"red-ui-app": {
|
||||
"red-ui": {
|
||||
"tags": []
|
||||
},
|
||||
"red-ui-app-e2e": {
|
||||
"tags": [],
|
||||
"implicitDependencies": ["red-ui-app"]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,39 +1,39 @@
|
||||
{
|
||||
"version": 1,
|
||||
"projects": {
|
||||
"red-ui-app": {
|
||||
"red-ui": {
|
||||
"projectType": "application",
|
||||
"schematics": {
|
||||
"@schematics/angular:component": {
|
||||
"style": "scss"
|
||||
}
|
||||
},
|
||||
"root": "apps/red-ui-app",
|
||||
"sourceRoot": "apps/red-ui-app/src",
|
||||
"root": "apps/red-ui",
|
||||
"sourceRoot": "apps/red-ui/src",
|
||||
"prefix": "redaction",
|
||||
"architect": {
|
||||
"build": {
|
||||
"builder": "@angular-devkit/build-angular:browser",
|
||||
"options": {
|
||||
"outputPath": "dist/apps/red-ui-app",
|
||||
"index": "apps/red-ui-app/src/index.html",
|
||||
"main": "apps/red-ui-app/src/main.ts",
|
||||
"polyfills": "apps/red-ui-app/src/polyfills.ts",
|
||||
"tsConfig": "apps/red-ui-app/tsconfig.app.json",
|
||||
"outputPath": "dist/apps/red-ui",
|
||||
"index": "apps/red-ui/src/index.html",
|
||||
"main": "apps/red-ui/src/main.ts",
|
||||
"polyfills": "apps/red-ui/src/polyfills.ts",
|
||||
"tsConfig": "apps/red-ui/tsconfig.app.json",
|
||||
"aot": true,
|
||||
"assets": [
|
||||
"apps/red-ui-app/src/favicon.ico",
|
||||
"apps/red-ui-app/src/assets"
|
||||
"apps/red-ui/src/favicon.ico",
|
||||
"apps/red-ui/src/assets"
|
||||
],
|
||||
"styles": ["apps/red-ui-app/src/styles.scss"],
|
||||
"styles": ["apps/red-ui/src/styles.scss"],
|
||||
"scripts": []
|
||||
},
|
||||
"configurations": {
|
||||
"production": {
|
||||
"fileReplacements": [
|
||||
{
|
||||
"replace": "apps/red-ui-app/src/environments/environment.ts",
|
||||
"with": "apps/red-ui-app/src/environments/environment.prod.ts"
|
||||
"replace": "apps/red-ui/src/environments/environment.ts",
|
||||
"with": "apps/red-ui/src/environments/environment.prod.ts"
|
||||
}
|
||||
],
|
||||
"optimization": true,
|
||||
@ -62,65 +62,38 @@
|
||||
"serve": {
|
||||
"builder": "@angular-devkit/build-angular:dev-server",
|
||||
"options": {
|
||||
"browserTarget": "red-ui-app:build"
|
||||
"browserTarget": "red-ui:build"
|
||||
},
|
||||
"configurations": {
|
||||
"production": {
|
||||
"browserTarget": "red-ui-app:build:production"
|
||||
"browserTarget": "red-ui:build:production"
|
||||
}
|
||||
}
|
||||
},
|
||||
"extract-i18n": {
|
||||
"builder": "@angular-devkit/build-angular:extract-i18n",
|
||||
"options": {
|
||||
"browserTarget": "red-ui-app:build"
|
||||
"browserTarget": "red-ui:build"
|
||||
}
|
||||
},
|
||||
"lint": {
|
||||
"builder": "@angular-devkit/build-angular:tslint",
|
||||
"options": {
|
||||
"tsConfig": [
|
||||
"apps/red-ui-app/tsconfig.app.json",
|
||||
"apps/red-ui-app/tsconfig.spec.json"
|
||||
"apps/red-ui/tsconfig.app.json",
|
||||
"apps/red-ui/tsconfig.spec.json"
|
||||
],
|
||||
"exclude": ["**/node_modules/**", "!apps/red-ui-app/**/*"]
|
||||
"exclude": ["**/node_modules/**", "!apps/red-ui/**/*"]
|
||||
}
|
||||
},
|
||||
"test": {
|
||||
"builder": "@nrwl/jest:jest",
|
||||
"options": {
|
||||
"jestConfig": "apps/red-ui-app/jest.config.js",
|
||||
"jestConfig": "apps/red-ui/jest.config.js",
|
||||
"passWithNoTests": true
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"red-ui-app-e2e": {
|
||||
"root": "apps/red-ui-app-e2e",
|
||||
"sourceRoot": "apps/red-ui-app-e2e/src",
|
||||
"projectType": "application",
|
||||
"architect": {
|
||||
"e2e": {
|
||||
"builder": "@nrwl/cypress:cypress",
|
||||
"options": {
|
||||
"cypressConfig": "apps/red-ui-app-e2e/cypress.json",
|
||||
"tsConfig": "apps/red-ui-app-e2e/tsconfig.e2e.json",
|
||||
"devServerTarget": "red-ui-app:serve"
|
||||
},
|
||||
"configurations": {
|
||||
"production": {
|
||||
"devServerTarget": "red-ui-app:serve:production"
|
||||
}
|
||||
}
|
||||
},
|
||||
"lint": {
|
||||
"builder": "@angular-devkit/build-angular:tslint",
|
||||
"options": {
|
||||
"tsConfig": ["apps/red-ui-app-e2e/tsconfig.e2e.json"],
|
||||
"exclude": ["**/node_modules/**", "!apps/red-ui-app-e2e/**/*"]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"cli": {
|
||||
@ -135,5 +108,5 @@
|
||||
"unitTestRunner": "jest"
|
||||
}
|
||||
},
|
||||
"defaultProject": "red-ui-app"
|
||||
"defaultProject": "red-ui"
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user