Skip to content

Commit

Permalink
Merge pull request #16 from Caleydo/migrate
Browse files Browse the repository at this point in the history
Migrate
  • Loading branch information
Samuel Gratzl committed Jan 4, 2017
2 parents fd9ed3a + 4d324e9 commit b7a47f5
Show file tree
Hide file tree
Showing 34 changed files with 2,103 additions and 961 deletions.
21 changes: 21 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# EditorConfig helps developers define and maintain consistent
# coding styles between different editors and IDEs
# editorconfig.org

root = true


[*]

# Change these settings to your own preference
indent_style = space
indent_size = 2

# We recommend you to keep these unchanged
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
*.less text
*.styl text
*.js text
*.ts text
*.coffee text
*.json text
*.htm text
Expand Down
12 changes: 9 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
/.tscache
/.idea
/build/
/dist/
node_modules/
/src/**/*.js
/tests/**/*.js
*.map
style.css
Column.js
StratomeX.js
*.css
*.log
6 changes: 0 additions & 6 deletions .npmignore

This file was deleted.

28 changes: 28 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
language: node_js

node_js:
- 6

addons:
firefox: 49.0.1

before_install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi

script: npm run dist

deploy:
provider: releases
api_key:
secure: TK9/P34Bi3WuppiDrBCwVcn41yCBwmILaU8hXTBzUPbT7TbeFIwsC6/4CtH85Z+ZrUve4S5pTmWRNf2dQDxWw3uYu7+bJuemV2J1LHG76mognj+TNEiYxfLQUt3Gql4W7C7FcI4Rlx5/uMN9wY1wro8TWUBMwT6jjSrUWIvK3GXoojd5bHvJx07XpjWl9wCon4D0ruZiFoM2mdeP23lbc2GckETi32oEKswnQXxkMACmxbPzoWbvkxH4aK8Bt2Rj2sl2TbPhVkN6DAkHGkGAvLI+2/aRfG27+oo3OKsaDjbuGABct8TfZccJ970CbQ8kbnCjYxstvqkg1JWjF0W67sX/flBZZOEUA5l0OLWo6HqMGMxm7/lEQhIdPMsRmvXL+HVOxkMrB2dda58QzxVwiZp+rRqUaeabPZp8Kl5xodGrVxsBvxe6zAbJ5jCtCSumG6+kLyKI00/kYlghqQNrgUw0ZsYJlQ34h3lo/24QpaeyDpQoCkGWQgtgqiXGpeKSu7bCnOqIqAy3nbT9Utwj7K8gIasTG5idosEAz/THMampNbGDuyxxc340sYGNMg9Bhm1g2ILWRdtV470p5hwBtIDTKi3/PAizEO26+Wh0zI47Sg3ao57avcbCsTmzbZUeA5J4bojmchhJCHX8su9cSCGh/2fJA/1eBIgEvOQ8LNE=
file: dist/stratomex_js.tar.gz
on:
tags: true

