From dd12564a81ab02c6effdd8f7887e18f029332ce3 Mon Sep 17 00:00:00 2001 From: mmrbnjd Date: Fri, 3 May 2024 18:18:38 +0330 Subject: [PATCH] chat --- Back/Controllers/TicketController.cs | 10 +- Back/Services/servUser.cs | 2 +- Shared/DTOs/CTicketDto.cs | 2 + TaxPayerFull/Layout/LTicket.razor | 25 +- TaxPayerFull/Layout/Lchat.razor | 32 +++ TaxPayerFull/Layout/PanelLayout.razor | 1 + TaxPayerFull/Layout/PanelNavMenu.razor | 8 +- TaxPayerFull/Pages/UserPanel/Ticket.razor | 134 +++++++--- TaxPayerFull/wwwroot/assets/css/chatstyle.css | 247 ++++++++++++++++++ TaxPayerFull/wwwroot/index.html | 2 +- 10 files changed, 413 insertions(+), 50 deletions(-) create mode 100644 TaxPayerFull/Layout/Lchat.razor create mode 100644 TaxPayerFull/wwwroot/assets/css/chatstyle.css diff --git a/Back/Controllers/TicketController.cs b/Back/Controllers/TicketController.cs index 9be429f..d7b75b0 100644 --- a/Back/Controllers/TicketController.cs +++ b/Back/Controllers/TicketController.cs @@ -60,7 +60,15 @@ namespace Back.Controllers var UserID = claim.Value; var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID)); - item.CompanyID = user.RolUsers.First().CompanyID.ToString(); + if (string.IsNullOrEmpty(item.CompanyID)) + { + item.CompanyID = user.RolUsers.First().CompanyID.ToString(); + } + else + { + if(!await _servCompany.ExsistCompanyByComoanyIDandUserID(Convert.ToInt32(item.CompanyID), Convert.ToInt32(UserID))) + item.CompanyID = user.RolUsers.First().CompanyID.ToString(); + } var res = await _servTicket.NewTicket(item); return Ok(res != null); } diff --git a/Back/Services/servUser.cs b/Back/Services/servUser.cs index bcedd33..955b38d 100644 --- a/Back/Services/servUser.cs +++ b/Back/Services/servUser.cs @@ -129,7 +129,7 @@ namespace Back.Services //} ret.Company = new CompanyAuthenticationDTO { - ID = user.RolUsers.First().ID, + ID = user.RolUsers.First().CompanyID, Name = user.RolUsers.First().Company.Name, IsAdmin = user.RolUsers.First().IsAdmin, Logo = user.RolUsers.First().Company.Logo == null ? null : Convert.ToBase64String(user.RolUsers.First().Company.Logo) diff --git a/Shared/DTOs/CTicketDto.cs b/Shared/DTOs/CTicketDto.cs index 1e3b37c..11f49a3 100644 --- a/Shared/DTOs/CTicketDto.cs +++ b/Shared/DTOs/CTicketDto.cs @@ -11,8 +11,10 @@ namespace Shared.DTOs { public string? CompanyID { get; set; } [Required] + [MinLength(3,ErrorMessage ="لطفا بیشتر بنویسید")] public string Title { get; set; } [Required] + [MinLength(3, ErrorMessage = "لطفا بیشتر بنویسید")] public string Text { get; set; } } } diff --git a/TaxPayerFull/Layout/LTicket.razor b/TaxPayerFull/Layout/LTicket.razor index b35bd86..2fdcbee 100644 --- a/TaxPayerFull/Layout/LTicket.razor +++ b/TaxPayerFull/Layout/LTicket.razor @@ -1,14 +1,12 @@ @using Shared.DTOs - + -
- This is a vertically centered modal. -
+ - + @@ -22,17 +20,26 @@ @Ticket.MsgStatus - + + @if (!string.IsNullOrEmpty(Ticket.EndDate)) + { +

تاریخ شروع
@Ticket.CreateDate

- @if (!string.IsNullOrEmpty(Ticket.EndDate)) - { +

تاریخ پایان
@Ticket.EndDate

} - + else + { + +
+

تاریخ شروع @Ticket.CreateDate

+
+ } + diff --git a/TaxPayerFull/Layout/Lchat.razor b/TaxPayerFull/Layout/Lchat.razor new file mode 100644 index 0000000..8abef59 --- /dev/null +++ b/TaxPayerFull/Layout/Lchat.razor @@ -0,0 +1,32 @@ +
+ +
+
+ Today at 11:41 +
+
+ Hey, man! What's up, Mr Stark? 👋 +
+ +
+ Kid, where'd you come from? +
+ + +
+ Field trip! 🤣 +
+
+ حل شد 🤣 +
+ +
+ مشکل ما چی شد +
+ +
+
+ +
+
+ diff --git a/TaxPayerFull/Layout/PanelLayout.razor b/TaxPayerFull/Layout/PanelLayout.razor index a0d5611..447807a 100644 --- a/TaxPayerFull/Layout/PanelLayout.razor +++ b/TaxPayerFull/Layout/PanelLayout.razor @@ -21,6 +21,7 @@ + diff --git a/TaxPayerFull/Layout/PanelNavMenu.razor b/TaxPayerFull/Layout/PanelNavMenu.razor index d464e36..2364115 100644 --- a/TaxPayerFull/Layout/PanelNavMenu.razor +++ b/TaxPayerFull/Layout/PanelNavMenu.razor @@ -45,13 +45,13 @@
پشتیبانی
-
  • + @*
  • سفارشات
     -
    • -
  • +
    • *@ +
  • تنظیمات
    @@ -61,7 +61,7 @@ @code{ - string[] cssActionItem = { "active", "", "", "", "", "", "", "" }; + string[] cssActionItem = { "active", "", "", "", "", "", "" }; } @functions{ diff --git a/TaxPayerFull/Pages/UserPanel/Ticket.razor b/TaxPayerFull/Pages/UserPanel/Ticket.razor index 43cf275..471790e 100644 --- a/TaxPayerFull/Pages/UserPanel/Ticket.razor +++ b/TaxPayerFull/Pages/UserPanel/Ticket.razor @@ -4,6 +4,27 @@ @using Shared.DTOs.Serch @layout PanelLayout @inject HttpClientController hc; +@inject UserAuthenticationDTO userinfo + + +
    +
    + + +
    +
    +
    + + +
    +
    +     + + + + +     +

    متفرقه / پشتیبانی @@ -25,7 +46,7 @@
    • -
      +
      @@ -33,24 +54,24 @@
      - - + +
      - +
      - +
      • - +

    - +
      @@ -90,16 +111,20 @@ @code { + private Modal modal = default!; // alert AlertColor alertColor = AlertColor.Primary; IconName alertIconName = IconName.CheckCircleFill; bool Hidealert = true; string alertMessage = ""; - + #region bind public string? TicketID { get; set; } public string? Title { get; set; } + public string? newTitle { get; set; } + public string? newtext { get; set; } + #endregion [Parameter, SupplyParameterFromQuery] public int? PageIndex { get; set; } @@ -108,35 +133,76 @@ protected override async Task OnParametersSetAsync() { if (PageIndex == null) PageIndex = 1; - request = new PagingDto(2, 10, new List() - { - new TicketDTO - { - CreateDate="1402/08/05", -CreateTime="20:10:10", -EndDate="1402/08/08", -EndTime="08:10:10", -MsgStatus="خوانده شده/ در حال بررسی", -Status=StatusTicket.optout, -TicketID=1, -Title="این یک تست برای یک تیکت است" - }, - new TicketDTO - { - CreateDate="1402/08/05", -CreateTime="20:10:10", -EndDate="1402/08/08", -EndTime="08:10:10", -MsgStatus="خوانده شده/ در حال بررسی", -Status=StatusTicket.optout, -TicketID=1, -Title="این یک تست برای یک تیکت است" - } - }); + await Search(PageIndex.Value); await base.OnParametersSetAsync(); } private async Task Submit() { - var eeee = Title + " " + Title; + await Search(1); } } +@functions { + private void ShowSuccessAlert(string msg) + { + Hidealert = false; + alertColor = AlertColor.Success; + alertIconName = IconName.CheckCircleFill; + alertMessage = msg; + } + + private void ShowDangerAlert(string msg) + { + Hidealert = false; + alertColor = AlertColor.Danger; + alertIconName = IconName.ExclamationTriangleFill; + alertMessage = msg; + } + private async Task Search(int pi) + { + var rsp = await hc.Post("Ticket/GetAll", new ItemSerchGetTicket + { + PageIndex = pi, + PageSize = 10, + TicketID = string.IsNullOrEmpty(TicketID) ? null : Convert.ToInt32(TicketID), + Title = Title + + }); + if (rsp.IsSuccessStatusCode) + { + request = await rsp.Content.ReadFromJsonAsync>(); + } + else + { + ShowDangerAlert("خطایی در اجرای عملیات رخ داده"); + } + } + private async Task OnShowModalClick() + { + await modal.ShowAsync(); + } + private async Task OnHideModalClick() + { + await modal.HideAsync(); + } + private async Task OnClickNewTicket() + { + var rsp = await hc.Post("Ticket/NewTicket", new CTicketDto + { + CompanyID = userinfo.Company.ID.ToString(), + Text = newtext, + Title = newTitle + }); + if (rsp.IsSuccessStatusCode) + { + ShowSuccessAlert("درخواست شما با موفقیت ثبت شد"); + newtext = newTitle = string.Empty; + await Search(1); + } + else + { + ShowDangerAlert("خطایی در اجرای عملیات رخ داده"); + } + await modal.HideAsync(); + + } +} \ No newline at end of file diff --git a/TaxPayerFull/wwwroot/assets/css/chatstyle.css b/TaxPayerFull/wwwroot/assets/css/chatstyle.css new file mode 100644 index 0000000..8f0bdb9 --- /dev/null +++ b/TaxPayerFull/wwwroot/assets/css/chatstyle.css @@ -0,0 +1,247 @@ +@import url("https://fonts.googleapis.com/css?family=Red+Hat+Display:400,500,900&display=swap"); +body, html { + font-family: Red hat Display, sans-serif; + font-weight: 400; + line-height: 1.25em; + letter-spacing: 0.025em; + color: #333; + background: #F7F7F7; +} + +.center { + position: absolute; + top: 50%; + left: calc(50% + 12rem); + transform: translate(-50%, -50%); +} + +.pic { + width: 4rem; + height: 4rem; + background-size: cover; + background-position: center; + border-radius: 50%; +} + +.contact { + position: relative; + margin-bottom: 1rem; + padding-left: 5rem; + height: 4.5rem; + display: flex; + flex-direction: column; + justify-content: center; +} +.contact .pic { + position: absolute; + left: 0; +} +.contact .name { + font-weight: 500; + margin-bottom: 0.125rem; +} +.contact .message, .contact .seen { + font-size: 0.9rem; + color: #999; +} +.contact .badge { + box-sizing: border-box; + position: absolute; + width: 1.5rem; + height: 1.5rem; + text-align: center; + font-size: 0.9rem; + padding-top: 0.125rem; + border-radius: 1rem; + top: 0; + left: 2.5rem; + background: #333; + color: white; +} + +.contacts { + position: absolute; + top: 50%; + left: 0; + transform: translate(-6rem, -50%); + width: 24rem; + height: 32rem; + padding: 1rem 2rem 1rem 1rem; + box-sizing: border-box; + border-radius: 1rem 0 0 1rem; + cursor: pointer; + background: white; + box-shadow: 0 0 8rem 0 rgba(0, 0, 0, 0.1), 2rem 2rem 4rem -3rem rgba(0, 0, 0, 0.5); + transition: transform 500ms; +} +.contacts h2 { + margin: 0.5rem 0 1.5rem 5rem; +} +.contacts .fa-bars { + position: absolute; + left: 2.25rem; + color: #999; + transition: color 200ms; +} +.contacts .fa-bars:hover { + color: #666; +} +.contacts .contact:last-child { + margin: 0; +} +.contacts:hover { + transform: translate(-23rem, -50%); +} + +.chat { + position: relative; + display: flex; + flex-direction: column; + justify-content: space-between; + + z-index: 2; + box-sizing: border-box; + border-radius: 1rem; + background: white; + box-shadow: 0 0 8rem 0 rgba(0, 0, 0, 0.1), 0rem 2rem 4rem -3rem rgba(0, 0, 0, 0.5); +} +.chat .contact.bar { + flex-basis: 3.5rem; + flex-shrink: 0; + margin: 1rem; + box-sizing: border-box; +} +.chat .messages { + padding: 1rem; + background: #F7F7F7; + flex-shrink: 2; + overflow-y: auto; + box-shadow: inset 0 2rem 2rem -2rem rgba(0, 0, 0, 0.05), inset 0 -2rem 2rem -2rem rgba(0, 0, 0, 0.05); +} +.chat .messages .time { + font-size: 0.8rem; + background: #EEE; + padding: 0.25rem 1rem; + border-radius: 2rem; + color: #999; + width: -webkit-fit-content; + width: -moz-fit-content; + width: fit-content; + margin: 0 auto; +} +.chat .messages .message { + box-sizing: border-box; + padding: 0.5rem 1rem; + margin: 1rem; + background: #FFF; + border-radius: 1.125rem 1.125rem 1.125rem 0; + min-height: 2.25rem; + width: -webkit-fit-content; + width: -moz-fit-content; + width: fit-content; + max-width: 66%; + box-shadow: 0 0 2rem rgba(0, 0, 0, 0.075), 0rem 1rem 1rem -1rem rgba(0, 0, 0, 0.1); +} +.chat .messages .message.parker { + margin: 1rem 1rem 1rem auto; + border-radius: 1.125rem 1.125rem 0 1.125rem; + background: #333; + color: white; + +} +.chat .messages .message .typing { + display: inline-block; + width: 0.8rem; + height: 0.8rem; + margin-right: 0rem; + box-sizing: border-box; + background: #ccc; + border-radius: 50%; +} +.chat .messages .message .typing.typing-1 { + -webkit-animation: typing 3s infinite; + animation: typing 3s infinite; +} +.chat .messages .message .typing.typing-2 { + -webkit-animation: typing 3s 250ms infinite; + animation: typing 3s 250ms infinite; +} +.chat .messages .message .typing.typing-3 { + -webkit-animation: typing 3s 500ms infinite; + animation: typing 3s 500ms infinite; +} +.chat .input { + box-sizing: border-box; + flex-basis: 4rem; + flex-shrink: 0; + display: flex; + align-items: center; + padding: 0 0.5rem 0 1.5rem; +} +.chat .input i { + font-size: 1.5rem; + margin-right: 1rem; + color: #666; + cursor: pointer; + transition: color 200ms; +} +.chat .input i:hover { + color: #333; +} +.chat .input input { + border: none; + background-image: none; + background-color: white; + padding: 0.5rem 1rem; + margin-right: 1rem; + border-radius: 1.125rem; + flex-grow: 2; + box-shadow: 0 0 1rem rgba(0, 0, 0, 0.1), 0rem 1rem 1rem -1rem rgba(0, 0, 0, 0.2); + font-family: Red hat Display, sans-serif; + font-weight: 400; + letter-spacing: 0.025em; +} +.chat .input input:placeholder { + color: #999; +} + +@-webkit-keyframes typing { + 0%, 75%, 100% { + transform: translate(0, 0.25rem) scale(0.9); + opacity: 0.5; + } + 25% { + transform: translate(0, -0.25rem) scale(1); + opacity: 1; + } +} + +@keyframes typing { + 0%, 75%, 100% { + transform: translate(0, 0.25rem) scale(0.9); + opacity: 0.5; + } + 25% { + transform: translate(0, -0.25rem) scale(1); + opacity: 1; + } +} +.pic.stark { + background-image: url("https://vignette.wikia.nocookie.net/marvelcinematicuniverse/images/7/73/SMH_Mentor_6.png"); +} + +.pic.banner { + background-image: url("https://vignette.wikia.nocookie.net/marvelcinematicuniverse/images/4/4f/BruceHulk-Endgame-TravelingCapInPast.jpg"); +} + +.pic.thor { + background-image: url("https://vignette.wikia.nocookie.net/marvelcinematicuniverse/images/9/98/ThorFliesThroughTheAnus.jpg"); +} + +.pic.danvers { + background-image: url("https://vignette.wikia.nocookie.net/marvelcinematicuniverse/images/0/05/HeyPeterParker.png"); +} + +.pic.rogers { + background-image: url("https://vignette.wikia.nocookie.net/marvelcinematicuniverse/images/7/7c/Cap.America_%28We_Don%27t_Trade_Lives_Vision%29.png"); +} \ No newline at end of file diff --git a/TaxPayerFull/wwwroot/index.html b/TaxPayerFull/wwwroot/index.html index 677f50e..aaee991 100644 --- a/TaxPayerFull/wwwroot/index.html +++ b/TaxPayerFull/wwwroot/index.html @@ -9,7 +9,7 @@ - +