Skip to content

Commit

Permalink
Merge pull request #199 from CodeForPhilly/features/holo
Browse files Browse the repository at this point in the history
Build site with hologit
  • Loading branch information
themightychris authored Feb 6, 2019
2 parents 8a59226 + da0b686 commit 48fad46
Show file tree
Hide file tree
Showing 23 changed files with 85 additions and 113 deletions.
4 changes: 4 additions & 0 deletions .holo/branches/emergence-site/_emergence-github.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[holomapping]
files = "*/**"
after = "skeleton-v2"
before = "laddr"
4 changes: 4 additions & 0 deletions .holo/branches/emergence-site/_emergence-redirects.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[holomapping]
files = "*/**"
after = "skeleton-v2"
before = "laddr"
4 changes: 4 additions & 0 deletions .holo/branches/emergence-site/_emergence-saml2.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[holomapping]
files = "*/**"
after = "skeleton-v2"
before = "laddr"
4 changes: 4 additions & 0 deletions .holo/branches/emergence-site/_emergence-slack.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[holomapping]
files = "*/**"
after = "skeleton-v2"
before = "laddr"
3 changes: 3 additions & 0 deletions .holo/branches/emergence-site/_laddr.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[holomapping]
files = "*/**"
after = "skeleton-v2"
2 changes: 2 additions & 0 deletions .holo/branches/emergence-site/_skeleton-v2.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[holomapping]
files = "*/**"
4 changes: 4 additions & 0 deletions .holo/branches/emergence-skeleton.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[holobranch]
# This skeleton holobranch is a variant of the site holobranch with lensing turned off
extend = "emergence-site"
lens = false
3 changes: 3 additions & 0 deletions .holo/branches/example-codeforphilly/_codeforphilly.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[holomapping]
files = "*/**"
after = [ "-skeleton" ]
3 changes: 3 additions & 0 deletions .holo/branches/example-codeforphilly/_laddr.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[holomapping]
holosource = "-skeleton"
files = "*/**"
2 changes: 2 additions & 0 deletions .holo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[holospace]
name = "laddr"
2 changes: 2 additions & 0 deletions .holo/sources/-skeleton.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[holosource.project]
holobranch = "emergence-skeleton"
3 changes: 3 additions & 0 deletions .holo/sources/codeforphilly.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[holosource]
url = "https://github.com/CodeForPhilly/codeforphilly.org"
ref = "refs/heads/master"
3 changes: 3 additions & 0 deletions .holo/sources/emergence-github.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[holosource]
url = "https://github.com/JarvusInnovations/emergence-github"
ref = "refs/heads/master"
3 changes: 3 additions & 0 deletions .holo/sources/emergence-redirects.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[holosource]
url = "https://github.com/JarvusInnovations/emergence-redirects"
ref = "refs/heads/master"
3 changes: 3 additions & 0 deletions .holo/sources/emergence-saml2.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[holosource]
url = "https://github.com/JarvusInnovations/emergence-saml2"
ref = "refs/heads/master"
3 changes: 3 additions & 0 deletions .holo/sources/emergence-slack.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[holosource]
url = "https://github.com/JarvusInnovations/emergence-slack"
ref = "refs/heads/master"
3 changes: 3 additions & 0 deletions .holo/sources/skeleton-v2.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[holosource]
url = "https://github.com/JarvusInnovations/emergence-skeleton-v2"
ref = "refs/heads/emergence/skeleton"
4 changes: 4 additions & 0 deletions .studiorc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

hab pkg install emergence/studio
source "$(hab pkg path emergence/studio)/studio.sh"
30 changes: 28 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,39 @@ There are three ways to get started with Laddr:
- [Clone laddr](#clone-laddr) to work on and contribute to its core, shared functionality
- [Extend laddr](#extend-laddr) to create a workspace for customizing a copy of laddr for your brigade without forking the whole thing

### Dependencies

Install recent versions of [Habitat](http://habitat.sh) and [Docker](https://www.docker.com/) on your Linux, Mac, or Windows workstation.

### Clone Laddr

*TODO: document me*
```bash
cd ~/Repositories/laddr # or wherever you cloned this rep

# expose port 7080 from any Docker container started by Habitat
export HAB_DOCKER_OPTS="-p 7080:7080"

# launch and enter a Habitat studio
hab studio enter

# once the studio has finished loading, start all services with a local database
start-all-local

# build and load the site, then wait for file changes
watch-site
```

At that point you should be able to see an instance at http://localhost:7080 and any edits should be reflected live

### Extend Laddr

*TODO: document me*
*TODO: Extending project docs*

```bash
# build the codeforphilly example extending project instead
export EMERGENCE_HOLOBRANCH=example-codeforphilly
watch-site
```

## Support

Expand Down
16 changes: 0 additions & 16 deletions php-config/Git.config.d/emergence-github.php

This file was deleted.

17 changes: 0 additions & 17 deletions php-config/Git.config.d/emergence-redirects.php

This file was deleted.

68 changes: 0 additions & 68 deletions php-config/Git.config.d/laddr.php

This file was deleted.

10 changes: 0 additions & 10 deletions php-config/Git.config.d/recaptcha.php

This file was deleted.

0 comments on commit 48fad46

Please sign in to comment.