Skip to content

Commit

Permalink
chore: Release v0.1.7
Browse files Browse the repository at this point in the history
#SOCRFW-312
  • Loading branch information
alxndrkalinin authored Nov 22, 2016
2 parents 84d6065 + cf976bf commit 545e0fc
Show file tree
Hide file tree
Showing 12 changed files with 457 additions and 1,893 deletions.
29 changes: 15 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,40 @@ A scalable and highly flexible HTML5/JS platform to build and run in-browser app

* Web site: http://socr.umich.edu
* Issue-tracking and project management: https://socredu.atlassian.net/browse/SOCRFW
* **Disclaimer: project is under active development, unit tests currently are not passing, bugs are possible**
* **Note: project is under active development, unit tests currently are not passing, bugs are possible**

[![Build Status](https://travis-ci.org/SOCR/SOCRAT.svg?branch=master)](https://travis-ci.org/SOCR/SOCRAT)
[![Dependency Status](https://gemnasium.com/SOCR/SOCRAT.png?branch=master)](https://gemnasium.com/SOCR/SOCRAT)

Installation
------------
In case you wish to create your own module or contribute to the project, follow these steps to setup your enviroment.
In case you wish to create your own module or contribute to the project, follow these steps to setup your environment.

First, install [nodejs](http://nodejs.org/) if you haven't. npm is the package manager for Node.js and comes bundled with it.
First, install [Node.js](http://nodejs.org/) if you haven't yet. `npm` is the package manager for `Node.js` and comes bundled with it.

Install Webpack,
Install Webpack:

$> npm install webpack -g
$> sudo npm install webpack -g

Clone the repository.
Clone the repository:

$> git clone https://github.com/SOCR/SOCRAT.git
$> git clone https://github.com/SOCR/SOCRAT.git
$> cd SOCRAT

If you're interested in latest changes or want to contribute to the project, switch to the `dev` branch:

Now, lets install all the dependencies. Go into the root folder,
$> git checkout dev
$> git pull

Now, lets install all the dependencies:

$> cd SOCRAT
$> npm install

This will install all the dependencies mentioned in package.json files.

Start the server and see the application running at localhost:8080:
Start the development server and see the application running at `localhost:8080`:

$> npm run serve

To start unit-test use. Status information will appear in the new browser window. Test runner will log into console.

$> npm run test


Motivation
Expand Down
6 changes: 6 additions & 0 deletions app/app.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ require 'angular-cookies'
require 'angular-resource'
require 'styles/app.less'

# TODO: consider relocating to Charts
require("expose?vg!vega")
require("expose?vl!vega-lite")
require 'vega-embed/vega-embed.js'
require 'compassql'

# create app-level modules
angular.module 'app_controllers', []
angular.module 'app_directives', []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

BaseCtrl = require 'scripts/BaseClasses/BaseController.coffee'
require 'handsontable/dist/handsontable.full.css'
require 'imports?Handsontable=handsontable/dist/handsontable.full.js!ngHandsontable/dist/ngHandsontable.js'
require 'imports?Handsontable=handsontable/dist/handsontable.full.js!ng-handsontable/dist/ngHandsontable.js'

module.exports = class GetDataMainCtrl extends BaseCtrl
@inject '$scope',
Expand Down
Loading

0 comments on commit 545e0fc

Please sign in to comment.