Skip to content

Commit

Permalink
Merge branch 'develop-landing-page' into 132-update-landing-page-feat…
Browse files Browse the repository at this point in the history
…ures
  • Loading branch information
CSchmitz81 authored May 21, 2020
2 parents 05e4ca9 + 69511e6 commit 1abbea8
Show file tree
Hide file tree
Showing 5 changed files with 300 additions and 31 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,10 @@ _**Note:** if you're having trouble installing on Mac, try this:_
##### Checkout existing branch (optional)

git checkout <BRANCH_NAME>

_**Note:** if the branch cannot be found:_

git fetch --all
> git fetch --all
##### Install 3rd party dependencies

Expand Down
4 changes: 1 addition & 3 deletions src/ctree-app/ctree-app-icon.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,9 @@
}
</style>

<iron-meta key="rootPath" value="{{rootPath}}"></iron-meta>

<a name="Collaboraton Trees" class="ctree-item" href="[[rootPath]]">
<paper-button>
<iron-icon src="[[rootPath]]/images/app-icon-144.png"></iron-icon>
<iron-icon src="[[rootPath]]images/app-icon-144.png"></iron-icon>
</paper-button>
</a>
</template>
Expand Down
34 changes: 8 additions & 26 deletions src/ctree-app/ctree-landing.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@
<link rel="import" href="icons.html">
<link rel="import" href="features-section.html">

<link rel="import" href="../ctree-testimonials/ctree-testimonials.html">

<dom-module id="ctree-landing">
<template>
<style>
Expand Down Expand Up @@ -88,6 +90,8 @@
@apply --layout-fit;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
background-color: #DBE8DE;
color: #63A375;
}
#headerTitle, #menuButton {
display: none;
Expand Down Expand Up @@ -311,7 +315,6 @@
line-height: 40px;
font-size: 2.375em;
margin: 65px auto 20px;
color: #2B2B2B;
}
div #participate p {
font-size: 1.25em;
Expand Down Expand Up @@ -384,8 +387,8 @@
background-color: #BFBFBF;
}
#feedback.section-styling {
background-color: #F8F8F8;
color: #196848;
background-color: #DBE8DE;
color: #63A375;
}
#ctree.section-styling {
background-color: #196848;
Expand Down Expand Up @@ -424,6 +427,7 @@
font-size: 2.1em;
margin-top: 60px;
letter-spacing: .02em;
color: #2B2B2B;
}
#participate p {
color: #222322;
Expand All @@ -447,7 +451,6 @@
color: #000000;
display: flex;
}

</style>

<iron-meta key="rootPath" value="{{rootPath}}"></iron-meta>
Expand Down Expand Up @@ -501,28 +504,7 @@
<div id="overview" class="section-styling">
</div>
<div id="feedback" class="section-styling">
<p>W</p>
<p>W</p>
<p>W</p>
<p>W</p>
<p>W</p>
<p>W</p>
<p>W</p>
<p>W</p>
<p>W</p>
<p>W</p>
<p>W</p>
<p>W</p>
<p>W</p>
<p>W</p>
<p>W</p>
<p>W</p>
<p>W</p>
<p>W</p>
<p>W</p>
<p>W</p>
<p>W</p>
<p>W</p>
<ctree-testimonials></ctree-testimonials>
</div>

<features-section id="features"></features-section>
Expand Down
147 changes: 147 additions & 0 deletions src/ctree-testimonials/ctree-testimonials.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
<!--
@license
Copyright (c) 2017 Foundation For an Innovative Future (InnovativeFuture.org)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or any
later version.
Foundation For an Innovative Future reserves the right to release the
covered work, in part or in whole, under a different open source
license and/or with specific copyleft exclusions. Such a release
would not invalidate the license for this project, although the
project released with a modified license would not be considered
part of this covered work or subject to the copyleft portions of this
license even if the projects are identical.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Please email contact@innovativeFuture.org for inquiries related to
this license.
-->

<link rel="import" href="../../bower_components/polymer/polymer.html">
<link rel="import" href="../../bower_components/paper-card/paper-card.html">
<link rel="import" href="../../bower_components/iron-list/iron-list.html">
<link rel="import" href="./ctree-testimony.html">


<dom-module id="ctree-testimonials">

<template>
<style>
/* Feedback cards styles */
.feedback-container {
width: 77%;
text-align: center;
justify-content: center;
background-color: #FFFFFF;
margin-top: 78px;
margin-bottom: 88px;
padding-top: 56px;
padding-bottom: 34px;
margin-left: auto;
margin-right: auto;
-webkit-box-shadow: 3px 3px 4px 0px #696969;
-moz-box-shadow: 3px 3px 4px 0px #696969;
box-shadow: 3px 3px 4px 0px #696969;
}
.feedback-cards-header {
font-size: 5.1vh;
margin-bottom: 86px;
font-weight: bold;
}
.feedback-cards {
display: flex;
flex-wrap: wrap;
justify-content: space-around;
width: 81%;
margin: 0 auto;
}
@media (max-width: 500px) {
.feedback-container {
margin-top: 34px;
margin-bottom: 0px;
padding-top: 0px;
padding-bottom: 0px;
background-color: #DBE8DE;
box-shadow: none;
width: 100%;
}
.feedback-cards-header {
font-size: 5.65vh;
margin-bottom: 78px;
}
.feedback-cards {
width: 85%;
}
}
</style>

