Skip to content

Commit

Permalink
fix(naming): Move atom/inbox/nilas refs to Nylas
Browse files Browse the repository at this point in the history
Conflicts:
	internal_packages/inbox-activity-bar/lib/activity-bar-long-poll-item.cjsx
  • Loading branch information
bengotow committed May 15, 2015
1 parent b0aabf3 commit 91edef9
Show file tree
Hide file tree
Showing 186 changed files with 339 additions and 341 deletions.
2 changes: 1 addition & 1 deletion atom.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ if [ $OS == 'Mac' ]; then
$ATOM_SHELL_PATH/Atom.app/Contents/MacOS/Atom --executed-from="$(pwd)" --pid=$$ "$@" $EDGEHILL_PATH

elif [ $OS == 'Linux' ]; then
DOT_INBOX_DIR="$HOME/.inbox"
DOT_INBOX_DIR="$HOME/.nylas"

mkdir -p "$DOT_INBOX_DIR"

Expand Down
10 changes: 5 additions & 5 deletions build/Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ module.exports = (grunt) ->
installDir = grunt.option('install-dir')

home = if process.platform is 'win32' then process.env.USERPROFILE else process.env.HOME
atomShellDownloadDir = path.join(home, '.inbox', 'atom-shell')
atomShellDownloadDir = path.join(home, '.nylas', 'atom-shell')

symbolsDir = path.join(buildDir, 'Atom.breakpad.syms')
shellAppDir = path.join(buildDir, appName)
Expand Down Expand Up @@ -147,7 +147,7 @@ module.exports = (grunt) ->
csonConfig =
options:
rootObject: true
cachePath: path.join(home, '.inbox', 'compile-cache', 'grunt-cson')
cachePath: path.join(home, '.nylas', 'compile-cache', 'grunt-cson')

glob_to_multiple:
expand: true
Expand Down Expand Up @@ -204,7 +204,7 @@ module.exports = (grunt) ->
src: [
'internal_packages/**/*.cjsx'
'internal_packages/**/*.coffee'
'dot-inbox/**/*.coffee'
'dot-nylas/**/*.coffee'
'exports/**/*.coffee'
'src/**/*.coffee'
]
Expand All @@ -214,8 +214,8 @@ module.exports = (grunt) ->
]
test: [
'spec/*.coffee'
'spec-inbox/*.cjsx'
'spec-inbox/*.coffee'
'spec-nylas/*.cjsx'
'spec-nylas/*.coffee'
]
target:
grunt.option("target")?.split(" ") or []
Expand Down
4 changes: 2 additions & 2 deletions build/tasks/build-task.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module.exports = (grunt) ->
packageDirectories = []
nonPackageDirectories = [
'benchmark'
'dot-inbox'
'dot-nylas'
'vendor'
'resources'
]
Expand Down Expand Up @@ -161,7 +161,7 @@ module.exports = (grunt) ->
cp directory, path.join(appDir, directory), filter: filterPackage

cp 'spec', path.join(appDir, 'spec')
cp 'spec-inbox', path.join(appDir, 'spec-inbox')
cp 'spec-nylas', path.join(appDir, 'spec-nylas')
cp 'src', path.join(appDir, 'src'), filter: /.+\.(cson|coffee|cjsx|jsx)$/
cp 'static', path.join(appDir, 'static')

Expand Down
2 changes: 1 addition & 1 deletion build/tasks/mkdeb-task.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module.exports = (grunt) ->

{name, version, description} = grunt.file.readJSON('package.json')
section = 'devel'
maintainer = 'InboxApp <edgehill@inboxapp.com>'
maintainer = 'InboxApp <edgehill@nylas.com>'
installDir = '/usr'
iconName = 'edgehill'
getInstalledSize buildDir, (error, installedSize) ->
Expand Down
2 changes: 1 addition & 1 deletion build/tasks/prebuild-less-task.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LessCache = require 'less-cache'
module.exports = (grunt) ->
grunt.registerMultiTask 'prebuild-less', 'Prebuild cached of compiled LESS files', ->
prebuiltConfigurations = [
['inbox-light-ui']
['light-ui']
]

directory = path.join(grunt.config.get('atom.appDir'), 'less-compile-cache')
Expand Down
6 changes: 3 additions & 3 deletions build/tasks/publish-build-task.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ zipAssets = (buildDir, assets, callback) ->
async.parallel(tasks, callback)

