Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ blank_issues_enabled: false

contact_links:
- name: 📦 ISSUES INSTALLING/UPDATING A PACKAGE
url: https://marticliment.com/unigetui/help/issues-with-packages
url: https://github.com/Devolutions/UniGetUI
about: PLEASE READ THIS BEFORE CREATING AN ISSUE RELATED TO A SPECIFIC PACKAGE
- name: 🔒 Security issue or vulnerability
url: https://whitehub.net/programs/unigetui/
about: Found a security issue? Please report it via our disclosure program
- name: 📧 Contact me privately by email
url: https://marticliment.com/contact
about: Please use only if the issue (for example, a vulnerability) cannot be posted publicly
url: https://devolutions.net/security/
about: Found a security issue? Please report it via the Devolutions security page
- name: 📧 Contact us directly, in private
url: https://devolutions.net/contact/
about: Please use only for private inquiries that should not be posted publicly
- name: 💬 Having doubts or questions?
url: https://github.com/Devolutions/UniGetUI/discussions/new/choose
about: Create a discussion and get help from other members of the community
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
- [ ] **I have read the [contributing guidelines](https://github.com/Devolutions/UniGetUI/blob/main/CONTRIBUTING.md#coding), and I agree with the [Code of Conduct](https://github.com/Devolutions/UniGetUI/blob/main/CODE_OF_CONDUCT.md)**.
- [ ] **Have you checked that there aren't other open [pull requests](https://github.com/Devolutions/UniGetUI/pulls) for the same changes?**
- [ ] **Have you tested that the committed code can be executed without errors?**
- [ ] **This PR is not composed of garbage changes used to farm GitHub activity to enter potential Crypto AirDrops.**
Any user suspected of farming GitHub activity with crypto purposes will get banned. Submitting broken code wastes the contributors' time, who have to spend their free time reviewing, fixing, and testing code that does not even compile breaks other features, or does not introduce any useful changes. I appreciate your understanding.
- [ ] **Have you confirmed that this issue is caused by UniGetUI itself, and not by the package manager or the package involved?**
If the same issue can be reproduced outside UniGetUI with the relevant package manager or with the package itself, please report it there first. UniGetUI should only be used to track issues that are specific to UniGetUI's behavior or integration.
-----

<!-- optionally, explain here about the committed code -->
Expand Down
5 changes: 2 additions & 3 deletions src/UniGetUI.Avalonia/ViewModels/Pages/HelpPageViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ namespace UniGetUI.Avalonia.ViewModels.Pages;

public partial class HelpPageViewModel : ViewModels.ViewModelBase
{
public const string HelpBaseUrl = "https://marticliment.com/unigetui/help/";
public const string HelpBaseUrl = "https://github.com/Devolutions/UniGetUI";

// Kept in sync from the WebView's NavigationCompleted event via code-behind
public string CurrentUrl { get; set; } = HelpBaseUrl;

[RelayCommand]
private void OpenInBrowser() => CoreTools.Launch(CurrentUrl);

public string GetInitialUrl(string uriAttachment) =>
string.IsNullOrEmpty(uriAttachment) ? HelpBaseUrl : HelpBaseUrl + uriAttachment;
public string GetInitialUrl(string uriAttachment) => HelpBaseUrl;
}
11 changes: 0 additions & 11 deletions src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,6 @@ public HelpPage()
private void OnNavigationStarted(object? sender, WebViewNavigationStartingEventArgs e)
{
NavProgressBar.IsVisible = true;

// Add iframe query param so the help site shows the embedded view
string url = e.Request?.ToString() ?? "";
if (url.Contains("marticliment.com") && !url.Contains("isWingetUIIframe"))
{
e.Cancel = true;
string modified = url.Contains('?')
? url + "&isWingetUIIframe"
: url + "?isWingetUIIframe";
WebViewControl.Navigate(new Uri(modified));
}
}

private void OnNavigationCompleted(object? sender, WebViewNavigationCompletedEventArgs e)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
SettingName="IconDataBaseURL"
Text="{t:Translate Use a custom icon and screenshot database URL}"
Placeholder="{t:Translate Leave empty for default}"
HelpUrl="https://www.marticliment.com/unigetui/help/icons-and-screenshots#custom-source"
HelpUrl="https://github.com/Devolutions/UniGetUI"
ValueChangedCommand="{Binding ShowRestartRequiredCommand}"
CornerRadius="8"/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ public Experimental()
vm.RestartRequired += (s, e) => RestartRequired?.Invoke(s, e);

ShowVersionNumberOnTitlebar.Text = CoreTools.Translate("Show UniGetUI's version and build number on the titlebar.");
IconDatabaseURLCard.HelpUrl = new Uri("https://www.marticliment.com/unigetui/help/icons-and-screenshots#custom-source");
IconDatabaseURLCard.HelpUrl = new Uri("https://github.com/Devolutions/UniGetUI");
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/UniGetUI/Pages/DialogPages/PackageDetailsPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
<HyperlinkButton
Grid.Column="1"
VerticalAlignment="Stretch"
NavigateUri="https://marticliment.com/unigetui/help/icons-and-screenshots/#about-icons"
NavigateUri="https://github.com/Devolutions/UniGetUI"
>
<widgets:TranslatedTextBlock
VerticalAlignment="Center"
Expand Down Expand Up @@ -240,7 +240,7 @@
<HyperlinkButton
Grid.Column="1"
VerticalAlignment="Stretch"
NavigateUri="https://marticliment.com/unigetui/help/icons-and-screenshots/#about-icons"
NavigateUri="https://github.com/Devolutions/UniGetUI"
>
<widgets:TranslatedTextBlock VerticalAlignment="Center" Text="Become a contributor" />
</HyperlinkButton>
Expand Down
26 changes: 4 additions & 22 deletions src/UniGetUI/Pages/HelpPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ namespace UniGetUI.Interface.Dialogs
/// </summary>
public sealed partial class HelpPage : Page, IDisposable, IEnterLeaveListener
{
private static readonly Uri HelpUri = new("https://github.com/Devolutions/UniGetUI");
private bool Initialized;
private WebView2? webView;
private Uri? lastUri;
Expand All @@ -32,21 +33,6 @@ private async Task InitializeWebView()
{
ProgressBar.Visibility = Visibility.Visible;
lastUri = new Uri(e.Uri);
if (
e.Uri.ToString().Contains("marticliment.com")
&& !e.Uri.ToString().Contains("isWingetUIIframe")
)
{
e.Cancel = true;
if (e.Uri.ToString().Contains('?'))
{
webView.Source = new Uri(e.Uri.ToString() + "&isWingetUIIframe");
}
else
{
webView.Source = new Uri(e.Uri.ToString() + "?isWingetUIIframe");
}
}
};
webView.NavigationCompleted += (_, _) =>
{
Expand All @@ -66,7 +52,7 @@ private async Task _navigateTo(string piece, bool skipWait)
while (!Initialized && !skipWait)
await Task.Delay(50);
ArgumentNullException.ThrowIfNull(webView);
webView.Source = new Uri("https://marticliment.com/unigetui/help/" + piece);
webView.Source = HelpUri;
}

private void BackButton_Click(object sender, RoutedEventArgs e)
Expand All @@ -90,7 +76,7 @@ private void HomeButton_Click(object sender, RoutedEventArgs e)
if (!Initialized || webView is null)
return;

webView.Source = new Uri("https://marticliment.com/unigetui/help");
webView.Source = HelpUri;
}

private void ReloadButton_Click(object sender, RoutedEventArgs e)
Expand All @@ -106,11 +92,7 @@ private void BrowserButton_Click(object sender, RoutedEventArgs e)
if (!Initialized || webView is null)
return;

string uri = webView
.Source.ToString()
.Replace("?isWingetUIIframe", "")
.Replace("&isWingetUIIframe", "");
CoreTools.Launch(uri);
CoreTools.Launch(webView.Source.ToString());
}

public void Dispose()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

<widgets:TextboxCard
CornerRadius="8"
HelpUrl="https://www.marticliment.com/unigetui/help/icons-and-screenshots#custom-source"
HelpUrl="https://github.com/Devolutions/UniGetUI"
Placeholder="Leave empty for default"
SettingName="IconDataBaseURL"
Text="Use a custom icon and screenshot database URL"
Expand Down
Loading