Skip to content

Commit

Permalink
Merge pull request #1 from zerothstack/chore/ubiquits-to-zeroth
Browse files Browse the repository at this point in the history
Chore/ubiquits to zeroth
  • Loading branch information
zakhenry committed Nov 29, 2016
2 parents 6ad6905 + 1e4228b commit 0288b4b
Show file tree
Hide file tree
Showing 31 changed files with 135 additions and 158 deletions.
28 changes: 14 additions & 14 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
VERBOSITY=verbose
SCHEMA=ubiquits
LOG_LEVEL=verbose
SCHEMA=zeroth

# MariaDB container config
MYSQL_DATABASE=ubiquits
MYSQL_USER=ubiquits
MYSQL_PASSWORD=ubiquits
MYSQL_ROOT_PASSWORD=ubiquits_root
# Postgres container config
POSTGRES_DB=zeroth
POSTGRES_USER=zeroth
POSTGRES_PASSWORD=zeroth

DB_HOST=localhost
DB_PORT=3306
DB_DATABASE=ubiquits
DB_USERNAME=ubiquits
DB_PASSWORD=ubiquits
DB_DRIVER=mysql
DB_IMAGE=mariadb:10.1.14
DB_PORT=5432
DB_DATABASE=zeroth
DB_USERNAME=zeroth
DB_PASSWORD=zeroth
DB_DRIVER=postgres
DB_IMAGE=postgres:9.6.1-alpine

APP_PORT=3000
REMOTE_PORT=3001
PATH_ROOT=/data
WEB_ROOT=/data/dist/browser

# force chalk to output color to remote cli / docker logs
# force chalk to output color
FORCE_COLOR=true