getAtomDraftRelease = (callback) ->
atomRepo = new GitHub({repo: 'inboxapp/inboxapp', token})
atomRepo = new GitHub({repo: 'nylas/edgehill', token})
atomRepo.getReleases (error, releases=[]) ->
if error?
logError('Fetching inboxapp/edgehill releases failed', error, releases)
logError('Fetching nylas/edgehill releases failed', error, releases)
callback(error)
else
[firstDraft] = releases.filter ({draft}) -> draft
Expand All @@ -142,7 +142,7 @@ getAtomDraftRelease = (callback) ->
firstDraft.assets = assets
callback(null, firstDraft)
else
callback(new Error('No draft release in inboxapp/edgehill repo'))
callback(new Error('No draft release in nylas/edgehill repo'))

deleteRelease = (release) ->
options =
Expand Down
2 changes: 1 addition & 1 deletion docs-atom/build-instructions/freebsd.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ FreeBSD -RELEASE 64-bit is the recommended platform.
## Instructions

```sh
git clone https://github.com/inboxapp/edgehill
git clone https://github.com/nylas/edgehill
cd edgehill
script/build # Creates application at $TMPDIR/edgehill-build/Edgehill
sudo script/grunt install # Installs command to /usr/local/bin/edgehill
Expand Down
20 changes: 10 additions & 10 deletions docs-atom/build-instructions/linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,37 +41,37 @@ Ubuntu LTS 12.04 64-bit is the recommended platform.

If you have problems with permissions don't forget to prefix with `sudo`

1. Clone the Edgehill repository:
1. Clone the Nylas Mail repository:

```sh
git clone https://github.com/inboxapp/edgehill
git clone https://github.com/nylas/edgehill
cd edgehill
```

2. Checkout the latest Edgehill release:
2. Checkout the latest Nylas Mail release:

```sh
git fetch -p
git checkout $(git describe --tags `git rev-list --tags --max-count=1`)
```

3. Build Edgehill:
3. Build Nylas Mail:

```sh
script/build
```

This will create the edgehill application at `$TMPDIR/edgehill-build/Edgehill`.
This will create the Nylas Mail application at `$TMPDIR/edgehill-build/Edgehill`.

4. Install the `edgehill` and `apm` commands to `/usr/local/bin` by executing:

```sh
sudo script/grunt install
```

To use the newly installed Edgehill, quit and restart all running Edgehill instances.
To use the newly installed Nylas Mail, quit and restart all running Nylas Mail instances.

5. *Optionally*, you may generate distributable packages of Edgehill at `$TMPDIR/edgehill-build`. Currenty, `.deb` and `.rpm` package types are supported. To create a `.deb` package run:
5. *Optionally*, you may generate distributable packages of Nylas Mail at `$TMPDIR/edgehill-build`. Currenty, `.deb` and `.rpm` package types are supported. To create a `.deb` package run:

```sh
script/grunt mkdeb
Expand Down Expand Up @@ -101,7 +101,7 @@ script/build --build-dir /build/edgehill/here

### TypeError: Unable to watch path

If you get following error with a big traceback right after Edgehill starts:
If you get following error with a big traceback right after Nylas Mail starts:

```
TypeError: Unable to watch path
Expand All @@ -114,7 +114,7 @@ this is the reason for this error you can issue
sudo sysctl fs.inotify.max_user_watches=32768
```

and restart Edgehill. If Edgehill now works fine, you can make this setting permanent:
and restart Nylas Mail. If Nylas Mail now works fine, you can make this setting permanent:

```sh
echo 32768 | sudo tee -a /proc/sys/fs/inotify/max_user_watches
Expand All @@ -140,7 +140,7 @@ sudo update-alternatives --install /usr/bin/node node /usr/bin/nodejs 1 --slave

### AttributeError: 'module' object has no attribute 'script_main'

If you get following error with a big traceback while building Edgehill:
If you get following error with a big traceback while building Nylas Mail:

```
sys.exit(gyp.script_main()) AttributeError: 'module' object has no attribute 'script_main' gyp ERR!
Expand Down
2 changes: 1 addition & 1 deletion docs-atom/build-instructions/os-x.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
## Instructions

