SES-74 #8

Merged
s426134 merged 7 commits from SES-74 into master 2020-12-05 19:00:59 +01:00
20 changed files with 5 additions and 59 deletions
Showing only changes of commit ceb836d734 - Show all commits

View File

@ -1,10 +1,10 @@
import { RouterModule, Routes } from '@angular/router'; import { RouterModule, Routes } from '@angular/router';
import { MasterPageComponent } from './app/pages/master-page/master-page.component'; import { SelectRoleComponent } from './app/components/select-role/select-role.component';
const routes: Routes = [ const routes: Routes = [
{ {
path: '', path: '',
component: MasterPageComponent, component: SelectRoleComponent,
pathMatch: 'full' pathMatch: 'full'
}, },
]; ];

View File

@ -1,6 +1,5 @@
<body> <body>
<div class="container"> <div class="container">
<router-outlet></router-outlet> <router-outlet></router-outlet>
<app-select-role></app-select-role>
</div> </div>
</body> </body>

View File

@ -5,5 +5,5 @@ import { Component } from '@angular/core';
templateUrl: './app.component.html' templateUrl: './app.component.html'
}) })
export class AppComponent { export class AppComponent {
title = 'app'; title = 'Session Companion';
} }

View File

@ -4,7 +4,6 @@ import { FormsModule } from '@angular/forms';
import { HttpClientModule } from '@angular/common/http'; import { HttpClientModule } from '@angular/common/http';
import { AppComponent } from './app.component'; import { AppComponent } from './app.component';
import { SelectRoleComponent } from './components/select-role/select-role.component'; import { SelectRoleComponent } from './components/select-role/select-role.component';
import { MasterPageComponent } from './pages/master-page/master-page.component';
import { appRoutingModule } from '../app.routing'; import { appRoutingModule } from '../app.routing';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { MatButtonModule } from '@angular/material/button'; import { MatButtonModule } from '@angular/material/button';
@ -14,7 +13,6 @@ import { MatCardModule } from '@angular/material/card';
declarations: [ declarations: [
AppComponent, AppComponent,
SelectRoleComponent, SelectRoleComponent,
MasterPageComponent
], ],
imports: [ imports: [
BrowserModule.withServerTransition({ appId: 'ng-cli-universal' }), BrowserModule.withServerTransition({ appId: 'ng-cli-universal' }),

View File

@ -1,9 +0,0 @@
import { Component } from '@angular/core';
@Component({
selector: 'app-game-master-dashboard',
templateUrl: './game-master-dashboard.component.html',
styleUrls: ['./game-master-dashboard.component.css']
})
export class GameMasterDashboardPageComponent {
}

View File

@ -1,5 +0,0 @@
.container {
display: flex;
justify-content: center;
align-items: center;
}

View File

@ -1,9 +0,0 @@
import { Component } from '@angular/core';
@Component({
selector: 'app-master-page',
templateUrl: './master-page.component.html',
styleUrls: ['./master-page.component.css'],
})
export class MasterPageComponent {
}

View File

@ -1,9 +0,0 @@
import { Component } from '@angular/core';
@Component({
selector: 'app-player-dashboard-page',
templateUrl: './player-dashboard-page.component.html',
styleUrls: ['./player-dashboard-page.component.css']
})
export class PlayerDashboardPageComponent {
}

View File

@ -1,9 +0,0 @@
import { Component } from '@angular/core';
@Component({
selector: 'app-registration-page',
templateUrl: './registration-page.component.html',
styleUrls: ['./registration-page.component.css'],
})
export class RegistrationPageComponent {
}

View File

@ -1,9 +0,0 @@
import { Component } from '@angular/core';
@Component({
selector: 'app-sign-in-page',
templateUrl: './sign-in-page.component.html',
styleUrls: ['./sign-in-page.component.css']
})
export class SignInPageComponent {
}

View File

@ -1,6 +1,6 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
"DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=SessionCompanion;Trusted_Connection=True;MultipleActiveResultSets=true" "DefaultConnection": "Server=.\\SQLEXPRESS;Database=SessionCompanion;Trusted_Connection=True;MultipleActiveResultSets=true"
}, },
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {