diff --git a/.env.sample b/.env.sample index 66b83dc1b..b88791dc9 100644 --- a/.env.sample +++ b/.env.sample @@ -2,8 +2,8 @@ # # Please use `openssl rand -hex 32` to create SEQUELIZE_SECRET -DATABASE_URL=postgres://user:pass@example.com:5432/atlas -DATABASE_URL_TEST=postgres://user:pass@example.com:5432/atlas-test +DATABASE_URL=postgres://user:pass@example.com:5432/outline +DATABASE_URL_TEST=postgres://user:pass@example.com:5432/outline-test PORT=3000 REDIS_URL=redis://localhost:6379 SEQUELIZE_SECRET=F0E5AD933D7F6FD8F4DBB3E038C501C052DC0593C686D21ACB30AE205D2F634B diff --git a/LICENSE b/LICENSE index b5cec1326..ce9f0d9dd 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2017 Atlas (https://www.beautifulatlas.com/) and individual contributors. +Copyright (c) 2017 Outline (https://www.getoutline.com/) and individual contributors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -8,7 +8,7 @@ Redistribution and use in source and binary forms, with or without modification, 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of the Atlas nor the names of its contributors may be used to endorse or promote products derived from this software + 3. Neither the name of the Outline nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, diff --git a/app.json b/app.json index 3f446c672..926596895 100644 --- a/app.json +++ b/app.json @@ -1,5 +1,5 @@ { - "name": "atlas", + "name": "outline", "scripts": { "postdeploy": "yarn build && yarn sequelize:migrate" }, diff --git a/app/components/Editor/components/Link.js b/app/components/Editor/components/Link.js index de8a4e2d0..487d014cb 100644 --- a/app/components/Editor/components/Link.js +++ b/app/components/Editor/components/Link.js @@ -14,13 +14,13 @@ function getPathFromUrl(href: string) { } } -function isAtlasUrl(href: string) { +function isOutlineUrl(href: string) { if (href[0] === '/') return true; try { - const atlas = new URL(BASE_URL); + const outline = new URL(BASE_URL); const parsed = new URL(href); - return parsed.hostname === atlas.hostname; + return parsed.hostname === outline.hostname; } catch (err) { return false; } @@ -30,7 +30,7 @@ export default function Link({ attributes, node, children, readOnly }: Props) { const href = node.data.get('href'); const path = getPathFromUrl(href); - if (isAtlasUrl(href) && readOnly) { + if (isOutlineUrl(href) && readOnly) { return {children}; } else { return {children}; diff --git a/app/components/Layout/Layout.js b/app/components/Layout/Layout.js index 25f11ec86..a3d576ff4 100644 --- a/app/components/Layout/Layout.js +++ b/app/components/Layout/Layout.js @@ -102,7 +102,7 @@ type Props = { return ( - Atlas + Outline ( - {`${title} - Atlas`} + {`${title} - Outline`} ); export default PageTitle; diff --git a/app/scenes/CollectionNew/CollectionNew.js b/app/scenes/CollectionNew/CollectionNew.js index 1839400c3..195b97852 100644 --- a/app/scenes/CollectionNew/CollectionNew.js +++ b/app/scenes/CollectionNew/CollectionNew.js @@ -56,7 +56,7 @@ type Props = { return (
- Collections are for grouping your Atlas. They work best when organized + Collections are for grouping your Outline. They work best when organized around a topic or internal team — Product or Engineering for example. - Atlas is designed to be super fast and easy to use. + Outline is designed to be super fast and easy to use. All of your usual keyboard shortcuts work here, and there {"'"} s Markdown too. diff --git a/app/scenes/Settings/Settings.js b/app/scenes/Settings/Settings.js index 5d54313f3..37243c3fc 100644 --- a/app/scenes/Settings/Settings.js +++ b/app/scenes/Settings/Settings.js @@ -31,8 +31,8 @@ import SlackAuthLink from 'components/SlackAuthLink';
Slack - Connect Atlas to your Slack to instantly search for your documents - using /atlas command. + Connect Outline to your Slack to instantly search for your documents + using /outline command. API Access - Create API tokens to hack on your Atlas. + Create API tokens to hack on your Outline. Learn more in API documentation. diff --git a/app/static/flatpages/api.md b/app/static/flatpages/api.md index afbad3c0e..0edc14b6b 100644 --- a/app/static/flatpages/api.md +++ b/app/static/flatpages/api.md @@ -1,15 +1,15 @@ -# Atlas API +# Outline API _Our API is currently in beta and we might make minor adjustments._ ## Making requests -Atlas' API follows JSON RPC style conventions where each API endpoint is a method on `https://www.beautifulatlas.com/api/`. Each request needs to be made using HTTPS and both `GET` and `POST` (recommended) methods are supported. +Outline's API follows JSON RPC style conventions where each API endpoint is a method on `https://www.getoutline.com/api/`. Each request needs to be made using HTTPS and both `GET` and `POST` (recommended) methods are supported. For `GET` requests query string parameters are expected (e.g. `/api/document.info?id=...&token=...`). When making `POST` requests, request parameters are parsed depending on `Content-Type` header. To make a call using JSON payload, one must pass `Content-Type: application/json` header: ```shell -curl 'https://www.beautifulatlas.com/api/documents.info?id=atlas-api-NTpezNwhUP'\ +curl 'https://www.getoutline.com/api/documents.info?id=outline-api-NTpezNwhUP'\ -H 'authorization: Bearer '\ -H 'content-type: application/json'\ -H 'accept: application/json' @@ -17,9 +17,9 @@ curl 'https://www.beautifulatlas.com/api/documents.info?id=atlas-api-NTpezNwhUP' ## Authentication -To access private API endpoints, you must provide a valid API key. You can create new API keys in your [account settings](https://www.beautifulatlas.com/settings). Be careful when handling your keys as they give access to all of your documents. +To access private API endpoints, you must provide a valid API key. You can create new API keys in your [account settings](https://www.getoutline.com/settings). Be careful when handling your keys as they give access to all of your documents. -To authenticate with Atlas API, you can supply the API key as a header (`Authorization: Bearer `) or as part of the payload using `token` parameter. +To authenticate with Outline API, you can supply the API key as a header (`Authorization: Bearer `) or as part of the payload using `token` parameter. Some API endpoints allow unauhenticated requests for public resources and they can be called without an API key. @@ -42,7 +42,7 @@ This method returns the information for currently logged in user. #### Arguments -`https://www.beautifulatlas.com/api/user.info` +`https://www.getoutline.com/api/user.info` Parameter | Description ------------ | ------------- @@ -52,11 +52,11 @@ Parameter | Description ### `user.s3Upload` - Gets S3 upload credentials -You can upload small files and images as part of your documents. All files are stored using Amazon S3. Instead of uploading files to Atlas, you need to upload them directly to S3 with special credentials which can be obtained through this endpoint. +You can upload small files and images as part of your documents. All files are stored using Amazon S3. Instead of uploading files to Outline, you need to upload them directly to S3 with special credentials which can be obtained through this endpoint. #### Arguments -`https://www.beautifulatlas.com/api/user.s3Upload` +`https://www.getoutline.com/api/user.s3Upload` Parameter | Description ------------ | ------------- @@ -73,7 +73,7 @@ List all your document collections. #### Arguments -`https://www.beautifulatlas.com/api/collections.list` +`https://www.getoutline.com/api/collections.list` Parameter | Description ------------ | ------------- @@ -89,7 +89,7 @@ Returns detailed information on a document collection. #### Arguments -`https://www.beautifulatlas.com/api/collections.info` +`https://www.getoutline.com/api/collections.info` Parameter | Description ------------ | ------------- @@ -100,14 +100,14 @@ Parameter | Description ### `collections.create` - Create a document collection -Creates a new document collection. Atlas supports two types of collections: +Creates a new document collection. Outline supports two types of collections: - `atlas` - Structured collection with a navigation tree - `journal` - Chronological collection of documents #### Arguments -`https://www.beautifulatlas.com/api/collections.create` +`https://www.getoutline.com/api/collections.create` Parameter | Description ------------ | ------------- @@ -124,7 +124,7 @@ Collection navigation can be re-organized by sending a modified version of the n #### Arguments -`https://www.beautifulatlas.com/api/collections.updateNavigationTree` +`https://www.getoutline.com/api/collections.updateNavigationTree` Parameter | Description ------------ | ------------- @@ -139,11 +139,11 @@ Parameter | Description This method returns information for a document with a specific ID. Following identifiers are allowed: - UUID - `id` field of the document -- URI identifier - Human readable identifier used in Atlas URLs (e.g. `atlas-api-i48ZEZc5zjXndcP`) +- URI identifier - Human readable identifier used in Outline URLs (e.g. `outline-api-i48ZEZc5zjXndcP`) #### Arguments -`https://www.beautifulatlas.com/api/documents.info` +`https://www.getoutline.com/api/documents.info` Parameter | Description ------------ | ------------- @@ -158,7 +158,7 @@ This methods allows you to search all of your documents with keywords. #### Arguments -`https://www.beautifulatlas.com/api/documents.search` +`https://www.getoutline.com/api/documents.search` Parameter | Description ------------ | ------------- @@ -173,7 +173,7 @@ This method allows you to publish a new document under an existing collection. I #### Arguments -`https://www.beautifulatlas.com/api/documents.create` +`https://www.getoutline.com/api/documents.create` Parameter | Description ------------ | ------------- @@ -191,7 +191,7 @@ Delete a document and all of its child documents if any. #### Arguments -`https://www.beautifulatlas.com/api/documents.delete` +`https://www.getoutline.com/api/documents.delete` Parameter | Description ------------ | ------------- diff --git a/app/utils/ApiClient.js b/app/utils/ApiClient.js index c94ed2f24..ab1567128 100644 --- a/app/utils/ApiClient.js +++ b/app/utils/ApiClient.js @@ -13,7 +13,7 @@ class ApiClient { constructor(options: Options = {}) { this.baseUrl = options.baseUrl || '/api'; - this.userAgent = 'AtlasFrontend'; + this.userAgent = 'OutlineFrontend'; } fetch = ( diff --git a/package.json b/package.json index 7a032c883..53361d1a3 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "Atlas", + "name": "Outline", "private": true, "main": "index.js", "scripts": { @@ -45,7 +45,7 @@ }, "repository": { "type": "git", - "url": "git+ssh://git@github.com/jorilallo/atlas.git" + "url": "git+ssh://git@github.com/outline/outline.git" }, "dependencies": { "@tommoor/slate-drop-or-paste-images": "0.5.1", diff --git a/server/middlewares/subdomainRedirect.js b/server/middlewares/subdomainRedirect.js index 9f6ca9ba8..c1c41468d 100644 --- a/server/middlewares/subdomainRedirect.js +++ b/server/middlewares/subdomainRedirect.js @@ -1,6 +1,6 @@ export default function subdomainRedirect(options) { return async function subdomainRedirectMiddleware(ctx, next) { - if (ctx.headers.host === 'beautifulatlas.com') { + if (ctx.headers.host === 'getoutline.com') { ctx.redirect(`https://www.${ctx.headers.host}${ctx.path}`); } else { return next(); diff --git a/server/pages/About.js b/server/pages/About.js index 281ff9197..086f4ca80 100644 --- a/server/pages/About.js +++ b/server/pages/About.js @@ -11,7 +11,7 @@ export default function About() { About -

About Atlas

+

About Outline

Just a proof of concept for multiple pages.

diff --git a/server/pages/Pricing.js b/server/pages/Pricing.js index d8d76ec66..0f0084ba0 100644 --- a/server/pages/Pricing.js +++ b/server/pages/Pricing.js @@ -13,7 +13,7 @@ export default function Pricing() {

Pricing

- Explore Atlas with a 14 day trial, free forever for teams smaller than 5. + Explore Outline with a 14 day trial, free forever for teams smaller than 5.

diff --git a/server/pages/components/Layout.js b/server/pages/components/Layout.js index 3f873c086..9f7e23e93 100644 --- a/server/pages/components/Layout.js +++ b/server/pages/components/Layout.js @@ -15,7 +15,7 @@ export default function Layout({ children }: Props) { - Atlas + Outline diff --git a/server/pages/components/Navigation.js b/server/pages/components/Navigation.js index 0ff578067..922f66a78 100644 --- a/server/pages/components/Navigation.js +++ b/server/pages/components/Navigation.js @@ -6,7 +6,7 @@ import { color } from '../../../shared/styles/constants'; function Navigation() { return (