Project

General

Profile

« Previous | Next » 

Revision 58110

Refactored the landing page to become home and to have a second about page as well

View differences:

modules/uoa-repository-dashboard-gui/branches/new-ui/src/app/pages/sources/sources-register.component.ts
1
/*
2
*  created by myrto
3
*/
4

  
5

  
6 1
import { Component, OnInit } from '@angular/core';
7 2

  
8 3
@Component({
modules/uoa-repository-dashboard-gui/branches/new-ui/src/app/pages/landing/landing.component.html
1
<div>
2
  <div class="image-front-topbar  uk-section-default"
3
       uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">
4
    <div style="background-image: url('../../../assets/imgs/KOJu48AA.jpeg'); background-color: rgb(255, 255, 255); box-sizing: border-box; min-height: calc(-101.35px + 100vh);"
5
         class="uk-background-norepeat uk-background-cover uk-background-top-center uk-background-fixed uk-section uk-padding-remove-bottom uk-flex uk-flex-middle" uk-height-viewport="offset-top: true;offset-bottom: 20">
6
      <div class="uk-width-1-1">
7
        <div class="uk-margin-medium uk-grid uk-grid-stack" uk-grid="">
8
          <div class="uk-width-1-1@m">
9
          </div>
10
        </div>
11
        <div class="uk-container uk-container-large uk-margin-large">
12
          <div class="uk-sticky-placeholder" style="height: 84px; margin: 0px;"></div>
13
          <div class="search_box_bg uk-grid-large uk-flex-middle uk-grid uk-grid-stack" uk-grid="">
14
            <div class="el-overlay uk-panel uk-width-xlarge uk-dark">
15
              <h1 class="el-title uk-margin uk-heading-hero provide">Content Provider Dashboard</h1>
16
              <div class="el-content uk-margin"><h2 style="color:#1a1a1a!important">A one-stop-shop for sharing, finding and enriching your content</h2></div>
17
              <p><a (click)="goToPage('/dashboard')" class="el-link uk-button uk-button-primary">Start here</a></p>
18
            </div>
19
          </div>
20
        </div>
21
      </div>
22
    </div>
23
  </div>
24

  
25
  <div class="uk-section-default uk-section uk-section-small">
26
    <div class="uk-container uk-container-large">
27
      <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
28
        <div class="uk-width-1-1@m uk-first-column">
29
          <div class="uk-margin uk-text-center uk-child-width-1-1 uk-grid-match uk-child-width-1-1@s uk-child-width-1-4@m uk-child-width-1-4@l uk-grid-large uk-grid" uk-grid="">
30
            <div class="uk-first-column">
31
              <div class="el-item uk-card uk-card-hover uk-card-small uk-card-body">
32
                <a (click)="goToPage('/compatibility/validate')" class="el-link uk-margin-remove-adjacent"></a>
33
                <img src="../../../assets/imgs/Path%20163.svg" class="el-image" alt="" uk-svg="" hidden="true">
34
                <h3 class="el-title uk-margin uk-h3">Validate</h3>
35
                <!--<div class="el-content uk-margin uk-text-lead">-->
36
                <div class="el-content uk-margin">
37
                  <p><strong>Interoperable metadata is key for effective content sharing.</strong></p>
38
                  <p>Use our validation service and see how you can apply the OpenAIRE Guidelines to expose your content using global standards.</p>
39
                </div>
40
              </div>
41
            </div>
42
            <div class="">
43
              <div class="el-item uk-card uk-card-hover uk-card-small uk-card-body">
44
                <a (click)="goToPage('/sources/register')" class="el-link uk-margin-remove-adjacent"></a>
45
                <img src="../../../assets/imgs/Group%20987.svg" class="el-image" alt="" uk-svg="" hidden="true">
46
                <h3 class="el-title uk-margin uk-h3" style="margin-top: 26px !important;">Register</h3>
47
                <div class="el-content uk-margin">
48
                  <p><strong>Reach a wider audience around the world</strong></p>
49
                  <p>Register your literature or data repository, OA Journal, CRIS in OpenAIRE and be part of a global interlinked network. Start now!</p>
50
                </div>
51
              </div>
52
            </div>
53
            <div class="">
54
              <div class="el-item uk-card uk-card-hover uk-card-small uk-card-body">
55
                <a (click)="goToPage('/content/events')" class="el-link uk-margin-remove-adjacent"></a>
56
                <img src="../../../assets/imgs/Group%20409.svg" class="el-image" alt="" uk-svg="" hidden="true">
57
                <h3 class="el-title uk-margin uk-h3">Enrich</h3>
58
                <div class="el-content uk-margin">
59
                  <p><strong>Improve your metadata. Get more connections</strong></p>
60
                  <p>Our newly released OA Broker service offers a wealth of information on scholarly communication data. Find out what interests you and subscribe to enrich your records. Learn more!</p>
61
                </div>
62
              </div>
63
            </div>
64
            <div class="">
65
              <div class="el-item uk-card uk-card-hover uk-card-small uk-card-body">
66
                <a (click)="goToPage('/getImpact')" class="el-link uk-margin-remove-adjacent"></a>
67
                <img src="../../../assets/imgs/Group%20410.svg" class="el-image" alt="" uk-svg="" hidden="true">
68
                <h3 class="el-title uk-margin uk-h3" style="margin-top: 34px !important;">Measure</h3>
69
                <div class="el-content uk-margin">
70
                  <p><strong>Open research impact empowers Open Science</strong></p>
71
                  <p>Participate in the Open Metrics service by sharing your usage data. Get the benefit of an aggregated environment to broaden the mechanisms for impact assesment. Learn more!</p>
72
                </div>
73
              </div>
74
            </div>
75
          </div>
76
          <div class="uk-margin-medium uk-text-center uk-scrollspy-inview uk-animation-slide-top-medium" uk-scrollspy-class="" style="">
77
            <a (click)="goToPage('/dashboard')" class="el-content uk-button uk-button-primary">
78
              Get Started
79
            </a>
80
          </div>
81
        </div>
82
      </div>
83
    </div>
84
  </div>
85

  
86
  <div class="uk-section-muted uk-section uk-section-small">
87
    <div class="uk-container uk-container-large">
88
      <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
89
        <div class="uk-width-1-1@m uk-first-column">
90
          <div class="uk-margin uk-child-width-1-1 uk-grid-match uk-child-width-1-1@s uk-child-width-1-2@m
91
            uk-child-width-1-2@l uk-grid-large uk-grid uk-grid-divider provide" uk-grid="">
92
            <div class="uk-first-column uk-text-center">
93
              <div class="el-item uk-card uk-card-small uk-card-body">
94
                <img src="../../../assets/imgs/Group%20599.svg" class="el-image" alt="" uk-svg="" hidden="true">
95
                <h3 class="el-title uk-margin uk-h3">Have more questions?</h3>
96
              </div>
97
            </div>
98
            <div class="questions">
99
              <div class="el-item uk-card uk-card-small uk-card-body">
100
                <ul class="uk-list uk-list-divider">
101
                  <!--<li><a href="https://www.openaire.eu/os-primers">Learn about open science policies and how to align</a></li>-->
102
                  <!--<li><a href="https://www.openaire.eu/rdm-handbook">Learn more on how to manage your data in the open science era</a></li>-->
103
                  <!--<li><a href="https://www.openaire.eu/guides/">Find out how to use OpenAIRE to best serve your needs</a></li>-->
104
                  <!--<li><a href="https://www.openaire.eu/webinars/">View our training material on a variety of related topics</a></li>-->
105
                  <!--<li><a href="https://www.openaire.eu/contact-us/">Contact us</a></li>-->
106
                  <li><a href="https://www.openaire.eu/validator-registration-guide">Learn how to validate and register your repository</a></li>
107
                  <li><a href="https://www.openaire.eu/guides">Find out how to use OpenAIRE to best serve your needs</a></li>
108
                  <li><a href="https://www.openaire.eu/category/content-providers">View our training material for Content Providers</a></li>
109
                  <li><a href="https://guidelines.openaire.eu/en/latest/">Follow the OpenAIRE Guidelines</a></li>
110
                  <li><a href="https://www.openaire.eu/contact-us/">Contact us</a></li>
111
                </ul>
112
              </div>
113
            </div>
114
          </div>
115
        </div>
116
      </div>
117
    </div>
118
  </div>
119

  
120
  <div class="uk-section-default uk-section">
121
    <div class="uk-container">
122
      <div class="uk-grid-medium uk-margin-medium uk-grid" uk-grid="">
123
        <div class="uk-width-2-3@m uk-first-column">
124
          <div class="uk-margin-medium-top uk-panel">
125
            <h3 class="el-title uk-margin uk-h3">
126
              Our community
127
            </h3>
128
            <hr class="uk-divider-small uk-text-left provide">
129

  
130
            <div class="uk-grid uk-margin-medium-top">
131

  
132
              <div class="uk-width-expand@m">
133
                <p class="uk-margin-medium-bottom">
134
                  <span class="emphasis provide">{{ (statisticsNumbers && statisticsNumbers.literature) ? (statisticsNumbers.literature | number) : 'N/A' }}</span><br>
135
                  <span class="uk-text-uppercase">literature repositories</span>
136
                </p>
137
                <p>
138
                  <span class="emphasis provide">{{ (statisticsNumbers && statisticsNumbers.journal) ? (statisticsNumbers.journal | number) : 'N/A' }}</span><br>
139
                  <span class="uk-text-uppercase">OA Journals</span>
140
                </p>
141
              </div>
142
              <div class="uk-width-expand@m">
143
                <p class="uk-margin-medium-bottom">
144
                  <span class="emphasis provide">{{ (statisticsNumbers && statisticsNumbers.dataRepositories) ? (statisticsNumbers.dataRepositories | number) : 'N/A' }}</span><br>
145
                  <span class="uk-text-uppercase">data repositories</span>
146
                </p>
147
                <p>
148
                  <span class="emphasis provide">{{ (statisticsNumbers && statisticsNumbers.aggregators) ? (statisticsNumbers.aggregators | number) : 'N/A' }}</span><br>
149
                  <span class="uk-text-uppercase">aggregators</span>
150
                </p>
151
              </div>
152

  
153
            </div>
154

  
155
            <div class="uk-grid">
156

  
157
              <div class="uk-width-expand@m">
158
                <p>
159
                  <span class="emphasis">{{ (statisticsNumbers && statisticsNumbers.publications) ? (statisticsNumbers.publications | number) : 'N/A' }}</span>
160
                  <span class="uk-text-uppercase"> publications</span>
161
                </p>
162
                <p>
163
                  <span class="emphasis">{{ (statisticsNumbers && statisticsNumbers.datasets) ? (statisticsNumbers.datasets | number) : 'N/A' }}</span>
164
                  <span class="uk-text-uppercase"> datasets</span>
165
                </p>
166
                <p>
167
                  <span class="emphasis">{{ (statisticsNumbers && statisticsNumbers.software) ? (statisticsNumbers.software | number) : 'N/A' }}</span>
168
                  <span class="uk-text-uppercase"> software</span>
169
                </p>
170
              </div>
171
              <div class="uk-width-expand@m">
172
                <p>
173
                  <span class="emphasis">{{ statisticsNumbers ? (statisticsNumbers.lastYearUsagestats.number | number) : 'N/A' }}</span>
174
                  <span class="uk-text-uppercase"> usage events
175
                  ({{ statisticsNumbers ? statisticsNumbers.lastYearUsagestats.year : 'N/A' }})</span>
176
                </p>
177
                <p>
178
                  <span class="emphasis">
179
                    {{ (statisticsNumbers && statisticsNumbers.usagestats) ? statisticsNumbers.usagestats : 'N/A' }}
180
                  </span>
181
                  <span class="uk-text-uppercase"> metadata exchange events</span>
182
                </p>
183
              </div>
184

  
185
            </div>
186
          </div>
187
        </div>
188
        <div class="uk-width-expand@m">
189

  
190
          <div class="uk-card uk-card-body uk-card-provide">
191

  
192
            <h3 class="uk-margin-remove-top uk-h3">
193
              <span class="">Our data policies</span>
194
            </h3>
195
            <hr class="uk-divider-small uk-text-left">
196

  
197
            <ul class="uk-margin-small uk-list uk-list-large uk-margin-medium-bottom">
198
              <li class="el-item uk-margin-medium-bottom">
199
                <h5 class="el-title uk-h5">Data acquisition</h5>
200
                <div class="el-content">
201
                  <span>How we retrieve data, how often, what processes it goes through (aggregating cleaning, transforming, inferring, de-duplicating), what are the quality checks&nbsp;along all&nbsp; data processing stages.</span>
202
                </div>
203
              </li>
204
              <li class="el-item">
205
                <h5 class="el-title uk-h5">Data usage</h5>
206
                <div class="el-content">
207
                  <span>Who is able to retrieve our data, what are the licences, what about specific SLAs.</span>
208
                </div>
209
              </li>
210
            </ul>
211
            <div class="uk-margin uk-margin-remove-bottom uk-text-left">
212
              <h6 class="uk-h6">
213
                <a class="el-content uk-link-text" href="https://www.openaire.eu/data-aquisition-policy" target="_blank">
214
                  Learn more
215
                </a>
216
              </h6>
217
            </div>
218
          </div>
219

  
220

  
221
        </div>
222
      </div>
223
    </div>
224
  </div>
225

  
226

  
227
  <div class="uk-section-muted" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}">
228
    <div class="uk-container uk-container-large">
229
      <div class="uk-grid uk-margin-large-top uk-margin-large-bottom" uk-grid="">
230
        <div class="uk-width-expand@m uk-width-1-2@s uk-dark uk-grid-item-match uk-first-column explore">
231
          <div class="uk-margin uk-panel uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
232
            <h4 class="el-title uk-margin uk-h4">
233
              Researcher?
234
            </h4>
235
            <div class="el-content uk-margin">
236
              Explore all OA research results. Link all your research. Build your profile
237
            </div>
238
            <p>
239
              <a href="https://{{ inBeta ? 'beta.' : '' }}explore.openaire.eu" class="el-link uk-button uk-button-default" target="_blank">
240
                OpenAIRE.EXPLORE
241
              </a>
242
            </p>
243
          </div>
244
        </div>
245
        <div class="uk-width-expand@m uk-width-1-2@s uk-dark uk-grid-item-match connect">
246
          <div class="uk-margin uk-panel uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
247
            <h4 class="el-title uk-margin uk-h4">
248
              Research community?
249
            </h4>
250
            <div class="el-content uk-margin">
251
              Use a trusted partner to share, link, disseminate and monitor your research.
252
            </div>
253
            <p>
254
              <a href="https://{{ inBeta ? 'beta.' : '' }}connect.openaire.eu" class="el-link uk-button uk-button-default" target="_blank">
255
                OpenAIRE.CONNECT
256
              </a>
257
            </p>
258
          </div>
259
        </div>
260
        <div class="uk-width-expand@m uk-width-1-2@s uk-dark uk-grid-item-match monitor">
261
          <div class="uk-margin uk-panel uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
262
            <h4 class="el-title uk-margin uk-h4">
263
              Research manager?
264
            </h4>
265
            <div class="el-content uk-margin">
266
              Use our monitoring services and easily track all relevant research results.
267
            </div>
268
            <p>
269
              <a href="https://monitor.openaire.eu" class="el-link uk-button uk-button-default" target="_blank">
270
                OpenAIRE.MONITOR
271
              </a>
272
            </p>
273
          </div>
274
        </div>
275
        <div class="uk-width-expand@m uk-width-1-2@s uk-dark uk-grid-item-match develop">
276
          <div class="uk-margin uk-panel uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
277
            <h4 class="el-title uk-margin uk-h4">
278
              Developer?
279
            </h4>
280
            <div class="el-content uk-margin">
281
              Get access to OpenAIRE data and capitalize on on Europe's open linked research
282
            </div>
283
            <p>
284
              <a href="https://develop.openaire.eu" class="el-link uk-button uk-button-default" target="_blank">
285
                OpenAIRE.DEVELOP
286
              </a>
287
            </p>
288
          </div>
289
        </div>
290
      </div>
291
    </div>
292
  </div>
293

  
294
</div>
295 0

  
modules/uoa-repository-dashboard-gui/branches/new-ui/src/app/pages/landing/landing.component.ts
1
import { Component, OnInit, ViewEncapsulation } from '@angular/core';
2
import { UsageStatsSummary } from '../../domain/typeScriptClasses';
3
import { AuthenticationService } from '../../services/authentication.service';
4
import { StatisticsService } from '../../services/statistics.service';
5
import { Router } from '@angular/router';
6

  
7
@Component ({
8
  selector: 'app-landing',
9
  templateUrl: './landing.component.html',
10
  styleUrls: ['../../../assets/css/landingpage/theme.css','../../../assets/css/landingpage/custom.css','../../../assets/css/landingpage/custom-provide.css'],
11
})
12

  
13
export class LandingComponent implements OnInit {
14

  
15
  statisticsNumbers: UsageStatsSummary;
16
  inBeta: boolean;
17

  
18

  
19
  constructor(private authService: AuthenticationService,
20
              private statsService: StatisticsService,
21
              private router: Router) { }
22

  
23
  ngOnInit() {
24
    this.getStatisticsNumbers();
25

  
26
    const baseUrl = window.location.origin;
27
    this.inBeta = ( baseUrl.includes('beta') || baseUrl.includes('athenarc') );
28

  
29
    let body = document.getElementsByTagName('body')[0];
30
    body.classList.remove("dashboard");
31
    body.classList.add("landing");
32
  }
33

  
34

  
35
  login() {
36
    this.authService.loginWithState();
37
  }
38

  
39
  getStatisticsNumbers() {
40
    this.statsService.getStatisticsNumbers().subscribe(
41
      res => {
42
        this.statisticsNumbers = res;
43
        // this.statisticsNumbers.lastYearUsagestats = JSON.parse(res['lastYearUsagestats'].toString());
44
      },
45
      error => console.log(error),
46
      () => {
47
        console.log('statisticsNumbers is', JSON.stringify(this.statisticsNumbers));
48
      }
49
    );
50
  }
51

  
52
  goToPage(pageUrl: string) {
53
    if (this.authService.getIsUserLoggedIn()) {
54
      this.router.navigate([pageUrl]);
55
    } else {
56
      this.authService.redirectUrl = pageUrl;
57
      this.login();
58
    }
59
  }
60

  
61
}
62 0

  
modules/uoa-repository-dashboard-gui/branches/new-ui/src/app/pages/landing/home/home.component.html
1
<div>
2
  <div class="image-front-topbar  uk-section-default"
3
       uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">
4
    <!--<div style="background-image: url('../../../../assets/imgs/KOJu48AA.jpeg'); background-color: rgb(255, 255, 255); box-sizing: border-box; min-height: calc(-101.35px + 100vh);"-->
5
    <div style="background: transparent linear-gradient(0deg, #F7F7F7 0%, #E2EEFA 100%) 0% 0% no-repeat padding-box; box-sizing: border-box; min-height: calc(-101.35px + 100vh);"
6
         class="uk-background-norepeat uk-background-cover uk-background-top-center uk-background-fixed uk-section uk-padding-remove-bottom uk-flex uk-flex-middle" uk-height-viewport="offset-top: true;offset-bottom: 20">
7
      <div class="uk-width-1-1">
8
        <div class="uk-margin-medium uk-grid uk-grid-stack" uk-grid="">
9
          <div class="uk-width-1-1@m">
10
          </div>
11
        </div>
12
        <div class="uk-container uk-container-large uk-margin-large">
13
          <div class="uk-sticky-placeholder" style="height: 84px; margin: 0px;"></div>
14
          <div class="search_box_bg uk-grid-large uk-flex-middle uk-grid uk-grid-stack" uk-grid="">
15
            <div class="el-overlay uk-panel uk-width-1-1 uk-dark uk-text-center">
16

  
17
              <h1 class="uk-margin provideLanding">Find, Share and Enrich your content.</h1>
18

  
19
              <div class="uk-container uk-container-xsmall uk-container-center">
20
                <div class="uk-margin-medium-top uk-margin-medium-left uk-margin-medium-right" style="color:#707070!important; font-size: 16px;">The Provide Dashboard is a one-stop-shop web service where the OpenAIRE content providers interact with OpenAIRE research graph and infrastructure.</div>
21
              </div>
22

  
23
              <div class="uk-container uk-container-large uk-container-center">
24
                <div class="uk-grid uk-child-width-1-3@l">
25
                  <div class="">
26
                    <img src="../../../../assets/imgs/landing/provide.png">
27
                  </div>
28
                  <div style="display: flex; align-items: center; justify-content: center">
29
                    <a (click)="goToPage('/dashboard')" class="el-link uk-button uk-button-primary">Sign In</a>
30
                  </div>
31
                </div>
32

  
33
              </div>
34

  
35
              <!--<div class="el-content uk-margin"><h2 style="color:#1a1a1a!important">A one-stop-shop for sharing, finding and enriching your content</h2></div>-->
36
              <!--<p><a (click)="goToPage('/dashboard')" class="el-link uk-button uk-button-primary">Sign In</a></p>-->
37
            </div>
38
          </div>
39
        </div>
40
      </div>
41
    </div>
42
  </div>
43

  
44
  <div class="uk-section-default uk-section uk-section-small">
45
    <div class="uk-container uk-container-large">
46
      <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
47
        <div class="uk-width-1-1@m uk-first-column">
48
          <div class="uk-margin uk-text-center uk-child-width-1-1 uk-grid-match uk-child-width-1-1@s uk-child-width-1-4@m uk-child-width-1-4@l uk-grid-large uk-grid" uk-grid="">
49
            <div class="uk-first-column">
50
              <div class="el-item uk-card uk-card-hover uk-card-small uk-card-body">
51
                <a (click)="goToPage('/compatibility/validate')" class="el-link uk-margin-remove-adjacent"></a>
52
                <img src="../../../../assets/imgs/Path%20163.svg" class="el-image" alt="" uk-svg="" hidden="true">
53
                <h3 class="el-title uk-margin uk-h3">Validate</h3>
54
                <!--<div class="el-content uk-margin uk-text-lead">-->
55
                <div class="el-content uk-margin">
56
                  <p><strong>Interoperable metadata is key for effective content sharing.</strong></p>
57
                  <p>Use our validation service and see how you can apply the OpenAIRE Guidelines to expose your content using global standards.</p>
58
                </div>
59
              </div>
60
            </div>
61
            <div class="">
62
              <div class="el-item uk-card uk-card-hover uk-card-small uk-card-body">
63
                <a (click)="goToPage('/sources/register')" class="el-link uk-margin-remove-adjacent"></a>
64
                <img src="../../../../assets/imgs/Group%20987.svg" class="el-image" alt="" uk-svg="" hidden="true">
65
                <h3 class="el-title uk-margin uk-h3" style="margin-top: 26px !important;">Register</h3>
66
                <div class="el-content uk-margin">
67
                  <p><strong>Reach a wider audience around the world</strong></p>
68
                  <p>Register your literature or data repository, OA Journal, CRIS in OpenAIRE and be part of a global interlinked network. Start now!</p>
69
                </div>
70
              </div>
71
            </div>
72
            <div class="">
73
              <div class="el-item uk-card uk-card-hover uk-card-small uk-card-body">
74
                <a (click)="goToPage('/content/events')" class="el-link uk-margin-remove-adjacent"></a>
75
                <img src="../../../../assets/imgs/Group%20409.svg" class="el-image" alt="" uk-svg="" hidden="true">
76
                <h3 class="el-title uk-margin uk-h3">Enrich</h3>
77
                <div class="el-content uk-margin">
78
                  <p><strong>Improve your metadata. Get more connections</strong></p>
79
                  <p>Our newly released OA Broker service offers a wealth of information on scholarly communication data. Find out what interests you and subscribe to enrich your records. Learn more!</p>
80
                </div>
81
              </div>
82
            </div>
83
            <div class="">
84
              <div class="el-item uk-card uk-card-hover uk-card-small uk-card-body">
85
                <a (click)="goToPage('/getImpact')" class="el-link uk-margin-remove-adjacent"></a>
86
                <img src="../../../../assets/imgs/Group%20410.svg" class="el-image" alt="" uk-svg="" hidden="true">
87
                <h3 class="el-title uk-margin uk-h3" style="margin-top: 34px !important;">Measure</h3>
88
                <div class="el-content uk-margin">
89
                  <p><strong>Open research impact empowers Open Science</strong></p>
90
                  <p>Participate in the Open Metrics service by sharing your usage data. Get the benefit of an aggregated environment to broaden the mechanisms for impact assesment. Learn more!</p>
91
                </div>
92
              </div>
93
            </div>
94
          </div>
95
          <div class="uk-margin-medium uk-text-center uk-scrollspy-inview uk-animation-slide-top-medium" uk-scrollspy-class="" style="">
96
            <a (click)="goToPage('/dashboard')" class="el-content uk-button uk-button-primary">
97
              Get Started
98
            </a>
99
          </div>
100
        </div>
101
      </div>
102
    </div>
103
  </div>
104

  
105
  <div class="uk-section-muted uk-section uk-section-small">
106
    <div class="uk-container uk-container-large">
107
      <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
108
        <div class="uk-width-1-1@m uk-first-column">
109
          <div class="uk-margin uk-child-width-1-1 uk-grid-match uk-child-width-1-1@s uk-child-width-1-2@m
110
            uk-child-width-1-2@l uk-grid-large uk-grid uk-grid-divider provide" uk-grid="">
111
            <div class="uk-first-column uk-text-center">
112
              <div class="el-item uk-card uk-card-small uk-card-body">
113
                <img src="../../../../assets/imgs/Group%20599.svg" class="el-image" alt="" uk-svg="" hidden="true">
114
                <h3 class="el-title uk-margin uk-h3">Have more questions?</h3>
115
              </div>
116
            </div>
117
            <div class="questions">
118
              <div class="el-item uk-card uk-card-small uk-card-body">
119
                <ul class="uk-list uk-list-divider">
120
                  <!--<li><a href="https://www.openaire.eu/os-primers">Learn about open science policies and how to align</a></li>-->
121
                  <!--<li><a href="https://www.openaire.eu/rdm-handbook">Learn more on how to manage your data in the open science era</a></li>-->
122
                  <!--<li><a href="https://www.openaire.eu/guides/">Find out how to use OpenAIRE to best serve your needs</a></li>-->
123
                  <!--<li><a href="https://www.openaire.eu/webinars/">View our training material on a variety of related topics</a></li>-->
124
                  <!--<li><a href="https://www.openaire.eu/contact-us/">Contact us</a></li>-->
125
                  <li><a href="https://www.openaire.eu/validator-registration-guide">Learn how to validate and register your repository</a></li>
126
                  <li><a href="https://www.openaire.eu/guides">Find out how to use OpenAIRE to best serve your needs</a></li>
127
                  <li><a href="https://www.openaire.eu/category/content-providers">View our training material for Content Providers</a></li>
128
                  <li><a href="https://guidelines.openaire.eu/en/latest/">Follow the OpenAIRE Guidelines</a></li>
129
                  <li><a href="https://www.openaire.eu/contact-us/">Contact us</a></li>
130
                </ul>
131
              </div>
132
            </div>
133
          </div>
134
        </div>
135
      </div>
136
    </div>
137
  </div>
138

  
139
  <div class="uk-section-default uk-section">
140
    <div class="uk-container">
141
      <div class="uk-grid-medium uk-margin-medium uk-grid" uk-grid="">
142
        <div class="uk-width-2-3@m uk-first-column">
143
          <div class="uk-margin-medium-top uk-panel">
144
            <h3 class="el-title uk-margin uk-h3">
145
              Our community
146
            </h3>
147
            <hr class="uk-divider-small uk-text-left provide">
148

  
149
            <div class="uk-grid uk-margin-medium-top">
150

  
151
              <div class="uk-width-expand@m">
152
                <p class="uk-margin-medium-bottom">
153
                  <span class="emphasis provide">{{ (statisticsNumbers && statisticsNumbers.literature) ? (statisticsNumbers.literature | number) : 'N/A' }}</span><br>
154
                  <span class="uk-text-uppercase">literature repositories</span>
155
                </p>
156
                <p>
157
                  <span class="emphasis provide">{{ (statisticsNumbers && statisticsNumbers.journal) ? (statisticsNumbers.journal | number) : 'N/A' }}</span><br>
158
                  <span class="uk-text-uppercase">OA Journals</span>
159
                </p>
160
              </div>
161
              <div class="uk-width-expand@m">
162
                <p class="uk-margin-medium-bottom">
163
                  <span class="emphasis provide">{{ (statisticsNumbers && statisticsNumbers.dataRepositories) ? (statisticsNumbers.dataRepositories | number) : 'N/A' }}</span><br>
164
                  <span class="uk-text-uppercase">data repositories</span>
165
                </p>
166
                <p>
167
                  <span class="emphasis provide">{{ (statisticsNumbers && statisticsNumbers.aggregators) ? (statisticsNumbers.aggregators | number) : 'N/A' }}</span><br>
168
                  <span class="uk-text-uppercase">aggregators</span>
169
                </p>
170
              </div>
171

  
172
            </div>
173

  
174
            <div class="uk-grid">
175

  
176
              <div class="uk-width-expand@m">
177
                <p>
178
                  <span class="emphasis">{{ (statisticsNumbers && statisticsNumbers.publications) ? (statisticsNumbers.publications | number) : 'N/A' }}</span>
179
                  <span class="uk-text-uppercase"> publications</span>
180
                </p>
181
                <p>
182
                  <span class="emphasis">{{ (statisticsNumbers && statisticsNumbers.datasets) ? (statisticsNumbers.datasets | number) : 'N/A' }}</span>
183
                  <span class="uk-text-uppercase"> datasets</span>
184
                </p>
185
                <p>
186
                  <span class="emphasis">{{ (statisticsNumbers && statisticsNumbers.software) ? (statisticsNumbers.software | number) : 'N/A' }}</span>
187
                  <span class="uk-text-uppercase"> software</span>
188
                </p>
189
              </div>
190
              <div class="uk-width-expand@m">
191
                <p>
192
                  <span class="emphasis">{{ statisticsNumbers ? (statisticsNumbers.lastYearUsagestats.number | number) : 'N/A' }}</span>
193
                  <span class="uk-text-uppercase"> usage events
194
                  ({{ statisticsNumbers ? statisticsNumbers.lastYearUsagestats.year : 'N/A' }})</span>
195
                </p>
196
                <p>
197
                  <span class="emphasis">
198
                    {{ (statisticsNumbers && statisticsNumbers.usagestats) ? statisticsNumbers.usagestats : 'N/A' }}
199
                  </span>
200
                  <span class="uk-text-uppercase"> metadata exchange events</span>
201
                </p>
202
              </div>
203

  
204
            </div>
205
          </div>
206
        </div>
207
        <div class="uk-width-expand@m">
208

  
209
          <div class="uk-card uk-card-body uk-card-provide">
210

  
211
            <h3 class="uk-margin-remove-top uk-h3">
212
              <span class="">Our data policies</span>
213
            </h3>
214
            <hr class="uk-divider-small uk-text-left">
215

  
216
            <ul class="uk-margin-small uk-list uk-list-large uk-margin-medium-bottom">
217
              <li class="el-item uk-margin-medium-bottom">
218
                <h5 class="el-title uk-h5">Data acquisition</h5>
219
                <div class="el-content">
220
                  <span>How we retrieve data, how often, what processes it goes through (aggregating cleaning, transforming, inferring, de-duplicating), what are the quality checks&nbsp;along all&nbsp; data processing stages.</span>
221
                </div>
222
              </li>
223
              <li class="el-item">
224
                <h5 class="el-title uk-h5">Data usage</h5>
225
                <div class="el-content">
226
                  <span>Who is able to retrieve our data, what are the licences, what about specific SLAs.</span>
227
                </div>
228
              </li>
229
            </ul>
230
            <div class="uk-margin uk-margin-remove-bottom uk-text-left">
231
              <h6 class="uk-h6">
232
                <a class="el-content uk-link-text" href="https://www.openaire.eu/data-aquisition-policy" target="_blank">
233
                  Learn more
234
                </a>
235
              </h6>
236
            </div>
237
          </div>
238

  
239

  
240
        </div>
241
      </div>
242
    </div>
243
  </div>
244

  
245

  
246
  <div class="uk-section-muted" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}">
