diff --git a/web/eastwillamettevalley.dart b/web/eastwillamettevalley.dart index 1139df7..9df684e 100644 --- a/web/eastwillamettevalley.dart +++ b/web/eastwillamettevalley.dart @@ -31,8 +31,6 @@ class _EastWillametteValleyState extends State { padding: EdgeInsets.only(bottom: 6.0,), child: Column( children: [ - cardTwo('Water and First in Downtown Silverton','https://www.google.com/maps/@45.0052266,-122.7825282,17z','water-first'), - cardTwo('Downtown Mt Angel is famous for German Food','https://www.google.com/maps/@45.0696714,-122.7991836,17z','downtown-mtangel'), silverFalls(), convenienceCardOne( 'https://en.wikipedia.org/wiki/Oregon_Garden', @@ -41,6 +39,8 @@ class _EastWillametteValleyState extends State { 'https://www.google.com/maps/@44.9927687,-122.7935883,16z', 'oregon-garden-map' ), + cardTwo('Water and First in Downtown Silverton','https://www.google.com/maps/@45.0052266,-122.7825282,17z','water-first'), + cardTwo('Downtown Mt Angel is famous for German Food','https://www.google.com/maps/@45.0696714,-122.7991836,17z','downtown-mtangel'), ], ), ), diff --git a/web/middlesoutheaststreets.dart b/web/middlesoutheaststreets.dart index 48f80b2..852942a 100644 --- a/web/middlesoutheaststreets.dart +++ b/web/middlesoutheaststreets.dart @@ -31,13 +31,13 @@ class _MiddleSouthEastStreetsState extends State { padding: EdgeInsets.only(bottom: 6.0,), child: Column( children: [ + mtTabor(), cardTwo('NE Glisan from 22nd to 30th','https://www.google.com/maps/@45.5265333,-122.6390832,18z','glisan'), cardTwo('East Burnside from Grand Ave to 32nd','https://www.google.com/maps/@45.5229846,-122.6464803,16z','burnside'), cardTwo('SE Morrison-Belmont from Grand Ave to 11th','https://www.google.com/maps/@45.5168686,-122.6573149,18z','morrison-belmont'), cardTwo('SE Belmont from 23rd to 47th','https://www.google.com/maps/@45.5164842,-122.6281218,16z','belmont'), cardTwo('SE Hawthorne from 9th to 49th','https://www.google.com/maps/@45.5119538,-122.6358274,15z','hawthorne'), cardTwo('SE Division between 10th and 50th','https://www.google.com/maps/@45.5047459,-122.634429,15z','division'), - mtTabor(), ], ), ), diff --git a/web/northeaststreets.dart b/web/northeaststreets.dart index bccc17b..478f7fa 100644 --- a/web/northeaststreets.dart +++ b/web/northeaststreets.dart @@ -31,14 +31,13 @@ class _NorthEastStreetsState extends State { padding: EdgeInsets.only(bottom: 6.0,), child: Column( children: [ - cardTwo('Killingsworth','https://example.com','killingsworth'), - cardTwo('Alberta','https://example.com','alberta'), - cardTwo('Freemont','https://example.com','freemont'), - cardTwo('Sandy','https://example.com','sandy'), - cardTwo('Weidler-Broadway','https://example.com','weidler-broadway'), modaCenter(), rockyButteDrive(), rockyButteHike(), + cardTwo('NE Alberta, 9th to 32nd','https://www.google.com/maps/@45.5591051,-122.6447643,16z','alberta'), + cardTwo('NE Freemont, 40th to 51st','https://www.google.com/maps/@45.5483097,-122.6163709,17z','freemont'), + cardTwo('NE Sandy, 40th to 75th','https://www.google.com/maps/@45.5422545,-122.6045048,16z','sandy'), + cardTwo('NE Weidler-Broadway, MLK to 28th','https://www.google.com/maps/@45.534722,-122.6490053,16z','weidler-broadway'), ], ), ), diff --git a/web/northstreets.dart b/web/northstreets.dart index 3324873..a9926e9 100644 --- a/web/northstreets.dart +++ b/web/northstreets.dart @@ -31,11 +31,11 @@ class _NorthStreetsState extends State { padding: EdgeInsets.only(bottom: 6.0,), child: Column( children: [ + modaCenter(), + waudBluff(), cardTwo('Vancouver-Williams','https://example.com','vancouver-williams'), cardTwo('Mississippi-Albina','https://example.com','mississippi-albina'), cardTwo('North Lombard','https://example.com','north lombard'), - modaCenter(), - waudBluff(), ], ), ), diff --git a/web/northweststreets.dart b/web/northweststreets.dart index 16d0267..009c419 100644 --- a/web/northweststreets.dart +++ b/web/northweststreets.dart @@ -31,9 +31,6 @@ class _NorthWestStreetsState extends State { padding: EdgeInsets.only(bottom: 6.0,), child: Column( children: [ - cardTwo('Vaughn','https://example.com','vaughn'), - cardTwo('NW 23rd','https://example.com','23rd'), - cardTwo('NW 21st','https://example.com','21st'), macleayParkPittockMansion(), convenienceCardOne( 'https://en.wikipedia.org/wiki/Washington_Park_(Portland,_Oregon)', @@ -49,6 +46,9 @@ class _NorthWestStreetsState extends State { 'https://www.google.com/maps/@45.521389,-122.691667,17z', 'providence-park-map' ), + cardTwo('Vaughn','https://example.com','vaughn'), + cardTwo('NW 23rd','https://example.com','23rd'), + cardTwo('NW 21st','https://example.com','21st'), ], ), ), diff --git a/web/sellwoodstreets.dart b/web/sellwoodstreets.dart index feaccd1..db2b8b8 100644 --- a/web/sellwoodstreets.dart +++ b/web/sellwoodstreets.dart @@ -30,9 +30,6 @@ class _SellwoodStreetsState extends State { padding: EdgeInsets.only(bottom: 6.0,), child: Column( children: [ - cardTwo('SE Woodstock from 42nd to 50th','https://www.google.com/maps/@45.4791687,-122.6158324,18z','woodstock'), - cardTwo('SE Milwaukie, Tolman to Knapp','https://www.google.com/maps/@45.4741145,-122.6483169,17z','milwaukie'), - cardTwo('SE 13th from Umatilla to Malden','https://www.google.com/maps/@45.4662368,-122.6532889,17z','13th'), convenienceCardOne( 'https://www.portlandoregon.gov/parks/finder/index.cfm?&action=ViewPark&propertyid=27', 'crystal-springs-rhododendron-garden', @@ -47,6 +44,9 @@ class _SellwoodStreetsState extends State { 'https://www.google.com/maps/@45.4762318,-122.6616333,16z', 'springwater-on-the-willamette-trail-map' ), + cardTwo('SE Woodstock from 42nd to 50th','https://www.google.com/maps/@45.4791687,-122.6158324,18z','woodstock'), + cardTwo('SE Milwaukie, Tolman to Knapp','https://www.google.com/maps/@45.4741145,-122.6483169,17z','milwaukie'), + cardTwo('SE 13th from Umatilla to Malden','https://www.google.com/maps/@45.4662368,-122.6532889,17z','13th'), ], ), ), diff --git a/web/stjohnsstreets.dart b/web/stjohnsstreets.dart index 2879999..6dec4e3 100644 --- a/web/stjohnsstreets.dart +++ b/web/stjohnsstreets.dart @@ -27,7 +27,6 @@ class _StJohnsStreetsState extends State { backgroundColor: peacockBlue, body: Column( children: [ - cardTwo('Lombard-Ivanhoe','https://example.com','lombard-ivanhoe'), convenienceCardOne( 'https://en.wikipedia.org/wiki/Cathedral_Park_(Portland,_Oregon)', 'Cathedral Park', @@ -35,6 +34,7 @@ class _StJohnsStreetsState extends State { 'https://www.google.com/maps/@45.5883,-122.75799,17z', 'cathedral-park' ), + cardTwo('Lombard-Ivanhoe','https://example.com','lombard-ivanhoe'), ], ), ); diff --git a/web/westwillamettevalley.dart b/web/westwillamettevalley.dart index 385b809..fd0aa51 100644 --- a/web/westwillamettevalley.dart +++ b/web/westwillamettevalley.dart @@ -30,8 +30,6 @@ class _WestWillametteValleyState extends State { padding: EdgeInsets.only(bottom: 6.0,), child: Column( children: [ - cardTwo('Newberg-Dundee is a Wine-Tasting Destination','https://www.google.com/maps/@45.3007635,-122.9754037,17z','downtown-newberg'), - cardTwo('3rd St in Downtown McMinnville','https://www.google.com/maps/@45.2099371,-123.1927857,16z','downtown-mcminnville'), convenienceCardOne( 'https://en.wikipedia.org/wiki/Evergreen_Aviation_%26_Space_Museum', 'spruce-goose', @@ -39,6 +37,8 @@ class _WestWillametteValleyState extends State { 'https://www.google.com/maps/@45.2031571,-123.1454622,17z', 'spruce-goose-map' ), + cardTwo('Newberg-Dundee is a Wine-Tasting Destination','https://www.google.com/maps/@45.3007635,-122.9754037,17z','downtown-newberg'), + cardTwo('3rd St in Downtown McMinnville','https://www.google.com/maps/@45.2099371,-123.1927857,16z','downtown-mcminnville'), ], ), ),