<div class="feedback-container">
<div class="feedback-cards-header">Feedback</div>
<div class="feedback-cards">
<template is="dom-repeat" items="{{testimonies}}">
<ctree-testimonial image={{item.image}}
handle={{item.handle}}
quote={{item.quote}}
ctree={{item.ctree}}>
</ctree-testimonial>
</template>
</div>
</div>
</template>

<script>
class CTreeTestimonials extends Polymer.Element {
static get is() { return 'ctree-testimonials' }
static get properties() {
return {
ctreeKey: String,
testimonies: {
type: Array,
value: [
{
id: "1",
image: [[rootPath]] + "/images/avatar01.jpg",
handle: "@ecojess",
quote: "Collaboration Tree allowed us to evolve our beach cleanups through evolving the idea with our community!",
ctree: ""
},
{
id: "2",
image: [[rootPath]] + "/images/avatar02.jpg",
handle: "@RyanW",
quote: "CTree is great since my voice can reach people working directly on causes I am interested and make a difference",
ctree: ""
},
{
id: "3",
image: [[rootPath]] + "/images/avatar03.jpg",
handle: "@hackforla",
quote: "Collaboration Tree helped us connect to our volunteers which led to better turn out at our local hack-nights!",
ctree: ""
},
{
id: "4",
image: [[rootPath]] + "/images/avatar04.jpg",
handle: "@Nick",
quote: "This is a test",
ctree: ""
}
]
}
}
}
}
customElements.define(CTreeTestimonials.is, CTreeTestimonials);
</script>

</dom-module>
142 changes: 142 additions & 0 deletions src/ctree-testimonials/ctree-testimony.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
<!--
@license
Copyright (c) 2017 Foundation For an Innovative Future (InnovativeFuture.org)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or any
later version.
Foundation For an Innovative Future reserves the right to release the
covered work, in part or in whole, under a different open source
license and/or with specific copyleft exclusions. Such a release
would not invalidate the license for this project, although the
project released with a modified license would not be considered
part of this covered work or subject to the copyleft portions of this
license even if the projects are identical.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Please email contact@innovativeFuture.org for inquiries related to
this license.
-->

<link rel="import" href="../../bower_components/polymer/polymer.html">
<link rel="import" href="../../bower_components/paper-card/paper-card.html">
<link rel="import" href="../../bower_components/paper-button/paper-button.html">
<link rel="import" href="../../bower_components/iron-image/iron-image.html">

<dom-module id="ctree-testimonial">
<template>
<style>
:host {
width: 271px; /* must be a specific size for flex wrapping */
}
.feedback-card {
margin-left: 3%;
margin-right: 3%;
flex-basis: 0;
flex-grow: 1;
box-shadow: 0 2px 4px 0 rgba(0,0,0,0.5);
transition: 0.3s;
margin-bottom: 90px;
}
.feedback-avatar {
margin-top: -45px;
border-radius: 50%;
box-shadow: 0 2px 4px 0 rgba(0,0,0,0.5);
width: 90px;
height: 90px;
}
.feedback-card-content {
width: 100%;
text-align: center;
justify-content: center;
}
.feedback-user {
font-size: 1.15em;
font-weight: 450;
color: #000000;
margin-top: 12px;
margin-bottom: 12px;
}
.user-horizontial-line {
width: 50%;
}
.feedback-user-content {
font-size: 0.85em;
font-weight: 500;
color: #000000;
min-height: 114px;
padding-bottom: 2px;
}
.feedback-card-button-view-ctree {
color: #FFFFFF;
font-family: Roboto;
font-size: 1.15em;
font-weight: lighter;
border-radius: 7px;
background-color: #63A375;
box-shadow: 2px 2px 3px 0 rgba(0,0,0,0.5);
padding-top: 9px;
padding-bottom: 7px;
margin-bottom: 27px;
width: 63%;
}
/* Mobile Styles */
@media (max-width: 500px) {
.feedback-card {
background-color: #FFFFFF;
}
.feedback-user {
font-size: 1.6em;
}
.feedback-user-content {
font-size: 1.15em;
}
.feedback-card-button-view-ctree {
font-size: 1.54em;
}
}
</style>
<div class=feedback-card>
<img src="[[image]]" alt="avatar" class="feedback-avatar"/>
<div class="feedback-card-content">
<div class="feedback-user">{{handle}}</div>
<hr class="user-horizontial-line" />
<div class="feedback-user-content">
<blockquote>
<p>
"{{quote}}"
</p>
</blockquote>
</div>
<div class="feedback-card-button-container">
<!-- TODO: add button click event to link back to ctree -->
<button class="feedback-card-button-view-ctree">View CTree</button>
</div>
</div>
</div>
</template>
<script>
class CTreeTestimonial extends Polymer.Element {
static get is() { return 'ctree-testimonial' }
static get properties() {
return {
image: String,
handle: String,
quote: String,
ctree: String
}
}
}
customElements.define(CTreeTestimonial.is, CTreeTestimonial);
</script>

</dom-module>

0 comments on commit 1abbea8

Please sign in to comment.