Pre-release Roma

LINServices · Mar 15, 2024 · 20618ce · 20618ce
1 parent 8134555
commit 20618ce
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 26 deletions.
diff --git a/LIN.Allo/LIN.Allo.Client/LIN.Allo.Client.csproj b/LIN.Allo/LIN.Allo.Client/LIN.Allo.Client.csproj
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.3" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/LIN.Allo/LIN.Allo.Client/Pages/Chat.razor b/LIN.Allo/LIN.Allo.Client/Pages/Chat.razor
@@ -128,7 +128,7 @@
                             @if (IsConversationsLoad)
                             {
                                 // Si no hay conversaciones.
-                                if (ConversationsObserver.Data.Values.Count <= 0 && !IsSearching)
+                                if (ConversationsObserver.Data.Count <= 0 && !IsSearching)
                                 {
                                     <div class="px-5">
                                         <div class="flex rounded-lg justify-center items-center border-dashed border-2 border-gray-300 w-full py-10 mt-3 dark:border-zinc-600">
@@ -168,9 +168,9 @@
                                 // Renderizar las conversaciones.
                                 else
                                 {
-                                    foreach (var conversation in ConversationsObserver.Data.Values)
+                                    foreach (var conversation in ConversationsObserver.Data)
                                     {
-                                        <Control Member="@(conversation)" OnClick="Go" IsSelect=@(SelectedConversation?.ID == conversation.Conversation.ID) />
+                                        <Control Member="@(conversation.Item2)" OnClick="Go" IsSelect=@(SelectedConversation?.ID == conversation.Item2.Conversation.ID) />
                                     }
                                 }
 
@@ -205,7 +205,7 @@
                 @* Mostrar el chat *@
                 @if (RealTime.Hub != null && SelectedConversation != null)
                 {
-                    <ChatSection Drawer="MemberDrawer" Iam="ConversationsObserver.Get(SelectedConversation.ID)" OnBackPress="Nav" />
+                    <ChatSection EmmaClick="OpenEmma" Drawer="MemberDrawer" Iam="ConversationsObserver.Get(SelectedConversation.ID)" OnBackPress="Nav" />
                 }
 
                 // No esta seleccionado.

diff --git a/LIN.Allo/LIN.Allo.Client/Pages/Chat.razor.cs b/LIN.Allo/LIN.Allo.Client/Pages/Chat.razor.cs
@@ -453,9 +453,9 @@ public async void Select(int chat, bool force = false)
 
 
         // Consulta al cache
-        var cache = (from C in ConversationsObserver.Data.Values
-                     where C.Conversation.ID == chat
-                     select C).FirstOrDefault();
+        var cache = (from C in ConversationsObserver.Data
+                     where C.Item2.Conversation.ID == chat
+                     select C).FirstOrDefault().Item2;
 
 
         if (cache == null)
@@ -521,4 +521,8 @@ void Close()
         navigationManager.NavigateTo("/");
     }
 
+    public void RefreshUI()
+    {
+        StateHasChanged();
+    }
 }
diff --git a/LIN.Allo/LIN.Allo.Client/Pages/Login.razor b/LIN.Allo/LIN.Allo.Client/Pages/Login.razor
@@ -62,6 +62,7 @@
                                                                   class="font-medium text-current-500 hover:text-current-800"
                                                                   href="/register">Regístrate</a> @* *@para iniciar a disfrutar
                                 </p>
+
                             </div>
 
                         </div>

diff --git a/LIN.Allo/LIN.Allo.Client/Pages/Sections/ChatSection.razor b/LIN.Allo/LIN.Allo.Client/Pages/Sections/ChatSection.razor
@@ -47,19 +47,12 @@
     @* Botones *@
     <div class="flex justify-center items-center">
 
