Merge pull request #199 from CodeForPhilly/features/holo

themightychris · web-flow · commit 48fad4694ffd · 2019-02-06T03:58:02.000-05:00
Build site with hologit
diff --git a/.holo/branches/emergence-site/_emergence-github.toml b/.holo/branches/emergence-site/_emergence-github.toml
@@ -0,0 +1,4 @@
+[holomapping]
+files = "*/**"
+after = "skeleton-v2"
+before = "laddr"
diff --git a/.holo/branches/emergence-site/_emergence-redirects.toml b/.holo/branches/emergence-site/_emergence-redirects.toml
@@ -0,0 +1,4 @@
+[holomapping]
+files = "*/**"
+after = "skeleton-v2"
+before = "laddr"
diff --git a/.holo/branches/emergence-site/_emergence-saml2.toml b/.holo/branches/emergence-site/_emergence-saml2.toml
@@ -0,0 +1,4 @@
+[holomapping]
+files = "*/**"
+after = "skeleton-v2"
+before = "laddr"
diff --git a/.holo/branches/emergence-site/_emergence-slack.toml b/.holo/branches/emergence-site/_emergence-slack.toml
@@ -0,0 +1,4 @@
+[holomapping]
+files = "*/**"
+after = "skeleton-v2"
+before = "laddr"
diff --git a/.holo/branches/emergence-site/_laddr.toml b/.holo/branches/emergence-site/_laddr.toml
@@ -0,0 +1,3 @@
+[holomapping]
+files = "*/**"
+after = "skeleton-v2"
diff --git a/.holo/branches/emergence-site/_skeleton-v2.toml b/.holo/branches/emergence-site/_skeleton-v2.toml
@@ -0,0 +1,2 @@
+[holomapping]
+files = "*/**"
diff --git a/.holo/branches/emergence-skeleton.toml b/.holo/branches/emergence-skeleton.toml
@@ -0,0 +1,4 @@
+[holobranch]
+# This skeleton holobranch is a variant of the site holobranch with lensing turned off
+extend = "emergence-site"
+lens = false
diff --git a/.holo/branches/example-codeforphilly/_codeforphilly.toml b/.holo/branches/example-codeforphilly/_codeforphilly.toml
@@ -0,0 +1,3 @@
+[holomapping]
+files = "*/**"
+after = [ "-skeleton" ]
diff --git a/.holo/branches/example-codeforphilly/_laddr.toml b/.holo/branches/example-codeforphilly/_laddr.toml
@@ -0,0 +1,3 @@
+[holomapping]
+holosource = "-skeleton"
+files = "*/**"
diff --git a/.holo/config.toml b/.holo/config.toml
@@ -0,0 +1,2 @@
+[holospace]
+name = "laddr"
diff --git a/.holo/sources/-skeleton.toml b/.holo/sources/-skeleton.toml
@@ -0,0 +1,2 @@
+[holosource.project]
+holobranch = "emergence-skeleton"
diff --git a/.holo/sources/codeforphilly.toml b/.holo/sources/codeforphilly.toml
@@ -0,0 +1,3 @@
+[holosource]
+url = "https://github.com/CodeForPhilly/codeforphilly.org"
+ref = "refs/heads/master"
diff --git a/.holo/sources/emergence-github.toml b/.holo/sources/emergence-github.toml
@@ -0,0 +1,3 @@
+[holosource]
+url = "https://github.com/JarvusInnovations/emergence-github"
+ref = "refs/heads/master"
diff --git a/.holo/sources/emergence-redirects.toml b/.holo/sources/emergence-redirects.toml
@@ -0,0 +1,3 @@
+[holosource]
+url = "https://github.com/JarvusInnovations/emergence-redirects"
+ref = "refs/heads/master"
diff --git a/.holo/sources/emergence-saml2.toml b/.holo/sources/emergence-saml2.toml
@@ -0,0 +1,3 @@
+[holosource]
+url = "https://github.com/JarvusInnovations/emergence-saml2"
+ref = "refs/heads/master"
diff --git a/.holo/sources/emergence-slack.toml b/.holo/sources/emergence-slack.toml
@@ -0,0 +1,3 @@
+[holosource]
+url = "https://github.com/JarvusInnovations/emergence-slack"
+ref = "refs/heads/master"
diff --git a/.holo/sources/skeleton-v2.toml b/.holo/sources/skeleton-v2.toml
@@ -0,0 +1,3 @@
+[holosource]
+url = "https://github.com/JarvusInnovations/emergence-skeleton-v2"
+ref = "refs/heads/emergence/skeleton"
diff --git a/.studiorc b/.studiorc
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+hab pkg install emergence/studio
+source "$(hab pkg path emergence/studio)/studio.sh"
diff --git a/README.md b/README.md
@@ -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
 
diff --git a/php-config/Git.config.d/emergence-github.php b/php-config/Git.config.d/emergence-github.php
diff --git a/php-config/Git.config.d/emergence-redirects.php b/php-config/Git.config.d/emergence-redirects.php
diff --git a/php-config/Git.config.d/laddr.php b/php-config/Git.config.d/laddr.php
diff --git a/php-config/Git.config.d/recaptcha.php b/php-config/Git.config.d/recaptcha.php

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[holomapping]`
	`2`	`+files = "/*"`
	`3`	`+after = "skeleton-v2"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[holomapping]`
	`2`	`+holosource = "-skeleton"`
	`3`	`+files = "/*"`