Skip to content

Commit b8f2c97

Browse files
author
Piotr Stachaczynski
committed
fix md display in fe
1 parent cd35ea4 commit b8f2c97

22 files changed

Lines changed: 413 additions & 268 deletions

File tree

‎.idea/.idea.MaIN/.idea/inspectionProfiles/Project_Default.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Frontend/MainFE/Components/App.razor‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@
55
<meta charset="utf-8"/>
66
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
77
<base href="/"/>
8-
<link rel="stylesheet" href="bootstrap/bootstrap.min.css"/>
8+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
99
<link rel="stylesheet" href="app.css"/>
1010
<link rel="stylesheet" href="MainFE.styles.css"/>
1111
<link rel="icon" type="image/png" href="favicon.png"/>
1212
<HeadOutlet/>
1313
</head>
1414

1515
<body>
16+
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
17+
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.12.9/dist/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
18+
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
19+
<script src="js/app.js"></script>
1620
<Routes/>
1721
<script src="_framework/blazor.web.js"></script>
1822
</body>

‎Frontend/MainFE/Components/Layout/NavMenu.razor‎

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
@inject ModelSelectionService ChatService
2-
@using Microsoft.FluentUI.AspNetCore.Components
1+
@using Microsoft.FluentUI.AspNetCore.Components
32
<style>
4-
.gradient{
5-
box-shadow: 0 4px 16px rgba(0,0,0,0.5);
3+
.gradient {
4+
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.5);
5+
background-color: #1e1e1e !important;
66
}
77
88
.select-label {
@@ -29,16 +29,15 @@
2929
border-color: #0078D4;
3030
box-shadow: 0 0 0 3px rgba(0, 120, 212, 0.3);
3131
}
32-
3332
</style>
33+
3434
<nav class="navbar navbar-expand-md navbar-dark bg-dark mb-4 gradient">
3535
<div class="container-fluid">
3636
<a class="navbar-brand" href="">MaIN</a>
37-
<button class="navbar-toggler @NavButtonCssClass" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse"
38-
aria-controls="navbarCollapse" aria-label="Toggle navigation" @onclick="ToggleNavMenu">
37+
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
3938
<span class="navbar-toggler-icon"></span>
4039
</button>
41-
<div class="collapse navbar-collapse @NavBarCssClass" id="navbarCollapse" @onclick="ToggleNavMenu">
40+
<div class="collapse navbar-collapse" id="navbarSupportedContent">
4241
<ul class="navbar-nav mb-2 mb-md-0">
4342
<li class="nav-item">
4443
<NavLink class="nav-link" href="" Match="NavLinkMatch.All">
@@ -50,33 +49,12 @@
5049
<span class="oi oi-plus" aria-hidden="true"></span> 💬 Chat
5150
</NavLink>
5251
</li>
53-
5452
</ul>
55-
@* <div class="nav-item" style="color: white; position: absolute; right: 0"> *@
56-
@* Model: *@
57-
@* <FluentSelect TOption="string" id="modelSelect" Value="@ChatService.SelectedModel" *@
58-
@* Class="select-element" style="padding: 10px"> *@
59-
@* @foreach (var model in models) *@
60-
@* { *@
61-
@* <FluentOption TOption="string" Value="@model">@model </FluentOption> *@
62-
@* } *@
63-
@* </FluentSelect> *@
64-
@* </div> *@
6553
</div>
6654
</div>
6755
</nav>
6856

6957
@code {
70-
71-
string[] models = { "llama3:70b", "gemma:2b" }; // Define your models here
72-
7358
private bool collapseNavMenu = true;
74-
private string? NavBarCssClass => collapseNavMenu ? null : "show";
75-
private string? NavButtonCssClass => collapseNavMenu ? "collapsed" : null;
76-
77-
private void ToggleNavMenu()
78-
{
79-
collapseNavMenu = !collapseNavMenu;
80-
}
8159

8260
}

‎Frontend/MainFE/Components/Models/ChatDto.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using System.Text.Json.Serialization;
2+
using MainFE.Components.Pages;
3+
4+
namespace MainFE.Components.Models;
5+
6+
public class ChatDto
7+
{
8+
[JsonPropertyName("id")] public string Id { get; set; }
9+
[JsonPropertyName("name")] public string Name { get; set; }
10+
[JsonPropertyName("model")] public string Model { get; set; }
11+
[JsonPropertyName("messages")] public List<Message> Messages { get; set; }
12+
[JsonPropertyName("stream")] public bool Stream { get; set; } = false;
13+
[JsonIgnore] public bool IsSelected { get; set; }
14+
}

‎Frontend/MainFE/Components/Models/ChatRequest.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using System.Text.Json.Serialization;
2+
using MainFE.Components.Pages;
3+
4+
namespace MainFE.Components.Models;
5+
6+
public class ChatRequest
7+
{
8+
[JsonPropertyName("model")] public string Model { get; set; }
9+
[JsonPropertyName("messages")] public List<Message> Messages { get; set; }
10+
[JsonPropertyName("stream")] public bool Stream { get; set; } = false;
11+
[JsonPropertyName("name")] public string Name { get; set; }
12+
}

‎Frontend/MainFE/Components/Models/ChatResponse.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using System.Text.Json.Serialization;
2+
3+
namespace MainFE.Components.Models;
4+
5+
public class ChatResponse
6+
{
7+
[JsonPropertyName("model")] public string Model { get; set; }
8+
[JsonPropertyName("created_at")] public DateTime CreatedAt { get; set; }
9+
[JsonPropertyName("message")] public Message Message { get; set; }
10+
[JsonPropertyName("done")] public bool Done { get; set; }
11+
}

‎Frontend/MainFE/Components/Models/Message.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace MainFE.Components.Models;
2+
3+
public class Message
4+
{
5+
public string? Content { get; set; }
6+
public string Role { get; set; }
7+
}

‎Frontend/MainFE/Components/Models/Role.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
using System.Runtime.Serialization;
2+
3+
namespace MainFE.Components.Models;
4+
5+
public enum Role
6+
{
7+
[EnumMember(Value = "system")] System = 1,
8+
[EnumMember(Value = "assistant")] Assistant = 2,
9+
[EnumMember(Value = "user")] User = 3,
10+
}

0 commit comments

Comments
 (0)