Skip to content

Commit 4142fd8

Browse files
appeon-dotnetappeon-dotnet
committed
Update
1 parent 0bef99c commit 4142fd8

File tree

13 files changed

+126
-89
lines changed

13 files changed

+126
-89
lines changed

‎Appeon.DataStoreDemo.Web/Pages/Header.cshtml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<div class="navbar nav_title" style="border: 0;">
2+
<a href="~/Index" class="site_title">
3+
<img src="~/images/appeon.svg">
4+
<i class="fa fa-paw"></i> <span>Appeon Demo!</span>
5+
</a>
6+
</div>
7+
<div class="clearfix"></div>
8+
<!-- menu profile quick info -->
9+
<div class="profile clearfix">
10+
<div class="profile_pic">
11+
<img src="~/images/user.png" alt="..." class="img-circle profile_img">
12+
</div>
13+
<div class="profile_info">
14+
<span>Welcome,</span>
15+
<h2>Admin</h2>
16+
</div>
17+
</div>

‎Appeon.DataStoreDemo.Web/Pages/Index.cshtml‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<meta charset="utf-8">
1414
<meta http-equiv="X-UA-Compatible" content="IE=edge">
1515
<meta name="viewport" content="width=device-width, initial-scale=1">
16-
<link rel="icon" href="images/favicon.ico" type="image/ico" />
16+
<link rel="icon" href="~/images/favicon.ico" type="image/ico" />
1717

1818
<title>Appeon ModelMapper Demo!</title>
1919

@@ -30,36 +30,22 @@
3030
<div class="main_container">
3131
<div class="col-md-3 left_col">
3232
<div class="left_col scroll-view">
33-
<div class="navbar nav_title" style="border: 0;">
34-
<a href="index.html" class="site_title">
35-
<img src="~/images/appeon.svg">
36-
<i class="fa fa-paw"></i> <span>Appeon Demo!</span>
37-
</a>
38-
</div>
39-
<div class="clearfix"></div>
40-
<!-- menu profile quick info -->
41-
<div class="profile clearfix">
42-
<div class="profile_pic">
43-
<img src="images/user.png" alt="..." class="img-circle profile_img">
44-
</div>
45-
<div class="profile_info">
46-
<span>Welcome,</span>
47-
<h2>@ViewData["loginName"]</h2>
48-
</div>
49-
</div>
33+
@Html.Partial("Header")
5034
<!-- /menu profile quick info -->
5135
<br />
5236
<!-- sidebar menu -->
5337
<div id="sidebar-menu" class="main_menu_side hidden-print main_menu">
54-
<script src="~/js/menu.js"></script>
38+
<!--<script src="~/js/menu.js"></script>-->
39+
@Html.Partial("Menu")
5540
</div>
5641
<!-- /sidebar menu -->
5742
<!-- /menu footer buttons -->
5843
<!-- /menu footer buttons -->
5944
</div>
6045
</div>
6146
<!-- top navigation -->
62-
<script src="~/js/profile.js"></script>
47+
<!--<script src="~/js/profile.js"></script>-->
48+
@Html.Partial("Profile")
6349
<!-- /top navigation -->
6450
<!-- page content -->
6551
<div class="right_col" role="main">

‎Appeon.DataStoreDemo.Web/Pages/Login.cshtml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@
1212
<meta charset="utf-8">
1313
<meta http-equiv="X-UA-Compatible" content="IE=edge">
1414
<meta name="viewport" content="width=device-width, initial-scale=1">
15+
<link rel="icon" href="~/images/favicon.ico" type="image/ico" />
1516

1617
<title>Appeon ModelMapper Demo </title>
1718

