diff --git a/PluralKit.Web/Pages/Error.cshtml b/PluralKit.Web/Pages/Error.cshtml
deleted file mode 100644
index 6f92b956..00000000
--- a/PluralKit.Web/Pages/Error.cshtml
+++ /dev/null
@@ -1,26 +0,0 @@
-@page
-@model ErrorModel
-@{
- ViewData["Title"] = "Error";
-}
-
-
Error.
-An error occurred while processing your request.
-
-@if (Model.ShowRequestId)
-{
-
- Request ID: @Model.RequestId
-
-}
-
-Development Mode
-
- Swapping to the Development environment displays detailed information about the error that occurred.
-
-
- The Development environment shouldn't be enabled for deployed applications.
- It can result in displaying sensitive information from exceptions to end users.
- For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development
- and restarting the app.
-
diff --git a/PluralKit.Web/Pages/Error.cshtml.cs b/PluralKit.Web/Pages/Error.cshtml.cs
deleted file mode 100644
index 21723dc8..00000000
--- a/PluralKit.Web/Pages/Error.cshtml.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Diagnostics;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
-
-namespace PluralKit.Web.Pages
-{
- [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
- public class ErrorModel : PageModel
- {
- public string RequestId { get; set; }
-
- public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
-
- public void OnGet()
- {
- RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
- }
- }
-}
\ No newline at end of file
diff --git a/PluralKit.Web/Pages/Index.cshtml b/PluralKit.Web/Pages/Index.cshtml
deleted file mode 100644
index b5f0c15f..00000000
--- a/PluralKit.Web/Pages/Index.cshtml
+++ /dev/null
@@ -1,10 +0,0 @@
-@page
-@model IndexModel
-@{
- ViewData["Title"] = "Home page";
-}
-
-
diff --git a/PluralKit.Web/Pages/Index.cshtml.cs b/PluralKit.Web/Pages/Index.cshtml.cs
deleted file mode 100644
index d585c7ad..00000000
--- a/PluralKit.Web/Pages/Index.cshtml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Microsoft.AspNetCore.Mvc.RazorPages;
-
-namespace PluralKit.Web.Pages
-{
- public class IndexModel : PageModel
- {
- public void OnGet()
- {
- }
- }
-}
\ No newline at end of file
diff --git a/PluralKit.Web/Pages/Shared/_Layout.cshtml b/PluralKit.Web/Pages/Shared/_Layout.cshtml
deleted file mode 100644
index 556e8ada..00000000
--- a/PluralKit.Web/Pages/Shared/_Layout.cshtml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
- @ViewData["Title"] - PluralKit.Web
-
-
-
-
-
-
-
-
-
-
- @RenderBody()
-
-
-
-
-
-@RenderSection("Scripts", required: false)
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/PluralKit.Web/Pages/ViewSystem.cshtml b/PluralKit.Web/Pages/ViewSystem.cshtml
deleted file mode 100644
index 8a44b5f3..00000000
--- a/PluralKit.Web/Pages/ViewSystem.cshtml
+++ /dev/null
@@ -1,122 +0,0 @@
-@page "/s/{systemId}"
-@model PluralKit.Web.Pages.ViewSystem
-
-
-
-
-
- @Model.System.Hid
-
-
- @if (Model.System.Tag != null)
- {
-
-
- @Model.System.Tag
-
- }
-
- @if (Model.System.UiTz != null)
- {
-
-
- @Model.System.UiTz
-
- }
-
-
- @if (Model.System.Name != null)
- {
-
@Model.System.Name
- }
-
- @if (Model.System.Description != null)
- {
-
@Model.System.Description
- }
-
-
Members
- @foreach (var member in Model.Members)
- {
-
-
-
-
@member.Name
-
@member.Description
-
-
-
-
- @member.Hid
-
-
- @if (member.Birthday != null)
- {
-
-
- @member.BirthdayString
-
- }
-
- @if (member.Pronouns != null)
- {
-
-
- @member.Pronouns
-
- }
-
-
-
- }
-
-
-@section Scripts {
-
-}
\ No newline at end of file
diff --git a/PluralKit.Web/Pages/ViewSystem.cshtml.cs b/PluralKit.Web/Pages/ViewSystem.cshtml.cs
deleted file mode 100644
index ebd41064..00000000
--- a/PluralKit.Web/Pages/ViewSystem.cshtml.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
-
-namespace PluralKit.Web.Pages
-{
- public class ViewSystem : PageModel
- {
- private IDataStore _data;
-
- public ViewSystem(IDataStore data)
- {
- _data = data;
- }
-
- public PKSystem System { get; set; }
- public IEnumerable Members { get; set; }
-
- public async Task OnGet(string systemId)
- {
- System = await _data.GetSystemByHid(systemId);
- if (System == null) return NotFound();
-
- Members = await _data.GetSystemMembers(System);
-
- return Page();
- }
- }
-}
\ No newline at end of file
diff --git a/PluralKit.Web/Pages/_ViewImports.cshtml b/PluralKit.Web/Pages/_ViewImports.cshtml
deleted file mode 100644
index 82dd3ee0..00000000
--- a/PluralKit.Web/Pages/_ViewImports.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-@using PluralKit.Web
-@namespace PluralKit.Web.Pages
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/PluralKit.Web/Pages/_ViewStart.cshtml b/PluralKit.Web/Pages/_ViewStart.cshtml
deleted file mode 100644
index 24f33e00..00000000
--- a/PluralKit.Web/Pages/_ViewStart.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-@{
- Layout = "Shared/_Layout";
-}
\ No newline at end of file
diff --git a/PluralKit.Web/PluralKit.Web.csproj b/PluralKit.Web/PluralKit.Web.csproj
deleted file mode 100644
index 74760155..00000000
--- a/PluralKit.Web/PluralKit.Web.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- netcoreapp2.2
- full
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/PluralKit.Web/Program.cs b/PluralKit.Web/Program.cs
deleted file mode 100644
index 82af97b6..00000000
--- a/PluralKit.Web/Program.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
-
-namespace PluralKit.Web
-{
- public class Program
- {
- public static void Main(string[] args)
- {
- CreateWebHostBuilder(args).Build().Run();
- }
-
- public static IWebHostBuilder CreateWebHostBuilder(string[] args)
- {
- return WebHost.CreateDefaultBuilder(args)
- .UseStartup();
- }
- }
-}
\ No newline at end of file
diff --git a/PluralKit.Web/Startup.cs b/PluralKit.Web/Startup.cs
deleted file mode 100644
index f7b56233..00000000
--- a/PluralKit.Web/Startup.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System.Data;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Npgsql;
-
-namespace PluralKit.Web
-{
- 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)
- {
- InitUtils.Init();
-
- var config = Configuration.GetSection("PluralKit").Get();
-
- services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
-
- services
- .AddScoped(_ => new NpgsqlConnection(config.Database))
- .AddTransient()
- .AddSingleton(config);
- }
-
- // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
- public async void Configure(IApplicationBuilder app, IHostingEnvironment env)
- {
- if (env.IsDevelopment())
- {
- app.UseDeveloperExceptionPage();
- }
- else
- {
- app.UseExceptionHandler("/Error");
- }
-
- //app.UseHttpsRedirection();
- app.UseMvc();
-
- var conn = app.ApplicationServices.GetRequiredService();
- conn.Open();
-
- await Schema.CreateTables(conn);
- }
- }
-}
\ No newline at end of file
diff --git a/PluralKit.sln b/PluralKit.sln
index 1a9d4b73..c33f65c8 100644
--- a/PluralKit.sln
+++ b/PluralKit.sln
@@ -4,8 +4,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluralKit.Bot", "PluralKit.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluralKit.Core", "PluralKit.Core\PluralKit.Core.csproj", "{5DBE037D-179D-4C05-8A28-35E37129C961}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluralKit.Web", "PluralKit.Web\PluralKit.Web.csproj", "{975F9DED-78D1-4742-8412-DF70BB381E92}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluralKit.API", "PluralKit.API\PluralKit.API.csproj", "{3420F8A9-125C-4F7F-A444-10DD16945754}"
EndProject
Global
@@ -22,10 +20,6 @@ Global
{5DBE037D-179D-4C05-8A28-35E37129C961}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5DBE037D-179D-4C05-8A28-35E37129C961}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5DBE037D-179D-4C05-8A28-35E37129C961}.Release|Any CPU.Build.0 = Release|Any CPU
- {975F9DED-78D1-4742-8412-DF70BB381E92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {975F9DED-78D1-4742-8412-DF70BB381E92}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {975F9DED-78D1-4742-8412-DF70BB381E92}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {975F9DED-78D1-4742-8412-DF70BB381E92}.Release|Any CPU.Build.0 = Release|Any CPU
{3420F8A9-125C-4F7F-A444-10DD16945754}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3420F8A9-125C-4F7F-A444-10DD16945754}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3420F8A9-125C-4F7F-A444-10DD16945754}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/docker-compose.yml b/docker-compose.yml
index 251b3fba..e24b37b6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,16 +16,6 @@ services:
- db
- influx
restart: always
- web:
- image: pluralkit
- command: ["PluralKit.Web.dll"]
- environment:
- - "PluralKit:Database=Host=db;Username=postgres;Password=postgres;Database=postgres;Maximum Pool Size=1000"
- links:
- - db
- ports:
- - 2837:5000
- restart: always
api:
image: pluralkit
command: ["PluralKit.API.dll"]