Skip to content

Commit

Permalink
Merge pull request #31 from qlcchain/feature/portal
Browse files Browse the repository at this point in the history
Feature/portal
  • Loading branch information
ze-rix committed Jan 16, 2020
2 parents 2273b4b + ec1ac4e commit 278f76f
Show file tree
Hide file tree
Showing 13 changed files with 1,428 additions and 1,832 deletions.
2,477 changes: 654 additions & 1,823 deletions package-lock.json

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions package.json
Expand Up @@ -59,12 +59,12 @@
"electron-util": "^0.11.0",
"find-process": "^1.4.3",
"fs-extra": "^8.1.0",
"inly": "^4.0.3",
"inly": "^4.0.4",
"jquery": "^3.4.1",
"js-base64": "^2.5.1",
"ngx-bootstrap": "^4.3.0",
"ngx-clipboard": "^12.2.1",
"ngx-device-detector": "^1.3.19",
"ngx-clipboard": "^12.3.0",
"ngx-device-detector": "^1.3.20",
"ngx-logger": "^3.4.6",
"pidusage": "^2.0.17",
"ps-node": "^0.1.6",
Expand All @@ -79,8 +79,8 @@
"zone.js": "~0.9.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.803.21",
"@angular/cli": "^8.3.21",
"@angular-devkit/build-angular": "^0.803.22",
"@angular/cli": "^8.3.22",
"@angular/compiler-cli": "^8.2.14",
"@angular/language-service": "^8.2.14",
"@types/jasmine": "^3.4.6",
Expand All @@ -95,13 +95,13 @@
"jasmine-spec-reporter": "~4.2.1",
"karma": "^4.4.1",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "^2.1.0",
"karma-coverage-istanbul-reporter": "^2.1.1",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.2",
"karma-jasmine-html-reporter": "^1.5.1",
"popper.js": "^1.16.0",
"protractor": "~5.4.2",
"tar": "^4.4.13",
"ts-node": "^8.5.2",
"ts-node": "^8.6.2",
"tslint": "~5.16.0",
"typescript": "3.4.5"
},
Expand Down
2 changes: 2 additions & 0 deletions src/app/app-routing.module.ts
Expand Up @@ -40,6 +40,7 @@ import { CanActivateRouteGuard } from './app-routing.guard';
import { RepresentationRewardComponent } from './components/qlc/representation/representation-reward/representation-reward.component';
import { MiningRewardComponent } from './components/qlc/mining/mining-reward/mining-reward.component';
import { StakingDashboardComponent } from './components/staking-dashboard/staking-dashboard.component';
import { PortalComponent } from './components/portal/portal.component';

