Skip to content

Commit

Permalink
* Speaker#1 announce
Browse files Browse the repository at this point in the history 
- Announcement: Speaker#1 Ravindra Kumar
- "Other speaker announce soon" after speaker details in Speaker page and also on Home page below featured-people.
- Toolbar register button redirect to Tickets section.
  • Loading branch information
@JaldeepAsodariya
JaldeepAsodariya committed Oct 23, 2017
1 parent 50ba83e commit 9ebe189
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 70 deletions.
2 changes: 1 addition & 1 deletion data/resources.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"teamPageTitle": "Team",
"teamPageText": "Google is known all around the world. Everyone is 'googling', checking on 'maps' and communicating in 'gmail'. For simple users, they are services that just works, but not for us. Developers see much more: APIs, scalability issues, complex technology stacks. And that is what GDG is about.<br><br> [Google Developers Group (GDG) Ahmedabad](http://www.meetup.com/GDG-Ahmedabad/) - is open and volunteer geek community who create exciting projects and share experience about Google technologies with a passion.<br><br> Our goal is to organize space to connect the best industry experts with Indian audience to boost development of IT.",
"declaresoon": "Declare soon",
"speakersoon": "Currently, we are accepting proposals from interested speakers till **20th October**. We will shortlist the speakers based on received application and publish the list once it gets confirmed.",
"speakersoon": "Other speakers will be announced soon.",
"schedulesoon": "We declare schedule very soon. Stay tuned with us!",
"statistics": [
{
Expand Down
Binary file added images/people/ravindra_kumar.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 12 additions & 28 deletions src/elements/featured-people.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
}

/*Declare Soon*/

.details {
@apply(--layout-vertical);
@apply(--layout-center-justified);
Expand All @@ -44,6 +45,7 @@
font-size: 24px;
font-weight: 400;
}

/*End Declare Soon*/

.people-wrapper {
Expand Down Expand Up @@ -113,29 +115,11 @@

<div class="container">
<h4 class="heading">{$ featuredPeopleTitle $}</h4>
<div class="details">
<div class="details-item" cascaded>
<div class="details-info">
<marked-element class="details-text" markdown="{$ speakersoon $}">
<div class="markdown-html"></div>
</marked-element>
</div>
</div>
</div>
<!--
<div class="people-wrapper">
<template is="dom-repeat" items="[[featuredPeople]]" as="person">
<a href$="/speakers/[[person.id]]" class="person">
<iron-image
class="photo"
src="[[person.photoUrl]]"
sizing="cover"
></iron-image>
<iron-image
class="company-logo"
src="[[person.companyLogo]]"
sizing="contain"
></iron-image>
<iron-image class="photo" src="[[person.photoUrl]]" sizing="cover"></iron-image>
<iron-image class="company-logo" src="[[person.companyLogo]]" sizing="contain"></iron-image>
<h4 class="name">[[person.name]]</h4>
<span class="company">[[person.country]]</span>
</a>
Expand All @@ -145,15 +129,15 @@ <h4 class="name">[[person.name]]</h4>
<a href="/speakers" class="block-link">
<paper-button>{$ featuredPeopleViewAll $}</paper-button>
</a>
</div>
-->
<div class="text-center">
<a href="https://docs.google.com/forms/d/e/1FAIpQLSeg41OhfG4cQnB17l7zztuA28S1rOuMH6Q3-VUq94yVoZVu4w/viewform" target="_blank" class="style-scope header-content" style="color: white; ">
<paper-button class="primary style-scope header-content x-scope paper-button-0" raised="" role="button" tabindex="0" animated="" aria-disabled="false" elevation="1">Submit a proposal</paper-button>
</a>
<div class="text-center">
<div class="details-info">
<marked-element class="details-text" markdown="{$ speakersoon $}">
<div class="markdown-html"></div>
</marked-element>
</div>
</div>
</div>
</div>

</template>

<script>
Expand Down Expand Up @@ -191,4 +175,4 @@ <h4 class="name">[[person.name]]</h4>
}());
</script>

</dom-module>
</dom-module>
14 changes: 10 additions & 4 deletions src/elements/toolbar-block.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,8 @@
</div>
</div>
</paper-menu-button>

<div class="action-button-wrapper" hidden$="[[app.isPhoneSize]]" layout horizontal center-center>
<a href="https://docs.google.com/forms/d/e/1FAIpQLSfEfa8hXx3d2_37MPzwdL1Md5r-vLtNXSMklkRPMjWGsiZSbQ/viewform" target="_blank" rel="noopener noreferrer" on-tap="_trackBuyClick">
<paper-button class="action-button">{$ buyTicket $}</paper-button>
</a>
<paper-button class="action-button" on-tap="_scrollToTickets">{$ buyTicket $}</paper-button>
</div>
</div>
</app-toolbar>
Expand Down Expand Up @@ -242,6 +239,15 @@

_trackBuyClick: function () {
HOVERBOARD.Analytics.trackEvent('ticket', 'buy_click', 'toolbar');
},

