Skip to content
This repository has been archived by the owner on Jul 6, 2020. It is now read-only.

Load Base Components only once #233

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Load Base Components only once #233

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d9188da
Removed Base Components (Header and Footer)
jayaike Dec 9, 2019
e9e72de
Added Base Components (Header and Footer)
jayaike Dec 9, 2019
6a3b32b
Merge branch 'master' into Base-Component-Features
jayaike Dec 9, 2019
7476a5a
Formatted Code
jayaike Dec 9, 2019
25ed8d2
Removed condition on Footer
jayaike Dec 9, 2019
9d34916
Merge branch 'Base-Component-Features' of https://github.com/nsjcorps…
jayaike Dec 9, 2019
9f17c42
Removed footer
jayaike Dec 10, 2019
8165718
Removed Header
jayaike Dec 10, 2019
d7b5f33
Formatted Code
jayaike Dec 10, 2019
c91e800
Adjusted footer condition
jayaike Dec 11, 2019
8424cc3
Fixed issues with auth routes
jayaike Dec 11, 2019
8b3fb07
Fixed issues with auth routes
jayaike Dec 11, 2019
421b295
Made authService public
jayaike Dec 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/app/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<!-- The <router-outlet> tells the router where to display routed views. -->
<app-header-static></app-header-static>
<router-outlet></router-outlet>
<app-footer></app-footer>
<app-toast></app-toast>
<app-loading *ngIf="isLoading"></app-loading>
<app-confirm *ngIf="confirmParams['isConfirming']" [params]="confirmParams"></app-confirm>
Expand Down
53 changes: 25 additions & 28 deletions src/app/components/about/about.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,28 @@
<app-header-static></app-header-static>

<div class="about-container">
<div class="row">
<div class="col-lg-7 col-md-7 col-sm-12 col-xs-12 about-content-column">
<h4 class="about-title">About Us</h4>
<p class="about-content">EvalAI is built by a team of open source enthusiasts working at
<a href="http://cloudcv.org" target="_blank" class="blue-text">CloudCV</a>. CloudCV aims to make AI research
reproducible and easily accessible. We want to reduce the barrier to entry for doing research
and make it easier for researchers, students and developers to develop and use state-of-the-art
algorithms as a service.</p>
<p class="about-content">With EvalAI, we want to standardize the process of
evaluating different methods on a dataset and make it simple to host a competition.
Comparing a new method with other existing approaches is an essential component of
research and this process has traditionally been affected by difference in evaluation
metric implementation, different splits of the dataset or minor modifications in the
algorithm. This makes it extremely hard to reproduce numbers from published papers
and reliably compare your method with other existing approaches. By building EvalAI, we
hope to make this easier by standardizing the dataset splits, evaluation metrics and by
maintaining a public leaderboard of hosted challenges.</p>
</div>
<div class="col-lg-5 col-md-5 col-sm-1 col-xs-1">
<div class="rocket-container">
<div class="spaceman">
<img src="assets/images/spaceman.png">
</div>
<div class="about-container">
<div class="row">
<div class="col-lg-7 col-md-7 col-sm-12 col-xs-12 about-content-column">
<h4 class="about-title">About Us</h4>
<p class="about-content">EvalAI is built by a team of open source enthusiasts working at
<a href="http://cloudcv.org" class="blue-text">CloudCV</a>. CloudCV aims to make AI research
reproducible and easily accessible. We want to reduce the barrier to entry for doing research
and make it easier for researchers, students and developers to develop and use state-of-the-art
algorithms as a service.</p>
<p class="about-content">With EvalAI, we want to standardize the process of
evaluating different methods on a dataset and make it simple to host a competition.
Comparing a new method with other existing approaches is an essential component of
research and this process has traditionally been affected by difference in evaluation
metric implementation, different splits of the dataset or minor modifications in the
algorithm. This makes it extremely hard to reproduce numbers from published papers
and reliably compare your method with other existing approaches. By building EvalAI, we
hope to make this easier by standardizing the dataset splits, evaluation metrics and by
maintaining a public leaderboard of hosted challenges.</p>
</div>
<div class="col-lg-5 col-md-5 col-sm-1 col-xs-1">
<div class="rocket-container">
<div class="spaceman">
<img src="assets/images/spaceman.png">
</div>
</div>
</div>
</div>
<app-footer></app-footer>
</div>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please format the file

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file is already formatted. See the screenshot below. I guess what you are seeing is the second to the last line.

Screenshot (124)

</div>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should only be 1-2 line changes. Other changes are due to spaces, indentation etc. Please remove unnecessary changes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason for the line changes is I had to format the code after removing the footer.

4 changes: 0 additions & 4 deletions src/app/components/analytics/analytics.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<app-side-bar *ngIf="authService.isAuth"></app-side-bar>
<app-header-static></app-header-static>
<div class="web-container" [style.center]="!authService.isAuth">
<div class="dashboard-flex">
<div class="dashboard-content">
<router-outlet></router-outlet>
</div>
<app-footer [isDash]="true" *ngIf="authService.isAuth"></app-footer>
</div>
</div>
<div class="clearfix"></div>