1819
<!-- Bootstrap -->
1920
<link href="~/vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
2021
<!-- Font Awesome -->
21-
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
22+
<link href="~/vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
2223
<!-- NProgress -->
23-
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">
24+
<link href="~/vendors/nprogress/nprogress.css" rel="stylesheet">
2425
<!-- iCheck -->
2526
<link href="~/vendors/iCheck/skins/flat/green.css" rel="stylesheet">
2627
<!-- PNotify -->
@@ -29,6 +30,10 @@
2930
<link href="~/vendors/pnotify/dist/pnotify.nonblock.css" rel="stylesheet">
3031
<!-- Custom Theme Style -->
3132
<link href="~/css/custom.min.css" rel="stylesheet">
33+
<script>
34+
35+
var indexUrl = '@Url.Content("~/Index")';
36+
</script>
3237
</head>
3338
<body class="login">
3439
<div>
@@ -83,13 +88,13 @@
8388
<input type="password" class="form-control" placeholder="Password" required="" />
8489
</div>
8590
<div>
86-
<a class="btn btn-default submit" href="/Index">Submit</a>
91+
<a class="btn btn-default submit" href="~/Index">Submit</a>
8792
</div>
8893
<div class="clearfix"></div>
8994
<div class="separator">
9095
<p class="change_link">
9196
Already a member ?
92-
<a href="/Index" class="to_register"> Log in </a>
97+
<a href="~/Index" class="to_register"> Log in </a>
9398
</p>
9499
<div class="clearfix"></div>
95100
<br />

‎Appeon.DataStoreDemo.Web/Pages/Menu.cshtml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<div class="menu_section">
2+
<h3>General</h3>
3+
<ul class="nav side-menu">
4+
5+
<li><a href="~/Index"><i class="fa fa-home"></i> Home </a></li>
6+
<li>
7+
8+
<a><i class="fa fa-edit"></i> Orders Manager <span class="fa fa-chevron-down"></span></a>
9+
<ul class="nav child_menu">
10+
<li><a href="~/SalesOrders/Create">Add Order</a></li>
11+
<li><a href="~/SalesOrders/Index">Order History</a></li>
12+
</ul>
13+
</li>
14+
<!--<li><a href="about.html"><i class="fa fa-laptop"></i> About </a></li> -->
15+
</ul>
16+
</div>

‎Appeon.DataStoreDemo.Web/Pages/Profile.cshtml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<div class="top_nav">
2+
<div class="nav_menu">
3+
<nav>
4+
<div class="nav toggle">
5+
<a id="menu_toggle"><i class="fa fa-bars"></i></a>
6+
7+
</div>
8+
<ul class="nav navbar-nav navbar-right">
9+
10+
<li class="">
11+
<a href="javascript:;" class="user-profile dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
12+
<img src="~/images/user.png" alt="">Admin
13+
<span class=" fa fa-angle-down"></span>
14+
15+
</a>
16+
<ul class="dropdown-menu dropdown-usermenu pull-right">
17+
<li><a href="">Help</a></li>
18+
<li><a href="~/Login"><i class="fa fa-sign-out pull-right"></i> Log Out</a></li>
19+
</ul>
20+
</li>
21+
</ul>
22+
</nav>
23+
</div>
24+
</div>

‎Appeon.DataStoreDemo.Web/Pages/SalesOrders/Create.cshtml‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<meta charset="utf-8">
1313
<meta http-equiv="X-UA-Compatible" content="IE=edge">
1414
<meta name="viewport" content="width=device-width, initial-scale=1">
15+
<link rel="icon" href="~/images/favicon.ico" type="image/ico" />
1516

1617
<title>SnapObjects Asp.NetCore Demo</title>
1718