_scrollToTickets: function () {
HOVERBOARD.Analytics.trackEvent('ticket', 'buy_click', 'header');
Polymer.AppLayout.scroll({
top: HOVERBOARD.Elements.Tickets.getBoundingClientRect().top,
behavior: 'smooth',
target: HOVERBOARD.Elements.Scroller
});
}

});
Expand Down
61 changes: 24 additions & 37 deletions src/pages/speakers-page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
}

/*Declare Soon*/

.details {
@apply(--layout-vertical);
@apply(--layout-center-justified);
Expand All @@ -58,6 +59,7 @@
font-size: 24px;
font-weight: 400;
}

/*End Declare Soon*/

.speakers-container {
Expand Down Expand Up @@ -201,36 +203,14 @@
}
</style>

<app-route route="{{route}}"
pattern="/:speakerId"
data="{{routeData}}"></app-route>

<div class="container speakers-container">
<div class="details">
<div class="details-item" cascaded>
<iron-icon class="details-icon" icon="info"></iron-icon>
<div class="details-info">
<h4 class="details-title">{$ declaresoon $}</h4>
<marked-element class="details-text" markdown="{$ speakersoon $}">
<div class="markdown-html"></div>
</marked-element>
</div>
</div>

<div class="text-center">
<a href="https://docs.google.com/forms/d/e/1FAIpQLSeg41OhfG4cQnB17l7zztuA28S1rOuMH6Q3-VUq94yVoZVu4w/viewform" target="_blank" class="style-scope header-content" style="color: white; ">
<paper-button class="primary style-scope header-content x-scope paper-button-0" raised="" role="button" tabindex="0" animated="" aria-disabled="false" elevation="1">Submit a proposal</paper-button>
</a>
</div>
</div>
<app-route route="{{route}}" pattern="/:speakerId" data="{{routeData}}"></app-route>

<!--
<div class="container speakers-container">
<template is="dom-repeat" items="[[_toArray(speakers)]]" as="speaker" on-dom-change="updateCascadedNodes">
<div class="speaker" cascaded>
<paper-material class="card">
<a href$="/speakers/[[speaker.id]]/" class="header">
<iron-image src="[[speaker.photoUrl]]" class="photo placeholder-color" preload fade
sizing="cover"></iron-image>
<iron-image src="[[speaker.photoUrl]]" class="photo placeholder-color" preload fade sizing="cover"></iron-image>
<div class="photo-overlay"></div>
<ul class="badges">
<template is="dom-repeat" items="[[speaker.badges]]" as="badge">
Expand Down Expand Up @@ -259,24 +239,32 @@ <h4 class="details-title">{$ declaresoon $}</h4>
<div class="card-actions">
<template is="dom-repeat" items="[[speaker.socials]]" as="social">
<a href="[[social.link]]" target="_blank" rel="noopener noreferrer">
<paper-icon-button class="social-icon"
icon$="icons:{{social.icon}}"></paper-icon-button>
<paper-icon-button class="social-icon" icon$="icons:{{social.icon}}"></paper-icon-button>
</a>
</template>
</div>
</paper-material>
</div>
</template>
-->
</div>
<div class="container speakers-container">
<div class="details">
<div class="details-item" cascaded>
<iron-icon class="details-icon" icon="info"></iron-icon>
<div class="details-info">
<h4 class="details-title">{$ declaresoon $}</h4>
<marked-element class="details-text" markdown="{$ speakersoon $}">
<div class="markdown-html"></div>
</marked-element>
</div>
</div>
</div>
</div>

<footer-block app="{{app}}" cascaded></footer-block>

<speaker-details id="speakerDetails"
app="{{app}}"
speaker="{{_selectedSpeaker}}"
entry-animation="scale-up-animation"
exit-animation="fade-out-animation"
with-backdrop>
<speaker-details id="speakerDetails" app="{{app}}" speaker="{{_selectedSpeaker}}" entry-animation="scale-up-animation" exit-animation="fade-out-animation"
with-backdrop>
</speaker-details>

</template>
Expand Down Expand Up @@ -337,12 +325,12 @@ <h4 class="details-title">{$ declaresoon $}</h4>
}
},

_findSpeakerById: function(id) {
_findSpeakerById: function (id) {
if (!this.speakers.filter) {
return undefined;
}

return this.speakers.filter(function(s) {return s.id === +id;})[0];
return this.speakers.filter(function (s) { return s.id === +id; })[0];
},

_getCustomStyleValue: function (value) {
Expand All @@ -358,4 +346,3 @@ <h4 class="details-title">{$ declaresoon $}</h4>
</script>

</dom-module>

1 change: 1 addition & 0 deletions src/styles/shared-styles.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
--docker: #2196f3;
--chrome-extensions: #ff9800;
--progressive-web-apps: #00b4aa;
--kotlin: #686EFE;
}

[layout] {
Expand Down

0 comments on commit 9ebe189

Please sign in to comment.