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

Merge pull request 'added ViewModels' (#10) from SES-68 into master

Browse Source 
Reviewed-on: #10
This commit is contained in:
Karol Górzyński 2020-12-05 16:17:35 +01:00
commit f0c14da49c
10 changed files with 233 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Jenkinsfile vendored
View File

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

25
SessionCompanion/SessionCompanion.ViewModels/CharismaViewModels/CharismaViewModel.cs Normal file
View File

@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Text;
namespace SessionCompanion.ViewModels.CharismaViewModels
{
public class CharismaViewModel
{
public int Id { get; set; }
public int CharacterId { get; set; }
public int Value { get; set; }
public int Modification { get; set; }
public int SavingThrows { get; set; }
public bool CanSaveThrows { get; set; }
public int Deception { get; set; }
public bool CanDeception { get; set; }
public int Intimidation { get; set; }
public bool CanIntimidation { get; set; }
public int Performance { get; set; }
public bool CanPerformance { get; set; }
public int Persuasion { get; set; }
public bool CanPersuasion { get; set; }
}
}

17
SessionCompanion/SessionCompanion.ViewModels/ConstitutionViewModels/ConstitutionViewModel.cs Normal file
View File

@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Text;
namespace SessionCompanion.ViewModels.ConstitutionViewModels
{
public class ConstitutionViewModel
{
public int Id { get; set; }
public int CharacterId { get; set; }
public int Value { get; set; }
public int Modification { get; set; }
public int SavingThrows { get; set; }
public bool CanSaveThrows { get; set; }
}
}

23
SessionCompanion/SessionCompanion.ViewModels/DexterityViewModels/DexterityViewModel.cs Normal file
View File

@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Text;
namespace SessionCompanion.ViewModels.DexterityViewModels
{
public class DexterityViewModel
{
public int Id { get; set; }
public int CharacterId { get; set; }
public int Value { get; set; }
public int Modification { get; set; }
public int SavingThrows { get; set; }
public bool CanSaveThrows { get; set; }
public int Acrobatics { get; set; }
public bool CanAcrobatics { get; set; }
public int SleightOfHand { get; set; }
public bool CanSleightOfHand { get; set; }
public int Stealth { get; set; }
public bool CanStealth { get; set; }
}
}

27
SessionCompanion/SessionCompanion.ViewModels/IntelligenceViewModels/IntelligenceViewModel.cs Normal file
View File

@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Text;
namespace SessionCompanion.ViewModels.IntelligenceViewModels
{
public class IntelligenceViewModel
{
public int Id { get; set; }
public int CharacterId { get; set; }
public int Value { get; set; }
public int Modification { get; set; }
public int SavingThrows { get; set; }
public bool CanSaveThrows { get; set; }
public int Arcana { get; set; }
public bool CanArcana { get; set; }
public int History { get; set; }
public bool CanHistory { get; set; }
public int Investigation { get; set; }
public bool CanInvestigation { get; set; }
public int Nature { get; set; }
public bool CanNature { get; set; }
public int Religion { get; set; }
public bool CanReligion { get; set; }
}
}

2
SessionCompanion/SessionCompanion.ViewModels/SessionCompanion.ViewModels.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>
</Project>

19
SessionCompanion/SessionCompanion.ViewModels/StrengthViewModels/StrengthViewModel.cs Normal file
View File

@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Text;
namespace SessionCompanion.ViewModels.StrengthViewModels
{
public class StrengthViewModel
{
public int Id { get; set; }
public int CharacterId { get; set; }
public int Value { get; set; }
public int Modification { get; set; }
public int SavingThrows { get; set; }
public bool CanSaveThrows { get; set; }
public int Athletics { get; set; }
public bool CanAthletics { get; set; }
}
}

27
SessionCompanion/SessionCompanion.ViewModels/WisdomViewModels/WisdomViewModel.cs Normal file
View File

@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Text;
namespace SessionCompanion.ViewModels.WisdomViewModels
{
public class WisdomViewModel
{
public int Id { get; set; }
public int CharacterId { get; set; }
public int Value { get; set; }
public int Modification { get; set; }
public int SavingThrows { get; set; }
public bool CanSaveThrows { get; set; }
public int AnimalHandling { get; set; }
public bool CanAnimalHandling { get; set; }
public int Insight { get; set; }
public bool CanInsight { get; set; }
public int Medicine { get; set; }
public bool CanMedicine { get; set; }
public int Perception { get; set; }
public bool CanPerception { get; set; }
public int Survival { get; set; }
public bool CanSurvival { get; set; }
}
}

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

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

26
SessionCompanion/SessionCompanion/appsettings.json
View File

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