Skip to content

Commit ee63f58

Browse files
authored
Merge pull request #10 from SenthilarasuBalu/EJ2CORE-995-WebmailShowCase
feature(EJ2CORE-995): Rendered Appbar, SideBar, Avatar, Splitter, Mention components.
2 parents 9f676cd + 18b7c63 commit ee63f58

15 files changed

+17042
-16011
lines changed

Helpers/MvcLaunchPageExtension.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using Microsoft.AspNetCore.Hosting;
88
using Microsoft.AspNetCore.Mvc;
99
using Microsoft.AspNetCore.Mvc.ViewFeatures;
10-
//using Microsoft.AspNetCore.Http.Internal;
1110

1211
namespace EJ2CoreSampleBrowser.Helpers
1312
{

Helpers/ProductXmlDataEngine.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.IO;
77
using Manoli.Utils.CSharpFormat;
88
using System.Net;
9-
//using Microsoft.Extensions.PlatformAbstractions;
109
using Microsoft.AspNetCore.Hosting.Internal;
1110
using Microsoft.AspNetCore.Http;
1211
using Microsoft.AspNetCore.Hosting;

Helpers/SampleBrowserHelper.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using Microsoft.AspNetCore.Mvc;
66
using Microsoft.AspNetCore.Html;
77
using Microsoft.AspNetCore.Http;
8-
//using Microsoft.AspNetCore.Http.Internal;
98
using Microsoft.Extensions.DependencyInjection;
109
using Microsoft.AspNetCore.Razor.TagHelpers;
1110
using Microsoft.AspNetCore.Mvc.ViewFeatures;

Helpers/SourceTabActionResult.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using Microsoft.AspNetCore.Mvc;
66
using Microsoft.AspNetCore.Html;
77
using Microsoft.AspNetCore.Http;
8-
//using Microsoft.Extensions.PlatformAbstractions;
98
using Microsoft.AspNetCore.Hosting;
109
using EJ2CoreSampleBrowser.Helpers.BrowserClasses;
1110

Nuget.Config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<packageSources>
44
<clear />
55
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
6-
<add key="ej2nuget" value="http://nexus.syncfusion.com/repository/ej2-nuget-production/" />
6+
<add key="ej2nuget" value="https://nexus.syncfusion.com/repository/ej2-nuget-production/" />
77
</packageSources>
88

99
<packageRestore>

Outlook_Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>

Views/Home/Home.cshtml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
}
1818

1919
<div class='row content'>
20-
<div class='sidebar' style='height:100%' role='complementary'>
20+
<ejs-sidebar id="sidebar" enableGestures="false" width="280px" target=".content-wrapper" showBackdrop="false" type="Push" style='height: 100%' role='complementary'>
21+
<e-content-template>
2122
<div style='background-color:#fff; width:100%;height:100%'>
2223
<div class="search-div">
2324
<div class="search-device-section">
@@ -45,8 +46,10 @@
4546
</div>
4647
</aside>
4748
</div>
48-
</div>
49-
<div class="headerContent" style="z-index: 112; height: 100%; background-color: #f4f4f4; width: 330px;right:0; position: absolute">
49+
</e-content-template>
50+
</ejs-sidebar>
51+
<ejs-sidebar id="headerSidebar" enableGestures="false" position="Right" width="330px" target=".content-wrapper" type="Push" style="z-index: 112; height: 100%; background-color: #f4f4f4; width: 330px;right:0; position: absolute">
52+
<e-content-template>
5053
<div style="right:20px;position: absolute; top: 35px">
5154
<ejs-button id="btnCloseButton"></ejs-button>
5255
</div>
@@ -130,7 +133,8 @@
130133
</a>
131134
</div>
132135
</div>
133-
</div>
136+
</e-content-template>
137+
</ejs-sidebar>
134138
<div class='content-wrapper' role='main'>
135139
<div class='content' style='height:100%'>
136140
<div class="e-roottools" style='background-color:#fff; width:100%;color:white'>
@@ -165,8 +169,9 @@
165169
</e-toolbar-items>
166170
</ejs-toolbar>
167171
</div>
168-
<div class='maincontent_pane' style='background-color:#fff; width:100%;height:calc(100% - 40px);color:white'>
169-
<div class='message-pane customScrollBar' style='overflow: auto'>
172+
<div class='maincontent_pane' style='background-color:#f4f9fd; width:100%;height:100%'>
173+
<div id="splitter"></div>
174+
<div id="list-pane-div" class='message-pane customScrollBar' style='overflow: auto'>
170175
<div class="filter-section">
171176
<div style='float: left; margin-top: 5px;'>
172177
<span id="spanFilterText" style='font-size: 22px;color:#333333'>Inbox</span>

