Skip to content

Commit

Permalink
Merge pull request #200 from bustlelabs/cleanup
Browse files Browse the repository at this point in the history
Remove unused files, remove packages from package.json, docs
  • Loading branch information
mixonic committed Nov 2, 2015
2 parents e0b7e0e + fce0dc4 commit 437baaf
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 208 deletions.
30 changes: 6 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -226,31 +226,13 @@ Or run headless tests via testem:

* `npm test`

To quickly view the demo:
#### Demo

* `broccoli serve`
* open http://localhost:4200/demo
* Image uploads and embeds are not supported running in this manner.

To view the full demo with uploads and embed, you will have to configure AWS
and Embedly keys as environment variables:

```bash
export AWS_ACCESS_KEY_ID=XXXXXX
export AWS_SECRET_ACCESS_KEY=XXXXXX
export EMBEDLY_KEY=XXXXXX
```

Also set the `bucketName` in `server/config.json` with the name of your AWS
S3 bucket for uploading files.

Then to boot the server:

```
node server/index.js
```
There is a demo app that uses content-kit and ember-content-kit in `demo/`. To run the demo:

And visit [localhost:5000/dist/demo/index.html](http://localhost:5000/dist/demo/index.html)
* `cd demo/ && npm install && bower install`
* `ember serve` (shut down your broccoli server if it is already running on port 4200)
* visit http://localhost:4200/

#### Releasing

Expand All @@ -259,7 +241,7 @@ And visit [localhost:5000/dist/demo/index.html](http://localhost:5000/dist/demo/
* `git push <origin> --follow-tags`
* `npm publish`

#### Re-deploy the demo
#### Deploy the demo

The demo website is hosted at github pages. To publish a new version:

Expand Down
63 changes: 0 additions & 63 deletions notes

This file was deleted.

11 changes: 0 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
"version": "0.5.0-beta2",
"description": "A modern, minimalist WYSIWYG editor.",
"repository": "https://github.com/bustlelabs/content-kit-editor",
"engines": {
"node": "0.10.x"
},
"scripts": {
"start": "broccoli serve",
"test": "testem ci",
Expand All @@ -30,12 +27,6 @@
],
"author": "Garth Poitras <garth22@gmail.com> (http://garthpoitras.com/)",
"license": "MIT",
"dependencies": {
"aws-sdk": "^2.1.7",
"busboy": "^0.2.9",
"embedly": "^1.0.2",
"express": "^4.11.1"
},
"devDependencies": {
"broccoli": "^0.16.3",
"broccoli-funnel": "^0.2.8",
Expand All @@ -45,8 +36,6 @@
"broccoli-test-builder": "^0.1.0",
"content-kit-utils": "^0.2.0",
"jquery": "^2.1.4",
"mobiledoc-dom-renderer": "^0.1.12",
"mobiledoc-html-renderer": "^0.1.7",
"testem": "^0.8.4"
},
"main": "dist/commonjs/content-kit-editor/index.js"
Expand Down
5 changes: 0 additions & 5 deletions server/config.json

This file was deleted.

26 changes: 0 additions & 26 deletions server/index.js

This file was deleted.

76 changes: 0 additions & 76 deletions server/services/upload.js

This file was deleted.

9 changes: 6 additions & 3 deletions src/js/parsers/mobiledoc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@ import {
import { kvArrayToObject, filter } from "../utils/array-utils";

/*
* input mobiledoc: [ markers, elements ]
* output: Post
*
* Parses from mobiledoc -> post
*/
export default class MobiledocParser {
constructor(builder) {
this.builder = builder;
}

/**
* @method parse
* @param {Mobiledoc}
* @return {Post}
*/
parse({version, sections: sectionData}) {
const markerTypes = sectionData[0];
const sections = sectionData[1];
Expand Down
8 changes: 8 additions & 0 deletions src/js/renderers/mobiledoc.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,15 @@ const postOpcodeCompiler = {
}
};

/**
* Render from post -> mobiledoc
*/
export default {
/**
* @method render
* @param {Post}
* @return {Mobiledoc}
*/
render(post) {
let opcodes = [];
visit(visitor, post, opcodes);
Expand Down

0 comments on commit 437baaf

Please sign in to comment.