kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #208 from sbwalker/master

Browse Source 
remove unnecessary API methods
This commit is contained in:
Shaun Walker 2020-02-14 10:14:44 -05:00 committed by GitHub
commit ff6f67aba0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 4 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Oqtane.Client/Services/Interfaces/IPageModuleService.cs
View File

@ -6,7 +6,6 @@ namespace Oqtane.Services
{
public interface IPageModuleService
{
Task<List<PageModule>> GetPageModulesAsync();
Task<PageModule> GetPageModuleAsync(int PageModuleId);
Task<PageModule> GetPageModuleAsync(int PageId, int ModuleId);
Task<PageModule> AddPageModuleAsync(PageModule PageModule);

2
Oqtane.Client/Services/Interfaces/IProfileService.cs
View File

@ -6,8 +6,6 @@ namespace Oqtane.Services
{
public interface IProfileService
{
Task<List<Profile>> GetProfilesAsync();
Task<List<Profile>> GetProfilesAsync(int SiteId);
Task<Profile> GetProfileAsync(int ProfileId);

2
Oqtane.Client/Services/Interfaces/IRoleService.cs
View File

@ -6,8 +6,6 @@ namespace Oqtane.Services
{
public interface IRoleService
{
Task<List<Role>> GetRolesAsync();
Task<List<Role>> GetRolesAsync(int SiteId);
Task<Role> GetRoleAsync(int RoleId);

1
Oqtane.Client/Services/Interfaces/ISiteService.cs
View File

@ -7,7 +7,6 @@ namespace Oqtane.Services
public interface ISiteService
{
Task<List<Site>> GetSitesAsync();
Task<List<Site>> GetSitesAsync(Alias Alias);
Task<Site> GetSiteAsync(int SiteId);
Task<Site> GetSiteAsync(int SiteId, Alias Alias);

1
Oqtane.Client/Services/Interfaces/IUserRoleService.cs
View File

@ -6,7 +6,6 @@ namespace Oqtane.Services
{
public interface IUserRoleService
{
Task<List<UserRole>> GetUserRolesAsync();
Task<List<UserRole>> GetUserRolesAsync(int SiteId);
Task<UserRole> GetUserRoleAsync(int UserRoleId);
Task<UserRole> AddUserRoleAsync(UserRole UserRole);

2
Oqtane.Client/Services/Interfaces/IUserService.cs
View File

@ -6,8 +6,6 @@ namespace Oqtane.Services
{
public interface IUserService
{
Task<List<User>> GetUsersAsync();
Task<User> GetUserAsync(int UserId, int SiteId);
Task<User> GetUserAsync(string Username, int SiteId);

5
Oqtane.Client/Services/PageModuleService.cs
View File

@ -26,11 +26,6 @@ namespace Oqtane.Services
get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "PageModule"); }
}
public async Task<List<PageModule>> GetPageModulesAsync()
{
return await http.GetJsonAsync<List<PageModule>>(apiurl);
}
public async Task<PageModule> GetPageModuleAsync(int PageModuleId)
{
return await http.GetJsonAsync<PageModule>(apiurl + "/" + PageModuleId.ToString());

5
Oqtane.Client/Services/ProfileService.cs
View File

@ -26,11 +26,6 @@ namespace Oqtane.Services
get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Profile"); }
}
public async Task<List<Profile>> GetProfilesAsync()
{
return await http.GetJsonAsync<List<Profile>>(apiurl);
}
public async Task<List<Profile>> GetProfilesAsync(int SiteId)
{
List<Profile> Profiles = await http.GetJsonAsync<List<Profile>>(apiurl + "?siteid=" + SiteId.ToString());

6
Oqtane.Client/Services/RoleService.cs
View File

@ -26,12 +26,6 @@ namespace Oqtane.Services
get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Role"); }
}
public async Task<List<Role>> GetRolesAsync()
{
List<Role> Roles = await http.GetJsonAsync<List<Role>>(apiurl);
return Roles.OrderBy(item => item.Name).ToList();
}
public async Task<List<Role>> GetRolesAsync(int SiteId)
{
List<Role> Roles = await http.GetJsonAsync<List<Role>>(apiurl + "?siteid=" + SiteId.ToString());

5
Oqtane.Client/Services/SiteService.cs
View File

@ -31,11 +31,6 @@ namespace Oqtane.Services
List<Site> sites = await http.GetJsonAsync<List<Site>>(apiurl);
return sites.OrderBy(item => item.Name).ToList();
}
public async Task<List<Site>> GetSitesAsync(Alias Alias)
{
List<Site> sites = await http.GetJsonAsync<List<Site>>(CreateApiUrl(Alias, NavigationManager.Uri, "Site"));
return sites.OrderBy(item => item.Name).ToList();
}
public async Task<Site> GetSiteAsync(int SiteId)
{

5
Oqtane.Client/Services/UserRoleService.cs
View File

@ -26,11 +26,6 @@ namespace Oqtane.Services
get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "UserRole"); }
}
public async Task<List<UserRole>> GetUserRolesAsync()
{
return await http.GetJsonAsync<List<UserRole>>(apiurl);
}
public async Task<List<UserRole>> GetUserRolesAsync(int SiteId)
{
return await http.GetJsonAsync<List<UserRole>>(apiurl + "?siteid=" + SiteId.ToString());

6
Oqtane.Client/Services/UserService.cs
View File

@ -27,12 +27,6 @@ namespace Oqtane.Services
get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "User"); }
}
public async Task<List<User>> GetUsersAsync()
{
List<User> users = await http.GetJsonAsync<List<User>>(apiurl);
return users.OrderBy(item => item.DisplayName).ToList();
}
public async Task<User> GetUserAsync(int UserId, int SiteId)
{
return await http.GetJsonAsync<User>(apiurl + "/" + UserId.ToString() + "?siteid=" + SiteId.ToString());

2
Oqtane.Client/Shared/Installer.razor
View File

@ -59,7 +59,7 @@
<label for="Title" class="control-label" style="font-weight: bold">Username: </label>
</td>
<td>
<input type="text" class="form-control" readonly @bind="@Username" />
<input type="text" class="form-control" @bind="@Username" />
</td>
</tr>
<tr style="@IntegratedSecurityDisplay">

7
Oqtane.Server/Controllers/PageModuleController.cs
View File

@ -24,13 +24,6 @@ namespace Oqtane.Controllers
this.logger = logger;
}
// GET: api/<controller>
[HttpGet]
public IEnumerable<PageModule> Get()
{
return PageModules.GetPageModules();
}
// GET api/<controller>/5
[HttpGet("{id}")]
public PageModule Get(int id)

9
Oqtane.Server/Controllers/ProfileController.cs
View File

@ -24,14 +24,7 @@ namespace Oqtane.Controllers
[HttpGet]
public IEnumerable<Profile> Get(string siteid)
{
if (siteid == "")
{
return Profiles.GetProfiles();
}
else
{
return Profiles.GetProfiles(int.Parse(siteid));
}
return Profiles.GetProfiles(int.Parse(siteid));
}
// GET api/<controller>/5

9
Oqtane.Server/Controllers/RoleController.cs
View File

@ -24,14 +24,7 @@ namespace Oqtane.Controllers
[HttpGet]
public IEnumerable<Role> Get(string siteid)
{
if (siteid == "")
{
return Roles.GetRoles();
}
else
{
return Roles.GetRoles(int.Parse(siteid));
}
return Roles.GetRoles(int.Parse(siteid));
}
// GET api/<controller>/5

8
Oqtane.Server/Controllers/UserController.cs
View File

@ -42,14 +42,6 @@ namespace Oqtane.Controllers
this.logger = logger;
}
// GET: api/<controller>?siteid=x
[HttpGet]
[Authorize(Roles = Constants.AdminRole)]
public IEnumerable<User> Get()
{
return Users.GetUsers();
}
// GET api/<controller>/5?siteid=x
[HttpGet("{id}")]
public User Get(int id, string siteid)

9
Oqtane.Server/Controllers/UserRoleController.cs
View File

@ -24,14 +24,7 @@ namespace Oqtane.Controllers
[HttpGet]
public IEnumerable<UserRole> Get(string siteid)
{
if (siteid == "")
{
return UserRoles.GetUserRoles();
}
else
{
return UserRoles.GetUserRoles(int.Parse(siteid));
}
return UserRoles.GetUserRoles(int.Parse(siteid));
}
// GET api/<controller>/5