-        @* Buscar *@
-        <div>
-            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="fill-[#263238] dark:fill-gray-100 hover:fill-current-500">
-                <path d="M15.9 14.3H15l-.3-.3c1-1.1 1.6-2.7 1.6-4.3 0-3.7-3-6.7-6.7-6.7S3 6 3 9.7s3 6.7 6.7 6.7c1.6 0 3.2-.6 4.3-1.6l.3.3v.8l5.1 5.1 1.5-1.5-5-5.2zm-6.2 0c-2.6 0-4.6-2.1-4.6-4.6s2.1-4.6 4.6-4.6 4.6 2.1 4.6 4.6-2 4.6-4.6 4.6z"></path>
+        @* Emma *@
+        <button @onclick="EmmaClick" class="h-4 w-4 rounded-full visible lg:hidden">
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" version="1.1" class="h-full w-full fill-current-500 hover:fill-current-600">
+                <path d="M0 0 C4.16347012 3.4964018 8.08707008 7.22822917 12 11 C12.71800781 11.65484375 13.43601563 12.3096875 14.17578125 12.984375 C20.46536293 18.88322115 25.23469978 25.86116307 30 33 C30.63035156 33.93457031 31.26070312 34.86914062 31.91015625 35.83203125 C35.7340925 41.92071334 38.54590444 48.33466425 41.1875 55 C41.5086377 55.78705322 41.82977539 56.57410645 42.16064453 57.38500977 C48.6288079 74.43121085 49.67462486 91.80175574 49.57641602 109.8659668 C49.56242094 113.45778943 49.59692837 117.04706214 49.63476562 120.63867188 C49.68776871 136.25709347 48.87201094 148.4825821 38.23046875 160.78125 C28.96355273 169.99947819 17.860369 174.80542246 4.875 175.25 C-10.19188737 175.04556462 -21.57652502 168.42347498 -32 158 C-32.49886719 158.43570313 -32.99773437 158.87140625 -33.51171875 159.3203125 C-48.45835388 171.71770106 -66.90325934 176.07394758 -86 175 C-106.74423628 172.30621881 -124.68493664 162.80990927 -137.6875 146.3125 C-149.37303444 130.11997933 -154.07200926 110.95610279 -151.50390625 91.1796875 C-147.76831018 70.6233566 -137.42180191 53.37910891 -120.390625 41.140625 C-103.18523362 29.86672628 -82.97767463 26.69260778 -62.93286133 30.58935547 C-44.40527851 34.57048897 -29.07285795 45.54836525 -18.07421875 60.7890625 C-9.53900252 74.00177011 -5.9616891 88.2787713 -5.75390625 103.85546875 C-5.72100081 105.54622978 -5.68778867 107.23698486 -5.65429688 108.92773438 C-5.60674745 111.56758995 -5.56220569 114.20741592 -5.52319336 116.84741211 C-5.48349868 119.41282909 -5.4319924 121.97779881 -5.37890625 124.54296875 C-5.36628502 125.72586739 -5.36628502 125.72586739 -5.35340881 126.93266296 C-5.28407371 132.30005618 -5.28407371 132.30005618 -3 137 C0.97359497 139.33740881 3.14743812 140.11367492 7.75 139.5 C11.61801829 137.71476079 12.29203486 136.84812686 14 133 C14.42813783 129.94718701 14.42054199 126.93039162 14.3984375 123.8515625 C14.40130768 122.96197845 14.40417786 122.07239441 14.40713501 121.15585327 C14.4091738 119.27137619 14.40365689 117.38687785 14.39111328 115.50244141 C14.3752469 112.66909092 14.39086863 109.83720876 14.41015625 107.00390625 C14.43976104 82.05995118 8.02657023 58.9819184 -9 40 C-10.21816406 38.64068359 -10.21816406 38.64068359 -11.4609375 37.25390625 C-27.21858553 20.59516104 -49.90474495 9.49742734 -72.96875 8.796875 C-98.36863393 8.437259 -121.66216292 14.65417467 -141 32 C-141.90621094 32.81210937 -142.81242187 33.62421875 -143.74609375 34.4609375 C-160.40483896 50.21858553 -171.50257266 72.90474495 -172.203125 95.96875 C-172.562741 121.36863393 -166.34582533 144.66216292 -149 164 C-148.18789062 164.90621094 -147.37578125 165.81242188 -146.5390625 166.74609375 C-130.78141447 183.40483896 -108.09525505 194.50257266 -85.03125 195.203125 C-66.81047411 195.46109793 -51.0602898 192.94547037 -34.75 184.25 C-28.74664439 181.18032302 -23.29352783 180.01611583 -16.75 182.0625 C-11.76043988 184.23922045 -9.25162652 187.67555074 -6.6875 192.4375 C-5.07948464 198.43101178 -5.96192076 202.70083577 -8.63671875 208.10546875 C-15.45998365 217.58765636 -30.52610223 222.14794361 -41.25 225.375 C-42.04027588 225.61331543 -42.83055176 225.85163086 -43.64477539 226.09716797 C-55.20582142 229.39488164 -66.500627 230.4101794 -78.5 230.375 C-79.2007666 230.37445618 -79.9015332 230.37391235 -80.62353516 230.37335205 C-114.50027068 230.25291428 -144.53992616 217.41833304 -169 194 C-170.11955078 192.97519531 -170.11955078 192.97519531 -171.26171875 191.9296875 C-177.88236958 185.66722196 -182.97963336 178.55651738 -188 171 C-188.6290625 170.06671875 -189.258125 169.1334375 -189.90625 168.171875 C-207.23601593 140.60179284 -211.95805078 104.20535241 -204.83911133 72.62255859 C-198.84333447 48.87776111 -186.91829939 28.55146928 -170 11 C-169.34515625 10.28199219 -168.6903125 9.56398437 -168.015625 8.82421875 C-162.11677885 2.53463707 -155.13883693 -2.23469978 -148 -7 C-147.06542969 -7.63035156 -146.13085938 -8.26070312 -145.16796875 -8.91015625 C-101.47012457 -36.35415281 -40.12596623 -31.83598863 0 0 Z M-105 73 C-113.38986507 81.30497604 -117.32161833 90.20330202 -117.5 102 C-117.34479768 113.11587703 -113.85480178 122.07039058 -106 130 C-96.56584786 137.91052888 -86.85020159 141.82209573 -74.42578125 140.78515625 C-64.57531663 139.16145329 -55.68814842 134.43446541 -49 127 C-42.53553519 117.94974926 -39.15852384 108.80853685 -40.36328125 97.62890625 C-42.23011296 87.17235806 -46.47441613 77.87106878 -55.07421875 71.2734375 C-71.11443989 60.66671926 -89.86046432 60.30001036 -105 73 Z " fill="#8" transform="translate(207,26)" />
             </svg>
-        </div>
-
-        @* Adjuntos *@
-        <div class="ml-6">
-            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="fill-[#263238] dark:fill-gray-100 hover:fill-current-500">
-                <path d="M1.816 15.556v.002c0 1.502.584 2.912 1.646 3.972s2.472 1.647 3.974 1.647a5.58 5.58 0 0 0 3.972-1.645l9.547-9.548c.769-.768 1.147-1.767 1.058-2.817-.079-.968-.548-1.927-1.319-2.698-1.594-1.592-4.068-1.711-5.517-.262l-7.916 7.915c-.881.881-.792 2.25.214 3.261.959.958 2.423 1.053 3.263.215l5.511-5.512c.28-.28.267-.722.053-.936l-.244-.244c-.191-.191-.567-.349-.957.04l-5.506 5.506c-.18.18-.635.127-.976-.214-.098-.097-.576-.613-.213-.973l7.915-7.917c.818-.817 2.267-.699 3.23.262.5.501.802 1.1.849 1.685.051.573-.156 1.111-.589 1.543l-9.547 9.549a3.97 3.97 0 0 1-2.829 1.171 3.975 3.975 0 0 1-2.83-1.173 3.973 3.973 0 0 1-1.172-2.828c0-1.071.415-2.076 1.172-2.83l7.209-7.211c.157-.157.264-.579.028-.814L11.5 4.36a.572.572 0 0 0-.834.018l-7.205 7.207a5.577 5.577 0 0 0-1.645 3.971z"></path>
-            </svg>
-        </div>
+        </button>
 
         @* Integrantes *@
         <div @onclick="OpenDrawer" class="ml-6">
@@ -162,15 +155,15 @@
 @* Entrada *@
 <div class="rounded-lg m-3 px-4 py-4 flex items-center drop-shadow-2xl bg-[#F8F7FB] dark:bg-[#2b2c30] dark:drop-shadow-gray-900">
     <div @onclick="()=> EmojiPanel?.Show()">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="fill-[#263238] dark:fill-white">
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="fill-[#263238] dark:fill-white hover:fill-current-500">
             <path opacity=".45" d="M9.153 11.603c.795 0 1.439-.879 1.439-1.962s-.644-1.962-1.439-1.962-1.439.879-1.439 1.962.644 1.962 1.439 1.962zm-3.204 1.362c-.026-.307-.131 5.218 6.063 5.551 6.066-.25 6.066-5.551 6.066-5.551-6.078 1.416-12.129 0-12.129 0zm11.363 1.108s-.669 1.959-5.051 1.959c-3.505 0-5.388-1.164-5.607-1.959 0 0 5.912 1.055 10.658 0zM11.804 1.011C5.609 1.011.978 6.033.978 12.228s4.826 10.761 11.021 10.761S23.02 18.423 23.02 12.228c.001-6.195-5.021-11.217-11.216-11.217zM12 21.354c-5.273 0-9.381-3.886-9.381-9.159s3.942-9.548 9.215-9.548 9.548 4.275 9.548 9.548c-.001 5.272-4.109 9.159-9.382 9.159zm3.108-9.751c.795 0 1.439-.879 1.439-1.962s-.644-1.962-1.439-1.962-1.439.879-1.439 1.962.644 1.962 1.439 1.962z"></path>
         </svg>
     </div>
     <div class="flex-1 mx-4">
         <input @oninput="GetValue" @bind=Message @onkeydown="SendMessageKey" class="w-full ring-0 border-0 focus:border-0 focus:ring-0 bg-transparent dark:text-gray-100 focus:outline-none" placeholder="Escribe tu mensaje..." type="text" />
     </div>
     <div @onclick="SendMessage">