@@ -41,36 +42,22 @@
4142
<div class="main_container">
4243
<div class="col-md-3 left_col">
4344
<div class="left_col scroll-view">
44-
<div class="navbar nav_title" style="border: 0;">
45-
<a href="index.html" class="site_title">
46-
<img src="~/images/appeon.svg">
47-
<i class="fa fa-paw"></i> <span>Appeon Demo!</span>
48-
</a>
49-
</div>
50-
<div class="clearfix"></div>
51-
<!-- menu profile quick info -->
52-
<div class="profile clearfix">
53-
<div class="profile_pic">
54-
<img src="~/images/user.png" alt="..." class="img-circle profile_img">
55-
</div>
56-
<div class="profile_info">
57-
<span>Welcome,</span>
58-
<h2>Admin</h2>
59-
</div>
60-
</div>
45+
@Html.Partial("Header")
6146
<!-- /menu profile quick info -->
6247
<br />
6348
<!-- sidebar menu -->
6449
<div id="sidebar-menu" class="main_menu_side hidden-print main_menu">
65-
<script src="~/js/menu.js"></script>
50+
<!--<script src="~/js/menu.js"></script>-->
51+
@Html.Partial("Menu")
6652
</div>
6753
<!-- /sidebar menu -->
6854
<!-- /menu footer buttons -->
6955
<!-- /menu footer buttons -->
7056
</div>
7157
</div>
7258
<!-- top navigation -->
73-
<script src="~/js/profile.js"></script>
59+
<!--<script src="~/js/profile.js"></script>-->
60+
@Html.Partial("Profile")
7461
<!-- /top navigation -->
7562
<!-- page content -->
7663
<div class="right_col" role="main">

‎Appeon.DataStoreDemo.Web/Pages/SalesOrders/Edit.cshtml‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<meta charset="utf-8">
1313
<meta http-equiv="X-UA-Compatible" content="IE=edge">
1414
<meta name="viewport" content="width=device-width, initial-scale=1">
15+
<link rel="icon" href="~/images/favicon.ico" type="image/ico" />
1516

1617
<title>SnapObjects Asp.NetCore Demo</title>
1718

@@ -37,36 +38,22 @@
3738
<div class="main_container">
3839
<div class="col-md-3 left_col">
3940
<div class="left_col scroll-view">
40-
<div class="navbar nav_title" style="border: 0;">
41-
<a href="index.html" class="site_title">
42-
<img src="~/images/appeon.svg">
43-
<i class="fa fa-paw"></i> <span>Appeon Demo!</span>
44-
</a>
45-
</div>
46-
<div class="clearfix"></div>
47-
<!-- menu profile quick info -->
48-
<div class="profile clearfix">
49-
<div class="profile_pic">
50-
<img src="~/images/user.png" alt="..." class="img-circle profile_img">
51-
</div>
52-
<div class="profile_info">
53-
<span>Welcome,</span>
54-
<h2>Admin</h2>
55-
</div>
56-
</div>
41+
@Html.Partial("Header")
5742
<!-- /menu profile quick info -->
5843
<br />
5944
<!-- sidebar menu -->
6045
<div id="sidebar-menu" class="main_menu_side hidden-print main_menu">
61-
<script src="~/js/menu.js"></script>
46+
<!--<script src="~/js/menu.js"></script>-->
47+
@Html.Partial("Menu")
6248
</div>
6349
<!-- /sidebar menu -->
6450
<!-- /menu footer buttons -->
6551
<!-- /menu footer buttons -->
6652
</div>
6753
</div>
6854
<!-- top navigation -->
69-
<script src="~/js/profile.js"></script>
55+
<!--<script src="~/js/profile.js"></script>-->
56+
@Html.Partial("Profile")
7057
<!-- /top navigation -->
7158
<!-- page content -->
7259
<div class="right_col" role="main">

‎Appeon.DataStoreDemo.Web/Pages/SalesOrders/Index.cshtml‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<meta charset="utf-8">
1414
<meta http-equiv="X-UA-Compatible" content="IE=edge">
1515
<meta name="viewport" content="width=device-width, initial-scale=1">
16+
<link rel="icon" href="~/images/favicon.ico" type="image/ico" />
1617
<title>SnapObjects Asp.NetCore Demo</title>
1718

