diff --git a/atom.sh b/atom.sh index 73da87df2..292f63780 100755 --- a/atom.sh +++ b/atom.sh @@ -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" diff --git a/build/Gruntfile.coffee b/build/Gruntfile.coffee index 8fc59471f..705e0f01d 100644 --- a/build/Gruntfile.coffee +++ b/build/Gruntfile.coffee @@ -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) @@ -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 @@ -204,7 +204,7 @@ module.exports = (grunt) -> src: [ 'internal_packages/**/*.cjsx' 'internal_packages/**/*.coffee' - 'dot-inbox/**/*.coffee' + 'dot-nylas/**/*.coffee' 'exports/**/*.coffee' 'src/**/*.coffee' ] @@ -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 [] diff --git a/build/tasks/build-task.coffee b/build/tasks/build-task.coffee index e91255024..d7f76dd9b 100644 --- a/build/tasks/build-task.coffee +++ b/build/tasks/build-task.coffee @@ -44,7 +44,7 @@ module.exports = (grunt) -> packageDirectories = [] nonPackageDirectories = [ 'benchmark' - 'dot-inbox' + 'dot-nylas' 'vendor' 'resources' ] @@ -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') diff --git a/build/tasks/mkdeb-task.coffee b/build/tasks/mkdeb-task.coffee index 0d335e1f8..f37af154d 100644 --- a/build/tasks/mkdeb-task.coffee +++ b/build/tasks/mkdeb-task.coffee @@ -33,7 +33,7 @@ module.exports = (grunt) -> {name, version, description} = grunt.file.readJSON('package.json') section = 'devel' - maintainer = 'InboxApp ' + maintainer = 'InboxApp ' installDir = '/usr' iconName = 'edgehill' getInstalledSize buildDir, (error, installedSize) -> diff --git a/build/tasks/prebuild-less-task.coffee b/build/tasks/prebuild-less-task.coffee index 54672fed8..ac7380bd3 100644 --- a/build/tasks/prebuild-less-task.coffee +++ b/build/tasks/prebuild-less-task.coffee @@ -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') diff --git a/build/tasks/publish-build-task.coffee b/build/tasks/publish-build-task.coffee index c8c2c18fa..e7d8481e1 100644 --- a/build/tasks/publish-build-task.coffee +++ b/build/tasks/publish-build-task.coffee @@ -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 @@ -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 = diff --git a/docs-atom/build-instructions/freebsd.md b/docs-atom/build-instructions/freebsd.md index 797cd42c0..afd56e546 100644 --- a/docs-atom/build-instructions/freebsd.md +++ b/docs-atom/build-instructions/freebsd.md @@ -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 diff --git a/docs-atom/build-instructions/linux.md b/docs-atom/build-instructions/linux.md index 2366a9fc2..7176b2d78 100644 --- a/docs-atom/build-instructions/linux.md +++ b/docs-atom/build-instructions/linux.md @@ -41,27 +41,27 @@ 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: @@ -69,9 +69,9 @@ If you have problems with permissions don't forget to prefix with `sudo` 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 @@ -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 @@ -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 @@ -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! diff --git a/docs-atom/build-instructions/os-x.md b/docs-atom/build-instructions/os-x.md index 94eb801ff..e557d562a 100644 --- a/docs-atom/build-instructions/os-x.md +++ b/docs-atom/build-instructions/os-x.md @@ -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 ``` diff --git a/docs-atom/build-instructions/windows.md b/docs-atom/build-instructions/windows.md index c6ee393f3..faba6ebe5 100644 --- a/docs-atom/build-instructions/windows.md +++ b/docs-atom/build-instructions/windows.md @@ -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 ``` diff --git a/docs/DraftStoreExtensions.md b/docs/DraftStoreExtensions.md index 9eb47c526..bc24173f1 100644 --- a/docs/DraftStoreExtensions.md +++ b/docs/DraftStoreExtensions.md @@ -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 diff --git a/docs/PackageOverview.md b/docs/PackageOverview.md index 3303a9ca6..69c780c60 100644 --- a/docs/PackageOverview.md +++ b/docs/PackageOverview.md @@ -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. diff --git a/docs/React.md b/docs/React.md index e4c788dd2..c2c039c18 100644 --- a/docs/React.md +++ b/docs/React.md @@ -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. diff --git a/dot-inbox/README.md b/dot-nylas/README.md similarity index 100% rename from dot-inbox/README.md rename to dot-nylas/README.md diff --git a/dot-inbox/config.cson b/dot-nylas/config.cson similarity index 83% rename from dot-inbox/config.cson rename to dot-nylas/config.cson index 06660eb0a..a28d5e6fb 100644 --- a/dot-inbox/config.cson +++ b/dot-nylas/config.cson @@ -1,7 +1,7 @@ 'global': 'core': 'themes': [ - 'inbox-light-ui' + 'light-ui' ] 'disabledPackages': [ "calendar-bar", diff --git a/dot-inbox/init.coffee b/dot-nylas/init.coffee similarity index 100% rename from dot-inbox/init.coffee rename to dot-nylas/init.coffee diff --git a/dot-inbox/keymap.cson b/dot-nylas/keymap.cson similarity index 100% rename from dot-inbox/keymap.cson rename to dot-nylas/keymap.cson diff --git a/dot-inbox/packages/README.md b/dot-nylas/packages/README.md similarity index 100% rename from dot-inbox/packages/README.md rename to dot-nylas/packages/README.md diff --git a/dot-inbox/styles.less b/dot-nylas/styles.less similarity index 100% rename from dot-inbox/styles.less rename to dot-nylas/styles.less diff --git a/exports/ui-components.coffee b/exports/nylas-component-kit.coffee similarity index 100% rename from exports/ui-components.coffee rename to exports/nylas-component-kit.coffee diff --git a/exports/inbox-exports.coffee b/exports/nylas-exports.coffee similarity index 98% rename from exports/inbox-exports.coffee rename to exports/nylas-exports.coffee index eb685bfa7..1ad1bcb7d 100644 --- a/exports/inbox-exports.coffee +++ b/exports/nylas-exports.coffee @@ -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' diff --git a/internal_packages/account-sidebar/lib/account-sidebar-divider-item.cjsx b/internal_packages/account-sidebar/lib/account-sidebar-divider-item.cjsx index d1c9d546f..02dc7e85a 100644 --- a/internal_packages/account-sidebar/lib/account-sidebar-divider-item.cjsx +++ b/internal_packages/account-sidebar/lib/account-sidebar-divider-item.cjsx @@ -1,6 +1,6 @@ React = require 'react' -{Actions} = require "inbox-exports" +{Actions} = require "nylas-exports" class AccountSidebarDividerItem extends React.Component displayName: 'AccountSidebarDividerItem' diff --git a/internal_packages/account-sidebar/lib/account-sidebar-item.cjsx b/internal_packages/account-sidebar/lib/account-sidebar-item.cjsx index c90a6ad67..0106c737d 100644 --- a/internal_packages/account-sidebar/lib/account-sidebar-item.cjsx +++ b/internal_packages/account-sidebar/lib/account-sidebar-item.cjsx @@ -1,5 +1,5 @@ React = require 'react' -{Actions} = require("inbox-exports") +{Actions} = require("nylas-exports") class AccountSidebarItem extends React.Component @displayName: "AccountSidebarItem" diff --git a/internal_packages/account-sidebar/lib/account-sidebar-sheet-item.cjsx b/internal_packages/account-sidebar/lib/account-sidebar-sheet-item.cjsx index c9af9d154..f5266726e 100644 --- a/internal_packages/account-sidebar/lib/account-sidebar-sheet-item.cjsx +++ b/internal_packages/account-sidebar/lib/account-sidebar-sheet-item.cjsx @@ -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' diff --git a/internal_packages/account-sidebar/lib/account-sidebar-store.coffee b/internal_packages/account-sidebar/lib/account-sidebar-store.coffee index c2214127a..8efc7e3b7 100644 --- a/internal_packages/account-sidebar/lib/account-sidebar-store.coffee +++ b/internal_packages/account-sidebar/lib/account-sidebar-store.coffee @@ -7,7 +7,7 @@ _ = require 'underscore-plus' Tag, Message, FocusedTagStore, - Thread} = require 'inbox-exports' + Thread} = require 'nylas-exports' AccountSidebarStore = Reflux.createStore init: -> diff --git a/internal_packages/account-sidebar/lib/account-sidebar-tag-item.cjsx b/internal_packages/account-sidebar/lib/account-sidebar-tag-item.cjsx index be7230370..2d123151d 100644 --- a/internal_packages/account-sidebar/lib/account-sidebar-tag-item.cjsx +++ b/internal_packages/account-sidebar/lib/account-sidebar-tag-item.cjsx @@ -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' diff --git a/internal_packages/account-sidebar/lib/account-sidebar.cjsx b/internal_packages/account-sidebar/lib/account-sidebar.cjsx index 391c16b76..ba1e38d63 100644 --- a/internal_packages/account-sidebar/lib/account-sidebar.cjsx +++ b/internal_packages/account-sidebar/lib/account-sidebar.cjsx @@ -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") diff --git a/internal_packages/account-sidebar/lib/main.cjsx b/internal_packages/account-sidebar/lib/main.cjsx index d054c84a0..ca4220207 100644 --- a/internal_packages/account-sidebar/lib/main.cjsx +++ b/internal_packages/account-sidebar/lib/main.cjsx @@ -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 diff --git a/internal_packages/attachments/lib/attachment-component.cjsx b/internal_packages/attachments/lib/attachment-component.cjsx index 9e2282d97..a353eb3b9 100644 --- a/internal_packages/attachments/lib/attachment-component.cjsx +++ b/internal_packages/attachments/lib/attachment-component.cjsx @@ -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. diff --git a/internal_packages/attachments/lib/main.cjsx b/internal_packages/attachments/lib/main.cjsx index 435b42ea7..a88b46582 100644 --- a/internal_packages/attachments/lib/main.cjsx +++ b/internal_packages/attachments/lib/main.cjsx @@ -1,4 +1,4 @@ -{ComponentRegistry} = require 'inbox-exports' +{ComponentRegistry} = require 'nylas-exports' module.exports = activate: (@state={}) -> diff --git a/internal_packages/calendar-bar/lib/calendar-bar-event-store.coffee b/internal_packages/calendar-bar/lib/calendar-bar-event-store.coffee index 4e0d49abb..128cd2a70 100644 --- a/internal_packages/calendar-bar/lib/calendar-bar-event-store.coffee +++ b/internal_packages/calendar-bar/lib/calendar-bar-event-store.coffee @@ -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 diff --git a/internal_packages/calendar-bar/lib/calendar-bar-item.cjsx b/internal_packages/calendar-bar/lib/calendar-bar-item.cjsx index b79399f06..785ee8a16 100644 --- a/internal_packages/calendar-bar/lib/calendar-bar-item.cjsx +++ b/internal_packages/calendar-bar/lib/calendar-bar-item.cjsx @@ -1,5 +1,5 @@ React = require 'react' -{Actions} = require("inbox-exports") +{Actions} = require("nylas-exports") moment = require 'moment' class CalendarBarItem extends React.Component diff --git a/internal_packages/calendar-bar/lib/calendar-bar.cjsx b/internal_packages/calendar-bar/lib/calendar-bar.cjsx index 08069164b..d9e4d9d05 100644 --- a/internal_packages/calendar-bar/lib/calendar-bar.cjsx +++ b/internal_packages/calendar-bar/lib/calendar-bar.cjsx @@ -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") diff --git a/internal_packages/composer/lib/composer-view.cjsx b/internal_packages/composer/lib/composer-view.cjsx index f692ff705..835c9f85d 100644 --- a/internal_packages/composer/lib/composer-view.cjsx +++ b/internal_packages/composer/lib/composer-view.cjsx @@ -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' diff --git a/internal_packages/composer/lib/contenteditable-component.cjsx b/internal_packages/composer/lib/contenteditable-component.cjsx index 5658f7f3f..e0e39edc2 100644 --- a/internal_packages/composer/lib/contenteditable-component.cjsx +++ b/internal_packages/composer/lib/contenteditable-component.cjsx @@ -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 diff --git a/internal_packages/composer/lib/file-uploads.cjsx b/internal_packages/composer/lib/file-uploads.cjsx index 4d95d2195..4fcfbc454 100644 --- a/internal_packages/composer/lib/file-uploads.cjsx +++ b/internal_packages/composer/lib/file-uploads.cjsx @@ -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: => diff --git a/internal_packages/composer/lib/floating-toolbar.cjsx b/internal_packages/composer/lib/floating-toolbar.cjsx index 586640e27..c175a55a4 100644 --- a/internal_packages/composer/lib/floating-toolbar.cjsx +++ b/internal_packages/composer/lib/floating-toolbar.cjsx @@ -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" diff --git a/internal_packages/composer/lib/main.cjsx b/internal_packages/composer/lib/main.cjsx index e76769222..59a04c4f0 100644 --- a/internal_packages/composer/lib/main.cjsx +++ b/internal_packages/composer/lib/main.cjsx @@ -5,7 +5,7 @@ React = require 'react' DatabaseStore, Message, ComponentRegistry, - WorkspaceStore} = require('inbox-exports') + WorkspaceStore} = require('nylas-exports') NewComposeButton = require('./new-compose-button') ComposerView = require('./composer-view') diff --git a/internal_packages/composer/lib/new-compose-button.cjsx b/internal_packages/composer/lib/new-compose-button.cjsx index b6eb6469d..38164e51e 100644 --- a/internal_packages/composer/lib/new-compose-button.cjsx +++ b/internal_packages/composer/lib/new-compose-button.cjsx @@ -1,6 +1,6 @@ React = require 'react' -{Message, Actions, NamespaceStore} = require 'inbox-exports' -{RetinaImg} = require 'ui-components' +{Message, Actions, NamespaceStore} = require 'nylas-exports' +{RetinaImg} = require 'nylas-component-kit' class NewComposeButton extends React.Component @displayName: 'NewComposeButton' diff --git a/internal_packages/composer/lib/participants-text-field.cjsx b/internal_packages/composer/lib/participants-text-field.cjsx index 7056f27e3..1c7721ef7 100644 --- a/internal_packages/composer/lib/participants-text-field.cjsx +++ b/internal_packages/composer/lib/participants-text-field.cjsx @@ -3,8 +3,8 @@ _ = require 'underscore-plus' {Contact, Utils, - ContactStore} = require 'inbox-exports' -{TokenizingTextField, Menu} = require 'ui-components' + ContactStore} = require 'nylas-exports' +{TokenizingTextField, Menu} = require 'nylas-component-kit' class ParticipantsTextField extends React.Component @displayName: 'ParticipantsTextField' diff --git a/internal_packages/composer/spec/inbox-composer-view-spec.cjsx b/internal_packages/composer/spec/inbox-composer-view-spec.cjsx index 7f4598070..236b9de35 100644 --- a/internal_packages/composer/spec/inbox-composer-view-spec.cjsx +++ b/internal_packages/composer/spec/inbox-composer-view-spec.cjsx @@ -11,13 +11,13 @@ ReactTestUtils = React.addons.TestUtils DraftStore, DatabaseStore, InboxTestUtils, - NamespaceStore} = require "inbox-exports" + NamespaceStore} = require "nylas-exports" -u1 = new Contact(name: "Christine Spang", email: "spang@inboxapp.com") -u2 = new Contact(name: "Michael Grinich", email: "mg@inboxapp.com") -u3 = new Contact(name: "Evan Morikawa", email: "evan@inboxapp.com") -u4 = new Contact(name: "Zoë Leiper", email: "zip@inboxapp.com") -u5 = new Contact(name: "Ben Gotow", email: "ben@inboxapp.com") +u1 = new Contact(name: "Christine Spang", email: "spang@nylas.com") +u2 = new Contact(name: "Michael Grinich", email: "mg@nylas.com") +u3 = new Contact(name: "Evan Morikawa", email: "evan@nylas.com") +u4 = new Contact(name: "Zoë Leiper", email: "zip@nylas.com") +u5 = new Contact(name: "Ben Gotow", email: "ben@nylas.com") users = [u1, u2, u3, u4, u5] NamespaceStore._current = new Namespace( {name: u1.name, provider: "inbox", emailAddress: u1.email}) @@ -45,7 +45,7 @@ searchContactStub = (email) -> ComposerView = proxyquire "../lib/composer-view", "./file-uploads": reactStub("file-uploads") "./participants-text-field": textFieldStub("") - "inbox-exports": + "nylas-exports": ContactStore: searchContacts: (email) -> searchContactStub ComponentRegistry: diff --git a/internal_packages/composer/spec/participants-text-field-spec.cjsx b/internal_packages/composer/spec/participants-text-field-spec.cjsx index c2bab76b8..374f1b7a9 100644 --- a/internal_packages/composer/spec/participants-text-field-spec.cjsx +++ b/internal_packages/composer/spec/participants-text-field-spec.cjsx @@ -9,22 +9,22 @@ proxyquire = require 'proxyquire' ContactStore, Contact, Utils, -} = require 'inbox-exports' +} = require 'nylas-exports' ParticipantsTextField = proxyquire '../lib/participants-text-field', - 'inbox-exports': {Contact, ContactStore} + 'nylas-exports': {Contact, ContactStore} participant1 = new Contact - email: 'ben@nilas.com' + email: 'ben@nylas.com' participant2 = new Contact email: 'ben@example.com' - name: 'ben' + name: 'Ben Gotow' participant3 = new Contact email: 'ben@inboxapp.com' - name: 'Duplicate email' + name: 'Ben Inboxer' participant4 = new Contact email: 'ben@elsewhere.com', - name: 'ben again' + name: 'ben Again' participant5 = new Contact email: 'evan@elsewhere.com', name: 'EVAN' @@ -105,14 +105,14 @@ describe 'ParticipantsTextField', -> describe "when text contains Name (Email) formatted data", -> it "should correctly parse it into named Contact objects", -> - newContact1 = new Contact(name:'Ben Imposter', email:'imposter@nilas.com') - newContact2 = new Contact(name:'Nilas Team', email:'feedback@nilas.com') - + newContact1 = new Contact(name:'Ben Imposter', email:'imposter@nylas.com') + newContact2 = new Contact(name:'Nylas Team', email:'feedback@nylas.com') + inputs = [ - "Ben Imposter , Nilas Team ", - "\n\nbla\nBen Imposter (imposter@nilas.com), Nilas Team (feedback@nilas.com)", - "Hello world! I like cheese. \rBen Imposter (imposter@nilas.com)\nNilas Team (feedback@nilas.com)", - "Ben ImposterNilas Team (feedback@nilas.com)" + "Ben Imposter , Nylas Team ", + "\n\nbla\nBen Imposter (imposter@nylas.com), Nylas Team (feedback@nylas.com)", + "Hello world! I like cheese. \rBen Imposter (imposter@nylas.com)\nNylas Team (feedback@nylas.com)", + "Ben ImposterNylas Team (feedback@nylas.com)" ] for input in inputs @@ -123,14 +123,14 @@ describe 'ParticipantsTextField', -> describe "when text contains emails mixed with garbage text", -> it "should still parse out emails into Contact objects", -> - newContact1 = new Contact(name:'garbage-man@nilas.com', email:'garbage-man@nilas.com') - newContact2 = new Contact(name:'recycling-guy@nilas.com', email:'recycling-guy@nilas.com') - + newContact1 = new Contact(name:'garbage-man@nylas.com', email:'garbage-man@nylas.com') + newContact2 = new Contact(name:'recycling-guy@nylas.com', email:'recycling-guy@nylas.com') + inputs = [ - "Hello world I real. \n asd. garbage-man@nilas.com—he's cool Also 'recycling-guy@nilas.com'!", - "garbage-man@nilas.com|recycling-guy@nilas.com", - "garbage-man@nilas.com1WHOA I REALLY HATE DATA,recycling-guy@nilas.com", - "nils.com garbage-man@nilas.com @nilas.com nope@.com nope!recycling-guy@nilas.com HOLLA AT recycling-guy@nilas." + "Hello world I real. \n asd. garbage-man@nylas.com—he's cool Also 'recycling-guy@nylas.com'!", + "garbage-man@nylas.com|recycling-guy@nylas.com", + "garbage-man@nylas.com1WHOA I REALLY HATE DATA,recycling-guy@nylas.com", + "nils.com garbage-man@nylas.com @nylas.com nope@.com nope!recycling-guy@nylas.com HOLLA AT recycling-guy@nylas." ] for input in inputs diff --git a/internal_packages/file-list/lib/file-frame-store.coffee b/internal_packages/file-list/lib/file-frame-store.coffee index 622127cba..84c671d5f 100644 --- a/internal_packages/file-list/lib/file-frame-store.coffee +++ b/internal_packages/file-list/lib/file-frame-store.coffee @@ -5,7 +5,7 @@ fs = require 'fs' {WorkspaceStore, FocusedContentStore, FileDownloadStore, - Actions} = require 'inbox-exports' + Actions} = require 'nylas-exports' module.exports = FileFrameStore = Reflux.createStore diff --git a/internal_packages/file-list/lib/file-frame.cjsx b/internal_packages/file-list/lib/file-frame.cjsx index 172e87579..66f84292b 100644 --- a/internal_packages/file-list/lib/file-frame.cjsx +++ b/internal_packages/file-list/lib/file-frame.cjsx @@ -1,7 +1,7 @@ React = require 'react' _ = require "underscore-plus" -{Utils, FileDownloadStore, Actions} = require 'inbox-exports' -{Spinner, EventedIFrame} = require 'ui-components' +{Utils, FileDownloadStore, Actions} = require 'nylas-exports' +{Spinner, EventedIFrame} = require 'nylas-component-kit' FileFrameStore = require './file-frame-store' class FileFrame extends React.Component diff --git a/internal_packages/file-list/lib/file-list-store.coffee b/internal_packages/file-list/lib/file-list-store.coffee index 8e10b59df..69ba206c7 100644 --- a/internal_packages/file-list/lib/file-list-store.coffee +++ b/internal_packages/file-list/lib/file-list-store.coffee @@ -2,7 +2,7 @@ Reflux = require 'reflux' _ = require 'underscore-plus' {File, DatabaseStore, - DatabaseView} = require 'inbox-exports' + DatabaseView} = require 'nylas-exports' module.exports = FileListStore = Reflux.createStore diff --git a/internal_packages/file-list/lib/file-list.cjsx b/internal_packages/file-list/lib/file-list.cjsx index dcd665a78..4f29bc2a6 100644 --- a/internal_packages/file-list/lib/file-list.cjsx +++ b/internal_packages/file-list/lib/file-list.cjsx @@ -1,9 +1,9 @@ _ = require 'underscore-plus' React = require 'react' -{ListTabular, MultiselectList} = require 'ui-components' +{ListTabular, MultiselectList} = require 'nylas-component-kit' {Actions, DatabaseStore, - ComponentRegistry} = require 'inbox-exports' + ComponentRegistry} = require 'nylas-exports' FileListStore = require './file-list-store' class FileList extends React.Component diff --git a/internal_packages/file-list/lib/file-selection-bar.cjsx b/internal_packages/file-list/lib/file-selection-bar.cjsx index 1106af187..5ed7fa2dc 100644 --- a/internal_packages/file-list/lib/file-selection-bar.cjsx +++ b/internal_packages/file-list/lib/file-selection-bar.cjsx @@ -1,6 +1,6 @@ React = require "react/addons" FileListStore = require './file-list-store' -{MultiselectActionBar} = require 'ui-components' +{MultiselectActionBar} = require 'nylas-component-kit' class FileSelectionBar extends React.Component @displayName: 'FileSelectionBar' diff --git a/internal_packages/file-list/lib/main.cjsx b/internal_packages/file-list/lib/main.cjsx index dabbc26f5..6559ea695 100644 --- a/internal_packages/file-list/lib/main.cjsx +++ b/internal_packages/file-list/lib/main.cjsx @@ -2,7 +2,7 @@ FileFrame = require "./file-frame" FileList = require './file-list' FileSelectionBar = require './file-selection-bar' {ComponentRegistry, - WorkspaceStore} = require 'inbox-exports' + WorkspaceStore} = require 'nylas-exports' module.exports = diff --git a/internal_packages/inbox-activity-bar/lib/activity-bar-store.coffee b/internal_packages/inbox-activity-bar/lib/activity-bar-store.coffee index 2d004334b..40f950c91 100644 --- a/internal_packages/inbox-activity-bar/lib/activity-bar-store.coffee +++ b/internal_packages/inbox-activity-bar/lib/activity-bar-store.coffee @@ -1,5 +1,5 @@ Reflux = require 'reflux' -{Actions} = require 'inbox-exports' +{Actions} = require 'nylas-exports' qs = require 'querystring' _ = require 'underscore-plus' diff --git a/internal_packages/inbox-activity-bar/lib/activity-bar-task.cjsx b/internal_packages/inbox-activity-bar/lib/activity-bar-task.cjsx index ebcda4110..26a08c693 100644 --- a/internal_packages/inbox-activity-bar/lib/activity-bar-task.cjsx +++ b/internal_packages/inbox-activity-bar/lib/activity-bar-task.cjsx @@ -1,7 +1,7 @@ React = require 'react/addons' classNames = require 'classnames' _ = require 'underscore-plus' -{Utils} = require 'inbox-exports' +{Utils} = require 'nylas-exports' class ActivityBarTask extends React.Component @displayName: 'ActivityBarTask' diff --git a/internal_packages/inbox-activity-bar/lib/activity-bar.cjsx b/internal_packages/inbox-activity-bar/lib/activity-bar.cjsx index c1d4d0dab..1c0c59553 100644 --- a/internal_packages/inbox-activity-bar/lib/activity-bar.cjsx +++ b/internal_packages/inbox-activity-bar/lib/activity-bar.cjsx @@ -6,8 +6,8 @@ React = require 'react/addons' TaskQueue, Actions, Contact, - Message} = require 'inbox-exports' -{ResizableRegion} = require 'ui-components' + Message} = require 'nylas-exports' +{ResizableRegion} = require 'nylas-component-kit' ActivityBarStore = require './activity-bar-store' ActivityBarTask = require './activity-bar-task' @@ -169,15 +169,15 @@ class ActivityBar extends React.Component from: [NamespaceStore.current().me()] to: [ new Contact - name: "Nilas Team" - email: "feedback@nilas.com" + name: "Nylas Team" + email: "feedback@nylas.com" ] date: (new Date) draft: true subject: "Feedback" namespaceId: NamespaceStore.current().id body: """ - Hi, Edgehill team! I have some feedback for you.
+ Hi, Nylas team! I have some feedback for you.

What happened:

diff --git a/internal_packages/inbox-activity-bar/lib/main.cjsx b/internal_packages/inbox-activity-bar/lib/main.cjsx index 090bee92c..c6e09f20a 100644 --- a/internal_packages/inbox-activity-bar/lib/main.cjsx +++ b/internal_packages/inbox-activity-bar/lib/main.cjsx @@ -1,5 +1,5 @@ React = require 'react' -{ComponentRegistry, WorkspaceStore} = require 'inbox-exports' +{ComponentRegistry, WorkspaceStore} = require 'nylas-exports' ActivityBar = require './activity-bar' module.exports = diff --git a/internal_packages/inbox-contact-elements/lib/ContactChip.cjsx b/internal_packages/inbox-contact-elements/lib/ContactChip.cjsx index bdab0a6c2..d2477e577 100644 --- a/internal_packages/inbox-contact-elements/lib/ContactChip.cjsx +++ b/internal_packages/inbox-contact-elements/lib/ContactChip.cjsx @@ -1,5 +1,5 @@ React = require "react" -{Actions} = require 'inbox-exports' +{Actions} = require 'nylas-exports' crypto = require "crypto" class ContactChip extends React.Component diff --git a/internal_packages/inbox-contact-elements/lib/Participants.cjsx b/internal_packages/inbox-contact-elements/lib/Participants.cjsx index e206d42e8..b30d727f3 100644 --- a/internal_packages/inbox-contact-elements/lib/Participants.cjsx +++ b/internal_packages/inbox-contact-elements/lib/Participants.cjsx @@ -2,7 +2,7 @@ React = require "react" _ = require "underscore-plus" ContactChip = require './ContactChip' -{NamespaceStore} = require "inbox-exports" +{NamespaceStore} = require "nylas-exports" # Parameters # clickable (optional) - is this currently clickable? diff --git a/internal_packages/inbox-contact-elements/lib/main.coffee b/internal_packages/inbox-contact-elements/lib/main.coffee index 2e89851be..a43a806c1 100644 --- a/internal_packages/inbox-contact-elements/lib/main.coffee +++ b/internal_packages/inbox-contact-elements/lib/main.coffee @@ -1,4 +1,4 @@ -{ComponentRegistry} = require 'inbox-exports' +{ComponentRegistry} = require 'nylas-exports' Participants = require './Participants' module.exports = diff --git a/internal_packages/inbox-light-ui/CONTRIBUTING.md b/internal_packages/light-ui/CONTRIBUTING.md similarity index 100% rename from internal_packages/inbox-light-ui/CONTRIBUTING.md rename to internal_packages/light-ui/CONTRIBUTING.md diff --git a/internal_packages/inbox-light-ui/LICENSE.md b/internal_packages/light-ui/LICENSE.md similarity index 100% rename from internal_packages/inbox-light-ui/LICENSE.md rename to internal_packages/light-ui/LICENSE.md diff --git a/internal_packages/inbox-light-ui/README.md b/internal_packages/light-ui/README.md similarity index 100% rename from internal_packages/inbox-light-ui/README.md rename to internal_packages/light-ui/README.md diff --git a/internal_packages/inbox-light-ui/index.less b/internal_packages/light-ui/index.less similarity index 100% rename from internal_packages/inbox-light-ui/index.less rename to internal_packages/light-ui/index.less diff --git a/internal_packages/inbox-light-ui/package.json b/internal_packages/light-ui/package.json similarity index 86% rename from internal_packages/inbox-light-ui/package.json rename to internal_packages/light-ui/package.json index b40e36476..907db9943 100644 --- a/internal_packages/inbox-light-ui/package.json +++ b/internal_packages/light-ui/package.json @@ -1,5 +1,5 @@ { - "name": "inbox-light-ui", + "name": "light-ui", "theme": "ui", "version": "0.1.0", "description": "The Inbox Mail Client Theme", diff --git a/internal_packages/message-list/lib/email-frame.cjsx b/internal_packages/message-list/lib/email-frame.cjsx index 0338eb2c9..51f251f22 100644 --- a/internal_packages/message-list/lib/email-frame.cjsx +++ b/internal_packages/message-list/lib/email-frame.cjsx @@ -1,7 +1,7 @@ React = require 'react' _ = require "underscore-plus" -{EventedIFrame} = require 'ui-components' -{Utils} = require 'inbox-exports' +{EventedIFrame} = require 'nylas-component-kit' +{Utils} = require 'nylas-exports' EmailFixingStyles = """