Skip to content

Commit

Permalink
Merge pull request #2 from GDG-GANDHINAGAR/home-page
Browse files Browse the repository at this point in the history
Home page
  • Loading branch information
pAditya198 authored Sep 1, 2019
2 parents decc7de + ec1168c commit 352471d
Show file tree
Hide file tree
Showing 22 changed files with 713 additions and 7 deletions.
6 changes: 6 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"@angular/cli": "~8.3.0-next.0",
"@angular/compiler-cli": "~9.0.0-next.0",
"@angular/language-service": "~9.0.0-next.0",
"@types/animejs": "^3.1.0",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
Expand Down
1 change: 1 addition & 0 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { HomePageComponent } from './components/home-page/home-page.component';
import { TeamPageComponent } from './components/team-page/team-page.component';
import { SpeakersPageComponent } from './components/speakers-page/speakers-page.component';
import { AboutPageComponent } from './components/about-page/about-page.component';
import { HomePageHeaderComponent } from './elements/home-page-header/home-page-header.component';

const routes: Routes = [
{ path: '', redirectTo: 'home', pathMatch: 'full' },
Expand Down
1 change: 1 addition & 0 deletions src/app/app.component.sass
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
position: fixed
box-shadow: none
background: #000000 !important
// box-shadow: 0 4px 58px 1px #ffffff78
z-index: 999
transition: all 0.7s ease

Expand Down
2 changes: 1 addition & 1 deletion src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export class AppComponent implements OnInit {
isMobile: boolean;
@HostListener('scroll', ['$event'])
onScroll(e) {
console.log(e.target);
// console.log(e.target);
if (e.target.scrollTop >= 200) {
this.isScrolled = true;
} else {
Expand Down
11 changes: 10 additions & 1 deletion src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ import { TeamCardComponent } from './elements/team-card/team-card.component';
import { FooterComponent } from './components/footer/footer.component';
import { TicketsComponent } from './elements/tickets/tickets.component';
import { GalleryImageComponent } from './elements/gallery-image/gallery-image.component';
import { PartnerImageComponent } from './elements/partner-image/partner-image.component';
import { FooterComponent } from './elements/footer/footer.component';
import { ReactiveFormsModule, FormsModule } from '@angular/forms';
import { HomePageHeaderComponent } from './elements/home-page-header/home-page-header.component';

@NgModule({
declarations: [
Expand All @@ -49,11 +53,16 @@ import { GalleryImageComponent } from './elements/gallery-image/gallery-image.co
TeamCardComponent,
FooterComponent,
TicketsComponent,
GalleryImageComponent
GalleryImageComponent,
PartnerImageComponent,
FooterComponent,
HomePageHeaderComponent
],
imports: [
BrowserModule,
AppRoutingModule,
ReactiveFormsModule,
FormsModule,
BrowserAnimationsModule,
MatListModule,
MatCardModule,
Expand Down
33 changes: 31 additions & 2 deletions src/app/components/home-page/home-page.component.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<!-- <div id="header">
<div id="header">
<div class="content">

</div> -->
</div>
<div class="bg">
<app-home-page-header></app-home-page-header>
</div>
</div>
<div id='about' class='container'>
<div class="row middle-lg middle-md middle-sm">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-6">
Expand Down Expand Up @@ -192,4 +197,28 @@ <h3 class="sub-title Previous">Previous Rockstars Speakers</h3>
</div>
</div>
</div>
<div id='partners'>
<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'>
General Partner
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
<app-partner-image
src='https://upload.wikimedia.org/wikipedia/commons/thumb/2/2f/Google_2015_logo.svg/1280px-Google_2015_logo.svg.png'>
</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>
</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>
</div>
</div>
</div>
</div>
<app-footer></app-footer>
6 changes: 5 additions & 1 deletion src/app/components/home-page/home-page.component.sass
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
width: 100vw
height: calc(100vh - 64px )
position: relative
margin-bottom: 100px

&:after
content: "header"
Expand All @@ -28,13 +29,16 @@

@media screen and (max-width: 930px)
font-size: 2em
@media screen and (max-width: 610px)
margin-bottom: 30px

.about-text
font-family: "Product Sans"
font-size: 1.1em
padding-left: 10px
position: relative

@media screen and (max-width: 610px)
margin-bottom: 50px
&:after
content: ""
position: absolute
Expand Down
179 changes: 179 additions & 0 deletions src/app/elements/footer/footer.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
<!-- <div class="social hide row">
<div class="share col">
<div class="text inline-block col">
SHARE
</div>
<div class="icon waves-effect waves-dark col">
<a href="https://www.facebook.com/">
<img src="assets/images/facebook.svg" alt="">
</a>
</div>
<div class="icon waves-effect waves-dark col">
<a href="https://www.facebook.com/">
<img src="assets/images/instagram.svg" alt="">
</a>
</div>
<div class="icon waves-effect waves-dark col">
<a href="https://www.facebook.com/">
<img src="assets/images/twitter.svg" alt="">
</a>
</div>
</div>
<div class="follow col">
<div class="text inline-block col">
Follow us
</div>
<div class="icon waves-effect waves-dark col">
<a href="https://www.facebook.com/">
<img src="assets/images/fb-dark.svg" alt="">
</a>
</div>
<div class="icon waves-effect waves-dark col">
<a href="https://www.facebook.com/">
<img src="assets/images/insta-dark.svg" alt="">
</a>
</div>
<div class="icon waves-effect waves-dark col">
<a href="https://www.facebook.com/">
<img src="assets/images/twitter-dark.svg" alt="">
</a>
</div>
</div>
<div class="email col">
<div class="text">
<a href="">email us</a>
</div>
</div>
</div> -->
<!-- <div class="divider hide">
</div> -->

<!-- <div class="about col-xs-12 col-s-12 col-m-6 col-l-4">
<div class="footer-section-title">
About
</div>
<ul class="list">
<li>
<a href="https://www.meetup.com/GDG-Gandhinagar/" target='_blank' class="text">
GDG Gandhinagar
</a>
</li>
<li>
<a href="https://developers.google.com/programs/community/gdg/" target="_blank" class="text">
Google Developers Group
</a>
</li>
<li>
<a routerLink="/team" class="text">
Meet the Team
</a>
</li>
</ul>
</div>
<div class="resources col-xs-12 col-s-12 col-m-6 col-l-4">
<div class="footer-section-title">
Event Resources
</div>
<ul class="list">
<li>
<a href="" class="text">
Mediakit
</a>
</li>
<li>
<a href="https://goo.gl/forms/BS1SCfp07OeZNb2S2" target="_blank" class="text">
Call for Papers
</a>
</li>
<li>
<a href="" class="text">
Faq
</a>
</li>
</ul>
</div>
<div class="Subsscribe col-xs-12 col-s-12 col-m-6 col-l-4">
<div class="footer-section-title small">
No spam, only the latest news and updates!
</div>
<form action="" [formGroup]="subscribeForm" (ngSubmit)="subscribe()">
<div class="input-field col s12">
<input #subInput id="email" name="email" formControlName="email" type="text" class="validate">
<label for="email">Email</label>
</div>
<button class="waves-effect waves-dark btn btn-arrow right" type="submit" [disabled]="!subscribeForm.valid">
<span>
Subscribe
</span>
<i class="large material-icons">arrow_forward</i>
</button>
</form>
</div>
</div>
<div class="divider"></div>
<div class="copywrite row no-marg">
<div class="col s12 m6">
<div class="logo left-align">
<img src="assets/images/gdg_logo_dark.svg" alt="">
</div>
</div>
<div class="col s12 m6">
<div class="text right-align">
© GDG Gandhinagar
</div>
</div>
</div> -->
<footer>
<div class="container">
<div class="links row ">
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
<div class="col-title">
About
</div>
<ul class="col-list">
<li><a href="https://www.meetup.com/GDG-Gandhinagar/">GDG Gandhinagar</a></li>
<li><a href="https://developers.google.com/programs/community/gdg/">Google Developers Group</a></li>
<li><a [routerLink]="['/team']">Meet the Team</a></li>
</ul>
</div>
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
<div class="col-title">
Event Resources
</div>
<ul class="col-list">
<li><a href="">Call for Papers
</a></li>
</ul>
</div>
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-4">
<div class="col-title">
title
</div>
<ul class="col-list">
<li><a href="">link</a></li>
<li><a href="">link</a></li>
<li><a href="">link</a></li>
</ul>
</div>

</div>
</div>
<div class="divider col-sm-12"></div>
<div class="container">
<div class="row copyright">

<div class="col-sm-12 col-md-6 col-lg-6">
<div class="logo left-align">
<img src="assets/images/logo_white.svg" alt="">
</div>
</div>
<div class="col-sm-12 col-md-6 col-lg-6">
<div class="copyright-text" style='text-align: right'>
© GDG Gandhinagar & DSC IITV
</div>
</div>

</div>
</div>
</footer>
Loading

0 comments on commit 352471d

Please sign in to comment.