From 420d65a5ebf81d2acc724f664c4d1098025ad6b1 Mon Sep 17 00:00:00 2001 From: GloriousCode Date: Thu, 30 Nov 2017 17:54:45 +1100 Subject: [PATCH] Adds donate component Adds FAB to dashboard Adds slack to sidebar --- web/src/app/app-routing.module.ts | 6 ++++++ web/src/app/app.component.html | 6 ++++++ web/src/app/app.component.scss | 8 +++++++- web/src/app/app.module.ts | 3 ++- .../pages/dashboard/dashboard.component.html | 6 +++++- .../pages/dashboard/dashboard.component.scss | 11 +++++++++- .../app/pages/donate/donate.component.html | 19 ++++++++++++++++++ .../app/pages/donate/donate.component.scss | 8 ++++++++ .../donate/donate.component.spec.ts | 0 .../donate/donate.component.ts | 0 .../pages/settings/settings.component.html | 4 ++-- .../app/shared/donate/donate.component.html | 1 - .../app/shared/donate/donate.component.scss | 0 web/src/assets/early-dumb-donate.png | Bin 0 -> 7976 bytes 14 files changed, 65 insertions(+), 7 deletions(-) create mode 100644 web/src/app/pages/donate/donate.component.html create mode 100644 web/src/app/pages/donate/donate.component.scss rename web/src/app/{shared => pages}/donate/donate.component.spec.ts (100%) rename web/src/app/{shared => pages}/donate/donate.component.ts (100%) delete mode 100644 web/src/app/shared/donate/donate.component.html delete mode 100644 web/src/app/shared/donate/donate.component.scss create mode 100644 web/src/assets/early-dumb-donate.png diff --git a/web/src/app/app-routing.module.ts b/web/src/app/app-routing.module.ts index cd01b7d1..e052dfa8 100644 --- a/web/src/app/app-routing.module.ts +++ b/web/src/app/app-routing.module.ts @@ -3,6 +3,7 @@ import { SettingsComponent } from './pages/settings/settings.component'; import { AboutComponent } from './pages/about/about.component'; import { DashboardComponent } from './pages/dashboard/dashboard.component'; import { WalletComponent } from './pages/wallet/wallet.component'; +import { DonateComponent } from './pages/donate/donate.component'; import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; @@ -28,6 +29,11 @@ const routes: Routes = [ path: 'wallet', component: WalletComponent } + , + { + path: 'donate', + component: DonateComponent + } ]; diff --git a/web/src/app/app.component.html b/web/src/app/app.component.html index 84310ac7..cbe6a5a7 100644 --- a/web/src/app/app.component.html +++ b/web/src/app/app.component.html @@ -39,6 +39,12 @@

Trello

+ + apps  + +

Slack