Views/Home/Index.cshtml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
ViewData["Title"] = "Index";
44
}
55
<div class='outlook-container'>
6-
<div class='header navbar'>
7-
<div class='container-fluid' style="font-size: 0; white-space: nowrap; line-height: normal">
6+
<ejs-appbar colorMode="Dark" id="appbar" style="font-size: 0; white-space: nowrap; line-height: normal">
7+
<e-content-template>
88
<div style="display: table-cell">
99
<div class='home-btn'>
1010
<span class='ej-icon-Bento' style='font-size: 18px;'></span>
@@ -31,15 +31,15 @@
3131
</div>
3232
</div>
3333
<div id="profile-div" class="header-right-pane">
34-
<div style="right: 0px;position: absolute;top: 3px;pointer-events: none;margin-right: 5px;">
35-
<div class='logo logo-style1 profile-pic'></div>
36-
</div>
37-
<div style="margin-right: 44px; pointer-events: none;">
34+
<div style="pointer-events: none;">
3835
<ejs-button id="btnLoginName" cssClass="btn-profile"></ejs-button>
3936
</div>
37+
<div style="margin-right: 5px; pointer-events: none;">
38+
<span class="e-avatar e-avatar-large e-avatar-circle" style="background-image: url('/content/images/1.png');height: 40px; width: 40px;"></span>
39+
</div>
4040
</div>
41-
</div>
42-
</div>
41+
</e-content-template>
42+
</ejs-appbar>
4343
<div id="content-area" style="height: 100%">
4444
</div>
4545
</div>

Views/Shared/_Layout.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<link rel="shortcut icon" href="~/favicon.ico" />
1313
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
14-
<link href="~/content/styles.css" rel="stylesheet" />
14+
<link href="~/content/fabric.css" rel="stylesheet" />
1515
<link href="~/content/Outlook Icons/style.css" rel="stylesheet" />
1616
<link href="~/content/css/outlook.css" rel="stylesheet" />
1717
<script type="text/javascript">

wwwroot/content/css/outlook.css

