Skip to content
This repository has been archived by the owner on Sep 24, 2024. It is now read-only.

Commit

Permalink
Front-end enhancements
Browse files Browse the repository at this point in the history
  • Loading branch information
@RafaelAPB
RafaelAPB committed Jan 20, 2018
1 parent 3763745 commit 7407e81
Show file tree
Hide file tree
Showing 19 changed files with 305 additions and 263 deletions.
14 changes: 10 additions & 4 deletions angular-src/src/app/general/gce-hash-code-next/gce-hash-code-next.component.css
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
#bg{
background:url("http://groups.ist.utl.pt/gce-neiist/assets/img/ghc.jpg") no-repeat 0px 0px;
background-size:cover;
.bg{
background:url("http://groups.ist.utl.pt/gce-neiist/assets/img/ghc.jpg") no-repeat 0px 0px;
background-size:cover;
}

.container{
padding: 1em 15em 2em 15em;
opacity: 0.9;
opacity: 0.85;
}

.middlePage {
width: 70%;
height: 100%;
margin: auto;
}

.banner-info{
Expand Down
25 changes: 14 additions & 11 deletions angular-src/src/app/general/gce-hash-code-next/gce-hash-code-next.component.html
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
<div id = "bg" class="container">
<div id="fb-root"></div>
<div class="banner">
<div class="container">
<div class="banner-info text-center">
<h1>Obrigado! A tua equipa está pré-inscrita!</h1>
<p>Para a equipa fazer a inscrição,<p style="color:#008744"> todos os elementos necessitam</p><p> de completar os passos <a href="https://goo.gl/hpmiVu">seguintes</a></p>.
<p>Nota que as inscrições para o nosso Hub irão abrir dia 28 de janeiro. Segue a nossa página do Facebook com regularidade para
ficares a par das últimas novidades!</p>
<iframe src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fwww.facebook.com%2Fgce.neiist%2F&width=141&layout=button_count&action=like&size=large&show_faces=true&share=true&height=46&appId=2016815968536967" width="141" height="46" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
<div class="bg">
<div class="container middlePage">
<div class="row">
<div class="col-md-12">
<div id="fb-root"></div>

<div class="banner-info text-center">
<h1>Obrigado! A tua equipa está pré-inscrita!</h1>
<p>Para a equipa fazer a inscrição,<p style="color:#008744"> todos os elementos necessitam</p><p> de completar os passos <a href="https://goo.gl/hpmiVu">seguintes</a></p>.
<p>Nota que as inscrições para o nosso Hub irão abrir dia 28 de janeiro. Segue a nossa página do Facebook com regularidade para
ficares a par das últimas novidades!</p>
<iframe src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fwww.facebook.com%2Fgce.neiist%2F&width=141&layout=button_count&action=like&size=large&show_faces=true&share=true&height=46&appId=2016815968536967" width="141" height="46" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
</div>
</div>
</div>
</div>
</div>
</div>
4 changes: 2 additions & 2 deletions angular-src/src/app/general/gce-hash-code/gce-hash-code.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
background-size:cover;
}
.middlePage {
width: 60em;
height: 110em;
width: 70%;
height: 100%;
margin: auto;
}
.num {
Expand Down
142 changes: 74 additions & 68 deletions angular-src/src/app/general/gce-hash-code/gce-hash-code.component.html
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
<div class="bg">
<div class="container middlePage">
<div class="row">


<div class="row">
<div class="col-md-12">
<div class="centered panel panel-red">
<div class="panel-heading">Google Hash-Code</div>
</div>
</div>
</div>
<div class="row">



<div class="row">
<div class="col-md-12">
<div class="panel panel-yellow">
<div class="centered panel-heading">Procedimentos</div>
Expand Down Expand Up @@ -57,6 +62,7 @@ <h3 class="centered">Programa</h3>
</p>

<h3 class="centered">Pré-inscrição</h3>
<p>É de salientar que as inscrições serão fechadas antes de 1 de fevereiro, caso cheguemos ao limite da nossa capacidade</p>


<table class="table table-hover">
Expand All @@ -77,109 +83,109 @@ <h3 class="centered">Pré-inscrição</h3>
</tr>
</tbody>
</table>
<p>É de salientar que as inscrições serão fechadas antes de 1 de fevereiro, caso cheguemos ao limite da nossa capacidade</p>
</div>
</div>
</div>
</div>

<div class="row">
<div class="row">
<div class="col-md-12">
<div class="centered panel-heading">
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
</div>
<div class="sol-sm-6">


<div class="row">
<div class="col-md-12">
<div class="nav-tab-holder text-right">
<ul class="nav nav-tabs row" role="tablist">
<a id="pre-ins" aria-controls="home" role="tab" data-toggle="tab">PRÉ-INSCRIÇÃO</a>
</ul>
</div>
</div>


</div>

<div class="row">
<div class="col-md-12">
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="home">
<div class="row">

<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="home">
<div class="row">

<div id = "contentorProposta" class="col-xl-10" style="background-color: blue; ">

<article role="login">
<form (submit)="addPreSign()" class="signup">
<flash-messages></flash-messages>
<div id = "contentorProposta" class="col-xl-10" style="background-color: blue; ">

<div class="form-group">
<input [(ngModel)]="teamName" class="form-control" placeholder="Nome da equipa" name="TC">
</div>
<article role="login">
<form (submit)="addPreSign()" class="signup">
<flash-messages></flash-messages>

<div class="form-group">
<input [(ngModel)]="teamCaptain" class="form-control" placeholder="Nome do Team Captain" name="TCo">
</div>
<div class="form-group">
<input [(ngModel)]="teamName" class="form-control" placeholder="Nome da equipa" name="TC">
</div>

<div class="form-group">
<input [(ngModel)]="teamContactEmail" class="form-control" placeholder="E-mail do Team Captain" name="CoE">
</div>
<div class="form-group">
<input [(ngModel)]="teamCaptain" class="form-control" placeholder="Nome do Team Captain" name="TCo">
</div>

<div class="form-group">
<input [(ngModel)]="teamContactPhone" class="form-control optional" placeholder="*OPCIONAL* Contacto telefónico do Team Captain" name="Co">
</div>
<div class="form-group">
<input [(ngModel)]="teamContactEmail" class="form-control" placeholder="E-mail do Team Captain" name="CoE">
</div>

<div id = "numeroParticipantes" class="btn-group" dropdown>
<button dropdownToggle type="button" class="btn btn-primary dropdown-toggle">
Número de membros da equipa<span class="caret"></span>
</button>
<ul *dropdownMenu class="dropdown-menu" role="menu">
<li role="menuitem"><a class="dropdown-item" (click) = "setNumber($event,'2')">2 membros</a></li>
<li role="menuitem"><a class="dropdown-item" (click) = "setNumber($event,'3')">3 membros</a></li>
<li role="menuitem"><a class="dropdown-item" (click) = "setNumber($event,'4')">4 membros</a></li>
</ul>
</div>
<div class="form-group">
<input [(ngModel)]="teamContactPhone" class="form-control optional" placeholder="*OPCIONAL* Contacto telefónico do Team Captain" name="Co">
</div>

<p>O contacto telefónico permitem-nos contactar-te para confirmação da presença da tua equipa. Se estiveres na lista de espera, utilizaremos estes contactos para
te alertar quando existir uma vaga.</p><br>
<div id = "numeroParticipantes" class="btn-group" dropdown>
<button dropdownToggle type="button" class="btn btn-primary dropdown-toggle">
Número de membros da equipa<span class="caret"></span>
</button>
<ul *dropdownMenu class="dropdown-menu" role="menu">
<li role="menuitem"><a class="dropdown-item" (click) = "setNumber($event,'2')">2 membros</a></li>
<li role="menuitem"><a class="dropdown-item" (click) = "setNumber($event,'3')">3 membros</a></li>
<li role="menuitem"><a class="dropdown-item" (click) = "setNumber($event,'4')">4 membros</a></li>
</ul>
</div>

<p>Se ainda não tiveres membros de equipa, não te pré-inscrevas já. Em vez disso, coloca um post no <a href="https://www.facebook.com/events/212879605945560/">nosso evento</a>, de modo a arranjares equipa.</p>
<p>O contacto telefónico permitem-nos contactar-te para confirmação da presença da tua equipa. Se estiveres na lista de espera, utilizaremos estes contactos para
te alertar quando existir uma vaga.</p><br>

<br><br>
<div class="checkbox">
<label>
<input type="checkbox" (click)="clicked($event)"> <b>Declaro que tomei conhecimento que a pré-inscrição só garante lugar na lista de espera.</b>
</label>
</div>
<p>Se ainda não tiveres membros de equipa, não te pré-inscrevas já. Em vez disso, coloca um post no <a href="https://www.facebook.com/events/212879605945560/">nosso evento</a>, de modo a arranjares equipa.</p>

<div class="checkbox">
<label>
<input type="checkbox" (click)="clickedc($event)"><b>Subscrever a newsletter do GCE</b>, para obter novidades sobre a plataforma e eventos semelhantes.
</label>
</div>
<flash-messages></flash-messages>
<div class="form-group">
<input type="submit" class="btn btn-primary btn-block" value="Pré-inscrição,nailed it!">
</div>
<br><br>
<div class="checkbox">
<label>
<input type="checkbox" (click)="clicked($event)"> <b>Declaro que tomei conhecimento que a pré-inscrição só garante lugar na lista de espera.</b>
</label>
</div>

<div class="checkbox">
<label>
<input type="checkbox" (click)="clickedc($event)"><b>Subscrever a newsletter do GCE</b>, para obter novidades sobre a plataforma e eventos semelhantes.
</label>
</div>
<flash-messages></flash-messages>
<div class="form-group">
<input type="submit" class="btn btn-primary btn-block" value="Pré-inscrição,nailed it!">
</div>




</form>

</article>
</div>
</form>

</article>
</div>


</div>
<!-- end of row -->
</div>
<!-- end of home -->

</div>
<!-- end of row -->
</div>
<!-- end of home -->

</div>

</div>
</div>
</div>
</div>
</div>
</div>
11 changes: 7 additions & 4 deletions angular-src/src/app/general/gce-hash-code/gce-hash-code.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import {FlashMessagesService} from 'angular2-flash-messages';
import {Router} from '@angular/router';
import {StudentService} from "../../services/student.service";
import { Subscription } from 'rxjs/Subscription';
import {window} from "rxjs/operator/window";
import { AuthService} from "../../services/auth.service";
import { OnDestroy } from '@angular/core';
import { ChangeDetectorRef} from '@angular/core';

@Component({
selector: 'app-gce-hash-code',
templateUrl: './gce-hash-code.component.html',
styleUrls: ['./gce-hash-code.component.css']
})
export class GceHashCodeComponent implements OnInit {
export class GceHashCodeComponent implements OnInit,OnDestroy {
teamCaptain: string;
teamContactPhone: string;
teamContactEmail: string;
Expand All @@ -34,17 +34,20 @@ export class GceHashCodeComponent implements OnInit {
private flashMessage: FlashMessagesService,
private studentService: StudentService,
private router: Router,
private authService: AuthService
private cd: ChangeDetectorRef
) {}

ngOnInit() {
}

ngOnDestroy(): void {
this.cd.detach();
this.subscriptions.forEach((subscription: Subscription) => {
subscription.unsubscribe();

});


}

clicked(event) {
Expand Down
1 change: 1 addition & 0 deletions angular-src/src/app/general/home/home.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@

.bigFont {
font-size:10px;
padding: 10px 10px 10px 10px;
}

.white {
Expand Down
20 changes: 11 additions & 9 deletions angular-src/src/app/general/home/home.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,9 @@ <h3><a href="#">Serviços de inovação</a></h3>
<p> De momento, o GCE está a ser uma ponte entre empresas e alunos do IST.</p>
<div class="portfolio-top-left-grids">
<div class="portfolio-top-left-grid">
<div class="portfolio-top-left-grid-left">
<i class="fa fa-handshake-o missao1" aria-hidden="true"></i>
<div class="portfolio-top-left-grid-left">

</div>
<div class="portfolio-top-left-grid-right">
<h5>Reforçar laços</h5>
Expand All @@ -90,8 +91,9 @@ <h5>Reforçar laços</h5>
<div class="clearfix"> </div>
</div>
<div class="portfolio-top-left-grid">
<div class="portfolio-top-left-grid-left">
<i class="fa fa-bolt missao2" aria-hidden="true"></i>
<div class="portfolio-top-left-grid-left">

</div>
<div class="portfolio-top-left-grid-right">
<h5>Promover o Empreendedorismo</h5>
Expand All @@ -101,8 +103,9 @@ <h5>Promover o Empreendedorismo</h5>
<div class="clearfix"> </div>
</div>
<div class="portfolio-top-left-grid">
<div class="portfolio-top-left-grid-left">
<i class="fa fa-road missao3" aria-hidden="true"></i>
<div class="portfolio-top-left-grid-left">

</div>
<div class="portfolio-top-left-grid-right">
<h5>Ser a estrada que conecta empresas, alunos e professores.</h5>
Expand Down Expand Up @@ -188,7 +191,6 @@ <h4>Recolha de dados</h4>

<app-info></app-info>

<app-gce-hash-code></app-gce-hash-code>
<!--- portfolio ---->
<!---- about ---->
<!---start-about---->
Expand Down Expand Up @@ -276,7 +278,7 @@ <h5>"If you aren't willing to work for it, don't complain about not having it"</
<div class="tm-head-grid wow fadeInRight" data-wow-delay="0.4s">
<img class = "img-team" src="https://groups.ist.utl.pt/gce-neiist/assets/img/team/dr.jpg" alt="">
<h4>Daniel Ramos</h4>
<h5>"Hello there, still wondering about a life changing quote"</h5>
<h5>"Wondering about a life-changing quote"</h5>
<ul class="top-social-icons">
<a href="https://www.linkedin.com/in/daniel-r-8a285312a/"><i class="fa fa-linkedin" aria-hidden="true"></i></a>
<a href="https://github.com/danieltrt"><i class="fa fa-github" aria-hidden="true"></i></a>
Expand All @@ -300,7 +302,7 @@ <h5>"Trying to live life to its fullest while learning with every bump in the ro
<div class="tm-head-grid wow fadeInUp" data-wow-delay="0.4s">
<img class = "img-team" src="https://groups.ist.utl.pt/gce-neiist/assets/img/gce.png" alt="">
<h4>Francisco Santos</h4>
<h5>"Hello there, still wondering about a life changing quote"</h5>
<h5>"Wondering about a life-changing quote"</h5>
<ul class="top-social-icons">
<a href=""><i class="fa fa-linkedin" aria-hidden="true"></i></a>
<div class="clear"></div>
Expand All @@ -320,9 +322,9 @@ <h5>"Opportunity does not knock, it presents itself when you beat down the door.
</div> <div class="wrap">
<div class="tm-head-grids">
<div class="tm-head-grid wow fadeInLeft" data-wow-delay="0.4s">
<img class = "img-team" src="https://groups.ist.utl.pt/gce-neiist/assets/img/gce.png" alt="">
<img class = "img-team" src="https://groups.ist.utl.pt/gce-neiist/assets/img/team/i.png" alt="">
<h4>Inês Sequeira</h4>
<h5>"Hello there, still wondering about a life changing quote"</h5>
<h5>"Wondering about a life-changing quote"</h5>
<ul class="top-social-icons">
<a href="https://github.com/inesseq"><i class="fa fa-github" aria-hidden="true"></i></a>
<a href="https://www.linkedin.com/in/in%C3%AAs-sequeira-a2b6b2a6/"><i class="fa fa-linkedin" aria-hidden="true"></i></a>
Expand Down Expand Up @@ -367,7 +369,7 @@ <h5>"Meaningful things will allow you to enjoy life to its fullest."</h5>
<div class="tm-head-grid wow fadeInUp" data-wow-delay="0.2s">
<img class = "img-team" src="https://groups.ist.utl.pt/gce-neiist/assets/img/team/rafa.jpg" alt="">
<h4><a href="https://web.ist.utl.pt/rafael.belchior/">Rafael Belchior</a></h4>
<h5>"If you are reading this, cheers! Trying to give my small contribution to society, by sharing knowledge."</h5>
<h5>"I don't walk, I run!"</h5>
<ul class="top-social-icons">
<a href="https://www.linkedin.com/in/rafaelpbelchior/"><i class="fa fa-linkedin" aria-hidden="true"></i></a>
<a href="https://github.com/RafaelAPB/"><i class="fa fa-github" aria-hidden="true"></i></a>
Expand Down
Loading

0 comments on commit 7407e81

Please sign in to comment.