Skip to content

Commit cab9cdf

Browse files
mikhail1aleksandrovmikhail1aleksandrov
committed
Merge branch 'new-at-study' into quantori-at-study
# Conflicts: # ddp-workspace/projects/toolkit/src/lib/toolkit.module.ts
2 parents d6ad70e + deebbcc commit cab9cdf

File tree

74 files changed

+2655
-158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+2655
-158
lines changed

‎config/deployment/dev/dispatch.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
21
dispatch:
3-
- url: "pepper-dev.datadonationplatform.org/docs*"
4-
service: pepper-api-spec
5-
- url: "pepper-dev.datadonationplatform.org/spec/*"
6-
service: pepper-api-spec
72
- url: "angio.dev.datadonationplatform.org/*"
83
service: angio
94
- url: "mbc.dev.datadonationplatform.org/*"
@@ -18,8 +13,10 @@ dispatch:
1813
service: mpc
1914
- url: "brain-v2.dev.datadonationplatform.org/*"
2015
service: brain-v2
21-
- url: "pepper-backend.dev.datadonationplatform.org/*"
22-
service: pepper-backend
16+
- url: "pepper-dev.datadonationplatform.org/docs*"
17+
service: pepper-api-spec
18+
- url: "pepper-dev.datadonationplatform.org/spec/*"
19+
service: pepper-api-spec
2320
- url: "pepper-dev.datadonationplatform.org/*"
2421
service: pepper-backend
2522
- url: "dsm-dev.datadonationplatform.org/api/*"

‎config/deployment/prod/dispatch.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,19 @@ dispatch:
1111
service: testboston
1212
- url: "mpcproject.org/*"
1313
service: mpc
14-
- url: "pepper-backend.prod.datadonationplatform.org/*"
15-
service: pepper-backend
14+
- url: "pepper.datadonationplatform.org/docs*"
15+
service: pepper-api-spec
16+
- url: "pepper.datadonationplatform.org/spec/*"
17+
service: pepper-api-spec
1618
- url: "pepper.datadonationplatform.org/*"
1719
service: pepper-backend
1820
- url: "dsm.datadonationplatform.org/api/*"
1921
service: study-manager-backend
22+
- url: "dsm.datadonationplatform.org/app/*"
23+
service: study-manager-backend
24+
- url: "dsm.datadonationplatform.org/info/*"
25+
service: study-manager-backend
26+
- url: "dsm.datadonationplatform.org/ui/*"
27+
service: study-manager-backend
2028
- url: "dsm.datadonationplatform.org/*"
2129
service: study-manager-ui

‎config/deployment/staging/dispatch.yaml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,19 @@ dispatch:
1313
service: mpc
1414
- url: "brain-v2.staging.datadonationplatform.org/*"
1515
service: brain-v2
16-
- url: "pepper-backend.staging.datadonationplatform.org/*"
17-
service: pepper-backend
16+
- url: "pepper-staging.datadonationplatform.org/docs*"
17+
service: pepper-api-spec
18+
- url: "pepper-staging.datadonationplatform.org/spec/*"
19+
service: pepper-api-spec
1820
- url: "pepper-staging.datadonationplatform.org/*"
1921
service: pepper-backend
20-
- url: "dsm.staging.datadonationplatform.org/api/*"
22+
- url: "dsm-staging.datadonationplatform.org/api/*"
23+
service: study-manager-backend
24+
- url: "dsm-staging.datadonationplatform.org/app/*"
25+
service: study-manager-backend
26+
- url: "dsm-staging.datadonationplatform.org/info/*"
27+
service: study-manager-backend
28+
- url: "dsm-staging.datadonationplatform.org/ui/*"
2129
service: study-manager-backend
22-
- url: "dsm.staging.datadonationplatform.org/*"
30+
- url: "dsm-staging.datadonationplatform.org/*"
2331
service: study-manager-ui

‎config/deployment/test/dispatch.yaml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,19 @@ dispatch:
1313
service: mpc
1414
- url: "brain-v2.test.datadonationplatform.org/*"
1515
service: brain-v2
16-
- url: "pepper-backend.test.datadonationplatform.org/*"
17-
service: pepper-backend
16+
- url: "pepper-test.datadonationplatform.org/docs*"
17+
service: pepper-api-spec
18+
- url: "pepper-test.datadonationplatform.org/spec/*"
19+
service: pepper-api-spec
1820
- url: "pepper-test.datadonationplatform.org/*"
1921
service: pepper-backend
20-
- url: "dsm.test.datadonationplatform.org/api/*"
22+
- url: "dsm-test.datadonationplatform.org/api/*"
23+
service: study-manager-backend
24+
- url: "dsm-test.datadonationplatform.org/app/*"
25+
service: study-manager-backend
26+
- url: "dsm-test.datadonationplatform.org/info/*"
27+
service: study-manager-backend
28+
- url: "dsm-test.datadonationplatform.org/ui/*"
2129
service: study-manager-backend
22-
- url: "dsm.test.datadonationplatform.org/*"
30+
- url: "dsm-test.datadonationplatform.org/*"
2331
service: study-manager-ui

