Skip to content

Commit

Permalink
Merge branch 'bugfix/join-room-no-card'
Browse files Browse the repository at this point in the history
  • Loading branch information
halomakes committed Apr 3, 2019
2 parents 3981dc1 + 828962e commit 73ae6dc
Show file tree
Hide file tree
Showing 146 changed files with 4,142 additions and 3,155 deletions.
9 changes: 9 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.dockerignore
.env
.git
.gitignore
.vs
.vscode
*/bin
*/obj
**/.toolstarget
9 changes: 0 additions & 9 deletions ClientApp/src/app/pages/landing/landing.component.html

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

20 changes: 0 additions & 20 deletions ClientApp/src/index.html

This file was deleted.

25 changes: 25 additions & 0 deletions pokeR.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.271
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokeR", "pokeR\PokeR.csproj", "{9BB9BA9B-2E37-42D3-9F24-A075B971C5DD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9BB9BA9B-2E37-42D3-9F24-A075B971C5DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9BB9BA9B-2E37-42D3-9F24-A075B971C5DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9BB9BA9B-2E37-42D3-9F24-A075B971C5DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9BB9BA9B-2E37-42D3-9F24-A075B971C5DD}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {1A2050AE-5745-400B-85AF-E89C4EC41A48}
EndGlobalSection
EndGlobal
46 changes: 46 additions & 0 deletions pokeR/.vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
// Use IntelliSense to find out which attributes exist for C# debugging
// Use hover for the description of the existing attributes
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Launch (web)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/bin/Debug/netcoreapp2.2/PokeR.dll",
"args": [],
"cwd": "${workspaceFolder}",
"stopAtEntry": false,
"internalConsoleOptions": "openOnSessionStart",
"launchBrowser": {
"enabled": true,
"args": "${auto-detect-url}",
"windows": {
"command": "cmd.exe",
"args": "/C start ${auto-detect-url}"
},
"osx": {
"command": "open"
},
"linux": {
"command": "xdg-open"
}
},
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"sourceFileMap": {
"/Views": "${workspaceFolder}/Views"
}
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach",
"processId": "${command:pickProcess}"
}
,]
}
15 changes: 15 additions & 0 deletions pokeR/.vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/PokeR.csproj"
],
"problemMatcher": "$msCompile"
}
]
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 73ae6dc

Please sign in to comment.