Skip to content

Commit 82b043d

Browse files
joeaudettejoeaudette
authored
Merge pull request #11 from cloudscribe/dev
merge changes from dev
2 parents e5436a3 + 0825d22 commit 82b043d

2 files changed

Lines changed: 73 additions & 27 deletions

File tree

‎src/WebApp/Startup.cs‎

Lines changed: 65 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,19 @@ public void ConfigureServices(IServiceCollection services)
121121
});
122122

123123
// it is recommended to use lower case urls
124-
services.AddRouting(options =>
124+
//services.AddRouting(options =>
125+
//{
126+
// options.LowercaseUrls = true;
127+
//});
128+
129+
//services.AddControllersWithViews();
130+
131+
services.Configure<MvcOptions>(options =>
125132
{
126-
options.LowercaseUrls = true;
127-
});
133+
options.EnableEndpointRouting = false;
128134

129-
services.AddControllersWithViews();
135+
136+
});
130137

131138
services.AddMvc()
132139
.AddRazorOptions(options =>
@@ -157,7 +164,7 @@ IOptions<RequestLocalizationOptions> localizationOptionsAccessor
157164
app.UseExceptionHandler("/oops/Error");
158165
}
159166

160-
app.UseForwardedHeaders();
167+
161168
app.UseStaticFiles();
162169

163170
//app.UseSession();
@@ -173,48 +180,87 @@ IOptions<RequestLocalizationOptions> localizationOptionsAccessor
173180

174181
var useFolders = multiTenantOptions.Mode == cloudscribe.Core.Models.MultiTenantMode.FolderName;
175182

176-
app.UseEndpoints(endpoints =>
183+
app.UseMvc(routes =>
177184
{
178-
//endpoints.MapControllerRoute(
179-
// name: "default",
180-
// pattern: "{controller=Home}/{action=Index}/{id?}");
181185

182-
endpoints.AddCloudscribeFileManagerRoutes();
186+
187+
routes.AddCloudscribeFileManagerRoutes();
183188

184189
if (useFolders)
185190
{
186-
endpoints.MapControllerRoute(
191+
routes.MapRoute(
187192
name: "foldererrorhandler",
188-
pattern: "{sitefolder}/oops/error/{statusCode?}",
193+
template: "{sitefolder}/oops/error/{statusCode?}",
189194
defaults: new { controller = "Oops", action = "Error" },
190195
constraints: new { name = new cloudscribe.Core.Web.Components.SiteFolderRouteConstraint() }
191196
);
192197

193-
endpoints.MapControllerRoute(
198+
routes.MapRoute(
194199
name: "folderdefault",
195-
pattern: "{sitefolder}/{controller}/{action}/{id?}",
200+
template: "{sitefolder}/{controller}/{action}/{id?}",
196201
defaults: new { controller = "Home", action = "Index" },
197202
constraints: new { name = new cloudscribe.Core.Web.Components.SiteFolderRouteConstraint() }
198203
);
199204

200205
}
201206

202-
endpoints.MapControllerRoute(
207+
routes.MapRoute(
203208
name: "errorhandler",
204-
pattern: "oops/error/{statusCode?}",
209+
template: "oops/error/{statusCode?}",
205210
defaults: new { controller = "Oops", action = "Error" }
206211
);
207212

208-
endpoints.MapControllerRoute(
213+
routes.MapRoute(
209214
name: "default",
210-
pattern: "{controller=Home}/{action=Index}/{id?}"
215+
template: "{controller=Home}/{action=Index}/{id?}"
211216
);
212217

213218

214219

215220
});
216221

217-
222+
//app.UseEndpoints(endpoints =>
223+
//{
224+
// //endpoints.MapControllerRoute(
225+
// // name: "default",
226+
// // pattern: "{controller=Home}/{action=Index}/{id?}");
227+
228+
// endpoints.AddCloudscribeFileManagerRoutes();
229+
230+
// if (useFolders)
231+
// {
232+
// endpoints.MapControllerRoute(
233+
// name: "foldererrorhandler",
234+
// pattern: "{sitefolder}/oops/error/{statusCode?}",
235+
// defaults: new { controller = "Oops", action = "Error" },
236+
// constraints: new { name = new cloudscribe.Core.Web.Components.SiteFolderRouteConstraint() }
237+
// );
238+
239+
// endpoints.MapControllerRoute(
240+
// name: "folderdefault",
241+
// pattern: "{sitefolder}/{controller}/{action}/{id?}",
242+
// defaults: new { controller = "Home", action = "Index" },
243+
// constraints: new { name = new cloudscribe.Core.Web.Components.SiteFolderRouteConstraint() }
244+
// );
245+
246+
// }
247+
248+
// endpoints.MapControllerRoute(
249+
// name: "errorhandler",
250+
// pattern: "oops/error/{statusCode?}",
251+
// defaults: new { controller = "Oops", action = "Error" }
252+
// );
253+
254+
// endpoints.MapControllerRoute(
255+
// name: "default",
256+
// pattern: "{controller=Home}/{action=Index}/{id?}"
257+
// );
258+
259+
260+
261+
//});
262+
263+
218264

219265

220266
}

‎src/WebApp/WebApp.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<PackageReference Include="cloudscribe.Core.Web" Version="4.0.0" />
36+
<PackageReference Include="cloudscribe.Core.Web" Version="4.0.3" />
3737
<PackageReference Include="cloudscribe.Core.CompiledViews.Bootstrap3" Version="4.0.0" />
3838
<PackageReference Include="cloudscribe.Core.Storage.NoDb" Version="4.0.0" />
39-
<PackageReference Include="cloudscribe.Core.Storage.EFCore.MSSQL" Version="4.0.0" />
40-
<PackageReference Include="cloudscribe.Core.Storage.EFCore.MySql" Version="4.0.0-*" />
41-
<PackageReference Include="cloudscribe.Core.Storage.EFCore.PostgreSql" Version="4.0.0" />
42-
<PackageReference Include="cloudscribe.Core.Storage.EFCore.SQLite" Version="4.0.0" />
39+
<PackageReference Include="cloudscribe.Core.Storage.EFCore.MSSQL" Version="4.0.1" />
40+
<PackageReference Include="cloudscribe.Core.Storage.EFCore.MySql" Version="4.0.1" />
41+
<PackageReference Include="cloudscribe.Core.Storage.EFCore.PostgreSql" Version="4.0.1" />
42+
<PackageReference Include="cloudscribe.Core.Storage.EFCore.SQLite" Version="4.0.1" />
4343
<PackageReference Include="cloudscribe.Logging.Web" Version="4.0.0" />
4444
<PackageReference Include="cloudscribe.Logging.NoDb" Version="4.0.0" />
4545
<PackageReference Include="cloudscribe.Logging.EFCore.MSSQL" Version="4.0.0" />
46-
<PackageReference Include="cloudscribe.Logging.EFCore.MySql" Version="4.0.1-*" />
47-
<PackageReference Include="cloudscribe.Logging.EFCore.PostgreSql" Version="4.0.0" />
46+
<PackageReference Include="cloudscribe.Logging.EFCore.MySql" Version="4.0.1" />
47+
<PackageReference Include="cloudscribe.Logging.EFCore.PostgreSql" Version="4.0.1" />
4848
<PackageReference Include="cloudscribe.Logging.EFCore.SQLite" Version="4.0.0" />
49-
<PackageReference Include="cloudscribe.Web.Localization" Version="3.0.0" />
49+
<PackageReference Include="cloudscribe.Web.Localization" Version="3.0.2" />
5050

5151

5252

0 commit comments

Comments
 (0)