Revision 51584
Added by Myrto Koukouli about 6 years ago
modules/uoa-repository-dashboard-gui/trunk/app/pages/sources/sources-register/sr-data.component.ts | ||
---|---|---|
13 | 13 |
import {formInfoLoading, loadingRepoError, noInterfacesSaved} from '../../../domain/shared-messages'; |
14 | 14 |
import {ActivatedRoute, Params, Router} from "@angular/router"; |
15 | 15 |
import {MyArray} from "../../../shared/reusablecomponents/forms/my-array.interface"; |
16 |
import { |
|
17 |
AsideHelpContentComponent, |
|
18 |
HelpContentComponent |
|
19 |
} from "../../../shared/reusablecomponents/help-content.component"; |
|
16 | 20 |
|
17 | 21 |
@Component ({ |
18 | 22 |
selector: 'app-sr-data', |
... | ... | |
39 | 43 |
* the param that is used is 'step' and the values are: 'selectDatasource','basicInformation','interfaces','finish' |
40 | 44 |
*/ |
41 | 45 |
queryParams: Params = Object.assign({}, this.route.snapshot.queryParams); |
46 |
@ViewChild('topHelperContent') |
|
47 |
public topHelperContent: HelpContentComponent; |
|
48 |
@ViewChild('leftHelperContent') |
|
49 |
public leftHelperContent: AsideHelpContentComponent; |
|
50 |
@ViewChild('rightHelperContent') |
|
51 |
public rightHelperContent: AsideHelpContentComponent; |
|
52 |
@ViewChild('bottomHelperContent') |
|
53 |
public bottomHelperContent: HelpContentComponent; |
|
42 | 54 |
|
43 | 55 |
|
44 | 56 |
@ViewChild('datasourcesByCountry') |
... | ... | |
91 | 103 |
|
92 | 104 |
moveBackAStep(){ |
93 | 105 |
if(this.showForm) { |
94 |
this.setQueryParam('baseUrl');
|
|
106 |
this.setQueryParam('selectDatasource');
|
|
95 | 107 |
this.showRepositories = true; |
96 | 108 |
this.showForm = false; |
97 | 109 |
this.step2 = ''; |
... | ... | |
177 | 189 |
// set param for step |
178 | 190 |
this.queryParams['step'] = value; |
179 | 191 |
this.router.navigate([], { relativeTo: this.route, queryParams: this.queryParams }); |
192 |
this.rightHelperContent.ngOnInit(); |
|
193 |
this.topHelperContent.ngOnInit(); |
|
194 |
this.leftHelperContent.ngOnInit(); |
|
195 |
this.bottomHelperContent.ngOnInit(); |
|
180 | 196 |
} |
181 | 197 |
|
182 | 198 |
} |
modules/uoa-repository-dashboard-gui/trunk/app/pages/sources/sources-register/sr-journal.component.ts | ||
---|---|---|
7 | 7 |
import {ActivatedRoute, Params, Router} from "@angular/router"; |
8 | 8 |
import {MyArray} from "../../../shared/reusablecomponents/forms/my-array.interface"; |
9 | 9 |
import {noInterfacesSaved} from "../../../domain/shared-messages"; |
10 |
import { |
|
11 |
AsideHelpContentComponent, |
|
12 |
HelpContentComponent |
|
13 |
} from "../../../shared/reusablecomponents/help-content.component"; |
|
10 | 14 |
|
11 | 15 |
@Component ({ |
12 | 16 |
selector: 'app-sr-journal', |
... | ... | |
39 | 43 |
* the param that is used is 'step' and the values are: 'basicInformation','interfaces','finish' |
40 | 44 |
*/ |
41 | 45 |
queryParams: Params = Object.assign({}, this.route.snapshot.queryParams); |
46 |
@ViewChild('topHelperContent') |
|
47 |
public topHelperContent: HelpContentComponent; |
|
48 |
@ViewChild('leftHelperContent') |
|
49 |
public leftHelperContent: AsideHelpContentComponent; |
|
50 |
@ViewChild('rightHelperContent') |
|
51 |
public rightHelperContent: AsideHelpContentComponent; |
|
52 |
@ViewChild('bottomHelperContent') |
|
53 |
public bottomHelperContent: HelpContentComponent; |
|
42 | 54 |
|
43 | 55 |
constructor( |
44 | 56 |
private fb: FormBuilder, |
45 | 57 |
private route: ActivatedRoute, |
46 |
private router: Router,) {}
|
|
58 |
private router: Router) {} |
|
47 | 59 |
|
48 | 60 |
ngOnInit() { |
49 | 61 |
this.setQueryParam('basicInformation'); |
... | ... | |
97 | 109 |
// set param for step |
98 | 110 |
this.queryParams['step'] = value; |
99 | 111 |
this.router.navigate([], { relativeTo: this.route, queryParams: this.queryParams }); |
112 |
this.rightHelperContent.ngOnInit(); |
|
113 |
this.topHelperContent.ngOnInit(); |
|
114 |
this.leftHelperContent.ngOnInit(); |
|
115 |
this.bottomHelperContent.ngOnInit(); |
|
100 | 116 |
} |
101 | 117 |
|
102 | 118 |
} |
modules/uoa-repository-dashboard-gui/trunk/app/pages/sources/sources-register/sr-literature.component.ts | ||
---|---|---|
13 | 13 |
import {formInfoLoading, loadingRepoError, noInterfacesSaved} from '../../../domain/shared-messages'; |
14 | 14 |
import {ActivatedRoute, Params, Router} from "@angular/router"; |
15 | 15 |
import {MyArray} from "../../../shared/reusablecomponents/forms/my-array.interface"; |
16 |
import { |
|
17 |
AsideHelpContentComponent, |
|
18 |
HelpContentComponent |
|
19 |
} from "../../../shared/reusablecomponents/help-content.component"; |
|
16 | 20 |
|
17 | 21 |
@Component ({ |
18 | 22 |
selector:'app-sr-literature', |
... | ... | |
39 | 43 |
* the param that is used is 'step' and the values are: 'selectDatasource','basicInformation','interfaces','finish' |
40 | 44 |
*/ |
41 | 45 |
queryParams: Params = Object.assign({}, this.route.snapshot.queryParams); |
46 |
@ViewChild('topHelperContent') |
|
47 |
public topHelperContent: HelpContentComponent; |
|
48 |
@ViewChild('leftHelperContent') |
|
49 |
public leftHelperContent: AsideHelpContentComponent; |
|
50 |
@ViewChild('rightHelperContent') |
|
51 |
public rightHelperContent: AsideHelpContentComponent; |
|
52 |
@ViewChild('bottomHelperContent') |
|
53 |
public bottomHelperContent: HelpContentComponent; |
|
42 | 54 |
|
43 | 55 |
@ViewChild('datasourcesByCountry') |
44 | 56 |
public datasourcesByCountry: RegisterDatasourceShareableComponent; |
... | ... | |
91 | 103 |
|
92 | 104 |
moveBackAStep(){ |
93 | 105 |
if(this.showForm) { |
94 |
this.setQueryParam('baseUrl');
|
|
106 |
this.setQueryParam('selectDatasource');
|
|
95 | 107 |
this.showRepositories = true; |
96 | 108 |
this.showForm = false; |
97 | 109 |
this.step2 = ''; |
... | ... | |
177 | 189 |
// set param for step |
178 | 190 |
this.queryParams['step'] = value; |
179 | 191 |
this.router.navigate([], { relativeTo: this.route, queryParams: this.queryParams }); |
192 |
this.rightHelperContent.ngOnInit(); |
|
193 |
this.topHelperContent.ngOnInit(); |
|
194 |
this.leftHelperContent.ngOnInit(); |
|
195 |
this.bottomHelperContent.ngOnInit(); |
|
180 | 196 |
} |
181 | 197 |
|
182 | 198 |
} |
modules/uoa-repository-dashboard-gui/trunk/app/pages/sources/sources-register/sr-aggregator.component.ts | ||
---|---|---|
7 | 7 |
import {ActivatedRoute, Params, Router} from "@angular/router"; |
8 | 8 |
import {MyArray} from "../../../shared/reusablecomponents/forms/my-array.interface"; |
9 | 9 |
import {noInterfacesSaved} from "../../../domain/shared-messages"; |
10 |
import { |
|
11 |
AsideHelpContentComponent, |
|
12 |
HelpContentComponent |
|
13 |
} from "../../../shared/reusablecomponents/help-content.component"; |
|
10 | 14 |
|
11 | 15 |
@Component ({ |
12 | 16 |
selector: 'sr-aggregator', |
... | ... | |
30 | 34 |
* the param that is used is 'step' and the values are: 'basicInformation','interfaces','finish' |
31 | 35 |
*/ |
32 | 36 |
queryParams: Params = Object.assign({}, this.route.snapshot.queryParams); |
37 |
@ViewChild('topHelperContent') |
|
38 |
public topHelperContent: HelpContentComponent; |
|
39 |
@ViewChild('leftHelperContent') |
|
40 |
public leftHelperContent: AsideHelpContentComponent; |
|
41 |
@ViewChild('rightHelperContent') |
|
42 |
public rightHelperContent: AsideHelpContentComponent; |
|
43 |
@ViewChild('bottomHelperContent') |
|
44 |
public bottomHelperContent: HelpContentComponent; |
|
33 | 45 |
|
34 | 46 |
@ViewChild ('registerAggregator') |
35 | 47 |
registerAggregator: DatasourceCreateFormComponent; |
... | ... | |
101 | 113 |
// set param for step |
102 | 114 |
this.queryParams['step'] = value; |
103 | 115 |
this.router.navigate([], { relativeTo: this.route, queryParams: this.queryParams }); |
116 |
this.rightHelperContent.ngOnInit(); |
|
117 |
this.topHelperContent.ngOnInit(); |
|
118 |
this.leftHelperContent.ngOnInit(); |
|
119 |
this.bottomHelperContent.ngOnInit(); |
|
104 | 120 |
} |
105 | 121 |
|
106 | 122 |
} |
modules/uoa-repository-dashboard-gui/trunk/app/pages/sources/sources-register.component.html | ||
---|---|---|
23 | 23 |
<div class="uk-margin uk-grid repositoryTypeSelection" uk-grid=""> |
24 | 24 |
<div class="uk-width-expand@m uk-width-1-2@s uk-grid-item-match uk-first-column"> |
25 | 25 |
<div class="uk-text-center uk-card uk-card-default uk-card-hover uk-scrollspy-inview uk-animation-slide-top-medium" uk-scrollspy-class=""> |
26 |
<a routerLink="literature" class="el-link uk-position-cover uk-margin-remove-adjacent"></a>
|
|
26 |
<a [routerLink]="['literature']" [queryParams]="{ step: 'selectDatasource' }" class="el-link uk-position-cover uk-margin-remove-adjacent"></a>
|
|
27 | 27 |
<div class="uk-card-media-top"> |
28 | 28 |
<img class="el-image" src="../../../assets/imgs/Literature_repos_square.png" alt="" style="width: 100%;"> |
29 | 29 |
</div> |
... | ... | |
43 | 43 |
</div> |
44 | 44 |
<div class="uk-width-expand@m uk-width-1-2@s uk-grid-item-match"> |
45 | 45 |
<div class="uk-margin uk-text-center uk-card uk-card-default uk-card-hover uk-scrollspy-inview uk-animation-slide-top-medium" uk-scrollspy-class="" data-id="" style=""> |
46 |
<a routerLink="data" class="el-link uk-position-cover uk-margin-remove-adjacent" href=""></a>
|
|
46 |
<a [routerLink]="['data']" [queryParams]="{ step: 'selectDatasource' }" class="el-link uk-position-cover uk-margin-remove-adjacent" href=""></a>
|
|
47 | 47 |
<div class="uk-card-media-top"> |
48 | 48 |
<img class="el-image" src="../../../assets/imgs/Data_repos_sqare.png" alt="" style="width:100%;"> |
49 | 49 |
</div> |
... | ... | |
63 | 63 |
</div> |
64 | 64 |
<div class="uk-width-expand@m uk-width-1-2@s uk-grid-item-match"> |
65 | 65 |
<div class="uk-margin uk-text-center uk-card uk-card-default uk-card-hover uk-scrollspy-inview uk-animation-slide-top-medium" uk-scrollspy-class="" data-id="" style=""> |
66 |
<a routerLink="journal" class="el-link uk-position-cover uk-margin-remove-adjacent"></a>
|
|
66 |
<a [routerLink]="['journal']" [queryParams]="{ step: 'basicInformation' }" class="el-link uk-position-cover uk-margin-remove-adjacent"></a>
|
|
67 | 67 |
<div class="uk-card-media-top"> |
68 | 68 |
<img class="el-image" src="../../../assets/imgs/OAJournals_square.png" alt="" style="width:100%;"> |
69 | 69 |
</div> |
... | ... | |
82 | 82 |
</div> |
83 | 83 |
<div class="uk-width-expand@m uk-width-1-2@s uk-grid-item-match"> |
84 | 84 |
<div class="uk-margin uk-text-center uk-card uk-card-default uk-card-hover uk-scrollspy-inview uk-animation-slide-top-medium" uk-scrollspy-class="" data-id="" style=""> |
85 |
<a routerLink="aggregator" class="el-link uk-position-cover uk-margin-remove-adjacent"></a>
|
|
85 |
<a [routerLink]="['aggregator']" [queryParams]="{ step: 'basicInformation' }" class="el-link uk-position-cover uk-margin-remove-adjacent"></a>
|
|
86 | 86 |
<div class="uk-card-media-top"> |
87 | 87 |
<img class="el-image" src="../../../assets/imgs/Icons_Aggregators_square.png" alt="" style="width:100%;"> |
88 | 88 |
</div> |
modules/uoa-repository-dashboard-gui/trunk/app/pages/compatibility/compatibility-validate-type.component.html | ||
---|---|---|
4 | 4 |
<h1 class="uk-h2">Run compatibility test</h1> |
5 | 5 |
|
6 | 6 |
<!-- TOP HELP CONTENT --> |
7 |
<!-- <help-content #topHelperContent [position]="'top'"
|
|
8 |
[ngClass]="topHelperContent.isPresent()?'uk-margin-medium-top uk-margin-medium-bottom':'clear-style'">
|
|
9 |
</help-content>-->
|
|
7 |
<help-content #topHelperContent [position]="'top'" |
|
8 |
[ngClass]="topHelperContent.isPresent()?'uk-margin-medium-top uk-margin-medium-bottom':'clear-style'"> |
|
9 |
</help-content>
|
|
10 | 10 |
|
11 | 11 |
<div class="uk-container uk-margin-medium-top uk-margin-medium-bottom"> |
12 | 12 |
<div class="uk-grid"> |
13 | 13 |
|
14 | 14 |
<!-- LEFT HELP CONTENT --> |
15 |
<!-- <aside-help-content #leftHelperContent [position]="'left'"
|
|
16 |
[ngClass]="leftHelperContent.isPresent()?'tm-sidebar uk-width-1-4@m uk-first-column':'clear-style'">
|
|
17 |
</aside-help-content>-->
|
|
15 |
<aside-help-content #leftHelperContent [position]="'left'" |
|
16 |
[ngClass]="leftHelperContent.isPresent()?'tm-sidebar uk-width-1-4@m uk-first-column':'clear-style'"> |
|
17 |
</aside-help-content>
|
|
18 | 18 |
|
19 | 19 |
<!-- MIDDLE --> |
20 | 20 |
<div class=" uk-width-expand@m"> |
... | ... | |
126 | 126 |
|
127 | 127 |
</div> |
128 | 128 |
</div> |
129 |
|
|
130 |
<!-- |
|
131 |
|
|
132 |
<div class="uk-grid uk-grid-stack"> |
|
133 |
<div class="uk-width-expand@m uk-first-column"> |
|
134 |
<div class="uk-margin-medium-bottom"> |
|
135 |
<h1 class="uk-article-title">Run compatibility test</h1> |
|
136 |
</div> |
|
137 |
<div class="wizard"> |
|
138 |
<div class="wizardBreadcrumbs"> |
|
139 |
<div class="steps clearfix"> |
|
140 |
<div class="step active"> |
|
141 |
<div> |
|
142 |
Select datasource |
|
143 |
<span></span> |
|
144 |
</div> |
|
145 |
</div> |
|
146 |
<div class="step {{step2}}"> |
|
147 |
<div> |
|
148 |
Select guidlines |
|
149 |
<span></span> |
|
150 |
</div> |
|
151 |
</div> |
|
152 |
<div class="step {{step3}}"> |
|
153 |
<div> |
|
154 |
Select parameters |
|
155 |
<span></span> |
|
156 |
</div> |
|
157 |
</div> |
|
158 |
<div class="step {{step4}}"> |
|
159 |
<div> |
|
160 |
Finish |
|
161 |
<span></span> |
|
162 |
</div> |
|
163 |
</div> |
|
164 |
</div> |
|
165 |
</div> |
|
166 |
<div class="content"> |
|
167 |
<div> |
|
168 |
<div class="animated fadeInRight stepContent"> |
|
169 |
<div *ngIf="errorMessage" class="uk-alert uk-alert-danger">{{ errorMessage }}</div> |
|
170 |
<div *ngIf="loadingMessage" class="loading-big"> |
|
171 |
<div class="loader-big" style="text-align: center; padding-top: 170px; color: rgb(47, 64, 80); font-weight: bold;"> |
|
172 |
{{ loadingMessage }} |
|
173 |
</div> |
|
174 |
<div class="whiteFilm"></div> |
|
175 |
</div> |
|
176 |
<div *ngIf="showDatasource"> |
|
177 |
<compatibility-validate-step1 #step1ChooseBaseUrl |
|
178 |
[baseUrlList]="baseUrlList" |
|
179 |
(emitObject)="getChosenUrl($event)"></compatibility-validate-step1> |
|
180 |
</div> |
|
181 |
<div *ngIf="showGuidelines"> |
|
182 |
<compatibility-validate-step2 #step2ChooseGuidelines |
|
183 |
[ruleSets]="ruleSets" |
|
184 |
(emitObject)="getChosenRules($event)"> |
|
185 |
</compatibility-validate-step2> |
|
186 |
</div> |
|
187 |
<div *ngIf="showParameters"> |
|
188 |
<compatibility-validate-step3 #step3ChooseParameters |
|
189 |
[valSets]="valSets" |
|
190 |
(emitObject)="getChosenParameters($event)"> |
|
191 |
</compatibility-validate-step3> |
|
192 |
</div> |
|
193 |
<div *ngIf="showCrisEntities"> |
|
194 |
<compatibility-validate-step3-cris #step3ChooseCrisEntities |
|
195 |
(emitObject)="getChosenCrisEntities($event)"> |
|
196 |
</compatibility-validate-step3-cris> |
|
197 |
</div> |
|
198 |
<div *ngIf="showFinish"> |
|
199 |
<div> |
|
200 |
<div class="success"> |
|
201 |
<i class="fa fa-check-circle" style=""></i> |
|
202 |
<h3>Validation has begun</h3> |
|
203 |
</div> |
|
204 |
<div class="uk-alert uk-alert-primary marginTop20 textAlignCenter"> |
|
205 |
You will be notified by email with the results of the compatibility test. |
|
206 |
</div> |
|
207 |
</div> |
|
208 |
</div> |
|
209 |
</div> |
|
210 |
</div> |
|
211 |
</div> |
|
212 |
<div class="wizardActions"> |
|
213 |
<button *ngIf="!showDatasource && !showFinish" class="uk-button uk-button-grey-light" type="button" (click)="moveBackAStep()"> |
|
214 |
<i class="fa fa-angle-double-left"></i> |
|
215 |
Back |
|
216 |
</button> |
|
217 |
<button *ngIf="!showFinish" class="uk-button uk-button-grey-light" type="button" (click)="moveAStep()"> |
|
218 |
<span *ngIf="!showParameters">Next</span> |
|
219 |
<span *ngIf="showParameters" class="uk-link">Finish</span> |
|
220 |
<i class="fa fa-angle-double-right"></i> |
|
221 |
</button> |
|
222 |
</div> |
|
223 |
</div> |
|
224 |
</div> |
|
225 |
<div class="tm-sidebar uk-width-1-4@m"> |
|
226 |
<div *ngIf="showDatasource"> |
|
227 |
<div class="uk-card uk-card-body uk-card-default sidemenu"> |
|
228 |
<h3 class="el-title uk-h3 uk-heading-bullet">Select repository/journal</h3> |
|
229 |
<p class="small"> |
|
230 |
Select from the list, or enter the base OAI URL of the repository/journal. The repository's/journal's published sets are exposed in a later stage and you may select one for the compatibility tests. |
|
231 |
</p> |
|
232 |
</div> |
|
233 |
</div> |
|
234 |
<div *ngIf="showGuidelines"> |
|
235 |
<div class="uk-card uk-card-body uk-card-default sidemenu"> |
|
236 |
<h3 class="el-title uk-h3 uk-heading-bullet">Select guidelines</h3> |
|
237 |
<p class="small"> |
|
238 |
You may apply two types of compatibility tests on your repository: |
|
239 |
</p> |
|
240 |
<ul class="small"> |
|
241 |
<li>Content: specific to the content/format of the dc fields</li> |
|
242 |
<li>Usage: specific to the implementation of OAI-PMH</li> |
|
243 |
</ul> |
|
244 |
<p class="small"> |
|
245 |
You may select from a predifined set of rules (OpenAIRE for Literature Repositories, OpenAIRE for Data Archives) or customize them according to your needs. |
|
246 |
</p> |
|
247 |
</div> |
|
248 |
</div> |
|
249 |
<div *ngIf="showParameters"> |
|
250 |
<div class="uk-card uk-card-body uk-card-default sidemenu"> |
|
251 |
<h3 class="el-title uk-h3 uk-heading-bullet">Select parameters</h3> |
|
252 |
<p class="small"> |
|
253 |
You may define an upper limit on the # of records tested. This is highly recommended for first time users, or when re-checking after the implementation of automated changes. |
|
254 |
</p> |
|
255 |
<p class="small"> |
|
256 |
Select one of the repository's/journal's exposed sets. |
|
257 |
</p> |
|
258 |
<p class="small"> |
|
259 |
You may also group your results by a specific field. This is quite useful when validating an aggregator and you know in advance which is the field that distinguished among data sources. |
|
260 |
</p> |
|
261 |
</div> |
|
262 |
</div> |
|
263 |
</div> |
|
264 |
</div> |
|
265 |
|
|
266 |
--> |
modules/uoa-repository-dashboard-gui/trunk/app/pages/compatibility/compatibility-validate-type.component.ts | ||
---|---|---|
15 | 15 |
import { CompatibilityValidateStep2Component } from './compatibility-validate-forms/compatibility-validate-step2.component'; |
16 | 16 |
import { CompatibilityValidateStep3Component } from './compatibility-validate-forms/compatibility-validate-step3.component'; |
17 | 17 |
import { CompatibilityValidateStep3CrisComponent } from './compatibility-validate-forms/compatibility-validate-step3-cris.component'; |
18 |
import {AsideHelpContentComponent, HelpContentComponent} from "../../shared/reusablecomponents/help-content.component"; |
|
18 | 19 |
|
19 | 20 |
@Component ({ |
20 | 21 |
selector: 'compatibility-validate-literature', |
... | ... | |
29 | 30 |
* the param that is used is 'step' and the values are: 'baseUrl','guidelines','crisEntities'/'parameters','finish' |
30 | 31 |
*/ |
31 | 32 |
queryParams: Params = Object.assign({}, this.route.snapshot.queryParams); |
33 |
@ViewChild('topHelperContent') |
|
34 |
public topHelperContent: HelpContentComponent; |
|
35 |
@ViewChild('leftHelperContent') |
|
36 |
public leftHelperContent: AsideHelpContentComponent; |
|
37 |
@ViewChild('rightHelperContent') |
|
38 |
public rightHelperContent: AsideHelpContentComponent; |
|
39 |
@ViewChild('bottomHelperContent') |
|
40 |
public bottomHelperContent: HelpContentComponent; |
|
32 | 41 |
|
33 | 42 |
|
34 | 43 |
showDatasource: boolean; |
... | ... | |
311 | 320 |
// set param for step |
312 | 321 |
this.queryParams['step'] = value; |
313 | 322 |
this.router.navigate([], { relativeTo: this.route, queryParams: this.queryParams }); |
323 |
this.rightHelperContent.ngOnInit(); |
|
324 |
this.topHelperContent.ngOnInit(); |
|
325 |
this.leftHelperContent.ngOnInit(); |
|
326 |
this.bottomHelperContent.ngOnInit(); |
|
314 | 327 |
} |
315 | 328 |
|
316 | 329 |
} |
modules/uoa-repository-dashboard-gui/trunk/app/pages/content/content-notifications.component.html | ||
---|---|---|
4 | 4 |
<h1 class="uk-h2">Enrich Your Content - Browse Subscriptions</h1> |
5 | 5 |
|
6 | 6 |
<!-- TOP HELP CONTENT --> |
7 |
<!-- <help-content #topHelperContent [position]="'top'"
|
|
7 |
<help-content #topHelperContent [position]="'top'" |
|
8 | 8 |
[ngClass]="topHelperContent.isPresent()?'uk-margin-medium-top uk-margin-medium-bottom':'clear-style'"> |
9 |
</help-content>-->
|
|
9 |
</help-content> |
|
10 | 10 |
|
11 | 11 |
<div class="uk-container uk-margin-medium-top uk-margin-medium-bottom"> |
12 | 12 |
<div class="uk-grid"> |
13 | 13 |
|
14 | 14 |
<!-- LEFT HELP CONTENT --> |
15 |
<!-- <aside-help-content #leftHelperContent [position]="'left'"
|
|
15 |
<aside-help-content #leftHelperContent [position]="'left'" |
|
16 | 16 |
[ngClass]="leftHelperContent.isPresent()?'tm-sidebar uk-width-1-4@m uk-first-column':'clear-style'"> |
17 |
</aside-help-content>-->
|
|
17 |
</aside-help-content> |
|
18 | 18 |
|
19 | 19 |
<!-- MIDDLE --> |
20 | 20 |
<div class=" uk-width-expand@m"> |
modules/uoa-repository-dashboard-gui/trunk/app/pages/landing/landing.component.html | ||
---|---|---|
16 | 16 |
<h4 id="page#7" class="uk-text-center uk-h4 uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style=""> |
17 | 17 |
A one-stop-shop for sharing, finding and enriching your content </h4> |
18 | 18 |
<div class="uk-margin-large uk-text-center uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style=""> |
19 |
<a class="el-content uk-button uk-button-primary" (click)="login()">
|
|
19 |
<a class="el-content uk-button uk-button-primary" (click)="onStartHerePush()">
|
|
20 | 20 |
Start here |
21 | 21 |
</a> |
22 | 22 |
</div> |
modules/uoa-repository-dashboard-gui/trunk/app/pages/landing/landing.component.ts | ||
---|---|---|
12 | 12 |
constructor(private authService: AuthenticationService, private router: Router) { } |
13 | 13 |
|
14 | 14 |
ngOnInit() { |
15 |
this.checkIfIsLoggedIn(); |
|
16 | 15 |
} |
17 | 16 |
|
18 | 17 |
|
... | ... | |
20 | 19 |
this.authService.loginWithState(); |
21 | 20 |
} |
22 | 21 |
|
23 |
checkIfIsLoggedIn() { |
|
24 |
if ( this.authService.getIsUserLoggedIn() ) { |
|
25 |
this.router.navigate(['/dashboard']); |
|
26 |
} |
|
22 |
onStartHerePush() { |
|
23 |
this.router.navigate(['/dashboard']); |
|
27 | 24 |
} |
28 | 25 |
|
29 | 26 |
getIsUserLoggedIn() { |
modules/uoa-repository-dashboard-gui/trunk/app/services/authentication.service.ts | ||
---|---|---|
91 | 91 |
let state = sessionStorage.getItem("state.location"); |
92 | 92 |
sessionStorage.removeItem("state.location"); |
93 | 93 |
console.log(`tried to login - returning to state: ${state}`); |
94 |
if (state.includes('landing')) { |
|
95 |
this.router.navigate([this.baseUrl+"/dashboard"]); |
|
96 |
} else { |
|
97 |
this.router.navigate([state]); |
|
98 |
} |
|
94 |
this.router.navigate([state]); |
|
99 | 95 |
} |
100 |
} else { |
|
101 |
this.isLoggedIn = false; |
|
102 | 96 |
} |
103 | 97 |
} |
104 | 98 |
|
modules/uoa-repository-dashboard-gui/trunk/app/services/repository.service.ts | ||
---|---|---|
88 | 88 |
console.log(`knocking on: ${url}`); |
89 | 89 |
return this.http.get(url) |
90 | 90 |
.map( res => <Repository[]>res.json()) |
91 |
.do(res => console.log(`counted ${res.length} repositories`)) |
|
92 | 91 |
.catch(this.handleError); |
93 | 92 |
} |
94 | 93 |
|
modules/uoa-repository-dashboard-gui/trunk/app/shared/reusablecomponents/help-content.component.ts | ||
---|---|---|
30 | 30 |
|
31 | 31 |
ngOnInit() { |
32 | 32 |
this.errorMessage = null; |
33 |
this._helpContentService.getActivePageContent( this.router.url ).subscribe( |
|
34 |
pageContent => this.shiftThroughContent(pageContent), |
|
35 |
error => this.handleError(<any>error) |
|
36 |
); |
|
33 |
setTimeout(()=>{ |
|
34 |
this._helpContentService.getActivePageContent( this.router.url ).subscribe( |
|
35 |
pageContent => this.shiftThroughContent(pageContent), |
|
36 |
error => this.handleError(<any>error) |
|
37 |
); |
|
38 |
},50); |
|
37 | 39 |
} |
38 | 40 |
|
39 | 41 |
shiftThroughContent(pageContent: PageContent) { |
40 | 42 |
this.contents = pageContent.content[this.position]; |
41 |
console.log(`help-service for ${this.router.url} -> ${this.position} responded: ${JSON.stringify(this.contents)}`);
|
|
43 |
/*console.log(`help-service for ${this.router.url} -> ${this.position} responded: ${JSON.stringify(this.contents)}`);*/
|
|
42 | 44 |
} |
43 | 45 |
|
44 | 46 |
isPresent() { |
modules/uoa-repository-dashboard-gui/trunk/webpack.config.js | ||
---|---|---|
98 | 98 |
"process.env": { |
99 | 99 |
PRODUCTION: JSON.stringify(false), |
100 | 100 |
API_ENDPOINT: JSON.stringify(process.env.API_ENDPOINT || "http://aleka.athenarc.gr:8380/repomanager-service-dev"), |
101 |
FAQ_ENDPOINT: JSON.stringify(process.env.FAQ_ENDPOINT || "http://aleka.athenarc.gr:5555/api"),
|
|
101 |
FAQ_ENDPOINT: JSON.stringify(process.env.FAQ_ENDPOINT || "http://audrey.athenarc.gr:5555/api"),
|
|
102 | 102 |
AAI_ENDPOINT: JSON.stringify(process.env.AAI_ENDPOINT || "http://aleka.athenarc.gr:8380/repomanager-service-dev/openid_connect_login"), |
103 |
FAQ_HOMEPAGE: JSON.stringify(process.env.FAQ_HOMEPAGE || "http://aleka.athenarc.gr:5555"),
|
|
103 |
FAQ_HOMEPAGE: JSON.stringify(process.env.FAQ_HOMEPAGE || "http://audrey.athenarc.gr:5555"),
|
|
104 | 104 |
BASE_URL: JSON.stringify(process.env.FAQ_HOMEPAGE || "http://aleka.athenarc.gr:3000") |
105 | 105 |
} |
106 | 106 |
}) |
... | ... | |
127 | 127 |
"process.env": { |
128 | 128 |
PRODUCTION: JSON.stringify(true), |
129 | 129 |
API_ENDPOINT: JSON.stringify("http://aleka.athenarc.gr:8380/repomanager-service-dev"), |
130 |
FAQ_ENDPOINT: JSON.stringify("http://aleka.athenarc.gr:5555/api"),
|
|
130 |
FAQ_ENDPOINT: JSON.stringify("http://audrey.athenarc.gr:5555/api"),
|
|
131 | 131 |
AAI_ENDPOINT: JSON.stringify("http://aleka.athenarc.gr:8380/repomanager-service-dev/openid_connect_login"), |
132 |
FAQ_HOMEPAGE: JSON.stringify("http://aleka.athenarc.gr:5555"),
|
|
132 |
FAQ_HOMEPAGE: JSON.stringify("http://audrey.athenarc.gr:5555"),
|
|
133 | 133 |
BASE_URL: JSON.stringify("http://aleka.athenarc.gr:3000") |
134 | 134 |
} |
135 | 135 |
}) |
Also available in: Unified diff
final commit before first deployment