diff --git a/Components/Navigation/DesktopNavComponent.razor b/Components/Navigation/DesktopNavComponent.razor index 4d4fc88..f9e35a1 100644 --- a/Components/Navigation/DesktopNavComponent.razor +++ b/Components/Navigation/DesktopNavComponent.razor @@ -2,33 +2,53 @@ @inject INavigationService navigationService @implements IDisposable -
-
+@{ + var visibleStyle = navigationService.GetNavigationSectionId() > 0 ? "clickOffVisible" : ""; +} + +
+ +
+ +
+
IGP Fan Reference - @foreach (var webSection in WebSections) { -
@webSection.Name
- } -
- - @{ - var hoveredStyle = NavigationStateType.Hovering_Menu.Equals(navigationService.GetNavigationState()) ? - "navMenuContainerShow" : ""; - } -
- @foreach (var section in WebSections) { - var pages = (from page in WebPages - where page.WebSectionModelId == section.Id - select page).ToList(); - - + @foreach (var webSection in WebSections) + { +
+ + + + @if (webSection.Id.Equals(navigationService.GetNavigationSectionId())) + { +
+
+ +
+
+ } +
}
@code { - - [Parameter] public List WebSections { get; set; } = default!; - [Parameter] public List WebPages { get; set; } = default!; - + [Parameter] + public List WebSections { get; set; } = default!; + + [Parameter] + public List WebPages { get; set; } = default!; + - protected override void OnInitialized() { + protected override void OnInitialized() + { navigationService.Subscribe(StateHasChanged); } - void IDisposable.Dispose() { + void IDisposable.Dispose() + { navigationService.Unsubscribe(StateHasChanged); } - void HoverOut(MouseEventArgs mouseEventArgs) { + void MenuClicked(int menuName) + { + Console.WriteLine($"MenuClicked {menuName}"); + navigationService.ChangeNavigationSectionId(menuName); + } + + void MenuClosed() + { + navigationService.ChangeNavigationSectionId(-1); + } + + void HoverOut(MouseEventArgs mouseEventArgs) + { Console.WriteLine(NavigationStateType.Default); navigationService.ChangeNavigationState(NavigationStateType.Default); } diff --git a/Components/Navigation/NavLinkComponent.razor b/Components/Navigation/DesktopNavLinkComponent.razor similarity index 72% rename from Components/Navigation/NavLinkComponent.razor rename to Components/Navigation/DesktopNavLinkComponent.razor index 4735a34..0288d4e 100644 --- a/Components/Navigation/NavLinkComponent.razor +++ b/Components/Navigation/DesktopNavLinkComponent.razor @@ -1,18 +1,15 @@ -@using Services -@using Model.Website -@using Model.Website.Enums -@inject INavigationService navigationService; +@inject INavigationService navigationService; @inject NavigationManager navigationManager; @if (isOnPage) { - +
@Page.Name
} else { - +
@Page.Name
@@ -20,16 +17,6 @@ else { } + +@code { + + [Parameter] + public WebSectionModel Section { get; set; } = default!; + +} \ No newline at end of file diff --git a/Components/Navigation/NavSectionComponent.razor b/Components/Navigation/NavSectionComponent.razor deleted file mode 100644 index 17b5c46..0000000 --- a/Components/Navigation/NavSectionComponent.razor +++ /dev/null @@ -1,59 +0,0 @@ -@using Model.Website - -
-
-
- @Section.Name -
-
- - @foreach (var childPage in Children) { - if (childPage.IsPrivate.Equals("True")) { - continue; - } - - } -
- - - -@code { - - [Parameter] - public WebSectionModel Section { get; set; } = default!; - - [Parameter] - public List Children { get; set; } = default!; - -} \ No newline at end of file diff --git a/Components/Navigation/TabletNavComponent.razor b/Components/Navigation/TabletNavComponent.razor index 74077b6..d3b7c7e 100644 --- a/Components/Navigation/TabletNavComponent.razor +++ b/Components/Navigation/TabletNavComponent.razor @@ -19,23 +19,23 @@
- @foreach (var _section in WebSections) { + @foreach (var webSection in WebSections) { var pages = (from page in WebPages - where page.WebSectionModelId == _section.Id + where page.WebSectionModelId == webSection.Id select page).ToList();
- @_section.Name + @webSection.Name
- @foreach (var _page in pages) { - if (_page.IsPrivate.Equals("True")) { + @foreach (var webPage in pages) { + if (webPage.IsPrivate.Equals("True")) { continue; } - - @_page.Name + + @webPage.Name }
diff --git a/IGP/Database.db b/IGP/Database.db index 7c83ce5..96ba9d6 100644 Binary files a/IGP/Database.db and b/IGP/Database.db differ diff --git a/IGP/PageLayout.razor b/IGP/PageLayout.razor index 6e7d106..728186f 100644 --- a/IGP/PageLayout.razor +++ b/IGP/PageLayout.razor @@ -41,11 +41,7 @@ protected override async Task OnInitializedAsync() { -#if NO_SQL await webService.Load(); -#else - await WebService.Load(Database); -#endif } void IDisposable.Dispose() diff --git a/IGP/wwwroot/generated/AgileTaskModels.json b/IGP/wwwroot/generated/AgileTaskModels.json index 3445e46..d6f6beb 100644 --- a/IGP/wwwroot/generated/AgileTaskModels.json +++ b/IGP/wwwroot/generated/AgileTaskModels.json @@ -1 +1 @@ -[{"Id":1,"AgileSprintModelId":null,"Name":"Support Safari","Description":"Consider other web browsers.","Notes":"Added","Status":"Todo","Priority":"Low","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":2,"AgileSprintModelId":2,"Name":"Filter Patch Notes","Description":"You should be showing people what they really want to see in the patch notes.","Notes":"Added","Status":"Done","Priority":"Blocker","Task":"Feature","OrderPriority":3,"Created":"2022-02-20T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":3,"AgileSprintModelId":5,"Name":"Consider Pyre","Description":"Add Pyre Income. Make it so you can take Pyre Camps and Pyre Miners","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":4,"AgileSprintModelId":5,"Name":"Optimizations","Description":"Build Calculator should be usable.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":5,"AgileSprintModelId":5,"Name":"Change Attack Timing Interval","Description":"Be able to set attack timing.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":6,"AgileSprintModelId":5,"Name":"Add Pyre Spells","Description":"Make Pyre Spells castable and consume Pyre on build order","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":7,"AgileSprintModelId":null,"Name":"Default builds (Rush Thrones)","Description":"Add a dropdown list of default builds.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":8,"AgileSprintModelId":null,"Name":"Load older builds","Description":"Be able to load older builds. How are you going to handle auto correct to current patch?","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":9,"AgileSprintModelId":null,"Name":"How to use Build Calculator step by step","Description":"Need docs","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":10,"AgileSprintModelId":null,"Name":"Compare Health and Damage","Description":"Refer to community example spreadsheet.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":11,"AgileSprintModelId":null,"Name":"Compare Unit\u0027s Damage with it\u0027s own costs","Description":"Refer to community example spreadsheet.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":12,"AgileSprintModelId":4,"Name":"View one unit stats from a link. Make YAML copy and paste","Description":"Design so people can easily copy and paste data into discord","Notes":"Ended up not using exact Yaml. Button in Database controls Detailed vs Plain display ","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-20T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":13,"AgileSprintModelId":2,"Name":"Look into SQL","Description":"You really should be using SQL.","Notes":"Agile and Change log pages now use SQL","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":14,"AgileSprintModelId":1,"Name":"Mobile Menu","Description":"You need a real mobile menu. Viewers don\u0027t scroll below the fold, so no one is going to know what happens when you click a button on phones.","Notes":"Added smaller menus for tablets and phones.","Status":"Done","Priority":"High","Task":"Feature","OrderPriority":3,"Created":"2022-02-18T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":15,"AgileSprintModelId":2,"Name":"Acropolis Consume Mote","Description":"The Mote is suppose to be consumed when making a Town Hall.","Notes":"Fixed","Status":"Done","Priority":"High","Task":"Bug","OrderPriority":3,"Created":"2022-02-18T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":16,"AgileSprintModelId":5,"Name":"Multiple Travel Time in Harass Calculator","Description":"Travel time should be based on the amount of bases used. 3 bases is 3 travel times.","Notes":"Add notes...","Status":"Todo","Priority":"Low","Task":"Feature","OrderPriority":2,"Created":"2022-02-18T00:00:00","Finished":null},{"Id":17,"AgileSprintModelId":1,"Name":"Update Database to 0.0.6.8375a","Description":"Xacal tech change, and Hallower damage change. Update Godhead text.","Notes":"Done","Status":"Done","Priority":"None","Task":"Feature","OrderPriority":3,"Created":"2022-02-18T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":18,"AgileSprintModelId":null,"Name":"Patch History Viewer","Description":"Add an ability to compare patches, to see all nerfs and buffs made between them.","Notes":"Inspired by Zkay\u0027s post on discord, where he details a possible \u0027patch history viewer\u0027 implementation.","Status":"Fun_Idea","Priority":"None","Task":"Feature","OrderPriority":5,"Created":"2022-02-16T00:00:00","Finished":null},{"Id":19,"AgileSprintModelId":1,"Name":"Twitch Page","Description":"Did a ~3 hour test stream, and was personal quite happy with the quality. Make Twitch page, and stream patch, sprint planning and development on Sunday.","Notes":"Page added under General, and named \u0022Streams\u0022.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-16T00:00:00","Finished":"2022-02-16T00:00:00"},{"Id":20,"AgileSprintModelId":1,"Name":"Finish the database","Description":"Add more descriptions for everything. Reduce any data duplication with ids. Add upgrade connections. Add ability connections. Add passives and passives connections.","Notes":"Good enough for now","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-11T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":21,"AgileSprintModelId":1,"Name":"Change Log View","Description":"Add a log to view last changes.","Notes":"Added changelog page. Shows Today, X Days Ago, or exact date if patch is over a week old.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-14T00:00:00","Finished":"2022-02-14T00:00:00"},{"Id":22,"AgileSprintModelId":1,"Name":"Agile View","Description":"Add the agile view.","Notes":"Finished.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-11T00:00:00","Finished":"2022-02-17T00:00:00"},{"Id":23,"AgileSprintModelId":1,"Name":"GUID for Ids","Description":"Stop using enums for ids, and start using guids. Enums are just too limited, I lose out on component and inheritance design with them. Replace all your enums with guids, rip off the bandaid.","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-11T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":24,"AgileSprintModelId":1,"Name":"Co-op overview","Description":"Write some sort of blog on co-op gameplay so you have something the feels very content-ish. Maybe make it a video.","Notes":"Finished and released early.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-11T00:00:00","Finished":"2022-02-12T00:00:00"},{"Id":25,"AgileSprintModelId":1,"Name":"Mobile UI","Description":"Make website work on mobile.","Notes":"Should be good. Will test on phone later.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-15T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":26,"AgileSprintModelId":1,"Name":"Add Making Of View","Description":"View to reference UI designs. Nicely encourages the pratice of making the UI code a lot cleaner.","Notes":"Good enough for now","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-11T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":27,"AgileSprintModelId":3,"Name":"Close Nav Menu on Navigation","Description":"Close Nav Menu on Navigation","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":28,"AgileSprintModelId":3,"Name":"Add Passive Descriptions and Passive","Description":"Have to guess on a bunch of passives","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-03-31T00:00:00"},{"Id":29,"AgileSprintModelId":3,"Name":"Tooltips that show referenced units","Description":"I should see any referenced unit by hovering over it","Notes":"Links can now go to links which can go to links.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-04-01T00:00:00"},{"Id":30,"AgileSprintModelId":null,"Name":"Update Logo for Website","Description":"After color scheme is picked","Notes":null,"Status":"Todo","Priority":"Low","Task":"Feature","OrderPriority":2,"Created":"2022-03-27T00:00:00","Finished":null},{"Id":31,"AgileSprintModelId":3,"Name":"Documentation page","Description":"Add documents on how to maintain website","Notes":"Added start of documents","Status":"Done","Priority":"Low","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":32,"AgileSprintModelId":null,"Name":"Test Automation","Description":"Selenium Tests","Notes":"Start adding IDs to everything","Status":"Todo","Priority":"Low","Task":"Feature","OrderPriority":2,"Created":"2022-03-27T00:00:00","Finished":null},{"Id":33,"AgileSprintModelId":null,"Name":"Unit Test","Description":"Add some unit tests","Notes":null,"Status":"Todo","Priority":"Low","Task":"Feature","OrderPriority":2,"Created":"2022-03-27T00:00:00","Finished":null},{"Id":34,"AgileSprintModelId":4,"Name":"Fully Transfer everything to SQL","Description":"Need to regenerate the database once everthing is fully transfered","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-04-09T00:00:00"},{"Id":35,"AgileSprintModelId":3,"Name":"Adding a loading Component","Description":"For JSON loading","Notes":"Added loading component to Agile and Changelog screens","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":36,"AgileSprintModelId":3,"Name":"Optimize Loading of Data","Description":"Currently loading non Agile stuff on Agile page","Notes":"Moved SQL database injection to app root","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":37,"AgileSprintModelId":3,"Name":"Convert Notes to Markdown","Description":"Using Markdown and generating the Note pages seems like a better solution to SQL or hardcoding data","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-04-01T00:00:00"},{"Id":38,"AgileSprintModelId":3,"Name":"Improve Entity Filter Options","Description":"The options I give you is strange, given it filers on Faction type","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","OrderPriority":3,"Created":"2022-04-01T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":39,"AgileSprintModelId":4,"Name":"Refresh Database Bug","Description":"Database dialog UI isn\u0027t refreshing enough","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","OrderPriority":3,"Created":"2022-04-03T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":40,"AgileSprintModelId":4,"Name":"Branding Stuff","Description":"Add a schedule, improving branding, etc, ","Notes":"Only improved Twitch overlays","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-03T00:00:00","Finished":"2022-04-10T00:00:00"},{"Id":41,"AgileSprintModelId":4,"Name":"Improve Documents/Notes UI","Description":"Should have a left navigation menu. And prev/next buttons","Notes":"Updated UI. Will added prev/next and breadcrumbs later","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-05T00:00:00","Finished":"2022-04-10T00:00:00"},{"Id":42,"AgileSprintModelId":5,"Name":"Add GitHub links instead of showing code","Description":"For all code examples","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":43,"AgileSprintModelId":5,"Name":"Research More used RTS calculations","Description":"What other calculators like the Harass Page can be added","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2001-01-01T00:00:00","Finished":null},{"Id":44,"AgileSprintModelId":5,"Name":"Add Error Toasts to Calculator","Description":"Not enough \u0022Ether\u0022","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":45,"AgileSprintModelId":5,"Name":"Handle Divide by Zero in Harass Calculator","Description":"addDescription","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":46,"AgileSprintModelId":5,"Name":"Harass Calculator first user experience","Description":"Navigate player though the harass calculator steps","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":47,"AgileSprintModelId":5,"Name":"Training Queue","Description":"Add training queue times to the build calculator","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":48,"AgileSprintModelId":5,"Name":"Refresh Button for Build Calculator","Description":"Refresh to regenerate timeline and charts","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":49,"AgileSprintModelId":5,"Name":"Gameplay Warning State Toasts","Description":"\u0022You should upgrade your economy.\u0022 \u0022Your using too much ether, spend alloy\u0022","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":50,"AgileSprintModelId":5,"Name":"Make desktop navigation buttons","Description":"It popping up all the time is a tad tedious","Notes":"addNotes","Status":"In_Progress","Priority":"Medium","Task":"Feature","OrderPriority":1,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":51,"AgileSprintModelId":5,"Name":"Working Timers","Description":"Toast dismiss timers not making sense. Look into proper Timers","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-10T00:00:00","Finished":null}] \ No newline at end of file +[{"Id":1,"AgileSprintModelId":null,"Name":"Support Safari","Description":"Consider other web browsers.","Notes":"Added","Status":"Todo","Priority":"Low","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":2,"AgileSprintModelId":2,"Name":"Filter Patch Notes","Description":"You should be showing people what they really want to see in the patch notes.","Notes":"Added","Status":"Done","Priority":"Blocker","Task":"Feature","OrderPriority":3,"Created":"2022-02-20T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":3,"AgileSprintModelId":5,"Name":"Consider Pyre","Description":"Add Pyre Income. Make it so you can take Pyre Camps and Pyre Miners","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":4,"AgileSprintModelId":5,"Name":"Optimizations","Description":"Build Calculator should be usable.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":5,"AgileSprintModelId":5,"Name":"Change Attack Timing Interval","Description":"Be able to set attack timing.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":6,"AgileSprintModelId":5,"Name":"Add Pyre Spells","Description":"Make Pyre Spells castable and consume Pyre on build order","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":7,"AgileSprintModelId":null,"Name":"Default builds (Rush Thrones)","Description":"Add a dropdown list of default builds.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":8,"AgileSprintModelId":null,"Name":"Load older builds","Description":"Be able to load older builds. How are you going to handle auto correct to current patch?","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":9,"AgileSprintModelId":null,"Name":"How to use Build Calculator step by step","Description":"Need docs","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":10,"AgileSprintModelId":null,"Name":"Compare Health and Damage","Description":"Refer to community example spreadsheet.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":11,"AgileSprintModelId":null,"Name":"Compare Unit\u0027s Damage with it\u0027s own costs","Description":"Refer to community example spreadsheet.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":12,"AgileSprintModelId":4,"Name":"View one unit stats from a link. Make YAML copy and paste","Description":"Design so people can easily copy and paste data into discord","Notes":"Ended up not using exact Yaml. Button in Database controls Detailed vs Plain display ","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-20T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":13,"AgileSprintModelId":2,"Name":"Look into SQL","Description":"You really should be using SQL.","Notes":"Agile and Change log pages now use SQL","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":14,"AgileSprintModelId":1,"Name":"Mobile Menu","Description":"You need a real mobile menu. Viewers don\u0027t scroll below the fold, so no one is going to know what happens when you click a button on phones.","Notes":"Added smaller menus for tablets and phones.","Status":"Done","Priority":"High","Task":"Feature","OrderPriority":3,"Created":"2022-02-18T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":15,"AgileSprintModelId":2,"Name":"Acropolis Consume Mote","Description":"The Mote is suppose to be consumed when making a Town Hall.","Notes":"Fixed","Status":"Done","Priority":"High","Task":"Bug","OrderPriority":3,"Created":"2022-02-18T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":16,"AgileSprintModelId":5,"Name":"Multiple Travel Time in Harass Calculator","Description":"Travel time should be based on the amount of bases used. 3 bases is 3 travel times.","Notes":"Add notes...","Status":"Todo","Priority":"Low","Task":"Feature","OrderPriority":2,"Created":"2022-02-18T00:00:00","Finished":null},{"Id":17,"AgileSprintModelId":1,"Name":"Update Database to 0.0.6.8375a","Description":"Xacal tech change, and Hallower damage change. Update Godhead text.","Notes":"Done","Status":"Done","Priority":"None","Task":"Feature","OrderPriority":3,"Created":"2022-02-18T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":18,"AgileSprintModelId":null,"Name":"Patch History Viewer","Description":"Add an ability to compare patches, to see all nerfs and buffs made between them.","Notes":"Inspired by Zkay\u0027s post on discord, where he details a possible \u0027patch history viewer\u0027 implementation.","Status":"Fun_Idea","Priority":"None","Task":"Feature","OrderPriority":5,"Created":"2022-02-16T00:00:00","Finished":null},{"Id":19,"AgileSprintModelId":1,"Name":"Twitch Page","Description":"Did a ~3 hour test stream, and was personal quite happy with the quality. Make Twitch page, and stream patch, sprint planning and development on Sunday.","Notes":"Page added under General, and named \u0022Streams\u0022.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-16T00:00:00","Finished":"2022-02-16T00:00:00"},{"Id":20,"AgileSprintModelId":1,"Name":"Finish the database","Description":"Add more descriptions for everything. Reduce any data duplication with ids. Add upgrade connections. Add ability connections. Add passives and passives connections.","Notes":"Good enough for now","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-11T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":21,"AgileSprintModelId":1,"Name":"Change Log View","Description":"Add a log to view last changes.","Notes":"Added changelog page. Shows Today, X Days Ago, or exact date if patch is over a week old.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-14T00:00:00","Finished":"2022-02-14T00:00:00"},{"Id":22,"AgileSprintModelId":1,"Name":"Agile View","Description":"Add the agile view.","Notes":"Finished.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-11T00:00:00","Finished":"2022-02-17T00:00:00"},{"Id":23,"AgileSprintModelId":1,"Name":"GUID for Ids","Description":"Stop using enums for ids, and start using guids. Enums are just too limited, I lose out on component and inheritance design with them. Replace all your enums with guids, rip off the bandaid.","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-11T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":24,"AgileSprintModelId":1,"Name":"Co-op overview","Description":"Write some sort of blog on co-op gameplay so you have something the feels very content-ish. Maybe make it a video.","Notes":"Finished and released early.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-11T00:00:00","Finished":"2022-02-12T00:00:00"},{"Id":25,"AgileSprintModelId":1,"Name":"Mobile UI","Description":"Make website work on mobile.","Notes":"Should be good. Will test on phone later.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-15T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":26,"AgileSprintModelId":1,"Name":"Add Making Of View","Description":"View to reference UI designs. Nicely encourages the pratice of making the UI code a lot cleaner.","Notes":"Good enough for now","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-11T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":27,"AgileSprintModelId":3,"Name":"Close Nav Menu on Navigation","Description":"Close Nav Menu on Navigation","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":28,"AgileSprintModelId":3,"Name":"Add Passive Descriptions and Passive","Description":"Have to guess on a bunch of passives","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-03-31T00:00:00"},{"Id":29,"AgileSprintModelId":3,"Name":"Tooltips that show referenced units","Description":"I should see any referenced unit by hovering over it","Notes":"Links can now go to links which can go to links.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-04-01T00:00:00"},{"Id":30,"AgileSprintModelId":null,"Name":"Update Logo for Website","Description":"After color scheme is picked","Notes":null,"Status":"Todo","Priority":"Low","Task":"Feature","OrderPriority":2,"Created":"2022-03-27T00:00:00","Finished":null},{"Id":31,"AgileSprintModelId":3,"Name":"Documentation page","Description":"Add documents on how to maintain website","Notes":"Added start of documents","Status":"Done","Priority":"Low","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":32,"AgileSprintModelId":null,"Name":"Test Automation","Description":"Selenium Tests","Notes":"Start adding IDs to everything","Status":"Todo","Priority":"Low","Task":"Feature","OrderPriority":2,"Created":"2022-03-27T00:00:00","Finished":null},{"Id":33,"AgileSprintModelId":null,"Name":"Unit Test","Description":"Add some unit tests","Notes":null,"Status":"Todo","Priority":"Low","Task":"Feature","OrderPriority":2,"Created":"2022-03-27T00:00:00","Finished":null},{"Id":34,"AgileSprintModelId":4,"Name":"Fully Transfer everything to SQL","Description":"Need to regenerate the database once everthing is fully transfered","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-04-09T00:00:00"},{"Id":35,"AgileSprintModelId":3,"Name":"Adding a loading Component","Description":"For JSON loading","Notes":"Added loading component to Agile and Changelog screens","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":36,"AgileSprintModelId":3,"Name":"Optimize Loading of Data","Description":"Currently loading non Agile stuff on Agile page","Notes":"Moved SQL database injection to app root","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":37,"AgileSprintModelId":3,"Name":"Convert Notes to Markdown","Description":"Using Markdown and generating the Note pages seems like a better solution to SQL or hardcoding data","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-04-01T00:00:00"},{"Id":38,"AgileSprintModelId":3,"Name":"Improve Entity Filter Options","Description":"The options I give you is strange, given it filers on Faction type","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","OrderPriority":3,"Created":"2022-04-01T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":39,"AgileSprintModelId":4,"Name":"Refresh Database Bug","Description":"Database dialog UI isn\u0027t refreshing enough","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","OrderPriority":3,"Created":"2022-04-03T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":40,"AgileSprintModelId":4,"Name":"Branding Stuff","Description":"Add a schedule, improving branding, etc, ","Notes":"Only improved Twitch overlays","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-03T00:00:00","Finished":"2022-04-10T00:00:00"},{"Id":41,"AgileSprintModelId":4,"Name":"Improve Documents/Notes UI","Description":"Should have a left navigation menu. And prev/next buttons","Notes":"Updated UI. Will added prev/next and breadcrumbs later","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-05T00:00:00","Finished":"2022-04-10T00:00:00"},{"Id":42,"AgileSprintModelId":5,"Name":"Add GitHub links instead of showing code","Description":"For all code examples","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":43,"AgileSprintModelId":5,"Name":"Research More used RTS calculations","Description":"What other calculators like the Harass Page can be added","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2001-01-01T00:00:00","Finished":null},{"Id":44,"AgileSprintModelId":5,"Name":"Add Error Toasts to Calculator","Description":"Not enough \u0022Ether\u0022","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":45,"AgileSprintModelId":5,"Name":"Handle Divide by Zero in Harass Calculator","Description":"addDescription","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":46,"AgileSprintModelId":5,"Name":"Harass Calculator first user experience","Description":"Navigate player though the harass calculator steps","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":47,"AgileSprintModelId":5,"Name":"Training Queue","Description":"Add training queue times to the build calculator","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":48,"AgileSprintModelId":5,"Name":"Refresh Button for Build Calculator","Description":"Refresh to regenerate timeline and charts","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":49,"AgileSprintModelId":5,"Name":"Gameplay Warning State Toasts","Description":"\u0022You should upgrade your economy.\u0022 \u0022Your using too much ether, spend alloy\u0022","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":50,"AgileSprintModelId":5,"Name":"Make desktop navigation buttons","Description":"It popping up all the time is a tad tedious","Notes":"addNotes","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-10T00:00:00","Finished":"2022-04-12T00:00:00"},{"Id":51,"AgileSprintModelId":5,"Name":"Working Timers","Description":"Toast dismiss timers not making sense. Look into proper Timers","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":52,"AgileSprintModelId":5,"Name":"Clean up Build Calculator code","Description":"Code needs to be easily readable so it can be updated, maintained, and optimized","Notes":"addNotes","Status":"In_Progress","Priority":"Medium","Task":"Feature","OrderPriority":1,"Created":"2022-04-12T00:00:00","Finished":null}] \ No newline at end of file diff --git a/IGP/wwwroot/generated/WebSectionModels.json b/IGP/wwwroot/generated/WebSectionModels.json index a1d8d97..9f7d2fc 100644 --- a/IGP/wwwroot/generated/WebSectionModels.json +++ b/IGP/wwwroot/generated/WebSectionModels.json @@ -1 +1 @@ -[{"Id":1,"Name":"Tools","Description":"Tools Stuff","Href":null,"Order":1,"IsPrivate":"False"},{"Id":2,"Name":"Resources","Description":"Resources Stuff","Href":null,"Order":2,"IsPrivate":"False"},{"Id":3,"Name":"General","Description":"About Stuff","Href":null,"Order":3,"IsPrivate":"False"},{"Id":4,"Name":"Development","Description":"Development Stuff","Href":null,"Order":4,"IsPrivate":"False"}] \ No newline at end of file +[{"Id":1,"Name":"Tools","Description":"Tools Stuff","Href":null,"Order":1,"IsPrivate":"False","WebPageModels":[]},{"Id":2,"Name":"Resources","Description":"Resources Stuff","Href":null,"Order":2,"IsPrivate":"False","WebPageModels":[]},{"Id":3,"Name":"General","Description":"About Stuff","Href":null,"Order":3,"IsPrivate":"False","WebPageModels":[]},{"Id":4,"Name":"Development","Description":"Development Stuff","Href":null,"Order":4,"IsPrivate":"False","WebPageModels":[]}] \ No newline at end of file diff --git a/Model/Entity/EntityModel.cs b/Model/Entity/EntityModel.cs index ea31179..4ee44c4 100644 --- a/Model/Entity/EntityModel.cs +++ b/Model/Entity/EntityModel.cs @@ -177,7 +177,7 @@ public class EntityModel } - public EntityProductionModel Production() + public EntityProductionModel? Production() { return ((EntityProductionModel)EntityParts.Find(x => x.GetType() == typeof(EntityProductionModel))!)!; } diff --git a/Model/Website/WebPageModel.cs b/Model/Website/WebPageModel.cs index 3cccd4a..19e9cfb 100644 --- a/Model/Website/WebPageModel.cs +++ b/Model/Website/WebPageModel.cs @@ -3,7 +3,7 @@ public class WebPageModel { public int Id { get; set; } - public int WebSectionModelId { get; set; } + public int? WebSectionModelId { get; set; } public string Name { get; set; } = "Add name"; public string Description { get; set; } = "Add description"; public string Href { get; set; } = null; diff --git a/Model/Website/WebSectionModel.cs b/Model/Website/WebSectionModel.cs index 06e517c..d86770a 100644 --- a/Model/Website/WebSectionModel.cs +++ b/Model/Website/WebSectionModel.cs @@ -1,4 +1,7 @@ -namespace Model.Website; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Model.Website; public class WebSectionModel { @@ -8,4 +11,6 @@ public class WebSectionModel public string Href { get; set; } = null; public int Order { get; set; } = 0; public string IsPrivate { get; set; } = "True"; + + [NotMapped] public List WebPageModels { get; set; } = new List(); } \ No newline at end of file diff --git a/Services/IServices.cs b/Services/IServices.cs index 7d19d21..ee536a4 100644 --- a/Services/IServices.cs +++ b/Services/IServices.cs @@ -1,15 +1,8 @@  -#if NO_SQL - -#else -using Contexts; -using Microsoft.EntityFrameworkCore; -#endif using Model.Doc; using Model.BuildOrders; using Model.Economy; using Model.Entity; -using Model.Entity.Data; using Model.MemoryTester; using Model.Notes; using Model.Website; @@ -52,26 +45,15 @@ public interface IEntityDialogService } public interface IWebsiteService { -#if NO_SQL public List WebPageModels { get; set; } public List WebSectionModels { get; set; } -#else - public DbSet WebPageModels { get; } - public DbSet WebSectionModels { get; } -#endif public void Subscribe(Action action); public void Unsubscribe(Action action); public void Update(); -#if NO_SQL public Task Load(); -#else - - public Task Load(DatabaseContext database); -#endif - public bool IsLoaded(); } @@ -146,6 +128,8 @@ public interface INavigationService { public void Subscribe(Action action); public void Unsubscribe(Action action); + public void ChangeNavigationSectionId(int newState); + public int GetNavigationSectionId(); public void ChangeNavigationState(string newState); public string GetNavigationState(); diff --git a/Services/Immortal/BuildOrderService.cs b/Services/Immortal/BuildOrderService.cs index fde9112..46157a9 100644 --- a/Services/Immortal/BuildOrderService.cs +++ b/Services/Immortal/BuildOrderService.cs @@ -9,29 +9,34 @@ using YamlDotNet.Serialization; namespace Services.Immortal; -public class BuildOrderService : IBuildOrderService { - private int HumanMicro = 2; - +public class BuildOrderService : IBuildOrderService +{ private readonly BuildOrderModel buildOrder = new(); - private int lastInterval = 0; - - public int GetLastRequestInterval() { + private readonly int HumanMicro = 2; + private int lastInterval; + + public int GetLastRequestInterval() + { return lastInterval; } - public Dictionary> GetOrders() { + public Dictionary> GetOrders() + { return buildOrder.Orders; } - public void Subscribe(Action action) { + public void Subscribe(Action action) + { OnChange += action; } - public void Unsubscribe(Action action) { + public void Unsubscribe(Action action) + { OnChange -= action; } - public void Add(EntityModel entity, int atInterval) { + public void Add(EntityModel entity, int atInterval) + { if (!buildOrder.Orders.ContainsKey(atInterval)) buildOrder.Orders.Add(atInterval, new List { entity.Clone() }); else @@ -40,64 +45,76 @@ public class BuildOrderService : IBuildOrderService { if (atInterval > lastInterval) lastInterval = atInterval; } - public bool Add(EntityModel entity, IEconomyService withEconomy, IToastService withToasts) { - if (entity != null) { - var production = entity.Production(); + public bool Add(EntityModel entity, IEconomyService withEconomy, IToastService withToasts) + { + var production = entity.Production(); + + if (production != null) + { + for (var interval = lastInterval; interval < withEconomy.GetOverTime().Count; interval++) + { + var economyAtSecond = withEconomy.GetOverTime()[interval]; + if (economyAtSecond.Alloy >= production.Alloy && economyAtSecond.Ether >= production.Ether && + economyAtSecond.Pyre >= production.Pyre) + { + if (!MeetsSupply(entity)) + { + withToasts.AddToast(new ToastModel + { + Title = "Supply Cap Reached", Message = "Build more supply!", + SeverityType = SeverityType.Error + }); + return false; + } - if (production != null) { - for (var interval = lastInterval; interval < withEconomy.GetOverTime().Count; interval++) { - var economyAtSecond = withEconomy.GetOverTime()[interval]; - if (economyAtSecond.Alloy >= production.Alloy && economyAtSecond.Ether >= production.Ether && - economyAtSecond.Pyre >= production.Pyre) { - if (!MeetsSupply(entity)) { - withToasts.AddToast(new ToastModel {Title = "Supply Cap Reached", Message = "Build more supply!", SeverityType = SeverityType.Error}); - return false; - } + if (!MeetsRequirements(entity, interval)) continue; - if (!MeetsRequirements(entity, interval)) continue; + //Account for human Micro delay + interval += HumanMicro; - //Account for human Micro delay - interval += HumanMicro; + if (!buildOrder.Orders.ContainsKey(interval)) + buildOrder.Orders.Add(interval, new List { entity.Clone() }); + else + buildOrder.Orders[interval].Add(entity.Clone()); - if (!buildOrder.Orders.ContainsKey(interval)) - buildOrder.Orders.Add(interval, new List { entity.Clone() }); - else - buildOrder.Orders[interval].Add(entity.Clone()); + lastInterval = interval; - lastInterval = interval; + NotifyDataChanged(); + return true; + } - NotifyDataChanged(); - return true; - } - else if(interval + 1 == withEconomy.GetOverTime().Count) - { - if (economyAtSecond.Ether < production.Ether) + if (interval + 1 == withEconomy.GetOverTime().Count) + { + if (economyAtSecond.Ether < production.Ether) + withToasts.AddToast(new ToastModel { - withToasts.AddToast(new ToastModel {Title = "Not Enough Ether", Message = "Build more ether extractors!", SeverityType = SeverityType.Error}); - - } - - } + Title = "Not Enough Ether", Message = "Build more ether extractors!", + SeverityType = SeverityType.Error + }); } } - else { - Add(entity, 0); - NotifyDataChanged(); - return true; - } + } + else + { + Add(entity, 0); + NotifyDataChanged(); + return true; } return false; } - public void RemoveLast() { + public void RemoveLast() + { EntityModel entityRemoved = null!; - if (buildOrder.Orders.Keys.Count > 1) { + if (buildOrder.Orders.Keys.Count > 1) + { var last = buildOrder.Orders.Keys.Last(); - if (buildOrder.Orders[last].Count > 0) { + if (buildOrder.Orders[last].Count > 0) + { entityRemoved = buildOrder.Orders[last].Last(); buildOrder.Orders[last].Remove(buildOrder.Orders[last].Last()); } @@ -109,7 +126,8 @@ public class BuildOrderService : IBuildOrderService { else lastInterval = 1; - if (entityRemoved?.Info()?.Descriptive == DescriptiveType.Worker) { + if (entityRemoved?.Info()?.Descriptive == DescriptiveType.Worker) + { RemoveLast(); return; } @@ -119,15 +137,18 @@ public class BuildOrderService : IBuildOrderService { } - public string AsJson() { - var options = new JsonSerializerOptions { + public string AsJson() + { + var options = new JsonSerializerOptions + { WriteIndented = true }; options.Converters.Add(new JsonStringEnumConverter()); return JsonSerializer.Serialize(buildOrder, options); } - public string BuildOrderAsYaml() { + public string BuildOrderAsYaml() + { var stringBuilder = new StringBuilder(); var serializer = new Serializer(); stringBuilder.AppendLine(serializer.Serialize(buildOrder)); @@ -135,28 +156,32 @@ public class BuildOrderService : IBuildOrderService { return buildOrderText; } - public List GetOrdersAt(int interval) { + public List GetOrdersAt(int interval) + { return (from ordersAtTime in buildOrder.Orders from orders in ordersAtTime.Value where ordersAtTime.Key == interval select orders).ToList(); } - public List GetCompletedAt(int interval) { + public List GetCompletedAt(int interval) + { return (from ordersAtTime in buildOrder.Orders from orders in ordersAtTime.Value where ordersAtTime.Key + (orders.Production() == null ? 0 : orders.Production().BuildTime) == interval select orders).ToList(); } - public List GetCompletedBefore(int interval) { + public List GetCompletedBefore(int interval) + { return (from ordersAtTime in buildOrder.Orders from orders in ordersAtTime.Value where ordersAtTime.Key + (orders.Production() == null ? 0 : orders.Production().BuildTime) <= interval select orders).ToList(); } - public List GetHarvestersCompletedBefore(int interval) { + public List GetHarvestersCompletedBefore(int interval) + { return (from ordersAtTime in buildOrder.Orders from orders in ordersAtTime.Value where ordersAtTime.Key + (orders.Production() == null ? 0 : orders.Production().BuildTime) <= interval @@ -164,12 +189,14 @@ public class BuildOrderService : IBuildOrderService { select orders).ToList(); } - public bool MeetsRequirements(EntityModel entity, int requestedInterval) { + public bool MeetsRequirements(EntityModel entity, int requestedInterval) + { var requirements = entity.Requirements(); if (requirements.Count == 0) return true; foreach (var requirement in requirements) - if (requirement.Requirement == RequirementType.Morph) { + if (requirement.Requirement == RequirementType.Morph) + { var entitiesNeeded = from entitiesAtInterval in buildOrder.Orders from requiredEntity in entitiesAtInterval.Value where requestedInterval > entitiesAtInterval.Key + @@ -185,7 +212,8 @@ public class BuildOrderService : IBuildOrderService { if (entitiesAlreadyMorphed.Count() >= entitiesNeeded.Count()) return false; } - else { + else + { var entitiesNeeded = from entitiesAtInterval in buildOrder.Orders from requiredEntity in entitiesAtInterval.Value where requestedInterval > entitiesAtInterval.Key + @@ -204,40 +232,48 @@ public class BuildOrderService : IBuildOrderService { return true; } - public void SetName(string Name) { + public void SetName(string Name) + { buildOrder.Name = Name; NotifyDataChanged(); } - public string GetName() { + public string GetName() + { return buildOrder.Name; } - public void SetNotes(string Notes) { + public void SetNotes(string Notes) + { buildOrder.Notes = Notes; NotifyDataChanged(); } - public string GetNotes() { + public string GetNotes() + { return buildOrder.Notes; } - public void SetColor(string color) { + public void SetColor(string color) + { buildOrder.Color = color; NotifyDataChanged(); } - public string GetColor() { + public string GetColor() + { return buildOrder.Color; } private event Action OnChange = null!; - private void NotifyDataChanged() { + private void NotifyDataChanged() + { OnChange?.Invoke(); } - public bool MeetsSupply(EntityModel entity) { + public bool MeetsSupply(EntityModel entity) + { var supply = entity.Supply(); if (supply == null || supply.Takes == 0) return true; diff --git a/Services/Immortal/EconomyService.cs b/Services/Immortal/EconomyService.cs index 648d57b..aa974c8 100644 --- a/Services/Immortal/EconomyService.cs +++ b/Services/Immortal/EconomyService.cs @@ -5,10 +5,10 @@ using Model.Types; namespace Services.Immortal; public class EconomyService : IEconomyService { - private List _overTime = null!; + private List _economyOverTime = null!; public List GetOverTime() { - return _overTime; + return _economyOverTime; } public void Subscribe(Action action) { @@ -20,28 +20,32 @@ public class EconomyService : IEconomyService { } public void Calculate(IBuildOrderService buildOrder, ITimingService timing, int fromInterval) { - if (_overTime == null) { - _overTime = new List(); + + //TODO Break all this up + if (_economyOverTime == null) { + _economyOverTime = new List(); for (var interval = 0; interval < timing.GetTiming(); interval++) - _overTime.Add(new EconomyModel { Interval = interval }); + _economyOverTime.Add(new EconomyModel { Interval = interval }); } - if (_overTime.Count > timing.GetTiming()) - _overTime.RemoveRange(timing.GetTiming(), _overTime.Count - timing.GetTiming()); + + + if (_economyOverTime.Count > timing.GetTiming()) + _economyOverTime.RemoveRange(timing.GetTiming(), _economyOverTime.Count - timing.GetTiming()); - while (_overTime.Count < timing.GetTiming()) _overTime.Add(new EconomyModel { Interval = _overTime.Count - 1 }); + while (_economyOverTime.Count < timing.GetTiming()) _economyOverTime.Add(new EconomyModel { Interval = _economyOverTime.Count - 1 }); for (var interval = fromInterval; interval < timing.GetTiming(); interval++) { - var economyAtSecond = _overTime[interval]; + var economyAtSecond = _economyOverTime[interval]; if (interval > 0) { - economyAtSecond.Alloy = _overTime[interval - 1].Alloy; - economyAtSecond.Ether = _overTime[interval - 1].Ether; - economyAtSecond.Pyre = _overTime[interval - 1].Pyre; - economyAtSecond.WorkerCount = _overTime[interval - 1].WorkerCount; - economyAtSecond.BusyWorkerCount = _overTime[interval - 1].BusyWorkerCount; - economyAtSecond.CreatingWorkerCount = _overTime[interval - 1].CreatingWorkerCount; - economyAtSecond.Harvesters = _overTime[interval - 1].Harvesters.ToList(); - economyAtSecond.CreatingWorkerDelays = _overTime[interval - 1].CreatingWorkerDelays.ToList(); + economyAtSecond.Alloy = _economyOverTime[interval - 1].Alloy; + economyAtSecond.Ether = _economyOverTime[interval - 1].Ether; + economyAtSecond.Pyre = _economyOverTime[interval - 1].Pyre; + economyAtSecond.WorkerCount = _economyOverTime[interval - 1].WorkerCount; + economyAtSecond.BusyWorkerCount = _economyOverTime[interval - 1].BusyWorkerCount; + economyAtSecond.CreatingWorkerCount = _economyOverTime[interval - 1].CreatingWorkerCount; + economyAtSecond.Harvesters = _economyOverTime[interval - 1].Harvesters.ToList(); + economyAtSecond.CreatingWorkerDelays = _economyOverTime[interval - 1].CreatingWorkerDelays.ToList(); } economyAtSecond.Interval = interval; @@ -134,7 +138,7 @@ public class EconomyService : IEconomyService { public EconomyModel GetEconomy(int atInterval) { - return _overTime[atInterval]; + return _economyOverTime[atInterval]; } private event Action onChange = null!; diff --git a/Services/Website/NavigationService.cs b/Services/Website/NavigationService.cs index 206488a..d40eb39 100644 --- a/Services/Website/NavigationService.cs +++ b/Services/Website/NavigationService.cs @@ -4,13 +4,18 @@ namespace Services.Website; public class NavigationService : INavigationService { private string navigationStateType = NavigationStateType.Default; - + private int navigationStateId = -1; + private NavSelectionType navSelectionType = NavSelectionType.None; + + private Type renderType = null!; private int webPageType; private int webSectionType; + + public void Subscribe(Action action) { OnChange += action; } @@ -19,6 +24,17 @@ public class NavigationService : INavigationService { OnChange += action; } + public void ChangeNavigationSectionId(int newState) + { + navigationStateId = newState; + NotifyDataChanged(); + } + + public int GetNavigationSectionId() + { + return navigationStateId; + } + public void ChangeNavigationState(string newState) { if (newState.Equals(navigationStateType)) return; diff --git a/Services/Website/WebsiteService.cs b/Services/Website/WebsiteService.cs index 4d1e18b..c28058b 100644 --- a/Services/Website/WebsiteService.cs +++ b/Services/Website/WebsiteService.cs @@ -1,10 +1,5 @@ using System.Net.Http.Json; -#if !NO_SQL -using Contexts; -using Microsoft.EntityFrameworkCore; -#endif - using Model.Website; namespace Services.Development; @@ -24,17 +19,8 @@ public class WebsiteService : IWebsiteService { -#if NO_SQL public List WebSectionModels { get; set; } = default!; public List WebPageModels { get; set; } = default!; -#else - - private DatabaseContext Database { get; set; } - - - public DbSet WebSectionModels => Database.WebSectionModels; - public DbSet WebPageModels => Database.WebPageModels; -#endif public void Subscribe(Action action) { @@ -49,39 +35,35 @@ public class WebsiteService : IWebsiteService { return isLoaded; } -#if NO_SQL - public async Task Load() { if (isLoaded) {return;} - - WebPageModels = ((await httpClient.GetFromJsonAsync("generated/WebPageModels.json"))!).ToList(); WebSectionModels =((await httpClient.GetFromJsonAsync("generated/WebSectionModels.json"))!).ToList(); isLoaded = true; - NotifyDataChanged(); - } -#else - public async Task Load(DatabaseContext database) { - Database = database; - - if (isLoaded) {return;} - - Database.WebPageModels.AddRange(await httpClient.GetFromJsonAsync("generated/WebPageModels.json")); - Database.WebSectionModels.AddRange( - await httpClient.GetFromJsonAsync("generated/WebSectionModels.json")); - - Database.SaveChanges(); - - isLoaded = true; + SortSql(); NotifyDataChanged(); - } -#endif - + } + void SortSql() + { + foreach (var page in WebPageModels) + { + + if (page.WebSectionModelId != null) + { + WebSectionModel webSection = + WebSectionModels.Find(webSection => webSection.Id == page.WebSectionModelId); + + webSection.WebPageModels.Add(page); + } + } + + } + public void Update() { NotifyDataChanged(); }