Merge pull request #410 from sinfo/staging

Update 2.3.11

Author: andreromao

src/app/landing-page/feedback/feedback.component.html

@@ -17,7 +17,7 @@ <h3>Testimonials</h3>
       <div class="carousel-inner">
 
         <div class="item active">
-          <img [src]="'../../assets/img/feedback/diana_feedback.png'" alt="Diana Kelley" style="width:100%;">
+          <img [src]="'https://static.sinfo.org/static/31-sinfo/websiteImages/diana_feedback.jpeg'" alt="Diana Kelley" style="width:100%;">
           <div class="carousel-caption">
             <h5 class="title">Diana Kelley</h5>
             <p class="feedbackField">"The SINFO conference team is top notch, amazing that it is all student run! From
@@ -29,7 +29,7 @@ <h5 class="title">Diana Kelley</h5>
         </div>
 
         <div class="item">
-          <img [src]="'../../assets/img/feedback/kevlin_feedback.jpg'" alt="Kevlin Henney" style="width:100%;">
+          <img [src]="'https://static.sinfo.org/static/31-sinfo/websiteImages/kevlin_feedback.jpeg'" alt="Kevlin Henney" style="width:100%;">
           <div class="carousel-caption">
             <h5 class="title">Kevlin Henney</h5>
             <p class="feedbackField">"SINFO is a great opportunity for attendees - great organizers and well
@@ -48,7 +48,7 @@ <h5 class="title">Philippe Renaud</h5>
         </div>
 
         <div class="item">
-          <img [src]="'../../assets/img/feedback/arlindo_feedback.jpg'" alt="Arlindo Oliveira" style="width:100%;">
+          <img [src]="'https://static.sinfo.org/static/31-sinfo/websiteImages/arlindo_feedback.jpeg'" alt="Arlindo Oliveira" style="width:100%;">
           <div class="carousel-caption">
             <h5 class="title">Arlindo Oliveira</h5>
             <p class="feedbackField">"This is an outstanding event, ambitious and well organized. It was a great

src/app/landing-page/landing-page.component.css

