Skip to content

DDP-4382: Migrate ESC(GEC) project to pepper #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 93 commits into from
Jan 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
7c0d72a
ddp-esc skeleton
fat23cat Jan 30, 2020
f588fda
Update ddp-esc config
fat23cat Jan 30, 2020
d0b14da
Router scroll
fat23cat Jan 30, 2020
5497509
esc favicons
fat23cat Jan 30, 2020
a4ef903
Add polyfills
fat23cat Jan 30, 2020
461729e
slyles firts implementation
fat23cat Jan 30, 2020
b840c37
Remove default app component
fat23cat Jan 30, 2020
2d993d0
Setup app module and config
fat23cat Jan 30, 2020
10cfb16
Setup routing
fat23cat Jan 30, 2020
73b2d8a
Update palette
fat23cat Jan 30, 2020
2626f47
pdfs
fat23cat Jan 30, 2020
d3393e5
translate init
fat23cat Jan 30, 2020
fbff7a7
Update index.html
fat23cat Jan 30, 2020
937ce3b
Replace wrong component
fat23cat Jan 30, 2020
1afbdb2
Remove unused url
fat23cat Jan 30, 2020
7e7a47e
Config should be const
fat23cat Jan 30, 2020
bb2b1c5
Remane config services
fat23cat Jan 30, 2020
5485733
Merge branch 'develop' into DDP-4382_esc-migration
fat23cat Jan 30, 2020
43f1b3c
Add gitignore
fat23cat Jan 31, 2020
3706c06
Init basic translate
fat23cat Jan 31, 2020
2ea3160
Welcome page skeleton
fat23cat Jan 31, 2020
a3c6788
Reorganize translate
fat23cat Jan 31, 2020
b159b90
Footer fixes
fat23cat Jan 31, 2020
70954a8
Fix whitespaces
fat23cat Jan 31, 2020
c9ccc04
Get rig of angio
fat23cat Jan 31, 2020
a99cc22
Main page background
fat23cat Feb 3, 2020
cdf0a3c
Styles updated
fat23cat Feb 3, 2020
619b3ef
Add images
fat23cat Feb 3, 2020
10407eb
Add steps
fat23cat Feb 3, 2020
615dc0c
Welocme page skeleton
fat23cat Feb 4, 2020
1afec54
Wrong file commited
fat23cat Feb 4, 2020
c6f87c3
Update template
fat23cat Feb 4, 2020
c8caa20
Main page styles
fat23cat Feb 4, 2020
3f6a814
Fix sidenav
fat23cat Feb 5, 2020
990b146
Implement more details page
fat23cat Feb 5, 2020
6e6712c
About us skeleton
fat23cat Feb 5, 2020
ea68c7b
Merge branch 'develop' into DDP-4382_esc-migration
fat23cat Feb 5, 2020
2809293
Fix assets path
fat23cat Feb 5, 2020
86e5139
Example row
fat23cat Feb 6, 2020
fe298f8
Implement about-us
fat23cat Feb 6, 2020
02ea7b1
Fix button style
fat23cat Feb 6, 2020
d9da5d9
Clean up styles
fat23cat Feb 7, 2020
8d848d1
Revert prion changes
fat23cat Feb 13, 2020
2e3f8d5
Merge branch 'develop' into DDP-4382_esc-migration
fat23cat Feb 13, 2020
c69e242
Merge branch 'develop' into DDP-4382_esc-migration
fat23cat Feb 17, 2020
0cd7dcb
Update redirect routes
fat23cat Feb 17, 2020
bf2baa5
Fix typo
fat23cat Feb 18, 2020
53f5934
Merge branch 'develop' into DDP-4382_esc-migration
fat23cat Feb 20, 2020
a090b28
Last updates
fat23cat Feb 20, 2020
7c9fc27
Merge branch 'DDP-4382_esc-migration' of https://github.com/broadinst…
fat23cat Feb 20, 2020
a4cb0ed
Fix whitespaces
fat23cat Feb 20, 2020
6a3d711
Merge branch 'DDP-4382_esc-migration' of https://github.com/broadinst…
fat23cat Feb 20, 2020
c27d391
DDP-4382 adding circle+GAE setup
zyme Feb 21, 2020
379fd3d
DDP-4382 adding circle+GAE setup
zyme Feb 21, 2020
90594d4
DDP-4382 adding circle+GAE setup
zyme Feb 21, 2020
c99020b
DDP-4382 adding circle+GAE setup
zyme Feb 21, 2020
1b065a4
Optimize images
fat23cat Feb 25, 2020
d2e2b3e
Merge branch 'develop' into DDP-4382_esc-migration
fat23cat Feb 25, 2020
d8f7dfe
Fix link attribute
fat23cat Feb 25, 2020
09b96dd
More optimizations
fat23cat Feb 27, 2020
4624ec3
Remove unused style
fat23cat Mar 3, 2020
0810b21
Merge branch 'DDP-4382_esc-migration' of https://github.com/broadinst…
fat23cat Mar 3, 2020
e151ef3
Update app config
fat23cat Mar 4, 2020
7a41e9e
Fix exports
fat23cat Mar 6, 2020
e80d9fb
Merge branch 'develop' into DDP-4382_esc-migration
fat23cat Mar 6, 2020
868bdb2
Update circleci config
fat23cat Mar 6, 2020
4b8b431
Merge branch 'develop' into DDP-4382_esc-migration
fat23cat Mar 19, 2020
4f4692a
Merge branch 'develop' into DDP-4382_esc-migration
fat23cat Mar 20, 2020
7898b0d
Merge branch 'develop' into DDP-4382_esc-migration
fat23cat Mar 31, 2020
193f064
GA reintegrated
fat23cat Mar 31, 2020
d684fd5
Merge branch 'develop' into DDP-4382_esc-migration
fat23cat Apr 4, 2020
296d22f
Merge branch 'develop' into DDP-4382_esc-migration
fat23cat Apr 7, 2020
15c821c
Merge branch 'develop' into DDP-4382_esc-migration
fat23cat Apr 8, 2020
1465016
Merge branch 'develop' into DDP-4382_esc-migration
fat23cat Apr 17, 2020
643b84e
Update circle ci
fat23cat Apr 17, 2020
a5d928d
Merge branch 'develop' into DDP-4382_esc-migration
fat23cat Apr 17, 2020
42c489e
Add data release page
fat23cat Apr 20, 2020
a3e87c7
Merge branch 'develop' into DDP-4382_esc-migration
fat23cat May 8, 2020
24d7455
Fix
fat23cat May 8, 2020
50daf65
Fix study guid
fat23cat May 8, 2020
217aa78
Merge branch 'develop' into DDP-4382_esc-migration
fat23cat Nov 24, 2020
b01f9f2
Fix data page
fat23cat Nov 24, 2020
ddebcb8
Add updates link
fat23cat Dec 3, 2020
2811a20
Merge branch 'develop' into DDP-4382_esc-migration
fat23cat Dec 3, 2020
5a3a0dc
Merge branch 'develop' into DDP-4382_esc-migration
fat23cat Dec 30, 2020
d066244
Fix style
fat23cat Dec 30, 2020
3ae73e5
Angular 10 migration
fat23cat Dec 30, 2020
8180a7e
Update dispatch files
fat23cat Dec 30, 2020
448cb6b
Merge branch 'develop' into DDP-4382_esc-migration
fat23cat Jan 11, 2021
d11be59
Update pepperConfig
fat23cat Jan 11, 2021
41de402
Fix angular 10 issue
fat23cat Jan 11, 2021
73b3217
Add activityGuids
fat23cat Jan 11, 2021
0ba5488
Fix config
fat23cat Jan 14, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ references:
- *npm_cache_key
# Note: important that values of guids and keys have matching order!"
study_keys: &study_keys
"osteo brain angio mbc testboston mpc prion atcp rgp"
"osteo brain angio mbc testboston mpc prion atcp rgp esc"
study_guids: &study_guids
"CMI-OSTEO cmi-brain ANGIO cmi-mbc testboston cmi-mpc PRION atcp rgp"
"CMI-OSTEO cmi-brain ANGIO cmi-mbc testboston cmi-mpc PRION atcp rgp cmi-esc"
config_deployment_dir: &config_deployment_dir
config/deployment