247
    <div class="uk-container uk-container-large">
248
      <div class="uk-grid uk-margin-large-top uk-margin-large-bottom" uk-grid="">
249
        <div class="uk-width-expand@m uk-width-1-2@s uk-dark uk-grid-item-match uk-first-column explore">
250
          <div class="uk-margin uk-panel uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
251
            <h4 class="el-title uk-margin uk-h4">
252
              Researcher?
253
            </h4>
254
            <div class="el-content uk-margin">
255
              Explore all OA research results. Link all your research. Build your profile
256
            </div>
257
            <p>
258
              <a href="https://{{ inBeta ? 'beta.' : '' }}explore.openaire.eu" class="el-link uk-button uk-button-default" target="_blank">
259
                OpenAIRE.EXPLORE
260
              </a>
261
            </p>
262
          </div>
263
        </div>
264
        <div class="uk-width-expand@m uk-width-1-2@s uk-dark uk-grid-item-match connect">
265
          <div class="uk-margin uk-panel uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
266
            <h4 class="el-title uk-margin uk-h4">
267
              Research community?
268
            </h4>
269
            <div class="el-content uk-margin">
270
              Use a trusted partner to share, link, disseminate and monitor your research.
271
            </div>
272
            <p>
273
              <a href="https://{{ inBeta ? 'beta.' : '' }}connect.openaire.eu" class="el-link uk-button uk-button-default" target="_blank">
