Skip to content

Commit 67f1eb7

Browse files
Redirect legacy links and update GitHub templates (#4585)
* Redirect legacy help links to GitHub repository * Update GitHub issue and PR templates * Add icon test fixture assets
1 parent 466046e commit 67f1eb7

File tree

11 files changed

+19
-49
lines changed

11 files changed

+19
-49
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ blank_issues_enabled: false
22

33
contact_links:
44
- name: 📦 ISSUES INSTALLING/UPDATING A PACKAGE
5-
url: https://marticliment.com/unigetui/help/issues-with-packages
5+
url: https://github.com/Devolutions/UniGetUI
66
about: PLEASE READ THIS BEFORE CREATING AN ISSUE RELATED TO A SPECIFIC PACKAGE
77
- name: 🔒 Security issue or vulnerability
8-
url: https://whitehub.net/programs/unigetui/
9-
about: Found a security issue? Please report it via our disclosure program
10-
- name: 📧 Contact me privately by email
11-
url: https://marticliment.com/contact
12-
about: Please use only if the issue (for example, a vulnerability) cannot be posted publicly
8+
url: https://devolutions.net/security/
9+
about: Found a security issue? Please report it via the Devolutions security page
10+
- name: 📧 Contact us directly, in private
11+
url: https://devolutions.net/contact/
12+
about: Please use only for private inquiries that should not be posted publicly
1313
- name: 💬 Having doubts or questions?
1414
url: https://github.com/Devolutions/UniGetUI/discussions/new/choose
1515
about: Create a discussion and get help from other members of the community

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
- [ ] **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)**.
33
- [ ] **Have you checked that there aren't other open [pull requests](https://github.com/Devolutions/UniGetUI/pulls) for the same changes?**
44
- [ ] **Have you tested that the committed code can be executed without errors?**
5-
- [ ] **This PR is not composed of garbage changes used to farm GitHub activity to enter potential Crypto AirDrops.**
6-
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.
5+
- [ ] **Have you confirmed that this issue is caused by UniGetUI itself, and not by the package manager or the package involved?**
6+
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.
77
-----
88

99
<!-- optionally, explain here about the committed code -->

src/UniGetUI.Avalonia/ViewModels/Pages/HelpPageViewModel.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ namespace UniGetUI.Avalonia.ViewModels.Pages;
55

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

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

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

16-
public string GetInitialUrl(string uriAttachment) =>
17-
string.IsNullOrEmpty(uriAttachment) ? HelpBaseUrl : HelpBaseUrl + uriAttachment;
16+
public string GetInitialUrl(string uriAttachment) => HelpBaseUrl;
1817
}

src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,6 @@ public HelpPage()
2323
private void OnNavigationStarted(object? sender, WebViewNavigationStartingEventArgs e)
2424
{
2525
NavProgressBar.IsVisible = true;
26-
27-
// Add iframe query param so the help site shows the embedded view
28-
string url = e.Request?.ToString() ?? "";
29-
if (url.Contains("marticliment.com") && !url.Contains("isWingetUIIframe"))
30-
{
31-
e.Cancel = true;
32-
string modified = url.Contains('?')
33-
? url + "&isWingetUIIframe"
34-
: url + "?isWingetUIIframe";
35-
WebViewControl.Navigate(new Uri(modified));
36-
}
3726
}
3827

3928
private void OnNavigationCompleted(object? sender, WebViewNavigationCompletedEventArgs e)

src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Experimental.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
SettingName="IconDataBaseURL"
5252
Text="{t:Translate Use a custom icon and screenshot database URL}"
5353
Placeholder="{t:Translate Leave empty for default}"
54-
HelpUrl="https://www.marticliment.com/unigetui/help/icons-and-screenshots#custom-source"
54+
HelpUrl="https://github.com/Devolutions/UniGetUI"
5555
ValueChangedCommand="{Binding ShowRestartRequiredCommand}"
5656
CornerRadius="8"/>
5757

src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Experimental.axaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ public Experimental()
2121
vm.RestartRequired += (s, e) => RestartRequired?.Invoke(s, e);
2222

2323
ShowVersionNumberOnTitlebar.Text = CoreTools.Translate("Show UniGetUI's version and build number on the titlebar.");
24-
IconDatabaseURLCard.HelpUrl = new Uri("https://www.marticliment.com/unigetui/help/icons-and-screenshots#custom-source");
24+
IconDatabaseURLCard.HelpUrl = new Uri("https://github.com/Devolutions/UniGetUI");
2525
}
2626
}
19.3 KB
Loading
19.3 KB
Loading

src/UniGetUI/Pages/DialogPages/PackageDetailsPage.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208
<HyperlinkButton
209209
Grid.Column="1"
210210
VerticalAlignment="Stretch"
211-
NavigateUri="https://marticliment.com/unigetui/help/icons-and-screenshots/#about-icons"
211+
NavigateUri="https://github.com/Devolutions/UniGetUI"
212212
>
213213
<widgets:TranslatedTextBlock
214214
VerticalAlignment="Center"
@@ -240,7 +240,7 @@
240240
<HyperlinkButton
241241
Grid.Column="1"
242242
VerticalAlignment="Stretch"
243-
NavigateUri="https://marticliment.com/unigetui/help/icons-and-screenshots/#about-icons"
243+
NavigateUri="https://github.com/Devolutions/UniGetUI"
244244
>
245245
<widgets:TranslatedTextBlock VerticalAlignment="Center" Text="Become a contributor" />
246246
</HyperlinkButton>

src/UniGetUI/Pages/HelpPage.xaml.cs

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ namespace UniGetUI.Interface.Dialogs
1414
/// </summary>
1515
public sealed partial class HelpPage : Page, IDisposable, IEnterLeaveListener
1616
{
17+
private static readonly Uri HelpUri = new("https://github.com/Devolutions/UniGetUI");
1718
private bool Initialized;
1819
private WebView2? webView;
1920
private Uri? lastUri;
@@ -32,21 +33,6 @@ private async Task InitializeWebView()
3233
{
3334
ProgressBar.Visibility = Visibility.Visible;
3435
lastUri = new Uri(e.Uri);
35-
if (
36-
e.Uri.ToString().Contains("marticliment.com")
37-
&& !e.Uri.ToString().Contains("isWingetUIIframe")
38-
)
39-
{
40-
e.Cancel = true;
41-
if (e.Uri.ToString().Contains('?'))
42-
{
43-
webView.Source = new Uri(e.Uri.ToString() + "&isWingetUIIframe");
44-
}
45-
else
46-
{
47-
webView.Source = new Uri(e.Uri.ToString() + "?isWingetUIIframe");
48-
}
49-
}
5036
};
5137
webView.NavigationCompleted += (_, _) =>
5238
{
@@ -66,7 +52,7 @@ private async Task _navigateTo(string piece, bool skipWait)
6652
while (!Initialized && !skipWait)
6753
await Task.Delay(50);
6854
ArgumentNullException.ThrowIfNull(webView);
69-
webView.Source = new Uri("https://marticliment.com/unigetui/help/" + piece);
55+
webView.Source = HelpUri;
7056
}
7157

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

93-
webView.Source = new Uri("https://marticliment.com/unigetui/help");
79+
webView.Source = HelpUri;
9480
}
9581

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

109-
string uri = webView
110-
.Source.ToString()
111-
.Replace("?isWingetUIIframe", "")
112-
.Replace("&isWingetUIIframe", "");
113-
CoreTools.Launch(uri);
95+
CoreTools.Launch(webView.Source.ToString());
11496
}
11597

11698
public void Dispose()

0 commit comments

Comments
 (0)