diff --git a/web/attractions.dart b/web/attractions.dart index 33a1482..1080f54 100644 --- a/web/attractions.dart +++ b/web/attractions.dart @@ -5,6 +5,8 @@ import 'card_templates.dart'; import 'washingtonpark.dart'; import 'mounthood.dart'; import 'columbiagorge.dart'; +import 'eastwillamettevalleysights.dart'; +import 'westwillamettevalleysights.dart'; class Attractions extends StatefulWidget { @override @@ -30,6 +32,18 @@ class _AttractionsState extends State { children: [ mountSaintHelens(), oregonCoast(), + InkWell( + onTap: () async { + await Navigator.push(context, MaterialPageRoute(builder: (context) => WestWillametteValleySights())); + }, + child: cardOne('Sight-See in the West Willamette Valley.'), + ), + InkWell( + onTap: () async { + await Navigator.push(context, MaterialPageRoute(builder: (context) => EastWillametteValleySights())); + }, + child: cardOne('Sight-See in the East Willamette Valley.'), + ), InkWell( onTap: () async { await Navigator.push(context, MaterialPageRoute(builder: (context) => MountHood())); diff --git a/web/eastwillamettevalleysights.dart b/web/eastwillamettevalleysights.dart new file mode 100644 index 0000000..c315345 --- /dev/null +++ b/web/eastwillamettevalleysights.dart @@ -0,0 +1,49 @@ +import 'package:flutter_web/material.dart'; +import 'defaults.dart'; +import 'prebuildcards.dart'; +import 'card_templates.dart'; + +class EastWillametteValleySights extends StatefulWidget { + @override + _EastWillametteValleySightsState createState() => _EastWillametteValleySightsState(); +} + +class _EastWillametteValleySightsState extends State { + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text('east willamette valley sights'), + 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(), + oregonGarden(), + convenienceCardOne( + 'https://oregonstateparks.org/index.cfm?do=parkPage.dsp_parkPage&parkId=151', + 'silver-falls', + 'Camp at Silver Falls State Park Oregon', + 'https://www.google.com/maps/@44.87752,-122.65513,15z', + 'silver-falls-map' + ), + ], + ), + ), + ), + ); + } +} diff --git a/web/prebuildcards.dart b/web/prebuildcards.dart index e5b4929..6696705 100644 --- a/web/prebuildcards.dart +++ b/web/prebuildcards.dart @@ -380,3 +380,23 @@ Card lostLake() { 'lost-lake-map' ); } + +Card spruceGoose() { + return convenienceCardOne( + 'https://en.wikipedia.org/wiki/Evergreen_Aviation_%26_Space_Museum', + 'spruce-goose', + 'McMinnville is convenient for the Spruce Goose and Evergreen Aviation Museum', + 'https://www.google.com/maps/@45.2031571,-123.1454622,17z', + 'spruce-goose-map' + ); +} + +Card oregonGarden() { + return 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' + ); +} diff --git a/web/silverton.dart b/web/silverton.dart index 011d9d2..034ca4a 100644 --- a/web/silverton.dart +++ b/web/silverton.dart @@ -32,13 +32,7 @@ class _SilvertonState extends State { 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' - ), + oregonGarden(), cardTwo('Water and First in Downtown Silverton','https://www.google.com/maps/@45.0052266,-122.7825282,17z','water-first'), ], ), diff --git a/web/westwillamettevalleysights.dart b/web/westwillamettevalleysights.dart new file mode 100644 index 0000000..abc792d --- /dev/null +++ b/web/westwillamettevalleysights.dart @@ -0,0 +1,52 @@ +import 'package:flutter_web/material.dart'; +import 'defaults.dart'; +import 'prebuildcards.dart'; +import 'card_templates.dart'; + +class WestWillametteValleySights extends StatefulWidget { + @override + _WestWillametteValleySightsState createState() => _WestWillametteValleySightsState(); +} + +class _WestWillametteValleySightsState extends State { + @override + Widget build(BuildContext context) { + String _wineTastingString = 'Newberg-Dundee is Oregon\'s biggest wine tasting region.'; + _wineTastingString += ' But be careful out there, because no one wants to deal with a bunch'; + _wineTastingString += ' of drunk jerks in Newberg at 1 or 2 am.'; + return Scaffold( + appBar: AppBar( + title: Text('west willamette valley sights'), + 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: [ + cardThree(_wineTastingString), + convenienceCardOne( + 'https://www.oregonwines.com/wineries/by-region/dundee-newberg-wineries/', + 'newberg-dundee-wine', + 'Some Newberg-Dundee Wine Tasting Info', + 'https://www.google.com/maps/@45.3046966,-123.0034138,12z', + 'newberg-dundee-wine-map' + ), + spruceGoose(), + ], + ), + ), + ), + ); + } +}