274
                OpenAIRE.CONNECT
275
              </a>
276
            </p>
277
          </div>
278
        </div>
279
        <div class="uk-width-expand@m uk-width-1-2@s uk-dark uk-grid-item-match monitor">
280
          <div class="uk-margin uk-panel uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
281
            <h4 class="el-title uk-margin uk-h4">
282
              Research manager?
283
            </h4>
284
            <div class="el-content uk-margin">
285
              Use our monitoring services and easily track all relevant research results.
286
            </div>
287
            <p>
288
              <a href="https://monitor.openaire.eu" class="el-link uk-button uk-button-default" target="_blank">
289
                OpenAIRE.MONITOR
290
              </a>
291
            </p>
292
          </div>
293
        </div>
294
        <div class="uk-width-expand@m uk-width-1-2@s uk-dark uk-grid-item-match develop">
295
          <div class="uk-margin uk-panel uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
296
            <h4 class="el-title uk-margin uk-h4">
297
              Developer?
298
            </h4>
299
            <div class="el-content uk-margin">
300
              Get access to OpenAIRE data and capitalize on on Europe's open linked research
301
            </div>
302
            <p>
303
              <a href="https://develop.openaire.eu" class="el-link uk-button uk-button-default" target="_blank">
304
                OpenAIRE.DEVELOP
