Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history 
# Conflicts:
#	src/app/app.module.ts
  • Loading branch information
@rkorszun
rkorszun committed Feb 1, 2018
2 parents a412f31 + 2e81f65 commit 52e93cd
Show file tree
Hide file tree
Showing 14 changed files with 224 additions and 600 deletions.
23 changes: 11 additions & 12 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,41 +44,38 @@
},
"devDependencies": {
"@angular/animations": "^4.4.3",
"@angular/cli": "1.4.3",
"@angular/common": "4.4.3",
"@angular/compiler": "4.4.3",
"@angular/compiler-cli": "4.4.3",
"@angular/core": "4.4.3",
"@angular/forms": "4.4.3",
"@angular/http": "4.4.3",
"@angular/platform-browser": "^4.4.3",
"@angular/platform-browser-dynamic": "^4.4.3",
"@angular/router": "4.4.3",
"core-js": "2.4.1",
"font-awesome": "^4.7.0",
"ionicons": "^3.0.0",
"ngx-loading": "^1.0.8",
"rxjs": "5.4.3",
"zone.js": "0.8.17",
"@angular/compiler": "4.4.3",
"electron-builder": "^19.37.2",
"electron-squirrel-startup": "^1.0.0",
"@angular/cli": "1.4.3",
"@angular/compiler-cli": "4.4.3",
"@types/core-js": "0.9.36",
"@types/jasmine": "2.5.54",
"@types/node": "7.0.7",
"autoprefixer": "7.1.4",
"codelyzer": "3.2.0",
"copyfiles": "1.2.0",
"core-js": "2.4.1",
"cross-env": "5.0.5",
"css-loader": "0.28.7",
"cssnano": "3.10.0",
"electron": "1.7.11",
"electron-builder": "^19.37.2",
"electron-packager": "9.1.0",
"electron-rebuild": "^1.6.0",
"electron-reload": "1.2.1",
"electron-squirrel-startup": "^1.0.0",
"electron-winstaller": "^2.6.3",
"exports-loader": "0.6.4",
"file-loader": "0.11.2",
"font-awesome": "^4.7.0",
"html-loader": "0.5.1",
"ionicons": "^3.0.0",
"istanbul-instrumenter-loader": "3.0.0",
"jasmine-core": "2.8.0",
"jasmine-spec-reporter": "4.2.1",
Expand All @@ -98,6 +95,7 @@
"postcss-url": "7.1.2",
"protractor": "5.1.2",
"raw-loader": "0.5.1",
"rxjs": "5.4.3",
"sass-loader": "6.0.6",
"script-loader": "0.7.1",
"source-map-loader": "0.2.1",
Expand All @@ -109,7 +107,8 @@
"url-loader": "0.5.9",
"webdriver-manager": "12.0.6",
"webpack": "3.6.0",
"webpack-dev-server": "2.8.2"
"webpack-dev-server": "2.8.2",
"zone.js": "0.8.17"
},
"license": "Apache-2.0"
}
13 changes: 3 additions & 10 deletions src/app/app.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import { DatabaseService } from './services/database.service'

import { BrowserAnimationsModule } from '@angular/platform-browser/animations';

import { LoadingModule, ANIMATION_TYPES } from 'ngx-loading';
import { HttpService } from './services/http.service';
import { SecondsToTimePipe } from './pipes/seconds-to-time.pipe';

Expand All @@ -40,6 +39,7 @@ import { ToolbarComponent } from './components/toolbar/toolbar.component';
import { SwitchAccountComponent } from './components/accounts/switch-account/switch-account.component'
import { MenuService } from './services/menu.service';
import { Nl2brPipe } from 'app/pipes/nl2br.pipe';
import { LoadingSpinnerComponent } from './components/loading-spinner/loading-spinner.component';

