From fcfd018b1d89bf0ba0f9b447fad3b0b8262f0aed Mon Sep 17 00:00:00 2001
From: Yoan <yoan2004.yb@gmail.com>
Date: Thu, 6 Apr 2023 19:18:55 +0200
Subject: [PATCH 1/2] Barre de recherche, de tri et de filtre

---
 Sources/Ohara/AppShell.xaml                |  2 +-
 Sources/Ohara/NewPage2.xaml                | 19 +++++++
 Sources/Ohara/NewPage3.xaml                | 61 ++++++++++++++++++++++
 Sources/Ohara/NewPage3.xaml.cs             | 10 ++++
 Sources/Ohara/Ohara.csproj                 |  3 ++
 Sources/Ohara/Resources/Styles/Styles.xaml |  2 +
 6 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 Sources/Ohara/NewPage3.xaml
 create mode 100644 Sources/Ohara/NewPage3.xaml.cs

diff --git a/Sources/Ohara/AppShell.xaml b/Sources/Ohara/AppShell.xaml
index d199a5d..02b2def 100644
--- a/Sources/Ohara/AppShell.xaml
+++ b/Sources/Ohara/AppShell.xaml
@@ -14,7 +14,7 @@
     
     <ShellContent
         ContentTemplate="{DataTemplate local:NewPage2}"
-        Route="MainPage" />
+        Route="NewPage2" />
         
 
 </Shell>
diff --git a/Sources/Ohara/NewPage2.xaml b/Sources/Ohara/NewPage2.xaml
index c5325c0..be9e5d4 100644
--- a/Sources/Ohara/NewPage2.xaml
+++ b/Sources/Ohara/NewPage2.xaml
@@ -32,6 +32,25 @@
             <Button Style="{StaticResource buttonMenu}" Text="Équipages"/>
         </VerticalStackLayout>
         <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">
+            <Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="10*"/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions >
+                    <ColumnDefinition Width="20*"/>
+                    <ColumnDefinition Width="25*"/>
+                    <ColumnDefinition Width="10*"/>
+                    <ColumnDefinition Width="10*"/>
+                </Grid.ColumnDefinitions>
+                <SearchBar Placeholder="Rechercher..." BackgroundColor="#bfe5ef" Grid.Column="0"/>
+                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="2">
+                    <Label Text="Filtrer" HorizontalTextAlignment="Center" />
+                </Frame>
+
+                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="3">
+                    <Label Text="Trier" HorizontalTextAlignment="Center"  />
+                </Frame>
+            </Grid>
             <ScrollView Orientation="Horizontal" HorizontalScrollBarVisibility="Always">
                 <HorizontalStackLayout Spacing="40" Padding="40">
 