notifications:
slack:
secure: E8/1UIdHSczUbN+6i6gd1d5LM4vmLdwLQ30tpyjvnM0wvfDce76oPxLJAy240WJ5ybXRZUtNrttpVpt4tEXCy8aLFCmxD7s77rVloH+q1J8R/ptTFWZGhFGEujk1awEmVbzcWxJkV9/JENQaeGBKxwv8/EQwWwEkAb7p/+AJb9owmH88b3wUZUGHBWtbMiyyaF4Rm1Wg1stJB8Z1Ga7PRF4cqufTgcDdsCPVv9gAY+VxOIGqX/Vfuc9UWpUH8vq8lHUE7Inn5QS78kuFfSgLWga3H6Mu/Gko1XNlWk0QWWQBUvEZ6ZC6Wuo68KzvUjJHDTnx8WyfHue2JNHIslcX+eJq2WHLeEgM24VeNkILCGo/H/60NGHiSjrIv/Y9h6bQ9FDjo6TUyE4nbdPYN1RN9FQ5UbI9Y4Gi753H9mqnHWlEywBOzHxdZCAuz9Wh03CCF/blsvJ+Obbyo6Jrfe+g44jyi9kQdBNQ78qG6v4EXws8FiYao6x3PpgIwFix42Cpr+soAh5FpA3C1zHSAyZZpXF65/lrDl5yPNofK7Wy0B9bw+0I6Z/u7ZKFNVZXvYPGYvtUVcsALGBdmYc61+LCta36Po0KZseWVAlJj6QnOJDYzv0wvV/zsuf9A5KpYFGiqV9Q7zmtiO5FYF5sBy+lE7O9tHVO4O18IRndhRQgxhs=
on_success: change
on_failure: always
113 changes: 113 additions & 0 deletions .yo-rc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
{
"generator-phovea": {
"type": "app",
"name": "stratomex_js",
"author": "The Caleydo Team",
"githubAccount": "caleydo",
"modules": [
"phovea_core",
"phovea_vis",
"phovea_vis_lineup",
"phovea_d3",
"phovea_ui",
"phovea_clue"
],
"extensions": [
{
"type": "view",
"id": "stratomex",
"module": "StratomeX",
"extras": {
"location": "center"
}
},
{
"type": "view",
"id": "stratomex-lineup",
"module": "Lineup",
"extras": {
"location": "bottom"
}
},
{
"type": "actionFactory",
"id": "stratomex-note",
"module": "notes",
"extras": {
"factory": "createCmd",
"creates": "(addStratomeXNote|changeStratomeXNote|removeStratomeXNote)"
}
},
{
"type": "actionFactory",
"id": "stratomex-column",
"module": "Column",
"extras": {
"factory": "createCmd",
"creates": "(createStratomeXColumn|removeStratomeXColumn|swapStratomeXColumns|setStratomeXColumnOption|changeStratomeXColumnVis|showStratomeXInDetail)"
}
},
{
"type": "actionCompressor",
"id": "stratomex-compressSwap",
"module": "Column",
"extras": {
"factory": "compressSwap",
"matches": "swapStratomeXColumns"
}
},
{
"type": "actionCompressor",
"id": "stratomex-compressCreateRemove",
"module": "Column",
"extras": {
"factory": "compressCreateRemove",
"matches": "(createStratomeXColumn|removeStratomeXColumn)"
}
},
{
"type": "actionCompressor",
"id": "stratomex-compressHideShowDetail",
"module": "Column",
"extras": {
"factory": "compressHideShowDetail",
"matches": "showStratomeXInDetail"
}
},
{
"type": "app",
"id": "stratomex_js",
"module": "",
"extras": {
"name": "Stratomex.js"
}
}
],
"sextensions": [],
"libraries": [
"d3"
],
"unknown": {
"requirements": [],
"debianPackages": [],
"redhatPackages": []
},
"app": "",
"entries": {
"app": "./src/index.ts"
},
"libraryAliases": {
"d3": "d3/d3"
},
"libraryExternals": [
"d3",
"lineupjs",
"font-awesome",
"jquery",
"marked"
],
"ignores": [],
"today": "Tue, 08 Nov 2016 10:00:21 GMT",
"clientOnly": false
}
}
2 changes: 1 addition & 1 deletion ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
* Static or animated images showing the UI behavior

### Expected behavior
*
*
38 changes: 16 additions & 22 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,28 +1,22 @@
Copyright (c) 2015, The Caleydo Team
Copyright (c) 2016, The Caleydo Team
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

* 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.
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.

* Neither the name of stratomex.js 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, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Neither the name of the Caleydo Software 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, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39 changes: 31 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Caleydo StratomeX.js ![Caleydo Web Application](https://img.shields.io/badge/Caleydo%20Web-Application-1BA64E.svg)
==================
stratomex_js [![Phovea][phovea-image]][phovea-url] [![NPM version][npm-image]][npm-url] [![Build Status][travis-image]][travis-url] [![Dependency Status][daviddm-image]][daviddm-url]
=====================

StratomeX.js is a port for Caleydo Web using the Caleydo CLUE framework for provenance tracking and story telling.
StratomeX.js is a port for Phovea using the Caleydo CLUE framework for provenance tracking and story telling.

Further resources:
* [Vistories.org](http://vistories.org)
Expand All @@ -13,16 +13,39 @@ A [demonstration](http://playground.caleydo.org/stratomex_js/) is available in t
Installation
------------

[Set up a virtual machine using Vagrant](http://www.caleydo.org/documentation/vagrant/) and run these commands inside the virtual machine:
```
git clone https://github.com/caleydo/stratomex_js.git
cd stratomex_js
npm install
```

Testing
-------

```
npm test
```

Building
--------

```bash
./manage.sh clone Caleydo/stratomex_js
./manage.sh resolve
```
npm run build
```



***

<a href="https://caleydo.org"><img src="http://caleydo.org/assets/images/logos/caleydo.svg" align="left" width="200px" hspace="10" vspace="6"></a>
This repository is part of **[Caleydo Web](http://caleydo.org/)**, a platform for developing web-based visualization applications. For tutorials, API docs, and more information about the build and deployment process, see the [documentation page](http://caleydo.org/documentation/).
This repository is part of **[Phovea](http://phovea.caleydo.org/)**, a platform for developing web-based visualization applications. For tutorials, API docs, and more information about the build and deployment process, see the [documentation page](http://caleydo.org/documentation/).


[phovea-image]: https://img.shields.io/badge/Phovea-Application-1BA64E.svg
[phovea-url]: https://phovea.caleydo.org
[npm-image]: https://badge.fury.io/js/stratomex_js.svg
[npm-url]: https://npmjs.org/package/stratomex_js
[travis-image]: https://travis-ci.org/caleydo/stratomex_js.svg?branch=master
[travis-url]: https://travis-ci.org/caleydo/stratomex_js
[daviddm-image]: https://david-dm.org/caleydo/stratomex_js.svg?theme=shields.io
[daviddm-url]: https://david-dm.org/caleydo/stratomex_js

0 comments on commit b7a47f5

Please sign in to comment.