Optimeet v1.0

- .exe working
Excustic · Jul 31, 2023 · 05541e2 · 05541e2
1 parent c5b8842
commit 05541e2
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 9 deletions.
diff --git a/Optimeet/FileManager.cs b/Optimeet/FileManager.cs
@@ -18,6 +18,8 @@ public sealed class FileManager
         Environment.SpecialFolder.MyDoc‌uments), "Optimeet", "meetings.xml");
         readonly string path_settings = Path.Combine(Environment.GetFolderPath(
         Environment.SpecialFolder.MyDoc‌uments), "Optimeet", "settings.csv");
+        public static readonly string path_keys = Path.Combine(Environment.GetFolderPath(
+        Environment.SpecialFolder.MyDoc‌uments), "Optimeet", "keys.json");
         public Trie<Contact> Contacts;
         public SortedSet<Meeting> Meetings;
         public Dictionary<string, int[]> Settings;
@@ -26,7 +28,6 @@ public sealed class FileManager
         public const string SETTING_2 = "Search radius (metres)";
         public const string SETTING_3 = "Meeting duration (minutes)";
         public const string SETTING_4 = "Define upcoming meetings deadline (weeks)";
-        public const string path_keys = "keys.json";
         private FileManager()
         {
             LoadContacts();

diff --git a/Optimeet/MainWindow.xaml.cs b/Optimeet/MainWindow.xaml.cs
@@ -14,6 +14,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Reflection;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
@@ -40,7 +41,10 @@ public partial class MainWindow : Window
         //Google API variables
         private CalendarService service;
         private UserCredential credential;
-        private readonly string credPath = "token.json";
+        private readonly string secretsPath = Path.Combine(Environment.GetFolderPath(
+        Environment.SpecialFolder.MyDoc‌uments), "Optimeet", "client_secrets.json");
+        private readonly string credPath = Path.Combine(Environment.GetFolderPath(
+        Environment.SpecialFolder.MyDoc‌uments), "Optimeet", "token.json");
         //Used for picking a meeting location
         private Location FinalChoice; 
         private Location CreateContactLocation; //Used for saving a new contact
@@ -1326,9 +1330,10 @@ private async void SignInOutGoogleAccount(object sender, RoutedEventArgs e)
             {
                 try
                 {
-                    DirectoryInfo dir = new DirectoryInfo(Environment.CurrentDirectory);
+                    DirectoryInfo dir = new DirectoryInfo(Path.Combine(Environment.GetFolderPath(
+                        Environment.SpecialFolder.MyDoc‌uments), "Optimeet"));
                     foreach (var subDir in dir.GetDirectories())
-                        if (subDir.Name.Equals(credPath))
+                        if (subDir.Name.Equals("t"+credPath.Split('t')[credPath.Split('t').Length-1]))
                         {
                             subDir.Attributes = FileAttributes.Normal;
                             subDir.Delete(true);
@@ -1352,7 +1357,7 @@ private async void SignInOutGoogleAccount(object sender, RoutedEventArgs e)
                 try
                 {
                     //Retrieve Google OAuth2.0 secret keys
-                    using (var stream = new FileStream("../../client_secrets.json", FileMode.Open, FileAccess.Read))
+                    using (var stream = new FileStream(secretsPath, FileMode.Open, FileAccess.Read))
                     {
                         var flow = new GoogleAuthorizationCodeFlow(new GoogleAuthorizationCodeFlow.Initializer
                         {
@@ -1382,7 +1387,7 @@ private async void SignInOutGoogleAccount(object sender, RoutedEventArgs e)
                     if (b == null)
                         return;
                     //User sign attempt --> Create new user --> log in to service
-                    using (var stream = new FileStream("../../client_secrets.json", FileMode.Open, FileAccess.Read))
+                    using (var stream = new FileStream(secretsPath, FileMode.Open, FileAccess.Read))
                     {
                         credential = await GoogleWebAuthorizationBroker.AuthorizeAsync(
                             GoogleClientSecrets.FromStream(stream).Secrets,

diff --git a/Optimeet/MapsHelper.cs b/Optimeet/MapsHelper.cs
@@ -66,9 +66,9 @@ private static void Initialzie()
                     AutocompleteRequest += GKey;
                 }
             }
-            catch (Exception)
+            catch (Exception e)
             {
-                MessageBox.Show("Could not load all map services because some keys are missing", "Error");
+                MessageBox.Show("Could not load all map services because some keys are missing: "+e.Message+". "+FileManager.path_keys, "Error");
             }
         }
         /// <summary>

diff --git a/Optimeet/Optimeet.csproj b/Optimeet/Optimeet.csproj
@@ -16,6 +16,22 @@
     <Deterministic>true</Deterministic>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>D:\Optimeet\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.0</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -36,6 +52,21 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ManifestCertificateThumbprint>8F3DF6FFD8455AD240D8EA93BC52F461C046202A</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>Optimeet_TemporaryKey.pfx</ManifestKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>true</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>true</SignManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>logo-dark.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="FontAwesome.WPF, Version=4.7.0.37774, Culture=neutral, PublicKeyToken=0758b07a11a4f466, processorArchitecture=MSIL">
       <HintPath>..\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll</HintPath>
@@ -171,6 +202,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="Optimeet_TemporaryKey.pfx" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -226,6 +258,21 @@
   <ItemGroup>
     <Resource Include="Assets\google.png" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="logo-dark.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\MaterialDesignThemes.4.9.0\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.4.9.0\build\MaterialDesignThemes.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -234,4 +281,7 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\MaterialDesignThemes.4.9.0\build\MaterialDesignThemes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MaterialDesignThemes.4.9.0\build\MaterialDesignThemes.targets'))" />
   </Target>
+  <PropertyGroup>
+    <PreBuildEvent>del /S /Q $(TargetDir)publish</PreBuildEvent>
+  </PropertyGroup>
 </Project>
diff --git a/Optimeet/client_secrets.json b/Optimeet/client_secrets.json
diff --git a/Optimeet/logo-dark.ico b/Optimeet/logo-dark.ico