diff --git a/projects/Infrastructure/Areas/Admin/Views/Shared/_Layout.cshtml b/projects/Infrastructure/Areas/Admin/Views/Shared/_Layout.cshtml deleted file mode 100644 index 09215d11..00000000 --- a/projects/Infrastructure/Areas/Admin/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,106 +0,0 @@ -@inject Infrastructure.Application.Services.Settings.ISettingService settingSerice -@{ - var name = settingSerice.GetSetting("name").Value; - var logo = settingSerice.GetSetting("logo").Value; - var copyright = settingSerice.GetSetting("copyright").Value; -} - - - - @(await Html.PartialAsync("_Header")) - @name @HtmlTitle - @RenderSection("styles", required: false) - - -
- - -
- @RenderSection("header", false) - @if (!HideBread) - { -
-
-
-
-

@HtmlTitle

-
-
-
    -
  1. 首页
    2. - @RenderSection("bread", false) -
  2. @HtmlTitle
    3. -
-
-
-
-
- } -
- - @RenderBody() -
- - - -
- -
- @(await Html.PartialAsync("_Footer")) - @RenderSection("scripts", required: false) - - - \ No newline at end of file diff --git a/projects/Infrastructure/Views/Shared/_Footer.cshtml b/projects/Infrastructure/Views/Shared/_Footer.cshtml deleted file mode 100644 index b2b3a61a..00000000 --- a/projects/Infrastructure/Views/Shared/_Footer.cshtml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/projects/Infrastructure/Views/Shared/_Header.cshtml b/projects/Infrastructure/Views/Shared/_Header.cshtml deleted file mode 100644 index 96344122..00000000 --- a/projects/Infrastructure/Views/Shared/_Header.cshtml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/projects/Infrastructure/Views/Shared/_Layout.cshtml b/projects/Infrastructure/Views/Shared/_Layout.cshtml index 6d4a822a..32aa6bd9 100644 --- a/projects/Infrastructure/Views/Shared/_Layout.cshtml +++ b/projects/Infrastructure/Views/Shared/_Layout.cshtml @@ -1,5 +1,6 @@ @inject Infrastructure.Application.Services.Settings.ISettingService settingSerice @{ + var area = ViewContext.RouteData.Values["area"] as string; var name = settingSerice.GetSetting("name").Value; var logo = settingSerice.GetSetting("logo").Value; var copyright = settingSerice.GetSetting("copyright").Value; @@ -7,102 +8,156 @@ - @(await Html.PartialAsync("_Header")) - @name @HtmlTitle + + + + + + + + + + + + + + + + + + + + + @HtmlTitle @RenderSection("styles", required: false) - -
- -
- @RenderSection("header", false) -
+ +
+ @RenderSection("header", false) @if (!HideBread) { -
-
-
-
-

@HtmlTitle

-
-
-
    -
  1. 首页
    2. - @RenderSection("bread", false) -
  2. @HtmlTitle
    3. -
-
+
+
+
+
+

@HtmlTitle

+
+
+
    +
  1. 首页
    2. + @RenderSection("bread", false) +
  2. @HtmlTitle
    3. +
+
} -
+
- @RenderBody() -
+
+ @RenderBody() +
+ + + +
- - - -
-
-
+
@Html.Raw(string.Format(copyright, DateTime.Now.Year.ToString()))
v @Helper.Instance.GetVersion() - @if (User.Identity.IsAuthenticated) - { - 管理 - }
+
+
+
+
- @(await Html.PartialAsync("_Footer")) + + + + + + + + + + + + + + + + + + + + + + + + @RenderSection("scripts", required: false) - + \ No newline at end of file diff --git a/projects/IoTCenter/Areas/Admin/Views/Shared/_Layout.cshtml b/projects/IoTCenter/Areas/Admin/Views/Shared/_Layout.cshtml deleted file mode 100644 index 32aa6bd9..00000000 --- a/projects/IoTCenter/Areas/Admin/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,163 +0,0 @@ -@inject Infrastructure.Application.Services.Settings.ISettingService settingSerice -@{ - var area = ViewContext.RouteData.Values["area"] as string; - var name = settingSerice.GetSetting("name").Value; - var logo = settingSerice.GetSetting("logo").Value; - var copyright = settingSerice.GetSetting("copyright").Value; -} - - - - - - - - - - - - - - - - - - - - - - - - @HtmlTitle - @RenderSection("styles", required: false) - - -
-
- - -
- @RenderSection("header", false) - @if (!HideBread) - { -
-
-
-
-

@HtmlTitle

-
-
-
    -
  1. 首页
    2. - @RenderSection("bread", false) -
  2. @HtmlTitle
    3. -
-
-
-
-
- } -
- -
- @RenderBody() -
-
- - - -
-
- - @Html.Raw(string.Format(copyright, DateTime.Now.Year.ToString())) - -
- v @Helper.Instance.GetVersion() -
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - @RenderSection("scripts", required: false) - - - \ No newline at end of file diff --git a/projects/IoTCenter/Dockerfile b/projects/IoTCenter/Dockerfile deleted file mode 100644 index c10b8647..00000000 --- a/projects/IoTCenter/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. - -FROM mcr.microsoft.com/dotnet/aspnet:5.0-buster-slim AS base -WORKDIR /app -EXPOSE 80 - -FROM mcr.microsoft.com/dotnet/sdk:5.0-buster-slim AS build -WORKDIR /src -COPY ["IoTCenter/IoTCenter.csproj", "IoTCenter/"] -COPY ["IoT.Shared/IoT.Shared.csproj", "IoT.Shared/"] -COPY ["Infrastructure/Infrastructure.csproj", "Infrastructure/"] -RUN dotnet restore "IoTCenter/IoTCenter.csproj" -COPY . . -WORKDIR "/src/IoTCenter" -RUN dotnet build "IoTCenter.csproj" -c Release -o /app/build - -FROM build AS publish -RUN dotnet publish "IoTCenter.csproj" -c Release -o /app/publish - -FROM base AS final -WORKDIR /app -COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "IoTCenter.dll"] diff --git a/projects/IoTCenter/wwwroot/css/jquery.tree-multiselect.min.css b/projects/IoTCenter/wwwroot/css/jquery.tree-multiselect.min.css deleted file mode 100644 index b8ba8303..00000000 --- a/projects/IoTCenter/wwwroot/css/jquery.tree-multiselect.min.css +++ /dev/null @@ -1,2 +0,0 @@ -/* jQuery Tree Multiselect v2.6.1 | (c) Patrick Tsai | MIT Licensed */ -div.tree-multiselect{border:2px solid #D8D8D8;border-radius:5px;display:table;height:inherit;width:100%}div.tree-multiselect>div.selected,div.tree-multiselect>div.selections{display:inline-block;box-sizing:border-box;overflow:auto;padding:1%;vertical-align:top;width:50%}div.tree-multiselect>div.selections{border-right:solid 2px #D8D8D8}div.tree-multiselect>div.selections div.item{margin-left:16px}div.tree-multiselect>div.selections div.item label{cursor:pointer;display:inline}div.tree-multiselect>div.selections div.item label.disabled{color:#D8D8D8}div.tree-multiselect>div.selections *[searchhit=false]{display:none}div.tree-multiselect>div.selections.no-border{border-right:none}div.tree-multiselect>div.selected>div.item{background:#EAEAEA;border-radius:2px;padding:2px 5px;overflow:auto}div.tree-multiselect>div.selected.ui-sortable>div.item:hover{cursor:move}div.tree-multiselect div.section>div.section,div.tree-multiselect div.section>div.item{padding-left:20px}div.tree-multiselect div.section.collapsed>div.title span.collapse-section:after{content:"+"}div.tree-multiselect div.section.collapsed:not([searchhit])>.item,div.tree-multiselect div.section.collapsed:not([searchhit])>.section{display:none}div.tree-multiselect div.title,div.tree-multiselect div.item{margin-bottom:2px}div.tree-multiselect div.title{background:#777;color:white;padding:2px}div.tree-multiselect div.title>*{display:inline-block}div.tree-multiselect div.title>span.collapse-section{margin:0 3px;width:8px}div.tree-multiselect div.title>span.collapse-section:after{content:"-"}div.tree-multiselect div.title:hover{cursor:pointer}div.tree-multiselect input[type=checkbox]{display:inline;margin-right:5px}div.tree-multiselect input[type=checkbox]:not([disabled]):hover{cursor:pointer}div.tree-multiselect span.remove-selected,div.tree-multiselect span.description{background:#777;border-radius:2px;color:white;margin-right:5px;padding:0 3px}div.tree-multiselect span.remove-selected:hover{cursor:pointer}div.tree-multiselect span.description:hover{cursor:help}div.tree-multiselect div.temp-description-popup{background:#EAEAEA;border:2px solid #676767;border-radius:3px;padding:5px}div.tree-multiselect span.section-name{float:right;font-style:italic}div.tree-multiselect .auxiliary{display:table;width:100%}div.tree-multiselect .auxiliary input.search{border:2px solid #D8D8D8;display:table-cell;margin:0;padding:5px;width:100%}div.tree-multiselect .auxiliary .select-all-container{display:table-cell;text-align:right}div.tree-multiselect .auxiliary .select-all-container span.select-all,div.tree-multiselect .auxiliary .select-all-container span.unselect-all{margin-right:5px;padding-right:5px}div.tree-multiselect .auxiliary .select-all-container span.select-all:hover,div.tree-multiselect .auxiliary .select-all-container span.unselect-all:hover{cursor:pointer}div.tree-multiselect .auxiliary .select-all-container span.select-all{border-right:2px solid #D8D8D8}