Skip to content

Commit 1ebe8ca

Browse files
yakovenkodenisyakovenkodenis
committed
Merge pull request #17 from PI-13-5/development
Initiate release 1
2 parents 5ae0e33 + f8fafe7 commit 1ebe8ca

File tree

403 files changed

+79145
-265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

403 files changed

+79145
-265
lines changed

‎.vs/BistroDriveWebApp/v14/.suo

67 KB
Binary file not shown.

‎BistroDriveWebApp/App_Data/DataBase.mdf

3.19 MB
Binary file not shown.

‎BistroDriveWebApp/App_Data/DataBase_log.ldf

832 KB
Binary file not shown.

‎BistroDriveWebApp/App_Data/bistrodrive.sql

Lines changed: 399 additions & 0 deletions
Large diffs are not rendered by default.

‎BistroDriveWebApp/App_Start/BundleConfig.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Web;
1+
using System.Web;
22
using System.Web.Optimization;
33

44
namespace BistroDriveWebApp
@@ -9,7 +9,8 @@ public class BundleConfig
99
public static void RegisterBundles(BundleCollection bundles)
1010
{
1111
bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
12-
"~/Scripts/jquery-{version}.js"));
12+
"~/Scripts/jquery-2.1.4.min.js",
13+
"~/Scripts/jquery-ui.js"));
1314

1415
bundles.Add(new ScriptBundle("~/bundles/jqueryval").Include(
1516
"~/Scripts/jquery.validate*"));
@@ -25,7 +26,8 @@ public static void RegisterBundles(BundleCollection bundles)
2526

2627
bundles.Add(new StyleBundle("~/Content/css").Include(
2728
"~/Content/bootstrap.css",
28-
"~/Content/site.css"));
29+
"~/Content/site.css",
30+
"~/Content/font-awesome/css/font-awesome.min.css"));
2931
}
3032
}
3133
}

‎BistroDriveWebApp/App_Start/IdentityConfig.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ public static ApplicationUserManager Create(IdentityFactoryOptions<ApplicationUs
5454
manager.PasswordValidator = new PasswordValidator
5555
{
5656
RequiredLength = 6,
57-
RequireNonLetterOrDigit = true,
57+
//RequireNonLetterOrDigit = true,
5858
RequireDigit = true,
59-
RequireLowercase = true,
60-
RequireUppercase = true,
59+
//RequireLowercase = true,
60+
//RequireUppercase = true,
6161
};
6262

6363
// Configure user lockout defaults

‎BistroDriveWebApp/App_Start/Startup.Auth.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
using Microsoft.Owin.Security.Google;
77
using Owin;
88
using BistroDriveWebApp.Models;
9+
using System.Data.Entity;
10+
using MySql.Data.Entity;
911

1012
namespace BistroDriveWebApp
1113
{
@@ -18,6 +20,8 @@ public void ConfigureAuth(IAppBuilder app)
1820
app.CreatePerOwinContext(ApplicationDbContext.Create);
1921
app.CreatePerOwinContext<ApplicationUserManager>(ApplicationUserManager.Create);
2022
app.CreatePerOwinContext<ApplicationSignInManager>(ApplicationSignInManager.Create);
23+
// Необходимо для корректной работы mysql На хостинге
24+
DbConfiguration.SetConfiguration(new MySqlEFConfiguration());
2125

2226
// Enable the application to use a cookie to store information for the signed in user
2327
// and to use a cookie to temporarily store information about a user logging in with a third party login provider
@@ -63,6 +67,7 @@ public void ConfigureAuth(IAppBuilder app)
6367
// ClientId = "",
6468
// ClientSecret = ""
6569
//});
70+
Models.DataManager.Init();
6671
}
6772
}
6873
}

‎BistroDriveWebApp/BistroDriveWebApp.csproj

