diff --git a/package.json b/package.json index 8a98e6d..7347239 100644 --- a/package.json +++ b/package.json @@ -91,12 +91,14 @@ "src/**/*.{js,ts,scss,md,html,json}": [ "prettier --write", "git add" + ], + "*.scss": [ + "stylelint src/**/*.scss" ] }, "husky": { "hooks": { - "pre-commit": "pretty-quick --staged && npm run format:lint && lint-staged", - "pre-push": "ng build --prod" + "pre-commit": "npx pretty-quick --staged && npm run format:lint && lint-staged" } } } diff --git a/src/app/auth/auth.component.html b/src/app/auth/auth.component.html index 501293c..3e6e5e0 100644 --- a/src/app/auth/auth.component.html +++ b/src/app/auth/auth.component.html @@ -8,20 +8,25 @@

CICADA

-
- +

Add Private Key

- Private Key - +
- Private Key is required. + Private Key is required.
@@ -29,20 +34,24 @@ Add Key -
- diff --git a/src/app/pages/accounts/account-details/account-details.component.html b/src/app/pages/accounts/account-details/account-details.component.html index 22d8df3..3f98057 100644 --- a/src/app/pages/accounts/account-details/account-details.component.html +++ b/src/app/pages/accounts/account-details/account-details.component.html @@ -14,30 +14,44 @@
-
+
Loading...
-
+
Loading...
-
+
Loading...

- {{account?.vcard?.fn[0].value}} + {{ account?.vcard?.fn[0].value }}

