diff --git a/web/attractions.dart b/web/attractions.dart index 5f2429c..bca2079 100644 --- a/web/attractions.dart +++ b/web/attractions.dart @@ -1,7 +1,6 @@ import 'package:flutter_web/material.dart'; import 'defaults.dart'; import 'prebuildcards.dart'; -import 'card_templates.dart'; class Attractions extends StatefulWidget { @override diff --git a/web/eastcounty.dart b/web/eastcounty.dart index cc4fa21..a8e8e12 100644 --- a/web/eastcounty.dart +++ b/web/eastcounty.dart @@ -1,7 +1,6 @@ import 'package:flutter_web/material.dart'; import 'defaults.dart'; import 'card_templates.dart'; -import 'prebuildcards.dart'; class EastCounty extends StatefulWidget { @override diff --git a/web/eastwillamettevalley.dart b/web/eastwillamettevalley.dart index ffaa331..1139df7 100644 --- a/web/eastwillamettevalley.dart +++ b/web/eastwillamettevalley.dart @@ -31,8 +31,9 @@ class _EastWillametteValleyState extends State { padding: EdgeInsets.only(bottom: 6.0,), child: Column( children: [ - silverFalls(), 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', 'oregon-garden', @@ -40,7 +41,6 @@ class _EastWillametteValleyState extends State { 'https://www.google.com/maps/@44.9927687,-122.7935883,16z', 'oregon-garden-map' ), - 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 c15980c..9642ca8 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('Glisan','https://example.com','glisan'), cardTwo('Burnside','https://example.com','burnside'), cardTwo('Stark','https://example.com','stark'), cardTwo('Morrison-Belmont','https://example.com','morrison-belmont'), cardTwo('Hawthorne','https://example.com','hawthorne'), cardTwo('SE Division between 11th and 60th','https://www.google.com/maps/@45.5048718,-122.6326215,18z','division'), + mtTabor(), ], ), ), diff --git a/web/northeaststreets.dart b/web/northeaststreets.dart index 9594035..bccc17b 100644 --- a/web/northeaststreets.dart +++ b/web/northeaststreets.dart @@ -31,14 +31,14 @@ class _NorthEastStreetsState extends State { padding: EdgeInsets.only(bottom: 6.0,), child: Column( children: [ - rockyButteDrive(), - rockyButteHike(), 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(), ], ), ), diff --git a/web/northstreets.dart b/web/northstreets.dart index 2582e48..3324873 100644 --- a/web/northstreets.dart +++ b/web/northstreets.dart @@ -32,10 +32,10 @@ class _NorthStreetsState extends State { child: Column( children: [ cardTwo('Vancouver-Williams','https://example.com','vancouver-williams'), - modaCenter(), cardTwo('Mississippi-Albina','https://example.com','mississippi-albina'), - waudBluff(), cardTwo('North Lombard','https://example.com','north lombard'), + modaCenter(), + waudBluff(), ], ), ), diff --git a/web/northweststreets.dart b/web/northweststreets.dart index ca47d04..16d0267 100644 --- a/web/northweststreets.dart +++ b/web/northweststreets.dart @@ -31,8 +31,10 @@ class _NorthWestStreetsState extends State { padding: EdgeInsets.only(bottom: 6.0,), child: Column( children: [ - macleayParkPittockMansion(), 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)', 'washington-park', @@ -40,7 +42,6 @@ class _NorthWestStreetsState extends State { 'https://www.google.com/maps/@45.515833,-122.7075,15z', 'washington-park-map' ), - cardTwo('NW 23rd','https://example.com','23rd'), convenienceCardOne( 'https://en.wikipedia.org/wiki/Providence_Park', 'providence-park', @@ -48,7 +49,6 @@ class _NorthWestStreetsState extends State { 'https://www.google.com/maps/@45.521389,-122.691667,17z', 'providence-park-map' ), - cardTwo('NW 21st','https://example.com','21st'), ], ), ), diff --git a/web/sellwoodstreets.dart b/web/sellwoodstreets.dart index 0c0559c..fbd1078 100644 --- a/web/sellwoodstreets.dart +++ b/web/sellwoodstreets.dart @@ -31,6 +31,10 @@ class _SellwoodStreetsState extends State { child: Column( children: [ cardTwo('Woodstock','https://example.com','woodstock'), + cardTwo('Bybee','https://example.com','bybee'), + cardTwo('Milwaukie','https://example.com','milwaukie'), + cardTwo('SE 13th','https://example.com','13th'), + cardTwo('Tacoma','https://example.com','tacoma'), convenienceCardOne( 'https://www.portlandoregon.gov/parks/finder/index.cfm?&action=ViewPark&propertyid=27', 'crystal-springs-rhododendron-garden', @@ -38,8 +42,6 @@ class _SellwoodStreetsState extends State { 'https://www.google.com/maps/@45.479722,-122.635556,17z', 'crystal-springs-rhododendron-garden-map' ), - cardTwo('Bybee','https://example.com','bybee'), - cardTwo('Milwaukie','https://example.com','milwaukie'), convenienceCardOne( 'https://www.alltrails.com/trail/us/oregon/springwater-on-the-wilamette-north-woodland-and-bluff-trail-loop', 'springwater-on-the-willamette-trail', @@ -47,8 +49,6 @@ class _SellwoodStreetsState extends State { 'https://www.google.com/maps/@45.4762318,-122.6616333,16z', 'springwater-on-the-willamette-trail-map' ), - cardTwo('SE 13th','https://example.com','13th'), - cardTwo('Tacoma','https://example.com','tacoma'), ], ), ), diff --git a/web/stjohnsstreets.dart b/web/stjohnsstreets.dart index 6dec4e3..2879999 100644 --- a/web/stjohnsstreets.dart +++ b/web/stjohnsstreets.dart @@ -27,6 +27,7 @@ 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', @@ -34,7 +35,6 @@ class _StJohnsStreetsState extends State { 'https://www.google.com/maps/@45.5883,-122.75799,17z', 'cathedral-park' ), - cardTwo('Lombard-Ivanhoe','https://example.com','lombard-ivanhoe'), ], ), );