WIP: External plugins

.env.example

@@ -0,0 +1,3 @@
+SPOTIFY_CLIENT_ID=
+SPOTIFY_CLIENT_SECRET=
+SPOTIFY_REDIRECT_URI=

.eslintrc.json

@@ -25,6 +25,7 @@
   ],
   "rules": {
     "react/jsx-filename-extension": [1, { "extensions": [".tsx", ".ts", ".js"] }],
-    "react/prop-types": "off"
+    "react/prop-types": "off",
+    "quotes": [2, "single", { "avoidEscape": true }]
   }
 }

.gitignore

@@ -57,3 +57,5 @@ buck-out/
 
 # CocoaPods
 /ios/Pods/
+
+.env

babel.config.js

@@ -1,3 +1,8 @@
 module.exports = {
   presets: ['module:metro-react-native-babel-preset'],
+  'plugins': [
+    ['module:react-native-dotenv', {
+      'allowUndefined': true
+    }]
+  ]
 };

index.js

@@ -3,26 +3,45 @@ import { AppRegistry, YellowBox } from 'react-native';
 import { QueryPanel } from './src/components/spotter.component.tsx';
 import { name as appName } from './app.json';
 import { Settings } from './src/components/settings/settings.component.tsx';
-import { ThemeProvider, ApiProvider } from './src/providers';
+import {
+  ThemeProvider,
+  ApiProvider,
+  EventsProvider,
+  SettingsProvider,
+  HistoryProvider,
+  StorageProvider,
+} from './src/providers';
 
 // TODO: Check
 YellowBox.ignoreWarnings([
   'RCTBridge'
 ]);
 
 const AppWithModules = () => (
-  <ThemeProvider>
-    <ApiProvider>
-      <QueryPanel/>
-    </ApiProvider>
-  </ThemeProvider>
+  <ApiProvider>
+    <SettingsProvider>
+      <HistoryProvider>
+        <StorageProvider>
+          <EventsProvider>
+            <ThemeProvider>
+              <QueryPanel />
+            </ThemeProvider>
+          </EventsProvider>
+        </StorageProvider>
+      </HistoryProvider>
+    </SettingsProvider>
+  </ApiProvider>
 );
 const SettingsWithModules = () => (
-  <ThemeProvider>
-    <ApiProvider>
-      <Settings/>
-    </ApiProvider>
-  </ThemeProvider>
+  <ApiProvider>
+    <SettingsProvider>
+      {/* <EventsProvider> */}
+        <ThemeProvider>
+          <Settings />
+        </ThemeProvider>
+      {/* </EventsProvider> */}
+    </SettingsProvider>
+  </ApiProvider>
 );
 
 AppRegistry.registerComponent(appName, () => AppWithModules);

macos/Podfile

@@ -1,63 +1,6 @@
-# require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
-
-# abstract_target 'Shared' do
-#   # Pods for spotter
-#   pod 'FBLazyVector', :path => '../node_modules/react-native-macos/Libraries/FBLazyVector'
-#   pod 'FBReactNativeSpec', :path => '../node_modules/react-native-macos/Libraries/FBReactNativeSpec'
-#   pod 'RCTRequired', :path => '../node_modules/react-native-macos/Libraries/RCTRequired'
-#   pod 'RCTTypeSafety', :path => '../node_modules/react-native-macos/Libraries/TypeSafety'
-#   pod 'React', :path => '../node_modules/react-native-macos/'
-#   pod 'React-Core', :path => '../node_modules/react-native-macos/'
-#   pod 'React-CoreModules', :path => '../node_modules/react-native-macos/React/CoreModules'
-#   pod 'React-Core/DevSupport', :path => '../node_modules/react-native-macos/'
-#   pod 'React-RCTActionSheet', :path => '../node_modules/react-native-macos/Libraries/ActionSheetIOS'
-#   pod 'React-RCTAnimation', :path => '../node_modules/react-native-macos/Libraries/NativeAnimation'
-#   pod 'React-RCTBlob', :path => '../node_modules/react-native-macos/Libraries/Blob'
-#   pod 'React-RCTImage', :path => '../node_modules/react-native-macos/Libraries/Image'
-#   pod 'React-RCTLinking', :path => '../node_modules/react-native-macos/Libraries/LinkingIOS'
-#   pod 'React-RCTNetwork', :path => '../node_modules/react-native-macos/Libraries/Network'
-#   pod 'React-RCTSettings', :path => '../node_modules/react-native-macos/Libraries/Settings'
-#   pod 'React-RCTText', :path => '../node_modules/react-native-macos/Libraries/Text'
-#   pod 'React-RCTVibration', :path => '../node_modules/react-native-macos/Libraries/Vibration'
-#   pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native-macos/'
-
-#   pod 'React-cxxreact', :path => '../node_modules/react-native-macos/ReactCommon/cxxreact'
-#   pod 'React-jsi', :path => '../node_modules/react-native-macos/ReactCommon/jsi'
-#   pod 'React-jsiexecutor', :path => '../node_modules/react-native-macos/ReactCommon/jsiexecutor'
-#   pod 'React-jsinspector', :path => '../node_modules/react-native-macos/ReactCommon/jsinspector'
-#   pod 'ReactCommon/callinvoker', :path => '../node_modules/react-native-macos/ReactCommon'
-#   pod 'ReactCommon/turbomodule/core', :path => '../node_modules/react-native-macos/ReactCommon'
-#   pod 'Yoga', :path => '../node_modules/react-native-macos/ReactCommon/yoga'
-
-#   pod 'boost-for-react-native', :podspec => '../node_modules/react-native-macos/third-party-podspecs/boost-for-react-native.podspec'
-#   pod 'DoubleConversion', :podspec => '../node_modules/react-native-macos/third-party-podspecs/DoubleConversion.podspec'
-#   pod 'glog', :podspec => '../node_modules/react-native-macos/third-party-podspecs/glog.podspec'
-#   pod 'RCT-Folly', :podspec => '../node_modules/react-native-macos/third-party-podspecs/RCT-Folly.podspec'
-
-#   pod 'ShellOut'
-#   pod 'Magnet'
-#   pod 'KeyHolder'
-
-#   target 'spotter-macOS' do
-#     platform :macos, '10.14'
-#     use_native_modules!
-#     # Pods specifically for macOS target
-#   end
-
-# #  target 'spotter-iOS' do
-# #    platform :ios, '9'
-# #    use_native_modules!
-# #    # Pods specifically for iOS target
-# #  end
-# end
-
-
-
-
 require_relative '../node_modules/react-native-macos/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