- Balance: {{account?.balance | tokenRatio}} {{ tokenSymbol | uppercase }} - Created: {{account?.date_registered | unixDate}} - Address: - {{accountAddress}} - Copy + Balance: {{ account?.balance | tokenRatio }} + {{ tokenSymbol | uppercase }} + Created: {{ account?.date_registered | unixDate }} + Address: + {{ accountAddress }} + Copy
@@ -45,85 +59,145 @@
-
First Name: * - - First Name is required. + + First Name is required.
Last Name(s): * - - Last Name is required. + + Last Name is required.
Phone Number: - - Phone Number is required. + + Phone Number is required.
Age: - - Age is required. + + Age is required.
ACCOUNT TYPE: - + - {{accountType | uppercase}} + {{ accountType | uppercase }} - Type is required. + Type is required.
Bio: - - Bio is required. + + Bio is required.
GENDER: - + - {{gender | uppercase}} + {{ gender | uppercase }} - Gender is required. + Gender is required.
BUSINESS CATEGORY: - + - {{category | titlecase}} + {{ category | titlecase }} @@ -135,9 +209,15 @@
User Location: - + User Location is required. @@ -147,50 +227,82 @@
LOCATION: - + - {{area | uppercase}} + {{ area | uppercase }} - Location is required. + Location is required.
LOCATION TYPE: - + - {{type | uppercase}} + {{ type | uppercase }} - Location Type is required. + Location Type is required.
-
-
-
-
@@ -200,32 +312,32 @@
- - USER - + USER
- + - - - - - - + + + + + + - - - - - - + + + + + +
1 user + 1 user +
NAMEBALANCECREATEDSTATUS
NAMEBALANCECREATEDSTATUS
{{account?.vcard?.fn[0].value}}{{account?.balance | tokenRatio}} {{ tokenSymbol | uppercase }}{{account?.date_registered | unixDate}} - - {{accountStatus}} - -
{{ account?.vcard?.fn[0].value }}{{ account?.balance | tokenRatio }} {{ tokenSymbol | uppercase }}{{ account?.date_registered | unixDate }} + + {{ accountStatus }} + +
@@ -234,135 +346,216 @@ - +
TRANSACTION TYPE - + ALL TRANSFERS - - {{transactionType | uppercase}} + + {{ transactionType | uppercase }} - +
Filter - + search - - +
- - + + - - + + - + - - + + - + - +
Sender {{transaction?.sender?.vcard.fn[0].value || transaction.from}} Sender + {{ transaction?.sender?.vcard.fn[0].value || transaction.from }} + Recipient {{transaction?.recipient?.vcard.fn[0].value || transaction.to}} Recipient + {{ transaction?.recipient?.vcard.fn[0].value || transaction.to }} + Value Value - {{transaction?.value | tokenRatio}} {{ tokenSymbol | uppercase }} - {{transaction?.toValue | tokenRatio}} {{ tokenSymbol | uppercase }} + {{ transaction?.value | tokenRatio }} {{ tokenSymbol | uppercase }} + {{ transaction?.toValue | tokenRatio }} {{ tokenSymbol | uppercase }} Created {{transaction?.tx.timestamp | unixDate}} Created + {{ transaction?.tx.timestamp | unixDate }} + TYPE TYPE - {{transaction?.type}} + {{ transaction?.type }}
- - +
- - Accounts - + Accounts
ACCOUNT TYPE - + ALL - {{accountType | uppercase}} + {{ accountType | uppercase }} - +
Filter - + search - - + NAME - {{user?.vcard.fn[0].value}} + {{ user?.vcard.fn[0].value }} - PHONE NUMBER - {{user?.vcard.tel[0].value}} + + PHONE NUMBER + + {{ user?.vcard.tel[0].value }} CREATED - {{user?.date_registered | unixDate}} + + {{ user?.date_registered | unixDate }} + BALANCE - {{user?.balance | tokenRatio}} {{tokenSymbol | uppercase}} + + {{ user?.balance | tokenRatio }} {{ tokenSymbol | uppercase }} + LOCATION - {{user?.location.area_name}} + {{ user?.location.area_name }} - - + + - +
diff --git a/src/app/pages/accounts/account-search/account-search.component.html b/src/app/pages/accounts/account-search/account-search.component.html index 56a17cc..6698305 100644 --- a/src/app/pages/accounts/account-search/account-search.component.html +++ b/src/app/pages/accounts/account-search/account-search.component.html @@ -18,33 +18,61 @@
- - Accounts - + Accounts
Search - - Phone Number is required. + + Phone Number is required. phone Phone Number - +
Search - - Account Address is required. + + Account Address is required. view_in_ar Account Address - +
diff --git a/src/app/pages/accounts/accounts.component.html b/src/app/pages/accounts/accounts.component.html index 43628aa..a52dda5 100644 --- a/src/app/pages/accounts/accounts.component.html +++ b/src/app/pages/accounts/accounts.component.html @@ -17,63 +17,99 @@
- - Accounts - + Accounts
ACCOUNT TYPE - + ALL - {{accountType | uppercase}} + {{ accountType | uppercase }} - - + +
Filter - + search - - + NAME - {{user?.vcard.fn[0].value}} + {{ user?.vcard.fn[0].value }} PHONE NUMBER - {{user?.vcard.tel[0].value}} + {{ user?.vcard.tel[0].value }} CREATED - {{user?.date_registered | unixDate}} + {{ user?.date_registered | unixDate }} BALANCE - {{user?.balance | tokenRatio}} + {{ user?.balance | tokenRatio }} LOCATION - {{user?.location.area_name}} + {{ user?.location.area_name }} - + - +
diff --git a/src/app/pages/accounts/create-account/create-account.component.html b/src/app/pages/accounts/create-account/create-account.component.html index 41a82a9..9d411e7 100644 --- a/src/app/pages/accounts/create-account/create-account.component.html +++ b/src/app/pages/accounts/create-account/create-account.component.html @@ -18,61 +18,110 @@
- - CREATE A USER ACCOUNT - + CREATE A USER ACCOUNT
Account Type: - + - {{accountType | uppercase}} + {{ accountType | uppercase }} - Account type is required. -
+ Account type is required.
ID Number: - - ID Number is required. + + ID Number is required.
Phone Number: - - Phone Number is required. -
+ + Phone Number is required.
Given Name(s):* - - Given Names are required. -
+ + Given Names are required.
Family/Surname: - - Surname is required. -
+ + Surname is required.
Directory Entry: - - Directory Entry is required. -
+ + Directory Entry is required.
@@ -80,11 +129,13 @@ Location: - {{area | uppercase}} + {{ area | uppercase }} - Location is required. -
+ Location is required.
@@ -92,34 +143,59 @@ Gender: - {{gender | uppercase}} + {{ gender | uppercase }} - Gender is required. -
+ Gender is required.
Referrer Phone Number: - - Referrer is required. -
+ + Referrer is required.
Business Category: - + - {{category | titlecase}} + {{ category | titlecase }} - Business Category is required. + Business Category is required.
- +
diff --git a/src/app/pages/admin/admin.component.html b/src/app/pages/admin/admin.component.html index 453f743..b933f3e 100644 --- a/src/app/pages/admin/admin.component.html +++ b/src/app/pages/admin/admin.component.html @@ -20,19 +20,30 @@
Actions - +
- Filter - + search - Expand @@ -44,32 +55,52 @@ NAME - {{action.user}} + {{ action.user }} ROLE - {{action.role}} + {{ action.role }} ACTION - {{action.action}} + {{ action.action }} STATUS - {{approvalStatus(action.approval)}} - {{approvalStatus(action.approval)}} + + {{ approvalStatus(action.approval) }} + + + {{ approvalStatus(action.approval) }} + APPROVE - - + + @@ -77,22 +108,37 @@
- Staff Name: {{action.user}}
- Role: {{action.role}}
- Action Details: {{action.action}}
- Approval Status: {{action.approval}}
+ Staff Name: {{ action.user }}
+ Role: {{ action.role }}
+ Action Details: {{ action.action }}
+ Approval Status: {{ action.approval }}
- - + +
- +
@@ -102,4 +148,3 @@
- diff --git a/src/app/pages/pages.component.html b/src/app/pages/pages.component.html index 5e60109..331647c 100644 --- a/src/app/pages/pages.component.html +++ b/src/app/pages/pages.component.html @@ -16,10 +16,16 @@
-
diff --git a/src/app/pages/settings/organization/organization.component.html b/src/app/pages/settings/organization/organization.component.html index 9e38bf9..1921b85 100644 --- a/src/app/pages/settings/organization/organization.component.html +++ b/src/app/pages/settings/organization/organization.component.html @@ -26,19 +26,31 @@
Default Disbursement * - + RCU Default Disbursement is required.
- Require Transfer Card * + Require Transfer Card *
Default Country Code * - + KE Kenya US United States ETH Ethiopia @@ -47,9 +59,11 @@ Country Code is required. - -
- +
+
diff --git a/src/app/pages/settings/settings.component.html b/src/app/pages/settings/settings.component.html index ac74e63..56260f1 100644 --- a/src/app/pages/settings/settings.component.html +++ b/src/app/pages/settings/settings.component.html @@ -19,16 +19,14 @@
- - SETTINGS - + SETTINGS

