Merge pull request #26 from menubar-apps/custom-gh-api-url

Custom gh api url

Author: streetturtle

pullBar.xcodeproj/project.pbxproj

@@ -164,7 +164,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1300;
-				LastUpgradeCheck = 1310;
+				LastUpgradeCheck = 1410;
 				TargetAttributes = {
 					8CECBBDE2742AAF800A2802D = {
 						CreatedOnToolsVersion = 13.0;
@@ -299,6 +299,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -360,6 +361,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -391,6 +393,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 11;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = UV3HUS49VJ;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -420,6 +423,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 11;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = UV3HUS49VJ;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;

pullBar.xcodeproj/xcshareddata/xcschemes/pullBar.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1310"
+   LastUpgradeVersion = "1410"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

pullBar/Assets.xcassets/bmc-logo-no-background.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "bmc-logo-no-background.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

pullBar/Assets.xcassets/bmc-logo-no-background.imageset/bmc-logo-no-background.png

@@ -9,6 +9,7 @@ import Foundation
 import Defaults
 
 extension Defaults.Keys {
+    static let githubApiBaseUrl = Key<String>("githubApiBaseUrl", default: "https://api.github.com")
     static let githubUsername = Key<String>("githubUsername", default: "")
 
     static let showAssigned = Key<Bool>("showAssigned", default: false)

pullBar/Extensions/DefaultsExtensions.swift

@@ -12,6 +12,7 @@ import KeychainAccess
 
 public class GitHubClient {
 
+    @Default(.githubApiBaseUrl) var githubApiBaseUrl
     @Default(.githubUsername) var githubUsername
     @FromKeychain(.githubToken) var githubToken
 
@@ -35,7 +36,7 @@ public class GitHubClient {
             "variables":[]
         ] as [String: Any]
 
-        AF.request("https://api.github.com/graphql", method: .post, parameters: parameters, encoding: JSONEncoding.default, headers: headers)
+        AF.request(githubApiBaseUrl + "/graphql", method: .post, parameters: parameters, encoding: JSONEncoding.default, headers: headers)
             .validate(statusCode: 200..<300)
             .responseDecodable(of: GraphQlSearchResp.self, decoder: GithubDecoder()) { response in
                 switch response.result {
@@ -66,7 +67,7 @@ public class GitHubClient {
             "variables":[]
         ] as [String: Any]
 
-        AF.request("https://api.github.com/graphql", method: .post, parameters: parameters, encoding: JSONEncoding.default, headers: headers)
+        AF.request(githubApiBaseUrl + "/graphql", method: .post, parameters: parameters, encoding: JSONEncoding.default, headers: headers)
             .validate(statusCode: 200..<300)
             .responseDecodable(of: GraphQlSearchResp.self, decoder: GithubDecoder()) { response in
                 switch response.result {
@@ -96,7 +97,7 @@ public class GitHubClient {
             "variables":[]
         ] as [String: Any]
 
-        AF.request("https://api.github.com/graphql", method: .post, parameters: parameters, encoding: JSONEncoding.default, headers: headers)
+        AF.request(githubApiBaseUrl + "/graphql", method: .post, parameters: parameters, encoding: JSONEncoding.default, headers: headers)
             .validate(statusCode: 200..<300)
             .responseDecodable(of: GraphQlSearchResp.self, decoder: GithubDecoder()) { response in
                 switch response.result {
@@ -231,7 +232,7 @@ public class GitHubClient {
             .accept("application/json")
         ]
 
-        AF.request("https://api.github.com/user",
+        AF.request(githubApiBaseUrl + "/user",
                    method: .get,
                    headers: headers)
         .validate(statusCode: 200..<300)

pullBar/GitHub/GitHubClient.swift

@@ -7,19 +7,47 @@
 
 import SwiftUI
 
-import SwiftUI
-
 struct AboutView: View {
+    @Environment(\.openURL) var openURL
+    
     let currentVersion = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as! String
-
+    
     var body: some View {
         VStack {
             Image(nsImage: NSImage(named: "AppIcon")!)
             Text("PullBar").font(.title)
             Text("by Pavel Makhov").font(.caption)
             Text("version " + currentVersion).font(.footnote)
             Divider()
-            Link("PullBar on GitHub", destination: URL(string: "https://github.com/menubar-apps/PullBar")!)
+            
+            Button(action: {
+                openURL(URL(string:"https://github.com/menubar-apps/PullBar/issues/new?assignees=&labels=enhancement&projects=&template=feature_request.md&title=")!)
+            }) {
+                HStack {
+                    Image(systemName: "star.fill")
+                    Text("Feature Request")
+                }
+            }
+            Button(action: {
+                openURL(URL(string:"https://github.com/menubar-apps/PullBar/issues/new?assignees=&labels=bug&projects=&template=bug_report.md&title=")!)
+            }) {
+                HStack {
+                    Image(systemName: "ladybug.fill")
+                    Text("Bug Report")
+                }
+            }
+            Divider()
+            Button(action: {
+                openURL(URL(string: "https://www.buymeacoffee.com/streetturtle")!)
+            }) {
+                HStack {
+                    Image("bmc-logo-no-background")
+                        .resizable()
+                        .scaledToFit()
+                        .padding(.top, 2)
+                    Text("Buy me a coffee")
+                }
+            }	
         }.padding()
     }
 }

pullBar/Views/AboutView.swift

@@ -12,6 +12,7 @@ import LaunchAtLogin
 
 struct PreferencesView: View {
 
+    @Default(.githubApiBaseUrl) var githubApiBaseUrl
     @Default(.githubUsername) var githubUsername
     @FromKeychain(.githubToken) var githubToken
 
@@ -36,7 +37,15 @@ struct PreferencesView: View {
         TabView {
             Form {
                 HStack(alignment: .center) {
-                    Text("GitHub username:").frame(width: 120, alignment: .trailing)
+                    Text("API Base URL:").frame(width: 120, alignment: .trailing)
+                    TextField("", text: $githubApiBaseUrl)
+                        .textFieldStyle(RoundedBorderTextFieldStyle())
+                        .disableAutocorrection(true)
+                        .textContentType(.password)
+                        .frame(width: 200)
+                }
+                HStack(alignment: .center) {
+                    Text("Username:").frame(width: 120, alignment: .trailing)
                     TextField("", text: $githubUsername)
                         .textFieldStyle(RoundedBorderTextFieldStyle())
                         .disableAutocorrection(true)
@@ -45,7 +54,7 @@ struct PreferencesView: View {
                 }
 
                 HStack(alignment: .center) {
-                    Text("GitHub token:").frame(width: 120, alignment: .trailing)
+                    Text("Token:").frame(width: 120, alignment: .trailing)
                     VStack(alignment: .leading) {
                         HStack() {
                             SecureField("", text: $githubToken)