diff --git a/web/eastwillamettevalley.dart b/web/eastwillamettevalley.dart index 9df684e..9b7dafa 100644 --- a/web/eastwillamettevalley.dart +++ b/web/eastwillamettevalley.dart @@ -1,7 +1,8 @@ import 'package:flutter_web/material.dart'; import 'defaults.dart'; import 'card_templates.dart'; -import 'prebuildcards.dart'; +import 'silverton.dart'; +import 'oregoncity.dart'; class EastWillametteValley extends StatefulWidget { @override @@ -31,16 +32,19 @@ class _EastWillametteValleyState extends State { padding: EdgeInsets.only(bottom: 6.0,), child: Column( children: [ - silverFalls(), - convenienceCardOne( - 'https://en.wikipedia.org/wiki/Oregon_Garden', - 'oregon-garden', - 'Silverton is convenient for a visit to Oregon Garden', - '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'), + InkWell( + onTap: () async { + await Navigator.push(context, MaterialPageRoute(builder: (context) => Silverton())); + }, + child: cardOne('Silverton (and sights)'), + ), + InkWell( + onTap: () async { + await Navigator.push(context, MaterialPageRoute(builder: (context) => OregonCity())); + }, + child: cardOne('Oregon City (and sights)'), + ), ], ), ), diff --git a/web/lakeoswego.dart b/web/lakeoswego.dart new file mode 100644 index 0000000..47cfd9f --- /dev/null +++ b/web/lakeoswego.dart @@ -0,0 +1,42 @@ +import 'package:flutter_web/material.dart'; +import 'defaults.dart'; +import 'card_templates.dart'; + +class LakeOswegoStreets extends StatefulWidget { + @override + _LakeOswegoStreetsState createState() => _LakeOswegoStreetsState(); +} + +class _LakeOswegoStreetsState extends State { + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text('walkable lake-oswego streets\nwith bars-restaurants'), + centerTitle: true, + backgroundColor: navy, + actions: [ + IconButton( + icon: Icon(Icons.home), + onPressed: () { + Navigator.of(context).popUntil((route) => route.isFirst); + }, + ), + ], + ), + backgroundColor: peacockBlue, + body: Column( + children: [ + convenienceCardOne( + 'https://en.wikipedia.org/wiki/Willamette_Shore_Trolley', + 'willamette-trolley', + 'This area of town is convenient for an excursion on the Willamette Shore Trolley', + 'https://www.google.com/maps/@45.4180967,-122.6629502,20z', + 'willamette-trolley-map' + ), + cardTwo('Downtown Lake Oswego','https://www.google.com/maps/@45.4167125,-122.6660073,16z','lake-oswego'), + ], + ), + ); + } +} diff --git a/web/oregoncity.dart b/web/oregoncity.dart new file mode 100644 index 0000000..0015b32 --- /dev/null +++ b/web/oregoncity.dart @@ -0,0 +1,58 @@ +import 'package:flutter_web/material.dart'; +import 'defaults.dart'; +import 'card_templates.dart'; +import 'prebuildcards.dart'; + +class OregonCity extends StatefulWidget { + @override + _OregonCityState createState() => _OregonCityState(); +} + +class _OregonCityState extends State { + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text('walkable small-towns\nwith bars-restaurants'), + centerTitle: true, + backgroundColor: navy, + actions: [ + IconButton( + icon: Icon(Icons.home), + onPressed: () { + Navigator.of(context).popUntil((route) => route.isFirst); + }, + ), + ], + ), + backgroundColor: peacockBlue, + body: SingleChildScrollView( + child: Container( + padding: EdgeInsets.only(bottom: 6.0,), + child: Column( + children: [ + mcgloughlinPromenade(), + convenienceCardOne( + 'https://www.nps.gov/fova/learn/historyculture/mcloughlin-house.htm', + 'mcloughlin-house', + 'History Buffs may want to visit the McGloughlin House', + 'https://www.google.com/maps/@45.3571259,-122.6056864,19z', + 'mcloughlin-house-map' + ), + convenienceCardOne( + 'https://en.wikipedia.org/wiki/Willamette_Falls', + 'willamette-falls', + 'See Willamette Falls in Oregon City', + 'https://www.google.com/maps/@45.35239,-122.61763,16z', + 'willamette-falls-map' + ), + cardTwo('See Willamette Falls from turnout on I-205 NB','https://goo.gl/maps/kMaYQafxdtHbVqFr5','main'), + cardTwo('See Willamette Falls from turnout on 99E','https://www.google.com/maps/@45.351922,-122.6141362,21z','main'), + cardTwo('Main St in Downtown Oregon City','https://www.google.com/maps/@45.3575898,-122.6072795,17z','main'), + ], + ), + ), + ), + ); + } +} diff --git a/web/oregoncityvistas.dart b/web/oregoncityvistas.dart new file mode 100644 index 0000000..f9783d5 --- /dev/null +++ b/web/oregoncityvistas.dart @@ -0,0 +1,43 @@ +import 'package:flutter_web/material.dart'; +import 'defaults.dart'; +import 'prebuildcards.dart'; +import 'card_templates.dart'; + +class OregonCityVistas extends StatefulWidget { + @override + _OregonCityVistasState createState() => _OregonCityVistasState(); +} + +class _OregonCityVistasState extends State { + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text('oregon-city-vistas'), + centerTitle: true, + backgroundColor: navy, + actions: [ + IconButton( + icon: Icon(Icons.home), + onPressed: () { + Navigator.of(context).popUntil((route) => route.isFirst); + }, + ), + ], + ), + backgroundColor: peacockBlue, + body: SingleChildScrollView( + child: Container( + padding: EdgeInsets.only(bottom: 6.0,), + child: Column( + children: [ + mcgloughlinPromenade(), + willametteFallsViewPoint(), + cardTwo('See Willamette Falls from turnout on 99E','https://www.google.com/maps/@45.351922,-122.6141362,21z','main'), + ], + ), + ), + ), + ); + } +} diff --git a/web/prebuildcards.dart b/web/prebuildcards.dart index 2490d9f..a4f309e 100644 --- a/web/prebuildcards.dart +++ b/web/prebuildcards.dart @@ -270,3 +270,23 @@ Card oregonCoast() { 'oregon-coast-map' ); } + +Card mcgloughlinPromenade() { + return convenienceCardOne( + 'https://www.oregonhikers.org/field_guide/McLoughlin_Promenade_Hike', + 'mcgloughlin-promenade', + 'Hike the McGloughlin Promenade above Downtown Oregon City and Willamette Falls', + 'https://www.google.com/maps/@45.35709,-122.60811,19z', + 'elevator-trailhead' + ); +} + +Card willametteFallsViewPoint() { + return convenienceCardOne( + 'https://en.wikipedia.org/wiki/Willamette_Falls', + 'willamette-falls', + 'See Willamette Falls from I-205 NB', + 'https://goo.gl/maps/kMaYQafxdtHbVqFr5', + 'willamette-falls-map' + ); +} diff --git a/web/silverton.dart b/web/silverton.dart new file mode 100644 index 0000000..011d9d2 --- /dev/null +++ b/web/silverton.dart @@ -0,0 +1,49 @@ +import 'package:flutter_web/material.dart'; +import 'defaults.dart'; +import 'card_templates.dart'; +import 'prebuildcards.dart'; + +class Silverton extends StatefulWidget { + @override + _SilvertonState createState() => _SilvertonState(); +} + +class _SilvertonState extends State { + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text('walkable small-towns\nwith bars-restaurants'), + centerTitle: true, + backgroundColor: navy, + actions: [ + IconButton( + icon: Icon(Icons.home), + onPressed: () { + Navigator.of(context).popUntil((route) => route.isFirst); + }, + ), + ], + ), + backgroundColor: peacockBlue, + body: SingleChildScrollView( + child: Container( + padding: EdgeInsets.only(bottom: 6.0,), + child: Column( + children: [ + silverFalls(), + convenienceCardOne( + 'https://en.wikipedia.org/wiki/Oregon_Garden', + 'oregon-garden', + 'Silverton is convenient for a visit to Oregon Garden', + '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'), + ], + ), + ), + ), + ); + } +} diff --git a/web/streetareas.dart b/web/streetareas.dart index 86449a6..add5ba1 100644 --- a/web/streetareas.dart +++ b/web/streetareas.dart @@ -7,6 +7,7 @@ import 'northstreets.dart'; import 'stjohnsstreets.dart'; import 'sellwoodstreets.dart'; import 'smalltowns.dart'; +import 'lakeoswego.dart'; import 'card_templates.dart'; class StreetAreas extends StatefulWidget { @@ -67,6 +68,12 @@ class _StreetAreasState extends State { }, child: cardOne('NorthWest'), ), + InkWell( + onTap: () async { + await Navigator.push(context, MaterialPageRoute(builder: (context) => LakeOswegoStreets())); + }, + child: cardOne('Lake Oswego'), + ), InkWell( onTap: () async { await Navigator.push(context, MaterialPageRoute(builder: (context) => SmallTowns())); diff --git a/web/vistadrives.dart b/web/vistadrives.dart index c7fe5e6..78991a5 100644 --- a/web/vistadrives.dart +++ b/web/vistadrives.dart @@ -33,6 +33,7 @@ class _VistaDrivesState extends State { waudBluff(), rockyButteDrive(), hoganButte(), + willametteFallsViewPoint(), womensForum(), crownPoint(), ], diff --git a/web/vistahikes.dart b/web/vistahikes.dart index 18b1893..c97ad67 100644 --- a/web/vistahikes.dart +++ b/web/vistahikes.dart @@ -33,6 +33,7 @@ class _VistaHikesState extends State { waudBluff(), rockyButteHike(), mtTabor(), + mcgloughlinPromenade(), olallieButte(), larchMountain(), angelsRest(), diff --git a/web/vistas.dart b/web/vistas.dart index a08e2df..b52eb51 100644 --- a/web/vistas.dart +++ b/web/vistas.dart @@ -8,6 +8,7 @@ import 'vistasnorthpdx.dart'; import 'vistasnortheastpdx.dart'; import 'vistassoutheastpdx.dart'; import 'greshamvistas.dart'; +import 'oregoncityvistas.dart'; import 'remotevistas.dart'; import 'gorgevistas.dart'; @@ -87,6 +88,12 @@ class _VistasState extends State { }, child: cardOne('Gresham'), ), + InkWell( + onTap: () async { + await Navigator.push(context, MaterialPageRoute(builder: (context) => OregonCityVistas())); + }, + child: cardOne('Oregon City'), + ), ], ), ),