Expand Down Expand Up @@ -436,6 +436,8 @@ jobs:
study_key: atcp
- conditionally-launch-build-and-store:
study_key: rgp
- conditionally-launch-build-and-store:
study_key: esc
- conditionally-launch-build-and-store:
study_key: prion

Expand Down Expand Up @@ -541,6 +543,9 @@ workflows:
- deploy-stored-build-job:
<<: *deploy_branch_filters
study_key: rgp
- deploy-stored-build-job:
<<: *deploy_branch_filters
study_key: esc
- deploy-stored-build-job:
<<: *deploy_branch_filters
study_key: prion
Expand Down Expand Up @@ -578,6 +583,9 @@ workflows:
- build-and-deploy-job:
name: rgp-nightly
study_key: rgp
- build-and-deploy-job:
name: esc-nightly
study_key: esc
- build-and-deploy-job:
name: prion-nightly
study_key: prion
2 changes: 2 additions & 0 deletions config/deployment/dev/dispatch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ dispatch:
service: testboston
- url: "mpc.dev.datadonationplatform.org/*"
service: mpc
- url: "esc.dev.datadonationplatform.org/*"
service: esc
- url: "prion.dev.datadonationplatform.org/*"
service: prion
- url: "pepper-dev.datadonationplatform.org/docs*"
Expand Down
2 changes: 2 additions & 0 deletions config/deployment/staging/dispatch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ dispatch:
service: testboston
- url: "mpc.staging.datadonationplatform.org/*"
service: mpc
- url: "esc.staging.datadonationplatform.org/*"
service: esc
- url: "prion.staging.datadonationplatform.org/*"
service: prion
- url: "pepper-staging.datadonationplatform.org/docs*"
Expand Down
2 changes: 2 additions & 0 deletions config/deployment/test/dispatch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ dispatch:
service: testboston
- url: "mpc.test.datadonationplatform.org/*"
service: mpc
- url: "esc.test.datadonationplatform.org/*"
service: esc
- url: "prion.test.datadonationplatform.org/*"
service: prion
- url: "pepper-test.datadonationplatform.org/docs*"
Expand Down
16 changes: 16 additions & 0 deletions config/pepperConfig.js.ctmpl
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,22 @@ var DDP_ENV = {
{{end}}
{{end}}

{{if eq $study_guid "cmi-esc"}}
{{if eq $environment "dev"}}
DDP_ENV['auth0ClientId'] = "2LLtNaf1eoiwyMiORtgrcOzL0aASMNC3";
DDP_ENV['projectGAToken'] = "UA-108484823-1";
{{else if eq $environment "test"}}
DDP_ENV['auth0ClientId'] = "fixme-not-set";
DDP_ENV['projectGAToken'] = "UA-108484823-1";
{{else if eq $environment "staging"}}
DDP_ENV['auth0ClientId'] = "fixme-not-set";
DDP_ENV['projectGAToken'] = "UA-108484823-1";
{{else if eq $environment "prod"}}
DDP_ENV['auth0ClientId'] = "fixme-not-set";
DDP_ENV['projectGAToken'] = "UA-61688341-15";
{{end}}
{{end}}

{{if eq $study_guid "cmi-brain"}}
{{if eq $environment "dev"}}
DDP_ENV['auth0ClientId'] = "ZYh16tmcKQrMbWEqFOXSw4wQTvAcaQIJ";
Expand Down
1 change: 1 addition & 0 deletions ddp-workspace/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ DDP apps:
ng serve ddp-angio
ng serve ddp-atcp
ng serve ddp-brain
ng serve ddp-esc
ng serve ddp-mbc
ng serve ddp-mpc
ng serve ddp-osteo
Expand Down
152 changes: 151 additions & 1 deletion ddp-workspace/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -1735,6 +1735,156 @@
}
}
}
},
"ddp-esc": {
"projectType": "application",
"schematics": {
"@schematics/angular:component": {
"style": "scss"
}
},
"root": "projects/ddp-esc",
"sourceRoot": "projects/ddp-esc/src",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/ddp-esc",
"index": "projects/ddp-esc/src/index.html",
"main": "projects/ddp-esc/src/main.ts",
"polyfills": "projects/ddp-esc/src/polyfills.ts",
"tsConfig": "projects/ddp-esc/tsconfig.app.json",
"aot": true,
"assets": [
"projects/ddp-esc/src/favicon.ico",
"projects/ddp-esc/src/favicon-alert.ico",
"projects/ddp-esc/src/assets",
{
"glob": "*.pdf",
"input": "projects/ddp-esc/src/pdf/",
"output": "/"
},
{
"glob": "pepperConfig.js",
"input": "projects/ddp-esc/output-config/",
"output": "assets/config"
}
],
"styles": [
"projects/ddp-esc/src/theme.scss",
"projects/ddp-esc/src/styles.scss"
],
"scripts": []
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "projects/ddp-esc/src/environments/environment.ts",
"with": "projects/ddp-esc/src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "5mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "25kb"
}
]
},
"es5": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "25kb"
}
],
"tsConfig": "projects/ddp-esc/tsconfig.es5.json"
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "ddp-esc:build"
},
"configurations": {
"production": {
"browserTarget": "ddp-esc:build:production"
},
"es5": {
"browserTarget": "ddp-esc:build:es5"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "ddp-esc:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/ddp-esc/src/test.ts",
"polyfills": "projects/ddp-esc/src/polyfills.ts",
"tsConfig": "projects/ddp-esc/tsconfig.spec.json",
"karmaConfig": "projects/ddp-esc/karma.conf.js",
"assets": [
"projects/ddp-esc/src/favicon.ico",
"projects/ddp-esc/src/favicon-alert.ico",
"projects/ddp-esc/src/assets",
{
"glob": "*.pdf",
"input": "projects/ddp-esc/src/pdf/",
"output": "/"
}
],
"styles": [
"projects/ddp-esc/src/styles.scss"
],
"scripts": []
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/ddp-esc/tsconfig.app.json",
"projects/ddp-esc/tsconfig.spec.json",
"projects/ddp-esc/e2e/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "projects/ddp-esc/e2e/protractor.conf.js",
"devServerTarget": "ddp-esc:serve"
},
"configurations": {
"production": {
"devServerTarget": "ddp-esc:serve:production"
}
}
}
}
}
},
"defaultProject": "ddp-sdk",
Expand All @@ -1743,4 +1893,4 @@
"style": "scss"
}
}
}
}
12 changes: 12 additions & 0 deletions ddp-workspace/projects/ddp-esc/.browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries

# You can see what browsers were selected by your queries by running:
# npx browserslist

> 0.5%
last 2 versions
Firefox ESR
not dead
not IE 9-11 # For IE 9-11 support, remove 'not'.
13 changes: 13 additions & 0 deletions ddp-workspace/projects/ddp-esc/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Editor configuration, see https://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
max_line_length = off
trim_trailing_whitespace = false
53 changes: 53 additions & 0 deletions ddp-workspace/projects/ddp-esc/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/out-tsc
# Only exists if Bazel was run
/bazel-out

# dependencies
/node_modules

# profiling files
chrome-profiler-events.json
speed-measure-plugin.json

# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*

# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
yarn-error.log
testem.log
/typings

# e2e
/e2e/*.js
/e2e/*.map

# System Files
.DS_Store
Thumbs.db

# ignore rendered configs--they will be rebuilt at deploy time
src/assets/config/*
18 changes: 18 additions & 0 deletions ddp-workspace/projects/ddp-esc/app.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
service: esc
runtime: python37

# This setting will not matter except to prevent default automatic-scaling which prevents disabling
# earlier versions of this service
basic_scaling:
max_instances: 1

handlers:
- url: /(.*\.(css|eot|gz|html|ico|js|map|png|svg|ttf|woff|woff2|jpg|jpeg|gif|png|json|pdf))
static_files: dist/\1
upload: dist/(.*\.(css|eot|gz|html|ico|js|map|png|svg|ttf|woff|woff2|jpg|jpeg|gif|png|json|pdf))
secure: always

- url: /(.*)
static_files: dist/index.html
upload: dist/index.html
secure: always
32 changes: 32 additions & 0 deletions ddp-workspace/projects/ddp-esc/e2e/protractor.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// @ts-check
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts

const { SpecReporter } = require('jasmine-spec-reporter');

/**
* @type { import("protractor").Config }
*/
exports.config = {
allScriptsTimeout: 11000,
specs: [
'./src/**/*.e2e-spec.ts'
],
capabilities: {
browserName: 'chrome'
},
directConnect: true,
baseUrl: 'http://localhost:4200/',
framework: 'jasmine',
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
print: function() {}
},
onPrepare() {
require('ts-node').register({
project: require('path').join(__dirname, './tsconfig.json')
});
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
}
};
Loading