CICADA Admin Credentials

- UserId: {{ userInfo?.userid }}
- Username: {{ userInfo?.name }}
+ UserId: {{ userInfo?.userid }}
+ Username: {{ userInfo?.name }}
Email: {{ userInfo?.email }}
-
+

Organization Settings

Update your organization settings @@ -37,21 +35,27 @@
- - ACCOUNT MANAGEMENT - + ACCOUNT MANAGEMENT -
+
-
+
- +
@@ -60,39 +64,60 @@
TRUSTED USERS - +
Filter - + search - - + NAME - {{user.name}} + {{ user.name }} EMAIL - {{user.email}} + {{ user.email }} USER ID - {{user.userid}} + {{ user.userid }} - - +
diff --git a/src/app/pages/tokens/token-details/token-details.component.html b/src/app/pages/tokens/token-details/token-details.component.html index 4d90527..0c8024f 100644 --- a/src/app/pages/tokens/token-details/token-details.component.html +++ b/src/app/pages/tokens/token-details/token-details.component.html @@ -3,32 +3,43 @@
TOKEN DETAILS - +
- Name: {{token?.name}} + Name: {{ token?.name }}
- Symbol: {{token?.symbol}} + Symbol: {{ token?.symbol }}
- Address: {{token?.address}} + Address: {{ token?.address }}
- Details: A community inclusive currency for trading among lower to middle income societies. + Details: A community inclusive currency for trading among lower to + middle income societies.
- Supply: {{token?.supply | tokenRatio}} -