305
              </a>
306
            </p>
307
          </div>
308
        </div>
309
      </div>
310
    </div>
311
  </div>
312

  
313
</div>
0 314

  
modules/uoa-repository-dashboard-gui/branches/new-ui/src/app/pages/landing/home/home.component.ts
1
import { Component, OnInit } from '@angular/core';
2
import { UsageStatsSummary } from '../../../domain/typeScriptClasses';
3
import { AuthenticationService } from '../../../services/authentication.service';
4
import { StatisticsService } from '../../../services/statistics.service';
5
import { Router } from '@angular/router';
6

  
7
@Component ({
8
  selector: 'app-landing',
9
  templateUrl: './home.component.html',
10
  styleUrls: ['../../../../assets/css/landingpage/theme.css','../../../../assets/css/landingpage/custom.css','../../../../assets/css/landingpage/custom-provide.css'],
11
})
12

  
13
export class HomeComponent implements OnInit {
14

  
15
  statisticsNumbers: UsageStatsSummary;
16
  inBeta: boolean;
17

  
18

  
19
  constructor(private authService: AuthenticationService,
20
              private statsService: StatisticsService,
21
              private router: Router) { }
22

  
23
  ngOnInit() {
24
    this.getStatisticsNumbers();
25

  
26
    const baseUrl = window.location.origin;
27
    this.inBeta = ( baseUrl.includes('beta') || baseUrl.includes('athenarc') );
28

  
29
    let body = document.getElementsByTagName('body')[0];
30
    body.classList.remove("dashboard");
31
    body.classList.add("landing");
32
  }
33

  
34

  
35
  login() {
36
    this.authService.loginWithState();
37
  }
38

  
39
  getStatisticsNumbers() {
40
    this.statsService.getStatisticsNumbers().subscribe(
41
      res => {
42
        this.statisticsNumbers = res;
43
        // this.statisticsNumbers.lastYearUsagestats = JSON.parse(res['lastYearUsagestats'].toString());
44
      },
45
      error => console.log(error),
46
      () => {
47
        console.log('statisticsNumbers is', JSON.stringify(this.statisticsNumbers));
48
      }
49
    );
50
  }
51

  
52
  goToPage(pageUrl: string) {
53
    if (this.authService.getIsUserLoggedIn()) {
54
      this.router.navigate([pageUrl]);
55
    } else {
56
      this.authService.redirectUrl = pageUrl;
57
      this.login();
58
    }
59
  }
60

  
61
}
0 62

  
modules/uoa-repository-dashboard-gui/branches/new-ui/src/app/pages/landing/about/about.component.ts
1
import { Component, OnInit } from '@angular/core';
2
import { AuthenticationService } from '../../../services/authentication.service';
3
import { StatisticsService } from '../../../services/statistics.service';
4
import { Router } from '@angular/router';
5

  
6
@Component ({
7
  selector: 'app-about',
8
  templateUrl: './about.component.html',
9
  styleUrls: ['../../../../assets/css/landingpage/theme.css','../../../../assets/css/landingpage/custom.css','../../../../assets/css/landingpage/custom-provide.css'],
10
})
11

  
12
export class AboutComponent implements OnInit {
13

  
14
  constructor(private authService: AuthenticationService,
15
              private statsService: StatisticsService,
16
              private router: Router) { }
17

  
18
  ngOnInit() {
19
    let body = document.getElementsByTagName('body')[0];
20
    body.classList.remove("dashboard");
21
    body.classList.add("landing");
22
  }
23

  
24
  login() {
25
    this.authService.loginWithState();
26
  }
27

  
28

  
29
  goToPage(pageUrl: string) {
30
    if (this.authService.getIsUserLoggedIn()) {
31
      this.router.navigate([pageUrl]);
32
    } else {
33
      this.authService.redirectUrl = pageUrl;
34
      this.login();
35
    }
36
  }
37

  
38
}
modules/uoa-repository-dashboard-gui/branches/new-ui/src/app/pages/landing/about/about.component.html
1
<div>
2

  
3
  <div class="image-front-topbar  uk-section-default"
