diff --git a/internal_packages/feedback/lib/feedback-button.cjsx b/internal_packages/feedback/lib/feedback-button.cjsx deleted file mode 100644 index acb73ff59..000000000 --- a/internal_packages/feedback/lib/feedback-button.cjsx +++ /dev/null @@ -1,29 +0,0 @@ -{Utils, - React, - FocusedContactsStore, - AccountStore, - Actions} = require 'nylas-exports' -{RetinaImg} = require 'nylas-component-kit' - -class FeedbackButton extends React.Component - @displayName: 'FeedbackButton' - - constructor: (@props) -> - - componentDidMount: => - @_unsubs = [] - @_unsubs.push Actions.sendFeedback.listen(@_onSendFeedback) - - componentWillUnmount: => - unsub() for unsub in @_unsubs - - render: => -
-
?
-
- - _onSendFeedback: => - return if NylasEnv.inSpecMode() - require('electron').shell.openExternal('https://nylas.zendesk.com/hc/en-us/sections/203638587-N1') - -module.exports = FeedbackButton diff --git a/internal_packages/feedback/lib/main.cjsx b/internal_packages/feedback/lib/main.cjsx deleted file mode 100644 index 69fa169e0..000000000 --- a/internal_packages/feedback/lib/main.cjsx +++ /dev/null @@ -1,13 +0,0 @@ -{WorkspaceStore, ComponentRegistry} = require 'nylas-exports' -FeedbackButton = require './feedback-button' -protocol = require('remote').require('protocol') - -module.exports = - activate: (@state) -> - ComponentRegistry.register FeedbackButton, - location: WorkspaceStore.Sheet.Global.Footer - - serialize: -> - - deactivate: -> - ComponentRegistry.unregister(FeedbackButton) diff --git a/internal_packages/feedback/package.json b/internal_packages/feedback/package.json deleted file mode 100644 index 2f3d661a0..000000000 --- a/internal_packages/feedback/package.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "feedback", - "main": "./lib/main", - "version": "0.1.0", - "engines": { - "nylas": "*" - }, - "description": "Intercom feeedback", - "dependencies": { - }, - "private":true -} diff --git a/internal_packages/feedback/stylesheets/main.less b/internal_packages/feedback/stylesheets/main.less deleted file mode 100644 index cd506b695..000000000 --- a/internal_packages/feedback/stylesheets/main.less +++ /dev/null @@ -1,27 +0,0 @@ -@import "ui-variables"; -@import "ui-mixins"; - -.btn-feedback { - position: fixed; - bottom: 7px; - right: 7px; - background: linear-gradient(to bottom, #419bf9 0%, #1081f7 100%); - width: 38px; - height: 38px; - border-radius: 25px; - display: inline-block; - font-size: 28px; - text-align: center; - line-height: 37px; - color: rgba(255, 255, 255, 0.9); - border: 1px solid #0668ce; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); - cursor: default; -} -.btn-feedback:hover { - color:rgba(255,255,255,1); - background: linear-gradient(to bottom, lighten(@blue,5%) 0%, darken(@blue, 5%) 100%); -} -.btn-feedback:active { - background: linear-gradient(to bottom, darken(@blue,20%) 0%, darken(@blue, 10%) 100%); -} diff --git a/internal_packages/worker-ui/lib/developer-bar.cjsx b/internal_packages/worker-ui/lib/developer-bar.cjsx index 141acb845..78d031494 100644 --- a/internal_packages/worker-ui/lib/developer-bar.cjsx +++ b/internal_packages/worker-ui/lib/developer-bar.cjsx @@ -52,9 +52,6 @@ class DeveloperBar extends React.Component Requests: {@state.curlHistory.length} -
-
Actions.sendFeedback() }>Feedback
-
{@_sectionContent()}
diff --git a/menus/darwin.cson b/menus/darwin.cson index c84d5d38b..4e7a59ebf 100644 --- a/menus/darwin.cson +++ b/menus/darwin.cson @@ -90,7 +90,7 @@ { label: 'Help' submenu: [ - { label: 'Send Feedback to Nylas', command: 'application:send-feedback' } + { label: 'Nylas N1 Help', command: 'application:view-help' } ] } ] diff --git a/menus/linux.cson b/menus/linux.cson index 23a15a7eb..289f6a0ee 100644 --- a/menus/linux.cson +++ b/menus/linux.cson @@ -62,7 +62,7 @@ submenu: [ { label: "VERSION", enabled: false } { type: 'separator' } - { label: 'Send Feedback to Nylas', command: 'application:send-feedback' } + { label: 'Nylas N1 Help', command: 'application:view-help' } ] } ] diff --git a/menus/win32.cson b/menus/win32.cson index f563beead..fa887394f 100644 --- a/menus/win32.cson +++ b/menus/win32.cson @@ -50,7 +50,7 @@ { label: 'Check for Update', command: 'application:check-for-update', visible: false} { label: 'Downloading Update', enabled: false, visible: false} { type: 'separator' } - { label: 'Send Feedback to Nylas', command: 'application:send-feedback' } + { label: 'Nylas N1 Help', command: 'application:view-help' } ] } { type: 'separator' } diff --git a/src/browser/application.coffee b/src/browser/application.coffee index 090ea96d8..29aae471a 100644 --- a/src/browser/application.coffee +++ b/src/browser/application.coffee @@ -273,7 +273,9 @@ class Application @on 'application:add-account', => @windowManager.ensureOnboardingWindow() @on 'application:new-message', => @windowManager.sendToMainWindow('new-message') - @on 'application:send-feedback', => @windowManager.sendToMainWindow('send-feedback') + @on 'application:view-help', => + url = 'https://nylas.zendesk.com/hc/en-us/sections/203638587-N1' + require('electron').shell.openExternal(url) @on 'application:open-preferences', => @windowManager.sendToMainWindow('open-preferences') @on 'application:show-main-window', => @openWindowsForTokenState() @on 'application:show-work-window', => @windowManager.showWorkWindow() diff --git a/src/flux/actions.coffee b/src/flux/actions.coffee index a07d7084e..58edbd3dd 100644 --- a/src/flux/actions.coffee +++ b/src/flux/actions.coffee @@ -126,8 +126,7 @@ class Actions @longPollOffline: ActionScopeWorkWindow @willMakeAPIRequest: ActionScopeWorkWindow @didMakeAPIRequest: ActionScopeWorkWindow - @sendFeedback: ActionScopeWindow - + ### Public: Retry the initial sync diff --git a/src/window-event-handler.coffee b/src/window-event-handler.coffee index 1d1726030..f06240e0e 100644 --- a/src/window-event-handler.coffee +++ b/src/window-event-handler.coffee @@ -30,10 +30,6 @@ class WindowEventHandler @subscribe ipcRenderer, 'update-available', (event, detail) -> NylasEnv.updateAvailable(detail) - @subscribe ipcRenderer, 'send-feedback', (detail) -> - Actions = require './flux/actions' - Actions.sendFeedback() - @subscribe ipcRenderer, 'browser-window-focus', -> document.body.classList.remove('is-blurred')