From 097099d00dd88be38b9bc8dc868292d5d1cc6543 Mon Sep 17 00:00:00 2001
From: unknown <hillelcoren@gmail.com>
Date: Tue, 22 May 2018 01:04:06 -0700
Subject: [PATCH] Refactor

---
 lib/main.dart                                        | 12 ++++++------
 lib/routes.dart                                      |  4 ++--
 lib/ui/app/sidebar.dart                              |  2 +-
 lib/ui/auth/{login_screen.dart => login.dart}        |  0
 lib/ui/client/{client_list.dart => clients.dart}     |  0
 .../dashboard.dart}                                  |  0
 .../product/{product_screen.dart => products.dart}   |  0
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename lib/ui/auth/{login_screen.dart => login.dart} (100%)
 rename lib/ui/client/{client_list.dart => clients.dart} (100%)
 rename lib/ui/{dashboard_screen.dart => dashboard/dashboard.dart} (100%)
 rename lib/ui/product/{product_screen.dart => products.dart} (100%)

diff --git a/lib/main.dart b/lib/main.dart
index fda322372..f37f47ceb 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:redux/redux.dart';
 import 'package:invoiceninja/redux/app/app_state.dart';
-import 'package:invoiceninja/ui/dashboard_screen.dart';
-import 'package:invoiceninja/ui/client/client_list.dart';
-import 'package:invoiceninja/ui/product/product_screen.dart';
-import 'package:invoiceninja/ui/auth/login_screen.dart';
+import 'package:invoiceninja/ui/dashboard/dashboard.dart';
+import 'package:invoiceninja/ui/client/clients.dart';
+import 'package:invoiceninja/ui/product/products.dart';
+import 'package:invoiceninja/ui/auth/login.dart';
 import 'package:invoiceninja/routes.dart';
 import 'package:invoiceninja/redux/product/product_actions.dart';
 import 'package:invoiceninja/redux/product/product_middleware.dart';
@@ -61,14 +61,14 @@ class InvoiceNinjaApp extends StatelessWidget {
               },
             );
           },
-          AppRoutes.clientScreen: (context) {
+          AppRoutes.clients: (context) {
             return StoreBuilder<AppState>(
               builder: (context, store) {
                 return ClientList();
               },
             );
           },
-          AppRoutes.productScreen: (context) {
+          AppRoutes.products: (context) {
             return StoreBuilder<AppState>(
               onInit: (store) => store.dispatch(LoadProductsAction()),
               builder: (context, store) {
diff --git a/lib/routes.dart b/lib/routes.dart
index 5e3e273be..b851a9746 100644
--- a/lib/routes.dart
+++ b/lib/routes.dart
@@ -1,6 +1,6 @@
 class AppRoutes {
   static final login = "/";
   static final dashboard = "/dashboard";
-  static final clientScreen = "/clientScreen";
-  static final productScreen = "/productScreen";
+  static final clients = "/clients";
+  static final products = "/products";
 }
\ No newline at end of file
diff --git a/lib/ui/app/sidebar.dart b/lib/ui/app/sidebar.dart
index d68eedee8..274671ad4 100644
--- a/lib/ui/app/sidebar.dart
+++ b/lib/ui/app/sidebar.dart
@@ -36,7 +36,7 @@ class Sidebar extends StatelessWidget {
             leading: new Icon(Icons.language),
             title: new Text('Products'),
             onTap: () {
-              Navigator.of(context).popAndPushNamed(AppRoutes.productScreen);
+              Navigator.of(context).popAndPushNamed(AppRoutes.products);
             },
           ),
           /*
diff --git a/lib/ui/auth/login_screen.dart b/lib/ui/auth/login.dart
similarity index 100%
rename from lib/ui/auth/login_screen.dart
rename to lib/ui/auth/login.dart
diff --git a/lib/ui/client/client_list.dart b/lib/ui/client/clients.dart
similarity index 100%
rename from lib/ui/client/client_list.dart
rename to lib/ui/client/clients.dart
diff --git a/lib/ui/dashboard_screen.dart b/lib/ui/dashboard/dashboard.dart
similarity index 100%
rename from lib/ui/dashboard_screen.dart
rename to lib/ui/dashboard/dashboard.dart
diff --git a/lib/ui/product/product_screen.dart b/lib/ui/product/products.dart
similarity index 100%
rename from lib/ui/product/product_screen.dart
rename to lib/ui/product/products.dart