diff --git a/Sledgemapper.Shared/Entities/AuthenticateModel.cs b/Sledgemapper.Shared/Entities/AuthenticateModel.cs index cb13fb3..61c8d20 100644 --- a/Sledgemapper.Shared/Entities/AuthenticateModel.cs +++ b/Sledgemapper.Shared/Entities/AuthenticateModel.cs @@ -9,8 +9,5 @@ namespace Sledgemapper.Shared.Entities [Required] public string Password { get; set; } - - [Required] - public string Email { get; set; } } } \ No newline at end of file diff --git a/Sledgemapper/Content/Content.mgcb b/Sledgemapper/Content/Content.mgcb index 96d1fe1..7b85633 100644 --- a/Sledgemapper/Content/Content.mgcb +++ b/Sledgemapper/Content/Content.mgcb @@ -107,7 +107,7 @@ #begin handcursorsIndex /importer:XmlImporter -/processor:PassThroughProcessor +/processor: /build:handcursorsIndex #begin icon_delete.png @@ -146,18 +146,6 @@ /processorParam:TextureFormat=Color /build:icon_room.png -#begin listBackground.png -/importer:TextureImporter -/processor:TextureProcessor -/processorParam:ColorKeyColor=255,0,255,255 -/processorParam:ColorKeyEnabled=True -/processorParam:GenerateMipmaps=False -/processorParam:PremultiplyAlpha=True -/processorParam:ResizeToPowerOfTwo=False -/processorParam:MakeSquare=False -/processorParam:TextureFormat=Color -/build:listBackground.png - #begin location.png /importer:TextureImporter /processor:TextureProcessor diff --git a/Sledgemapper/Content/listBackground.png b/Sledgemapper/Content/listBackground.png deleted file mode 100644 index a762eea..0000000 Binary files a/Sledgemapper/Content/listBackground.png and /dev/null differ diff --git a/Sledgemapper/IMapApi.cs b/Sledgemapper/IMapApi.cs index 5c594f1..ca2d5a8 100644 --- a/Sledgemapper/IMapApi.cs +++ b/Sledgemapper/IMapApi.cs @@ -55,7 +55,7 @@ namespace Sledgemapper Task Register([Body] RegisterModel registerModel); [Headers("Authorization")] - [Post("/authmanagement/login")] + [Post("/authmanagement/authenticate")] Task Authenticate([Body] AuthenticateModel registerModel); [Post("/session/{sessionName}/room")] @@ -66,8 +66,5 @@ namespace Sledgemapper [Post("/campaign/{campaignName}")] Task NewCampaign(string campaignName); - - [Get("/campaign/")] - Task> GetCampaigns(); } } \ No newline at end of file diff --git a/Sledgemapper/Sledgemapper.cs b/Sledgemapper/Sledgemapper.cs index 7c39fc4..787830c 100644 --- a/Sledgemapper/Sledgemapper.cs +++ b/Sledgemapper/Sledgemapper.cs @@ -211,9 +211,8 @@ namespace Sledgemapper _mainWidget.MenuViewCenterOnSelection.Selected += OnMenuViewCenterOnSelectionSelected; _mainWidget.MenuViewShowCellNUmbers.Selected += OnMenuViewShowCellNUmbersSelected; _mainWidget.MenuViewShowNotes.Selected += OnMenuViewNotesSelected; - _mainWidget.MenuCampaingNew.Selected += OnMenuCampaignNew; - _mainWidget.MenuCampaignOpen.Selected += OnMenuCampaignOpen; + _mainWidget.MenuConnectNew.Enabled = false; _mainWidget.MenuConnectJoin.Enabled = false; _mainWidget.MenuConnectSync.Enabled = false; @@ -323,41 +322,6 @@ namespace Sledgemapper content.TxtCampaign.SetKeyboardFocus(); } - private async void OnMenuCampaignOpen(object sender, EventArgs e) - { - if (!((MenuItem)sender).Enabled) - { - return; - } - - Window window = new() - { - Title = "Campaigns" - }; - - var content = new CampaignList(); - var campaigns = await _communicationManager.Api.GetCampaigns(); - foreach(var campaign in campaigns) - { - var item = new CampaignListItem(); - item.TxtCampaignName.Text=campaign.Name; -item.Background= new NinePatchRegion( - Content.Load("listBackground"), new Rectangle(0, 0, 418, 98), - new Myra.Graphics2D.Thickness {Left = 11, Right = 11, - Top = 11, Bottom = 11}); - content.StackNotesList.AddChild(item); - } - //content.BtnNewCampaign.Text = "N"; - - - -// content.BtnNewCampaign.Click += OnButtonNewCampaignClicked; - window.Content = content; - - window.ShowModal(_desktop); - // content.TxtCampaign.SetKeyboardFocus(); - } - private void OneMenuFileSettingsSelected(object sender, EventArgs e) { var propertyGrid = new PropertyGrid @@ -464,9 +428,7 @@ item.Background= new NinePatchRegion( _state.SelectClosestSnapPoint(screenPosition); } - if (!newState.IsKeyDown(Keys.LeftControl) && mouseState.LeftButton == ButtonState.Pressed && mouseState.LeftButton == oldMouseState.LeftButton && - !_desktop.IsMouseOverGUI - ) + if (!newState.IsKeyDown(Keys.LeftControl) && mouseState.LeftButton == ButtonState.Pressed && mouseState.LeftButton == oldMouseState.LeftButton) { _viewportCenter = new Vector3(_viewportCenter.X + mouseState.Position.X - oldMouseState.Position.X, _viewportCenter.Y + mouseState.Position.Y - oldMouseState.Position.Y, 0); if (mouseState.Position != oldMouseState.Position) @@ -756,7 +718,7 @@ item.Background= new NinePatchRegion( var visibleTilesY = GraphicsDevice.Viewport.Height / _state.TileSize + 1; DrawMap(); - //ApplyShaderToMap(); + ApplyShaderToMap(); _spriteBatch.Begin( transformMatrix: Matrix.CreateTranslation(_viewportCenter), @@ -764,7 +726,7 @@ item.Background= new NinePatchRegion( DrawTiles(); - //DrawWalls(); + DrawWalls(); DrawOverlays(); @@ -2171,7 +2133,6 @@ item.Background= new NinePatchRegion( _authResponse = await _communicationManager.Login(new AuthenticateModel { Username = localContent.TxtEmail.Text, - Email = localContent.TxtEmail.Text, Password = localContent.TxtPassword.Text }); successful = _authResponse != null; @@ -2374,12 +2335,6 @@ item.Background= new NinePatchRegion( }; var content = new LoginRegisterWindow(); - -#if DEBUG -content.TxtEmail.Text="michele.scandura@outlook.com"; -content.TxtPassword.Text="slePharland!79"; -#endif - content.RdoLogin.IsPressed = true; content.RdoLogin.Click += (s, e) => { diff --git a/Sledgemapper/UI/CampaignList.Generated.cs b/Sledgemapper/UI/CampaignList.Generated.cs deleted file mode 100644 index edc9aca..0000000 --- a/Sledgemapper/UI/CampaignList.Generated.cs +++ /dev/null @@ -1,80 +0,0 @@ -/* Generated by MyraPad at 03/06/2021 15:48:34 */ -using Myra; -using Myra.Graphics2D; -using Myra.Graphics2D.TextureAtlases; -using Myra.Graphics2D.UI; -using Myra.Graphics2D.Brushes; -using Myra.Graphics2D.UI.Properties; - -#if MONOGAME || FNA -using Microsoft.Xna.Framework; -using Microsoft.Xna.Framework.Graphics; -#elif STRIDE -using Stride.Core.Mathematics; -#else -using System.Drawing; -using System.Numerics; -#endif - -namespace Sledgemapper.UI -{ - partial class CampaignList: VerticalStackPanel - { - private void BuildUI() - { - var label1 = new Label(); - label1.Text = "Campaigns"; - label1.HorizontalAlignment = Myra.Graphics2D.UI.HorizontalAlignment.Center; - - StackNotesList = new VerticalStackPanel(); - StackNotesList.Proportions.Add(new Proportion - { - Type = Myra.Graphics2D.UI.ProportionType.Fill, - }); - StackNotesList.MinHeight = 350; - StackNotesList.Id = "StackNotesList"; - - var scrollViewer1 = new ScrollViewer(); - scrollViewer1.Content = StackNotesList; - - var textButton1 = new TextButton(); - textButton1.Text = "New"; - textButton1.Width = 70; - textButton1.Height = 20; - textButton1.Padding = new Thickness(5); - textButton1.HorizontalAlignment = Myra.Graphics2D.UI.HorizontalAlignment.Center; - - var textButton2 = new TextButton(); - textButton2.Text = "Load"; - textButton2.Width = 70; - textButton2.Height = 20; - textButton2.Padding = new Thickness(5); - textButton2.HorizontalAlignment = Myra.Graphics2D.UI.HorizontalAlignment.Center; - - var textButton3 = new TextButton(); - textButton3.Text = "Cancel"; - textButton3.Width = 70; - textButton3.Height = 20; - textButton3.Padding = new Thickness(5); - textButton3.HorizontalAlignment = Myra.Graphics2D.UI.HorizontalAlignment.Center; - - var horizontalStackPanel1 = new HorizontalStackPanel(); - horizontalStackPanel1.Spacing = 15; - horizontalStackPanel1.HorizontalAlignment = Myra.Graphics2D.UI.HorizontalAlignment.Right; - horizontalStackPanel1.Widgets.Add(textButton1); - horizontalStackPanel1.Widgets.Add(textButton2); - horizontalStackPanel1.Widgets.Add(textButton3); - - - Spacing = 13; - Width = 400; - Padding = new Thickness(10); - Widgets.Add(label1); - Widgets.Add(scrollViewer1); - Widgets.Add(horizontalStackPanel1); - } - - - public VerticalStackPanel StackNotesList; - } -} diff --git a/Sledgemapper/UI/CampaignList.cs b/Sledgemapper/UI/CampaignList.cs deleted file mode 100644 index a22afef..0000000 --- a/Sledgemapper/UI/CampaignList.cs +++ /dev/null @@ -1,11 +0,0 @@ -/* Generated by MyraPad at 01/06/2021 12:43:27 */ -namespace Sledgemapper.UI -{ - public partial class CampaignList - { - public CampaignList() - { - BuildUI(); - } - } -} \ No newline at end of file diff --git a/Sledgemapper/UI/CampaignListItem.Generated.cs b/Sledgemapper/UI/CampaignListItem.Generated.cs deleted file mode 100644 index 1a084ed..0000000 --- a/Sledgemapper/UI/CampaignListItem.Generated.cs +++ /dev/null @@ -1,45 +0,0 @@ -/* Generated by MyraPad at 03/06/2021 16:16:33 */ -using Myra; -using Myra.Graphics2D; -using Myra.Graphics2D.TextureAtlases; -using Myra.Graphics2D.UI; -using Myra.Graphics2D.Brushes; -using Myra.Graphics2D.UI.Properties; - -#if MONOGAME || FNA -using Microsoft.Xna.Framework; -using Microsoft.Xna.Framework.Graphics; -#elif STRIDE -using Stride.Core.Mathematics; -#else -using System.Drawing; -using System.Numerics; -#endif - -namespace Sledgemapper.UI -{ - partial class CampaignListItem: HorizontalStackPanel - { - private void BuildUI() - { - TxtCampaignName = new Label(); - TxtCampaignName.Text = "Highfell"; - TxtCampaignName.TextColor = ColorStorage.CreateColor(102, 102, 102, 255); - TxtCampaignName.VerticalAlignment = Myra.Graphics2D.UI.VerticalAlignment.Center; - TxtCampaignName.Background = new SolidBrush("#00000000"); - TxtCampaignName.Id = "TxtCampaignName"; - - - VerticalAlignment = Myra.Graphics2D.UI.VerticalAlignment.Center; - Width = 300; - Height = 45; - BorderThickness = new Thickness(2); - Padding = new Thickness(10); - Id = "PnlCampaignItem"; - Widgets.Add(TxtCampaignName); - } - - - public Label TxtCampaignName; - } -} diff --git a/Sledgemapper/UI/CampaignListItem.cs b/Sledgemapper/UI/CampaignListItem.cs deleted file mode 100644 index 0e86cde..0000000 --- a/Sledgemapper/UI/CampaignListItem.cs +++ /dev/null @@ -1,11 +0,0 @@ -/* Generated by MyraPad at 03/06/2021 16:00:11 */ -namespace Sledgemapper.UI -{ - public partial class CampaignListItem - { - public CampaignListItem() - { - BuildUI(); - } - } -} \ No newline at end of file diff --git a/Sledgemapper/UI/campaignListItem.xmmp b/Sledgemapper/UI/campaignListItem.xmmp deleted file mode 100644 index 14e5c9a..0000000 --- a/Sledgemapper/UI/campaignListItem.xmmp +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Sledgemapper/UI/campaignsList.xmmp b/Sledgemapper/UI/campaignsList.xmmp deleted file mode 100644 index dc1c328..0000000 --- a/Sledgemapper/UI/campaignsList.xmmp +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/nuget.config b/nuget.config index 7749f28..d18c541 100644 --- a/nuget.config +++ b/nuget.config @@ -2,6 +2,6 @@ - - + + \ No newline at end of file