4
       uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">
5
    <div style="background-color: #F7F7F7; box-sizing: border-box; min-height: calc(-101.35px + 100vh);"
6
         class="uk-background-norepeat uk-background-cover uk-background-top-center uk-background-fixed uk-section uk-padding-remove-bottom uk-flex uk-flex-middle" uk-height-viewport="offset-top: true;offset-bottom: 20">
7
      <div class="uk-width-1-1">
8
        <div class="uk-margin-medium uk-grid uk-grid-stack" uk-grid="">
9
          <div class="uk-width-1-1@m">
10
          </div>
11
        </div>
12
        <div class="uk-container uk-container-large uk-margin-large aboutPage">
13
          <div class="uk-sticky-placeholder" style="height: 84px; margin: 0px;"></div>
14
          <div class="uk-grid-large uk-flex-middle uk-grid uk-grid-stack" uk-grid="">
15

  
16
            <div class="el-overlay uk-panel uk-width-1-2@l uk-dark">
17
              <h1 class="el-title uk-margin provideLanding">Capture the essence</h1>
18
              <div class="uk-margin-medium-top">
19
                <p style="color:#707070!important; font-size: 16px;">The OpenAIRE Content Provider Dashboard is a one-stop-shop web service where data providers (repository, data archive, journal, aggregator, CRIS system) interact with OpenAIRE. It provides the front-end access to many of OpenAIRE’s backend services.</p>
20
              </div>
21
              <!--<p><a (click)="goToPage('/dashboard')" class="el-link uk-button uk-button-primary">Start here</a></p>-->
