Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement razor chats sidebar #99

Merged
merged 38 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
54379d7
cc
BeepBeepBopBop Jan 11, 2025
4155347
cc
BeepBeepBopBop Jan 11, 2025
d33117f
cc
BeepBeepBopBop Jan 11, 2025
92a05b3
Update Chat.razor.css
BeepBeepBopBop Jan 11, 2025
777255d
cc
BeepBeepBopBop Jan 11, 2025
21529b0
Update Chat.razor.css
BeepBeepBopBop Jan 11, 2025
60e63ba
Update lmkitmaestro.js
BeepBeepBopBop Jan 11, 2025
7026140
cc
BeepBeepBopBop Jan 11, 2025
efd97b0
cc
BeepBeepBopBop Jan 11, 2025
40a145f
cc
BeepBeepBopBop Jan 11, 2025
eed8cc5
Update Chat.razor.css
BeepBeepBopBop Jan 11, 2025
5947159
cc
BeepBeepBopBop Jan 11, 2025
159c13f
cc
BeepBeepBopBop Jan 11, 2025
613a942
Update ConversationListItem.razor
BeepBeepBopBop Jan 11, 2025
a25c17d
Update ConversationListItem.razor.css
BeepBeepBopBop Jan 11, 2025
83274d5
cc
BeepBeepBopBop Jan 11, 2025
42e5a22
Update Chat.razor.cs
BeepBeepBopBop Jan 11, 2025
5e0e385
cc
BeepBeepBopBop Jan 11, 2025
2e17667
cc
BeepBeepBopBop Jan 11, 2025
aa979c0
cc
BeepBeepBopBop Jan 11, 2025
68d1150
xx
BeepBeepBopBop Jan 11, 2025
c38fe65
cc
BeepBeepBopBop Jan 12, 2025
14aea6e
cc
BeepBeepBopBop Jan 13, 2025
69019da
CC
BeepBeepBopBop Jan 15, 2025
b5187b9
update
BeepBeepBopBop Jan 15, 2025
eb38609
cc
BeepBeepBopBop Jan 15, 2025
ccca535
cc
BeepBeepBopBop Jan 15, 2025
d4c22d4
cc
BeepBeepBopBop Jan 15, 2025
f030d85
cc
BeepBeepBopBop Jan 15, 2025
08f6445
cc
BeepBeepBopBop Jan 15, 2025
cbec691
cc
BeepBeepBopBop Jan 16, 2025
1e8eb92
Update Chat.razor.css
BeepBeepBopBop Jan 16, 2025
ce517e4
cc
BeepBeepBopBop Jan 16, 2025
40847c7
Update ConversationListItem.razor.css
BeepBeepBopBop Jan 17, 2025
c351c98
Merge branch 'main' into evan/razor-ui
BeepBeepBopBop Jan 17, 2025
46f8901
fix message buttons bug
BeepBeepBopBop Jan 17, 2025
d748e66
set scrollbar style globally
BeepBeepBopBop Jan 17, 2025
f91fc2b
update css
BeepBeepBopBop Jan 17, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
cc
  • Loading branch information
BeepBeepBopBop committed Jan 15, 2025
commit ccca53583890d5e632dc83da2b6a39f9194a3f59
37 changes: 19 additions & 18 deletions LM-Kit-Maestro/UI/Razor/Components/Chat.razor
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,19 @@
@inherits MvvmComponentBase<ChatPageViewModel>

<div id="chat-container">
<div id="chats-sidebar"
class="@(ViewModel.ChatsSidebarIsToggled ? "sidebar-show" : "sidebar-hide")">
@foreach (var conversation in ViewModel.ConversationListViewModel.Conversations)
{
<div>
<ConversationListItem
OnSelect="OnConversationItemSelected"
OnDelete="OnConversationItemDeleteClicked"
IsSelected="@(conversation == ViewModel.ConversationListViewModel.CurrentConversation)"
ViewModel="conversation"/>
</div>
}
<div id="chats-sidebar"class="@(ViewModel.ChatsSidebarIsToggled ? "sidebar-show" : "sidebar-hide")">

<div id="conversation-list">

@foreach (var conversation in ViewModel.ConversationListViewModel.Conversations)
{
<ConversationListItem
OnSelect="OnConversationItemSelected"
OnDelete="OnConversationItemDeleteClicked"
IsSelected="@(conversation == ViewModel.ConversationListViewModel.CurrentConversation)"
ViewModel="conversation"/>
}
</div>
</div>

<div id="chat-content">
Expand Down Expand Up @@ -91,12 +92,12 @@
<div id="bottom-space">
@if (ViewModel?.ConversationListViewModel?.CurrentConversation?.LMKitConversation?.ContextSize > 0)
{
<MudText Align="Align.Center" Typo="Typo.caption">
Tokens: @ViewModel.ConversationListViewModel.CurrentConversation.LMKitConversation.ContextUsedSpace /
@ViewModel.ConversationListViewModel.CurrentConversation.LMKitConversation.ContextSize
(@CalculateUsagePercentage(ViewModel.ConversationListViewModel.CurrentConversation.LMKitConversation.ContextUsedSpace,
ViewModel.ConversationListViewModel.CurrentConversation.LMKitConversation.ContextSize)%)
</MudText>
<MudText Align="Align.Center" Typo="Typo.caption">
Tokens: @ViewModel.ConversationListViewModel.CurrentConversation.LMKitConversation.ContextUsedSpace /
@ViewModel.ConversationListViewModel.CurrentConversation.LMKitConversation.ContextSize
(@CalculateUsagePercentage(ViewModel.ConversationListViewModel.CurrentConversation.LMKitConversation.ContextUsedSpace,
ViewModel.ConversationListViewModel.CurrentConversation.LMKitConversation.ContextSize)%)
</MudText>
}
</div>
</div>
Expand Down
8 changes: 6 additions & 2 deletions LM-Kit-Maestro/UI/Razor/Components/Chat.razor.css
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
margin-block: 8px;
}

#conversation-list {
padding-inline: 12px;
}

.chat-element {
width: 100%;
justify-content: center;
Expand Down Expand Up @@ -128,7 +132,7 @@ body.mac .chat-element {
color: var(--Outline);
}

.sidebar-hide{
.sidebar-hide {
visibility: collapse;
}

Expand All @@ -140,4 +144,4 @@ body.mac .chat-element {
min-width: 300px;
max-width: 300px;
height: 100%;
}
}
11 changes: 3 additions & 8 deletions LM-Kit-Maestro/UI/Razor/Components/ConversationListItem.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,11 @@ public partial class ConversationListItem : ComponentBase

public string Title { get; private set; } = "";

protected override void OnAfterRender(bool firstRender)
protected override void OnParametersSet()
{
base.OnAfterRender(firstRender);
base.OnParametersSet();

if (firstRender)
{
Trace.WriteLine("Title set");
Title = ViewModel.Title;
}
Title = ViewModel.Title;
}

private void OnShowMoreClicked()
Expand All @@ -42,7 +38,6 @@ private async void OnRenameClicked()
ViewModel.IsShowingActionPopup = false;
ViewModel.IsRenaming = true;

//await Task.Delay(50);
await ItemTitleRef!.FocusAsync();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
padding-block: 12px;
padding-inline: 8px;
cursor: pointer;
width: 100%;
}

#item-container:hover {
Expand Down
Loading