Skip to content

Commit

Permalink
Fix #10 (#13)
Browse files Browse the repository at this point in the history
  • Loading branch information
aashutoshrathi authored and parth181195 committed Aug 31, 2019
1 parent 78ee1eb commit b69227d
Show file tree
Hide file tree
Showing 15 changed files with 90 additions and 69 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -42,3 +42,4 @@ testem.log
# System Files
.DS_Store
Thumbs.db
.vscode/
7 changes: 0 additions & 7 deletions .vscode/settings.json

This file was deleted.

File renamed without changes.
85 changes: 55 additions & 30 deletions src/app/components/home-page/home-page.component.html
Expand Up @@ -31,7 +31,8 @@
</div>
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-6">
<div class="wrapper">
<div class="row middle-sm center-sm middle-md center-md middle-lg center-lg">
<div class="row middle-sm center-sm middle-md center-md middle-lg
center-lg">
<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6">
<app-data-icon title='Attendees' color='#D7DF23' data='150+'></app-data-icon>
</div>
Expand All @@ -50,7 +51,8 @@
</div>
</div>
<div id="speakers">
<div class='row center-lg center-xs center-md middle-lg middle-md middle-sm middle-xs'>
<div class='row center-lg center-xs center-md middle-lg middle-md middle-sm
middle-xs'>
<div class="col-xs-12">
<app-homepage-title title='Rockstar Speakers' color='#2BB673'></app-homepage-title>
</div>
Expand All @@ -74,62 +76,72 @@
</div>
<div class='row center-lg center-xs center-md'>
<div class="col-xs-12">
<h3 class="sub-title Previous">Previous Rockstars Speakers</h3>
<h3 class="sub-title Previous">Previous Rockstars Speakers</h3>
</div>
</div>
<div class='row center-lg center-xs center-md'>
<div class="col-xs-6 col-sm-4 col-md-3 col-lg-2">
<app-profile-icon width=100 src='https://avatars2.githubusercontent.com/u/17850142?s=460&v=4'>
<app-profile-icon width=100
src='https://avatars2.githubusercontent.com/u/17850142?s=460&v=4'>
</app-profile-icon>
</div>
<div class="col-xs-6 col-sm-4 col-md-3 col-lg-2">
<app-profile-icon width=100 src='https://avatars2.githubusercontent.com/u/17850142?s=460&v=4'>
<app-profile-icon width=100
src='https://avatars2.githubusercontent.com/u/17850142?s=460&v=4'>
</app-profile-icon>
</div>
<div class="col-xs-6 col-sm-4 col-md-3 col-lg-2">
<app-profile-icon width=100 src='https://avatars2.githubusercontent.com/u/17850142?s=460&v=4'>
<app-profile-icon width=100
src='https://avatars2.githubusercontent.com/u/17850142?s=460&v=4'>
</app-profile-icon>
</div>
<div class="col-xs-6 col-sm-4 col-md-3 col-lg-2">
<app-profile-icon width=100 src='https://avatars2.githubusercontent.com/u/17850142?s=460&v=4'>
<app-profile-icon width=100
src='https://avatars2.githubusercontent.com/u/17850142?s=460&v=4'>
</app-profile-icon>
</div>
<div class="col-xs-6 col-sm-4 col-md-3 col-lg-2">
<app-profile-icon width=100 src='https://avatars2.githubusercontent.com/u/17850142?s=460&v=4'>
<app-profile-icon width=100
src='https://avatars2.githubusercontent.com/u/17850142?s=460&v=4'>
</app-profile-icon>
</div>
<div class="col-xs-6 col-sm-4 col-md-3 col-lg-2">
<app-profile-icon width=100 src='https://avatars2.githubusercontent.com/u/17850142?s=460&v=4'>
<app-profile-icon width=100
src='https://avatars2.githubusercontent.com/u/17850142?s=460&v=4'>
</app-profile-icon>
</div>
</div>
</div>


<div id="gallery">
<div class='row center-lg center-xs center-md middle-lg middle-md middle-sm middle-xs'>
<div class='row center-lg center-xs center-md middle-lg middle-md middle-sm
middle-xs'>
<div class="col-xs-12">
<app-homepage-title title='Gallery' color='#00AEEF'></app-homepage-title>
</div>
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-4" *ngFor="let item of [1,2,3,4,5,6]">
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-4" *ngFor="let item of
[1,2,3,4,5,6]">
<app-gallery-image src='assets/images/g{{item}}.JPG'></app-gallery-image>
</div>
<div class="col-xs-12" style='margin-top: 50px'>
<a mat-raised-button isRoundButton='true' target="_blank" href='https://photos.app.goo.gl/CojnpJaXwuLuqeV66'
<a mat-raised-button isRoundButton='true' target="_blank"
href='https://photos.app.goo.gl/CojnpJaXwuLuqeV66'
color='#2BB673'>View More</a>
</div>
</div>
</div>