22
            </div>
23

  
24
            <div class="el-overlay uk-panel uk-width-1-2@l uk-dark" style="text-align: right">
25
              <img src="../../../../assets/imgs/landing/Image%2036.png">
26
            </div>
27
          </div>
28
        </div>
29
      </div>
30
    </div>
31
  </div>
32

  
33
  <div class="uk-section-secondary uk-section uk-section-small uk-preserve-color">
34
    <div class="uk-container uk-container-expand">
35

  
36
      <div class="validationAndRegistrationSection uk-padding">
37

  
38
        <div class="uk-container uk-container-medium uk-container-center">
39
          <div style="text-align: center">
40
            <img src="../../../../assets/imgs/landing/Image%2035.png">
41
          </div>
42
          <div class="" style="text-align: center">
43
            <h2 class="provideLanding">Validation & Registration</h2>
44
            <p>
45
              The OpenAIRE Validator service allows to test your repository’s compatibility with the OpenAIRE Guidelines. If validation succeeds the data source can be registered for regular aggregation and indexing in OpenAIRE. OpenAIRE allows for registration of institutional and thematic repositories registered in OpenDOAR, research data repositories registered in re3data, individual e-Journals, CRIS, aggregators and publishers.
46
            </p>
47
            <p>
48
              The Validator service includes two main steps to perform the aggregation and indexing of your datasource in OpenAIRE:
49
            </p>
50
          </div>
51
        </div>
52

  
53
        <div class="uk-container uk-container-large uk-container-center">
54

  
55
        </div>
56

  
57

  
58
      </div>
59

  
60
    </div>
61
  </div>
62

  
63

  
64
</div>
modules/uoa-repository-dashboard-gui/branches/new-ui/src/app/services/authentication.service.ts
93 93
            deleteCookie('openAIREUser');
94 94
            deleteCookie('AccessToken');
95 95
            this.isLoggedIn = false;
96
            this.router.navigate(['/landing']);
96
            this.router.navigate(['/home']);
97 97
          },
98 98
          () => {
99 99
            if ( sessionStorage.getItem('state.location') ) {
......
101 101
              sessionStorage.removeItem('state.location');
102 102
              console.log(`tried to login - returning to state: ${state}`);
103 103
              if ( !this.getIsUserLoggedIn() ) {
104
                console.log('user hasn\'t logged in yet -- going to landing');
105
                this.router.navigate(['/landing']);
104
                console.log('user hasn\'t logged in yet -- going to home');
105
                this.router.navigate(['/home']);
106 106
              } else {
107 107
                this.router.navigate([state]);
108 108
              }
modules/uoa-repository-dashboard-gui/branches/new-ui/src/app/services/auth-guard.service.ts
28 28
    // this.authenticationService.redirectUrl = state.url;
29 29
    // this.authenticationService.loginWithState();
30 30

  
31
    this.router.navigate(['/landing']);
31
    this.router.navigate(['/home']);
32 32

  
33 33
    return false;
34 34
  }
......
42 42
      return true;
43 43
    }
44 44

  
45
    this.router.navigate(['/landing']);
45
    this.router.navigate(['/home']);
46 46

  
47 47
    return false;
48 48
  }
modules/uoa-repository-dashboard-gui/branches/new-ui/src/app/app.component.html
1
<div *ngIf="!isHomeRoute() ; else landing" class="sidebar_main_swipe" [class.sidebar_main_active]="open">
2
  <!--<div *ngIf="!isHomeRoute() ; else landing" class="sidebar_main_open sidebar_main_swipe uk-height-1-1">-->
1
<div *ngIf="!isLandingRoute() ; else landing" class="sidebar_main_swipe" [class.sidebar_main_active]="open">
2
  <!--<div *ngIf="!isHomeRoute() ; else home" class="sidebar_main_open sidebar_main_swipe uk-height-1-1">-->
3 3
  <top-menu-dashboard></top-menu-dashboard>
4 4
  <side-menu></side-menu>
5 5
  <div id="hide_controls">
modules/uoa-repository-dashboard-gui/branches/new-ui/src/app/app.component.ts
62 62
    });
63 63
  }