+ + bug_report  diff --git a/web/src/app/app.component.scss b/web/src/app/app.component.scss index 0e4c3e4f..6df782bd 100644 --- a/web/src/app/app.component.scss +++ b/web/src/app/app.component.scss @@ -1,5 +1,6 @@ .container { - height: 100vmax; + min-height: 100vh; + height:100%; } .main { @@ -17,6 +18,7 @@ width: 14%; position: fixed; margin-top: 4rem; + } .navbar { @@ -43,4 +45,8 @@ .settings-highlight { color: magenta !important; +} + +.donate-highlight { + color: goldenrod!important; } \ No newline at end of file diff --git a/web/src/app/app.module.ts b/web/src/app/app.module.ts index a6687f5a..fda27e19 100644 --- a/web/src/app/app.module.ts +++ b/web/src/app/app.module.ts @@ -33,6 +33,8 @@ import { AboutComponent } from './pages/about/about.component'; import { SettingsComponent } from './pages/settings/settings.component'; import { DashboardComponent } from './pages/dashboard/dashboard.component'; import { WalletComponent } from './pages/wallet/wallet.component'; +import { DonateComponent } from './pages/donate/donate.component'; + //Shared import { NavbarComponent } from './shared/navbar/navbar.component'; import { ExchangeCurrencyTickerComponent } from './shared/exchange-currency-ticker/exchange-currency-ticker.component'; @@ -58,7 +60,6 @@ import { PriceHistoryComponent } from './shared/price-history/price-history.comp import { MyOrdersComponent } from './shared/my-orders/my-orders.component'; import { OrdersComponent } from './shared/orders/orders.component'; import { BuySellComponent } from './shared/buy-sell/buy-sell.component'; -import { DonateComponent } from './shared/donate/donate.component'; import { SelectedCurrencyComponent } from './shared/selected-currency/selected-currency.component'; diff --git a/web/src/app/pages/dashboard/dashboard.component.html b/web/src/app/pages/dashboard/dashboard.component.html index 6aec9745..07ae4aaa 100644 --- a/web/src/app/pages/dashboard/dashboard.component.html +++ b/web/src/app/pages/dashboard/dashboard.component.html @@ -1,3 +1,6 @@ + + +
@@ -14,4 +17,5 @@ - \ No newline at end of file + +
diff --git a/web/src/app/pages/dashboard/dashboard.component.scss b/web/src/app/pages/dashboard/dashboard.component.scss index 852afb6f..94179cbb 100644 --- a/web/src/app/pages/dashboard/dashboard.component.scss +++ b/web/src/app/pages/dashboard/dashboard.component.scss @@ -11,4 +11,13 @@ .mat-card-footer { position: absolute; bottom: 24px; -} \ No newline at end of file +} + +.mat-fab { + top: auto; + right: 30px; + bottom: 20px; + left: auto; + position: fixed; + z-index: 3; +} diff --git a/web/src/app/pages/donate/donate.component.html b/web/src/app/pages/donate/donate.component.html new file mode 100644 index 00000000..6308e679 --- /dev/null +++ b/web/src/app/pages/donate/donate.component.html @@ -0,0 +1,19 @@ + + + Donations + We give our thanks + + +
+ +
+

If this framework helped you in any way, or you would like to support the developers working on it, please donate

+ + + attach_money +

Address:

+

1F5zVDgNjorJ51oGebSvNCrSAHpwGkUdDB

+ + + + \ No newline at end of file diff --git a/web/src/app/pages/donate/donate.component.scss b/web/src/app/pages/donate/donate.component.scss new file mode 100644 index 00000000..5dfe9673 --- /dev/null +++ b/web/src/app/pages/donate/donate.component.scss @@ -0,0 +1,8 @@ +.BTC { + color:orange; +} + +.full-card { + width: 80%; + margin: 0px auto !important; +} \ No newline at end of file diff --git a/web/src/app/shared/donate/donate.component.spec.ts b/web/src/app/pages/donate/donate.component.spec.ts similarity index 100% rename from web/src/app/shared/donate/donate.component.spec.ts rename to web/src/app/pages/donate/donate.component.spec.ts diff --git a/web/src/app/shared/donate/donate.component.ts b/web/src/app/pages/donate/donate.component.ts similarity index 100% rename from web/src/app/shared/donate/donate.component.ts rename to web/src/app/pages/donate/donate.component.ts diff --git a/web/src/app/pages/settings/settings.component.html b/web/src/app/pages/settings/settings.component.html index b9284dd2..cdfd4464 100644 --- a/web/src/app/pages/settings/settings.component.html +++ b/web/src/app/pages/settings/settings.component.html @@ -64,11 +64,11 @@
- Enabled Currency pairs {{enabledCurrencies.selectedOptions.selected.length}} + Enabled Currency pairs {{enabledCurrencies.selectedOptions.selected.length}} - Managed via config temporarily
- + {{currency}} diff --git a/web/src/app/shared/donate/donate.component.html b/web/src/app/shared/donate/donate.component.html deleted file mode 100644 index ec9cc2d1..00000000 --- a/web/src/app/shared/donate/donate.component.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/src/app/shared/donate/donate.component.scss b/web/src/app/shared/donate/donate.component.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/web/src/assets/early-dumb-donate.png b/web/src/assets/early-dumb-donate.png new file mode 100644 index 0000000000000000000000000000000000000000..a123a27cffc967747e1eb7b2f657fd89810fdf56 GIT binary patch literal 7976 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 MMNNfzIm>td1BAY45C8xG literal 0 HcmV?d00001