Merge pull request #427 from sinfo/misc/andre

Misc improvements and fixes

Author: andreromao

src/app/events/event.service.ts

@@ -61,6 +61,13 @@ export class EventService {
     }
   }
 
+  getCalendarUrl(): Observable<string> {
+    return this.http.get<string>(`${environment.cannonUrl}/calendar`, { responseType: 'text' as 'json' })
+      .pipe(
+        catchError(this.handleError<string>('getCalendarUrl', ''))
+      )
+  }
+
   /**
    * Handle Http operation that failed.
    * Let the app continue.

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

@@ -401,7 +401,7 @@ <h6>About Us</h6>
                     SINFO is a college student and non-profitable organization responsible for the planning of one of
                     the
                     biggest Tech events
-                    in Portugal. It’s an annual conference that takes place at the Alameda Campus of Técnico Lisboa, in
+                    in Portugal. It’s an annual conference that takes place at Técnico Innovation Center, in
                     the
                     capital
                     city of Portugal, Lisbon. We had a record breaking attendance of participants last year, achievement

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

@@ -9,7 +9,8 @@ <h3>Schedule</h3>
     <br />
 
     <br />
-    <a class="btn btn-sm btn-outline-clr ics" href="https://deck.sinfo.org/calendar.ics" target="_blank" style="margin-bottom: 50px">
+    <a *ngIf="calendarUrl"
+      class="btn btn-sm btn-outline-clr ics" href={{calendarUrl}} target="_blank" style="margin-bottom: 50px">
       Download calendar
       <span class="fa fa-download icon"></span>
     </a>

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

@@ -3,6 +3,7 @@ import { Router } from '@angular/router'
 
 import { Session } from '../../session/session.model'
 import { SessionService } from '../../session/session.service'
+import { EventService } from '../../events/event.service'
 
 import { environment } from '../../../environments/environment'
 
@@ -22,14 +23,17 @@ export class ScheduleComponent implements OnInit, OnChanges {
 
   sessions: Session[]
   private schedule
+  calendarUrl: string
 
   constructor(
     private sessionService: SessionService,
+    private eventService: EventService,
     private router: Router,
   ) { }
 
   ngOnInit() {
     this.getSessions()
+    this.getCalendarUrl()
     this.showOrHideDropdown()
   }
 
@@ -45,6 +49,11 @@ export class ScheduleComponent implements OnInit, OnChanges {
       })
   }
 
+  getCalendarUrl(): void {
+    this.eventService.getCalendarUrl()
+      .subscribe(url => this.calendarUrl = url)
+  }
+
   createSchedule(sessions: Session[]): void {
     let tempSchedule = []
     let registeredDays = -1

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

@@ -40,7 +40,7 @@ <h5>Gold Sponsors</h5>
         <hr>
         <h5>Silver Sponsors</h5>
         <div class="row" *ngIf="silvers.length">
-          <mat-card class="example-card speaker-card silver cursor-pointer" *ngFor="let silver of silvers" (click)="onSelect(silver)"
+          <mat-card class="example-card speaker-card silver cursor-pointer" *ngFor="let silver of silvers" (click)="visitSite(silver)"
             [ngStyle]="{'background-image': 'url(' + silver.img + ')' }">
           </mat-card>
         </div>

src/app/landing-page/sponsors/sponsors.component.ts

@@ -76,4 +76,8 @@ export class SponsorsComponent implements OnInit {
     this.router.navigate(['/sponsors', sponsor.id])
   }
 
+  visitSite(sponsor: Sponsor) {
+    if (sponsor.site) window.open(sponsor.site, '_blank')
+  }
+
 }

src/app/session/session.component.html

@@ -66,16 +66,12 @@ <h3 class="title">{{session.kind}}</h3>
 
         <div class="row session-details" *ngIf="session.kind === 'Keynote' && speaker">
           <div class="col-sm-3 col-xs-12">
-            <a (click)="onSelect(speaker.id)">
-              <img class="speaker-img" src='{{speaker.img}}'>
-            </a>
+            <img class="speaker-img" src='{{speaker.img}}'>
           </div>
 
           <div class="col-sm-9 col-xs-12 align-left justify">
-            <a (click)="onSelect(speaker.id)">
-              <h5 class="name">{{speaker.name}}</h5>
-              <h5>{{speaker.title}}</h5>
-            </a>
+            <h5 class="name">{{speaker.name}}</h5>
+            <h5>{{speaker.title}}</h5>
           </div>
         </div>
 
@@ -87,23 +83,23 @@ <h5>{{speaker.title}}</h5>
           <div class="col-md-7 col-sm-12 align-left justify">
             <h5 class="name">{{session.name}}</h5>
           <!--TODO Add the rest of the information-->
-            <div class="description-wrapper" *ngIf="session.description">
-              <p @myInsertRemoveTrigger class="description" *ngIf="showMore || session.description.length <= 300">
-                {{ session.description }}
-                <span *ngIf="showMore" (click)="showMore = !showMore" class="seeMore">
-                  <b> see less </b>
-                </span>
-              </p>
-              <p @myInsertRemoveTrigger class="description" *ngIf="!showMore && session.description.length > 300">
-                {{ session.description | slice:0:300 }}
-                <span *ngIf="!showMore" (click)="showMore = !showMore" class="seeMore">
-                  <b>... see more </b>
-                </span>
-              </p>
-            </div>
           </div>
         </div>
 
+        <div class="description-wrapper" *ngIf="session.description">
+          <p @myInsertRemoveTrigger class="description" *ngIf="showMore || session.description.length <= 300">
+            {{ session.description }}
+            <span *ngIf="showMore" (click)="showMore = !showMore" class="seeMore">
+              <b> see less </b>
+            </span>
+          </p>
+          <p @myInsertRemoveTrigger class="description" *ngIf="!showMore && session.description.length > 300">
+            {{ session.description | slice:0:300 }}
+            <span *ngIf="!showMore" (click)="showMore = !showMore" class="seeMore">
+              <b>... see more </b>
+            </span>
+          </p>
+        </div>
 
         <!--TODO Fetch users checked-in -->
 

src/app/sponsor/sponsor.component.html

@@ -61,7 +61,7 @@
 
                 <div class="row speaker-section">
                     <div class="col-sm-3 col-xs-12">
-                        <img src='{{sponsor.img}}'
+                        <img src='{{sponsor.img}}' (click)="visitSite(sponsor)"
                             onerror="this.src='https://sinfo.ams3.digitaloceanspaces.com/static/25-sinfo/speakers/hacky.png'">
                     </div>
 

src/app/sponsor/sponsor.component.ts

@@ -12,6 +12,7 @@ import { Company } from '../company/company.model';
 import { CompanyService } from '../company/company.service';
 import { EventService } from './../events/event.service'
 import { Event } from '../events/event.model';
+import { Sponsor } from '../landing-page/sponsors/sponsor.model';
 
 @Component({
   selector: 'app-sponsor',
@@ -75,5 +76,9 @@ export class SponsorComponent implements OnInit {
     this.router.navigate(['/sessions', id])
   }
 
+  visitSite(sponsor: Sponsor) {
+    if (sponsor.site) window.open(sponsor.site, '_blank')
+  }
+
 }
 

src/index.html

@@ -38,7 +38,7 @@
   <meta name="og:locale" content="en_US" />
   <meta name="fb:admins" content="134758406571284" />
   <meta name="og:type" content="website" />
-  <meta name="og:image" content="assets/img/PowerOn.png" />
+  <meta name="og:image" content="https://static.sinfo.org/static/31-sinfo/websiteImages/previewLogo-SINFO31.png" />
 
   <!-- Favicons -->
   <link rel="shortcut icon" href="favicon.ico" />