64 64

  
65
  isHomeRoute() {
65
  isLandingRoute() {
66 66
    // console.log('Is home route? Route is: ' + this.router.url);
67
    return (this.router.url === '/') || (this.router.url === '/landing');
67
    return (this.router.url === '/') || (this.router.url === '/home') || (this.router.url === '/about');
68 68
  }
69 69

  
70 70
  public toggleOpen(event: MouseEvent) {
modules/uoa-repository-dashboard-gui/branches/new-ui/src/app/shared/topmenulanding/topmenu-landing.component.html
24 24
              <div>
25 25
                <a *ngIf="!getIsUserLoggedIn()" (click)="login()">Sign in| Register</a>
26 26
                <span *ngIf="getIsUserLoggedIn()">{{getUserName()}}</span>
27
                <ul *ngIf="getIsUserLoggedIn()" class="uk-list uk-margin-top">
27
                <ul  class="uk-list uk-margin-top">
28 28
                  <li>
29
                    <a class="uk-search-input" [routerLink]="['home']" [routerLinkActive]="['uk-active']">Home</a>
30
                  </li>
31
                  <li>
32
                    <a class="uk-search-input" [routerLink]="['about']" [routerLinkActive]="['uk-active']">About</a>
33
                  </li>
34
                  <li>
35
                  <li *ngIf="getIsUserLoggedIn()">
29 36
                    <a class="uk-search-input" [routerLink]="['emptyPage']" [routerLinkActive]="['uk-active']">Dashboard</a>
30 37
                  </li>
31
                  <!--<li>-->
32
                    <!--<a class="uk-search-input" [routerLink]="['landing']" [routerLinkActive]="['uk-active']">Home</a>-->
33
                  <!--</li>-->
34
                  <!--<li>-->
35
                    <!--<a class="uk-search-input" [routerLink]="['dashboard']" [routerLinkActive]="['uk-active']">Dashboard</a>-->
36
                  <!--</li>-->
37
                  <!--<li>-->
38

  
38 39
                    <!--Sources-->
39 40
                    <!--<ul>-->
40 41
                      <!--<li><a [routerLink]="['sources', 'register']" [routerLinkActive]="['uk-active']">Register</a></li>-->
......
124 125

  
125 126
            <div class="uk-navbar-right">
126 127

  
127
              <ul class="uk-navbar-nav" *ngIf="getIsUserLoggedIn()" >
128
                <li class="uk-parent" [routerLinkActive]="['uk-active']">
129
                  <a [routerLink]="['emptyPage']" [routerLinkActive]="['uk-active']">
128
              <ul class="uk-navbar-nav" >
129
                <li *ngIf="getIsUserLoggedIn()" class="uk-parent" [routerLinkActive]="['uk-active']">
130
                  <a [routerLink]="['home']" [routerLinkActive]="['uk-active']">
131
                    Home
132
                  </a>
133
                </li>
134
                <li *ngIf="getIsUserLoggedIn()" class="uk-parent" [routerLinkActive]="['uk-active']">
135
                  <a [routerLink]="['about']" [routerLinkActive]="['uk-active']">
136
                    About
137
                  </a>
138
                </li>
139
                <li *ngIf="getIsUserLoggedIn()" class="uk-parent" [routerLinkActive]="['uk-active']">
140
                  <a [routerLink]="['join']" [routerLinkActive]="['uk-active']">
130 141
                    Dashboard
131 142
                  </a>
132 143
                </li>
133
                <!--<li class="uk-parent" [routerLinkActive]="['uk-active']">-->
134
                  <!--<a [routerLink]="['dashboard']" [routerLinkActive]="['uk-active']">-->
135
                    <!--Dashboard-->
136
                  <!--</a>-->
137
                <!--</li>-->
138
                <!--<li class="uk-parent" [routerLinkActive]="['uk-active']"><a href="#" class=""-->
139
                                                                            <!--aria-expanded="false">Sources</a>-->
140
                  <!--<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 106.55px;"-->
141
                       <!--id="sourcesMenu" (click)="onClick('sourcesMenu')">-->
142
                    <!--<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">-->
143
                      <!--<div class="uk-first-column">-->
144
                        <!--<ul class="uk-nav uk-navbar-dropdown-nav">-->
145
                          <!--<li><a [routerLink]="['/sources','register']" id="registerLink">Register</a></li>-->
146
                          <!--<li><a [routerLink]="['/sources', 'update']">Update</a></li>-->
147
                        <!--</ul>-->
148
                      <!--</div>-->
149
                    <!--</div>-->
150
                  <!--</div>-->
151
                <!--</li>-->
152
                <!--<li class="uk-parent" [routerLinkActive]="['uk-active']"><a href="#" class=""-->
153
                                                                            <!--aria-expanded="false">Compatibility</a>-->
154
                  <!--<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 106.55px;"-->
155
                       <!--id="compatibilityMenu" (click)="onClick('compatibilityMenu')">-->
156
                    <!--<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">-->
157
                      <!--<div class="uk-first-column">-->
158
                        <!--<ul class="uk-nav uk-navbar-dropdown-nav">-->
159
                          <!--<li><a [routerLink]="['/compatibility','validate']">Validate</a></li>-->
160
                          <!--<li><a [routerLink]="['/compatibility','browseHistory']">Validation History</a></li>-->
161
                          <!--<li><a [routerLink]="['/compatibility','monitor']">Collection Monitor</a></li>-->
162
                        <!--</ul>-->
163
                      <!--</div>-->
164
                    <!--</div>-->
165
                  <!--</div>-->
166
                <!--</li>-->
167
                <!--<li class="uk-parent" [routerLinkActive]="['uk-active']"><a href="#" class=""-->
168
                                                                            <!--aria-expanded="false">Content</a>-->
169
                  <!--<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 106.55px;"-->
170
                       <!--id="contentMenu" (click)="onClick('contentMenu')">-->
171
                    <!--<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">-->
172
                      <!--<div class="uk-first-column">-->
173
                        <!--<ul class="uk-nav uk-navbar-dropdown-nav">-->
174
                          <!--<li><a [routerLink]="['/content','events']">Events</a></li>-->
175
                          <!--<li><a [routerLink]="['/content','notifications']">Notifications</a></li>-->
176
                        <!--</ul>-->
177
                      <!--</div>-->
178
                    <!--</div>-->
179
                  <!--</div>-->
180
                <!--</li>-->
181
                <!--<li class="uk-parent">-->
182
                  <!--<a [routerLink]="['/getImpact']" [routerLinkActive]="['uk-active']">-->
183
                    <!--Metrics-->
184
                  <!--</a>-->
185
                <!--</li>-->
186
              </ul>
187 144

  
188
              <div class="uk-navbar-item">
189

  
190
                <ul *ngIf="!getIsUserLoggedIn()" class="uk-navbar-nav">
191
                  <li class="uk-parent">
192
                    <a class="" (click)="login()">
193
                      Sign in
194
                      <span class="uk-margin-small-left uk-icon">
145
                <li *ngIf="!getIsUserLoggedIn()" class="uk-parent">
146
                  <a class="" (click)="login()">
147
                    Sign in
148
                    <span class="uk-margin-small-left uk-icon">
195 149
                      <svg height="20" ratio="1" viewBox="0 0 20 20" width="20" xmlns="http://www.w3.org/2000/svg">
196 150
                        <circle cx="9.9" cy="6.4" fill="none" r="4.4" stroke="#000" stroke-width="1.1"></circle>
197 151
                        <path d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2" fill="none" stroke="#000" stroke-width="1.1"></path>
198 152
                      </svg>
199 153
                    </span>
200
                    </a>
201
                  </li>
202
                </ul>
203

  
204
                <ul *ngIf="getIsUserLoggedIn()" class="uk-navbar-nav">
205
                  <li class="uk-parent">
206
                    <a class="" aria-expanded="false">
207
                      {{ getUserName() }}
208
                      <span class="uk-margin-small-left uk-icon">
154
                  </a>
155
                </li>
156
                <li *ngIf="getIsUserLoggedIn()" class="uk-parent">
157
                  <a class="" aria-expanded="false">
158
                    {{ getUserName() }}
159
                    <span class="uk-margin-small-left uk-icon">
209 160
                      <svg height="20" ratio="1" viewBox="0 0 20 20" width="20" xmlns="http://www.w3.org/2000/svg">
210 161
                        <circle cx="9.9" cy="6.4" fill="none" r="4.4" stroke="#000" stroke-width="1.1"></circle>
211 162
                        <path d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2" fill="none" stroke="#000" stroke-width="1.1"></path>
212 163
                      </svg>
213 164
                    </span>
214
                    </a>
215
                    <div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 106.55px;"
216
                         id="userMenu" (click)="onClick('userMenu')">
217
                      <div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
218
                        <div class="uk-first-column">
219
                          <ul class="uk-nav uk-navbar-dropdown-nav">
220
                            <!--<ul *ngIf="getIsUserAdmin()" class="uk-nav uk-navbar-dropdown-nav">-->
221
                              <!--<li class="uk-nav-header" style="display: block;">Admin</li>-->
222
                              <!--<li style="display: block"><a href="{{adminHomePage}}" target="_blank">Help Texts</a></li>-->
223
                              <!--<li style="display: block"><a [routerLink]="['/admin/metrics']">Metrics</a></li>-->
224
                              <!--<li style="display: block" class="uk-margin-small-bottom"><a [routerLink]="['/admin/registrations']">Registrations</a></li>-->
225
                            <!--</ul>-->
226
                            <li><a class="" (click)="logout()">Log out</a></li>
227
                          </ul>
228
                        </div>
165
                  </a>
166
                  <div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 106.55px;"
167
                       id="userMenu" (click)="onClick('userMenu')">
168
                    <div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
169
                      <div class="uk-first-column">
170
                        <ul class="uk-nav uk-navbar-dropdown-nav">
171
                          <!--<ul *ngIf="getIsUserAdmin()" class="uk-nav uk-navbar-dropdown-nav">-->
172
                          <!--<li class="uk-nav-header" style="display: block;">Admin</li>-->
173
                          <!--<li style="display: block"><a href="{{adminHomePage}}" target="_blank">Help Texts</a></li>-->
174
                          <!--<li style="display: block"><a [routerLink]="['/admin/metrics']">Metrics</a></li>-->
175
                          <!--<li style="display: block" class="uk-margin-small-bottom"><a [routerLink]="['/admin/registrations']">Registrations</a></li>-->
176
                          <!--</ul>-->
177
                          <li><a class="" (click)="logout()">Log out</a></li>
178
                        </ul>
229 179
                      </div>
230 180
                    </div>
231
                  </li>
232
                </ul>
181
                  </div>
182
                </li>
233 183

  
234
              </div>
184
              </ul>
235 185

  
186
              <!--<div class="uk-navbar-item">-->
236 187

  
188
                <!--<ul *ngIf="!getIsUserLoggedIn()" class="uk-navbar-nav">-->
189
                  <!--<li class="uk-parent">-->
190
                    <!--<a class="" (click)="login()">-->
191
                      <!--Sign in-->
192
                      <!--<span class="uk-margin-small-left uk-icon">-->
193
                      <!--<svg height="20" ratio="1" viewBox="0 0 20 20" width="20" xmlns="http://www.w3.org/2000/svg">-->
194
                        <!--<circle cx="9.9" cy="6.4" fill="none" r="4.4" stroke="#000" stroke-width="1.1"></circle>-->
195
                        <!--<path d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2" fill="none" stroke="#000" stroke-width="1.1"></path>-->
196
                      <!--</svg>-->
197
                    <!--</span>-->
198
                    <!--</a>-->
199
                  <!--</li>-->
200
                <!--</ul>-->
201

  
202
                <!--<ul *ngIf="getIsUserLoggedIn()" class="uk-navbar-nav">-->
203
                  <!--<li class="uk-parent">-->
204
                    <!--<a class="" aria-expanded="false">-->
205
                      <!--{{ getUserName() }}-->
206
                      <!--<span class="uk-margin-small-left uk-icon">-->
207
                      <!--<svg height="20" ratio="1" viewBox="0 0 20 20" width="20" xmlns="http://www.w3.org/2000/svg">-->
208
                        <!--<circle cx="9.9" cy="6.4" fill="none" r="4.4" stroke="#000" stroke-width="1.1"></circle>-->
209
                        <!--<path d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2" fill="none" stroke="#000" stroke-width="1.1"></path>-->
210
                      <!--</svg>-->
211
                    <!--</span>-->
212
                    <!--</a>-->
213
                    <!--<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 106.55px;"-->
214
                         <!--id="userMenu" (click)="onClick('userMenu')">-->
215
                      <!--<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">-->
216
                        <!--<div class="uk-first-column">-->
217
                          <!--<ul class="uk-nav uk-navbar-dropdown-nav">-->
218
                            <!--&lt;!&ndash;<ul *ngIf="getIsUserAdmin()" class="uk-nav uk-navbar-dropdown-nav">&ndash;&gt;-->
219
                              <!--&lt;!&ndash;<li class="uk-nav-header" style="display: block;">Admin</li>&ndash;&gt;-->
220
                              <!--&lt;!&ndash;<li style="display: block"><a href="{{adminHomePage}}" target="_blank">Help Texts</a></li>&ndash;&gt;-->
221
                              <!--&lt;!&ndash;<li style="display: block"><a [routerLink]="['/admin/metrics']">Metrics</a></li>&ndash;&gt;-->
222
                              <!--&lt;!&ndash;<li style="display: block" class="uk-margin-small-bottom"><a [routerLink]="['/admin/registrations']">Registrations</a></li>&ndash;&gt;-->
223
                            <!--&lt;!&ndash;</ul>&ndash;&gt;-->
224
                            <!--<li><a class="" (click)="logout()">Log out</a></li>-->
225
                          <!--</ul>-->
226
                        <!--</div>-->
227
                      <!--</div>-->
228
                    <!--</div>-->
229
                  <!--</li>-->
230
                <!--</ul>-->
231

  
232
              <!--</div>-->
233

  
234

  
237 235
            </div>
238 236

  
239 237
          </nav>
modules/uoa-repository-dashboard-gui/branches/new-ui/src/app/shared/sidemenu/sidemenu.component.html
9 9
  </div>
10 10
  <!--<div class="sidebar_main_header">-->
11 11
    <!--<div class="sidebar_logo">-->
12
      <!--<a [routerLink]="['/landing']" class="sSidebar_hide sidebar_logo_large">-->
12
      <!--<a [routerLink]="['/home']" class="sSidebar_hide sidebar_logo_large">-->
13 13
        <!--<img class="logo_regular" src="../../../assets/imgs/OA_PROVIDE_B.png" alt="" height="" width="200"/>-->
14 14
        <!--<img class="logo_light" src="assets/img/logo_main_white.png" alt="" height="15" width="71"/>-->
15 15
      <!--</a>-->
16
      <!--<a [routerLink]="['/landing']" class="sSidebar_show sidebar_logo_small">-->
16
      <!--<a [routerLink]="['/home']" class="sSidebar_show sidebar_logo_small">-->
17 17
        <!--<img class="logo_regular" src="../../../assets/imgs/OA_PROVIDE_A.png" alt="" height="32" width="32"/>-->
18 18
        <!--<img class="logo_light" src="assets/img/logo_main_small_light.png" alt="" height="32" width="32"/>-->
19 19
      <!--</a>-->
......
98 98
    <ul>
99 99

  
100 100
      <li [routerLinkActive]="['current_section']" class="">
101
        <a href="{{adminHomePage}}">
101
        <a href="{{adminHomePage}}" target="_blank">
102 102
          <span class="menu_icon_circle_letter">H</span>
103 103
          <span class="menu_title">Help Texts</span>
104 104
        </a>
modules/uoa-repository-dashboard-gui/branches/new-ui/src/app/app.module.ts
17 17
import { StatisticsService } from './services/statistics.service';
18 18
import { AuthGuardService } from './services/auth-guard.service';
19 19
import { AuthenticationService } from './services/authentication.service';
20
import { LandingComponent } from './pages/landing/landing.component';
20
import { HomeComponent } from './pages/landing/home/home.component';
21 21
import { MatomoModule } from 'ngx-matomo';
22 22
import { DashboardService } from "./services/dashboard.service";
23 23
import { EmptyPageComponent } from "./pages/emptypage/empty-page.component";
24 24
import { SharedService } from "./services/shared.service";
25 25
import { JoinComponent } from "./pages/join/join.component";
26
import { AboutComponent } from "./pages/landing/about/about.component";
26 27

  
27 28

  
28 29
@NgModule({
29 30
  declarations: [
30 31
    AppComponent,
31
    LandingComponent,
32
    HomeComponent,
33
    AboutComponent,
32 34
    EmptyPageComponent,
33 35
    JoinComponent
34 36
  ],
modules/uoa-repository-dashboard-gui/branches/new-ui/src/app/app-routing.module.ts
1 1
import { RouterModule, Routes } from '@angular/router';
2 2
import { NgModule } from '@angular/core';
3
import { LandingComponent } from './pages/landing/landing.component';
3
import { HomeComponent } from './pages/landing/home/home.component';
4 4
import { AuthGuardService } from './services/auth-guard.service';
5 5
import { ForbiddenPageComponent } from './shared/reusablecomponents/403-forbidden-page.component';
6 6
import { EmptyPageComponent } from "./pages/emptypage/empty-page.component";
7 7
import { JoinComponent } from "./pages/join/join.component";
8
import { AboutComponent } from "./pages/landing/about/about.component";
8 9

  
9 10
const appRoutes: Routes = [
10 11
  {
11 12
    path: '',
12
    redirectTo: '/landing',
13
    redirectTo: '/home',
13 14
    pathMatch: 'full'
14 15
  },
15 16
  {
16
    path: 'landing',
17
    component: LandingComponent
17
    path: 'home',
18
    component: HomeComponent
18 19
  },
19 20
  {
21
    path: 'about',
22
    component: AboutComponent
23
  },
24
  {
20 25
    path: 'join',
21 26
    component: JoinComponent,
22 27
    canActivate: [AuthGuardService]
......
74 79
  },
75 80
  // {
76 81
  //   path: '',
77
  //   redirectTo: '/landing',
82
  //   redirectTo: '/home',
78 83
  //   pathMatch: 'full'
79 84
  // },
80 85
  {
modules/uoa-repository-dashboard-gui/branches/new-ui/src/assets/css/provide-custom.css
346 346
  color: #6299EC;
347 347
}
348 348

  
349
.uk-pagination > li {
350
  text-align: center;
351
}
352

  
349 353
/****************************************/
350 354

  
351 355

  
modules/uoa-repository-dashboard-gui/branches/new-ui/src/assets/css/landingpage/custom-provide.css
12 12
  --develop-portal-color: #DA65AB;
13 13
}
14 14

  
15
.provide.uk-heading-hero {
16
  color: #37C7E9;
15
h1.provideLanding {
16
  /*color: #37C7E9;*/
17
  font: Bold 42px/20px Open Sans;
18
  letter-spacing: -2.1px;
19
  color: #212121;
20
  opacity: 1;
17 21
}
18 22

  
23
h2.provideLanding {
24
  /*color: #37C7E9;*/
25
  font: Bold 30px/82px Open Sans;
26
  letter-spacing: -0.75px;
27
  color: #212121;
28
  opacity: 1;
29
}
30

  
31
h3.provideLanding {
32
  /*color: #37C7E9;*/
33
  font: Bold 24px/33px Open Sans;
34
  letter-spacing: -0.24px;
35
  color: #212121;
36
  opacity: 1;
37
}
38

  
19 39
.uk-button-primary {
20 40
  background-color: #37C7E9;
21 41
}
......
111 131
}
112 132

  
113 133

  
134
.uk-section-secondary {
135
  background-color: #F7F7F7;
136
}
114 137

  
138
/************ ABOUT PAGE ***********/
115 139

  
140
.aboutPage .uk-grid > *, .aboutPage .uk-grid-large > *{
141
  padding-left: 0px;
142
}
143

  
144
.validationAndRegistrationSection {
145
  background-color: #FFE8EB;
146
}
147

  
148
/****************************************/
149

  
150

  
151

  
152

  
153

  
154

  
155

  
116 156
.uk-card-provide {
117 157
  background-color: #37C7E9;
118 158
  color: #fff !important;

Also available in: Unified diff