rearrange street lists

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

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

web/eastwillamettevalley.dart

@@ -31,8 +31,9 @@ class _EastWillametteValleyState extends State<EastWillametteValley> {
           padding: EdgeInsets.only(bottom: 6.0,),
           child: Column(
             children: <Widget>[
-              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<EastWillametteValley> {
                 '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'),
             ],
           ),
         ),

web/middlesoutheaststreets.dart

@@ -31,13 +31,13 @@ class _MiddleSouthEastStreetsState extends State<MiddleSouthEastStreets> {
           padding: EdgeInsets.only(bottom: 6.0,),
           child: Column(
             children: <Widget>[
-              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(),
             ],
           ),
         ),

web/northeaststreets.dart

@@ -31,14 +31,14 @@ class _NorthEastStreetsState extends State<NorthEastStreets> {
           padding: EdgeInsets.only(bottom: 6.0,),
           child: Column(
             children: <Widget>[
-              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(),
             ],
           ),
         ),

web/northstreets.dart

@@ -32,10 +32,10 @@ class _NorthStreetsState extends State<NorthStreets> {
           child: Column(
             children: <Widget>[
               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(),
             ],
           ),
         ),

web/northweststreets.dart

@@ -31,8 +31,10 @@ class _NorthWestStreetsState extends State<NorthWestStreets> {
           padding: EdgeInsets.only(bottom: 6.0,),
           child: Column(
             children: <Widget>[
-              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<NorthWestStreets> {
                 '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<NorthWestStreets> {
                 'https://www.google.com/maps/@45.521389,-122.691667,17z',
                 'providence-park-map'
               ),
-              cardTwo('NW 21st','https://example.com','21st'),
             ],
           ),
         ),

web/sellwoodstreets.dart

@@ -31,6 +31,10 @@ class _SellwoodStreetsState extends State<SellwoodStreets> {
           child: Column(
             children: <Widget>[
               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<SellwoodStreets> {
                 '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<SellwoodStreets> {
                 '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'),
             ],
           ),
         ),

web/stjohnsstreets.dart

@@ -27,6 +27,7 @@ class _StJohnsStreetsState extends State<StJohnsStreets> {
       backgroundColor: peacockBlue,
       body: Column(
         children: <Widget>[
+          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<StJohnsStreets> {
             'https://www.google.com/maps/@45.5883,-122.75799,17z',
             'cathedral-park'
           ),
-          cardTwo('Lombard-Ivanhoe','https://example.com','lombard-ivanhoe'),
         ],
       ),
     );