pyc-website
main website for pyc inc.
git clone https://9o.is/git/pyc-website.git
commit f2f26249783779e0b3bd851c6cacc5640df0d3d0 parent f314be546513e409ca0d269a109119fca0912b76 Author: Jul <jul@9o.is> Date: Fri, 11 Apr 2014 00:42:59 -0400 fixed html5mode and index loads faster Diffstat:
| M | src/main/scala/bootstrap/liftweb/Boot.scala | | | 3 | --- |
| M | src/main/scala/com/pyd/config/Site.scala | | | 6 | +++--- |
| M | src/main/scala/com/pyd/lib/NgUIRouter.scala | | | 3 | ++- |
| M | src/main/scala/com/pyd/snippet/Sitemap.scala | | | 5 | +++-- |
| D | src/main/webapp/apply-atm.html | | | 145 | ------------------------------------------------------------------------------- |
| M | src/main/webapp/index.html | | | 149 | ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- |
6 files changed, 152 insertions(+), 159 deletions(-)
diff --git a/src/main/scala/bootstrap/liftweb/Boot.scala b/src/main/scala/bootstrap/liftweb/Boot.scala @@ -51,9 +51,6 @@ class Boot extends Loggable { // Build SiteMap LiftRules.setSiteMap(Site.siteMap) - - // sets the default page for index - NgUIRouterFactory.defaultRoute.default.set(Full(Site.applyATM.menu)) // Error handler ErrorHandler.init diff --git a/src/main/scala/com/pyd/config/Site.scala b/src/main/scala/com/pyd/config/Site.scala @@ -27,10 +27,11 @@ case class MenuLoc(menu: Menu) { object Site extends Locs { import MenuGroups._ + + val domain = "pydcoin.com" // locations (for top group) - val home = MenuLoc(Menu.i("Home") / "index") - val applyATM = MenuLoc(Menu.i("Apply for Bitcoin ATM") / "apply-atm" >> TopBarGroup >> UiRouterGroup >> UiRouterController("AtmApplicationCtrl")) + val home = MenuLoc(Menu.i("Apply for Bitcoin ATM") / "index" >> TopBarGroup >> UiRouterGroup) val locations = MenuLoc(Menu.i("Locations") / "locations" >> TopBarGroup >> SiteMapGroup >> UiRouterGroup >> UiRouterController("NearAtmNotifyCtrl")) val whatsBitcoin = MenuLoc(Menu.i("What Is Bitcoin") / "what-is-bitcoin" >> SiteMapGroup >> UiRouterGroup) val about = MenuLoc(Menu.i("About Us") / "about" >> TopBarGroup >> SiteMapGroup >> UiRouterGroup) @@ -58,7 +59,6 @@ object Site extends Locs { private def menus = List( home.menu, - applyATM.menu, locations.menu, whatsBitcoin.menu, about.menu, diff --git a/src/main/scala/com/pyd/lib/NgUIRouter.scala b/src/main/scala/com/pyd/lib/NgUIRouter.scala @@ -59,7 +59,8 @@ trait NgUIRouterSnip extends SnippetHelper { S.contextPath+_.loc.calcDefaultHref+"');" } openOr "" - app+".config(function($stateProvider, $urlRouterProvider) {"+ + app+".config(function($stateProvider, $urlRouterProvider,$locationProvider) {"+ + "$locationProvider.html5Mode(true);"+ otherwise+"$stateProvider"+ routes.vend.map { menu => diff --git a/src/main/scala/com/pyd/snippet/Sitemap.scala b/src/main/scala/com/pyd/snippet/Sitemap.scala @@ -1,6 +1,7 @@ package com.pyd package snippet +import config._ import org.joda.time.DateTime import net.liftweb._ import net.liftweb.http._ @@ -34,12 +35,12 @@ class SitemapContent { } openOr Nil def base: CssSel = - "loc *" #> "http://%s/#%s".format(S.hostName, baseEntry) & + "loc *" #> "http://%s%s".format(Site.domain, baseEntry) & "lastmod *" #> (new DateTime).toString("yyyy-MM-dd'T'HH:mm:ss.SSSZZ") def list: CssSel = "url *" #> entries.map(post => - "loc *" #> "http://%s/#%s".format(S.hostName, post.url) & + "loc *" #> "http://%s%s".format(Site.domain, post.url) & "lastmod *" #> post.date.toString("yyyy-MM-dd'T'HH:mm:ss.SSSZZ")) } \ No newline at end of file diff --git a/src/main/webapp/apply-atm.html b/src/main/webapp/apply-atm.html @@ -1,144 +0,0 @@ -<div data-lift="NgUIRouter.surround?withAjax=no-base&with=base-wrap&at=content"> - - <div id="content-index" class="row no-gutter"> - - <div id="applyatm-index" class="col-xs-12 col-sm-6 col-md-4"> - <div class="row"> - <div class="col-xs-12"> - - <h1 class="semibig-text text-primary"> - Are you a merchant? Apply for a Bitcoin ATM! <br/> - <small>Fill the form below & we'll contact you shortly.</small> - </h1> - </div> - </div> - - <div class="row"> - <div id="atm-benefits" class="col-xs-12 text-primary padding-20"> - <table> - <tr> - <td><i class="fa fa-wrench fa-4x"></i></td> - <td><h4>Free installation and maintenance</h4></td> - </tr> - <tr> - <td><i class="fa fa-bitcoin fa-4x pull-left"></i></td> - <td><h4>Hot and new emerging technology</h4></td> - </tr> - <tr> - <td><i class="fa fa-thumbs-up fa-4x pull-left"></i></td> - <td><h4>Increase business exposure</h4></td> - </tr> - <tr> - <td><i class="fa fa-shield fa-4x pull-left"></i></td> - <td><h4>Safe and reliable way for customers to purchase Bitcoin</h4></td> - </tr> - </table> - </div> - </div> - - <div class="row"> - <div class="col-xs-12"> - <div class="page-content text-primary"> - <h1>Bitcoin ATM Application</h1> - </div> - </div> - </div> - - <div class="row"> - <div class="col-xs-12"> - <span data-lift="embed?what=/templates-hidden/parts/apply-atm-form"></span> - </div> - </div> - - </div> - - <div class="col-xs-12 col-sm-6 col-md-8 no-padding"> - <div class="row semi-content-index"> - <div id="buysell-index" class="col-xs-12"> - <div class="jumbotron"> - <h1>Buy Bitcoin Instantly!</h1> - <p> - We provide Bitcoin services that are safe and secure, easy to use and user-friendly. - Sign up to buy and sell Bitcoin today. - </p> - <p data-lift="test_cond.loggedOut"> - <a data-lift="Menus.item?name=Register" class="btn btn-primary btn-lg" role="button">Free Sign Up Today</a> - </p> - </div> - </div> - </div> - - <div class="row semi-content-index"> - <div id="findatm-index" class="col-sm-12 col-md-6 bg-secondary-gradient"> - <div class="row"> - <div class="col-xs-12"> - <h1 class="semibig-text text-white">Find ATM Locations</h1> - </div> - </div> - - <div class="row"> - <div class="col-xs-12 padding-20"> - <span data-lift="embed?what=/templates-hidden/parts/find-atm-form"></span> - </div> - </div> - - <div class="row"> - <div class="col-xs-12"> - <img - src="http://maps.googleapis.com/maps/api/staticmap?center=40.736755,-74.033353&zoom=13&size=360x240&sensor=false" - style="width: 100%"> - </div> - </div> - - <div class="row"> - <div class="col-xs-12 text-white padding-20"> - <h4>We're in the process of finding a bussiness in the - Hoboken, NJ area to host a Bitcoin ATM.</h4> - </div> - </div> - </div> - - <div id="whoweare-index" class="col-sm-12 col-md-6 bg-primary-gradient text-white"> - <div class="row"> - <div class="col-xs-12"> - <h1 class="semibig-text text-white">Who We Are</h1> - </div> - </div> - - <div class="row"> - <div class="col-xs-12"> - <h4> - PYD is an ATM service operator for the bitcoin currency. <small - class="text-white"> We enable customers to retrieve - bitcoin instantly, just as they retrieve cash from a bank ATM. - </small> - </h4> - <br> - <a data-lift="Menus.item?name=About Us" class="btn btn-primary" type="button">Learn More About Us</a> - </div> - </div> - - <div id="atm-bitcoin-video" class="row" ng-cloak> - <div class="col-xs-12 padding-top-20"> - <div class="page-content"> - <h1>What is Bitcoin?</h1> - </div> - </div> - <div class="col-xs-12 padding-bottom-20"> - <a data-lift="Menus.item?name=What Is Bitcoin" type="button" class="btn btn-default btn-lg btn-block"> - <small>Click Here to </small><strong>Understand</strong><br> - <img src="/img/bitcoin_logo.png" style="width: 100%"></img> - </a> - </div> - <div class="col-xs-12"> - <iframe src="//www.youtube.com/embed/LP4GSvQUtBw" frameborder="0" - allowfullscreen></iframe> - </div> - </div> - - </div> - </div> - </div> - </div> - -</div> -\ No newline at end of file diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html @@ -1,6 +1,144 @@ -<div data-lift="surround?with=with-footer;at=content"> - <lift:head> - <title data-lift="Menu.title">PYD: The Easiest Way to Bitcoin</title> - </lift:head> - <div ui-view="viewA"></div> +<div data-lift="NgUIRouter.surround?withAjax=no-base&with=with-footer&at=content"> +<div ui-view="viewA"> + <div id="content-index" class="row no-gutter"> + + <div id="applyatm-index" class="col-xs-12 col-sm-6 col-md-4"> + <div class="row"> + <div class="col-xs-12"> + + <h1 class="semibig-text text-primary"> + Are you a merchant? Apply for a Bitcoin ATM! <br/> + <small>Fill the form below & we'll contact you shortly.</small> + </h1> + </div> + </div> + + <div class="row"> + <div id="atm-benefits" class="col-xs-12 text-primary padding-20"> + <table> + <tr> + <td><i class="fa fa-wrench fa-4x"></i></td> + <td><h4>Free installation and maintenance</h4></td> + </tr> + <tr> + <td><i class="fa fa-bitcoin fa-4x pull-left"></i></td> + <td><h4>Hot and new emerging technology</h4></td> + </tr> + <tr> + <td><i class="fa fa-thumbs-up fa-4x pull-left"></i></td> + <td><h4>Increase business exposure</h4></td> + </tr> + <tr> + <td><i class="fa fa-shield fa-4x pull-left"></i></td> + <td><h4>Safe and reliable way for customers to purchase Bitcoin</h4></td> + </tr> + </table> + </div> + </div> + + <div class="row"> + <div class="col-xs-12"> + <div class="page-content text-primary"> + <h1>Bitcoin ATM Application</h1> + </div> + </div> + </div> + + <div class="row"> + <div class="col-xs-12"> + <span data-lift="embed?what=/templates-hidden/parts/apply-atm-form"></span> + </div> + </div> + + </div> + + <div class="col-xs-12 col-sm-6 col-md-8 no-padding"> + <div class="row semi-content-index"> + <div id="buysell-index" class="col-xs-12"> + <div class="jumbotron"> + <h1>Buy Bitcoin Instantly!</h1> + <p> + We provide Bitcoin services that are safe and secure, easy to use and user-friendly. + Sign up to buy and sell Bitcoin today. + </p> + <p data-lift="test_cond.loggedOut"> + <a data-lift="Menus.item?name=Register" class="btn btn-primary btn-lg" role="button">Free Sign Up Today</a> + </p> + </div> + </div> + </div> + + <div class="row semi-content-index"> + <div id="findatm-index" class="col-sm-12 col-md-6 bg-secondary-gradient"> + <div class="row"> + <div class="col-xs-12"> + <h1 class="semibig-text text-white">Find ATM Locations</h1> + </div> + </div> + + <div class="row"> + <div class="col-xs-12 padding-20"> + <span data-lift="embed?what=/templates-hidden/parts/find-atm-form"></span> + </div> + </div> + + <div class="row"> + <div class="col-xs-12"> + <img + src="http://maps.googleapis.com/maps/api/staticmap?center=40.736755,-74.033353&zoom=13&size=360x240&sensor=false" + style="width: 100%"> + </div> + </div> + + <div class="row"> + <div class="col-xs-12 text-white padding-20"> + <h4>We're in the process of finding a bussiness in the + Hoboken, NJ area to host a Bitcoin ATM.</h4> + </div> + </div> + </div> + + <div id="whoweare-index" class="col-sm-12 col-md-6 bg-primary-gradient text-white"> + <div class="row"> + <div class="col-xs-12"> + <h1 class="semibig-text text-white">Who We Are</h1> + </div> + </div> + + <div class="row"> + <div class="col-xs-12"> + <h4> + PYD is an ATM service operator for the bitcoin currency. <small + class="text-white"> We enable customers to retrieve + bitcoin instantly, just as they retrieve cash from a bank ATM. + </small> + </h4> + <br> + <a data-lift="Menus.item?name=About Us" class="btn btn-primary" type="button">Learn More About Us</a> + </div> + </div> + + <div id="atm-bitcoin-video" class="row" ng-cloak> + <div class="col-xs-12 padding-top-20"> + <div class="page-content"> + <h1>What is Bitcoin?</h1> + </div> + </div> + <div class="col-xs-12 padding-bottom-20"> + <a data-lift="Menus.item?name=What Is Bitcoin" type="button" class="btn btn-default btn-lg btn-block"> + <small>Click Here to </small><strong>Understand</strong><br> + <img src="/img/bitcoin_logo.png" style="width: 100%"></img> + </a> + </div> + <div class="col-xs-12"> + <iframe src="//www.youtube.com/embed/LP4GSvQUtBw" frameborder="0" + allowfullscreen></iframe> + </div> + </div> + + </div> + </div> + </div> + </div> </div> +</div> +\ No newline at end of file