-
Notifications
You must be signed in to change notification settings - Fork 10
Actualización de UI #24
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
andresciceri
wants to merge
5
commits into
angularcolombia:master
Choose a base branch
from
andresciceri:lastVersion
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
423cc2f
update: nuevo template y nuevo header y footer
andresciceri a8ef774
update: nuevo package-lock.json & se adiciona el footer
andresciceri 7a9b6b9
update: styles with variables
andresciceri 2ad8ae0
update: nuevo UI para la visualización del detalle del evento
andresciceri b0d0f7a
update: se modificó archivo de estilos con variables y sin usar ID's
andresciceri File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| <app-login></app-login> | ||
| <router-outlet></router-outlet> | ||
| <router-outlet></router-outlet> | ||
| <app-footer></app-footer> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,46 @@ | ||
| <div class="card event-container"> | ||
| <div class="event-description"> | ||
| <h2>{{eventData?.name}}</h2> | ||
| <div>{{eventData?.time | date}}</div> | ||
| <div [innerHtml]="eventData?.description"></div> | ||
|
|
||
| <div> | ||
| <a [href]="eventData?.link">{{eventData?.link}}</a> | ||
| <header class="masthead"> | ||
| <div class="overlay"></div> | ||
| <div class="container"> | ||
| <div class="row"> | ||
| <div class="col-lg-8 col-md-10 mx-auto"> | ||
| <div class="site-heading"> | ||
| <h1>Evento</h1> | ||
| <span class="subheading">Unete a nuestra comunidad</span> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </header> | ||
| <div class="container"> | ||
| <div class="row"> | ||
| <div class="col-lg-8"> | ||
| <div class="event-description"> | ||
| <h2 class="display-4">{{eventData?.name}}</h2> | ||
| <p class="text-date"><i class="fa fa-calendar" aria-hidden="true"></i> {{eventData?.time | date}}</p> | ||
| <hr> | ||
| <div [innerHtml]="eventData?.description"></div> | ||
|
|
||
| <div class="event-location-attendees"> | ||
| <app-rsvp [eventId]="eventData?.id"></app-rsvp> | ||
| <h3>Lugar</h3> | ||
| <div>{{eventData?.venue.name}}</div> | ||
| <img src="{{eventData?.mapPic}}" alt="Mapa para llegar a {{eventData?.venue.name}}"> | ||
|
|
||
| <div> | ||
| {{eventData?.venue.address_1}}, {{eventData?.venue.city}}, {{eventData?.venue.localized_country_name}} | ||
| <div> | ||
| <a [href]="eventData?.link">{{eventData?.link}}</a> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="col-lg-4"> | ||
| <div class="event-location-attendees"> | ||
| <app-rsvp [eventId]="eventData?.id"></app-rsvp> | ||
| <h3 class="display-4">Lugar</h3> | ||
| <div><i class="fa fa-map-marker" aria-hidden="true"></i> {{eventData?.venue.name}}</div> | ||
| <div class="row"> | ||
| <img src="{{eventData?.mapPic}}" alt="Mapa para llegar a {{eventData?.venue.name}}"> | ||
| </div> | ||
|
|
||
| <div> | ||
| <app-attendees-list [eventId]="eventData?.id"></app-attendees-list> | ||
| <div class="row"> | ||
| <p>{{eventData?.venue.address_1}}, {{eventData?.venue.city}}</p> | ||
| <p>{{eventData?.venue.localized_country_name}}</p> | ||
| </div> | ||
| </div> | ||
| <hr> | ||
| <app-attendees-list [eventId]="eventData?.id"></app-attendees-list> | ||
| </div> | ||
| </div> | ||
| </div> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,48 @@ | ||
| .event-container | ||
| display flex | ||
| padding 0.5em | ||
| height 67vh | ||
| overflow-y auto | ||
|
|
||
| .event-description | ||
| width 70% | ||
| $fonts-text = 'Open Sans', 'Helvetica Neue', Arial, sans-serif | ||
| $color-background = #868e96 | ||
| $color-background-o = #212529 | ||
|
|
||
| h2 | ||
| margin-top 0 | ||
| margin-bottom 0 | ||
| header | ||
| &.masthead | ||
| margin-bottom 50px | ||
| background no-repeat center center | ||
| background-color $color-background | ||
| background-attachment scroll | ||
| position relative | ||
| -webkit-background-size cover | ||
| -moz-background-size cover | ||
| -o-background-size cover | ||
| background-size cover | ||
| background-image: url("../../../../assets/backgrounds/event-image.png"); | ||
|
|
||
| h3 | ||
| margin-top 0.2em | ||
| margin-bottom 0.1em | ||
| header | ||
| &.masthead | ||
| .overlay | ||
| position absolute | ||
| top 0 | ||
| left 0 | ||
| height 100% | ||
| width 100% | ||
| background-color $color-background-o | ||
| opacity .5 | ||
|
|
||
| img | ||
| width 300px | ||
| header | ||
| &.masthead | ||
| .site-heading | ||
| h1 | ||
| font-size 80px | ||
| color #fff | ||
|
|
||
| header.masthead .page-heading, header.masthead .site-heading | ||
| text-align center | ||
| padding 100px 0; | ||
|
|
||
| header.masthead .page-heading .subheading, header.masthead .site-heading .subheading | ||
|
|
||
| font-size 24px | ||
| font-weight 300 | ||
| line-height 1.1 | ||
| display block | ||
| margin 10px 0 0 | ||
| font-family $fonts-text | ||
| color #fff |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,41 @@ | ||
| import { Component, OnInit, Input } from '@angular/core'; | ||
| import { environment } from './../../../../environments/environment'; | ||
| import { MeetupService } from './../../../core/services/meetup.service'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-event', | ||
| templateUrl: './event.component.html', | ||
| styleUrls: ['./event.component.styl'] | ||
| }) | ||
| export class EventComponent implements OnInit { | ||
| @Input() public eventData; | ||
|
|
||
| eventData; | ||
|
|
||
| constructor() { } | ||
| /** | ||
| * @param meetupService {MeetupService} Injection of MeetupService | ||
| */ | ||
|
|
||
| constructor(private meetupService: MeetupService) { } | ||
|
|
||
| ngOnInit() { | ||
| this.meetupService.getNextEvents().subscribe((eventResponse) => { | ||
| const event = eventResponse[0]; | ||
| if(event.venue) { | ||
| const staticMapsUrl = `https://maps.googleapis.com/maps/api/staticmap`; | ||
| const staticMapsUrlProps = [ | ||
| ['center', `${event.venue.lat},${event.venue.lon}`], | ||
| ['zoom', '17'], | ||
| ['markers', `color:red|${event.venue.lat},${event.venue.lon}`], | ||
| ['size', '300x300'], | ||
| ['key', environment.staticMapsKey], | ||
| ].reduce((acc, elem) => acc += encodeURI(`${elem[0]}=${elem[1]}&`), '?'); | ||
|
|
||
| event.mapPic = staticMapsUrl + staticMapsUrlProps; | ||
| } | ||
|
|
||
| this.eventData = event; | ||
| console.log(this.eventData); | ||
| }); | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <section id="contact"> | ||
| <div class="container"> | ||
| <div class="row"> | ||
| <div class="col-lg-8 mx-auto text-center"> | ||
| <h2 class="section-heading">Sigamos en contacto!</h2> | ||
| <hr class="my-4"> | ||
| <p class="mb-5"></p> | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-lg-4 ml-auto text-center"> | ||
| <i class="fa fa-meetup fa-3x mb-3 sr-contact"></i> | ||
| <p> | ||
| <a href="https://www.meetup.com/es-ES/Angular-Colombia/" target="_blank">Angular Colombia</a> | ||
| </p> | ||
| </div> | ||
| <div class="col-lg-4 mr-auto text-center"> | ||
| <i class="fa fa-twitter fa-3x mb-3 sr-contact"></i> | ||
| <p> | ||
| <a href="https://twitter.com/AngularCO" target="_blank">@AngularCO</a> | ||
| </p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </section> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import { async, ComponentFixture, TestBed } from '@angular/core/testing'; | ||
|
|
||
| import { FooterComponent } from './footer.component'; | ||
|
|
||
| describe('FooterComponent', () => { | ||
| let component: FooterComponent; | ||
| let fixture: ComponentFixture<FooterComponent>; | ||
|
|
||
| beforeEach(async(() => { | ||
| TestBed.configureTestingModule({ | ||
| declarations: [ FooterComponent ] | ||
| }) | ||
| .compileComponents(); | ||
| })); | ||
|
|
||
| beforeEach(() => { | ||
| fixture = TestBed.createComponent(FooterComponent); | ||
| component = fixture.componentInstance; | ||
| fixture.detectChanges(); | ||
| }); | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy(); | ||
| }); | ||
| }); |
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| import { Component, OnInit } from '@angular/core'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-footer', | ||
| templateUrl: './footer.component.html', | ||
| styleUrls: ['./footer.component.styl'] | ||
| }) | ||
| export class FooterComponent implements OnInit { | ||
|
|
||
| constructor() { } | ||
|
|
||
| ngOnInit() { | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,25 @@ | ||
| <header> | ||
| <div class="app-header"> | ||
| <h1>Angular Colombia</h1> | ||
| <header class="masthead text-center text-white d-flex"> | ||
| <div class="overlay"></div> | ||
| <div class="container my-auto"> | ||
| <div class="row"> | ||
| <div class="col-lg-10 mx-auto"> | ||
| <h1 class="text-uppercase"> | ||
| <strong>Angular Colombia</strong> | ||
| </h1> | ||
| <hr> | ||
| </div> | ||
| <div class="col-lg-8 mx-auto"> | ||
| <div *ngIf="nextEvent" class="next-event-header"> | ||
| <h3 class="text-faded"><a [routerLink]="['/event', nextEvent.id]">{{nextEvent?.name}}</a></h3> | ||
| <p class="text-faded"><i class="fa fa-calendar" aria-hidden="true"></i> {{nextEvent?.time | date}}, {{nextEvent?.time | date: 'shortTime'}}</p> | ||
| <p class="text-faded"><i class="fa fa-map-marker" aria-hidden="true"></i> {{nextEvent?.venue.address_1}}, {{nextEvent?.venue.city}}</p> | ||
| <a class="btn btn-primary btn-xl js-scroll-trigger" [href]="nextEvent?.link" target="_blank">Unirse</a> | ||
| </div> | ||
| <div *ngIf="!nextEvent"> | ||
| <p class="text-faded mb-5">Únete a nuestra comunidad.</p> | ||
| <a class="btn btn-primary btn-xl js-scroll-trigger" href="#about">Meetup</a> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="next-event-widget-container"> | ||
| <app-event [eventData]="nextEvent"></app-event> | ||
| </div> | ||
| </header> | ||
| </header> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think is fine to use Font Awesome, but the use of Bootstrap should be reviewed. Perhaps it would be better and cleaner not to use a CSS framework.