From d4341e1f1789f7598fcda72a3026a4de327cb48d Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Fri, 29 May 2020 19:08:31 -0400 Subject: [PATCH] cleanup imports --- src/app/chat/core.nim | 9 ++++----- src/app/chat/views/channels_list.nim | 25 +++---------------------- src/app/login/core.nim | 9 +-------- src/app/login/view.nim | 11 ++++++----- src/app/node/core.nim | 4 +--- src/app/onboarding/view.nim | 3 +-- src/app/profile/core.nim | 8 ++------ src/app/wallet/core.nim | 7 ++++--- src/app/wallet/view.nim | 5 ++--- 9 files changed, 24 insertions(+), 57 deletions(-) diff --git a/src/app/chat/core.nim b/src/app/chat/core.nim index a94e797ddb..89e87bd345 100644 --- a/src/app/chat/core.nim +++ b/src/app/chat/core.nim @@ -1,12 +1,11 @@ import NimQml -import json, eventemitter -import ../../status/chat as chat_model -import ../../signals/types +import json, eventemitter, chronicles import ../../status/libstatus/types as status_types +import ../../signals/types +import ../../status/chat +import ../../status/status import views/channels_list import view -import chronicles -import ../../status/status logScope: topics = "chat-controller" diff --git a/src/app/chat/views/channels_list.nim b/src/app/chat/views/channels_list.nim index 328b1e0f7b..2f6cd04d28 100644 --- a/src/app/chat/views/channels_list.nim +++ b/src/app/chat/views/channels_list.nim @@ -1,28 +1,9 @@ -import NimQml -import Tables -import strformat +import NimQml, Tables import random - import ../../../status/chat -const accountColors* = [ - "#9B832F", - "#D37EF4", - "#1D806F", - "#FA6565", - "#7CDA00", - "#887af9", - "#8B3131" -] - -const channelColors* = [ - "#fa6565", - "#7cda00", - "#887af9", - "#51d0f0", - "#FE8F59", - "#d37ef4" -] +const accountColors* = ["#9B832F", "#D37EF4", "#1D806F", "#FA6565", "#7CDA00", "#887af9", "#8B3131"] +const channelColors* = ["#fa6565", "#7cda00", "#887af9", "#51d0f0", "#FE8F59", "#d37ef4"] type ChannelsRoles {.pure.} = enum diff --git a/src/app/login/core.nim b/src/app/login/core.nim index 208c652cc0..a620206c5d 100644 --- a/src/app/login/core.nim +++ b/src/app/login/core.nim @@ -1,14 +1,7 @@ -import NimQml -import chronicles -import options -import std/wrapnils -import eventemitter - +import NimQml, eventemitter, chronicles, options, std/wrapnils import ../../status/libstatus/types as status_types import ../../signals/types -# import ../../status/accounts as AccountModel import ../../status/status - import view type LoginController* = ref object of SignalSubscriber diff --git a/src/app/login/view.nim b/src/app/login/view.nim index c86a6dbdcb..11a03b1949 100644 --- a/src/app/login/view.nim +++ b/src/app/login/view.nim @@ -1,16 +1,17 @@ -import NimQml -import Tables +import NimQml, Tables + import json import nimcrypto +import strformat +import json_serialization + import ../../signals/types import ../../status/libstatus/types as status_types import ../../status/libstatus/accounts as status_accounts -import strformat -import json_serialization -import core import ../../status/accounts as AccountModel import ../../status/status +import core type AccountRoles {.pure.} = enum diff --git a/src/app/node/core.nim b/src/app/node/core.nim index eb5c0a3800..07e6e734c9 100644 --- a/src/app/node/core.nim +++ b/src/app/node/core.nim @@ -1,11 +1,9 @@ import NimQml import chronicles -import eventemitter import ../../signals/types import ../../status/node -import view - import ../../status/status +import view logScope: topics = "node" diff --git a/src/app/onboarding/view.nim b/src/app/onboarding/view.nim index ff5963fd68..f01cb8ec46 100644 --- a/src/app/onboarding/view.nim +++ b/src/app/onboarding/view.nim @@ -1,5 +1,4 @@ -import NimQml -import Tables +import NimQml, Tables import json import nimcrypto import ../../status/libstatus/types as status_types diff --git a/src/app/profile/core.nim b/src/app/profile/core.nim index 8c39fb5957..580854a97d 100644 --- a/src/app/profile/core.nim +++ b/src/app/profile/core.nim @@ -1,15 +1,11 @@ import NimQml -import eventemitter -import strformat -import json - import ../../status/libstatus/mailservers as status_mailservers import ../../signals/types -import view import "../../status/libstatus/types" as status_types -import ../../status/profile +import ../../status/profile import ../../status/status +import view type ProfileController* = object view*: ProfileView diff --git a/src/app/wallet/core.nim b/src/app/wallet/core.nim index 43a791ec6d..e74adece06 100644 --- a/src/app/wallet/core.nim +++ b/src/app/wallet/core.nim @@ -1,16 +1,17 @@ import NimQml -import eventemitter +# import eventemitter import strformat import strutils import chronicles -import view import ../../status/libstatus/wallet as status_wallet -import ../../status/wallet import ../../signals/types +import ../../status/wallet import ../../status/status +import view + type WalletController* = ref object of SignalSubscriber status: Status view*: WalletView diff --git a/src/app/wallet/view.nim b/src/app/wallet/view.nim index aac9103c4f..5345799528 100644 --- a/src/app/wallet/view.nim +++ b/src/app/wallet/view.nim @@ -1,8 +1,7 @@ -import NimQml -import Tables -import views/asset_list +import NimQml, Tables import ../../status/wallet import ../../status/status +import views/asset_list QtObject: type