-pod 'ShellOut'
 pod 'Magnet'
 pod 'KeyHolder'
 

macos/Podfile.lock

@@ -249,12 +249,11 @@ PODS:
     - React-Core (= 0.63.27)
     - React-cxxreact (= 0.63.27)
     - React-jsi (= 0.63.27)
-  - RNCAsyncStorage (1.13.2):
-    - React
-  - RNSqlite2 (1.0.0):
+  - RNCAsyncStorage (1.15.11):
+    - React-Core
+  - RNSqlite2 (3.3.0):
     - React-Core
   - Sauce (2.1.0)
-  - ShellOut (2.0.0)
   - Yoga (1.14.0)
 
 DEPENDENCIES:
@@ -290,15 +289,13 @@ DEPENDENCIES:
   - ReactCommon/turbomodule/core (from `../node_modules/react-native-macos/ReactCommon`)
   - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
   - RNSqlite2 (from `../node_modules/react-native-sqlite-2`)
-  - ShellOut
   - Yoga (from `../node_modules/react-native-macos/ReactCommon/yoga`)
 
 SPEC REPOS:
   trunk:
     - KeyHolder
     - Magnet
     - Sauce
-    - ShellOut
 
 EXTERNAL SOURCES:
   boost-for-react-native:
@@ -389,12 +386,11 @@ SPEC CHECKSUMS:
   React-RCTText: 5582eafe1164c2ff6105fe5e80f38fceb7b57f47
   React-RCTVibration: 23458306eaf4b927518e6cc352563e6b87cd2492
   ReactCommon: 5a71bfd6f9fa344bbeee26749682ef3880f786b1
-  RNCAsyncStorage: 05bae7ecfab1cbd5441993f1ca098f7c3b3f8d0e
-  RNSqlite2: aba98937d707abaf15d97f7bdeaf99335268c283
+  RNCAsyncStorage: eb05c0284dd6b50b32f92fad55e2a41e03358c43
+  RNSqlite2: df25f1fefd82da39a3f956504149fb32d23831fb
   Sauce: a4075a04b6041e7a0c992a952cc79f7a0ebdb8e3
-  ShellOut: 1393eefc56892e80d85339e233d3935e2e1ff6f9
   Yoga: b4c6f1be0c16f6a112d81c7fb09d23dcbe40a1b4
 
-PODFILE CHECKSUM: 4505f9ae7945002d2c6ea1c294eae96380ef1adf
+PODFILE CHECKSUM: e73099f05fb738deb644b6f8f5117d186a3985c7
 
-COCOAPODS: 1.10.2
+COCOAPODS: 1.11.2

macos/spotter-macOS/Applications/Applications.swift

@@ -1,5 +1,4 @@
 import Foundation
-import ShellOut
 
 @objc(Applications)
 class Applications: RCTEventEmitter {

macos/spotter-macOS/Clipboard/Clipboard.swift

@@ -1,5 +1,4 @@
 import Foundation
-import ShellOut
 import Magnet
 import Carbon
 

macos/spotter-macOS/Hotkey/Hotkey.swift

@@ -3,7 +3,6 @@ enum Events {
 }
 
 import Foundation
-import ShellOut
 import Magnet
 import Carbon
 

macos/spotter-macOS/Info.plist

@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>Spotter</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIconFile</key>

macos/spotter-macOS/Notifications/Notifications.swift

@@ -1,5 +1,4 @@
 import Foundation
-import ShellOut
 import Magnet
 import Carbon
 

macos/spotter-macOS/Panel/Panel.swift

@@ -1,5 +1,4 @@
 import Foundation
-import ShellOut
 
 @objc(Panel)
 class Panel: RCTEventEmitter {

macos/spotter-macOS/Shell/Shell.swift

@@ -1,27 +1,27 @@
 import Foundation
-import ShellOut
 
 @objc(Shell)
 class Shell: RCTEventEmitter {
-  
+
   @objc
   func execute(_ command: String,
                       resolver resolve: RCTPromiseResolveBlock,
-                      rejecter reject: RCTPromiseRejectBlock) -> Void {    
+                      rejecter reject: RCTPromiseRejectBlock) -> Void {
     do {
-      let output = try shellOut(to: command)
+      let output = try shellOut(to: command, at: "/")
       resolve(output)
     } catch {
       let error = error as! ShellOutError
       print(error.message)
       print(error.output)
+      reject("code", error.message, error)
     }
   }
-  
-  override func supportedEvents() -> [String]! {
+
+  override func supportedEvents() -> [String]? {
     return []
   }
-  
+
   @objc override static func requiresMainQueueSetup() -> Bool {
     return false
   }