@@ -193,7 +193,7 @@
 }
 
 .video-bg {
-  background-image: url("https://sinfo.ams3.cdn.digitaloceanspaces.com/static/27-sinfo/webapp/sinfo-tent.jpg");
+  background-image: url("https://static.sinfo.org/static/31-sinfo/websiteImages/sinfo-tent.jpeg");
   background-size: cover;
   background-repeat: no-repeat;
   background-position: 50% 50%;

src/app/landing-page/landing-page.component.html

@@ -214,7 +214,7 @@ <h2 class="text-center">The Event</h2>
           <div class="event-content">
 
             <mat-card class="example-card speaker-card" style="background-image: linear-gradient(rgba(27, 38, 97, 0.5), rgba(27, 38, 97, 0.5)),
-            url('assets/img/event-cards/speaker.jpg');">
+            url('https://static.sinfo.org/static/31-sinfo/websiteImages/speaker.jpeg');">
               <mat-card-header>
                 <mat-card-title class="card-title">
                   <h4 style="color: white;">Speaker Keynotes</h4>
@@ -229,7 +229,7 @@ <h4 style="color: white;">Speaker Keynotes</h4>
             </mat-card>
 
             <mat-card class="example-card speaker-card" style="background-image: linear-gradient(rgba(27, 38, 97, 0.5), rgba(27, 38, 97, 0.5)),
-            url('assets/img/event-cards/workshop.jpg');">
+            url('https://static.sinfo.org/static/31-sinfo/websiteImages/workshop.jpeg');">
               <mat-card-header>
                 <mat-card-title class="card-title">
                   <h4 style="color: white;">Workshops</h4>
@@ -244,7 +244,7 @@ <h4 style="color: white;">Workshops</h4>
             </mat-card>
 
             <mat-card class="example-card speaker-card" style="background-image: linear-gradient(rgba(27, 38, 97, 0.5), rgba(27, 38, 97, 0.5)),
-            url('assets/img/event-cards/presentation.jpg');">
+            url('https://static.sinfo.org/static/31-sinfo/websiteImages/presentation.jpeg');">
               <mat-card-header>
                 <mat-card-title class="card-title">
                   <h4 style="color: white;">Company Presentations</h4>
@@ -259,7 +259,7 @@ <h4 style="color: white;">Company Presentations</h4>
             </mat-card>
 
             <mat-card class="example-card speaker-card" style="background-image: linear-gradient(rgba(27, 38, 97, 0.5), rgba(27, 38, 97, 0.5)),
-            url('assets/img/event-cards/networking.jpg');">
+            url('https://static.sinfo.org/static/31-sinfo/websiteImages/networking.jpeg');">
               <mat-card-header>
                 <mat-card-title class="card-title">
                   <h4 style="color: white;">Networking</h4>
@@ -274,7 +274,7 @@ <h4 style="color: white;">Networking</h4>
             </mat-card>
 
             <mat-card class="example-card speaker-card" style="background-image: linear-gradient(rgba(27, 38, 97, 0.5), rgba(27, 38, 97, 0.5)),
-            url('assets/img/event-cards/opportunities.jpg');">
+            url('https://static.sinfo.org/static/31-sinfo/websiteImages/opportunities.jpeg');">
               <mat-card-header>
                 <mat-card-title class="card-title">
                   <h4 style="color: white;">Opportunities</h4>
@@ -289,7 +289,7 @@ <h4 style="color: white;">Opportunities</h4>
             </mat-card>
 
             <mat-card class="example-card speaker-card" style="background-image: linear-gradient(rgba(27, 38, 97, 0.5), rgba(27, 38, 97, 0.5)),
-            url('assets/img/event-cards/prizes.jpg');">
+            url('https://static.sinfo.org/static/31-sinfo/websiteImages/prizes.jpeg');">
               <mat-card-header>
                 <mat-card-title class="card-title">
                   <h4 style="color: white;">Giveaways</h4>
@@ -393,7 +393,7 @@ <h6 class="heading-alt">
                   <img src="assets/img/aboutUs-min.jpg" alt="" class="img-responsive" />
                 </div>
                 <div class="col-sm-7 align-left">
-                  <h6>About</h6>
+                  <h6>About Us</h6>
                   <p>
                     SINFO is a college student and non-profitable organization responsible for the planning of one of
                     the

src/app/landing-page/partners/partners.component.html

@@ -18,7 +18,7 @@ <h3 (click)="showAll = !showAll">Partners<mat-icon [class.chev-open]="!showAll"
 
 
             <div class="row" *ngIf="partners">
-                <mat-card class="example-card speaker-card platinum" *ngFor="let partner of partners"
+                <mat-card class="example-card speaker-card silver" *ngFor="let partner of partners"
                     [ngStyle]="{'background-image': 'url(' + partner.img + ')' }">
                 </mat-card>
             </div>

src/app/landing-page/schedule/schedule.component.html

@@ -44,7 +44,7 @@ <h6 class="highlight">Presentations</h6>
                 </div>
               </ng-template>
               <div class="tab-content">
-                <div *ngFor="let presentation of day.sessions.Presentation.sala1; let iSession=index"
+                <div *ngFor="let presentation of day.sessions.Presentation.all; let iSession=index"
                   style="margin: 2%;">
 
                   <mat-card class="example-card cursor-pointer" (click)="onSelect(presentation)">
@@ -70,7 +70,6 @@ <h6 class="title">{{presentation.name}}</h6>
                 </div>
               </div>
             </mat-tab>
-
             <!-- Keynotes -->
             <mat-tab>
               <ng-template mat-tab-label>

src/app/partials/image.directive.ts

@@ -10,7 +10,7 @@ import {
 export class ImageDirective implements AfterContentInit, OnDestroy {
 
   private errorImage = 'https://static.sinfo.org/static/25-sinfo/speakers/hacky.png'
-  private loadingImage = 'assets/img/logos/loading.gif'
+  private loadingImage = 'https://static.sinfo.org/static/31-sinfo/websiteImages/loading.gif'
 
   private nativeElement: HTMLElement
   private cancelOnError: Function

src/app/partials/loading/loading.component.html

@@ -1,4 +1,4 @@
 <div *ngIf="!content" class="loading-icon">
-    <img src="../../assets/img/logos/loading.gif">
+    <img src="https://static.sinfo.org/static/31-sinfo/websiteImages/loading.gif">
     <p>Loading...</p>
 </div>

src/app/user/achievements/achievements.component.html

@@ -78,7 +78,7 @@ <h6>{{activeAchievements.keynotes[0].value}} entries each</h6>
         </div>
       </div>
 
-      <div class='row'>
+      <!-- <div class='row'>
         <h5>Lunch Talks</h5>
         <div *ngIf="activeAchievements.talks.length > 0; else noAchievements">
 
@@ -88,7 +88,7 @@ <h6>{{activeAchievements.talks[0].value}} entries each</h6>
               [ngClass]="{'unlocked': isUnlocked(achievement)}" alt="{{achievement.name}}" title="{{achievement.name}}">
           </a>
         </div>
-      </div>
+      </div> -->
 
       <!-- <div class='row'>
         <h5>Speed Dates</h5>

src/app/user/card/card.component.html

@@ -3,7 +3,7 @@
 <div class="wrapper pad" *ngIf="companiesReady">
   <div class="row">
     <!-- <h3 class="title">
-      {{signatures.day | date:'EEEE':'+0001'}}'s card
+      {{signatures.day | date:'EEEE':'+0100'}}'s card
     </h3> -->
     <h3 class="title">
       Recent Signatures.

src/app/user/pick-winner/pick-winner.component.html

@@ -40,7 +40,7 @@ <h3 class="title">Picking the winner</h3>
           <button (click)=chooseWinner() type="button" class="btn btn-secondary">Pick Winner</button>
           <button (click)=changeSession() type="button" class="btn btn-secondary">Change Session</button>
         </div>
-        <ng-template #loading><img src='assets/img/logos/loading.gif'></ng-template>
+        <ng-template #loading><img src='https://static.sinfo.org/static/31-sinfo/websiteImages/loading.gif'></ng-template>
 
       </div>