Lines changed: 135 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,15 @@
7474
<HintPath>..\packages\Microsoft.ApplicationInsights.Agent.Intercept.0.17.0\lib\net45\Microsoft.Diagnostics.Instrumentation.Extensions.Intercept.dll</HintPath>
7575
<Private>True</Private>
7676
</Reference>
77+
<Reference Include="MySql.Data, Version=6.9.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL" />
78+
<Reference Include="MySql.Data.Entity.EF6, Version=6.9.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL" />
79+
<Reference Include="MySql.Web, Version=6.9.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL" />
7780
<Reference Include="System" />
7881
<Reference Include="System.Data" />
82+
<Reference Include="System.Data.Linq" />
7983
<Reference Include="System.Drawing" />
84+
<Reference Include="System.Runtime.Serialization" />
85+
<Reference Include="System.Security" />
8086
<Reference Include="System.Web.DynamicData" />
8187
<Reference Include="System.Web.Entity" />
8288
<Reference Include="System.Web.ApplicationServices" />
@@ -195,25 +201,131 @@
195201
<Compile Include="Controllers\AccountController.cs" />
196202
<Compile Include="Controllers\HomeController.cs" />
197203
<Compile Include="Controllers\ManageController.cs" />
204+
<Compile Include="Controllers\OrderController.cs" />
205+
<Compile Include="Controllers\ProfileController.cs" />
206+
<Compile Include="Core\Security.cs" />
198207
<Compile Include="Global.asax.cs">
199208
<DependentUpon>Global.asax</DependentUpon>
200209
</Compile>
201-
<Compile Include="Models\AccountViewModels.cs" />
202-
<Compile Include="Models\IdentityModels.cs" />
203-
<Compile Include="Models\ManageViewModels.cs" />
210+
<Compile Include="Models\aspnetrole.cs">
211+
<DependentUpon>Model1.tt</DependentUpon>
212+
</Compile>
213+
<Compile Include="Models\aspnetuser.cs">
214+
<DependentUpon>Model1.tt</DependentUpon>
215+
</Compile>
216+
<Compile Include="Models\aspnetuserclaim.cs">
217+
<DependentUpon>Model1.tt</DependentUpon>
218+
</Compile>
219+
<Compile Include="Models\aspnetuserlogin.cs">
220+
<DependentUpon>Model1.tt</DependentUpon>
221+
</Compile>
222+
<Compile Include="Models\chatmessage.cs">
223+
<DependentUpon>Model1.tt</DependentUpon>
224+
</Compile>
225+
<Compile Include="Models\dish.cs">
226+
<DependentUpon>Model1.tt</DependentUpon>
227+
</Compile>
228+
<Compile Include="Models\dishreview.cs">
229+
<DependentUpon>Model1.tt</DependentUpon>
230+
</Compile>
231+
<Compile Include="Models\dishtype.cs">
232+
<DependentUpon>Model1.tt</DependentUpon>
233+
</Compile>
234+
<Compile Include="Models\Model1.Context.cs">
235+
<AutoGen>True</AutoGen>
236+
<DesignTime>True</DesignTime>
237+
<DependentUpon>Model1.Context.tt</DependentUpon>
238+
</Compile>
239+
<Compile Include="Models\Model1.cs">
240+
<AutoGen>True</AutoGen>
241+
<DesignTime>True</DesignTime>
242+
<DependentUpon>Model1.tt</DependentUpon>
243+
</Compile>
244+
<Compile Include="Models\Model1.Designer.cs">
245+
<AutoGen>True</AutoGen>
246+
<DesignTime>True</DesignTime>
247+
<DependentUpon>Model1.edmx</DependentUpon>
248+
</Compile>
249+
<Compile Include="Models\order.cs">
250+
<DependentUpon>Model1.tt</DependentUpon>
251+
</Compile>
252+
<Compile Include="Models\ordercontactmethod.cs">
253+
<DependentUpon>Model1.tt</DependentUpon>
254+
</Compile>
255+
<Compile Include="Models\orderdelivery.cs">
256+
<DependentUpon>Model1.tt</DependentUpon>
257+
</Compile>
258+
<Compile Include="Models\orderingridientbuyer.cs">
259+
<DependentUpon>Model1.tt</DependentUpon>
260+
</Compile>
261+
<Compile Include="Models\orderpaymentmethod.cs">
262+
<DependentUpon>Model1.tt</DependentUpon>
263+
</Compile>
264+
<Compile Include="Models\orderproduct.cs">
265+
<DependentUpon>Model1.tt</DependentUpon>
266+
</Compile>
267+
<Compile Include="Models\orderstatu.cs">
268+
<DependentUpon>Model1.tt</DependentUpon>
269+
</Compile>
270+
<Compile Include="Models\Repositories\IngridientsBuyer.cs" />
271+
<Compile Include="Models\review.cs">
272+
<DependentUpon>Model1.tt</DependentUpon>
273+
</Compile>
274+
<Compile Include="Models\userdescription.cs">
275+
<DependentUpon>Model1.tt</DependentUpon>
276+
</Compile>
277+
<Compile Include="Models\ViewModels\AccountViewModels.cs" />
278+
<Compile Include="Models\Repositories\ContactMethodRepository.cs" />
279+
<Compile Include="Models\DataManager.cs" />
280+
<Compile Include="Models\Repositories\DeliveryMethodRepository.cs" />
281+
<Compile Include="Models\Repositories\DishRepository.cs" />
282+
<Compile Include="Models\ViewModels\HomeViewModels.cs" />
283+
<Compile Include="Models\ViewModels\IdentityModels.cs" />
284+
<Compile Include="Models\ViewModels\ManageViewModels.cs" />
285+
<Compile Include="Models\Repositories\OrderRepository.cs" />
286+
<Compile Include="Models\ViewModels\OrderViewModels.cs" />
287+
<Compile Include="Models\Repositories\PaymentMethodRepository.cs" />
288+
<Compile Include="Models\ViewModels\ProfileViewModels.cs" />
289+
<Compile Include="Models\Repositories\StatusRepository.cs" />
290+
<Compile Include="Models\Repositories\UserRepository.cs" />
204291
<Compile Include="Properties\AssemblyInfo.cs" />
205292
<Compile Include="Startup.cs" />
206293
</ItemGroup>
207294
<ItemGroup>
295+
<Content Include="App_Data\bistrodrive.sql" />
296+
<Content Include="App_Data\DataBase.mdf" />
297+
<Content Include="App_Data\DataBase_log.ldf">
298+
<DependentUpon>DataBase.mdf</DependentUpon>
299+
</Content>
208300
<Content Include="Content\bootstrap.css" />
209301
<Content Include="Content\bootstrap.min.css" />
210302
<Content Include="favicon.ico" />
211303
<Content Include="fonts\glyphicons-halflings-regular.svg" />
212304
<Content Include="Global.asax" />
213305
<Content Include="Content\Site.css" />
306+
<Content Include="Models\Model1.Context.tt">
307+
<Generator>TextTemplatingFileGenerator</Generator>
308+
<DependentUpon>Model1.edmx</DependentUpon>
309+
<LastGenOutput>Model1.Context.cs</LastGenOutput>
310+
</Content>
311+
<Content Include="Models\Model1.tt">
312+
<Generator>TextTemplatingFileGenerator</Generator>
313+
<DependentUpon>Model1.edmx</DependentUpon>
314+
<LastGenOutput>Model1.cs</LastGenOutput>
315+
</Content>
214316
<Content Include="Scripts\bootstrap.js" />
215317
<Content Include="Scripts\bootstrap.min.js" />
216318
<Content Include="ApplicationInsights.config" />
319+
<EntityDeploy Include="Models\Model1.edmx">
320+
<Generator>EntityModelCodeGenerator</Generator>
321+
<LastGenOutput>Model1.Designer.cs</LastGenOutput>
322+
</EntityDeploy>
323+
<Content Include="Models\Model1.edmx.diagram">
324+
<DependentUpon>Model1.edmx</DependentUpon>
325+
</Content>
326+
<None Include="Properties\PublishProfiles\bistrodrive.pubxml" />
327+
<None Include="Properties\PublishProfiles\SmarterASP.pubxml" />
328+
<None Include="Properties\PublishProfiles\SmartWD.pubxml" />
217329
<None Include="Scripts\jquery-1.10.2.intellisense.js" />
218330
<Content Include="Scripts\jquery-1.10.2.js" />
219331
<Content Include="Scripts\jquery-1.10.2.min.js" />
@@ -226,7 +338,9 @@
226338
<Content Include="Scripts\respond.js" />
227339
<Content Include="Scripts\respond.min.js" />
228340
<Content Include="Scripts\_references.js" />
229-
<Content Include="Web.config" />
341+
<Content Include="Web.config">
342+
<SubType>Designer</SubType>
343+
</Content>
230344
<Content Include="Web.Debug.config">
231345
<DependentUpon>Web.config</DependentUpon>
232346
</Content>
@@ -261,9 +375,21 @@
261375
<Content Include="Views\Shared\Lockout.cshtml" />
262376
<Content Include="Views\Shared\_LoginPartial.cshtml" />
263377
<Content Include="Service References\Application Insights\ConnectedService.json" />
378+
<Content Include="Views\Profile\Index.cshtml" />
379+
<Content Include="Views\Profile\AddDish.cshtml" />
380+
<Content Include="Views\Profile\_DishPartial.cshtml" />
381+
<Content Include="Views\Profile\EditDish.cshtml" />
382+
<Content Include="Views\Profile\Dish.cshtml" />
383+
<Content Include="Views\Profile\DishInfo.cshtml" />
384+
<Content Include="Views\Order\MakeOrder.cshtml" />
385+
<Content Include="Views\Order\Success.cshtml" />
386+
<Content Include="Views\Profile\Order.cshtml" />
387+
<Content Include="Views\Profile\OrderInfo.cshtml" />
388+
<Content Include="Views\Home\Offers.cshtml" />
264389
</ItemGroup>
265390
<ItemGroup>
266-
<Folder Include="App_Data\" />
391+
<Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" />
392+
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
267393
</ItemGroup>
268394
<ItemGroup>
269395
<Content Include="fonts\glyphicons-halflings-regular.woff" />
@@ -276,6 +402,10 @@
276402
<ItemGroup>
277403
<WCFMetadata Include="Service References\" />
278404
</ItemGroup>
405+
<ItemGroup>
406+
<Folder Include="Uploads\avatars\" />
407+
<Folder Include="Uploads\dish\" />
408+
</ItemGroup>
279409
<PropertyGroup>
280410
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
281411
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

‎BistroDriveWebApp/BistroDriveWebApp.csproj.user

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<NameOfLastUsedPublishProfile>SmarterASP</NameOfLastUsedPublishProfile>
5+
<WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
6+
<WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
7+
<WebStackScaffolding_IsPartialViewSelected>True</WebStackScaffolding_IsPartialViewSelected>
8+
<WebStackScaffolding_IsReferencingScriptLibrariesSelected>False</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
9+
<WebStackScaffolding_LayoutPageFile />
10+
<WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
11+
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
12+
</PropertyGroup>
313
<ProjectExtensions>
414
<VisualStudio>
515
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

0 commit comments

Comments
 (0)