diff --git a/web/attractions.dart b/web/attractions.dart index 1080f54..d998acc 100644 --- a/web/attractions.dart +++ b/web/attractions.dart @@ -5,6 +5,7 @@ import 'card_templates.dart'; import 'washingtonpark.dart'; import 'mounthood.dart'; import 'columbiagorge.dart'; +import 'oregoncoast.dart'; import 'eastwillamettevalleysights.dart'; import 'westwillamettevalleysights.dart'; @@ -31,7 +32,6 @@ class _AttractionsState extends State { child: Column( children: [ mountSaintHelens(), - oregonCoast(), InkWell( onTap: () async { await Navigator.push(context, MaterialPageRoute(builder: (context) => WestWillametteValleySights())); @@ -50,6 +50,12 @@ class _AttractionsState extends State { }, child: cardOne('Camp, Hike, or Sight-See on Mt Hood.'), ), + InkWell( + onTap: () async { + await Navigator.push(context, MaterialPageRoute(builder: (context) => OregonCoast())); + }, + child: cardOne('Camp, Hike, or Sight-See on the Oregon Coast.'), + ), InkWell( onTap: () async { await Navigator.push(context, MaterialPageRoute(builder: (context) => ColumbiaGorge())); diff --git a/web/columbiagorge.dart b/web/columbiagorge.dart index 14f8a7d..7585d79 100644 --- a/web/columbiagorge.dart +++ b/web/columbiagorge.dart @@ -1,8 +1,8 @@ import 'package:flutter_web/material.dart'; import 'defaults.dart'; +import 'gorgecamping.dart'; import 'prebuildcards.dart'; import 'card_templates.dart'; -import 'gorgecamping.dart'; class ColumbiaGorge extends StatefulWidget { @override diff --git a/web/gorgecamping.dart b/web/gorgecamping.dart index d42fc5f..313ffe2 100644 --- a/web/gorgecamping.dart +++ b/web/gorgecamping.dart @@ -1,8 +1,6 @@ import 'package:flutter_web/material.dart'; import 'defaults.dart'; -import 'prebuildcards.dart'; import 'card_templates.dart'; -import 'gorgecamping.dart'; class GorgeCamping extends StatefulWidget { @override diff --git a/web/hikes.dart b/web/hikes.dart index ebbbe9a..4556e74 100644 --- a/web/hikes.dart +++ b/web/hikes.dart @@ -32,10 +32,6 @@ class _HikesState extends State { padding: EdgeInsets.only(bottom: 6.0,), child: Column( children: [ - cardThree(_mapTip), - cardThree(_prepared), - cardThree(_eagleCreekClosed), - cardThree(_whiteWaterTrailClosed), macleayParkPittockMansion(), angelsRest(), multnomahFalls(), @@ -44,6 +40,10 @@ class _HikesState extends State { paradisePark(), silverFalls(), // jeffersonPark(), + cardThree(_mapTip), + cardThree(_prepared), + cardThree(_eagleCreekClosed), + cardThree(_whiteWaterTrailClosed), ], ), ), diff --git a/web/oregoncoast.dart b/web/oregoncoast.dart new file mode 100644 index 0000000..caec24a --- /dev/null +++ b/web/oregoncoast.dart @@ -0,0 +1,49 @@ +import 'package:flutter_web/material.dart'; +import 'defaults.dart'; +import 'card_templates.dart'; +import 'prebuildcards.dart'; + +class OregonCoast extends StatefulWidget { + @override + _OregonCoastState createState() => _OregonCoastState(); +} + +class _OregonCoastState extends State { + String _coastString = 'These is not a single State Park Campground on the Oregon Coast that is not Amazing!'; + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text('OregonCoast'), + 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: [ + fortStevens(), + tillamookAirMuseum(), + oregonCoastAquarium(), + seaLionCaves(), + infoCard(_coastString,'https://oregonstateparks.org/index.cfm?do=visit.dsp_find','a'), + infoCard('Watch Whales on the Oregon Coast','https://oregonstateparks.org/index.cfm?do=thingstodo.dsp_whalewatching','b'), + infoCard('Hike at the Oregon Coast.','https://www.oregonhikers.org/field_guide/Oregon_Coast_Hikes','c'), + ], + ), + ), + ), + ); + } +} diff --git a/web/prebuildcards.dart b/web/prebuildcards.dart index 6696705..85685be 100644 --- a/web/prebuildcards.dart +++ b/web/prebuildcards.dart @@ -231,16 +231,6 @@ Card mountSaintHelens() { ); } -Card oregonCoast() { - return convenienceCardOne( - 'https://en.wikipedia.org/wiki/Oregon_Coast', - 'oregon-coast', - 'Visit the Oregon Coast', - 'https://www.google.com/maps/@44.000001,-124.100001,8z', - 'oregon-coast-map' - ); -} - Card mcgloughlinPromenade() { return convenienceCardOne( 'https://www.oregonhikers.org/field_guide/McLoughlin_Promenade_Hike', @@ -400,3 +390,43 @@ Card oregonGarden() { 'oregon-garden-map' ); } + +Card oregonCoastAquarium() { + return convenienceCardOne( + 'https://en.wikipedia.org/wiki/Oregon_Coast_Aquarium', + 'oregon-aquarium', + 'Visit the Oregon Coast Aquarium in Newport', + 'https://www.google.com/maps/@44.61784,-124.04709,16z', + 'oregon-aquarium-map' + ); +} + +Card seaLionCaves() { + return convenienceCardOne( + 'https://en.wikipedia.org/wiki/Sea_Lion_Caves', + 'sea-lion-caves', + 'Visit Sea Lion Caves in Florence', + 'https://www.google.com/maps/@44.1224,-124.1276,16z', + 'sea-lion-caves-map' + ); +} + +Card fortStevens() { + return convenienceCardOne( + 'https://en.wikipedia.org/wiki/Fort_Stevens_(Oregon)', + 'fort-stevens', + 'History Buffs and beach-goers will want to explore Fort Stevens near Warrenton', + 'https://www.google.com/maps/@46.201944,-123.9625,16z', + 'fort-stevens-map' + ); +} + +Card tillamookAirMuseum() { + return convenienceCardOne( + 'https://en.wikipedia.org/wiki/Tillamook_Air_Museum', + 'tillamook-air-museum', + 'Aviation Enthusiasts will want to visit the Tillamook Air Museum.', + 'https://www.google.com/maps/@45.420391,-123.804835,16z', + 'tillamook-air-museum-map' + ); +}