Merge pull request #3 from 0t2/master

Revise About Dialog Content

.angular-cli.json

@@ -19,7 +19,8 @@
       "testTsconfig": "tsconfig.spec.json",
       "prefix": "app",
       "styles": [
-        "styles.css"
+        "styles.css",
+        "../node_modules/font-awesome/css/font-awesome.css"
       ],
       "scripts": [],
       "environmentSource": "environments/environment.ts",

package.json

@@ -28,6 +28,7 @@
     "angulartics2": "^2.3.0",
     "core-js": "^2.4.1",
     "countries-data": "^1.0.1",
+    "font-awesome": "^4.7.0",
     "rxjs": "^5.4.1",
     "zone.js": "^0.8.14"
   },

src/app/app.module.ts

@@ -6,7 +6,6 @@ import { AppComponent } from './app.component';
 import { CustomMaterialModule } from './modules/custom-material/custom-material.module';
 import { HeaderComponent } from './components/header/header.component';
 import { ContentComponent } from './components/content/content.component';
-import { FlexLayoutModule } from '@angular/flex-layout';
 import { HttpModule } from '@angular/http';
 
 import { YogiBotService } from './services/yogi-bot.service';
@@ -27,7 +26,6 @@ import { Angulartics2Module, Angulartics2GoogleAnalytics, Angulartics2Piwik } fr
   imports: [
     BrowserModule,
     CustomMaterialModule,
-    FlexLayoutModule,
     HttpModule,
     CountryModule,
     FormsModule,

src/app/components/header/about-dialog.css

@@ -0,0 +1,6 @@
+a {
+  display: inline-block;
+  width: 200px;
+  text-decoration: none;
+  color: #3f51b5;
+}

src/app/components/header/about-dialog.html

@@ -1,35 +1,43 @@
 <h1 md-dialog-title>About</h1>
 <div md-dialog-content>
-  <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Officia mollitia totam a reprehenderit dicta, dolore porro quae
-    vitae aliquid. Minus adipisci ad fugiat, incidunt autem pariatur ratione aliquid hic debitis excepturi veritatis reiciendis
-    animi alias officiis doloribus, fuga similique aut quo cupiditate culpa. Laboriosam natus ducimus iure recusandae quia
-    quam tenetur ex dolorem cumque laborum nobis officiis labore illum nihil, corporis, officia porro optio ab at esse eligendi
-    explicabo et nemo a. Aperiam ad tempora veritatis ullam unde reprehenderit excepturi veniam, ipsa esse est magnam ratione
-    nobis amet accusantium eum molestiae eos architecto quas. Odio sunt enim, nostrum ut mollitia molestiae nam dolorem labore
-    eaque, nihil neque provident obcaecati natus necessitatibus in! Nemo et eveniet laborum neque ipsum! Necessitatibus iste
-    tempore debitis quod veritatis error quasi explicabo, dolores sequi! Ratione reiciendis alias, beatae non necessitatibus
-    itaque facere soluta eaque. Officia incidunt officiis, ipsa iusto soluta porro velit architecto voluptatum, adipisci
-    repellendus sint corrupti odit dolorem. Voluptas ea sapiente odio nemo delectus? Laborum modi sit alias voluptatum reiciendis
-    minima itaque adipisci. Perspiciatis distinctio doloribus, magnam inventore. Pariatur, magni laudantium repudiandae.
-    Provident dicta ullam officiis dolorem dolore assumenda ipsam sed eveniet! Neque, eos, architecto. Unde similique voluptate
-    repellat ipsum placeat magni dolores aspernatur aliquam dignissimos non cumque a veniam sequi natus aliquid dolorem,
-    aperiam consequuntur rem! Minus harum modi mollitia explicabo dolore quae ducimus! Distinctio, vitae saepe facere sequi,
-    obcaecati assumenda minima accusamus soluta nam harum optio impedit dolores consequatur quae ut aliquam maiores tempore
-    animi numquam. Praesentium sapiente explicabo accusantium vero autem quos, incidunt expedita quia molestiae, nam recusandae.
-    Quibusdam nisi libero cupiditate iusto exercitationem totam possimus consectetur, labore necessitatibus qui ad consequuntur
-    eveniet nulla quis beatae dolorem repudiandae ipsam quasi quaerat ab tempora facilis debitis fugit. Excepturi eaque,
-    voluptate quod, maxime ullam voluptas dolor tempore laudantium consequatur, harum deserunt quaerat repellendus? Consequuntur
-    commodi saepe itaque ullam cumque eaque ea quae modi sequi dignissimos iusto, dolorem repudiandae vero eveniet omnis
-    consectetur quaerat optio totam. Dolor consequatur dicta, ad quia vero debitis in cum laboriosam explicabo, quam fuga
-    deleniti eius necessitatibus eaque dolores modi porro, distinctio, soluta vitae repellat eveniet mollitia? Magni, repellat,
-    laboriosam. At illo, tempore consequatur accusamus consequuntur. Cumque dolor aperiam cupiditate id veritatis, minima
-    sit est, odit pariatur voluptas nostrum unde error placeat facere soluta sunt. Quod at magnam dolore ratione consequuntur
-    odit, sapiente quia fugiat, excepturi beatae! Doloribus, minus! Quae magnam doloremque natus quod similique dolorum velit
-    maxime, consequatur veritatis placeat ab tempore vero fugit et cupiditate eligendi ipsa, voluptatem expedita dignissimos
-    asperiores! Facere incidunt delectus natus beatae cum laborum nisi necessitatibus blanditiis veniam rerum, totam neque
-    praesentium asperiores hic quisquam saepe deserunt non possimus, impedit architecto error molestiae! Consequuntur voluptate
-    sint quibusdam explicabo dicta dolorem sequi amet qui quo libero totam aspernatur possimus enim quam rerum voluptatem,
-    sed praesentium consectetur vero facere fuga nihil quas! Atque, asperiores, sit magnam molestiae eveniet suscipit nemo
-    porro quibusdam impedit sed nam, alias a omnis illo consequatur deleniti! Natus commodi iusto recusandae ducimus voluptatem,
-    doloremque omnis, obcaecati eaque vitae provident ratione.</p>
+  Would you care for some tea along with some sayings and inspirational quotes? Well, YogiBot shows you sayings from YogiTea
+  and other than reading these useful quotes from famous people, you get to share them with family and friends, and spread
+  these motivational quotes to anyone you care about. YogiBot comes with a clean and neat design, and the interface is so
+  user-friendly that you’ll get the whole idea after browsing through available quotes and sayings. YogiBot has a big database
+  of hundreds of quotes and sayings, and the good news is that you get to add the missing YogiTea quotes to the database
+  by sending your desired sayings. So, if you like reading famous sayings and apply them in your life, use YogiBot for free
+  and enjoy the always updating database of the YogiTea sayings. Share the inspirational quotes with family and friends,
+  and enjoy reading them in various languages.
+
+  <hr>
+
+  <h3>What Should I Expect From YogiBot?</h3>
+
+  Well, YogiBot gathers hundreds of sayings and quotes and shows it to you randomly in a most relaxing and peaceful interface.
+  Users get to send the missing quotes to be added to the server, and they also get to share it with those who they care
+  about. Available languages are English and German, and since the sayings appear randomly with no specific category, you’ll
+  never know what comes next. The only thing you know, is that the sayings and quotes are inspirational, touching, and moving.
+  <hr>
+  <h3>YogiBot Main Features at a Glance:</h3>
+
+  <li>Clean and neat design with fresh and intuitive interface</li>
+  <li>Rich database of YogiTea sayings (and constantly updating)</li>
+  <li>Share your favorite sayings to family and friends</li>
+  <li>Send the missing quotes to be added to the server</li>
+  <li>Available in English and German</li>
+  <li>Useful for anyone</li>
+  <li>Free to use and without ads</li>
+  <br> So, grab your cup of tea, read a saying, and let us know about any bugs, questions, feature requests, or any other
+  suggestions.
+  <hr>
+  <div fxLayout="row wrap">
+    <a href="https://github.com/Crazy-Marvin/yogibot-website" target="_blank"><i class="fa fa-github" aria-hidden="true"> Code on GitHub</i></a><br>
+    <a href="https://twitter.com/OfficialYogiBot" target="_blank"><i class="fa fa-twitter" aria-hidden="true"> YogiBot on Twitter</i></a><br>
+    <a href="https://play.google.com/store/apps/details?id=rocks.poopjournal.yogibot" target="_blank"><i class="fa fa-android" aria-hidden="true"> Android app</i></a><br>
+    <a href="https://apple.com" target="_blank"><i class="fa fa-apple" aria-hidden="true"> iOS app</i></a><br>
+    <a href="https://telegram.me/YogiTelegramBot" target="_blank"><i class="fa fa-telegram" aria-hidden="true"> @YogiTelegramBot</i></a><br>
+    <a href="https://slack.com/" target="_blank"><i class="fa fa-slack" aria-hidden="true"> Slack bot</i></a><br>
+    <a href="mailto:?subject=I want you to see the awesome YogiBot site&amp;body=Check out https://poopjournal.rocks/YogiBot"><i class="fa fa-share-alt-square " aria-hidden="true"> Share YogiBot</i></a><br>
+    <a href="bitcoin:1DAzWTRQFG3i1HJJvwjPhBVT7q9zv8SxBB" target="_blank"><i class="fa fa-btc" aria-hidden="true"> Donate Bitcoin</i></a><br>
+  </div>
 </div>

src/app/components/header/header.component.ts

@@ -55,12 +55,13 @@ export class HeaderComponent implements OnInit {
 
 @Component({
   selector: 'legal-dialog',
-  templateUrl: './legal-dialog.html',
+  templateUrl: './legal-dialog.html'
 })
 export class LegalDialog { }
 
 @Component({
   selector: 'about-dialog',
   templateUrl: './about-dialog.html',
+  styleUrls: ['./about-dialog.css']
 })
 export class AboutDialog { }

src/app/modules/custom-material/custom-material.module.ts

@@ -8,7 +8,7 @@ import {
 } from '@angular/material';
 
 import { LegalDialog, AboutDialog } from '../../components/header/header.component';
-
+import { FlexLayoutModule } from '@angular/flex-layout';
 // This module is used to collect all material dependency.
 // https://material.angular.io/guide/getting-started#step-3-import-the-component-modules
 @NgModule({
@@ -21,7 +21,8 @@ import { LegalDialog, AboutDialog } from '../../components/header/header.compone
     MdButtonModule,
     MdInputModule,
     MdAutocompleteModule,
-    MdMenuModule
+    MdMenuModule,
+    FlexLayoutModule
   ],
   exports: [
     BrowserAnimationsModule,
@@ -31,7 +32,8 @@ import { LegalDialog, AboutDialog } from '../../components/header/header.compone
     MdButtonModule,
     MdInputModule,
     MdAutocompleteModule,
-    MdMenuModule
+    MdMenuModule,
+    FlexLayoutModule
   ],
   declarations: [
     LegalDialog,

yarn.lock

@@ -1779,6 +1779,10 @@ flatten@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
 
+font-awesome@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
+
 for-in@^0.1.3:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"