# !!DANGER!! Any env variable defined with the prefix PUBLIC_ is exported to the browser!
Expand Down
21 changes: 10 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ branches:
except:
- "/^v[0-9\\.]+/"
before_install:
- openssl aes-256-cbc -K $encrypted_92b08e8fae7c_key -iv $encrypted_92b08e8fae7c_iv -in .travis/deployment_key.pem.enc -out .travis/deployment_key.pem -d
- openssl aes-256-cbc -K $encrypted_a0f0ce1c6211_key -iv $encrypted_a0f0ce1c6211_iv
-in .travis/deployment.key.pem.enc -out .travis/deployment.key.pem -d
- npm install -g pr-bumper
- pr-bumper check
- cp .env.example .env
Expand All @@ -34,24 +35,22 @@ script:
after_success:
- npm run coveralls
before_deploy:
- eval "$(ssh-agent -s)" #start the ssh agent
- chmod 600 .travis/deployment_key.pem
- ssh-add .travis/deployment_key.pem
- eval "$(ssh-agent -s)"
- chmod 600 .travis/deployment.key.pem
- ssh-add .travis/deployment.key.pem
- pr-bumper bump
- git fetch --tags # make sure travis ci has all remote tags for changelog
- git fetch --tags
- npm run preparepublish
env:
global:
# pr-bumper-GITHUB_TOKEN-ubiquits/ubiquits
- secure: WeZNXT3vUR5B0eoYKnaMVV0ORHATzNkAV9+ZESCOumXHZlbBH/9lLNsTSFh2wPxWwZZXtYRo5knEV6o9sj1vQqWLua2EJN6Fxt6axEjm2Q0zhhhRsyH2OlBKF86cvdwUq97xmVJ1x2jUZkfSTXNjf9CIBmnjTLF/+PoytLAanD4Sz4loKaUKHzxpZHhQ28RmwdivmOx1sIMDWdfHw1UvFduSrSPELqg7ZaB8a0CX+jJ8WNjm4i1uqEWCS2G/0ezPVrYsFbxZ7eTl3zQ+ebIMP7vnE1qGzmS5ArFF9LaRMpIQgkMjY1IrMsuK1P/vYM68glqUnvn76FmobEMJ6ivXWDLiveekM8IkFCMs7vhnWv70k0bqlZG/1L1VJdj/a4dKqPhEsjv/78TzLLzvTj5h3da4Oo4dUlCdOtGRGR+GGKXUXTJS6n63h2d/C+cU31cDQC4yBaOF6dvJ/ICu/DnpHDGROjXhEBzfRBrqM+zCrJc4naJrAFIr7RsTBtnu6TJVoZY3h8y1HWIRT3fusP8Hzfb7wH2VbUZfN3Rxb2uK8R8ZCF4i7RxF+FTqBQAvbY909uLKg5Uf7EXhQxnlzJ/QTeH5wyJEVeh7ObpIsr9rRhzzYh1pZyHBhCUHb5R+aP2XqqsiCuM1JyB2zkfE2ws6OrlWjwm1O8YPSyS/Q/9pxcI=
# RO_GH_TOKEN
- secure: Fweuy/B9OzsZojhhEZXpeVdhszpymSm3zJ+8ki80ym4UevU4jq2E+XiNSlj8eQZ+4NjUGQSA6IqbtHDq5x1cEknB1nWKhX5khXiG3IsfCCWOBBf9/2n30u1/wwXx3MjihHXSER0e1dAS+neAcTipSrMjdGalOwX4DbUxG0ZAZFD6DEjiSS2nV5W97sRW3MG2Q5mz4OcsI7DM9FbICp3DlF+0BQbWs8A3H5r1lmmLSK/bz+ZgVwm8yCc0lL7ToqYavLUp4Kg0jNI7w9yz/Fv91N+hRNMJEaAAtOP4AFzWliAs+MmQ3d/Pv8E6mnfUmrUYkrXMJauohpSlpsK4GyMZt7ZDGhY59y/cd2JM+bEVCbKiElqr6aC7UwEiH62+T8MCkftjsspqUV+1wmdP9sNKlGWngCNVgrtn8bXpYwOGLmPqPp0RvlIzUF4dBYj0LybjSQPi+lACehoBZ3M4EGfuItXlAtSUKqQHSRXpVccjujuZ+4tz5I10Heo87cZHPNN/UP5kVWSITb45KJAApl7gsNUHCIIc5JGCId3S3QDeM18ow4/8mIG+8Mbjf6OshDm/R9VCqbAaIjCg6mDzat/V+pu52tjqNbMHwbveHnW/LduSBWSQzFG+8xJgMkjzyTyuxwoe7fFbrNtpZ7wPYzAEW/X781n3zF5XcqXNnwLvjHw=
- secure: BaAeHe1z8uiUktmeRBBw0eXOzlWPTPe1QnmRdJAhRh5kvHD9ioQ3cpX3zcS/ozE6y4su2CPezuJBX+Zeyp3M+aVCzffU7N9X+1mVuJywp6V8B4hfder3hTsqRqTl8BJztonghToNwFLfeSGmlvtQ1evGHIWO+2jUjN/IgFv2m9LxwnQIoT0UAx11+wjsyGfeXVpnc31BVhQGo3dC92KHXgi74uAZqVguT1Psrl+ujJUwRW/mQaNZ7KVn4P22jU9JRUlxcBgOJ+vdAfoyT6nli+ukQ2m3hk0mFspdHk7QWDf0/B9Tmq83zpkYOQCDz6cvs/0xdbExlG0KMt/7lUi1uQHoFmLvdP8/+LLTpW7etrwIbMJ2xpwgzP62oo7Vitt3zf4U1Ud9PYdbIZyhyPhkLygKXiilmaHoHlkTW6ZGT4sMKJYdtCEAoXTvE6B/UxGzPIEwPL0q/Fq6fCbhiTma4foPvNkBlEHFUolEuPIg+UIl8V210JEybUR9+cX807NXj88GLOuMLB5Jm3sLEs5hZM1o/O7wFg2Q3QpOlkXtoOWTpmMuNr3g5+SHKIpgAMvjij1V5S6wxpPCB1NQXQEitJo331cln6QSAUPyJB2iqvP6v+JRC7A3kJOWJblrqL1IookgYJi3x3xDugOBh+bD+f09pv22yBALZdo7udIw9pc=
- secure: RoVqMf5eICrZVTOMyV8IRWCMTb8aydXTmRqq9zyrDi+t3P4FbNGlozZQg3CRohMhncmyeWoe6gusPimAy0PColobgU8Ty3H8D4DI6zqPGYqA1iMJUtjrc7o4WTDwbOUO5erc2BXJscWGGoruKmI/tDM5MibP8X2RTzj61Ag8wNvaJrWd589VQgcdqhaGjbmaclrE8e+jipJj9H0hNYUlbe6nTVuYupYludh1YCqyqeuqKwUwgJT8v0OiOCaUqgLlO0WBkEoJbqD3ViUYGx7hVy7GSC5jfAQIDI8uSqppB279T1tRkZmbnY85N0fCKgZ4E60vuMg8oC4+8Bq8k1atuYowZHMG9fLM2cozzUNpVuCSulICAONXqO4Nmfl+ClfQDOfQV2s39bgrjVbJYMjrB7ZxMVXzFXzggSozsz34LNs+Ehdm4dydigh9C474XzW/fSkrFpWQWk5bPx6wiyAh/9LTO8v+oH3Cw0wojmiDWu7+OsmN38sGVu9fCrh7y6rGMjSrIN+VYWnaJjWxrsZ3mZbkPBPn16QNxWOnGG/AuX5oXJkyz9kjrDtoSv50syDZOg4oV/gihgHuH0RkXc0/tuYzogNjV5B7UCJJO7gLXGVhhhrMTAJD/IWSA/iv4S4Y5eoNqobah7KeH/4Ocsmec85Gj7/570kSwm//u6qIhi0=
deploy:
provider: npm
email: zak@ubiquits.com
email: zak@zeroth.io
skip_cleanup: true
api_key:
secure: NTQtLuxaOqwgfTRBdki8KrQOWfTgoWt2VV+wxyykfk3TD6SCVVnEpBhcwqoIQR8CHyRANC9G1pxV1tRvZKfew5aPXatXkamWFSwnbFf878wi9kndqIKIYTKY+QwqFHTAoPg6T354jv0sOOd4018DCnA7gfoOr45P8VDrSN/77Vm6OasI7bMIoJGToHbt+MD+QGD1Q7EDDR6bHYkemY9XvUwyGYSaYXLmybpTwzWe1oW1xJ7PjQuE4KspGqN64rIK6QPj0H7pmx9F2mrUlNwakfQaVThSF2c8toSNsRcXtGW4AsE0eiKRcyQprEwojggUoJFPSR/iOLlFrWx4h2UvYjK2vyjDWXOnVRkMbKAj+ifXhpmiKm8tfWGKb2fGLKDAwthD2xVjkWMAQYb4I26fKQVp58q5gOS/AzBUERpBFzRzL7GhSZ1N6fxkjskKI6FNJs4J8+Zm6kqeCsSwYMD1NKYGk23FTbnUM80Cbg3VLCfr/2nXm6WT5ZYfNhC1HaGBRDrYIuHTWF0iXx0POsdBm43ZJQEE4xoP2zMMdiSh+FxFf3CNs4lGf2fm9g8mXO3oMTI5E7d07wJKCI3Ssqcp2DgfyUa6iF3ygwBgBFaT0OneUg1tFKsMjisU+g7uXq0mZTyBWTO0BMfz5nTPrtztFii2W/uxfSOdrIm/mJi6AqQ=
secure: LDZw/M1AX3F+q5XEi/vTip0kL6/ixyWbu3btpT5uf6zVAT6iz3nNFYCHbaPCafVxKf2scpVj+Ozoe+z5qi/ugMABnHckCVBngWUSPQkH+c/37OJJDD3PMkuXUZHp2e5g4bJNbojVPMBBBtoB0gUi6XU9TdMqE9oRgGqzG7u+JuLrfs1N3KrL3ItS3gEKm6zqlv0oxILQtK3R/uUIIaoSzgrSTimVHVKYh1sHY8hx0HBsoHzf52o97fs26VsYse6QBX1xJWrjRw9MLaMEACZSAnpx+S5ekVzrciF8PmJHuVuKeSIvJLSj2eb2WsESAu60Wk0IwdOC5xpsFS4p/vUaS94KrwW8Mx2OzAOawcmiPx2qaXKg6wIFJdpUl/I8F22kieyN4yod4uvX3bvydGcF5TVTBKk0WdoRtx/d2PGM8R6GJfV+7y5uniW1Jqswsqp+yLT9BqlOeuNE3xm0Qlw2m7SN0PCvbN+NXDL/lm8nSXpLw4gBeVqIdpq3JfBHA+UJhEGn+MuUsrFH/xBtOeItG3cWkke8gL58nhv/CHWm8yeVEZtxW58ntfAvliKKT7AGTw+x26O99mUvq7rHI5OXqHnMkk2kggQlHZTe9JBoSTIDZw8AZ34fII0DHcJGMChQLbePPk+EY1l2z2iIePZYzcQCKX5uiLFshNdxE7ZVv58=
on:
branch: master
tags: false
Binary file added .travis/deployment.key.pem.enc
Binary file not shown.
Binary file removed .travis/deployment_key.pem.enc
Binary file not shown.
73 changes: 35 additions & 38 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,49 +1,46 @@
<a name="0.0.6"></a>
## [0.0.6](https://github.com/ubiquits/quickstart/compare/v0.0.4...v0.0.6) (2016-06-18)
<a name="1.0.1-0"></a>
## [1.0.1-0](https://github.com/zeroth/quickstart/compare/da1e75e...v1.0.1-0) (2016-11-29)


