aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Main/Startup.cs11
-rw-r--r--Main/wwwroot/css/main.css (renamed from Website/css/main.css)0
-rw-r--r--Main/wwwroot/index.html19
-rw-r--r--Main/wwwroot/scripts/main.ts (renamed from Website/scripts/main.ts)0
-rw-r--r--Main/wwwroot/tsconfig.json (renamed from Website/tsconfig.json)0
-rw-r--r--Website/index.html18
6 files changed, 19 insertions, 29 deletions
diff --git a/Main/Startup.cs b/Main/Startup.cs
index 24f2a74..804c4f7 100644
--- a/Main/Startup.cs
+++ b/Main/Startup.cs
@@ -31,6 +31,7 @@ namespace Server {
});
services.AddHangfire(options => options.UseStorage(new MySqlStorage(Configuration.GetConnectionString("Storage"))));
+ services.AddDirectoryBrowser();
}
public void Configure(IApplicationBuilder app, IHostingEnvironment env) {
@@ -42,14 +43,8 @@ namespace Server {
app.UseHsts();
}
- // app.UseDefaultFiles();
- string website_path = Path.Combine(
- Directory.GetParent(Directory.GetCurrentDirectory()).ToString(),
- "Website/");
- app.UseStaticFiles(new StaticFileOptions {
- FileProvider = new PhysicalFileProvider(website_path),
- RequestPath = "/test"
- });
+ app.UseDefaultFiles();
+ app.UseStaticFiles();
app.UseHangfireDashboard();
app.UseHangfireServer();
diff --git a/Website/css/main.css b/Main/wwwroot/css/main.css
index ca052da..ca052da 100644
--- a/Website/css/main.css
+++ b/Main/wwwroot/css/main.css
diff --git a/Main/wwwroot/index.html b/Main/wwwroot/index.html
index bed39c1..d2721dc 100644
--- a/Main/wwwroot/index.html
+++ b/Main/wwwroot/index.html
@@ -1,5 +1,18 @@
+<!DOCTYPE html>
<html>
- <body>
- Hello world
- </body>
+
+<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <title>Page Title</title>
+ <link href="https://fonts.googleapis.com/css?family=Poppins" rel="stylesheet">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link rel="stylesheet" type="text/css" media="screen" href="css/main.css">
+</head>
+
+<body>
+ <div id="root"></div>
+ <script src="js/main.js"></script>
+</body>
+
</html> \ No newline at end of file
diff --git a/Website/scripts/main.ts b/Main/wwwroot/scripts/main.ts
index e68bc97..e68bc97 100644
--- a/Website/scripts/main.ts
+++ b/Main/wwwroot/scripts/main.ts
diff --git a/Website/tsconfig.json b/Main/wwwroot/tsconfig.json
index 89d01c4..89d01c4 100644
--- a/Website/tsconfig.json
+++ b/Main/wwwroot/tsconfig.json
diff --git a/Website/index.html b/Website/index.html
deleted file mode 100644
index d2721dc..0000000
--- a/Website/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <title>Page Title</title>
- <link href="https://fonts.googleapis.com/css?family=Poppins" rel="stylesheet">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <link rel="stylesheet" type="text/css" media="screen" href="css/main.css">
-</head>
-
-<body>
- <div id="root"></div>
- <script src="js/main.js"></script>
-</body>
-
-</html> \ No newline at end of file