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 00000000..a123a27c Binary files /dev/null and b/web/src/assets/early-dumb-donate.png differ