1819
<!-- Bootstrap -->
@@ -38,28 +39,13 @@
3839
<div class="main_container">
3940
<div class="col-md-3 left_col">
4041
<div class="left_col scroll-view">
41-
<div class="navbar nav_title" style="border: 0;">
42-
<a href="index.html" class="site_title">
43-
<img src="~/images/appeon.svg">
44-
<i class="fa fa-paw"></i> <span>Appeon Demo!</span>
45-
</a>
46-
</div>
47-
<div class="clearfix"></div>
48-
<!-- menu profile quick info -->
49-
<div class="profile clearfix">
50-
<div class="profile_pic">
51-
<img src="~/images/user.png" alt="..." class="img-circle profile_img">
52-
</div>
53-
<div class="profile_info">
54-
<span>Welcome,</span>
55-
<h2>Admin</h2>
56-
</div>
57-
</div>
42+
@Html.Partial("Header")
5843
<!-- /menu profile quick info -->
5944
<br />
6045
<!-- sidebar menu -->
6146
<div id="sidebar-menu" class="main_menu_side hidden-print main_menu">
62-
<script src="~/js/menu.js"></script>
47+
<!--<script src="~/js/menu.js"></script>-->
48+
@Html.Partial("Menu")
6349
</div>
6450
<!-- /sidebar menu -->
6551
<!-- /menu footer buttons -->
@@ -68,7 +54,8 @@
6854
</div>
6955

7056
<!-- top navigation -->
71-
<script src="~/js/profile.js"></script>
57+
<!--<script src="~/js/profile.js"></script>-->
58+
@Html.Partial("Profile")
7259
<!-- /top navigation -->
7360
<!-- page content -->
7461
<div class="right_col" role="main">

‎Appeon.DataStoreDemo.Web/Startup.cs‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ public void ConfigureServices(IServiceCollection services)
2727

2828
services.AddDataContext<OrderContext>(m => m.UseSqlServer(Configuration["ConnectionStrings:AdventureWorks2012"]));
2929

30+
//services.Configure<CookiePolicyOptions>(options =>
31+
//{
32+
// // This lambda determines whether user consent for non-essential cookies is needed for a given request.
33+
// options.CheckConsentNeeded = context => true;
34+
// options.MinimumSameSitePolicy = SameSiteMode.None;
35+
//});
3036
services.AddScoped<ISalesOrderService, SalesOrderService>();
3137
services.AddScoped<IOrderReportService, OrderReportService>();
3238
services.AddScoped<IGenericServiceFactory, GenericServiceFactory>();
@@ -43,6 +49,10 @@ public void ConfigureServices(IServiceCollection services)
4349

4450
});
4551

52+
//services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1).AddRazorPagesOptions(option => {
53+
// //option.RootDirectory = "/Pages";
54+
// //option.Conventions.AddPageRoute("/Pages", "/Login");
55+
//});
4656
services.AddAntiforgery(o => o.HeaderName = "XSRF-TOKEN");
4757
services.AddSession();
4858
}
@@ -71,6 +81,24 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
7181
{
7282
endpoints.MapRazorPages();
7383
});
84+
85+
//app.UseSession();
86+
//if (env.IsDevelopment())
87+
//{
88+
// app.UseDeveloperExceptionPage();
89+
//}
90+
//else
91+
//{
92+
// app.UseExceptionHandler("/Error");
93+
// // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
94+
// app.UseHsts();
95+
//}
96+
97+
//app.UseHttpsRedirection();
98+
//app.UseStaticFiles();
99+
//app.UseCookiePolicy();
100+
101+
//app.UseMvc();
74102
}
75103
}
76104
}

‎Appeon.DataStoreDemo.Web/appsettings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
}
88
},
99
"ConnectionStrings": {
10-
"AdventureWorks2012": "Data Source=127.0.0.1; Initial Catalog=AdventureWorks2012; Integrated Security=False; User ID=sa; Password=123456; Pooling=True; Min Pool Size=0; Max Pool Size=100; ApplicationIntent=ReadWrite"
10+
"AdventureWorks2012": "Data Source=127.0.0.1;Initial Catalog=AdventureWorks2012;Integrated Security=False;User ID=sa;Password=Appeon123!@#;Pooling=True;Min Pool Size=0;Max Pool Size=100;ApplicationIntent=ReadWrite"
1111
}
1212
}

0 commit comments

Comments
 (0)