Skip to content

Commit 200fc46

Browse files
authored
Merge pull request #107 from tallerify/tracks
Tracks
2 parents 3bad91c + d086916 commit 200fc46

110 files changed

Lines changed: 3909 additions & 2669 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.angular-cli.json

Lines changed: 0 additions & 59 deletions
This file was deleted.

.editorconfig

Lines changed: 0 additions & 13 deletions
This file was deleted.

.env

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
DATABASE_URL='postgres://postgres:postgres@localhost:5432/tallerify_dev'
2+
TEST_DATABASE_URL='postgres://postgres:postgres@localhost:5432/tallerify_test'
3+
SECRET_KEY='\x1d\x19\x936aL\xe3\x14V\x0ek\x8e\x1e\x19\x9e3\x1d\xc1\x9686s\x9a\xef'

.eslintrc.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
extends: airbnb-base
2+
plugins:
3+
- import
4+
env:
5+
es6: true
6+
node: true
7+
mocha: true

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,4 @@ testem.log
4040
# System Files
4141
.DS_Store
4242
Thumbs.db
43-
.env
4443
*.log

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.10.0
1+
7.9.0

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ env:
88
- TEST_DATABASE_URL=postgres://postgres@localhost:5432/tallerify_travis
99
after_success:
1010
- npm run coverage
11-
- cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
11+
- npm run codecov
12+
- npm run lint
1213
notifications:
1314
email: false
1415
slack: tallerify:3BddOwjmsqmpRjYFXvbRZu1r

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:boron
1+
FROM node:7.9.0
22

33
# Create app directory
44
RUN mkdir -p /usr/src/app

README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# tallerify-catalog-server
2-
[![Build Status](https://travis-ci.org/tallerify/tallerify-catalog.svg?branch=develop)](https://travis-ci.org/tallerify/tallerify-catalog)
3-
[![Coverage Status](https://coveralls.io/repos/github/tallerify/tallerify-catalog/badge.svg?branch=develop)](https://coveralls.io/github/tallerify/tallerify-catalog?branch=develop)
1+
# Shared Server
2+
[![Build Status](https://travis-ci.org/tallerify/shared-server.svg?branch=develop)](https://travis-ci.org/tallerify/shared-server)
3+
[![codecov](https://codecov.io/gh/tallerify/shared-server/branch/develop/graph/badge.svg)](https://codecov.io/gh/tallerify/shared-server)
44

55
## Installation
66

77
### With Docker and Docker Compose
88
1. Install [Docker](https://docs.docker.com/engine/installation/) and [Docker Compose](https://docs.docker.com/compose/install/)
99
2. Run `$ docker-compose up --build`
10-
3. Go to `http://localhost:300/`
10+
3. Go to `http://localhost:3000/`
1111

1212
### Without Docker
1313

@@ -20,8 +20,6 @@
2020
* `$ postgres=# CREATE DATABASE dbname;`
2121
3. Install the node packages via:
2222
* `$ npm install`
23-
4. Create database table:
24-
* `$ ./node_modules/.bin/sequelize db:migrate`
2523

2624
#### Start
2725
To start the application (server and client) run:
@@ -34,4 +32,5 @@ For running the test suit run:
3432
* `npm test`
3533

3634
## Documentation
35+
* [App Documentation](https://github.com/tallerify/tallerify-catalog/wiki)
3736
* [Api Specification](http://rebilly.github.io/ReDoc/?url=https://raw.githubusercontent.com/tallerify/tallerify-catalog/develop/docs/tallerify-catalog-api.yaml)

client/app/app.component.css

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)