Skip to content

Commit

Permalink
Minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Tommatheussen committed May 26, 2017
1 parent 83b7553 commit 5addd9f
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion client/src/app/database/collection.store.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Collection } from '../models/collection.interface';

import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/subject';
import { Subject } from 'rxjs/Subject';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';

import * as Datastore from 'nedb';
Expand Down
8 changes: 4 additions & 4 deletions client/src/app/home/home.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
<mdl-layout-content>
<ngx-datatable
class='material'
[columnMode]=''force''
[rowHeight]=''auto''
[columnMode]='"force"'
[rowHeight]='"auto"'
[rows]='cards'
[columns]='columns'
[rowClass]='getRowClass'
[messages]='{ emptyMessage: 'No set selected' }'>
[messages]='{ emptyMessage: "No set selected" }'>
</ngx-datatable>
</mdl-layout-content>
<mdl-layout>
Expand All @@ -33,5 +33,5 @@
<button *ngIf='!value' mdl-button mdl-button-type='mini-fab' (click)='collectCard(row)'>
<mdl-icon>library_add</mdl-icon>
</button>
<div *ngIf='value'>{{ value | date : 'mediumDate' }} </div>
<div *ngIf='value'>{{ value | date : 'mediumDate' }}</div>
</ng-template>
4 changes: 3 additions & 1 deletion client/src/app/home/home.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ import { SetService } from '../set.service';
import { CardService } from '../card.service';
import { CollectionService } from '../collection.service';

import { Observable } from 'rxjs/observable';
import { Observable } from 'rxjs/Observable';
import 'rxjs/add/operator/map';
import 'rxjs/add/observable/zip';
import { Set } from '../models/set.interface';
import { Card } from '../models/card.interface';
import { Collection } from '../models/collection.interface';
Expand Down
2 changes: 1 addition & 1 deletion client/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset='utf-8'>
<title>Pokemon TCG Tracker</title>
<base href='/'>
<base href="/">

<meta name='viewport' content='width=device-width, initial-scale=1'>
</head>
Expand Down
4 changes: 2 additions & 2 deletions electron/updater.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ ipcMain.on('download-update', () => {
});

ipcMain.on('install-update', () => {
autoUpdater.quitAndInstall();

notify('install-update-starting');

autoUpdater.quitAndInstall();
});

function notify(title, message) {
Expand Down

0 comments on commit 5addd9f

Please sign in to comment.