s426135/session-companion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SES-67 #11

Merged
s426134 merged 7 commits from SES-67 into master 2020-12-05 16:40:08 +01:00
Conversation 0 Commits 7 Files Changed 8 +178 -178
9 changed files with 178 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b242455a88 - Show all commits

42
Jenkinsfile vendored
View File

@ -1,21 +1,21 @@
pipeline { pipeline {
agent any agent any
stages { stages {
stage('Build image') { stage('Build image') {
steps { steps {
echo "Building docker image" echo "Building docker image"
script { script {
dir('SessionCompanion/SessionCompanion'){ dir('SessionCompanion/SessionCompanion'){
def customImage = docker.build("session-companion:${env.BUILD_ID}") def customImage = docker.build("session-companion:${env.BUILD_ID}")
//customImage.withRun('-p 5050:5050') //customImage.withRun('-p 5050:5050')
} }
} }
} }
} }
stage('Delete image') { stage('Delete image') {
steps { steps {
sh "docker rmi session-companion:${env.BUILD_ID}" sh "docker rmi session-companion:${env.BUILD_ID}"
} }
} }
} }
} }

26
SessionCompanion/SessionCompanion.Database/Repositories/CharismaRepository.cs
View File

@ -1,14 +1,14 @@
using SessionCompanion.Database.Repositories.Base; using SessionCompanion.Database.Repositories.Base;
using SessionCompanion.Database.Tables; using SessionCompanion.Database.Tables;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
namespace SessionCompanion.Database.Repositories namespace SessionCompanion.Database.Repositories
{ {
public class CharismaRepository : Repository<Charisma>, IRepository<Charisma> public class CharismaRepository : Repository<Charisma>, IRepository<Charisma>
{ {
public CharismaRepository(ApplicationDbContext _dbContext) : base(_dbContext) public CharismaRepository(ApplicationDbContext _dbContext) : base(_dbContext)
{ } { }
} }
} }

28
SessionCompanion/SessionCompanion.Database/Repositories/ConstitutionRepository.cs
View File

@ -1,14 +1,14 @@
using SessionCompanion.Database.Repositories.Base; using SessionCompanion.Database.Repositories.Base;
using SessionCompanion.Database.Tables; using SessionCompanion.Database.Tables;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
namespace SessionCompanion.Database.Repositories namespace SessionCompanion.Database.Repositories
{ {
public class ConstitutionRepository : Repository<Constitution>, IRepository<Constitution> public class ConstitutionRepository : Repository<Constitution>, IRepository<Constitution>
{ {
public ConstitutionRepository(ApplicationDbContext _dbContext) : base(_dbContext) public ConstitutionRepository(ApplicationDbContext _dbContext) : base(_dbContext)
{ } { }
} }
} }

28
SessionCompanion/SessionCompanion.Database/Repositories/DexterityRepository.cs
View File

@ -1,14 +1,14 @@
using SessionCompanion.Database.Repositories.Base; using SessionCompanion.Database.Repositories.Base;
using SessionCompanion.Database.Tables; using SessionCompanion.Database.Tables;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
namespace SessionCompanion.Database.Repositories namespace SessionCompanion.Database.Repositories
{ {
public class DexterityRepository : Repository<Dexterity>, IRepository<Dexterity> public class DexterityRepository : Repository<Dexterity>, IRepository<Dexterity>
{ {
public DexterityRepository(ApplicationDbContext _dbContext) : base(_dbContext) public DexterityRepository(ApplicationDbContext _dbContext) : base(_dbContext)
{ } { }
} }
} }

28
SessionCompanion/SessionCompanion.Database/Repositories/IntelligenceRepository.cs
View File

@ -1,14 +1,14 @@
using SessionCompanion.Database.Repositories.Base; using SessionCompanion.Database.Repositories.Base;
using SessionCompanion.Database.Tables; using SessionCompanion.Database.Tables;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
namespace SessionCompanion.Database.Repositories namespace SessionCompanion.Database.Repositories
{ {
public class IntelligenceRepository : Repository<Intelligence>, IRepository<Intelligence> public class IntelligenceRepository : Repository<Intelligence>, IRepository<Intelligence>
{ {
public IntelligenceRepository(ApplicationDbContext _dbContext) : base(_dbContext) public IntelligenceRepository(ApplicationDbContext _dbContext) : base(_dbContext)
{ } { }
} }
} }

28
SessionCompanion/SessionCompanion.Database/Repositories/StrengthRepository.cs
View File

@ -1,14 +1,14 @@
using SessionCompanion.Database.Repositories.Base; using SessionCompanion.Database.Repositories.Base;
using SessionCompanion.Database.Tables; using SessionCompanion.Database.Tables;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
namespace SessionCompanion.Database.Repositories namespace SessionCompanion.Database.Repositories
{ {
public class StrengthRepository : Repository<Strength>, IRepository<Strength> public class StrengthRepository : Repository<Strength>, IRepository<Strength>
{ {
public StrengthRepository(ApplicationDbContext _dbContext) : base(_dbContext) public StrengthRepository(ApplicationDbContext _dbContext) : base(_dbContext)
{ } { }
} }
} }

