Merge pull request #14 from zikpefu/polishing_zachary

added more buttons, changed readme, and styling
zikpefu · Apr 21, 2022 · 8e7e1bd · 8e7e1bd
2 parents 5f8aee4 + 383e98a
commit 8e7e1bd
Show file tree

Hide file tree

Showing 32 changed files with 14,254 additions and 666 deletions.
diff --git a/PaintByNumbersProject/.vs/PaintByNumbersProject/DesignTimeBuild/.dtbcache.v2 b/PaintByNumbersProject/.vs/PaintByNumbersProject/DesignTimeBuild/.dtbcache.v2
diff --git a/PaintByNumbersProject/.vs/PaintByNumbersProject/v17/.futdcache.v1 b/PaintByNumbersProject/.vs/PaintByNumbersProject/v17/.futdcache.v1
diff --git a/PaintByNumbersProject/.vs/PaintByNumbersProject/v17/.suo b/PaintByNumbersProject/.vs/PaintByNumbersProject/v17/.suo
diff --git a/PaintByNumbersProject/Views/Image/Paint.cshtml b/PaintByNumbersProject/Views/Image/Paint.cshtml
@@ -24,7 +24,11 @@
 }
 else
 {
-	@await Html.PartialAsync("_PaitingButtons")
+	<div class="hor-center">
+		@await Html.PartialAsync("_PaitingButtons")
+		<br />
+		<br />
+</div>
 	<script>
 		var imageURL = '/Image/@Model.PaintImageName';
 		var ImageID = '@Model.ImageId';

diff --git a/PaintByNumbersProject/Views/Paint/Index.cshtml b/PaintByNumbersProject/Views/Paint/Index.cshtml
@@ -1,12 +1,15 @@
 @{
-    ViewData["Title"] = "Demo";
+	ViewData["Title"] = "Demo";
 }
 
 <link rel="stylesheet" type="text/css" href="~/css/paintCanvas.css">
 
 <h1>Demo of Paiting</h1>
-@await Html.PartialAsync("_PaitingButtons")
-
+<div class="hor-center">
+	@await Html.PartialAsync("_PaitingButtons")
+	<br />
+	<br />
+</div>
 <script>
 	var imageURL = '/Image/example-image.png';
 	console.log(imageURL);

diff --git a/PaintByNumbersProject/Views/Shared/_Layout.cshtml b/PaintByNumbersProject/Views/Shared/_Layout.cshtml
@@ -12,13 +12,15 @@
 
     <meta name="msapplication-TileColor" content="#da532c">
     <meta name="theme-color" content="#ffffff">
-    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="~/css/boot_style.css" />
+@*    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />*@
     <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
     <link rel="stylesheet" href="~/PaintByNumbersProject.styles.css" asp-append-version="true" />
 </head>
 <body>
     <header>
-        <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
+        <!-- <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3"> -->
+        <nav class="navbar navbar-expand-lg navbar-light bg-light">
             <div class="container-fluid">
                 <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">Paint By Numbers</a>
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"

diff --git a/PaintByNumbersProject/Views/Shared/_PaitingButtons.cshtml b/PaintByNumbersProject/Views/Shared/_PaitingButtons.cshtml
@@ -1,3 +1,10 @@
 <button type="button" class="button1 btn" id="1" onclick="toolbox.selectedTool.changeFill(this)">1</button>
 <button type="button" class="button2 btn" id="2" onclick="toolbox.selectedTool.changeFill(this)">2</button>
-<button type="button" class="button3 btn" id="3" onclick="toolbox.selectedTool.changeFill(this)">3</button>
+<button type="button" class="button3 btn" id="3" onclick="toolbox.selectedTool.changeFill(this)">3</button>
+<button type="button" class="button4 btn" id="4" onclick="toolbox.selectedTool.changeFill(this)">4</button>
+<button type="button" class="button5 btn" id="5" onclick="toolbox.selectedTool.changeFill(this)">5</button>
+<button type="button" class="button6 btn" id="6" onclick="toolbox.selectedTool.changeFill(this)">6</button>
+<button type="button" class="button7 btn" id="7" onclick="toolbox.selectedTool.changeFill(this)">7</button>
+<button type="button" class="button8 btn" id="8" onclick="toolbox.selectedTool.changeFill(this)">8</button>
+<button type="button" class="button9 btn" id="9" onclick="toolbox.selectedTool.changeFill(this)">9</button>
+<button type="button" class="button10 btn" id="10" onclick="toolbox.selectedTool.changeFill(this)">10</button>
diff --git a/PaintByNumbersProject/bin/Debug/net6.0/PaintByNumbersProject.dll b/PaintByNumbersProject/bin/Debug/net6.0/PaintByNumbersProject.dll
diff --git a/PaintByNumbersProject/bin/Debug/net6.0/PaintByNumbersProject.exe b/PaintByNumbersProject/bin/Debug/net6.0/PaintByNumbersProject.exe
diff --git a/PaintByNumbersProject/bin/Debug/net6.0/PaintByNumbersProject.pdb b/PaintByNumbersProject/bin/Debug/net6.0/PaintByNumbersProject.pdb
diff --git a/PaintByNumbersProject/bin/Debug/net6.0/PaintByNumbersProject.staticwebassets.runtime.json b/PaintByNumbersProject/bin/Debug/net6.0/PaintByNumbersProject.staticwebassets.runtime.json
diff --git a/...sProject/obj/Debug/net6.0/PaintByNumbersProject.GeneratedMSBuildEditorConfig.editorconfig b/...sProject/obj/Debug/net6.0/PaintByNumbersProject.GeneratedMSBuildEditorConfig.editorconfig
diff --git a/PaintByNumbersProject/obj/Debug/net6.0/PaintByNumbersProject.assets.cache b/PaintByNumbersProject/obj/Debug/net6.0/PaintByNumbersProject.assets.cache
diff --git a/PaintByNumbersProject/obj/Debug/net6.0/PaintByNumbersProject.csproj.AssemblyReference.cache b/PaintByNumbersProject/obj/Debug/net6.0/PaintByNumbersProject.csproj.AssemblyReference.cache
diff --git a/PaintByNumbersProject/obj/Debug/net6.0/PaintByNumbersProject.csproj.CoreCompileInputs.cache b/PaintByNumbersProject/obj/Debug/net6.0/PaintByNumbersProject.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-bb82ab4d8a89895eb0bd1f0abf404dfa9a66f1c3
+2336ffb1eba653102c05d1504d7ceb0693a0138a
diff --git a/PaintByNumbersProject/obj/Debug/net6.0/PaintByNumbersProject.csproj.FileListAbsolute.txt b/PaintByNumbersProject/obj/Debug/net6.0/PaintByNumbersProject.csproj.FileListAbsolute.txt
diff --git a/PaintByNumbersProject/obj/Debug/net6.0/PaintByNumbersProject.dll b/PaintByNumbersProject/obj/Debug/net6.0/PaintByNumbersProject.dll
diff --git a/PaintByNumbersProject/obj/Debug/net6.0/PaintByNumbersProject.genruntimeconfig.cache b/PaintByNumbersProject/obj/Debug/net6.0/PaintByNumbersProject.genruntimeconfig.cache
@@ -1 +1 @@
-e54f1e24f2251e23afaaa5e678626d1a26876e06
+e59c76f9e9d3416be0d2f3340999909eca9e26d2
diff --git a/PaintByNumbersProject/obj/Debug/net6.0/PaintByNumbersProject.pdb b/PaintByNumbersProject/obj/Debug/net6.0/PaintByNumbersProject.pdb
diff --git a/PaintByNumbersProject/obj/Debug/net6.0/apphost.exe b/PaintByNumbersProject/obj/Debug/net6.0/apphost.exe
diff --git a/PaintByNumbersProject/obj/Debug/net6.0/project.razor.json b/PaintByNumbersProject/obj/Debug/net6.0/project.razor.json
diff --git a/PaintByNumbersProject/obj/Debug/net6.0/staticwebassets.build.json b/PaintByNumbersProject/obj/Debug/net6.0/staticwebassets.build.json
diff --git a/PaintByNumbersProject/obj/Debug/net6.0/staticwebassets.development.json b/PaintByNumbersProject/obj/Debug/net6.0/staticwebassets.development.json
diff --git a/PaintByNumbersProject/obj/PaintByNumbersProject.csproj.nuget.dgspec.json b/PaintByNumbersProject/obj/PaintByNumbersProject.csproj.nuget.dgspec.json
@@ -1,31 +1,26 @@
 {
   "format": 1,
   "restore": {
-    "C:\\Users\\roger\\Source\\Repos\\paintbynumbers\\PaintByNumbersProject\\PaintByNumbersProject.csproj": {}
+    "C:\\Users\\Zachary Ikpefua\\source\\repos\\paintbynumbers\\PaintByNumbersProject\\PaintByNumbersProject.csproj": {}
   },
   "projects": {
-    "C:\\Users\\roger\\Source\\Repos\\paintbynumbers\\PaintByNumbersProject\\PaintByNumbersProject.csproj": {
+    "C:\\Users\\Zachary Ikpefua\\source\\repos\\paintbynumbers\\PaintByNumbersProject\\PaintByNumbersProject.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "C:\\Users\\roger\\Source\\Repos\\paintbynumbers\\PaintByNumbersProject\\PaintByNumbersProject.csproj",
+        "projectUniqueName": "C:\\Users\\Zachary Ikpefua\\source\\repos\\paintbynumbers\\PaintByNumbersProject\\PaintByNumbersProject.csproj",
         "projectName": "PaintByNumbersProject",
-        "projectPath": "C:\\Users\\roger\\Source\\Repos\\paintbynumbers\\PaintByNumbersProject\\PaintByNumbersProject.csproj",
-        "packagesPath": "C:\\Users\\roger\\.nuget\\packages\\",
-        "outputPath": "C:\\Users\\roger\\Source\\Repos\\paintbynumbers\\PaintByNumbersProject\\obj\\",
+        "projectPath": "C:\\Users\\Zachary Ikpefua\\source\\repos\\paintbynumbers\\PaintByNumbersProject\\PaintByNumbersProject.csproj",
+        "packagesPath": "C:\\Users\\Zachary Ikpefua\\.nuget\\packages\\",
+        "outputPath": "C:\\Users\\Zachary Ikpefua\\source\\repos\\paintbynumbers\\PaintByNumbersProject\\obj\\",
         "projectStyle": "PackageReference",
-        "fallbackFolders": [
-          "C:\\Program Files (x86)\\DevExpress 20.2\\Components\\Offline Packages"
-        ],
         "configFilePaths": [
-          "C:\\Users\\roger\\AppData\\Roaming\\NuGet\\NuGet.Config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 20.2.config",
+          "C:\\Users\\Zachary Ikpefua\\AppData\\Roaming\\NuGet\\NuGet.Config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
         ],
         "originalTargetFrameworks": [
           "net6.0"
         ],
         "sources": {
-          "C:\\Program Files (x86)\\DevExpress 20.2\\Components\\System\\Components\\Packages": {},
           "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
           "https://api.nuget.org/v3/index.json": {}
         },
@@ -94,7 +89,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.202\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.200\\RuntimeIdentifierGraph.json"
         }
       }
     }

diff --git a/PaintByNumbersProject/obj/PaintByNumbersProject.csproj.nuget.g.props b/PaintByNumbersProject/obj/PaintByNumbersProject.csproj.nuget.g.props
@@ -5,22 +5,21 @@
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\roger\.nuget\packages\;C:\Program Files (x86)\DevExpress 20.2\Components\Offline Packages</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Zachary Ikpefua\.nuget\packages\</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
     <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.1.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\roger\.nuget\packages\" />
-    <SourceRoot Include="C:\Program Files (x86)\DevExpress 20.2\Components\Offline Packages\" />
+    <SourceRoot Include="C:\Users\Zachary Ikpefua\.nuget\packages\" />
   </ItemGroup>
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <Import Project="$(NuGetPackageRoot)microsoft.entityframeworkcore.design\6.0.3\build\net6.0\Microsoft.EntityFrameworkCore.Design.props" Condition="Exists('$(NuGetPackageRoot)microsoft.entityframeworkcore.design\6.0.3\build\net6.0\Microsoft.EntityFrameworkCore.Design.props')" />
     <Import Project="$(NuGetPackageRoot)microsoft.aspnetcore.identity.ui\6.0.2\build\Microsoft.AspNetCore.Identity.UI.props" Condition="Exists('$(NuGetPackageRoot)microsoft.aspnetcore.identity.ui\6.0.2\build\Microsoft.AspNetCore.Identity.UI.props')" />
   </ImportGroup>
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <PkgMessagePackAnalyzer Condition=" '$(PkgMessagePackAnalyzer)' == '' ">C:\Users\roger\.nuget\packages\messagepackanalyzer\2.1.152</PkgMessagePackAnalyzer>
-    <PkgMicrosoft_CodeAnalysis_Analyzers Condition=" '$(PkgMicrosoft_CodeAnalysis_Analyzers)' == '' ">C:\Users\roger\.nuget\packages\microsoft.codeanalysis.analyzers\3.3.2</PkgMicrosoft_CodeAnalysis_Analyzers>
-    <PkgMicrosoft_CodeAnalysis_AnalyzerUtilities Condition=" '$(PkgMicrosoft_CodeAnalysis_AnalyzerUtilities)' == '' ">C:\Users\roger\.nuget\packages\microsoft.codeanalysis.analyzerutilities\3.3.0</PkgMicrosoft_CodeAnalysis_AnalyzerUtilities>
-    <PkgMicrosoft_EntityFrameworkCore_Tools Condition=" '$(PkgMicrosoft_EntityFrameworkCore_Tools)' == '' ">C:\Users\roger\.nuget\packages\microsoft.entityframeworkcore.tools\6.0.3</PkgMicrosoft_EntityFrameworkCore_Tools>
+    <PkgMessagePackAnalyzer Condition=" '$(PkgMessagePackAnalyzer)' == '' ">C:\Users\Zachary Ikpefua\.nuget\packages\messagepackanalyzer\2.1.152</PkgMessagePackAnalyzer>
+    <PkgMicrosoft_CodeAnalysis_Analyzers Condition=" '$(PkgMicrosoft_CodeAnalysis_Analyzers)' == '' ">C:\Users\Zachary Ikpefua\.nuget\packages\microsoft.codeanalysis.analyzers\3.3.2</PkgMicrosoft_CodeAnalysis_Analyzers>
+    <PkgMicrosoft_CodeAnalysis_AnalyzerUtilities Condition=" '$(PkgMicrosoft_CodeAnalysis_AnalyzerUtilities)' == '' ">C:\Users\Zachary Ikpefua\.nuget\packages\microsoft.codeanalysis.analyzerutilities\3.3.0</PkgMicrosoft_CodeAnalysis_AnalyzerUtilities>
+    <PkgMicrosoft_EntityFrameworkCore_Tools Condition=" '$(PkgMicrosoft_EntityFrameworkCore_Tools)' == '' ">C:\Users\Zachary Ikpefua\.nuget\packages\microsoft.entityframeworkcore.tools\6.0.3</PkgMicrosoft_EntityFrameworkCore_Tools>
   </PropertyGroup>
 </Project>
diff --git a/PaintByNumbersProject/obj/project.assets.json b/PaintByNumbersProject/obj/project.assets.json
@@ -9860,31 +9860,25 @@
     ]
   },
   "packageFolders": {
-    "C:\\Users\\roger\\.nuget\\packages\\": {},
-    "C:\\Program Files (x86)\\DevExpress 20.2\\Components\\Offline Packages": {}
+    "C:\\Users\\Zachary Ikpefua\\.nuget\\packages\\": {}
   },
   "project": {
     "version": "1.0.0",
     "restore": {
-      "projectUniqueName": "C:\\Users\\roger\\Source\\Repos\\paintbynumbers\\PaintByNumbersProject\\PaintByNumbersProject.csproj",
+      "projectUniqueName": "C:\\Users\\Zachary Ikpefua\\source\\repos\\paintbynumbers\\PaintByNumbersProject\\PaintByNumbersProject.csproj",
       "projectName": "PaintByNumbersProject",
-      "projectPath": "C:\\Users\\roger\\Source\\Repos\\paintbynumbers\\PaintByNumbersProject\\PaintByNumbersProject.csproj",
-      "packagesPath": "C:\\Users\\roger\\.nuget\\packages\\",
-      "outputPath": "C:\\Users\\roger\\Source\\Repos\\paintbynumbers\\PaintByNumbersProject\\obj\\",
+      "projectPath": "C:\\Users\\Zachary Ikpefua\\source\\repos\\paintbynumbers\\PaintByNumbersProject\\PaintByNumbersProject.csproj",
+      "packagesPath": "C:\\Users\\Zachary Ikpefua\\.nuget\\packages\\",
+      "outputPath": "C:\\Users\\Zachary Ikpefua\\source\\repos\\paintbynumbers\\PaintByNumbersProject\\obj\\",
       "projectStyle": "PackageReference",
-      "fallbackFolders": [
-        "C:\\Program Files (x86)\\DevExpress 20.2\\Components\\Offline Packages"
-      ],
       "configFilePaths": [
-        "C:\\Users\\roger\\AppData\\Roaming\\NuGet\\NuGet.Config",
-        "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 20.2.config",
+        "C:\\Users\\Zachary Ikpefua\\AppData\\Roaming\\NuGet\\NuGet.Config",
         "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
       ],
       "originalTargetFrameworks": [
         "net6.0"
       ],
       "sources": {
-        "C:\\Program Files (x86)\\DevExpress 20.2\\Components\\System\\Components\\Packages": {},
         "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
         "https://api.nuget.org/v3/index.json": {}
       },
@@ -9953,7 +9947,7 @@
             "privateAssets": "all"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.202\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.200\\RuntimeIdentifierGraph.json"
       }
     }
   }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		bb82ab4d8a89895eb0bd1f0abf404dfa9a66f1c3
		2336ffb1eba653102c05d1504d7ceb0693a0138a
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		e54f1e24f2251e23afaaa5e678626d1a26876e06
		e59c76f9e9d3416be0d2f3340999909eca9e26d2