From e7181e70cce15c15aaa0d2eebd318bfdfbe852c3 Mon Sep 17 00:00:00 2001 From: Jagandeep Brar Date: Tue, 13 Apr 2021 10:01:28 -0500 Subject: [PATCH] (chore): Cleanup core folder structure --- lib/core.dart | 3 +++ lib/core/{system => }/firebase.dart | 0 lib/core/{system => }/firebase/analytics.dart | 0 lib/core/{system => }/firebase/auth.dart | 0 lib/core/{system => }/firebase/core.dart | 0 lib/core/{system => }/firebase/crashlytics.dart | 0 lib/core/{system => }/firebase/firestore.dart | 0 lib/core/{system => }/firebase/messaging.dart | 0 lib/core/{system => }/firebase/storage.dart | 0 lib/core/{system => }/firebase/types.dart | 0 lib/core/{system => }/firebase/types/auth_response.dart | 0 lib/core/{system => }/firebase/types/backup_document.dart | 0 lib/core/models.dart | 4 +--- lib/core/models/logs.dart | 2 ++ lib/core/models/{ => logs}/log.dart | 0 lib/core/models/{ => logs}/log.g.dart | 0 lib/core/models/{types => logs}/log_type.dart | 0 lib/core/models/{types => logs}/log_type.g.dart | 0 lib/core/models/types.dart | 1 - lib/core/{models => }/router.dart | 1 + lib/core/{models => }/router/module_router.dart | 0 lib/core/{models => }/router/page_router.dart | 0 lib/core/{system => router}/router.dart | 0 lib/core/state.dart | 2 ++ lib/core/{models => state}/module_state.dart | 0 lib/core/{system => state}/state.dart | 0 lib/core/system.dart | 4 +--- lib/core/{utilities => system}/filesystem.dart | 0 lib/core/utilities.dart | 1 - 29 files changed, 10 insertions(+), 8 deletions(-) rename lib/core/{system => }/firebase.dart (100%) rename lib/core/{system => }/firebase/analytics.dart (100%) rename lib/core/{system => }/firebase/auth.dart (100%) rename lib/core/{system => }/firebase/core.dart (100%) rename lib/core/{system => }/firebase/crashlytics.dart (100%) rename lib/core/{system => }/firebase/firestore.dart (100%) rename lib/core/{system => }/firebase/messaging.dart (100%) rename lib/core/{system => }/firebase/storage.dart (100%) rename lib/core/{system => }/firebase/types.dart (100%) rename lib/core/{system => }/firebase/types/auth_response.dart (100%) rename lib/core/{system => }/firebase/types/backup_document.dart (100%) create mode 100644 lib/core/models/logs.dart rename lib/core/models/{ => logs}/log.dart (100%) rename lib/core/models/{ => logs}/log.g.dart (100%) rename lib/core/models/{types => logs}/log_type.dart (100%) rename lib/core/models/{types => logs}/log_type.g.dart (100%) rename lib/core/{models => }/router.dart (70%) rename lib/core/{models => }/router/module_router.dart (100%) rename lib/core/{models => }/router/page_router.dart (100%) rename lib/core/{system => router}/router.dart (100%) create mode 100644 lib/core/state.dart rename lib/core/{models => state}/module_state.dart (100%) rename lib/core/{system => state}/state.dart (100%) rename lib/core/{utilities => system}/filesystem.dart (100%) diff --git a/lib/core.dart b/lib/core.dart index 33b06a6c..b31b728c 100644 --- a/lib/core.dart +++ b/lib/core.dart @@ -1,9 +1,12 @@ export 'core/database.dart'; export 'core/dialogs.dart'; export 'core/extensions.dart'; +export 'core/firebase.dart'; export 'core/mixins.dart'; export 'core/models.dart'; export 'core/pages.dart'; +export 'core/router.dart'; +export 'core/state.dart'; export 'core/system.dart'; export 'core/ui.dart'; export 'core/utilities.dart'; diff --git a/lib/core/system/firebase.dart b/lib/core/firebase.dart similarity index 100% rename from lib/core/system/firebase.dart rename to lib/core/firebase.dart diff --git a/lib/core/system/firebase/analytics.dart b/lib/core/firebase/analytics.dart similarity index 100% rename from lib/core/system/firebase/analytics.dart rename to lib/core/firebase/analytics.dart diff --git a/lib/core/system/firebase/auth.dart b/lib/core/firebase/auth.dart similarity index 100% rename from lib/core/system/firebase/auth.dart rename to lib/core/firebase/auth.dart diff --git a/lib/core/system/firebase/core.dart b/lib/core/firebase/core.dart similarity index 100% rename from lib/core/system/firebase/core.dart rename to lib/core/firebase/core.dart diff --git a/lib/core/system/firebase/crashlytics.dart b/lib/core/firebase/crashlytics.dart similarity index 100% rename from lib/core/system/firebase/crashlytics.dart rename to lib/core/firebase/crashlytics.dart diff --git a/lib/core/system/firebase/firestore.dart b/lib/core/firebase/firestore.dart similarity index 100% rename from lib/core/system/firebase/firestore.dart rename to lib/core/firebase/firestore.dart diff --git a/lib/core/system/firebase/messaging.dart b/lib/core/firebase/messaging.dart similarity index 100% rename from lib/core/system/firebase/messaging.dart rename to lib/core/firebase/messaging.dart diff --git a/lib/core/system/firebase/storage.dart b/lib/core/firebase/storage.dart similarity index 100% rename from lib/core/system/firebase/storage.dart rename to lib/core/firebase/storage.dart diff --git a/lib/core/system/firebase/types.dart b/lib/core/firebase/types.dart similarity index 100% rename from lib/core/system/firebase/types.dart rename to lib/core/firebase/types.dart diff --git a/lib/core/system/firebase/types/auth_response.dart b/lib/core/firebase/types/auth_response.dart similarity index 100% rename from lib/core/system/firebase/types/auth_response.dart rename to lib/core/firebase/types/auth_response.dart diff --git a/lib/core/system/firebase/types/backup_document.dart b/lib/core/firebase/types/backup_document.dart similarity index 100% rename from lib/core/system/firebase/types/backup_document.dart rename to lib/core/firebase/types/backup_document.dart diff --git a/lib/core/models.dart b/lib/core/models.dart index 6885e940..c6b43830 100644 --- a/lib/core/models.dart +++ b/lib/core/models.dart @@ -1,6 +1,4 @@ export 'models/configuration.dart'; -export 'models/log.dart'; -export 'models/module_state.dart'; -export 'models/router.dart'; +export 'models/logs.dart'; export 'models/types.dart'; export 'models/webhooks.dart'; diff --git a/lib/core/models/logs.dart b/lib/core/models/logs.dart new file mode 100644 index 00000000..fd1173e2 --- /dev/null +++ b/lib/core/models/logs.dart @@ -0,0 +1,2 @@ +export 'logs/log.dart'; +export 'logs/log_type.dart'; diff --git a/lib/core/models/log.dart b/lib/core/models/logs/log.dart similarity index 100% rename from lib/core/models/log.dart rename to lib/core/models/logs/log.dart diff --git a/lib/core/models/log.g.dart b/lib/core/models/logs/log.g.dart similarity index 100% rename from lib/core/models/log.g.dart rename to lib/core/models/logs/log.g.dart diff --git a/lib/core/models/types/log_type.dart b/lib/core/models/logs/log_type.dart similarity index 100% rename from lib/core/models/types/log_type.dart rename to lib/core/models/logs/log_type.dart diff --git a/lib/core/models/types/log_type.g.dart b/lib/core/models/logs/log_type.g.dart similarity index 100% rename from lib/core/models/types/log_type.g.dart rename to lib/core/models/logs/log_type.g.dart diff --git a/lib/core/models/types.dart b/lib/core/models/types.dart index 4da8424b..d64edcf6 100644 --- a/lib/core/models/types.dart +++ b/lib/core/models/types.dart @@ -2,4 +2,3 @@ export 'types/browser.dart'; export 'types/indexer_icon.dart'; export 'types/links.dart'; export 'types/loading_state.dart'; -export 'types/log_type.dart'; diff --git a/lib/core/models/router.dart b/lib/core/router.dart similarity index 70% rename from lib/core/models/router.dart rename to lib/core/router.dart index 2a3151f0..70afbf13 100644 --- a/lib/core/models/router.dart +++ b/lib/core/router.dart @@ -1,2 +1,3 @@ export 'router/module_router.dart'; export 'router/page_router.dart'; +export 'router/router.dart'; diff --git a/lib/core/models/router/module_router.dart b/lib/core/router/module_router.dart similarity index 100% rename from lib/core/models/router/module_router.dart rename to lib/core/router/module_router.dart diff --git a/lib/core/models/router/page_router.dart b/lib/core/router/page_router.dart similarity index 100% rename from lib/core/models/router/page_router.dart rename to lib/core/router/page_router.dart diff --git a/lib/core/system/router.dart b/lib/core/router/router.dart similarity index 100% rename from lib/core/system/router.dart rename to lib/core/router/router.dart diff --git a/lib/core/state.dart b/lib/core/state.dart new file mode 100644 index 00000000..22c651f1 --- /dev/null +++ b/lib/core/state.dart @@ -0,0 +1,2 @@ +export 'state/module_state.dart'; +export 'state/state.dart'; diff --git a/lib/core/models/module_state.dart b/lib/core/state/module_state.dart similarity index 100% rename from lib/core/models/module_state.dart rename to lib/core/state/module_state.dart diff --git a/lib/core/system/state.dart b/lib/core/state/state.dart similarity index 100% rename from lib/core/system/state.dart rename to lib/core/state/state.dart diff --git a/lib/core/system.dart b/lib/core/system.dart index 753ce365..00023e43 100644 --- a/lib/core/system.dart +++ b/lib/core/system.dart @@ -1,10 +1,8 @@ export 'system/desktop_window.dart'; -export 'system/firebase.dart'; export 'system/image_cache.dart'; export 'system/in_app_purchases.dart'; +export 'system/filesystem.dart'; export 'system/localization.dart'; export 'system/modules.dart'; export 'system/networking.dart'; export 'system/quick_actions.dart'; -export 'system/router.dart'; -export 'system/state.dart'; diff --git a/lib/core/utilities/filesystem.dart b/lib/core/system/filesystem.dart similarity index 100% rename from lib/core/utilities/filesystem.dart rename to lib/core/system/filesystem.dart diff --git a/lib/core/utilities.dart b/lib/core/utilities.dart index d9edb836..b56b23be 100644 --- a/lib/core/utilities.dart +++ b/lib/core/utilities.dart @@ -1,7 +1,6 @@ export 'utilities/changelog.dart'; export 'utilities/configuration.dart'; export 'utilities/encryption.dart'; -export 'utilities/filesystem.dart'; export 'utilities/logger.dart'; export 'utilities/profile.dart'; export 'utilities/uuid.dart';