summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DSACore/DSACore.csproj5
-rw-r--r--DSACore/Program.cs2
-rw-r--r--DSACore/Properties/launchSettings.json2
-rw-r--r--DSACore/Startup.cs11
-rw-r--r--DSACore/libman.json14
-rw-r--r--DiscoBot.sln12
-rw-r--r--WebApplication1/Controllers/ValuesController.cs45
-rw-r--r--WebApplication1/Program.cs24
-rw-r--r--WebApplication1/Properties/launchSettings.json30
-rw-r--r--WebApplication1/Startup.cs47
-rw-r--r--WebApplication1/WebApplication1.csproj15
-rw-r--r--WebApplication1/appsettings.Development.json9
-rw-r--r--WebApplication1/appsettings.json8
13 files changed, 9 insertions, 215 deletions
diff --git a/DSACore/DSACore.csproj b/DSACore/DSACore.csproj
index 44c4f8c..67bd4ab 100644
--- a/DSACore/DSACore.csproj
+++ b/DSACore/DSACore.csproj
@@ -5,12 +5,11 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.App" />
- <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+ <Folder Include="wwwroot\" />
</ItemGroup>
<ItemGroup>
- <Folder Include="wwwroot\" />
+ <PackageReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>
<ItemGroup>
diff --git a/DSACore/Program.cs b/DSACore/Program.cs
index 9bd6e6b..373a39e 100644
--- a/DSACore/Program.cs
+++ b/DSACore/Program.cs
@@ -14,8 +14,6 @@ namespace DSACore
{
public static void Main(string[] args)
{
- DSACore.DSA_Game.Dsa.Startup();
-
CreateWebHostBuilder(args).Build().Run();
}
diff --git a/DSACore/Properties/launchSettings.json b/DSACore/Properties/launchSettings.json
index 889d022..bcc4406 100644
--- a/DSACore/Properties/launchSettings.json
+++ b/DSACore/Properties/launchSettings.json
@@ -4,7 +4,7 @@
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
- "applicationUrl": "http://localhost:29492",
+ "applicationUrl": "http://localhost:2170",
"sslPort": 44365
}
},
diff --git a/DSACore/Startup.cs b/DSACore/Startup.cs
index efbd7b1..2d0c2a3 100644
--- a/DSACore/Startup.cs
+++ b/DSACore/Startup.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using DSACore.Hubs;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.HttpsPolicy;
@@ -26,15 +25,7 @@ namespace DSACore
// This method gets called by the runtime. Use this method to add services to the container.
public void ConfigureServices(IServiceCollection services)
{
- services.AddCors(options =>
- {
- options.AddPolicy("AllowSpecificOrigin",
- builder => builder.WithOrigins("https://console.firebase.google.com/project/heldenonline-4d828"));
- });
-
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
-
- services.AddSignalR();
}
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -50,8 +41,6 @@ namespace DSACore
}
app.UseHttpsRedirection();
- app.UseSignalR(routes => { routes.MapHub<ChatHub>("/chatHub"); });
- app.UseCors("AllowSpecificOrigin");
app.UseMvc();
}
}
diff --git a/DSACore/libman.json b/DSACore/libman.json
deleted file mode 100644
index 5c82187..0000000
--- a/DSACore/libman.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "version": "1.0",
- "defaultProvider": "unpkg",
- "libraries": [
- {
- "library": "@aspnet/signalr@1.0.3",
- "destination": "wwwroot/lib/@aspnet/signalr/",
- "files": [
- "dist/browser/signalr.js",
- "dist/browser/signalr.min.js"
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/DiscoBot.sln b/DiscoBot.sln
index 2857c31..7aab504 100644
--- a/DiscoBot.sln
+++ b/DiscoBot.sln
@@ -9,10 +9,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZooBOTanica", "ZooBOTanica\
EndProject
Project("{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}") = "NodeJSServer", "NodeJSServer\NodeJSServer.njsproj", "{57064377-C08C-4218-9C55-0552D40F3877}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DSACore", "DSACore\DSACore.csproj", "{89343249-016C-47C0-AED6-C99165DE8B66}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DSALib", "DSALib\DSALib.csproj", "{388DD4ED-29C4-4127-AC8F-34DD3FE9F9B0}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DSACore", "DSACore\DSACore.csproj", "{35A5E2CC-0FD4-4BC0-ACBF-38599CAED1C4}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -31,14 +31,14 @@ Global
{57064377-C08C-4218-9C55-0552D40F3877}.Debug|Any CPU.Build.0 = Debug|Any CPU
{57064377-C08C-4218-9C55-0552D40F3877}.Release|Any CPU.ActiveCfg = Release|Any CPU
{57064377-C08C-4218-9C55-0552D40F3877}.Release|Any CPU.Build.0 = Release|Any CPU
- {89343249-016C-47C0-AED6-C99165DE8B66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {89343249-016C-47C0-AED6-C99165DE8B66}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {89343249-016C-47C0-AED6-C99165DE8B66}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {89343249-016C-47C0-AED6-C99165DE8B66}.Release|Any CPU.Build.0 = Release|Any CPU
{388DD4ED-29C4-4127-AC8F-34DD3FE9F9B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{388DD4ED-29C4-4127-AC8F-34DD3FE9F9B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{388DD4ED-29C4-4127-AC8F-34DD3FE9F9B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{388DD4ED-29C4-4127-AC8F-34DD3FE9F9B0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {35A5E2CC-0FD4-4BC0-ACBF-38599CAED1C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {35A5E2CC-0FD4-4BC0-ACBF-38599CAED1C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {35A5E2CC-0FD4-4BC0-ACBF-38599CAED1C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {35A5E2CC-0FD4-4BC0-ACBF-38599CAED1C4}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/WebApplication1/Controllers/ValuesController.cs b/WebApplication1/Controllers/ValuesController.cs
deleted file mode 100644
index ac835f3..0000000
--- a/WebApplication1/Controllers/ValuesController.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-
-namespace WebApplication1.Controllers
-{
- [Route("api/[controller]")]
- [ApiController]
- public class ValuesController : ControllerBase
- {
- // GET api/values
- [HttpGet]
- public ActionResult<IEnumerable<string>> Get()
- {
- return new string[] { "value1", "value2" };
- }
-
- // GET api/values/5
- [HttpGet("{id}")]
- public ActionResult<string> Get(int id)
- {
- return "value";
- }
-
- // POST api/values
- [HttpPost]
- public void Post([FromBody] string value)
- {
- }
-
- // PUT api/values/5
- [HttpPut("{id}")]
- public void Put(int id, [FromBody] string value)
- {
- }
-
- // DELETE api/values/5
- [HttpDelete("{id}")]
- public void Delete(int id)
- {
- }
- }
-}
diff --git a/WebApplication1/Program.cs b/WebApplication1/Program.cs
deleted file mode 100644
index 8b7d1da..0000000
--- a/WebApplication1/Program.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-
-namespace WebApplication1
-{
- public class Program
- {
- public static void Main(string[] args)
- {
- CreateWebHostBuilder(args).Build().Run();
- }
-
- public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
- WebHost.CreateDefaultBuilder(args)
- .UseStartup<Startup>();
- }
-}
diff --git a/WebApplication1/Properties/launchSettings.json b/WebApplication1/Properties/launchSettings.json
deleted file mode 100644
index 5d1f813..0000000
--- a/WebApplication1/Properties/launchSettings.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "$schema": "http://json.schemastore.org/launchsettings.json",
- "iisSettings": {
- "windowsAuthentication": false,
- "anonymousAuthentication": true,
- "iisExpress": {
- "applicationUrl": "http://localhost:1650",
- "sslPort": 44303
- }
- },
- "profiles": {
- "IIS Express": {
- "commandName": "IISExpress",
- "launchBrowser": true,
- "launchUrl": "api/values",
- "environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- }
- },
- "WebApplication1": {
- "commandName": "Project",
- "launchBrowser": true,
- "launchUrl": "api/values",
- "applicationUrl": "https://localhost:5001;http://localhost:5000",
- "environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- }
- }
- }
-} \ No newline at end of file
diff --git a/WebApplication1/Startup.cs b/WebApplication1/Startup.cs
deleted file mode 100644
index 9be97f9..0000000
--- a/WebApplication1/Startup.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.HttpsPolicy;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-
-namespace WebApplication1
-{
- public class Startup
- {
- public Startup(IConfiguration configuration)
- {
- Configuration = configuration;
- }
-
- public IConfiguration Configuration { get; }
-
- // This method gets called by the runtime. Use this method to add services to the container.
- public void ConfigureServices(IServiceCollection services)
- {
- services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
- }
-
- // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
- public void Configure(IApplicationBuilder app, IHostingEnvironment env)
- {
- if (env.IsDevelopment())
- {
- app.UseDeveloperExceptionPage();
- }
- else
- {
- app.UseHsts();
- }
-
- app.UseHttpsRedirection();
- app.UseMvc();
- }
- }
-}
diff --git a/WebApplication1/WebApplication1.csproj b/WebApplication1/WebApplication1.csproj
deleted file mode 100644
index 710a1eb..0000000
--- a/WebApplication1/WebApplication1.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
- <PropertyGroup>
- <TargetFramework>netcoreapp2.1</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- <Folder Include="wwwroot\" />
- </ItemGroup>
-
- <ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.App" />
- </ItemGroup>
-
-</Project>
diff --git a/WebApplication1/appsettings.Development.json b/WebApplication1/appsettings.Development.json
deleted file mode 100644
index e203e94..0000000
--- a/WebApplication1/appsettings.Development.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "Logging": {
- "LogLevel": {
- "Default": "Debug",
- "System": "Information",
- "Microsoft": "Information"
- }
- }
-}
diff --git a/WebApplication1/appsettings.json b/WebApplication1/appsettings.json
deleted file mode 100644
index def9159..0000000
--- a/WebApplication1/appsettings.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Logging": {
- "LogLevel": {
- "Default": "Warning"
- }
- },
- "AllowedHosts": "*"
-}
generated by cgit v1.2.3-70-g09d2 (git 2.46.2) at 2024-11-04 21:40:36 +0000