;
-namespace IoTSharp.Hub.Extensions
+namespace IoTSharp.Extensions
{
public static class DataExtension
{
diff --git a/IoTSharp.Hub/Extensions/IoTSharpExtension.cs b/IoTSharp/Extensions/IoTSharpExtension.cs
similarity index 96%
rename from IoTSharp.Hub/Extensions/IoTSharpExtension.cs
rename to IoTSharp/Extensions/IoTSharpExtension.cs
index f767ebeae699e453d36b2e0b295461515afac916..2ea7f98f813b9f86b91f166e6edcca0f117d9a08 100644
--- a/IoTSharp.Hub/Extensions/IoTSharpExtension.cs
+++ b/IoTSharp/Extensions/IoTSharpExtension.cs
@@ -1,4 +1,4 @@
-using IoTSharp.Hub.Data;
+using IoTSharp.Data;
using Microsoft.AspNetCore.Builder;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
@@ -10,14 +10,14 @@ using System.IO;
using System.Linq;
using System.Reflection;
-namespace IoTSharp.Hub
+namespace IoTSharp
{
public static class IoTSharpExtension
{
public static void AddIoTSharpHub(this IServiceCollection services, IConfiguration configuration)
{
var _DataBase = configuration["DataBase"] ?? "sqlite";
- var _ConnectionString = Environment.ExpandEnvironmentVariables(configuration.GetConnectionString(_DataBase) ?? "Data Source=%APPDATA%\\IoTSharp.Hub\\MQTTChat.db;Pooling=true;");
+ var _ConnectionString = Environment.ExpandEnvironmentVariables(configuration.GetConnectionString(_DataBase) ?? "Data Source=%APPDATA%\\IoTSharp\\MQTTChat.db;Pooling=true;");
switch (_DataBase)
{
case "mssql":
diff --git a/IoTSharp.Hub/Extensions/MiscExtension.cs b/IoTSharp/Extensions/MiscExtension.cs
similarity index 93%
rename from IoTSharp.Hub/Extensions/MiscExtension.cs
rename to IoTSharp/Extensions/MiscExtension.cs
index 4acf51dc317cb00d2697381d87dcd25bacd4f70f..d624506a05ce3832dcab0d1e720fd7787ba60abb 100644
--- a/IoTSharp.Hub/Extensions/MiscExtension.cs
+++ b/IoTSharp/Extensions/MiscExtension.cs
@@ -1,11 +1,11 @@
-using IoTSharp.Hub.Data;
+using IoTSharp.Data;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Diagnostics;
using System.Reflection;
using System.Threading.Tasks;
-namespace IoTSharp.Hub.Extensions
+namespace IoTSharp.Extensions
{
public static class MiscExtension
{
diff --git a/IoTSharp.Hub/Extensions/MqttExtension.cs b/IoTSharp/Extensions/MqttExtension.cs
similarity index 99%
rename from IoTSharp.Hub/Extensions/MqttExtension.cs
rename to IoTSharp/Extensions/MqttExtension.cs
index a1aec48bb3bc3902f0ec984f51fed18da7874ac2..ebec2c35f815a00273dc987c197a2a0c1063d68b 100644
--- a/IoTSharp.Hub/Extensions/MqttExtension.cs
+++ b/IoTSharp/Extensions/MqttExtension.cs
@@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Builder;
using MQTTnet.AspNetCore;
using MQTTnet.Diagnostics;
-namespace IoTSharp.Hub
+namespace IoTSharp
{
public static class MqttExtension
diff --git a/IoTSharp.Hub/Extensions/TokenExtension.cs b/IoTSharp/Extensions/TokenExtension.cs
similarity index 98%
rename from IoTSharp.Hub/Extensions/TokenExtension.cs
rename to IoTSharp/Extensions/TokenExtension.cs
index 7c87fe1d0316a513d9061b2812614b5172bd61f2..31d5e213af220a295d44afc07e8e945748241469 100644
--- a/IoTSharp.Hub/Extensions/TokenExtension.cs
+++ b/IoTSharp/Extensions/TokenExtension.cs
@@ -1,5 +1,5 @@
-using IoTSharp.Hub.Data;
-using IoTSharp.Hub.Dtos;
+using IoTSharp.Data;
+using IoTSharp.Dtos;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Identity;
@@ -15,7 +15,7 @@ using System.Security.Claims;
using System.Text;
using System.Threading.Tasks;
-namespace IoTSharp.Hub
+namespace IoTSharp
{
public static class TokenExtension
{
diff --git a/IoTSharp.Hub/IoTSharp.Hub.csproj b/IoTSharp/IoTSharp.Hub-b5769e4.csproj
similarity index 100%
rename from IoTSharp.Hub/IoTSharp.Hub.csproj
rename to IoTSharp/IoTSharp.Hub-b5769e4.csproj
diff --git a/IoTSharp/IoTSharp.csproj b/IoTSharp/IoTSharp.csproj
new file mode 100644
index 0000000000000000000000000000000000000000..2d0b376feb49a13e21c7cb2fc7cb05d66dfc610e
--- /dev/null
+++ b/IoTSharp/IoTSharp.csproj
@@ -0,0 +1,95 @@
+
+
+
+ netcoreapp2.2
+ IoT#
+ IoTSharp
+ IoT#
+ https://github.com/IoTSharp/IoTSharp
+ https://github.com/IoTSharp/IoTSharp/blob/master/LICENSE
+ https://github.com/IoTSharp/IoTSharp
+
+ Open-source IoT Platform - Device management, data collection, processing and visualization. https://www.iotsharp.net
+
+ Open-source IoT Platform - Device management, data collection, processing and visualization.
+ IoTSharp
+ 18970590-05bf-4a1f-a70b-3c8a120d12cb
+ true
+ Latest
+ false
+ ClientApp\
+ $(DefaultItemExcludes);$(SpaRoot)node_modules\**
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ %(DistFiles.Identity)
+ PreserveNewest
+
+
+
+
+
diff --git a/IoTSharp/Pages/Error.cshtml b/IoTSharp/Pages/Error.cshtml
new file mode 100644
index 0000000000000000000000000000000000000000..6f92b9565570463a840d01c6ca4f29519392b455
--- /dev/null
+++ b/IoTSharp/Pages/Error.cshtml
@@ -0,0 +1,26 @@
+@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/IoTSharp/Pages/Error.cshtml.cs b/IoTSharp/Pages/Error.cshtml.cs
new file mode 100644
index 0000000000000000000000000000000000000000..cd86fe153445fad859a9fb071c9565220eed137c
--- /dev/null
+++ b/IoTSharp/Pages/Error.cshtml.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace IoTSharp.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;
+ }
+ }
+}
diff --git a/IoTSharp/Pages/_ViewImports.cshtml b/IoTSharp/Pages/_ViewImports.cshtml
new file mode 100644
index 0000000000000000000000000000000000000000..0886ebbae7ca84c3fa7e76aef870ee519febaa06
--- /dev/null
+++ b/IoTSharp/Pages/_ViewImports.cshtml
@@ -0,0 +1,3 @@
+@using IoTSharp
+@namespace IoTSharp.Pages
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/IoTSharp.Hub/Program.cs b/IoTSharp/Program.cs
similarity index 65%
rename from IoTSharp.Hub/Program.cs
rename to IoTSharp/Program.cs
index 177df3149842a958bf678dd603c4aa23449ed020..66b2bf8dfca7efc6306a156cd4bc54883cc99e0e 100644
--- a/IoTSharp.Hub/Program.cs
+++ b/IoTSharp/Program.cs
@@ -1,8 +1,15 @@
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
-namespace IoTSharp.Hub
+namespace IoTSharp
{
public class Program
{
@@ -16,4 +23,4 @@ namespace IoTSharp.Hub
WebHost.CreateDefaultBuilder(args)
.UseStartup();
}
-}
\ No newline at end of file
+}
diff --git a/IoTSharp.Hub/Properties/Resources.Designer.cs b/IoTSharp/Properties/Resources.Designer.cs
similarity index 95%
rename from IoTSharp.Hub/Properties/Resources.Designer.cs
rename to IoTSharp/Properties/Resources.Designer.cs
index f9869e0b7a2fd58b75e1345876de8e61c9bb0c56..9effd6bf3521b8802aa24c5426e7b32adf0b90c3 100644
--- a/IoTSharp.Hub/Properties/Resources.Designer.cs
+++ b/IoTSharp/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
//
//------------------------------------------------------------------------------
-namespace IoTSharp.Hub.Properties {
+namespace IoTSharp.Properties {
using System;
@@ -39,7 +39,7 @@ namespace IoTSharp.Hub.Properties {
public static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("IoTSharp.Hub.Properties.Resources", typeof(Resources).Assembly);
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("IoTSharp.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
diff --git a/IoTSharp.Hub/Properties/Resources.resx b/IoTSharp/Properties/Resources.resx
similarity index 100%
rename from IoTSharp.Hub/Properties/Resources.resx
rename to IoTSharp/Properties/Resources.resx
diff --git a/IoTSharp.Hub/Startup.cs b/IoTSharp/Startup.cs
similarity index 78%
rename from IoTSharp.Hub/Startup.cs
rename to IoTSharp/Startup.cs
index d3d45b66f3d7a42c325cc969e1f0cf6434664cfc..be7c89da05d27fdc1d43506e87cd09ac8912c995 100644
--- a/IoTSharp.Hub/Startup.cs
+++ b/IoTSharp/Startup.cs
@@ -1,4 +1,4 @@
-using IoTSharp.Hub.Data;
+using IoTSharp.Data;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Builder;
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.HttpOverrides;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.SpaServices.AngularCli;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
@@ -20,7 +21,7 @@ using System.Reflection;
using System.Text;
using System.Threading.Tasks;
-namespace IoTSharp.Hub
+namespace IoTSharp
{
public class Startup
{
@@ -74,10 +75,14 @@ namespace IoTSharp.Hub
services.AddIoTSharpMqttServer(AppSettings.MqttBroker);
services.AddMqttClient(AppSettings.MqttClient);
- }
-
-
+ services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+ // In production, the Angular files will be served from this directory
+ services.AddSpaStaticFiles(configuration =>
+ {
+ configuration.RootPath = "ClientApp/dist";
+ });
+ }
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IHostingEnvironment env)
@@ -89,17 +94,12 @@ namespace IoTSharp.Hub
}
else
{
- app.UseExceptionHandler("/Home/Error");
+ app.UseExceptionHandler("/Error");
// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
- // app.UseHsts();
+ app.UseHsts();
}
app.UseAuthentication();
- app.UseMvc();
- app.UseDefaultFiles();
- app.UseStaticFiles();
- app.UseHttpsRedirection();
- app.UseStaticFiles();
app.UseSwagger();
app.UseIoTSharpMqttClient();
@@ -109,8 +109,29 @@ namespace IoTSharp.Hub
ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto
});
- }
+ app.UseHttpsRedirection();
+ app.UseStaticFiles();
+ app.UseSpaStaticFiles();
+
+ app.UseMvc(routes =>
+ {
+ routes.MapRoute(
+ name: "default",
+ template: "{controller}/{action=Index}/{id?}");
+ });
-
+ app.UseSpa(spa =>
+ {
+ // To learn more about options for serving an Angular SPA from ASP.NET Core,
+ // see https://go.microsoft.com/fwlink/?linkid=864501
+
+ spa.Options.SourcePath = "ClientApp";
+
+ if (env.IsDevelopment())
+ {
+ spa.UseAngularCliServer(npmScript: "start");
+ }
+ });
+ }
}
}
\ No newline at end of file
diff --git a/IoTSharp.Hub/appsettings.Development.json b/IoTSharp/appsettings.Development.json
similarity index 100%
rename from IoTSharp.Hub/appsettings.Development.json
rename to IoTSharp/appsettings.Development.json
diff --git a/IoTSharp.Hub/appsettings.json b/IoTSharp/appsettings.json
similarity index 99%
rename from IoTSharp.Hub/appsettings.json
rename to IoTSharp/appsettings.json
index 9256c90f44a587ca76e40a3d40748aed6f07825d..331935a27adb4264e07f17bd62de8b3c9252692d 100644
--- a/IoTSharp.Hub/appsettings.json
+++ b/IoTSharp/appsettings.json
@@ -12,5 +12,4 @@
"JwtExpireDays": 1,
"JwtIssuer": "IoTSharp.Hub",
"AllowedHosts": "*"
-
-}
\ No newline at end of file
+}
diff --git a/IoTSharp.Hub/iotsharp.service b/IoTSharp/iotsharp.service
similarity index 67%
rename from IoTSharp.Hub/iotsharp.service
rename to IoTSharp/iotsharp.service
index d7411d28c4bd55b7e6a362d37a4b8e2771aaaa7a..ffaf113e32fe349cc825626633cd384bb6cad394 100644
--- a/IoTSharp.Hub/iotsharp.service
+++ b/IoTSharp/iotsharp.service
@@ -3,9 +3,9 @@ Description=IoTSharp running on Linux
[Service]
WorkingDirectory=/var/iotsharp/
-ExecStart=/var/iotsharp/IoTSharp.Hub
+ExecStart=/var/iotsharp/IoTSharp
Restart=always
-# Restart service after 10 seconds if the IoTSharp.Hub service crashes:
+# Restart service after 10 seconds if the IoTSharp service crashes:
RestartSec=10
KillSignal=SIGINT
SyslogIdentifier=iotsharp
diff --git a/IoTSharp.Hub/wwwroot/default.html b/IoTSharp/wwwroot/default.html
similarity index 82%
rename from IoTSharp.Hub/wwwroot/default.html
rename to IoTSharp/wwwroot/default.html
index 9cfab127e74c80bd5086ad5f1c144fa56a61538f..0c31355f83cb69491f93a959fb67d3d717e8abc7 100644
--- a/IoTSharp.Hub/wwwroot/default.html
+++ b/IoTSharp/wwwroot/default.html
@@ -1,5 +1,5 @@
- IoTSharp.Hub
+ IoTSharp
diff --git a/IoTSharp/wwwroot/favicon.ico b/IoTSharp/wwwroot/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a3a799985c43bc7309d701b2cad129023377dc71
Binary files /dev/null and b/IoTSharp/wwwroot/favicon.ico differ
diff --git a/README.md b/README.md
index 7e86e3cad145708226395d462661f33848311a09..4caaf41298dfbd799dbf2ac2f3ccd275f4a54ee1 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ IoTSharp is an open-source IoT platform for data collection, processing, visuali
### Linux
- mkdir /var/iotsharp
- cp ./* /var/iotsharp/
- - chmod 777 IoTSharp.Hub
+ - chmod 777 IoTSharp
- cp iotsharp.service /etc/systemd/system/iotsharp.service
- sudo systemctl enable /etc/systemd/system/iotsharp.service
- sudo systemctl start iotsharp.service
@@ -30,4 +30,4 @@ IoTSharp is an open-source IoT platform for data collection, processing, visuali
- http://127.0.0.1:5000/
### Windows
- - sc create iotsharp binPath= "D:\iotsharp\IoTSharp.Hub.exe" displayname= "IoTSharp" start= auto
+ - sc create iotsharp binPath= "D:\iotsharp\IoTSharp.exe" displayname= "IoTSharp" start= auto
-