Skip to content

Improvements to Takeoff to use it internally within takeoff.md files #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ services:
image: app
env_file:
- ./../env/frontend-app/.env
volumes: # For webpack dev server to use our local files
volumes:
- ./../env/frontend-app:/home/envuser/apphome
- /home/envuser/apphome/node_modules
ports:
- '10001:10001' # For docker to now where to redirect HMR queries
- '10001:10001'

# API App
api:
Expand Down
2 changes: 1 addition & 1 deletion env/api/docs/building-a-server-configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ that contains a set of default values listed below. For more information on the
## `development` defaults

The development defaults are in `api/config/development.js`. The file name is based on the `NODE_ENV` variable set, so you can put a file in
here with any name provided you want to run that environment.
here with any name provided you want to run that workspace.

You will always need to start by importing the base config from the file (unless you want full control over your config file)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { Component } from '@angular/core';
<div class="card-body">
<h3 class="card-header">Welcome to Takeoff</h3>
<div class="card-text">
Takeoff Development Environment: Online!
Takeoff: Online!
</div>
<div class="card-text">
<div class="btn-group" role="group" aria-label="Basic example">
Expand Down
4 changes: 2 additions & 2 deletions takeoff.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## npm:install:api

Run task `npm:install:app` after this
Run task `npm:install:app` in parallel

```bash
cd env/api && npm install --silent
Expand All @@ -17,5 +17,5 @@ cd env/frontend-app && npm install --silent
## docker:compose

```bash
docker-compose -f docker/docker-compose.yml build --no-cache
takeoff build -n
```