From 301d56473a688b80e54106f518cf4516c25d80ec Mon Sep 17 00:00:00 2001 From: Paul Quintero Date: Thu, 21 Apr 2022 23:02:35 -0600 Subject: [PATCH 1/7] Add banner wiringbits --- .../shared/footer/footer.component.css | 59 +++++++++++++++++++ .../shared/footer/footer.component.html | 27 ++++++++- .../shared/footer/footer.component.ts | 4 +- 3 files changed, 86 insertions(+), 4 deletions(-) diff --git a/web-ui/src/app/components/shared/footer/footer.component.css b/web-ui/src/app/components/shared/footer/footer.component.css index e69de29b..b0f9e385 100644 --- a/web-ui/src/app/components/shared/footer/footer.component.css +++ b/web-ui/src/app/components/shared/footer/footer.component.css @@ -0,0 +1,59 @@ +.wiringbitsLogoContainer { + width: 12%; + height: auto; + border-top: 1px solid #fff; + border-left: 1px solid #fff; + border-right: 1px solid #fff; + border-top-left-radius: 5px; + border-top-right-radius: 5px; + bottom: 0px; + right: 0px; + position: fixed; + z-index: 100; +} + +.wiringbitsLogoTitle { + border-top-left-radius: 5px; + border-top-right-radius: 5px; + color: #fff; + background: #0f1223; +} + +.wiringbitsLogoImg { + width: 70px; + margin-left: 8px; + display: inline-block; +} + +.wiringbitsLogoImg img { + width: 70px; + object-fit: cover; +} + +.wiringbitsLogoImg span { + margin: 0 auto; + display: table; +} + +.wiringbitsLogoOptions { + float: right; + margin-top: 10px; + margin-right: 2px; +} + +.wiringbitsLogoOptions button { + background: #0f1223; +} + +.wiringbitsLogoLink { + width: auto; + background: #fefcfe; + padding: 5px; +} + +.wiringbitsLogoLink a { + display: block; + text-align: center; + text-decoration: none; + font-size: 18px; +} \ No newline at end of file diff --git a/web-ui/src/app/components/shared/footer/footer.component.html b/web-ui/src/app/components/shared/footer/footer.component.html index f5222ee4..c48371f0 100644 --- a/web-ui/src/app/components/shared/footer/footer.component.html +++ b/web-ui/src/app/components/shared/footer/footer.component.html @@ -1,2 +1,25 @@ -

-

+
+
+
+ + Wiringbits +
+
+ + +
+ +
+ +
\ No newline at end of file diff --git a/web-ui/src/app/components/shared/footer/footer.component.ts b/web-ui/src/app/components/shared/footer/footer.component.ts index 67f13785..07ba0220 100644 --- a/web-ui/src/app/components/shared/footer/footer.component.ts +++ b/web-ui/src/app/components/shared/footer/footer.component.ts @@ -6,10 +6,10 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./footer.component.css'] }) export class FooterComponent implements OnInit { - + isCollapsed = true; + isClosed = true; constructor() { } ngOnInit() { } - } From 23e22dbfa80a4d5f637c1d44009753d27f690123 Mon Sep 17 00:00:00 2001 From: Paul Quintero Date: Thu, 21 Apr 2022 23:05:58 -0600 Subject: [PATCH 2/7] Add module collapse --- web-ui/src/app/components/shared/shared.module.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web-ui/src/app/components/shared/shared.module.ts b/web-ui/src/app/components/shared/shared.module.ts index 0556f315..734d6dd1 100644 --- a/web-ui/src/app/components/shared/shared.module.ts +++ b/web-ui/src/app/components/shared/shared.module.ts @@ -14,6 +14,7 @@ import { TransactionTablev2Component } from './transaction-tablev2/transaction-t import { PipesModule } from '../../pipes/pipes.module'; import { BsDropdownModule } from 'ngx-bootstrap/dropdown'; import { TooltipModule } from 'ng2-tooltip-directive'; +import { CollapseModule } from 'ngx-bootstrap/collapse'; import { LottieAnimationViewModule } from 'ng-lottie'; @@ -30,7 +31,8 @@ import { LottieAnimationViewModule } from 'ng-lottie'; InfiniteScrollModule, BsDropdownModule.forRoot(), LottieAnimationViewModule.forRoot(), - TooltipModule + TooltipModule, + CollapseModule.forRoot() ], declarations: [ NavbarComponent, From e79242c44939245e13dbd9d966b4c08bf83039d1 Mon Sep 17 00:00:00 2001 From: Paul Quintero Date: Thu, 21 Apr 2022 23:06:22 -0600 Subject: [PATCH 3/7] logo --- web-ui/src/assets/wiringbits.png | Bin 0 -> 51527 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 web-ui/src/assets/wiringbits.png diff --git a/web-ui/src/assets/wiringbits.png b/web-ui/src/assets/wiringbits.png new file mode 100644 index 0000000000000000000000000000000000000000..ce9236d1906478b7782b9ea7848ea7a19934544f GIT binary patch literal 51527 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 Date: Thu, 21 Apr 2022 23:30:15 -0600 Subject: [PATCH 4/7] update ngx to work correctly --- web-ui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web-ui/package.json b/web-ui/package.json index b12174ba..180f2694 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -37,7 +37,7 @@ "ng-http-loader": "^5.0.0", "ng-lottie": "^0.3.2", "ng2-tooltip-directive": "^2.9.17", - "ngx-bootstrap": "^3.3.0", + "ngx-bootstrap": "^4.2.0", "ngx-bootstrap-slider": "^1.9.0", "ngx-infinite-scroll": "^7.0.1", "ngx-moment": "^3.0.1", From a4f6b3393b47c23f264ebb4dcada4824c9288551 Mon Sep 17 00:00:00 2001 From: Paul Quintero Date: Fri, 22 Apr 2022 20:22:09 -0600 Subject: [PATCH 5/7] change desing chat to tooltip --- .../shared/footer/footer.component.css | 67 +++++-------------- .../shared/footer/footer.component.html | 28 ++------ .../shared/footer/footer.component.ts | 2 - .../app/components/shared/shared.module.ts | 4 +- web-ui/src/styles.css | 14 ++++ 5 files changed, 35 insertions(+), 80 deletions(-) diff --git a/web-ui/src/app/components/shared/footer/footer.component.css b/web-ui/src/app/components/shared/footer/footer.component.css index b0f9e385..53ffe360 100644 --- a/web-ui/src/app/components/shared/footer/footer.component.css +++ b/web-ui/src/app/components/shared/footer/footer.component.css @@ -1,59 +1,22 @@ -.wiringbitsLogoContainer { - width: 12%; - height: auto; - border-top: 1px solid #fff; - border-left: 1px solid #fff; - border-right: 1px solid #fff; - border-top-left-radius: 5px; - border-top-right-radius: 5px; +.wiringbitsLogoLink { + text-decoration: none; + font-size: 18px; + color: #fff; +} + +.wiringbitsFloatLogo { + background-color: #fff; + border-radius: 30px; + border: 2px solid #ffffff; + background-image: linear-gradient(to bottom right, #101011, #2a51e7); bottom: 0px; right: 0px; position: fixed; z-index: 100; } -.wiringbitsLogoTitle { - border-top-left-radius: 5px; - border-top-right-radius: 5px; - color: #fff; - background: #0f1223; -} - -.wiringbitsLogoImg { - width: 70px; - margin-left: 8px; - display: inline-block; +.wiringbitsFloatLogo img { + width: 50px; + height: 50px; + object-fit: contain; } - -.wiringbitsLogoImg img { - width: 70px; - object-fit: cover; -} - -.wiringbitsLogoImg span { - margin: 0 auto; - display: table; -} - -.wiringbitsLogoOptions { - float: right; - margin-top: 10px; - margin-right: 2px; -} - -.wiringbitsLogoOptions button { - background: #0f1223; -} - -.wiringbitsLogoLink { - width: auto; - background: #fefcfe; - padding: 5px; -} - -.wiringbitsLogoLink a { - display: block; - text-align: center; - text-decoration: none; - font-size: 18px; -} \ No newline at end of file diff --git a/web-ui/src/app/components/shared/footer/footer.component.html b/web-ui/src/app/components/shared/footer/footer.component.html index c48371f0..eacb09b1 100644 --- a/web-ui/src/app/components/shared/footer/footer.component.html +++ b/web-ui/src/app/components/shared/footer/footer.component.html @@ -1,25 +1,5 @@ -
-
-
- - Wiringbits -
-
- - -
- -
-
+Powered by wiringbits +
+
\ No newline at end of file diff --git a/web-ui/src/app/components/shared/footer/footer.component.ts b/web-ui/src/app/components/shared/footer/footer.component.ts index 07ba0220..7b873474 100644 --- a/web-ui/src/app/components/shared/footer/footer.component.ts +++ b/web-ui/src/app/components/shared/footer/footer.component.ts @@ -6,8 +6,6 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./footer.component.css'] }) export class FooterComponent implements OnInit { - isCollapsed = true; - isClosed = true; constructor() { } ngOnInit() { diff --git a/web-ui/src/app/components/shared/shared.module.ts b/web-ui/src/app/components/shared/shared.module.ts index 734d6dd1..0e798b76 100644 --- a/web-ui/src/app/components/shared/shared.module.ts +++ b/web-ui/src/app/components/shared/shared.module.ts @@ -14,7 +14,7 @@ import { TransactionTablev2Component } from './transaction-tablev2/transaction-t import { PipesModule } from '../../pipes/pipes.module'; import { BsDropdownModule } from 'ngx-bootstrap/dropdown'; import { TooltipModule } from 'ng2-tooltip-directive'; -import { CollapseModule } from 'ngx-bootstrap/collapse'; +import { PopoverModule } from 'ngx-bootstrap/popover'; import { LottieAnimationViewModule } from 'ng-lottie'; @@ -32,7 +32,7 @@ import { LottieAnimationViewModule } from 'ng-lottie'; BsDropdownModule.forRoot(), LottieAnimationViewModule.forRoot(), TooltipModule, - CollapseModule.forRoot() + PopoverModule.forRoot() ], declarations: [ NavbarComponent, diff --git a/web-ui/src/styles.css b/web-ui/src/styles.css index f79ee373..3cd21293 100644 --- a/web-ui/src/styles.css +++ b/web-ui/src/styles.css @@ -459,4 +459,18 @@ table.isLoading tr:nth-child(odd) td div::after { .small, small { font-size: 75%; +} + +.wiringbitsPopOver { + background-color: #00135b; + color: #ffffff; + border: 2px solid #fff; +} + +.wiringbitsHighlight { + box-shadow: 0px 0px 13px 5px #0ab8ca; +} + +.wiringbitsPopOver.popover>.arrow, .popover>.arrow:after { + border-color: transparent !important; } \ No newline at end of file From 4d98b9a49839ec03b3d8fadcc02308189bbeb9ab Mon Sep 17 00:00:00 2001 From: Paul Quintero Date: Fri, 22 Apr 2022 20:26:14 -0600 Subject: [PATCH 6/7] blanks paces --- web-ui/src/app/components/shared/footer/footer.component.html | 2 +- web-ui/src/styles.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web-ui/src/app/components/shared/footer/footer.component.html b/web-ui/src/app/components/shared/footer/footer.component.html index eacb09b1..18dbba41 100644 --- a/web-ui/src/app/components/shared/footer/footer.component.html +++ b/web-ui/src/app/components/shared/footer/footer.component.html @@ -2,4 +2,4 @@
-
\ No newline at end of file +
diff --git a/web-ui/src/styles.css b/web-ui/src/styles.css index 3cd21293..2a90bbef 100644 --- a/web-ui/src/styles.css +++ b/web-ui/src/styles.css @@ -473,4 +473,4 @@ table.isLoading tr:nth-child(odd) td div::after { .wiringbitsPopOver.popover>.arrow, .popover>.arrow:after { border-color: transparent !important; -} \ No newline at end of file +} From b5603912e3916ef0363e2db561a6a3432e072b57 Mon Sep 17 00:00:00 2001 From: Paul Quintero Date: Fri, 22 Apr 2022 20:33:52 -0600 Subject: [PATCH 7/7] Add module to unittest --- .../app/components/shared/footer/footer.component.spec.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web-ui/src/app/components/shared/footer/footer.component.spec.ts b/web-ui/src/app/components/shared/footer/footer.component.spec.ts index 2ca6c454..04361fb6 100644 --- a/web-ui/src/app/components/shared/footer/footer.component.spec.ts +++ b/web-ui/src/app/components/shared/footer/footer.component.spec.ts @@ -2,13 +2,18 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { FooterComponent } from './footer.component'; +import { PopoverModule } from 'ngx-bootstrap/popover'; + describe('FooterComponent', () => { let component: FooterComponent; let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ FooterComponent ] + declarations: [ FooterComponent ], + imports: [ + PopoverModule.forRoot(), + ], }) .compileComponents(); }));