### Bug Fixes

* **middleware:** Force headName to lowercase for demo middleware ([73a3c04](https://github.com/ubiquits/quickstart/commit/73a3c04))
* **bootstrap:** Fixed bootstrap not being invoked before usage ([ed987f1](https://github.com/zeroth/quickstart/commit/ed987f1))
* **controller:** Fixed controller with the old super signature ([e0d9df6](https://github.com/zeroth/quickstart/commit/e0d9df6))
* **controller:** Switched to new routeBase param of controller rather than decorator ([5339dfa](https://github.com/zeroth/quickstart/commit/5339dfa))
* **demo seeder:** Fix demo seeder always seeding even when seeds exist ([a9ca9b3](https://github.com/zeroth/quickstart/commit/a9ca9b3))
* **demo seeder:** Replaced missing DEMO_ID in .env.example ([db4e02f](https://github.com/zeroth/quickstart/commit/db4e02f))
* **env:** Update example.env, bump npm versions ([1d5d1ce](https://github.com/zeroth/quickstart/commit/1d5d1ce))
* **main:** Fix ts compiler warning ([aad4076](https://github.com/zeroth/quickstart/commit/aad4076))
* **middleware:** Force headName to lowercase for demo middleware ([73a3c04](https://github.com/zeroth/quickstart/commit/73a3c04))
* **npm:** Restored package json ([39a1609](https://github.com/zeroth/quickstart/commit/39a1609))
* **relationships:** Fix missing imports ([ba73fb9](https://github.com/zeroth/quickstart/commit/ba73fb9))
* **relationships:** Fix relationship definitions ([e6ca276](https://github.com/zeroth/quickstart/commit/e6ca276))
* **test:** Fix missing provider for app component in unit tests ([975b8da](https://github.com/zeroth/quickstart/commit/975b8da))
* **tests:** Fix missing UserMockStore provider ([559936a](https://github.com/zeroth/quickstart/commit/559936a))


### Features

* **bootstrap:** Implement async bootstrapping with check for database status so fallback to mock will work ([7ece712](https://github.com/ubiquits/quickstart/commit/7ece712))
* **bootstrap:** Refactor out the bootstrap code ([d99ee4f](https://github.com/ubiquits/quickstart/commit/d99ee4f))
* **changelog:** Updated changelog, add pr-bumper config to suppress changelog overwriting ([0a79445](https://github.com/ubiquits/quickstart/commit/0a79445))
* **infrastructure:** Implement separate mock, http and db stores as concrete classes for user store. ([1cb2cc2](https://github.com/ubiquits/quickstart/commit/1cb2cc2))
* **middleware:** Refactor with ResourceController and middleware example ([01f23db](https://github.com/ubiquits/quickstart/commit/01f23db))
* **stores:** Implement full e2e test of model retrieval with implementations of database and http stores ([8a8d4f4](https://github.com/ubiquits/quickstart/commit/8a8d4f4))



<a name="0.0.4"></a>
## [0.0.4](https://github.com/ubiquits/quickstart/compare/v0.0.3...v0.0.4) (2016-06-08)



<a name="0.0.3"></a>
## [0.0.3](https://github.com/ubiquits/quickstart/compare/v0.0.2...v0.0.3) (2016-06-03)



<a name="0.0.2"></a>
## [0.0.2](https://github.com/ubiquits/quickstart/compare/v0.0.1...v0.0.2) (2016-06-03)



<a name="0.0.1"></a>
## [0.0.1](https://github.com/ubiquits/quickstart/compare/da1e75e...v0.0.1) (2016-06-03)


### Features

* **demo:** extracted _demo from [@ubiquits](https://github.com/ubiquits)/core ([da1e75e](https://github.com/ubiquits/quickstart/commit/da1e75e))
* **env:** added .env example file ([25f90bc](https://github.com/ubiquits/quickstart/commit/25f90bc))
* **infrastructure:** refactored to use new toolchain structure ([49fb2e7](https://github.com/ubiquits/quickstart/commit/49fb2e7))
* **infrastructure:** tweaked implementation for testing ([a6a3ed6](https://github.com/ubiquits/quickstart/commit/a6a3ed6))
* **npm:** fixed package naming ([86f2117](https://github.com/ubiquits/quickstart/commit/86f2117))
* **bootstrap:** Implement async bootstrapping with check for database status so fallback to mock will work ([7ece712](https://github.com/zeroth/quickstart/commit/7ece712))
* **bootstrap:** Refactor out the bootstrap code ([d99ee4f](https://github.com/zeroth/quickstart/commit/d99ee4f))
* **changelog:** Updated changelog, add pr-bumper config to suppress changelog overwriting ([0a79445](https://github.com/zeroth/quickstart/commit/0a79445))
* **columns:** Implement custom column definitions ([4671c83](https://github.com/zeroth/quickstart/commit/4671c83))
* **demo:** extracted _demo from [@ubiquits](https://github.com/ubiquits)/core ([da1e75e](https://github.com/zeroth/quickstart/commit/da1e75e))
* **docker:** Implement env and docker-compose configuration to handle running with docker locally ([d44147a](https://github.com/zeroth/quickstart/commit/d44147a))
* **env:** added .env example file ([25f90bc](https://github.com/zeroth/quickstart/commit/25f90bc))
* **home:** Implement a better home screen, seed with more entities ([15443d3](https://github.com/zeroth/quickstart/commit/15443d3))
* **infrastructure:** Implement separate mock, http and db stores as concrete classes for user store. ([1cb2cc2](https://github.com/zeroth/quickstart/commit/1cb2cc2))
* **infrastructure:** refactored to use new toolchain structure ([49fb2e7](https://github.com/zeroth/quickstart/commit/49fb2e7))
* **infrastructure:** tweaked implementation for testing ([a6a3ed6](https://github.com/zeroth/quickstart/commit/a6a3ed6))
* **middleware:** Refactor with ResourceController and middleware example ([01f23db](https://github.com/zeroth/quickstart/commit/01f23db))
* **model:** Implement demo for model creation ([87366fd](https://github.com/zeroth/quickstart/commit/87366fd))
* **npm:** fixed package naming ([86f2117](https://github.com/zeroth/quickstart/commit/86f2117))
* **orm:** Remove sequelize, install typeorm ([f2e1cb5](https://github.com/zeroth/quickstart/commit/f2e1cb5))
* **orm:** Update to typeorm pattern, move db initializer to seeder ([601d9e5](https://github.com/zeroth/quickstart/commit/601d9e5))
* **registry:** Implement registry pattern from upstream ([8d0b101](https://github.com/zeroth/quickstart/commit/8d0b101))
* **services:** Implement [@service](https://github.com/service) decorator and upgrade to angular rc.4 ([3be65e5](https://github.com/zeroth/quickstart/commit/3be65e5))
* **stores:** Implement full e2e test of model retrieval with implementations of database and http stores ([8a8d4f4](https://github.com/zeroth/quickstart/commit/8a8d4f4))
* **ts 2.0:** Updates to tsconfig to use the new build pattern ([3594eec](https://github.com/zeroth/quickstart/commit/3594eec))



12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
![ubiquits](https://rawgithub.com/ubiquits/assets/master/fulllogo.svg)
![zeroth](https://rawgithub.com/zeroth/assets/master/fulllogo.svg)

## Note
This repository is the quickstart repository. See http://ubiquits.com/guide/quick-start for documentation on how to get started using the Ubiquits CLI.
This repository is the quickstart repository. See http://zeroth.io/guide/quick-start for documentation on how to get started using the Zeroth CLI.

Ubiquits is currently in developer preview (alpha) phase. Follow https://twitter.com/ubiquits for updates
Zeroth is currently in developer preview (alpha) phase. Follow https://twitter.com/zeroth for updates

## Overview
Ubiquits is a typescript full stack framework, with primary goals being cross-environment reusability and api rigidity achieved through strong typing with isomorphic components and documentation/test automation.
Zeroth is a typescript full stack framework, with primary goals being cross-environment reusability and api rigidity achieved through strong typing with isomorphic components and documentation/test automation.

## Goals
1. Angular(2) at it's core. There is no need to reinvent the wheel, and where possible Ubiquits will use Angular components
2. API first (or only). A Ubiquits application can be just a REST api with no frontend
1. Angular(2) at it's core. There is no need to reinvent the wheel, and where possible Zeroth will use Angular components
2. API first (or only). A Zeroth application can be just a REST api with no frontend
3. Strict, standards compliant API - strict interfaces for API design conforms to REST standards and best practices, allowing for easy interoperability of components (first or third party)
4. Common components between front & back end. Models, mocks, utilities etc are all platform independent
5. Easy integration. A developer should be able to integrate a full stack component with only an npm install
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '2'
services:
database:
extends:
file: ./node_modules/@ubiquits/core/docker/common-services.yml
file: ./node_modules/@zerothstack/core/docker/common-services.yml
service: database
ports:
- "${DB_PORT}:${DB_PORT}"
Expand Down
2 changes: 1 addition & 1 deletion docs/api.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ layout: api-container.hbs
## Error
Typedoc output not found. Have you run the generator after building the documentation?
```bash
$ u doc:build && u doc:api
$ z doc:build && z doc:api
```
10 changes: 5 additions & 5 deletions docs/index.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
layout: home.hbs
title: Ubiquits Quickstart
description: Quickstart for the Ubiquits framework.
title: Zeroth Quickstart
description: Quickstart for the Zeroth framework.
---

**Note!** This is not the main documentation for the Ubiquits framework.
That can be found at [ubiquits.com](https://ubiquits.com).
**Note!** This is not the main documentation for the Zeroth framework.
That can be found at [zeroth.io](https://zeroth.io).

This documentation is automatically generated from the ubiquits quickstart and should be modified to document your module
This documentation is automatically generated from the zeroth quickstart and should be modified to document your module
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@ubiquits/quickstart",
"name": "@zerothstack/quickstart",
"author": "Zak Henry (https://twitter.com/zak)",
"license": "MIT",
"version": "1.0.0",
"version": "1.0.1-0",
"description": "Isomorphic Javascript Framework build in TypeScript",
"homepage": "https://github.com/ubiquits/quickstart#readme",
"homepage": "https://github.com/zeroth/quickstart#readme",
"main": "index.js",
"dependencies": {
"@angular/common": "^2.1.2",
Expand All @@ -25,7 +25,7 @@
"@types/proxyquire": "^1.3.26",
"@types/socket.io": "^1.4.26",
"@types/validator": "^4.5.26",
"@ubiquits/core": "3.0.1",
"@zerothstack/core": "1.0.5",
"chalk": "^1.1.3",
"dotenv": "^2.0.0",
"express": "^4.14.0",
Expand All @@ -35,19 +35,19 @@
"zone.js": "^0.6.23"
},
"devDependencies": {
"@ubiquits/toolchain": "2.0.1-1"
"@zerothstack/toolchain": "1.0.0"
},
"scripts": {
"start": "u",
"test": "u test -s",
"coveralls": "u coveralls",
"build": "u build",
"start": "z",
"test": "z test -s",
"coveralls": "z coveralls",
"build": "z build",
"preparepublish": "cp -r lib/* .",
"postpublish": "u changelog && u doc build && u deploy docs"
"postpublish": "z changelog && z doc build && z deploy docs"
},
"repository": {
"type": "git",
"url": "git+https://github.com/ubiquits/quickstart.git"
"url": "git+https://github.com/zeroth/quickstart.git"
},
"keywords": [
"angular",
Expand All @@ -58,4 +58,4 @@
"typescript",
"universal"
]
}
}
6 changes: 3 additions & 3 deletions src/browser/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<main>
<div class="background"></div>
<h2>Hello <span class="invert">from</span></h2>
<h1>Angular 2 App & Ubiquits API</h1>
<h1>Angular 2 App & Zeroth API</h1>
<div class="logo-group">
<a href="http://angular.io" target="_blank">
<img src="../public/images/angular.png">
</a>
<span>&amp;</span>
<a href="http://ubiquits.com" target="_blank">
<img src="../public/images/ubiquits.svg">
<a href="http://zeroth.io" target="_blank">
<img src="../public/images/zeroth.svg">
</a>
</div>

Expand Down
2 changes: 1 addition & 1 deletion src/browser/app/app.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { AppComponent } from './app.component';
import { UserStore } from '../../common/stores/user.store';
import { UserMockStore } from '../../common/stores/user.mock.store';
import { ConsoleLogger, Logger } from '@ubiquits/core/common';
import { ConsoleLogger, Logger } from '@zerothstack/core/common';
import { TestBed } from '@angular/core/testing';
import { ComponentFixture } from '@angular/core/testing/component_fixture';
import { Injector } from '@angular/core';
Expand Down
10 changes: 6 additions & 4 deletions src/browser/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component } from '@angular/core';
import '../public/css/styles.css';
import { UserStore } from '../../common/stores/user.store';
import { User } from '../../common/models/user.model';
import { Collection, Logger } from '@ubiquits/core/common';
import { Collection, Logger } from '@zerothstack/core/common';
import { UserMockStore } from '../../common/stores/user.mock.store';

@Component({
Expand All @@ -15,9 +15,11 @@ export class AppComponent {
public requestData: any = null;
public responseData: any = null;

constructor(protected userStore: UserStore, protected userMockStore: UserMockStore, protected logger: Logger) {

}
constructor(
protected userStore: UserStore,
protected userMockStore: UserMockStore,
protected logger: Logger
) {}

private resetData(): void {
this.requestData = null;
Expand Down
2 changes: 1 addition & 1 deletion src/browser/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { AppComponent } from './app.component';
import { HttpModule } from '@angular/http';
import { UserStore } from '../../common/stores/user.store';
import { UserMockStore } from '../../common/stores/user.mock.store';
import { ConsoleLogger, Logger } from '@ubiquits/core/common';
import { ConsoleLogger, Logger } from '@zerothstack/core/common';
import { UserHttpStore } from '../stores/user.http.store';

@NgModule({
Expand Down
2 changes: 1 addition & 1 deletion src/browser/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<base href="/">
<title>Angular & Ubiquits</title>
<title>Angular & Zeroth</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>
Expand Down

0 comments on commit 0288b4b

Please sign in to comment.