Skip to content

Commit

Permalink
Merge pull request #57 from owise1/v2
Browse files Browse the repository at this point in the history
💇 v2
  • Loading branch information
Steve Lambert committed Mar 25, 2016
2 parents 0e7ecdf + d1a08df commit da891f4
Show file tree
Hide file tree
Showing 47 changed files with 30,395 additions and 3,099 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ add-art-alone.xpi
.Trashes
ehthumbs.db
Thumbs.db
**.swp
node_modules/
2 changes: 2 additions & 0 deletions .jpmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules/
!node_modules/ramda/*
674 changes: 0 additions & 674 deletions COPYING.txt

This file was deleted.

57 changes: 42 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
Add-Art is a Firefox (for now) Browser Extension that replaces ads with art.

Featured sources of art include:

- [The Brooklyn Museum][1]
- [Eyebeam][2]
- [Kadist Foundation][3]
- [NASA][4]
- [Rhizome][5]
#Add-Art
Add-Art is a Firefox ([Chrome](https://github.com/coreytegeler/add-art-chrome) & [Safari](https://github.com/owise1/add-art-safari)) Browser Extension that replaces ads with art.

When it works, it works pretty good. We all want it to be better, and we welcome your help with that.


##Links

SITE: [Add-Art.org][6]
Expand All @@ -20,8 +14,6 @@ LICENSE: [GPL][8]

## Contribute

The main thing we're working on are getting Add-Art working with the [Mozilla Add-Ons SDK](https://developer.mozilla.org/en-US/Add-ons/SDK) - also known as [Issue #49](https://github.com/slambert/Add-Art/issues/49). We've [created a branch](https://github.com/slambert/Add-Art/tree/sdk) so you pick right up on our work. We're also working on a Chrome version and you can check out that repo at [github.com/coreytegeler/add-art-chrome](https://github.com/coreytegeler/add-art-chrome)

You can see what else we've been working on in the [issues][9] section.

Do contribute:
Expand All @@ -33,6 +25,38 @@ Do contribute:
* Comment on the issue (or create an issue) with a link to your branch
* Sit back and wait

### Development

#### To install:

First you'll need to [install jpm](https://developer.mozilla.org/en-US/Add-ons/SDK/Tools/jpm#Installation). Then install the npm packages:

```
npm install
```

#### To work on the popup:

```
npm run watch
```
Then open `data/popup.html` in a browser

#### To run extension in the browser:

```
npm run run
```

#### How it currently works

Add-Art v2 no longer depends on Ad Block Plus and makes use of the [Mozilla Addons SDK](https://developer.mozilla.org/en-US/Add-ons/SDK). An "essay" (or exhibition) within add-art is simply a JSON file. [This repo](https://github.com/owise1/addendum-exhibitions) lays out an essay's JSON schema.

Kadist's [Addendum](http://addendum.kadist.org/) visual essays ship with the extension. The configuration for those essays are kept [here](https://github.com/owise1/addendum-exhibitions).

Users can also create their own essays on the [add-art site](http://add-art.org/essays/). They receive a link to the JSON for the essay and can use it to import the show into their extension.


## Contributors

* [Steve Lambert][10]
Expand All @@ -52,10 +76,11 @@ Do contribute:
* [Dan Phiffer][24]
* [Mushon Zer-Aviv][25]
* [Alyssa Wright][26]
* [Oliver Wise][27]

And help from
* Hana Newman
And help from

* Hana Newman


[1]: http://www.brooklynmuseum.org/
Expand Down Expand Up @@ -83,4 +108,6 @@ Do contribute:
[23]: https://twitter.com/#!/mikey_k
[24]: http://phiffer.org/
[25]: http://mushon.com/
[26]: http://alumni.media.mit.edu/~alyssa/
[26]: http://alumni.media.mit.edu/~alyssa/
[27]: http://owise1.guru

Loading

0 comments on commit da891f4

Please sign in to comment.