Merge pull request #48 from reidst/main

Deployment
reidst · Dec 11, 2023 · 348fbfe · 348fbfe
2 parents 62cab0c + 188c3fd
commit 348fbfe
Show file tree

Hide file tree

Showing 19 changed files with 387 additions and 126 deletions.
diff --git a/.gitignore b/.gitignore
@@ -396,3 +396,7 @@ FodyWeavers.xsd
 
 # JetBrains Rider
 *.sln.iml
+
+ISG.db
+ISG.db-shm
+ISG.db-wal
diff --git a/Areas/Identity/Pages/Account/Login.cshtml b/Areas/Identity/Pages/Account/Login.cshtml
@@ -5,33 +5,39 @@
     ViewData["Title"] = "Log in";
 }
 
+<br>
+<div id="header_box">
 <h1>@ViewData["Title"]</h1>
-<div class="row">
-    <div class="col-md-4">
+</div>
+<br>
+
+<div class="row" id="ro">
+    <h2>Use a local account to log in.</h2>
+    <div class="col-md-4" id="cont">
         <section>
             <form id="account" method="post">
-                <h2>Use a local account to log in.</h2>
-                <hr />
                 <div asp-validation-summary="ModelOnly" class="text-danger" role="alert"></div>
+                <hr/>
                 <div class="form-floating mb-3">
-                    <input asp-for="Input.UserName" class="form-control" autocomplete="username" aria-required="true" placeholder="jane-smith" />
+                    <input asp-for="Input.UserName" class="form-control" autocomplete="username" aria-required="true" placeholder="jane-smith"/>
                     <label asp-for="Input.UserName" class="form-label">Username</label>
                     <span asp-validation-for="Input.UserName" class="text-danger"></span>
                 </div>
                 <div class="form-floating mb-3">
-                    <input asp-for="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" placeholder="password" />
+                    <input asp-for="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" placeholder="password"/>
                     <label asp-for="Input.Password" class="form-label">Password</label>
                     <span asp-validation-for="Input.Password" class="text-danger"></span>
                 </div>
                 <div class="checkbox mb-3">
                     <label asp-for="Input.RememberMe" class="form-label">
-                        <input class="form-check-input" asp-for="Input.RememberMe" />
+                        <input class="form-check-input" asp-for="Input.RememberMe"/>
                         @Html.DisplayNameFor(m => m.Input.RememberMe)
                     </label>
                 </div>
                 <div>
                     <button id="login-submit" type="submit" class="w-100 btn btn-lg btn-primary">Log in</button>
                 </div>
+                <br>
                 <div>
                     <p>
                         <a id="forgot-password" asp-page="./ForgotPassword">Forgot your password?</a>
@@ -46,7 +52,7 @@
             </form>
         </section>
     </div>
-    <div class="col-md-6 col-md-offset-2">
+    <!-- <div class="col-md-6 col-md-offset-2">
         <section>
             <h3>Use another service to log in.</h3>
             <hr />
@@ -75,9 +81,37 @@
                 }
             }
         </section>
-    </div>
+    </div> -->
 </div>
 
 @section Scripts {
     <partial name="_ValidationScriptsPartial" />
 }
+
+<style>
+    input {
+        border-color: darkgreen;
+        outline: none;
+    }
+
+    #login-submit {
+        background-color: #557639;
+        outline: none;
+        border-color: black;
+    }
+
+    h1{
+        padding: 5px;
+        margin: auto;
+        text-align: center;
+    }
+    h2{
+        margin: auto;
+        text-align: center;
+    }
+
+    #cont {
+        margin: auto;
+        justify-content: center;
+    }
+</style>
diff --git a/Areas/Identity/Pages/Account/Register.cshtml b/Areas/Identity/Pages/Account/Register.cshtml
@@ -4,12 +4,16 @@
     ViewData["Title"] = "Register";
 }
 
+<br>
+<div id="header_box">
 <h1>@ViewData["Title"]</h1>
+</div>
+<br>
 
 <div class="row">
-    <div class="col-md-4">
+    <h2>Create a new account.</h2>
+    <div class="col-md-4" id="cont">
         <form id="registerForm" asp-route-returnUrl="@Model.ReturnUrl" method="post">
-            <h2>Create a new account.</h2>
             <hr />
             <div asp-validation-summary="ModelOnly" class="text-danger" role="alert"></div>
             <div class="form-floating mb-3">
