diff --git a/src/PanoptesFrontend/Data/Component.cs b/src/PanoptesFrontend/Data/Component.cs new file mode 100644 index 0000000..0bd1ef4 --- /dev/null +++ b/src/PanoptesFrontend/Data/Component.cs @@ -0,0 +1,12 @@ +public class Component { + public int Type {get; set;} + public string Text {get; set;} + public List Chart {get; set;} + + + public Component(int type, string text="", List chart = null){ + Type = type; + Text = text; + Chart = chart; + } +} \ No newline at end of file diff --git a/src/PanoptesFrontend/Data/Person.cs b/src/PanoptesFrontend/Data/Person.cs deleted file mode 100644 index fea4dc7..0000000 --- a/src/PanoptesFrontend/Data/Person.cs +++ /dev/null @@ -1,6 +0,0 @@ -public class Person -{ - public string Name { get; set; } - public int Age { get; set; } - public string Email { get; set; } -} \ No newline at end of file diff --git a/src/PanoptesFrontend/Data/Stats.cs b/src/PanoptesFrontend/Data/Stats.cs new file mode 100644 index 0000000..efcfe62 --- /dev/null +++ b/src/PanoptesFrontend/Data/Stats.cs @@ -0,0 +1,4 @@ +public class Stats { + String Label {get; set;} + Int64 Value {get; set;} +} diff --git a/src/PanoptesFrontend/Pages/PersonCard.razor b/src/PanoptesFrontend/Pages/PersonCard.razor deleted file mode 100644 index 34e0729..0000000 --- a/src/PanoptesFrontend/Pages/PersonCard.razor +++ /dev/null @@ -1,14 +0,0 @@ -
-
- @Data.Name -
-
-

Age: @Data.Age

-

Email: @Data.Email

-
-
- -@code { - [Parameter] - public Person Data { get; set; } -} \ No newline at end of file diff --git a/src/PanoptesFrontend/Pages/TestCard.razor b/src/PanoptesFrontend/Pages/TestCard.razor new file mode 100644 index 0000000..6cf748c --- /dev/null +++ b/src/PanoptesFrontend/Pages/TestCard.razor @@ -0,0 +1,10 @@ +
+
+

@Data.Text

