Skip to content

Build Fixes and Database Initialization #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 7, 2017
Merged

Build Fixes and Database Initialization #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07d2ae5
fix build errors and warnings
cyberjaxx Jul 1, 2017
66c4f32
Database wasn't initialized in non development environment
cyberjaxx Jul 2, 2017
e3d72db
Merge branch 'master' into master-fixes
MarkPieszak Jul 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Client/app/shared/route.resolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Injectable } from '@angular/core';
import { Injectable } from '@angular/core';
import { Resolve } from '@angular/router';

import { SignalR, SignalRConnection } from 'ng2-signalr';
import { SignalR, ISignalRConnection } from 'ng2-signalr';

@Injectable()
export class ConnectionResolver implements Resolve<SignalRConnection> {
export class ConnectionResolver implements Resolve<ISignalRConnection> {

constructor(private _signalR: SignalR) { }

Expand Down
4 changes: 2 additions & 2 deletions Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF

app.UseStaticFiles();

DbInitializer.Initialize(context);

if (env.IsDevelopment())
{
app.UseDeveloperExceptionPage();
app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions {
HotModuleReplacement = true
});

DbInitializer.Initialize(context);

app.UseSwagger();

// Enable middleware to serve swagger-ui (HTML, JS, CSS etc.), specifying the Swagger JSON endpoint.
Expand Down
4 changes: 1 addition & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
"isomorphic-fetch": "^2.2.1",
"jquery": "^2.2.1",
"json-loader": "^0.5.4",

"ng2-signalr": "2.0.4",
"ngx-bootstrap": "^1.7.1",
"node-sass": "^4.5.2",
Expand Down Expand Up @@ -82,7 +81,6 @@
"codelyzer": "^3.0.0-beta.4",
"jasmine-core": "^2.5.2",
"jest": "^20.0.0",
"jest-preset-angular": "^2.0.1",
"tslint": "^4.5.1"
"jest-preset-angular": "^2.0.1"
}
}