@@ -35,6 +39,8 @@
             <button id="registerSubmit" type="submit" class="w-100 btn btn-lg btn-primary">Register</button>
         </form>
     </div>
+
+    <!--
     <div class="col-md-6 col-md-offset-2">
         <section>
             <h3>Use another service to register.</h3>
@@ -65,8 +71,38 @@
             }
         </section>
     </div>
+    -->
 </div>
 
 @section Scripts {
     <partial name="_ValidationScriptsPartial" />
 }
+
+<style>
+    input {
+        border-color: darkgreen;
+        outline: none;
+    }
+
+    #registerSubmit {
+        background-color: #557639;
+        outline: none;
+        border-color: black;
+    }
+
+    h1{
+        padding: 5px;
+        margin: auto;
+        text-align: center;
+    }
+
+    h2{
+        margin: auto;
+        text-align: center;
+    }
+
+    #cont {
+        margin: auto;
+        justify-content: center;
+    }
+</style>
diff --git a/ISG.db-shm b/ISG.db-shm
diff --git a/ISG.db-wal b/ISG.db-wal
diff --git a/Models/Taxa.cs b/Models/Taxa.cs
@@ -34,5 +34,12 @@ public class Taxa
         public string? USDAsynonym { get; set; }
         [ForeignKey("GenusID")]
         public Genera? Genus { get; set; } 
+
+        [DisplayName("Plant")]
+        public string Name {
+            get {
+                return GenusID.Normalize() + " " + SpecificEpithet.ToLower();
+            }
+        }
     }
 }
diff --git a/Pages/About.cshtml b/Pages/About.cshtml
@@ -5,12 +5,42 @@
 }
 
 <br>
+
+<section class="container-fluid">
 <h1 id=about_header>Our Mission</h1>
-<p>Use this page to detail your site.</p>
+<div class="row">
+<div class="col-md-9">
+<p>Many botanists, whether academic, professional, or amateur, use scientific names in their lists and in their writing. With the increasing spread of 
+    plant species around the globe (whether on purpose or inadvertently), botanists more and more often need to use names that are not on their local 
+    lists – and there are over 386 thousand plant species worldwide! Finding the currently accepted scientific name efficiently and getting it onto a list or 
+    into a document with the correct spelling is challenging. There is a publicly available list, curated by a group of botanists at the Royal Botanic Gardens 
+    (Kew), that includes all of the accepted and synonym species worldwide. I have streamlined that list into an efficient database that serves as the foundation 
+    for an app that allows users to find and select names and then build lists that they can download to suit their needs.</p>
 
-<br>
+<p>The human tendency to ignore all plants (especially those that are not currently flowering or fruiting) in favor of animals, insects, and edible fruits, 
+    has been described as “green blindness”. Because using a name for someone or something is an important facet of recognition, an easily-used database of plant 
+    names is an important counterbalance, allowing people to “see” more and more of the green around them. Thus, my database and app are named I See Green.</p>
+</div>
+<div class="col-md-3">
+<a href="https://www.amazon.com/Learn-Love-Those-Latin-Names/dp/B09TYFYPZD"><img src="https://encrypted-tbn1.gstatic.com/images?q=tbn:ANd9GcSIieQARSSHmgiDMDLNPXqsZ_sG8LhC0M94ADUdFKtm9V6Biwlh"></img></a>
+</div>
+</div>
+</section>
 
-<h1 id=about_header>About Us</h1>
+<br>
 
-<p>Use this page to detail your site.</p>
+<section class="container-fluid">
+<h1 id=about_header>About Me</h1>
+<div class="row">
+<div class="col-md-8">
+<p>Ann Willyard taught Botany and Plant Systematics at Hendrix College. She earned a PhD from Oregon State University, a MS from California State University 
+    Chico, and a BA from University of California Santa Cruz. She has published and collaborated on botanical research papers, self-published the <a class="book_link" href="https://www.amazon.com/Learn-Love-Those-Latin-Names/dp/B09TYFYPZD">
+    Learn to Love Those Latin Names</a> book, is an Associate Editor of the American Journal of Botany, and is currently working on a taxonomic revision of a 
+    complicated group of pine species that are distributed across Mexico, Central America, and the southwest United States.</p>
+</div>
+<div class="col-md-4">
+<img src="https://www.hendrix.edu/uploadedImages/Departments_and_Programs/Biology/People/Willyard,%20Ann.JPG"></img>
+</div>
+</div>
+</section>
 <br>