Skip to content

Commit df7900d

Browse files
GRG2GRG2
authored
Merge pull request #244 from usnistgov/fix/ODD833-startup-performance02
Fix/odd833 startup performance02
2 parents f4cc485 + 60d446a commit df7900d

282 files changed

Lines changed: 5553 additions & 415516 deletions

File tree

Some content is hidden

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

‎angular/angular.json‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@
2424
"src/assets"
2525
],
2626
"styles": [
27-
"src/styles.css",
2827
"node_modules/bootstrap/dist/css/bootstrap.min.css",
28+
"node_modules/primeng/resources/themes/bootstrap/theme.css",
29+
"src/styles/font-awesome/css/font-awesome.min.css",
2930
"node_modules/primeng/resources/primeng.css",
3031
"node_modules/primeicons/primeicons.css",
31-
"src/styles/ultima-ng-5.2.4/assets/layout/css/layout-indigo.css",
32-
"src/styles/ultima-ng-5.2.4/assets/theme/theme-indigo.css",
33-
"src/styles/font-awesome/css/font-awesome.min.css",
3432
"src/styles/main.css",
3533
"src/styles/styles.layout.css",
36-
"src/styles/styles.themes.css"
34+
"src/styles/styles.themes.css",
35+
"src/assets/fontcss/roboto.css",
36+
"src/styles.css"
3737
],
3838
"scripts": [
3939
"node_modules/lodash/lodash.min.js",
@@ -100,8 +100,6 @@
100100
"src/styles.css",
101101
"node_modules/bootstrap/dist/css/bootstrap.min.css",
102102
"node_modules/primeng/resources/primeng.min.css",
103-
"src/styles/ultima-ng-5.2.4/assets/layout/css/layout-indigo.css",
104-
"src/styles/ultima-ng-5.2.4/assets/theme/theme-indigo.css",
105103
"node_modules/primeicons/primeicons.css",
106104
"src/styles/font-awesome/css/font-awesome.min.css",
107105
"src/styles/main.css"

‎angular/e2e/src/app.e2e-spec.ts‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ describe('workspace-project App', () => {
1919
browser.sleep(5000);
2020
browser.ignoreSynchronization = true;
2121
expect<any>(browser.getTitle()).toEqual('NIST Data Repository Page');
22-
2322
expect<any>(page.getParagraphText()).toEqual('NIST Data Discovery');
23+
expect<any>(element(by.id('feature')).getText()).toEqual('FEATURED DATA DOMAINS');
2424
});
2525

2626
it('About page should display title of about page', () => {
@@ -30,7 +30,7 @@ describe('workspace-project App', () => {
3030
expect<any>(element(by.id('title')).getText()).toEqual('About NIST Data');
3131
});
3232

33-
it('Advanced search page should display title of advanced search page', () => {
33+
it('Advanced search page should display title of Advanced Search Builder', () => {
3434
page.navigateTo('/#/advanced');
3535
browser.sleep(5000);
3636
browser.ignoreSynchronization = true;
@@ -57,25 +57,4 @@ describe('workspace-project App', () => {
5757
browser.ignoreSynchronization = true;
5858
expect<any>(element(by.id('title')).getText()).toEqual('APIs');
5959
});
60-
61-
it('Search for text SRD 69 should return SRD 101 (mock data)', () => {
62-
page.navigateTo('/#/search?q="SRD 69"&key=&queryAdvSearch=');
63-
browser.sleep(5000);
64-
browser.ignoreSynchronization = true;
65-
const text = element(by.css('sdp-search h4')).getText();
66-
expect<any>(text).toContain("SRD 101");
67-
});
68-
69-
it('Search for text SRD 101 should return SRD 101',()=>{
70-
page.navigateTo('/');
71-
browser.sleep(5000);
72-
browser.ignoreSynchronization = true;
73-
page.getSearchExampleLink().click();
74-
browser.sleep(5000);
75-
page.getSearchButton().click();
76-
browser.sleep(5000);
77-
78-
const text = element(by.css('sdp-search h4')).getText();
79-
expect<any>(text).toContain("SRD 101");
80-
});
8160
});

‎angular/e2e/src/app.po.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,18 @@ export class AppPage {
88
getParagraphText() {
99
browser.sleep(5000);
1010
browser.ignoreSynchronization = true;
11-
return element(by.className('TexAlCenter title')).getText();
11+
return element(by.className('title')).getText();
1212
}
1313

1414
getSearchExampleLink() {
1515
return element(by.id('srd101'));
1616
}
1717

1818
getSearchButton() {
19-
return element(by.className('searchButton'));
19+
return element(by.className('bigSearchButton'));
2020
}
2121

22+
showExampleLink() {
23+
return element(by.id('example'));
24+
}
2225
}

‎angular/package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"@angular/platform-browser": "^6.1.0",
2828
"@angular/platform-browser-dynamic": "^6.1.0",
2929
"@angular/router": "^6.1.0",
30+
"@ng-bootstrap/ng-bootstrap": "^3.3.1",
3031
"ajv": "^6.9.1",
3132
"bootstrap": "^4.0.0",
3233
"classlist.js": "^1.1.20150312",
@@ -41,7 +42,8 @@
4142
"primeui": "^4.1.15",
4243
"rxjs": "^6.2.0",
4344
"rxjs-compat": "^6.2.0",
44-
"zone.js": "~0.8.26"
45+
"zone.js": "~0.8.26",
46+
"ngx-toastr": "^10.1.0"
4547
},
4648
"devDependencies": {
4749
"@angular-devkit/build-angular": "^0.13.10",

‎angular/src/app/about/about.component.css‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,8 @@ hr {
4343
font-weight: 300;
4444
}
4545

46+
.main-image{
47+
width:50%;
48+
margin: 1em 0em 0em 0em;
49+
min-width: 200px;
50+
}

‎angular/src/app/about/about.component.html‎

Lines changed: 60 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,65 @@
1-
<div class="ui-g" style="width: 100%;background-color: #153971;color: #FFFFFF">
2-
<div class="ui-g-12" style="padding-left:2.5em;padding-right: 2.5em;padding-top: 2.5em">
3-
<label id='title' style="font-size: xx-large;float: left;display: block;"><i
4-
class="faa faa-info-circle faa-lg"></i>About NIST Data</label>
5-
<ol class="breadcrumb" style="float: right;">
6-
<li class="active breadcrumb-item"><span style="color: #fff; font-weight:normal; cursor: pointer;"
7-
(click)="commonService.goHome()">Home</span></li>
8-
<li class="breadcrumb-item">About</li>
9-
<li class="breadcrumb-item">NIST Data</li>
10-
</ol>
11-
</div>
1+
<!-- Top banner -->
2+
<div class="ui-g top-banner" [ngStyle]="{ 'background-image': 'url(' + imageURL + ')'}">
3+
<div class="container inner-top-banner">
4+
<span style="font-size: xx-large;">
5+
<i class="faa faa-info-circle faa-lg" style="padding-right: .5em;"></i><label id='title'>About NIST
6+
Data</label>
7+
</span>
8+
<ol class="breadcrumb" style="float: right;">
9+
<li class="active breadcrumb-item"><span style="color: #fff; font-weight:normal; cursor: pointer;"
10+
(click)="commonService.goHome()">Home</span></li>
11+
<li class="breadcrumb-item">About</li>
12+
<li class="breadcrumb-item">NIST Data</li>
13+
</ol>
14+
</div>
1215
</div>
1316

14-
<div class="card">
15-
<div class="ui-g">
16-
<div class="ui-g-12">
17-
<div class="ui-g-12 ui-md-6 ui-lg-6 content"
18-
style="font-family: Source Sans Pro,sans-serif;font-size:20px;line-height: 1.2em;">
19-
<div class="adv-step">
20-
This National Institute of Standards and Technology (NIST) <b>Science Data Portal</b> provides a user-friendly discovery and exploration tool for publicly available datasets at NIST. These data products are generated as part of the NIST mission, spanning multiple
21-
disciplines of scientific, engineering and technology research. NIST's publicly available data sets showcase its commitment to providing accurate, well-curated measurements of physical properties, exemplified by the <a href="https://www.nist.gov/srd" target="_blank" (click)="gaService.gaTrackEvent('outbound', $event, 'Standard Reference Data program')"> Standard Reference Data program</a>, as well as its commitment to advancing basic research.
22-
</div>
23-
<div class="adv-step">
24-
For <a href="https://www.nist.gov/topics/data/public-access-nist-research/copyright-fair-use-and-licensing-statements-srd-data-and" target="_blank" (click)="gaService.gaTrackEvent('outbound', $event, 'Fair Use')"><b>Fair Use</b></a> of these data, please include citation in your works including the Digital Object
25-
Identifier (DOI). NIST DOIs are registered with the <a href="https://www.datacite.org" target="_blank" (click)="gaService.gaTrackEvent('outbound', $event, 'DataCite')">DataCite organization</a> and provide globally unique persistent identifiers. The DOI also serves as a direct link to data <i>homepages</i> giving access to the full research publication description and underlying datasets.
26-
</div>
27-
<hr>
28-
<div class="adv-step">
29-
This portal is designed with <a href="https://www.go-fair.org/fair-principles/" target="_blank" (click)="gaService.gaTrackEvent('outbound', $event, 'FAIR Data')"> FAIR principles</a> and best practice for <a href="https://strategy.data.gov/" target="_blank" (click)="gaService.gaTrackEvent('outbound', $event, 'FDS')">Federal Data Strategy</a> (See <a href="#/policy"
30-
target="_blank" (click)="gaService.gaTrackEvent('outbound', $event, 'Policy')">Policy page</a> for more details). This portal and related software is hosted in the USNISTGOV organization <a href="https://github.com/usnistgov/oar-developer" target="_blank" (click)="gaService.gaTrackEvent('outbound', $event, 'OAR Github')">github repository</a> as an open source solution.
17+
<!-- Text body -->
18+
<div class="text-body" style="padding: 0px;">
19+
<div class="container">
20+
<div class="ui-g">
21+
<div class="ui-g-12">
22+
<div class="ui-g-12 ui-md-12 ui-lg-12 content"
23+
style="clear: both;">
24+
<img HSPACE=”50” VSPACE=”0” align=right class="main-image"
25+
src="./assets/images/AboutNIST-wordcloud_D.jpg" alt="AboutNIST">
26+
<div class="adv-step">
27+
This National Institute of Standards and Technology (NIST) <b>Science Data Portal</b> provides a
28+
user-friendly discovery and exploration tool for publicly available datasets at NIST. These data
29+
products are generated as part of the NIST mission, spanning multiple
30+
disciplines of scientific, engineering and technology research. NIST's publicly available data
31+
sets showcase its commitment to providing accurate, well-curated measurements of physical
32+
properties, exemplified by the <a href="https://www.nist.gov/srd" target="_blank"
33+
(click)="gaService.gaTrackEvent('outbound', $event, 'Standard Reference Data program')">
34+
Standard Reference Data program</a>, as well as its commitment to advancing basic research.
35+
</div>
36+
<div class="adv-step">
37+
For <a
38+
href="https://www.nist.gov/topics/data/public-access-nist-research/copyright-fair-use-and-licensing-statements-srd-data-and"
39+
target="_blank" (click)="gaService.gaTrackEvent('outbound', $event, 'Fair Use')"><b>Fair
40+
Use</b></a> of these data, please include citation in your works including the Digital
41+
Object
42+
Identifier (DOI). NIST DOIs are registered with the <a href="https://www.datacite.org"
43+
target="_blank" (click)="gaService.gaTrackEvent('outbound', $event, 'DataCite')">DataCite
44+
organization</a> and provide globally unique persistent identifiers. The DOI also serves as
45+
a direct link to data <i>homepages</i> giving access to the full research publication
46+
description and underlying datasets.
47+
</div>
48+
<hr>
49+
<div class="adv-step">
50+
This portal is designed with <a href="https://www.go-fair.org/fair-principles/" target="_blank"
51+
(click)="gaService.gaTrackEvent('outbound', $event, 'FAIR Data')"> FAIR principles</a> and
52+
best practice for <a href="https://strategy.data.gov/" target="_blank"
53+
(click)="gaService.gaTrackEvent('outbound', $event, 'FDS')">Federal Data Strategy</a> (See
54+
<a href="#/policy" target="_blank"
55+
(click)="gaService.gaTrackEvent('outbound', $event, 'Policy')">Policy page</a> for more
56+
details). This portal and related software is hosted in the USNISTGOV organization <a
57+
href="https://github.com/usnistgov/oar-developer" target="_blank"
58+
(click)="gaService.gaTrackEvent('outbound', $event, 'OAR Github')">github repository</a> as
59+
an open source solution.
60+
</div>
61+
</div>
62+
</div>
3163
</div>
32-
</div>
33-
<div class="ui-g-12 ui-md-6 ui-lg-1">
34-
</div>
35-
<div style="width: 100%">
36-
<img style="float:right;width:45%; margin: 1em 2em 0em 0em;" src="./assets/images/AboutNIST-wordcloud_D.jpg" alt="AboutNIST">
37-
</div>
3864
</div>
39-
</div>
4065
</div>

‎angular/src/app/about/about.component.ts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,28 @@
11
import { Component, OnInit } from '@angular/core';
22
import { GoogleAnalyticsService } from '../shared/ga-service/google-analytics.service';
33
import { CommonService } from '../shared/common/common.service';
4+
import { AppConfig, Config } from '../shared/config-service/config-service.service';
45

56
@Component({
67
selector: 'sdp-about',
78
templateUrl: './about.component.html',
89
styleUrls: ['./about.component.css']
910
})
1011
export class AboutComponent implements OnInit {
12+
imageURL: string;
13+
confValues: Config;
1114

12-
constructor(public gaService: GoogleAnalyticsService, public commonService: CommonService) {
15+
constructor(
16+
public gaService: GoogleAnalyticsService,
17+
private appConfig: AppConfig,
18+
public commonService: CommonService)
19+
{
20+
this.confValues = this.appConfig.getConfig();
1321
}
1422

1523
ngOnInit() {
24+
this.imageURL = this.confValues.SDPAPI + 'assets/images/sdp-background.jpg';
25+
1626
}
1727

1828
}

‎angular/src/app/about/about.routes.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { Route } from '@angular/router';
22
import { AboutComponent } from './about.component';
3-
import { SearchTopBarComponent } from '../app.searchtopbar.component';
43

54

65
export const AboutRoutes: Route[] = [
@@ -10,11 +9,6 @@ export const AboutRoutes: Route[] = [
109
{
1110
path: '',
1211
component: AboutComponent
13-
},
14-
{
15-
path: '',
16-
component: SearchTopBarComponent,
17-
outlet: 'route1'
1812
}
1913
]
2014
}

0 commit comments

Comments
 (0)