@NgModule({
declarations: [
Expand All @@ -57,22 +57,15 @@ import { Nl2brPipe } from 'app/pipes/nl2br.pipe';
ChangeAccountTokenComponent,
LicensesComponent,
ToolbarComponent,
SwitchAccountComponent
SwitchAccountComponent,
LoadingSpinnerComponent
],
imports: [
BrowserModule,
BrowserAnimationsModule,
FormsModule,
HttpModule,
AppRoutingModule,
LoadingModule.forRoot({
animationType: ANIMATION_TYPES.threeBounce,
backdropBackgroundColour: 'rgba(0,0,0,0.1)',
backdropBorderRadius: '4px',
primaryColour: '#ffffff',
secondaryColour: '#ffffff',
tertiaryColour: '#ffffff'
})
],
providers: [
ElectronService,
Expand Down
11 changes: 3 additions & 8 deletions src/app/components/accounts/edit-account/edit-account.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<button class="btn btn--transparent" type="submit" (click)="goToChangeToken()">CHANGE ACCOUNT TOKEN</button>
</div>
<span class="edit-account__title">SELECT BOARDS</span>
<div class="edit-account__boards" *ngIf="!httpService.loader else loader">
<div class="edit-account__boards" *ngIf="!httpService.loader else spinner">
<div class="edit-account__boards-list" *ngIf="agiles?.length != 0 else noBoards">
<div class="edit-account__item" *ngFor="let agile of agiles">
<input type="checkbox" [(ngModel)]="agile.checked" name="checked">
Expand All @@ -39,14 +39,9 @@
<button class="btn btn--red" type=”submit” (click)="saveChanges(editingAccount)">SAVE CHANGES</button>
</div>
</div>
<ng-template #loader>
<ng-template #spinner>
<div class="edit-account__boards loading-container">
<div class="spinner">
<div class="lds-css ng-scope">
<div class="lds-spinner" style="height:100%"><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div>
</div>
</div>
</div>
<app-loading-spinner></app-loading-spinner>
</div>
</ng-template>
<div class="edit-account__actions">
Expand Down
149 changes: 3 additions & 146 deletions src/app/components/accounts/edit-account/edit-account.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,150 +278,7 @@
.loading-container {
position: relative;
padding-bottom: 20px !important;
&__name {
margin-bottom: 12px;
background-color: $border-color;
border-radius: 40px;
height: 10px;
width: 220px;
app-loading-spinner {
position: static;
}
&__item {
margin-bottom: 24px;
padding: 12px;
width: 100%;
background: $empty-bg-color;
border-radius: 4px;
box-sizing: border-box;
.loading-container__title {
margin-bottom: 12px;
background-color: $border-color;
border-radius: 40px;
height: 10px;
width: 270px;
}
.loading-container__content {
background-color: $border-color;
border-radius: 40px;
height: 10px;
width: 180px;
}
}
.spinner {
.lds-css {
text-align: center;
}
.lds-spinner {
display: inline-block;
}
@keyframes lds-spinner {
0% {
opacity: 1;
}
100% {
opacity: 0;
}
}
@-webkit-keyframes lds-spinner {
0% {
opacity: 1;
}
100% {
opacity: 0;
}
}
.lds-spinner {
position: relative;
}
.lds-spinner div {
left: 94px;
top: 48px;
position: absolute;
-webkit-animation: lds-spinner linear 1s infinite;
animation: lds-spinner linear 1s infinite;
background: #ec4259;
width: 12px;
height: 24px;
border-radius: 40%;
-webkit-transform-origin: 6px 52px;
transform-origin: 6px 52px;
}
.lds-spinner div:nth-child(1) {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
-webkit-animation-delay: -0.916666666666667s;
animation-delay: -0.916666666666667s;
}
.lds-spinner div:nth-child(2) {
-webkit-transform: rotate(30deg);
transform: rotate(30deg);
-webkit-animation-delay: -0.833333333333333s;
animation-delay: -0.833333333333333s;
}
.lds-spinner div:nth-child(3) {
-webkit-transform: rotate(60deg);
transform: rotate(60deg);
-webkit-animation-delay: -0.75s;
animation-delay: -0.75s;
}
.lds-spinner div:nth-child(4) {
-webkit-transform: rotate(90deg);
transform: rotate(90deg);
-webkit-animation-delay: -0.666666666666667s;
animation-delay: -0.666666666666667s;
}
.lds-spinner div:nth-child(5) {
-webkit-transform: rotate(120deg);
transform: rotate(120deg);
-webkit-animation-delay: -0.583333333333333s;
animation-delay: -0.583333333333333s;
}
.lds-spinner div:nth-child(6) {
-webkit-transform: rotate(150deg);
transform: rotate(150deg);
-webkit-animation-delay: -0.5s;
animation-delay: -0.5s;
}
.lds-spinner div:nth-child(7) {
-webkit-transform: rotate(180deg);
transform: rotate(180deg);
-webkit-animation-delay: -0.416666666666667s;
animation-delay: -0.416666666666667s;
}
.lds-spinner div:nth-child(8) {
-webkit-transform: rotate(210deg);
transform: rotate(210deg);
-webkit-animation-delay: -0.333333333333333s;
animation-delay: -0.333333333333333s;
}
.lds-spinner div:nth-child(9) {
-webkit-transform: rotate(240deg);
transform: rotate(240deg);
-webkit-animation-delay: -0.25s;
animation-delay: -0.25s;
}
.lds-spinner div:nth-child(10) {
-webkit-transform: rotate(270deg);
transform: rotate(270deg);
-webkit-animation-delay: -0.166666666666667s;
animation-delay: -0.166666666666667s;
}
.lds-spinner div:nth-child(11) {
-webkit-transform: rotate(300deg);
transform: rotate(300deg);
-webkit-animation-delay: -0.083333333333333s;
animation-delay: -0.083333333333333s;
}
.lds-spinner div:nth-child(12) {
-webkit-transform: rotate(330deg);
transform: rotate(330deg);
-webkit-animation-delay: 0s;
animation-delay: 0s;
}
.lds-spinner {
width: 80px !important;
height: 80px !important;
-webkit-transform: translate(-40px, -40px) scale(0.4) translate(40px, 40px);
transform: translate(-40px, -40px) scale(0.4) translate(40px, 40px);
}
}
}
}
7 changes: 1 addition & 6 deletions src/app/components/boards-choice/boards-choice.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,7 @@
</div>
<ng-template #loader>
<div class="loading-container">
<div class="spinner">
<div class="lds-css ng-scope">
<div class="lds-spinner" style="height:100%"><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div>
</div>
</div>
</div>
<app-loading-spinner></app-loading-spinner>
</div>
</ng-template>
</div>
Expand Down
Loading

0 comments on commit 52e93cd

Please sign in to comment.