<div id="tickets">
<div class='row center-lg center-xs center-md middle-lg middle-md middle-sm middle-xs'>
<div class='row center-lg center-xs center-md middle-lg middle-md middle-sm
middle-xs'>
<div class="col-xs-12">
<app-homepage-title title='Tickets' color='#00AEEF'></app-homepage-title>
</div>
<div class="col-xs-12" style='height: 250px'>
<div class="sub-title" style='line-height:250px;font-size: 2.5em'>
Tickets🎫 Comming Soon!
Tickets🎫 Coming Soon!
</div>
</div>
</div>
Expand All @@ -138,8 +150,9 @@ <h3 class="sub-title Previous">Previous Rockstars Speakers</h3>


<div id="team">
<div class='row center-lg center-xs center-md middle-lg middle-md middle-sm middle-xs'>
<div class="col-xs-12 ">
<div class='row center-lg center-xs center-md middle-lg middle-md middle-sm
middle-xs'>
<div class="col-xs-12">
<app-homepage-title title='Who we are?' color='#F9BC15'></app-homepage-title>
</div>
<div class="col-xs-12 col-md-12 col-lg-6">
Expand All @@ -148,36 +161,43 @@ <h3 class="sub-title Previous">Previous Rockstars Speakers</h3>
</div>
</div>
<div class="col-xs-12 col-md-12 col-lg-6">
<div class="row left-xs left-lg left-sm left-md middle-lg middle-md middle-sm middle-xs">
<div class="row left-xs left-lg left-sm left-md middle-lg middle-md
middle-sm middle-xs">
<div class="col-xs-122">

<div class='organizer section'>
<div class='organizer-title section-title'>
Organizers
</div>
<div class='organizer-details section-details'>
GDG Gandhinagar with support of many geeks from all around Gandhinagar is proud organizer of DevFest
GDG Gandhinagar with support of many geeks from all around
Gandhinagar is proud organizer of DevFest
Gandhinagar
</div>
<div class="btn">
<a mat-raised-button isRoundButton='true' target="_blank" [routerLink]="['/team']"
routerLinkActive="router-link-active" color='#2BB673'>View More</a>
<a mat-raised-button isRoundButton='true' target="_blank"
[routerLink]="['/team']"
routerLinkActive="router-link-active" color='#2BB673'>View
More</a>
</div>
</div>
</div>
<div class="col-xs-12">

<div class='gdg section'>
<div class='gdg-title section-title'>
What is Gdg Gandhinagar?
What is GDG Gandhinagar?
</div>
<div class='gdg-details section-details'>
Google Developers Group (GDG) - is open and volunteer geek community who create exciting projects and
Google Developers Group (GDG) - is an open and volunteer geek
community who create exciting projects and
share experience about Google technologies with a passion
</div>
<div class="btn">
<a mat-raised-button isRoundButton='true' target="_blank" [routerLink]="['/team']"
routerLinkActive="router-link-active" color='#2BB673'>View More</a>
<a mat-raised-button isRoundButton='true' target="_blank"
[routerLink]="['/team']"
routerLinkActive="router-link-active" color='#2BB673'>View
More</a>
</div>
</div>
</div>
Expand All @@ -186,7 +206,8 @@ <h3 class="sub-title Previous">Previous Rockstars Speakers</h3>
</div>
</div>
<div id="subscribe">
<div class='row center-lg center-xs center-md middle-lg middle-md middle-sm middle-xs'>
<div class='row center-lg center-xs center-md middle-lg middle-md middle-sm
middle-xs'>
<div class="col-xs-12 col-md-12" style='height: 150px'>
<div class="sub-title" style='line-height:150px;font-size: 2em'>
Get notified about important conference updates
Expand All @@ -198,12 +219,14 @@ <h3 class="sub-title Previous">Previous Rockstars Speakers</h3>
</div>
</div>
<div id='partners'>
<div class='row center-lg center-xs center-md middle-lg middle-md middle-sm middle-xs'>
<div class='row center-lg center-xs center-md middle-lg middle-md middle-sm
middle-xs'>
<div class="col-xs-12">
<app-homepage-title title='Partners' color='#00AEEF'></app-homepage-title>
</div>
<div class="col-xs-12 col-md-12" >
<div class="sub-title" style='line-height:50px;font-size: 1.5em;margin-bottom: 20px'>
<div class="col-xs-12 col-md-12">
<div class="sub-title" style='line-height:50px;font-size:
1.5em;margin-bottom: 20px'>
General Partner
</div>
</div>
Expand All @@ -213,10 +236,12 @@ <h3 class="sub-title Previous">Previous Rockstars Speakers</h3>
</app-partner-image>
</div>
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
<app-partner-image src='https://miro.medium.com/max/1200/1*H1r9wQa95TIYBZalJeSA5A.png'></app-partner-image>
<app-partner-image
src='https://miro.medium.com/max/1200/1*H1r9wQa95TIYBZalJeSA5A.png'></app-partner-image>
</div>
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
<app-partner-image src='https://developers.google.com/community/gdg/images/gdg_lockup.png'></app-partner-image>
<app-partner-image
src='https://developers.google.com/community/gdg/images/gdg_lockup.png'></app-partner-image>
</div>
</div>
</div>
Expand Down
11 changes: 6 additions & 5 deletions src/app/components/home-page/home-page.component.sass
@@ -1,5 +1,5 @@
.sub-title
font-family: "Product Sans"
font-family: "Open Sans"
font-size: 2em
font-weight: lighter

