pyc-website

main website for pyc inc.

git clone https://9o.is/git/pyc-website.git

commit e8d400582d370c5330b6618c7b80437becf0fd0c
parent 78d7c429a5d8d9868ae96610d3396535f9660ab1
Author: Jul <jul@9o.is>
Date:   Sat, 18 Oct 2014 11:16:39 -0400

added crispins to the map

Diffstat:
Msrc/main/scala/inc/pyc/model/Atm.scala | 38+++++++++++++++++++-------------------
Msrc/main/scala/inc/pyc/snippet/AtmSnip.scala | 4++--
Msrc/main/webapp/app/mycontrollers/FindAtm.js | 6+++---
3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/main/scala/inc/pyc/model/Atm.scala b/src/main/scala/inc/pyc/model/Atm.scala @@ -141,14 +141,14 @@ object TimeOpen extends TimeOpen with BsonMetaRecord[TimeOpen] { object FeaturedAtm { import TimeOpen._ - val name = "Flat 128" + val name = "Crispins" lazy val atm: Atm = Atm.findByName(name) openOr { - val ownerEmail = "elizabeth@flat128.com" - val ownerUser = "Elizabeth_Dubois" - val ownerFname = "Elizabeth" - val ownerLname = "Dubois" + val ownerEmail = "robertetaylor@gmail.com" + val ownerUser = "Robert_Taylor" + val ownerFname = "Robert" + val ownerLname = "Taylor" val owner: User = User.findByEmail(ownerEmail) openOr { User.createRecord @@ -162,27 +162,27 @@ object FeaturedAtm { } val times = - create("11:00", "18:00") :: - create("11:00", "19:00") :: - create("11:00", "19:00") :: - create("11:00", "19:00") :: - create("11:00", "19:00") :: - create("11:00", "19:00") :: - create("11:00", "19:00") :: Nil + create("12:00", "2:00") :: + create("12:00", "2:00") :: + create("12:00", "2:00") :: + create("12:00", "2:00") :: + create("12:00", "2:00") :: + create("12:00", "2:00") :: + create("12:00", "2:00") :: Nil Atm.createRecord .name(name) - .secret("$2a$10$zsMONgzNw/Rn/QD3kPPWO.GfQFzuQpKMtDMZLquz6MtNgmTgGmID6") - .loc(LatLong(40.734229, -74.000594)) - .address("15 Christopher Street") + .secret("$2a$10$F/91Ve4n16NkgDT7GQgQUuTjDkQdxV.U1lDAPdQs5LIsbH44FB/ci") + .loc(LatLong(40.765708, -73.990707)) + .address("764 10th Ave") .city("New York") .state("New York") - .postal("10014") - .phone("(914) 582-6814") + .postal("10019") + .phone("(212) 586-0888") .owner(ownerFname + " " + ownerLname) .ownerObj(owner.id.get) - .website("http://www.flat128.com/") - .model("lamassu") + .website("http://www.crispinsnyc.com") + .model("skyhook") .timezone("America/New_York") .times(times) .save() diff --git a/src/main/scala/inc/pyc/snippet/AtmSnip.scala b/src/main/scala/inc/pyc/snippet/AtmSnip.scala @@ -130,11 +130,11 @@ class FindAtm extends AngularSnippet with Logger { /* Set featured ATM on map */ def init(o: JValue): JValue = { - /* Don't show any windows by default (for now) + //* Don't show any windows by default (for now) FeaturedAtm.atm.asJValue merge ("id" -> 1) ~ ("showWindow" -> false) - */ + //*/ diff --git a/src/main/webapp/app/mycontrollers/FindAtm.js b/src/main/webapp/app/mycontrollers/FindAtm.js @@ -97,10 +97,10 @@ angular.module("FindAtm", ['Forms', 'ngAlert', 'AtmHelper', 'Variables']) $scope.map = { center: { - latitude: 42.058938, - longitude: -75.627209 + latitude: 40.752867, + longitude: -73.984452 }, - zoom: 7, + zoom: 12, dynamicMarkers: [], markers: { fit: false