28
SessionCompanion/SessionCompanion.Database/Repositories/WisdomRepository.cs
View File

@ -1,14 +1,14 @@
using SessionCompanion.Database.Repositories.Base; using SessionCompanion.Database.Repositories.Base;
using SessionCompanion.Database.Tables; using SessionCompanion.Database.Tables;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
namespace SessionCompanion.Database.Repositories namespace SessionCompanion.Database.Repositories
{ {
public class WisdomRepository : Repository<Wisdom>, IRepository<Wisdom> public class WisdomRepository : Repository<Wisdom>, IRepository<Wisdom>
{ {
public WisdomRepository(ApplicationDbContext _dbContext) : base(_dbContext) public WisdomRepository(ApplicationDbContext _dbContext) : base(_dbContext)
{ } { }
} }
} }

122
SessionCompanion/SessionCompanion/ClientApp/package.json
View File

@ -1,61 +1,61 @@
{ {
"name": "sessioncompanion", "name": "sessioncompanion",
"version": "0.0.0", "version": "0.0.0",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve",
"build": "ng build", "build": "ng build",
"build:ssr": "ng run SessionCompanion:server:dev", "build:ssr": "ng run SessionCompanion:server:dev",
"test": "ng test", "test": "ng test",
"lint": "ng lint", "lint": "ng lint",
"e2e": "ng e2e" "e2e": "ng e2e"
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "8.2.12", "@angular/animations": "8.2.12",
"@angular/cdk": "~8.2.3", "@angular/cdk": "~8.2.3",
"@angular/common": "8.2.12", "@angular/common": "8.2.12",
"@angular/compiler": "8.2.12", "@angular/compiler": "8.2.12",
"@angular/core": "8.2.12", "@angular/core": "8.2.12",
"@angular/forms": "8.2.12", "@angular/forms": "8.2.12",
"@angular/material": "^8.2.3", "@angular/material": "^8.2.3",
"@angular/platform-browser": "8.2.12", "@angular/platform-browser": "8.2.12",
"@angular/platform-browser-dynamic": "8.2.12", "@angular/platform-browser-dynamic": "8.2.12",
"@angular/platform-server": "8.2.12", "@angular/platform-server": "8.2.12",
"@angular/router": "8.2.12", "@angular/router": "8.2.12",
"@nguniversal/module-map-ngfactory-loader": "8.1.1", "@nguniversal/module-map-ngfactory-loader": "8.1.1",
"aspnet-prerendering": "^3.0.1", "aspnet-prerendering": "^3.0.1",
"bootstrap": "^4.3.1", "bootstrap": "^4.3.1",
"core-js": "^3.3.3", "core-js": "^3.3.3",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
"jquery": "3.4.1", "jquery": "3.4.1",
"oidc-client": "^1.9.1", "oidc-client": "^1.9.1",
"popper.js": "^1.16.0", "popper.js": "^1.16.0",
"rxjs": "^6.5.3", "rxjs": "^6.5.3",
"zone.js": "0.9.1" "zone.js": "0.9.1"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "^0.803.26", "@angular-devkit/build-angular": "^0.803.26",
"@angular/cli": "^8.3.26", "@angular/cli": "^8.3.26",
"@angular/compiler-cli": "^8.2.14", "@angular/compiler-cli": "^8.2.14",
"@angular/language-service": "^8.2.12", "@angular/language-service": "^8.2.12",
"@types/jasmine": "~3.4.4", "@types/jasmine": "~3.4.4",
"@types/jasminewd2": "~2.0.8", "@types/jasminewd2": "~2.0.8",
"@types/node": "~12.11.6", "@types/node": "~12.11.6",
"codelyzer": "^5.2.0", "codelyzer": "^5.2.0",
"jasmine-core": "~3.5.0", "jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~4.2.1", "jasmine-spec-reporter": "~4.2.1",
"karma": "^5.0.2", "karma": "^5.0.2",
"karma-chrome-launcher": "~3.1.0", "karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~2.1.0", "karma-coverage-istanbul-reporter": "~2.1.0",
"karma-jasmine": "~2.0.1", "karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.2", "karma-jasmine-html-reporter": "^1.4.2",
"typescript": "3.5.3" "typescript": "3.5.3"
}, },
"optionalDependencies": { "optionalDependencies": {
"node-sass": "^4.12.0", "node-sass": "^4.12.0",
"protractor": "~5.4.2", "protractor": "~5.4.2",
"ts-node": "~8.4.1", "ts-node": "~8.4.1",
"tslint": "~5.20.0" "tslint": "~5.20.0"
} }
} }

26
SessionCompanion/SessionCompanion/appsettings.json
View File

@ -1,13 +1,13 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
"DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=SessionCompanion;Trusted_Connection=True;MultipleActiveResultSets=true" "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=SessionCompanion;Trusted_Connection=True;MultipleActiveResultSets=true"
}, },
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Information", "Default": "Information",
"Microsoft": "Warning", "Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information" "Microsoft.Hosting.Lifetime": "Information"
} }
}, },
"AllowedHosts": "*" "AllowedHosts": "*"
} }