resolved a number of issues with site creation #224

This commit is contained in:
Shaun Walker
2020-02-25 18:53:36 -05:00
parent 15236d78d4
commit b4ddc45829
17 changed files with 264 additions and 163 deletions

View File

@ -9,15 +9,11 @@ namespace Oqtane.Services
Task<List<Site>> GetSitesAsync();
Task<Site> GetSiteAsync(int SiteId);
Task<Site> GetSiteAsync(int SiteId, Alias Alias);
Task<Site> AddSiteAsync(Site Site);
Task<Site> AddSiteAsync(Site Site, Alias Alias);
Task<Site> UpdateSiteAsync(Site Site);
Task<Site> UpdateSiteAsync(Site Site, Alias Alias);
Task DeleteSiteAsync(int SiteId);
Task DeleteSiteAsync(int SiteId, Alias Alias);
}
}

View File

@ -12,7 +12,7 @@ namespace Oqtane.Services
Task<User> AddUserAsync(User User);
Task<User> AddUserAsync(User User, Alias alias);
Task<User> AddUserAsync(User User, Alias Alias);
Task<User> UpdateUserAsync(User User);

View File

@ -36,37 +36,27 @@ namespace Oqtane.Services
{
return await http.GetJsonAsync<Site>(apiurl + "/" + SiteId.ToString());
}
public async Task<Site> GetSiteAsync(int SiteId, Alias Alias)
{
return await http.GetJsonAsync<Site>(CreateApiUrl(Alias, NavigationManager.Uri, "Site") + "/" + SiteId.ToString());
}
public async Task<Site> AddSiteAsync(Site Site)
{
return await http.PostJsonAsync<Site>(apiurl, Site);
}
public async Task<Site> AddSiteAsync(Site Site, Alias Alias)
{
return await http.PostJsonAsync<Site>(CreateApiUrl(Alias, NavigationManager.Uri, "Site"), Site);
if (Alias == null)
{
return await http.PostJsonAsync<Site>(apiurl, Site);
}
else
{
return await http.PostJsonAsync<Site>(CreateApiUrl(Alias, NavigationManager.Uri, "Site"), Site);
}
}
public async Task<Site> UpdateSiteAsync(Site Site)
{
return await http.PutJsonAsync<Site>(apiurl + "/" + Site.SiteId.ToString(), Site);
}
public async Task<Site> UpdateSiteAsync(Site Site, Alias Alias)
{
return await http.PutJsonAsync<Site>(CreateApiUrl(Alias, NavigationManager.Uri, "Site") + "/" + Site.SiteId.ToString(), Site);
}
public async Task DeleteSiteAsync(int SiteId)
{
await http.DeleteAsync(apiurl + "/" + SiteId.ToString());
}
public async Task DeleteSiteAsync(int SiteId, Alias Alias)
{
await http.DeleteAsync(CreateApiUrl(Alias, NavigationManager.Uri, "Site") + "/" + SiteId.ToString());
}
}
}