Lines changed: 66 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,6 @@ html, body {
2929

3030
/* Top Header Customization */
3131

32-
.header {
33-
position: relative;
34-
display: block;
35-
z-index: 11;
36-
background: #222;
37-
}
38-
39-
.header.navbar {
40-
border-width: 0;
41-
border-radius: 0;
42-
margin-bottom: 0;
43-
}
44-
45-
.header.navbar.head-pane-hide .header-right-pane {
46-
display: none;
47-
}
48-
4932
.header-right-pane {
5033
display: table-cell;
5134
text-align: right;
@@ -105,22 +88,23 @@ html, body {
10588
left: -280px;
10689
}
10790

108-
.sidebar {
91+
#sidebar {
10992
position: absolute;
110-
top: 50px;
11193
bottom: 0;
11294
z-index: 10006;
11395
width: 280px;
11496
left: 0px;
11597
border-right: 1px solid #e5e3e3;
98+
overflow-y: hidden;
11699
}
117100

118101
.content-wrapper {
119102
margin: 0;
120-
left: 280px;
103+
left: 0px;
121104
height: 100%;
122-
position:absolute;
123-
width:calc(100% - 280px);
105+
position: absolute;
106+
width: 100%;
107+
overflow: hidden;
124108
}
125109
.content-wrapper > .content {
126110
z-index: 7;
@@ -149,14 +133,18 @@ html, body {
149133
}
150134

151135
.reading-pane {
152-
width:calc(100% - 374px);
136+
width: 100%;
153137
background-color:#fff;
154138
height:calc(100% - 40px);
155-
left:374px;
139+
left: 0px;
156140
position:absolute;
157141
overflow: auto;
158142
}
159143

144+
#list-pane-div {
145+
width: 100%;
146+
}
147+
160148
.reading-pane.new-mail {
161149
overflow: hidden;
162150
}
@@ -981,11 +969,6 @@ html, body {
981969
height: 100%;
982970
}
983971

984-
.e-dlg-overlay {
985-
background-color: white;
986-
opacity: 0.65;
987-
}
988-
989972
.dlg-content-style {
990973
padding: 15px;
991974
background-color: #f4f4f4;
@@ -1165,22 +1148,6 @@ html, body {
11651148
z-index: 100001;
11661149
}
11671150

1168-
.overlay-element {
1169-
width: 100%;
1170-
height: calc(100% + 50px);
1171-
position: absolute;
1172-
left: 0px; right: 0px;
1173-
top: 0px; bottom: 0px;
1174-
background-color: rgb(51,51,51);
1175-
opacity: 0.4;
1176-
z-index: 10005;
1177-
display: none;
1178-
}
1179-
1180-
.overlay-element.show1 {
1181-
display: block;
1182-
}
1183-
11841151
.popup-subjectstyle {
11851152
width:250px;
11861153
}
@@ -1413,7 +1380,7 @@ html, body {
14131380

14141381
@media screen and (min-width:1200px) {
14151382
.row.content.show-header-content .content-wrapper {
1416-
width:calc(100% - 610px);
1383+
width: 100%;
14171384
}
14181385
}
14191386

@@ -1456,8 +1423,10 @@ html, body {
14561423
#toolbar_mobile {
14571424
display: block;
14581425
}
1459-
.header.navbar {
1460-
display: none;
1426+
/* To Animate Appbar */
1427+
#appbar {
1428+
animation: hideAppBar 0.5s ease-out;
1429+
height: 0px;
14611430
}
14621431
.outlook-container {
14631432
height: 100%;
@@ -1503,6 +1472,14 @@ html, body {
15031472
}
15041473

15051474
}
1475+
@keyframes hideAppBar {
1476+
from {
1477+
height: 48px;
1478+
}
1479+
to {
1480+
height: 0px;
1481+
}
1482+
}
15061483

15071484
@media screen and (max-width:605px) {
15081485
.row.content.show-message-pane #toolbar_mobile .e-toolbar-item.tb-item-back {
@@ -1684,4 +1661,45 @@ html, body {
16841661
}
16851662
#rp-to {
16861663
font-size: 12px;
1664+
}
1665+
/* Overriding appbar styles to achieve exact appbar alignment*/
1666+
#appbar {
1667+
padding: 0%;
1668+
}
1669+
#profile-div {
1670+
display: flex;
1671+
}
1672+
.header-right-pane {
1673+
height: 50px;
1674+
display: flex;
1675+
justify-content: center;
1676+
align-items: center;
1677+
}
1678+
/* Overriding the default positon to achieve exact alignment */
1679+
#reading-pane-div {
1680+
position: relative;
1681+
}
1682+
#list-pane-div {
1683+
position: relative;
1684+
}
1685+
.msg-top-margin {
1686+
top: 40px;
1687+
}
1688+
/* Overriding splitter styles to remove resize handler Icon */
1689+
.e-splitter .e-split-bar.e-split-bar-horizontal .e-resize-handler::before {
1690+
display: none;
1691+
}
1692+
/* Overriding splitter styles to make splitBar transparent */
1693+
#splitter.e-splitter .e-split-bar.e-split-bar-horizontal,
1694+
#splitter.e-splitter .e-split-bar.e-split-bar-horizontal.e-split-bar-hover,
1695+
.e-splitter .e-split-bar.e-split-bar-horizontal.e-split-bar-active {
1696+
background-color: transparent;
1697+
}
1698+
/* Styles for the of Right-SideBar Content */
1699+
#headerSidebar {
1700+
background-color: #f4f4f4;
1701+
}
1702+
#headerSidebar .text-content {
1703+
font-size: 28px;
1704+
font-family: "Segoe UI Light","Segoe UI",Segoe,Tahoma,Helvetica,Arial,Sans-Serif;
16871705
}

0 commit comments

Comments
 (0)