Skip to content
This repository was archived by the owner on Feb 27, 2024. It is now read-only.

17 starting the gui from command prompt #19

Merged
merged 2 commits into from
Oct 19, 2021
Merged

17 starting the gui from command prompt #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f7d827
The json files now lives in %appdata%
entvex Oct 19, 2021
a07ac80
Created folder in %appdata%\NgrokSharp if not already created
entvex Oct 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FirstTimeWizard.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ private void _ngrokManager_DownloadAndUnZipDone(object sender, EventArgs e)

private void BtnDownload_OnClick(object sender, RoutedEventArgs e)
{
if (btnDownload.Content == "Next")
if ((string)btnDownload.Content == "Next")
{
tabcl.SelectedIndex = 1;
return;
Expand Down
28 changes: 19 additions & 9 deletions MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ public partial class MainWindow : Window
{
private readonly INgrokManager _ngrokManager;
private readonly ObservableCollection<TunnelDescription> _tunnelDescriptions;
private readonly string _downloadFolder =
$"{Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + Path.DirectorySeparatorChar}NgrokSharp{Path.DirectorySeparatorChar}";
private bool PaidAccount;

public MainWindow()
Expand All @@ -27,11 +29,18 @@ public MainWindow()

_ngrokManager = new NgrokManager();


if (!File.Exists($"{_downloadFolder}Settings.json"))
{
Directory.CreateDirectory(_downloadFolder);
File.WriteAllText($"{_downloadFolder}Settings.json", "{\r\n \"firstTimeSetupDone\": false\r\n}");
}

Settings settings;
try
{
//Load settings
settings = JsonConvert.DeserializeObject<Settings>(File.ReadAllText("Settings.json"));
settings = JsonConvert.DeserializeObject<Settings>(File.ReadAllText($"{_downloadFolder}Settings.json"));

if (settings.FirstTimeSetupDone == false)
{
Expand All @@ -44,17 +53,18 @@ public MainWindow()
settings.DataCenterRegion = firstTimeWizard.cmbTunnelExit.SelectedIndex;
settings.PaidAccount = (bool) firstTimeWizard.cbxPaidAccount.IsChecked;

File.WriteAllText("Settings.json", JsonConvert.SerializeObject(settings));
File.WriteAllText($"{_downloadFolder}Settings.json", JsonConvert.SerializeObject(settings));
}
}

PaidAccount = settings.PaidAccount;
sbStatus.Content = "connected to " + (NgrokManager.Region)settings.DataCenterRegion;
sbStatus.Content = $"connected to {(NgrokManager.Region)settings.DataCenterRegion}";
_ngrokManager.StartNgrok((NgrokManager.Region)settings.DataCenterRegion);

if (File.Exists("SavedTunnels.json"))
if (File.Exists($"{_downloadFolder}SavedTunnels.json"))
{
JsonConvert.DeserializeObject<List<TunnelDescription>>(File.ReadAllText("SavedTunnels.json"))?.ForEach( x => _tunnelDescriptions.Add(x));
JsonConvert.DeserializeObject<List<TunnelDescription>>(File.ReadAllText(
$"{_downloadFolder}SavedTunnels.json"))?.ForEach( x => _tunnelDescriptions.Add(x));
}

}
Expand Down Expand Up @@ -139,7 +149,7 @@ private void Window_Closed(object sender, EventArgs e)
}
}

File.WriteAllText(@"SavedTunnels.json", JsonConvert.SerializeObject(_tunnelDescriptions));
File.WriteAllText($"{_downloadFolder}SavedTunnels.json", JsonConvert.SerializeObject(_tunnelDescriptions));

}

Expand Down Expand Up @@ -177,7 +187,7 @@ private void BtnMenuItemRunFirstTimeWizard_OnClick(object sender, RoutedEventArg
if (result == MessageBoxResult.Yes)
{
Settings settings = new Settings {FirstTimeSetupDone = false};
File.WriteAllText("Settings.json", JsonConvert.SerializeObject(settings));
File.WriteAllText($"{_downloadFolder}Settings.json", JsonConvert.SerializeObject(settings));
Close();
}
}
Expand Down Expand Up @@ -235,8 +245,8 @@ private async void btnMenuItemDeleteTunnel_OnClick(object sender, RoutedEventArg
var result = await _ngrokManager.StopTunnel(_tunnelDescriptions[lwTunnels.SelectedIndex].Name);
}

var tunnel = _tunnelDescriptions.SingleOrDefault(x => x.Name == _tunnelDescriptions[lwTunnels.SelectedIndex].Name);
_tunnelDescriptions.Remove(tunnel);
var tunnel = _tunnelDescriptions.SingleOrDefault(x => x.Name == _tunnelDescriptions[lwTunnels.SelectedIndex].Name);
_tunnelDescriptions.Remove(tunnel);

}
}
Expand Down
7 changes: 1 addition & 6 deletions ngrokGUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<TargetFramework>net5.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<ApplicationIcon>icons8-tunnel-256.ico</ApplicationIcon>
<AssemblyName>ngrokGUI</AssemblyName>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -35,10 +36,4 @@
<Resource Include="icons8-tunnel-256.png" />
</ItemGroup>

<ItemGroup>
<None Update="Settings.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>