+ Supply: {{ token?.supply | tokenRatio }} +
+

Reserve

- Weight: {{token?.reserveRatio}} + Weight: {{ token?.reserveRatio }}
- Owner: {{token?.owner}} + Owner: {{ token?.owner }}
diff --git a/src/app/pages/tokens/tokens.component.html b/src/app/pages/tokens/tokens.component.html index 5cf5ebe..56d843b 100644 --- a/src/app/pages/tokens/tokens.component.html +++ b/src/app/pages/tokens/tokens.component.html @@ -20,45 +20,71 @@
Tokens - +
- Filter - + search - + Name - {{token.name}} + {{ token.name }} Symbol - {{token.symbol}} + {{ token.symbol }} Address - {{token.address}} + {{ token.address }} Supply - {{token.supply | tokenRatio}} + {{ token.supply | tokenRatio }} - + - +
@@ -68,4 +94,3 @@
- diff --git a/src/app/pages/transactions/transaction-details/transaction-details.component.html b/src/app/pages/transactions/transaction-details/transaction-details.component.html index 0da7816..fdce60d 100644 --- a/src/app/pages/transactions/transaction-details/transaction-details.component.html +++ b/src/app/pages/transactions/transaction-details/transaction-details.component.html @@ -3,43 +3,86 @@
TRANSACTION DETAILS - +
-

Exchange:

+

Exchange:

  • - Sender: {{transaction.sender?.vcard.fn[0].value}}

    + Sender: {{ transaction.sender?.vcard.fn[0].value }}

    Sender Address: - {{transaction.from}} - Copy -

    - + {{ transaction.from }} + Copy

    +
  • - Recipient: {{transaction.recipient?.vcard.fn[0].value}}

    + Recipient: {{ transaction.recipient?.vcard.fn[0].value }}

    Recipient Address: - {{transaction.to}} - Copy -

    - + {{ transaction.to }} + Copy

    +
  • - Amount: {{transaction.value | tokenRatio}} {{ tokenSymbol | uppercase }} + Amount: {{ transaction.value | tokenRatio }} {{ tokenSymbol | uppercase }}
-

Token:

+

Token:

  • Address: - {{transaction.token._address}} - Copy + {{ transaction.token._address }} + Copy
  • @@ -51,97 +94,140 @@
-

Transaction:

+

Transaction:

  • - Block: {{transaction.tx.block}} + Block: {{ transaction.tx.block }}
  • - Index: {{transaction.tx.txIndex}} + Index: {{ transaction.tx.txIndex }}
  • - Hash: {{transaction.tx.txHash}} + Hash: {{ transaction.tx.txHash }}
  • - Success: {{transaction.tx.success}} + Success: {{ transaction.tx.success }}
  • - Timestamp: {{transaction.tx.timestamp | unixDate}} + Timestamp: {{ transaction.tx.timestamp | unixDate }}
  • -

+ +
- +
- +
-

Exchange:

+

Exchange:

- -

+ +

-

Source Token:

+

