From 00b067fead282bb30eb8ca67572f16bd6e1920b7 Mon Sep 17 00:00:00 2001
From: Dan Volchek <volchek2@illinois.edu>
Date: Sun, 25 Aug 2019 17:14:55 -0700
Subject: detect the client's platform and check the appropriate input in the
 log parser

---
 src/SMAPI.Web/Views/LogParser/Index.cshtml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/SMAPI.Web/Views/LogParser')

diff --git a/src/SMAPI.Web/Views/LogParser/Index.cshtml b/src/SMAPI.Web/Views/LogParser/Index.cshtml
index e974c308..0dca003b 100644
--- a/src/SMAPI.Web/Views/LogParser/Index.cshtml
+++ b/src/SMAPI.Web/Views/LogParser/Index.cshtml
@@ -1,5 +1,6 @@
 @using Newtonsoft.Json
 @using StardewModdingAPI.Web.Framework.LogParsing.Models
+@using StardewModdingAPI.Web.Framework.UserAgentParsing
 @model StardewModdingAPI.Web.ViewModels.LogParserModel
 
 @{
@@ -67,10 +68,13 @@ else if (Model.ParsedLog?.IsValid == true)
     <h2>Where do I find my SMAPI log?</h2>
     <div>What system do you use?</div>
     <ul id="os-list">
-        <li><input type="radio" name="os" value="android" id="os-android" /> <label for="os-android">Android</label></li>
-        <li><input type="radio" name="os" value="linux" id="os-linux" /> <label for="os-linux">Linux</label></li>
-        <li><input type="radio" name="os" value="mac" id="os-mac" /> <label for="os-mac">Mac</label></li>
-        <li><input type="radio" name="os" value="windows" id="os-windows" /> <label for="os-windows">Windows</label></li>
+        @{
+            Platform? clientPlatform = Context.Items[ClientPlatformMiddleware.ClientPlatformKey] as Platform?;
+        }
+        <li><input type="radio" name="os" value="android" id="os-android" @(clientPlatform == Platform.Android ? "checked" : "")/> <label for="os-android">Android</label></li>
+        <li><input type="radio" name="os" value="linux" id="os-linux" @(clientPlatform == Platform.Linux ? "checked" : "")/> <label for="os-linux">Linux</label></li>
+        <li><input type="radio" name="os" value="mac" id="os-mac" @(clientPlatform == Platform.Mac ? "checked" : "")/> <label for="os-mac">Mac</label></li>
+        <li><input type="radio" name="os" value="windows" id="os-windows" @(clientPlatform == Platform.Windows ? "checked" : "")/> <label for="os-windows">Windows</label></li>
     </ul>
     <div data-os="android">
         On Android:
-- 
cgit 


From f04f7811536ba6e35c4ad6357fb6904826eda9dc Mon Sep 17 00:00:00 2001
From: Dan Volchek <volchek2@illinois.edu>
Date: Sun, 25 Aug 2019 17:21:03 -0700
Subject: rename namespace to be more accurate

---
 src/SMAPI.Web/Views/LogParser/Index.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/SMAPI.Web/Views/LogParser')

diff --git a/src/SMAPI.Web/Views/LogParser/Index.cshtml b/src/SMAPI.Web/Views/LogParser/Index.cshtml
index 0dca003b..7f8036db 100644
--- a/src/SMAPI.Web/Views/LogParser/Index.cshtml
+++ b/src/SMAPI.Web/Views/LogParser/Index.cshtml
@@ -1,6 +1,6 @@
 @using Newtonsoft.Json
+@using StardewModdingAPI.Web.Framework.ClientPlatformDetection
 @using StardewModdingAPI.Web.Framework.LogParsing.Models
-@using StardewModdingAPI.Web.Framework.UserAgentParsing
 @model StardewModdingAPI.Web.ViewModels.LogParserModel
 
 @{
-- 
cgit 


From d49ead6113c85d3b30db664aad1a965ffdef6bbb Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 31 Aug 2019 16:26:42 -0400
Subject: remove custom enum, add Android to SMAPI's platform enum

This will also be used in an upcoming commit for SMAPI's target platform constant.
---
 src/SMAPI.Web/Views/LogParser/Index.cshtml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/SMAPI.Web/Views/LogParser')

diff --git a/src/SMAPI.Web/Views/LogParser/Index.cshtml b/src/SMAPI.Web/Views/LogParser/Index.cshtml
index 7f8036db..42887019 100644
--- a/src/SMAPI.Web/Views/LogParser/Index.cshtml
+++ b/src/SMAPI.Web/Views/LogParser/Index.cshtml
@@ -1,4 +1,5 @@
 @using Newtonsoft.Json
+@using StardewModdingAPI.Toolkit.Utilities
 @using StardewModdingAPI.Web.Framework.ClientPlatformDetection
 @using StardewModdingAPI.Web.Framework.LogParsing.Models
 @model StardewModdingAPI.Web.ViewModels.LogParserModel
-- 
cgit 


From e7b214390a09fc6edc7664bce0b48cecf1d986a8 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 31 Aug 2019 16:27:36 -0400
Subject: move platform to log parser model instead of middleware

---
 src/SMAPI.Web/Views/LogParser/Index.cshtml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/SMAPI.Web/Views/LogParser')

diff --git a/src/SMAPI.Web/Views/LogParser/Index.cshtml b/src/SMAPI.Web/Views/LogParser/Index.cshtml
index 42887019..9a06d85a 100644
--- a/src/SMAPI.Web/Views/LogParser/Index.cshtml
+++ b/src/SMAPI.Web/Views/LogParser/Index.cshtml
@@ -1,6 +1,5 @@
 @using Newtonsoft.Json
 @using StardewModdingAPI.Toolkit.Utilities
-@using StardewModdingAPI.Web.Framework.ClientPlatformDetection
 @using StardewModdingAPI.Web.Framework.LogParsing.Models
 @model StardewModdingAPI.Web.ViewModels.LogParserModel
 
@@ -69,13 +68,13 @@ else if (Model.ParsedLog?.IsValid == true)
     <h2>Where do I find my SMAPI log?</h2>
     <div>What system do you use?</div>
     <ul id="os-list">
-        @{
-            Platform? clientPlatform = Context.Items[ClientPlatformMiddleware.ClientPlatformKey] as Platform?;
+        @foreach (Platform platform in new[] { Platform.Android, Platform.Linux, Platform.Mac, Platform.Windows })
+        {
+            <li>
+                <input type="radio" name="os" value="@platform" id="os-@platform" checked="@(Model.DetectedPlatform == platform)"/>
+                <label for="os-@platform">@platform</label>
+            </li>
         }
-        <li><input type="radio" name="os" value="android" id="os-android" @(clientPlatform == Platform.Android ? "checked" : "")/> <label for="os-android">Android</label></li>
-        <li><input type="radio" name="os" value="linux" id="os-linux" @(clientPlatform == Platform.Linux ? "checked" : "")/> <label for="os-linux">Linux</label></li>
-        <li><input type="radio" name="os" value="mac" id="os-mac" @(clientPlatform == Platform.Mac ? "checked" : "")/> <label for="os-mac">Mac</label></li>
-        <li><input type="radio" name="os" value="windows" id="os-windows" @(clientPlatform == Platform.Windows ? "checked" : "")/> <label for="os-windows">Windows</label></li>
     </ul>
     <div data-os="android">
         On Android:
-- 
cgit