‎config/pepperConfig.js.ctmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ var DDP_ENV = {
1010
{{ with secret (printf "secret/pepper/%s/%s/conf" $environment $version) }}
1111
mapsApiKey: "{{.Data.mapsApiKey}}",
1212
{{end}}
13-
{{with secret (printf "secret/pepper/%s/%s/%s/conf" $environment $version $study) }}
14-
recaptchaSiteClientKey:"{{.Data.recaptchaSiteClientKey}}",
15-
{{end}}
1613
studyGuid: "{{$study_guid}}",
1714
tcellbaseurl: "https://us.agent.tcell.insight.rapid7.com/api/v1"
1815
};
@@ -142,6 +139,9 @@ var DDP_ENV = {
142139
{{end}}
143140

144141
{{if eq $study_guid "testboston"}}
142+
{{with secret (printf "secret/pepper/%s/%s/%s/conf" $environment $version $study) }}
143+
DDP_ENV['recaptchaSiteClientKey'] = "{{.Data.recaptchaSiteClientKey}}",
144+
{{end}}
145145
{{if eq $environment "dev"}}
146146
DDP_ENV['auth0Domain'] = "login-dev.testboston.org";
147147
DDP_ENV['auth0Audience'] = "testboston-dev.auth0.com";

‎ddp-workspace/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ddp-workspace/projects/ddp-brain-v2/src/app-theme.scss

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,31 @@
44
$md-primary: (
55
50: transparent,
66
100: #FFFFFF,
7+
200: #1D1B25,
8+
250: #7154FF,
9+
300: #3E24BE,
10+
350: #C5BDEC,
11+
400: #BBBBBE,
12+
450: #6D6983,
13+
500: #F6F7FA,
14+
550: #00D49E,
15+
600: #A3A2A5,
16+
650: #7FE9CE,
17+
700: #444444,
718
contrast: (
819
50: #000000,
9-
100: #000000
20+
100: #000000,
21+
200: #000000,
22+
250: #000000,
23+
300: #000000,
24+
350: #000000,
25+
400: #000000,
26+
450: #000000,
27+
500: #000000,
28+
550: #000000,
29+
600: #000000,
30+
650: #000000,
31+
700: #000000
1032
)
1133
);
1234

‎ddp-workspace/projects/ddp-brain-v2/src/app/app-routes.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ export const AppRoutes = {
1515
PasswordResetDone: 'password-reset-done',
1616
CountMeIn: 'count-me-in',
1717
AboutUs: 'about-us',
18-
Data: 'data'
18+
Data: 'data',
19+
MoreDetails: 'more-details'
1920
};

‎ddp-workspace/projects/ddp-brain-v2/src/app/app-routing.module.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ import {
1212
ActivityRedesignedComponent,
1313
LoginLandingRedesignedComponent,
1414
RedirectToAuth0LoginRedesignedComponent,
15-
WorkflowStartActivityRedesignedComponent
15+
WorkflowStartActivityRedesignedComponent,
16+
PasswordRedesignedComponent
1617
} from 'toolkit';
1718

1819
import { AppRoutes } from './app-routes';
@@ -106,6 +107,10 @@ const routes: Routes = [
106107
IrbGuard
107108
]
108109
},
110+
{
111+
path: 'password',
112+
component: PasswordRedesignedComponent
113+
},
109114
{
110115
path: '',
111116
component: WelcomeComponent,

‎ddp-workspace/projects/ddp-brain-v2/src/app/app.module.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { BrowserModule } from '@angular/platform-browser';
22
import { NgModule, Injector, APP_INITIALIZER } from '@angular/core';
3+
import { LOCATION_INITIALIZED } from '@angular/common';
34

45
import { TranslateService } from '@ngx-translate/core';
56

@@ -22,7 +23,10 @@ import {
2223
import { AppRoutingModule } from './app-routing.module';
2324
import { AppComponent } from './components/app/app.component';
2425
import { WelcomeComponent } from './components/welcome/welcome.component';
25-
import { LOCATION_INITIALIZED } from '@angular/common';
26+
import { HeaderComponent } from './components/header/header.component';
27+
import { FooterComponent } from './components/footer/footer.component';
28+
29+
import { MatIconModule } from '@angular/material/icon';
2630

2731
const baseElt = document.getElementsByTagName('base');
2832

@@ -33,7 +37,7 @@ if (baseElt) {
3337

3438
declare const DDP_ENV: any;
3539

36-
declare const ga: Function;
40+
declare const ga: (...args: any[]) => void;
3741

3842
export const toolkitConfig = new ToolkitConfigurationService();
3943
toolkitConfig.studyGuid = DDP_ENV.studyGuid;
@@ -90,13 +94,16 @@ export function translateFactory(translate: TranslateService, injector: Injector
9094
@NgModule({
9195
declarations: [
9296
AppComponent,
93-
WelcomeComponent
97+
WelcomeComponent,
98+
HeaderComponent,
99+
FooterComponent
94100
],
95101
imports: [
96102
BrowserModule,
97103
AppRoutingModule,
98104
DdpModule,
99-
ToolkitModule
105+
ToolkitModule,
106+
MatIconModule
100107
],
101108
providers: [
102109
{

0 commit comments

Comments
 (0)