Source Token:

  • Address: - {{transaction.sourceToken.address}} - Copy + {{ transaction.sourceToken.address }} + Copy
  • - Name: {{transaction.sourceToken.name}} + Name: {{ transaction.sourceToken.name }}
  • - Symbol: {{transaction.sourceToken.symbol | uppercase}} + Symbol: {{ transaction.sourceToken.symbol | uppercase }}
  • - Amount: {{transaction.fromValue}} {{transaction.sourceToken.symbol | uppercase}} + Amount: {{ transaction.fromValue }} + {{ transaction.sourceToken.symbol | uppercase }}
-

Destination Token:

+

Destination Token:

  • Address: - {{transaction.destinationToken.address}} - Copy + {{ transaction.destinationToken.address }} + Copy
  • - Name: {{transaction.destinationToken.name}} + Name: {{ transaction.destinationToken.name }}
  • - Symbol: {{transaction.destinationToken.symbol | uppercase}} + Symbol: {{ transaction.destinationToken.symbol | uppercase }}
  • - Amount: {{transaction.toValue}} {{transaction.destinationToken.symbol | uppercase}} + Amount: {{ transaction.toValue }} + {{ transaction.destinationToken.symbol | uppercase }}
- +
- +
diff --git a/src/app/pages/transactions/transactions.component.html b/src/app/pages/transactions/transactions.component.html index 1d9d548..96cfcc9 100644 --- a/src/app/pages/transactions/transactions.component.html +++ b/src/app/pages/transactions/transactions.component.html @@ -17,71 +17,114 @@
- - Transfers - + Transfers
- - +
TRANSFER TYPE - + ALL TRANSFERS - - {{transactionType | uppercase}} + + {{ transactionType | uppercase }} - +
Filter - + search - - +
- - + + - - + + - + - - + + - + - +
Sender {{transaction?.sender?.vcard.fn[0].value || transaction.from}} Sender + {{ transaction?.sender?.vcard.fn[0].value || transaction.from }} + Recipient {{transaction?.recipient?.vcard.fn[0].value || transaction.to}} Recipient + {{ transaction?.recipient?.vcard.fn[0].value || transaction.to }} + Value Value - {{transaction?.value | tokenRatio}} {{ tokenSymbol | uppercase }} - {{transaction?.toValue | tokenRatio}} {{ tokenSymbol | uppercase }} + {{ transaction?.value | tokenRatio }} {{ tokenSymbol | uppercase }} + {{ transaction?.toValue | tokenRatio }} {{ tokenSymbol | uppercase }} Created {{transaction?.tx.timestamp | unixDate}} Created + {{ transaction?.tx.timestamp | unixDate }} + TYPE TYPE - {{transaction?.type}} + {{ transaction?.type }}
- - +
@@ -91,5 +134,3 @@
- - diff --git a/src/app/shared/error-dialog/error-dialog.component.html b/src/app/shared/error-dialog/error-dialog.component.html index f508467..d2b70b0 100644 --- a/src/app/shared/error-dialog/error-dialog.component.html +++ b/src/app/shared/error-dialog/error-dialog.component.html @@ -1,10 +1,6 @@
-

- Message: {{ data.message }} -

-

- Status: {{ data?.status }} -

+

Message: {{ data.message }}

+

Status: {{ data?.status }}

diff --git a/src/app/shared/footer/footer.component.html b/src/app/shared/footer/footer.component.html index fa0028d..45a3702 100644 --- a/src/app/shared/footer/footer.component.html +++ b/src/app/shared/footer/footer.component.html @@ -1,8 +1,10 @@ diff --git a/src/app/shared/network-status/network-status.component.html b/src/app/shared/network-status/network-status.component.html index 1f907f7..54d821a 100644 --- a/src/app/shared/network-status/network-status.component.html +++ b/src/app/shared/network-status/network-status.component.html @@ -1,13 +1,13 @@ diff --git a/src/app/shared/sidebar/sidebar.component.html b/src/app/shared/sidebar/sidebar.component.html index 7e8353e..c2f947e 100644 --- a/src/app/shared/sidebar/sidebar.component.html +++ b/src/app/shared/sidebar/sidebar.component.html @@ -2,10 +2,9 @@