Expand All @@ -13,6 +13,7 @@
margin-bottom: 100px

&:after
font-family: "Open Sans"
content: "header"
position: absolute
left: 50%
Expand All @@ -23,7 +24,7 @@
#about
.wrapper
.title
font-family: "Product Sans"
font-family: "Open Sans"
font-size: 2.5em
margin-bottom: 20px

Expand All @@ -33,7 +34,7 @@
margin-bottom: 30px

.about-text
font-family: "Product Sans"
font-family: "Open Sans"
font-size: 1.1em
padding-left: 10px
position: relative
Expand Down Expand Up @@ -77,7 +78,7 @@
object-fit: cover
.section-title
padding: 5px
font-family: "Product Sans"
font-family: "Open Sans"
font-size: 1.8em
font-weight: lighter
text-align: left
Expand All @@ -87,6 +88,6 @@
.section-details
padding: 10px
text-align: left
font-family: "Product Sans"
font-family: "Open Sans"
font-size: 1em
font-weight: lighter
4 changes: 2 additions & 2 deletions src/app/elements/app-bar/app-bar.component.spec.ts
Expand Up @@ -8,9 +8,9 @@ describe('AppBarComponent', () => {

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ AppBarComponent ]
declarations: [AppBarComponent]
})
.compileComponents();
.compileComponents();
}));

beforeEach(() => {
Expand Down
4 changes: 2 additions & 2 deletions src/app/elements/app-bar/app-bar.component.ts
@@ -1,4 +1,4 @@
import { Component, OnInit, HostListener, Inject } from '@angular/core';
import { Component, OnInit, HostListener } from '@angular/core';
import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';

@Component({
Expand Down Expand Up @@ -30,7 +30,7 @@ export class AppBarComponent implements OnInit {
}
ngOnInit() {
this.isScrolled = window.pageYOffset >= 200;
console.log(window.pageYOffset);
// console.log(window.pageYOffset);
}

}
4 changes: 2 additions & 2 deletions src/app/elements/data-icon/data-icon.component.sass
Expand Up @@ -25,7 +25,7 @@
width: 100%
text-align: center
position: absolute
font-family: 'Product Sans'
font-family: 'Open Sans'
// color: #000000
transform: translate(-50%,-50%)
top: 50%
Expand All @@ -34,6 +34,6 @@
.title
margin-top: 20px
text-align: center
font-family: 'Product Sans'
font-family: 'Open Sans'
color: #ffffff
font-size: 1.5em
6 changes: 3 additions & 3 deletions src/app/elements/footer/footer.component.sass
Expand Up @@ -6,7 +6,7 @@ footer
text-transform: capitalize
font-size: 1.3em
padding: 10px 0
font-family: 'Product Sans'
font-family: 'Open Sans'

.col-list
list-style: none
Expand All @@ -19,7 +19,7 @@ footer
color: #ffffff
a
color: #ffffff80
font-family: 'Product Sans'
font-family: 'Open Sans'
text-decoration: none
.divider
background: #ffffff
Expand All @@ -37,7 +37,7 @@ footer
height: 30px
.copyright-text
line-height: 50px
font-family: 'Product Sans'
font-family: 'Open Sans'

// .social
// margin: 0
Expand Down
Expand Up @@ -10,7 +10,7 @@
margin-top: 20px

.text
font-family: "Product Sans"
font-family: "Open Sans"
color: white
margin: 0
font-weight: lighter
Expand Down
Expand Up @@ -5,7 +5,7 @@
align-items: center
margin: 40px 0
.title
font-family: "Product Sans"
font-family: "Open Sans"
font-size: 2.5em
white-space: nowrap
@media screen and (max-width: 610px)
Expand Down
@@ -1,5 +1,4 @@
import { Component, OnInit, Input } from '@angular/core';
import { Title } from '@angular/platform-browser';

@Component({
selector: 'app-homepage-title',
Expand Down
6 changes: 3 additions & 3 deletions src/app/models/speaker.model.ts
Expand Up @@ -17,9 +17,9 @@ export interface SocialMediaObject {
}

export enum SocialMediaKind {
github = 'Github',
linkedin = 'Linked In',
insta = 'InstaGram',
github = 'GitHub',
linkedin = 'LinkedIn',
insta = 'Instagram',
fb = 'Facebook',
twitter = 'Twitter',
Stackoverflow = 'Stackoverflow'
Expand Down
Binary file modified src/favicon.ico
Binary file not shown.

0 comments on commit b69227d

Please sign in to comment.