+
+
+ +@code { + [Parameter] + public Component Data { get; set; } +} \ No newline at end of file diff --git a/src/PanoptesFrontend/Pages/TestRequest.razor b/src/PanoptesFrontend/Pages/TestRequest.razor index 6cb2f85..7c561d3 100644 --- a/src/PanoptesFrontend/Pages/TestRequest.razor +++ b/src/PanoptesFrontend/Pages/TestRequest.razor @@ -1,25 +1,29 @@ -@page "/people" +@page "/test" @using System.Net.Http.Json @using System.Text.Json @inject HttpClient httpClient -@if (people != null) +@if (data != null) { - @foreach (var person in people) - { - + @foreach (var component in data) { + switch (component.Type) { + case 0: + + break; + } } + } @code { - private List people; + public List data; protected override async Task OnInitializedAsync() { var response = await httpClient.GetAsync("http://localhost:8080"); var json = await response.Content.ReadAsStringAsync(); - people = JsonSerializer.Deserialize>(json); + data = JsonSerializer.Deserialize>(json); } } \ No newline at end of file diff --git a/src/PanoptesFrontend/bin/Debug/net6.0/PanoptesFrontend.dll b/src/PanoptesFrontend/bin/Debug/net6.0/PanoptesFrontend.dll index 907bb82..4da30d7 100644 Binary files a/src/PanoptesFrontend/bin/Debug/net6.0/PanoptesFrontend.dll and b/src/PanoptesFrontend/bin/Debug/net6.0/PanoptesFrontend.dll differ diff --git a/src/PanoptesFrontend/bin/Debug/net6.0/PanoptesFrontend.pdb b/src/PanoptesFrontend/bin/Debug/net6.0/PanoptesFrontend.pdb index 60c36d6..0712d5c 100644 Binary files a/src/PanoptesFrontend/bin/Debug/net6.0/PanoptesFrontend.pdb and b/src/PanoptesFrontend/bin/Debug/net6.0/PanoptesFrontend.pdb differ diff --git a/src/PanoptesFrontend/obj/Debug/net6.0/PanoptesFrontend.GeneratedMSBuildEditorConfig.editorconfig b/src/PanoptesFrontend/obj/Debug/net6.0/PanoptesFrontend.GeneratedMSBuildEditorConfig.editorconfig index 729a74b..b013cf1 100644 --- a/src/PanoptesFrontend/obj/Debug/net6.0/PanoptesFrontend.GeneratedMSBuildEditorConfig.editorconfig +++ b/src/PanoptesFrontend/obj/Debug/net6.0/PanoptesFrontend.GeneratedMSBuildEditorConfig.editorconfig @@ -31,8 +31,8 @@ build_metadata.AdditionalFiles.CssScope = build_metadata.AdditionalFiles.TargetPath = UGFnZXNcSW5kZXgucmF6b3I= build_metadata.AdditionalFiles.CssScope = -[C:/Users/user/Documents/Panoptes/2023-ca400-murphg62-byrnm257/src/PanoptesFrontend/Pages/PersonCard.razor] -build_metadata.AdditionalFiles.TargetPath = UGFnZXNcUGVyc29uQ2FyZC5yYXpvcg== +[C:/Users/user/Documents/Panoptes/2023-ca400-murphg62-byrnm257/src/PanoptesFrontend/Pages/TestCard.razor] +build_metadata.AdditionalFiles.TargetPath = UGFnZXNcVGVzdENhcmQucmF6b3I= build_metadata.AdditionalFiles.CssScope = [C:/Users/user/Documents/Panoptes/2023-ca400-murphg62-byrnm257/src/PanoptesFrontend/Pages/TestRequest.razor] diff --git a/src/PanoptesFrontend/obj/Debug/net6.0/PanoptesFrontend.csproj.CoreCompileInputs.cache b/src/PanoptesFrontend/obj/Debug/net6.0/PanoptesFrontend.csproj.CoreCompileInputs.cache index e918602..bc44f90 100644 --- a/src/PanoptesFrontend/obj/Debug/net6.0/PanoptesFrontend.csproj.CoreCompileInputs.cache +++ b/src/PanoptesFrontend/obj/Debug/net6.0/PanoptesFrontend.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -280f506f1a47e4ea08b5e9891f5fe3ce43a1a5db +84500de425a5aa9d6b1d6919ac86ff6fd49c4373 diff --git a/src/PanoptesFrontend/obj/Debug/net6.0/PanoptesFrontend.dll b/src/PanoptesFrontend/obj/Debug/net6.0/PanoptesFrontend.dll index 907bb82..4da30d7 100644 Binary files a/src/PanoptesFrontend/obj/Debug/net6.0/PanoptesFrontend.dll and b/src/PanoptesFrontend/obj/Debug/net6.0/PanoptesFrontend.dll differ diff --git a/src/PanoptesFrontend/obj/Debug/net6.0/PanoptesFrontend.pdb b/src/PanoptesFrontend/obj/Debug/net6.0/PanoptesFrontend.pdb index 60c36d6..0712d5c 100644 Binary files a/src/PanoptesFrontend/obj/Debug/net6.0/PanoptesFrontend.pdb and b/src/PanoptesFrontend/obj/Debug/net6.0/PanoptesFrontend.pdb differ diff --git a/src/PanoptesFrontend/obj/Debug/net6.0/ref/PanoptesFrontend.dll b/src/PanoptesFrontend/obj/Debug/net6.0/ref/PanoptesFrontend.dll index dd44c1a..7c05944 100644 Binary files a/src/PanoptesFrontend/obj/Debug/net6.0/ref/PanoptesFrontend.dll and b/src/PanoptesFrontend/obj/Debug/net6.0/ref/PanoptesFrontend.dll differ diff --git a/src/PanoptesFrontend/obj/Debug/net6.0/refint/PanoptesFrontend.dll b/src/PanoptesFrontend/obj/Debug/net6.0/refint/PanoptesFrontend.dll index dd44c1a..7c05944 100644 Binary files a/src/PanoptesFrontend/obj/Debug/net6.0/refint/PanoptesFrontend.dll and b/src/PanoptesFrontend/obj/Debug/net6.0/refint/PanoptesFrontend.dll differ diff --git a/src/PanoptesFrontend/obj/staticwebassets.pack.sentinel b/src/PanoptesFrontend/obj/staticwebassets.pack.sentinel index 25a1697..bca8fe0 100644 --- a/src/PanoptesFrontend/obj/staticwebassets.pack.sentinel +++ b/src/PanoptesFrontend/obj/staticwebassets.pack.sentinel @@ -2,3 +2,11 @@ 2.0 2.0 2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0