<app-footer *ngIf="!authService.isAuth"></app-footer>
4 changes: 0 additions & 4 deletions src/app/components/challenge-create/challenge-create.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<app-side-bar *ngIf="authService.isAuth"></app-side-bar>
<app-header-static></app-header-static>
<div class="web-container" [style.center]="!authService.isAuth">
<div class="challenge-create-flex">
<div class="challenge-create-content">
Expand Down Expand Up @@ -47,8 +46,5 @@
</section>

</div>
<app-footer [isDash]="true" *ngIf="authService.isAuth"></app-footer>
</div>
</div>

<app-footer *ngIf="!authService.isAuth"></app-footer>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So now we do not need to check these conditions?

2 changes: 0 additions & 2 deletions src/app/components/challenge/challenge.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<app-header-static></app-header-static>
<div class="mid-container">
<div class="challenge-container">
<div class="challenge-card">
Expand Down Expand Up @@ -142,4 +141,3 @@
<router-outlet></router-outlet>
</div>
</div>
<app-footer></app-footer>
3 changes: 0 additions & 3 deletions src/app/components/contact/contact.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<app-header-static></app-header-static>
<div class="contact-container">
<div class="row">
<div class="col-lg-8 col-md-8 col-sm-12 col-xs-12 ev-mt-50">
Expand Down Expand Up @@ -30,5 +29,3 @@ <h4 class="contact-title ev-mt-17 ev-mb-13 fs-34 align-center fw-regular">Contac
</div>
</div>
</div>
<app-footer></app-footer>

5 changes: 0 additions & 5 deletions src/app/components/dashboard/dashboard.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
<app-side-bar *ngIf="authService.isAuth"></app-side-bar>
<app-header-static></app-header-static>
<div class="web-container" [style.center]="!authService.isAuth">
<div class="dashboard-flex">
<div class="dashboard-content">
<app-dashboard-content></app-dashboard-content>
</div>
<!--Dashboard-Footer-->
<app-footer [isDash]="true" *ngIf="authService.isAuth"></app-footer>
</div>
</div>
<div class="clearfix"></div>

<app-footer *ngIf="!authService.isAuth"></app-footer>
2 changes: 0 additions & 2 deletions src/app/components/get-involved/get-involved.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<app-header-static></app-header-static>
<div class="container-top container align-center get-involved-container">
<div>
<h4 class="get-involved-title align-center fw-regular">Get Involved</h4>
Expand Down Expand Up @@ -93,4 +92,3 @@ <h4 class="get-involved-title align-center fw-regular">Get Involved</h4>
&nbsp;
</div>
</div>
<app-footer></app-footer>
3 changes: 0 additions & 3 deletions src/app/components/home/home.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<app-header-static></app-header-static>
<div class="white-bg view-container flex-body">
<div class="content">
<!-- EvalAI into -->
Expand Down Expand Up @@ -242,5 +241,3 @@ <h4 class="w-300 center">Subscribe to our newsletters</h4>
</div>
<!--landing-footer></landing-footer-->
</div>

<app-footer></app-footer>
3 changes: 0 additions & 3 deletions src/app/components/our-team/our-team.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<app-header-static></app-header-static>
<div class="container-top">
<div class="our-team-container">
<div class="our-team-title fw-regular">
Expand Down Expand Up @@ -87,5 +86,3 @@ <h3 ng-if="noTeamDisplay" class="team-heading fw-regular">{{noTeamDisplay}}</h3>
</div>
</div>
</div>

<app-footer></app-footer>
2 changes: 0 additions & 2 deletions src/app/components/privacy-policy/privacy-policy.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<app-header-static></app-header-static>
<div class="container-top container privacy-container rm-margin">
<div class="privacy-nav-container col-lg-2 col-md-3 col-sm-5 col-xs-5">
<ul>
Expand Down Expand Up @@ -252,4 +251,3 @@
</p>
</div>
</div>
<app-footer></app-footer>
4 changes: 0 additions & 4 deletions src/app/components/profile/profile.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
<app-header-static></app-header-static>

<div class="mid-container">
<div class="container-top profile-container">
<div class="align-center">
Expand Down Expand Up @@ -97,5 +95,3 @@
</div>
</div>
</div>

<app-footer></app-footer>
4 changes: 0 additions & 4 deletions src/app/components/publiclists/publiclists.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<app-side-bar *ngIf="authService.isAuth"></app-side-bar>
<app-header-static></app-header-static>
<div class="web-container" [style.center]="!authService.isAuth">
<div class="dashboard-flex">
<div class="dashboard-content">
<router-outlet></router-outlet>
</div>
<app-footer [isDash]="true" *ngIf="authService.isAuth"></app-footer>
</div>
</div>
<div class="clearfix"></div>

<app-footer *ngIf="!authService.isAuth"></app-footer>