This commit is contained in:
2020-02-26 21:50:58 +01:00
parent 78c21ade79
commit 64cdaf8e9f
15 changed files with 353 additions and 66 deletions

View File

@@ -0,0 +1,55 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using EstusShots.Shared.Models;
using GLib;
using Gtk;
namespace EstusShots.Gtk.DataStores
{
public class SeasonsDataStore
{
public ListStore ListStore { get; private set; }
public TreeView View { get; set; }
public List<Season> Data { get; set; }
public SeasonsDataStore(TreeView view)
{
ListStore = new ListStore(GType.Int, GType.String, GType.String);
Data = new List<Season>();
View = view;
var columns = BuildColumns();
columns.ForEach(column => View.AppendColumn(column));
View.Model = ListStore;
}
public void DataBind()
{
ListStore.Clear();
foreach (var datum in Data)
{
var row = new object[] {datum.Number, datum.Game, datum.Start.ToString(CultureInfo.InvariantCulture)};
try
{
ListStore.AppendValues(row);
}
catch (Exception e)
{
Console.WriteLine(e);
}
}
}
private List<TreeViewColumn> BuildColumns()
{
var columns = new List<TreeViewColumn>
{
new TreeViewColumn("Number", new CellRendererText(), "text", 0),
new TreeViewColumn("Game", new CellRendererText(), "text", 1),
new TreeViewColumn("Start", new CellRendererText(), "text", 2)
};
return columns;
}
}
}

View File

@@ -17,6 +17,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\EstusShots.Client\EstusShots.Client.csproj" />
<ProjectReference Include="..\EstusShots.Shared\EstusShots.Shared.csproj" />
</ItemGroup>

View File

@@ -1,9 +1,14 @@
using System;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Text.Json;
using EstusShots.Client;
using EstusShots.Gtk.DataStores;
using EstusShots.Shared.Models;
using Gtk;
using Application = Gtk.Application;
using DateTime = System.DateTime;
using UI = Gtk.Builder.ObjectAttribute;
namespace EstusShots.Gtk
@@ -11,60 +16,86 @@ namespace EstusShots.Gtk
class MainWindow : Window
{
private const string ApiUrl = "http://localhost:5000/api/";
private EstusShotsClient Client { get; }
[UI] private TreeView _seasonsView = null;
[UI] private Button _loadButton = null;
[UI] private Label _infoLabel = null;
[UI] private readonly TreeView _seasonsView = null;
[UI] private readonly Button _loadButton = null;
[UI] private readonly Button _newSeasonButton = null;
[UI] private readonly Label _infoLabel = null;
private SeasonsDataStore SeasonsView { get; set; }
public MainWindow() : this(new Builder("MainWindow.glade")) { }
private MainWindow(Builder builder) : base(builder.GetObject("MainWindow").Handle)
{
builder.Autoconnect(this);
Client = new EstusShotsClient("http://localhost:5000/api/");
DeleteEvent += Window_DeleteEvent;
_loadButton.Clicked += _loadButton_Clicked;
_loadButton.Clicked += LoadButtonClicked;
_newSeasonButton.Clicked += NewSeasonButtonOnClicked;
SeasonsView = new SeasonsDataStore(_seasonsView);
Info("Application Started");
}
private void Window_DeleteEvent(object sender, DeleteEventArgs a)
private void NewSeasonButtonOnClicked(object sender, EventArgs e)
{
Application.Quit();
}
private void _loadButton_Clicked(object sender, EventArgs a)
{
var season = new Season()
var season = new Season
{
Game = "Test Game",
Number = 1,
Start = DateTime.Now
};
};
var content = new StringContent(JsonSerializer.Serialize(season), Encoding.UTF8, "application/json");
var client = new HttpClient();
try
{
var response = client.PostAsync(ApiUrl + "seasons", content).Result;
var response = client.PostAsync(ApiUrl + "season", content).Result;
if (response.Headers.Location == null)
if (!response.IsSuccessStatusCode)
{
_infoLabel.Text = $"Error while creating Season: {response.ReasonPhrase}";
return;
}
var data = client.GetAsync(response.Headers.Location).Result;
var jsonData = data.Content.ReadAsStringAsync().Result;
var options = new JsonSerializerOptions
{
PropertyNameCaseInsensitive = true,
};
var s = JsonSerializer.Deserialize<Season>(jsonData, options);
_infoLabel.Text = $"Created new Season: {s.Game} ({s.SeasonId})";
Info($"Created new Season");
}
catch (Exception e)
catch (Exception ex)
{
_infoLabel.Text = $"Exception Occured: {e.Message}";
Console.WriteLine(e.Message);
_infoLabel.Text = $"Exception Occured: {ex.Message}";
Console.WriteLine(ex.Message);
}
}
private void SeasonsViewOnShown(object sender, EventArgs e)
{
Info("Loading Data");
// var seasons = Client.GetSeasons().Result;
// SeasonsView.Data = seasons;
// SeasonsView.DataBind();
// Info("Data Loaded");
}
private void LoadButtonClicked(object sender, EventArgs a)
{
var seasons = Client.GetSeasons().Result;
SeasonsView.Data = seasons;
SeasonsView.DataBind();
Info("List Refreshed");
}
private void Window_DeleteEvent(object sender, DeleteEventArgs a)
{
Application.Quit();
}
private void Info(string message)
{
_infoLabel.Text = message;
}
}
}

View File

@@ -4,9 +4,9 @@
<requires lib="gtk+" version="3.18"/>
<object class="GtkWindow" id="MainWindow">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Example Window</property>
<property name="default_width">480</property>
<property name="default_height">240</property>
<property name="title" translatable="yes">Estus Shots</property>
<property name="default_width">800</property>
<property name="default_height">600</property>
<child>
<placeholder/>
</child>
@@ -14,38 +14,106 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">2</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="_infoLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkTreeView" id="_seasonsView">
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="_seasonsView">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="enable_grid_lines">horizontal</property>
<signal name="show" handler="SeasonsViewOnShown" swapped="no"/>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButtonBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="_loadButton">
<property name="label" translatable="yes">Reload</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="_newSeasonButton">
<property name="label" translatable="yes">New Season</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">2</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="_loadButton">
<property name="label" translatable="yes">Load Seasons</property>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="can_focus">False</property>
<property name="margin_top">2</property>
<property name="spacing">5</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-connect</property>
<property name="icon_size">2</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="_infoLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>