-
No project!
-
Welcome to VoloDocs! There`s no defined project yet.
-
-
Click here to start your first project
-
+
+
+
No project!
+
There`s no defined project yet!
+
+
Click here to start your first project
+
}
else if (Model.Projects.Count > 1)
diff --git a/modules/docs/app/VoloDocs/Pages/Index.cshtml.cs b/modules/docs/app/VoloDocs/Pages/Index.cshtml.cs
index aaaeefb784..522e992d08 100644
--- a/modules/docs/app/VoloDocs/Pages/Index.cshtml.cs
+++ b/modules/docs/app/VoloDocs/Pages/Index.cshtml.cs
@@ -1,11 +1,8 @@
-using System;
using System.Collections.Generic;
-using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.Extensions.Options;
-using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
using Volo.Abp.Users;
using Volo.Docs;
@@ -16,14 +13,11 @@ namespace VoloDocs.Pages
public class IndexModel : PageModel
{
public IReadOnlyList
Projects { get; set; }
- public string ConnectionString { get; set; }
public string CreateProjectLink { get; set; }
-
-
private readonly IProjectAppService _projectAppService;
private readonly DbConnectionOptions _dbConnectionOptions;
- private readonly ICurrentUser _currentUser;
+ private readonly ICurrentUser _currentUser;
public IndexModel(IProjectAppService projectAppService,
IOptionsSnapshot dbConnectionOptions, ICurrentUser currentUser)
@@ -35,20 +29,15 @@ namespace VoloDocs.Pages
public async Task OnGet()
{
- ConnectionString = _dbConnectionOptions.ConnectionStrings.Default;
- if (string.IsNullOrWhiteSpace(ConnectionString))
- {
- return RedirectToPage("./Configure");
- }
-
CreateProjectLink = _currentUser.Id.HasValue
? "/Docs/Admin/Projects"
: "/Account/Login?returnUrl=/Docs/Admin/Projects";
-
+
Projects = (await _projectAppService.GetListAsync()).Items;
+
if (Projects.Count == 1)
{
- return RedirectToPage("./Project/Index", new
+ return RedirectToPage("./Documents/Project/Index", new
{
projectName = Projects[0].ShortName,
version = DocsAppConsts.Latest,
@@ -56,21 +45,6 @@ namespace VoloDocs.Pages
});
}
-
-
-
- //if (!Projects.Any())
- //{
- // if (_currentUser.Id.HasValue)
- // {
- // return Redirect("./Docs/Admin/Projects");
- // }
-
- // return Redirect("./account/login?returnUrl=/Docs/Admin/Projects");
- //}
-
-
-
return Page();
}
}
diff --git a/modules/docs/app/VoloDocs/appsettings.json b/modules/docs/app/VoloDocs/appsettings.json
index e328aa93f4..a7209b10ba 100644
--- a/modules/docs/app/VoloDocs/appsettings.json
+++ b/modules/docs/app/VoloDocs/appsettings.json
@@ -1,5 +1,5 @@
{
- "ConnectionString": "Server=localhost;Database=VoloDocs;Trusted_Connection=True;MultipleActiveResultSets=true",
+ "ConnectionString": "Server=localhost;Database=VoloDocsNew;Trusted_Connection=True;MultipleActiveResultSets=true",
"Title": "Volo Documents",
"LogoUrl": "/Assets/Images/Logo.png"
}
\ No newline at end of file