```sh
git clone git@github.com:inboxapp/edgehill.git
git clone git@github.com:nylas/edgehill.git
cd edgehill
script/build # Creates application at /Applications/Edgehill.app
```
Expand Down
2 changes: 1 addition & 1 deletion docs-atom/build-instructions/windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
# Use the `Git Shell` app which was installed by GitHub for Windows. Also Make
# sure you have logged into the GitHub for Windows GUI App.
cd C:\
git clone https://github.com/inboxapp/edgehill/
git clone https://github.com/nylas/edgehill/
cd edgehill
script/build # Creates application in the `Program Files` directory
```
Expand Down
2 changes: 1 addition & 1 deletion docs/DraftStoreExtensions.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ To create a Draft Store Extension, subclass {DraftStoreExtension} and override t
This extension displays a warning before sending a draft that contains the names of competitor's products and if the user proceeds to send the draft containing the words, it appends a disclaimer.

```coffee
{DraftStoreExtension} = require 'inbox-exports'
{DraftStoreExtension} = require 'nylas-exports'

class ProductsExtension extends DraftStoreExtension

Expand Down
2 changes: 1 addition & 1 deletion docs/PackageOverview.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,6 @@ by name to specify a loading order; otherwise, all style sheets are loaded.

###Installing a Package

Nylas Mail ships with many packages already bundled with the application. When the application launches, it looks for additional packages in `~/.inbox/packages`. Each package you create belongs in it's own directory inside this folder.
Nylas Mail ships with many packages already bundled with the application. When the application launches, it looks for additional packages in `~/.nylas/packages`. Each package you create belongs in it's own directory inside this folder.

In the future, it will be possible to install packages directly from within the client.
4 changes: 2 additions & 2 deletions docs/React.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ For a quick introduction to React, take a look at Facebook's [Getting Started wi

Nylas Mail provides a set of core React components you can use in your packages. Many of the standard components listen for key events, include considerations for different platforms, and have extensive CSS. Wrapping standard components makes it easy to build rich interfaces that are consistent with the rest of the Nylas Mail platform.

To use a standard component, require it from `ui-components` and use it in your component's `render` method.
To use a standard component, require it from `nylas-component-kit` and use it in your component's `render` method.

> Keep in mind that React's Component model is based on composition rather than inheritance. On other platforms, you might subclass {Popover} to create your own custom Popover. In React, you should wrap the standard Popover component in your own component, which provides the Popover with `props` and children to customize it's behavior.

Here's a quick look at standard components you can require from `ui-components`:
Here's a quick look at standard components you can require from `nylas-component-kit`:

- **{Menu}**: Allows you to display a list of items consistent with the rest of the Nylas Mail user experience.

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion dot-inbox/config.cson → dot-nylas/config.cson
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'global':
'core':
'themes': [
'inbox-light-ui'
'light-ui'
]
'disabledPackages': [
"calendar-bar",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Exports =
EdgehillAPI: require '../src/flux/edgehill-api'

# Testing
InboxTestUtils: require '../spec-inbox/test_utils'
InboxTestUtils: require '../spec-nylas/test_utils'

# Component Registry
ComponentRegistry: require '../src/component-registry'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
React = require 'react'

{Actions} = require "inbox-exports"
{Actions} = require "nylas-exports"

class AccountSidebarDividerItem extends React.Component
displayName: 'AccountSidebarDividerItem'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
React = require 'react'
{Actions} = require("inbox-exports")
{Actions} = require("nylas-exports")

class AccountSidebarItem extends React.Component
@displayName: "AccountSidebarItem"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
React = require 'react'
_ = require 'underscore-plus'
classNames = require 'classnames'
{Actions, Utils, WorkspaceStore} = require 'inbox-exports'
{RetinaImg} = require 'ui-components'
{Actions, Utils, WorkspaceStore} = require 'nylas-exports'
{RetinaImg} = require 'nylas-component-kit'

class AccountSidebarSheetItem extends React.Component
@displayName: 'AccountSidebarSheetItem'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ _ = require 'underscore-plus'
Tag,
Message,
FocusedTagStore,
Thread} = require 'inbox-exports'
Thread} = require 'nylas-exports'

AccountSidebarStore = Reflux.createStore
init: ->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
React = require 'react'
classNames = require 'classnames'
{Actions, Utils, WorkspaceStore} = require 'inbox-exports'
{RetinaImg} = require 'ui-components'
{Actions, Utils, WorkspaceStore} = require 'nylas-exports'
{RetinaImg} = require 'nylas-component-kit'