-        <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="bi bi-send-fill h-5 w-5 mr-3 fill-zinc-500 dark:fill-300" viewBox="0 0 16 16">
+        <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="bi bi-send-fill h-5 w-5 mr-3 fill-zinc-500 dark:fill-300 hover:fill-current-500" viewBox="0 0 16 16">
             <path d="M15.964.686a.5.5 0 0 0-.65-.65L.767 5.855H.766l-.452.18a.5.5 0 0 0-.082.887l.41.26.001.002 4.995 3.178 3.178 4.995.002.002.26.41a.5.5 0 0 0 .886-.083zm-1.833 1.89L6.637 10.07l-.215-.338a.5.5 0 0 0-.154-.154l-.338-.215 7.494-7.494 1.178-.471z" />
         </svg>
     </div>

diff --git a/LIN.Allo/LIN.Allo.Client/Pages/Sections/ChatSection.razor.cs b/LIN.Allo/LIN.Allo.Client/Pages/Sections/ChatSection.razor.cs
@@ -22,6 +22,10 @@ public partial class ChatSection : IDisposable, IMessageChanger, IConversationVi
     public Members? Drawer { get; set; }
 
 
+    [Parameter]
+    public Action EmmaClick { get; set; }
+
+
 
     /// <summary>
     /// Integrante del chat.

diff --git a/LIN.Allo/LIN.Allo.Client/_Imports.razor b/LIN.Allo/LIN.Allo.Client/_Imports.razor
@@ -7,7 +7,7 @@
 @using Microsoft.JSInterop
 @using LIN.Allo
 @using LIN.Allo.Client
-
+@using LIN.Allo.Shared.Components.Shared;
 
 @using LIN.Allo.Shared.Services
 @using LIN.Allo.Shared.Components.Elements.Dropdowns;

diff --git a/LIN.Allo/LIN.Allo/Components/App.razor b/LIN.Allo/LIN.Allo/Components/App.razor
@@ -15,8 +15,7 @@
 
 <body class="bg-li select-none dark:bg-black">
 
-
-     <Routes />
+    <Routes />
     <script src="_framework/blazor.web.js"></script>
 
     <script src="./js/Flowbite.js"></script>

diff --git a/LIN.Allo/LIN.Allo/LIN.Allo.csproj b/LIN.Allo/LIN.Allo/LIN.Allo.csproj
@@ -8,7 +8,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\LIN.Allo.Client\LIN.Allo.Client.csproj" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.2" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.3" />
     </ItemGroup>
 
 </Project>
diff --git a/LIN.Allo/LIN.Allo/Program.cs b/LIN.Allo/LIN.Allo/Program.cs
@@ -48,6 +48,7 @@
    .AddInteractiveWebAssemblyRenderMode()
    .AddInteractiveServerRenderMode()
    .AddAdditionalAssemblies(typeof(LIN.Allo.Client.Pages.Login).Assembly)
+   .AddAdditionalAssemblies(typeof(LIN.Allo.Shared._Imports).Assembly)
    .AddAdditionalAssemblies(typeof(LIN.Emma.UI.Emma).Assembly);
 
 

diff --git a/LIN.Allo/LIN.Allo/wwwroot/css/Tailwind.css b/LIN.Allo/LIN.Allo/wwwroot/css/Tailwind.css
@@ -2559,6 +2559,21 @@ video {
   background-color: rgb(24 24 27 / var(--tw-bg-opacity));
 }
 
+.bg-blue-500 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(59 130 246 / var(--tw-bg-opacity));
+}
+
+.bg-current-400 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(129 140 248 / var(--tw-bg-opacity));
+}
+
+.bg-zinc-300 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(212 212 216 / var(--tw-bg-opacity));
+}
+
 .bg-opacity-20 {
   --tw-bg-opacity: 0.2;
 }
@@ -2755,6 +2770,14 @@ video {
   padding: 1.75rem;
 }
 
+.p-0 {
+  padding: 0px;
+}
+
+.p-0\.5 {
+  padding: 0.125rem;
+}
+
 .px-0 {
   padding-left: 0px;
   padding-right: 0px;
@@ -4060,6 +4083,10 @@ h1:focus {
     display: block;
   }
 
+  .dl\:hidden {
+    display: none;
+  }
+
   .dl\:w-full {
     width: 100%;
   }
@@ -4231,6 +4258,15 @@ h1:focus {
     background-color: rgb(9 9 11 / var(--tw-bg-opacity));
   }
 
+  .dark\:bg-gray-900 {
+    --tw-bg-opacity: 1;
+    background-color: rgb(17 24 39 / var(--tw-bg-opacity));
+  }
+
+  .dark\:bg-zinc-900\/50 {
+    background-color: rgb(24 24 27 / 0.5);
+  }
+
   .dark\:fill-black {
     fill: #000;
   }