From fe94e3886a1fb24360f94c69c5aaf602a53d72da Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 4 Jun 2018 23:31:35 -0700 Subject: [PATCH] Refactor --- lib/constants.dart | 3 ++- lib/data/repositories/auth_repository.dart | 2 -- lib/data/repositories/dashboard_repository.dart | 17 ----------------- lib/data/repositories/product_repository.dart | 2 -- lib/redux/app/app_middleware.dart | 3 ++- lib/redux/auth/auth_middleware.dart | 7 +------ lib/redux/dashboard/dashboard_middleware.dart | 7 +------ lib/redux/product/product_middleware.dart | 7 +------ 8 files changed, 7 insertions(+), 41 deletions(-) diff --git a/lib/constants.dart b/lib/constants.dart index 5e7adfe99..0470703b1 100644 --- a/lib/constants.dart +++ b/lib/constants.dart @@ -1,3 +1,4 @@ const String kAppVersion = 'v0.0.1'; -const int kMillisecondsToRefreshData = 1000 * 60 * 10; +const String kStateFilename = 'state'; +const int kMillisecondsToRefreshData = 1000 * 60 * 10; \ No newline at end of file diff --git a/lib/data/repositories/auth_repository.dart b/lib/data/repositories/auth_repository.dart index 6ac3cc8f6..504cbcb4b 100644 --- a/lib/data/repositories/auth_repository.dart +++ b/lib/data/repositories/auth_repository.dart @@ -9,11 +9,9 @@ import 'package:invoiceninja/data/file_storage.dart'; import 'package:invoiceninja/data/web_client.dart'; class AuthRepository { - final FileStorage fileStorage; final WebClient webClient; const AuthRepository({ - @required this.fileStorage, this.webClient = const WebClient(), }); diff --git a/lib/data/repositories/dashboard_repository.dart b/lib/data/repositories/dashboard_repository.dart index 2c79e03b1..37fdb1f94 100644 --- a/lib/data/repositories/dashboard_repository.dart +++ b/lib/data/repositories/dashboard_repository.dart @@ -8,11 +8,9 @@ import 'package:invoiceninja/data/file_storage.dart'; import 'package:invoiceninja/data/web_client.dart'; class DashboardRepository { - final FileStorage fileStorage; final WebClient webClient; const DashboardRepository({ - @required this.fileStorage, this.webClient = const WebClient(), }); @@ -21,24 +19,9 @@ class DashboardRepository { final response = await webClient.get( auth.url + '/dashboard', company.token); - //fileStorage.saveDashboard(products); - DashboardResponse dashboardResponse = serializers.deserializeWith( DashboardResponse.serializer, response); return dashboardResponse.data; - - /* - try { - return await fileStorage.loadData(); - } catch (exception) { - final products = await webClient.fetchData( - auth.url + '/products', auth.token); - - //fileStorage.saveDashboard(products); - - return products; - } - */ } } \ No newline at end of file diff --git a/lib/data/repositories/product_repository.dart b/lib/data/repositories/product_repository.dart index da00d8ad4..4d0ec613c 100644 --- a/lib/data/repositories/product_repository.dart +++ b/lib/data/repositories/product_repository.dart @@ -11,11 +11,9 @@ import 'package:invoiceninja/data/file_storage.dart'; import 'package:invoiceninja/data/web_client.dart'; class ProductsRepository { - final FileStorage fileStorage; final WebClient webClient; const ProductsRepository({ - @required this.fileStorage, this.webClient = const WebClient(), }); diff --git a/lib/redux/app/app_middleware.dart b/lib/redux/app/app_middleware.dart index 284218ea2..d3a38a15b 100644 --- a/lib/redux/app/app_middleware.dart +++ b/lib/redux/app/app_middleware.dart @@ -1,4 +1,5 @@ import 'package:flutter/widgets.dart'; +import 'package:invoiceninja/constants.dart'; import 'package:invoiceninja/data/file_storage.dart'; import 'package:invoiceninja/data/repositories/persistence_repository.dart'; import 'package:invoiceninja/redux/app/app_state.dart'; @@ -12,7 +13,7 @@ import 'package:path_provider/path_provider.dart'; List> createStorePersistenceMiddleware([ PersistenceRepository repository = const PersistenceRepository( fileStorage: const FileStorage( - 'state', + kStateFilename, getApplicationDocumentsDirectory, ), ), diff --git a/lib/redux/auth/auth_middleware.dart b/lib/redux/auth/auth_middleware.dart index 942675b08..fc3b57659 100644 --- a/lib/redux/auth/auth_middleware.dart +++ b/lib/redux/auth/auth_middleware.dart @@ -8,12 +8,7 @@ import 'package:path_provider/path_provider.dart'; import 'package:invoiceninja/redux/company/company_actions.dart'; List> createStoreAuthMiddleware([ - AuthRepository repository = const AuthRepository( - fileStorage: const FileStorage( - '__invoiceninja__', - getApplicationDocumentsDirectory, - ), - ), + AuthRepository repository = const AuthRepository(), ]) { final loginInit = _createLoginInit(); final loginRequest = _createLoginRequest(repository); diff --git a/lib/redux/dashboard/dashboard_middleware.dart b/lib/redux/dashboard/dashboard_middleware.dart index 73ba865a3..b50cb53e4 100644 --- a/lib/redux/dashboard/dashboard_middleware.dart +++ b/lib/redux/dashboard/dashboard_middleware.dart @@ -6,12 +6,7 @@ import 'package:invoiceninja/data/repositories/dashboard_repository.dart'; import 'package:invoiceninja/data/file_storage.dart'; List> createStoreDashboardMiddleware([ - DashboardRepository repository = const DashboardRepository( - fileStorage: const FileStorage( - '__invoiceninja__', - getApplicationDocumentsDirectory, - ), - ), + DashboardRepository repository = const DashboardRepository(), ]) { final loadDashboard = _createLoadDashboard(repository); diff --git a/lib/redux/product/product_middleware.dart b/lib/redux/product/product_middleware.dart index 81b78b206..387be9793 100644 --- a/lib/redux/product/product_middleware.dart +++ b/lib/redux/product/product_middleware.dart @@ -7,12 +7,7 @@ import 'package:invoiceninja/data/repositories/product_repository.dart'; import 'package:invoiceninja/data/file_storage.dart'; List> createStoreProductsMiddleware([ - ProductsRepository repository = const ProductsRepository( - fileStorage: const FileStorage( - '__invoiceninja__', - getApplicationDocumentsDirectory, - ), - ), + ProductsRepository repository = const ProductsRepository(), ]) { final loadProducts = _loadProducts(repository); final saveProduct = _saveProduct(repository);