const routes: Routes = [
{ path: '', component: HomeComponent },
Expand Down Expand Up @@ -94,6 +95,7 @@ const routes: Routes = [
{ path: 'pov/:type/:hash', component: PovViewComponent },
{ path: 'news', component: NewsComponent },
{ path: 'dashboard', component: UserDashboardComponent, canActivate: [CanActivateRouteGuard] },
{ path: 'portal', component: PortalComponent },
{ path: '**', component: HomeComponent }
];

Expand Down
4 changes: 3 additions & 1 deletion src/app/app.module.ts
Expand Up @@ -78,6 +78,7 @@ import { MiningRewardComponent } from './components/qlc/mining/mining-reward/min
import { UserSubmenuComponent } from './components/user-dashboard/user-submenu/user-submenu.component';
import { StakingDashboardComponent } from './components/staking-dashboard/staking-dashboard.component';
import { SqueezeNumberPipe } from './pipes/squeeze-number.pipe';
import { PortalComponent } from './components/portal/portal.component';

export function createTranslateLoader(http: HttpClient) {
return new TranslateHttpLoader(http, './assets/i18n/', '.json');
Expand Down Expand Up @@ -137,7 +138,8 @@ export function createTranslateLoader(http: HttpClient) {
MiningRewardComponent,
UserSubmenuComponent,
StakingDashboardComponent,
SqueezeNumberPipe
SqueezeNumberPipe,
PortalComponent
],
imports: [
BrowserModule,
Expand Down
1 change: 1 addition & 0 deletions src/app/components/header/header.component.html
Expand Up @@ -31,6 +31,7 @@
<div class="menu-item menu-close"></div>
<div class="menu-sub-items">
<!-- <a routerLink="/topwallets" routerLinkActive="active">Top Wallets</a>-->
<a routerLink="/portal" routerLinkActive="active">Portal</a>
<a routerLink="/pov-explorer" routerLinkActive="active">PoV Explorer</a>
<a routerLink="/news" routerLinkActive="active">News</a>
<a routerLink="/tokens" routerLinkActive="active">Tokens</a>
Expand Down
17 changes: 17 additions & 0 deletions src/app/components/home/home.component.html
Expand Up @@ -93,6 +93,23 @@ <h1>Network Status</h1>

</div>
</div>
<div class="container">
<div class="row">
<div class="col-md-12 pl-md-2 pr-md-2 mt-0 mb-3 d-none d-md-block ">
<a routerLink="/portal">
<img src="../../../assets/img/banner-mining-support-plan-lg.png" alt="Banner minner support plan" style="width: 100%;">
</a>
</div>

<div class="col-12 pl-md-2 pr-md-2 mt-0 mb-3 d-block d-md-none ">
<a routerLink="/portal">
<img src="../../../assets/img/banner-mining-support-plan-sm.png" alt="Banner minner support plan" style="width: 100%;">
</a>
</div>


</div>
</div>
<div class="container"><div class="row">

<div class="col-lg-6 col-md-12 col-12 pl-0 pr-0">
Expand Down
362 changes: 362 additions & 0 deletions src/app/components/portal/portal.component.html

Large diffs are not rendered by default.

233 changes: 233 additions & 0 deletions src/app/components/portal/portal.component.scss
@@ -0,0 +1,233 @@
@import '../../../scss/mixins';
.btn {
padding: initial;
}

.custom-select {
display: inline-block;
width: 100%;
height: calc(2.25rem + 2px);
padding: 0.375rem 2.4rem 0.375rem 0.75rem;
line-height: 1.5;
color: #495057;
vertical-align: middle;
//background: #fff url('../assets/img/qlc-icon-dropdown.svg') no-repeat right 0.75rem center;
background-size: 16px 16px;
border: 1px solid #495057;
border-radius: 0;
appearance: none;
}
.custom-select:focus {
border-color: #495057;
outline: 0;
box-shadow: 0 0 0 2px rgba(108, 69, 190, 0.2);
}

.custom-select.contacts {
//background: #fff url('../assets/img/qlc-icon-addressbook-grey.svg') no-repeat right 0.75rem center;
background-size: 16px 16px;
}


.sendTokens {
padding-top: 40px;
padding-bottom: 40px;
.second {
margin-top: 15px;
}
.balance {
font-weight: bold;
padding-left: 30px;
}
.fiat {
font-weight: bold;
color: $textLight;
}
.toaccount {
position: absolute;
top: 15px;
width: 90%;
height: 31px;
left: 1px;
border-right: none;
border: transparent;
}
.success {
border: 1px solid $greenLight;
}
.toaccount.success {
border-right: none;
}
.dangerLeft {
border-bottom: 1px solid $redLight;
border-top: 1px solid $redLight;
border-left: 1px solid $redLight;
}
.dangerRight {
border-bottom: 1px solid $redLight;
border-top: 1px solid $redLight;
border-right: 1px solid $redLight;
}

button.btn-outline-secondary {
margin-top: auto;
background-color: transparent;
border: 1px solid $textLight;
border-left: none;
color: $default;
border-radius: 0;
text-shadow: none;
}
button.btn-outline-secondary:hover {
text-decoration: underline;
}
button.btn-outline-secondary:focus,
.btn-outline-secondary:not(:disabled):not(.disabled):active,
.btn-outline-secondary:not(:disabled):not(.disabled).active,
.show > .btn-outline-secondary.dropdown-toggle,
.btn-outline-secondary:not(:disabled):not(.disabled):active:focus,
.btn-outline-secondary:not(:disabled):not(.disabled).active:focus,
.show > .btn-outline-secondary.dropdown-toggle:focus {
box-shadow: none;
outline: 0;
background-color: transparent;
color: $default;
border-color: $textLight;
}
button.btn-outline-secondary:active {
text-decoration: underline;
}
.inlineForm,
.inlineForm2 {
border: 0;
border-top: 1px solid $textLight;
border-bottom: 1px solid $textLight;
//background: #fff url('../../../assets/img/separator_input.png') no-repeat left 0 center;
background-size: 1px 34px;
padding-top: 10px;
padding-bottom: 10px;
}
.inlineForm2 {
border-radius: 0;
border-right: 1px solid $textLight;
}
.input-group-text {
font-weight: bold;
border-radius: 0;
border: 1px solid $textLight;
/*border-right: none;*/
background: transparent;
width: 65px;
font-size: 13px;
}
.input-group-prepend {
border-right: 1px solid #c9c7d0 !important;
}
.input-group-text.maxLink {
border: 1px solid $textLight;
border-left: none;
color: $default;
width: auto;
padding-top: 10px;
padding-bottom: 10px;
}
.maxLink:hover {
text-decoration: underline;
}
.rowAmount {

font-size: 13px;
height: 58px;
padding-left: 20px;
padding-right: 20px;
color: $text;
padding-top: 10px;
height: auto;
}
}

.confirm-title {
font-weight: bolder;
display: block;
font-size: 24px;
}

.confirm-currency {
font-weight: bolder;
display: block;
font-size: 20px;
}

.confirm-subtitle {
display: block;
font-size: 10px;
}
.form-control.form-my-border {
border: 1px solid #a8a6ae !important;
}
.ng-invalid.ng-touched {
border: 1px solid #ff0000 !important;
}
@media (max-width: 12450px) {
.br-spacer {
display: block;
}
}
@media (max-width: 959px) {
.br-spacer {
display: none;
}
}
.confirmTransaction {
font-weight: bold;
text-align: center;
font-size: 13px;
color: $text;
.text-label {
text-transform: uppercase;
color: $textLight;
font-size: 12px;
}
.sum {
color: $default;
font-size: $fontSizeTitle;
background: #edeef4;
height: 1px;
margin-top: 20px;
margin-bottom: 20px;
}
.sum span {
background: #fff;
padding: 15px;
position: relative;
top: -15px;
}
.name {
font-size: $fontSizeTitle;
}
.address {

word-break: break-all;
word-wrap: break-word;
color: $text;
}
.address:hover {
color: $superLight;
}
.transfer {
background: #ffffff url('../../../assets/img/qlc-icon-arrow-transaction-right-grey.svg') no-repeat center center;
background-size: 24px 24px;
border-top: 0;
@media (max-width: 992px) {
background: #ffffff url('../../../assets/img/qlc-icon-arrow-transaction-down-grey.svg') no-repeat center center;
background-size: 24px 24px;
}
}
.fiatrate {
color: $textLight;
}
}

.ng-invalid.ng-invalid-ignore, .ng-invalid.ng-touched.ng-invalid-ignore, .ng-invalid-ignore, .ng-touched.ng-invalid-ignore, .ng-dirty.ng-invalid-ignore {
border: none !important;
}
25 changes: 25 additions & 0 deletions src/app/components/portal/portal.component.spec.ts
@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { PortalComponent } from './portal.component';

describe('PortalComponent', () => {
let component: PortalComponent;
let fixture: ComponentFixture<PortalComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ PortalComponent ]
})
.compileComponents();
}));

beforeEach(() => {
fixture = TestBed.createComponent(PortalComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});

0 comments on commit 278f76f

Please sign in to comment.