class AccountSidebarTagItem extends React.Component
@displayName: 'AccountSidebarTagItem'
Expand Down
2 changes: 1 addition & 1 deletion internal_packages/account-sidebar/lib/account-sidebar.cjsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
React = require 'react'
{Actions} = require("inbox-exports")
{Actions} = require("nylas-exports")
SidebarDividerItem = require("./account-sidebar-divider-item")
SidebarTagItem = require("./account-sidebar-tag-item")
SidebarSheetItem = require("./account-sidebar-sheet-item")
Expand Down
2 changes: 1 addition & 1 deletion internal_packages/account-sidebar/lib/main.cjsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
React = require "react"
AccountSidebar = require "./account-sidebar"
{ComponentRegistry, WorkspaceStore} = require "inbox-exports"
{ComponentRegistry, WorkspaceStore} = require "nylas-exports"

module.exports =
item: null # The DOM item the main React component renders into
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
path = require 'path'
React = require 'react'
{Actions} = require 'inbox-exports'
{Actions} = require 'nylas-exports'

# Passed in as props from MessageItem and FileDownloadStore
# This is empty if the attachment isn't downloading.
Expand Down
2 changes: 1 addition & 1 deletion internal_packages/attachments/lib/main.cjsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ComponentRegistry} = require 'inbox-exports'
{ComponentRegistry} = require 'nylas-exports'

module.exports =
activate: (@state={}) ->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Reflux = require 'reflux'
_ = require 'underscore-plus'
{DatabaseStore, NamespaceStore, Actions, Event, Calendar} = require 'inbox-exports'
{DatabaseStore, NamespaceStore, Actions, Event, Calendar} = require 'nylas-exports'
moment = require 'moment'

CalendarBarEventStore = Reflux.createStore
Expand Down
2 changes: 1 addition & 1 deletion internal_packages/calendar-bar/lib/calendar-bar-item.cjsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
React = require 'react'
{Actions} = require("inbox-exports")
{Actions} = require("nylas-exports")
moment = require 'moment'

class CalendarBarItem extends React.Component
Expand Down
2 changes: 1 addition & 1 deletion internal_packages/calendar-bar/lib/calendar-bar.cjsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
React = require 'react'
{Actions} = require("inbox-exports")
{Actions} = require("nylas-exports")
CalendarBarItem = require("./calendar-bar-item")
CalendarBarEventStore = require ("./calendar-bar-event-store")

Expand Down
4 changes: 2 additions & 2 deletions internal_packages/composer/lib/composer-view.cjsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ _ = require 'underscore-plus'
Actions,
UndoManager,
DraftStore,
FileUploadStore} = require 'inbox-exports'
FileUploadStore} = require 'nylas-exports'

{ResizableRegion,
InjectedComponentSet,
InjectedComponent,
RetinaImg} = require 'ui-components'
RetinaImg} = require 'nylas-component-kit'

FileUploads = require './file-uploads'
ContenteditableComponent = require './contenteditable-component'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ _ = require 'underscore-plus'
React = require 'react'
classNames = require 'classnames'
sanitizeHtml = require 'sanitize-html'
{Utils, DraftStore} = require 'inbox-exports'
{Utils, DraftStore} = require 'nylas-exports'
FloatingToolbar = require './floating-toolbar'

linkUUID = 0
Expand Down
2 changes: 1 addition & 1 deletion internal_packages/composer/lib/file-uploads.cjsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
path = require 'path'
React = require 'react'
{Actions,
FileUploadStore} = require 'inbox-exports'
FileUploadStore} = require 'nylas-exports'

class FileUpload extends React.Component
render: =>
Expand Down
2 changes: 1 addition & 1 deletion internal_packages/composer/lib/floating-toolbar.cjsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ _ = require 'underscore-plus'
React = require 'react/addons'
classNames = require 'classnames'
{CompositeDisposable} = require 'event-kit'
{RetinaImg} = require 'ui-components'
{RetinaImg} = require 'nylas-component-kit'

class FloatingToolbar extends React.Component
@displayName = "FloatingToolbar"
Expand Down
Loading

0 comments on commit 91edef9

Please sign in to comment.