diff --git a/Sources/Ohara/NewPage3.xaml b/Sources/Ohara/NewPage3.xaml
new file mode 100644
index 0000000..ecd33e6
--- /dev/null
+++ b/Sources/Ohara/NewPage3.xaml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Ohara.NewPage3"
+             Title="NewPage3"
+             BackgroundColor="#e2edf1">
+    
+    
+    <Grid>
+
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2*" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="300" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
+
+            <Image Source="ohara2.png" HeightRequest="300" HorizontalOptions="Center" >
+                <Image.Clip>
+                    <EllipseGeometry Center="150,90"  RadiusX="80"  RadiusY="80"/>
+                </Image.Clip>
+            </Image>
+
+
+            <Button Style="{StaticResource buttonMenu}" Text="Accueil"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Carte"/>
+            <Button Style="{StaticResource buttonMenu2}" Text="Personnages"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Fruits du démon"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Bateaux"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Îles"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Équipages"/>
+        </VerticalStackLayout>
+        <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">
+            <Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="10*"/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions >
+                    <ColumnDefinition Width="20*"/>
+                    <ColumnDefinition Width="25*"/>
+                    <ColumnDefinition Width="10*"/>
+                    <ColumnDefinition Width="10*"/>
+                </Grid.ColumnDefinitions>
+                <SearchBar Placeholder="Rechercher..." BackgroundColor="#bfe5ef" Grid.Column="0"/>
+                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="2">
+                    <Label Text="Filtrer" HorizontalTextAlignment="Center" />
+                </Frame>
+
+                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="3">
+                    <Label Text="Trier" HorizontalTextAlignment="Center"  />
+                </Frame>
+            </Grid>
+            <ScrollView Orientation="Vertical" VerticalScrollBarVisibility="Always">
+               
+            </ScrollView>
+        </VerticalStackLayout>
+    </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/Sources/Ohara/NewPage3.xaml.cs b/Sources/Ohara/NewPage3.xaml.cs
new file mode 100644
index 0000000..56a5a77
--- /dev/null
+++ b/Sources/Ohara/NewPage3.xaml.cs
@@ -0,0 +1,10 @@
+namespace Ohara;
+
+public partial class NewPage3 : ContentPage
+{
+	public NewPage3()
+	{
+
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/Sources/Ohara/Ohara.csproj b/Sources/Ohara/Ohara.csproj
index d4d1e5e..701ec1d 100644
--- a/Sources/Ohara/Ohara.csproj
+++ b/Sources/Ohara/Ohara.csproj
@@ -59,6 +59,9 @@
 	  <MauiXaml Update="NewPage2.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="NewPage3.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	</ItemGroup>
 
 </Project>
diff --git a/Sources/Ohara/Resources/Styles/Styles.xaml b/Sources/Ohara/Resources/Styles/Styles.xaml
index 950ce05..732b4d0 100644
--- a/Sources/Ohara/Resources/Styles/Styles.xaml
+++ b/Sources/Ohara/Resources/Styles/Styles.xaml
@@ -407,6 +407,7 @@
         <Setter Property="FontFamily" Value="OpenSans"/>
         <Setter Property="FontAttributes" Value="Bold" />
         <Setter Property="FontSize" Value="20"/>
+        <Setter Property="TextColor" Value="White"/>
         <Setter Property="CornerRadius" Value="0"/>
         
         <Setter Property="WidthRequest" Value="250"/>
@@ -424,6 +425,7 @@
         <Setter Property="FontFamily" Value="OpenSans"/>
         <Setter Property="FontAttributes" Value="Bold" />
         <Setter Property="FontSize" Value="20"/>
+        <Setter Property="TextColor" Value="White"/>
         <Setter Property="CornerRadius" Value="0"/>
 
         <Setter Property="WidthRequest" Value="275" />

From b02c9debc76524ccc6ee33eba0061e79f39c91ed Mon Sep 17 00:00:00 2001
From: Yoan <yoan2004.yb@gmail.com>
Date: Thu, 6 Apr 2023 19:21:44 +0200
Subject: [PATCH 2/2] =?UTF-8?q?D=C3=A9placemnt=20git=20ignore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/.gitignore => .gitignore | 748 +++++++++++++++----------------
 .vs/Ohara/v17/.wsuo              | Bin 11264 -> 0 bytes
 .vs/VSWorkspaceState.json        |   7 -
 3 files changed, 374 insertions(+), 381 deletions(-)
 rename Sources/.gitignore => .gitignore (94%)
 delete mode 100644 .vs/Ohara/v17/.wsuo
 delete mode 100644 .vs/VSWorkspaceState.json

diff --git a/Sources/.gitignore b/.gitignore
similarity index 94%
rename from Sources/.gitignore
rename to .gitignore
index e12097b..7ed3d08 100644
--- a/Sources/.gitignore
+++ b/.gitignore
@@ -1,375 +1,375 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
-
-.nuspec/
-.buildtasks/
-templatesTest/
-
-# User-specific files
-*.rsuser
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Mono auto generated files
-mono_crash.*
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-[Ww][Ii][Nn]32/
-[Aa][Rr][Mm]/
-[Aa][Rr][Mm]64/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
-[Ll]ogs/
-
-# Visual Studio 2015/2017 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# Visual Studio 2017 auto generated files
-Generated\ Files/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUnit
-*.VisualState.xml
-TestResult.xml
-nunit-*.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# Benchmark Results
-BenchmarkDotNet.Artifacts/
-
-# .NET Core
-project.lock.json
-project.fragment.lock.json
-artifacts/
-
-# ASP.NET Scaffolding
-ScaffoldingReadMe.txt
-
-# StyleCop
-StyleCopReport.xml
-
-# Files built by Visual Studio
-*_i.c
-*_p.c
-*_h.h
-*.ilk
-*.meta
-*.obj
-*.iobj
-*.pch
-*.pdb
-*.ipdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*_wpftmp.csproj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# Visual Studio Trace Files
-*.e2e
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# AxoCover is a Code Coverage Tool
-.axoCover/*
-!.axoCover/settings.json
-
-# Coverlet is a free, cross platform Code Coverage Tool
-coverage*.json
-coverage*.xml
-coverage*.info
-
-# Visual Studio code coverage results
-*.coverage
-*.coveragexml
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# Note: Comment the next line if you want to checkin your web deploy settings,
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# NuGet Symbol Packages
-*.snupkg
-# The packages folder can be ignored because of Package Restore
-**/[Pp]ackages/*
-# except build/, which is used as an MSBuild target.
-!**/[Pp]ackages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/[Pp]ackages/repositories.config
-# NuGet v3's project.json files produces more ignorable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-*.appx
-*.appxbundle
-*.appxupload
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!?*.[Cc]ache/
-
-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.jfm
-*.pfx
-*.publishsettings
-orleans.codegen.cs
-
-# Including strong name files can present a security risk
-# (https://github.com/github/gitignore/pull/2483#issue-259490424)
-#*.snk
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-ServiceFabricBackup/
-*.rptproj.bak
-
-# SQL Server files
-*.mdf
-*.ldf
-*.ndf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-*.rptproj.rsuser
-*- [Bb]ackup.rdl
-*- [Bb]ackup ([0-9]).rdl
-*- [Bb]ackup ([0-9][0-9]).rdl
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-node_modules/
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
-*.vbw
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# CodeRush personal settings
-.cr/personal
-
-# Python Tools for Visual Studio (PTVS)
-__pycache__/
-*.pyc
-
-# Cake - Uncomment if you are using it
-tools/**
-!tools/packages.config
-
-# Tabs Studio
-*.tss
-
-# Telerik's JustMock configuration file
-*.jmconfig
-
-# BizTalk build output
-*.btp.cs
-*.btm.cs
-*.odx.cs
-*.xsd.cs
-
-# OpenCover UI analysis results
-OpenCover/
-
-# Azure Stream Analytics local run output
-ASALocalRun/
-
-# MSBuild Binary and Structured Log
-*.binlog
-
-# NVidia Nsight GPU debugger configuration file
-*.nvuser
-
-# MFractors (Xamarin productivity tool) working folder
-.mfractor/
-
-# Local History for Visual Studio
-.localhistory/
-
-# BeatPulse healthcheck temp database
-healthchecksdb
-
-# Backup folder for Package Reference Convert tool in Visual Studio 2017
-MigrationBackup/
-
-# Ionide (cross platform F# VS Code tools) working folder
-.ionide/
-
-# Fody - auto-generated XML schema
-FodyWeavers.xsd
-.DS_Store
-
-# Android Studio
-.gradle/
-.idea/
-local.properties
-
-# Directory Build overrides for local setups
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+.nuspec/
+.buildtasks/
+templatesTest/
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+tools/**
+!tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+.DS_Store
+
+# Android Studio
+.gradle/
+.idea/
+local.properties
+
+# Directory Build overrides for local setups
 Directory.Build.Override.props
\ No newline at end of file
diff --git a/.vs/Ohara/v17/.wsuo b/.vs/Ohara/v17/.wsuo
deleted file mode 100644
index 1fe81cc85637d551f93573e1997adeae47e41583..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11264
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
G%Krd&$mC1_

diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
deleted file mode 100644
index 887098f..0000000
--- a/.vs/VSWorkspaceState.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "ExpandedNodes": [
-    ""
-  ],
-  "SelectedNode": "\\Ohara.sln",
-  "PreviewInSolutionExplorer": false
-}
\ No newline at end of file