Skip to content
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

OSS: OnBoarding: welcome an wait terminal messages #1039

Merged
merged 3 commits into from
Nov 30, 2015
Merged
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
10 changes: 9 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,18 @@ export NODE_PATH := server:shared:.

.DEFAULT_GOAL := install

welcome:
@echo "\033[36m ___ __ _| |_ _ _ __ ___ ___ "
@echo "\033[36m / __/ _\\\` | | | | | '_ \/ __|/ _ \\\ "
@echo "\033[36m | (_| (_| | | |_| | |_) \__ \ (_) | "
@echo "\033[36m \___\__,_|_|\__, | .__/|___/\___/ "
@echo "\033[36m |___/|_| "
@echo "\033[m"

install: node_modules

# Simply running `make run` will spawn the Node.js server instance.
run: githooks-commit install build
run: welcome githooks-commit install build
@$(NODE) build/bundle-$(CALYPSO_ENV).js

# a helper rule to ensure that a specific module is installed,
Expand Down
4 changes: 3 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
* External dependencies.
*/
var boot = require( 'boot' ),
http = require( 'http' );
http = require( 'http' ),
chalk = require( 'chalk' );

/**
* Internal dependencies
Expand All @@ -17,6 +18,7 @@ var start = Date.now(),
hotReloader;

console.log( '%s booted in %dms - port: %s', pkg.name, ( Date.now() ) - start, port );
console.info( chalk.cyan( '\nGetting bundles ready, hold on...' ) );
server = http.createServer( app );
server.listen( port );

Expand Down
6 changes: 3 additions & 3 deletions server/bundler/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ function middleware( app ) {
process.nextTick( function() {
if ( beforeFirstCompile ) {
beforeFirstCompile = false;
console.info( chalk.blue( 'READY! You can load http://calypso.localhost:3000/ now. Have fun!' ) );
console.info( chalk.cyan( '\nReady! You can load http://calypso.localhost:3000/ now. Have fun!' ) );
} else {
console.info( chalk.blue( 'READY! All assets are re-compiled. Have fun!' ) );
console.info( chalk.cyan( '\nReady! All assets are re-compiled. Have fun!' ) );
}
} );
} );
Expand All @@ -48,7 +48,7 @@ function middleware( app ) {
return next();
}

console.info( 'Compiling assets... Wait until you see READY! and then try http://calypso.localhost:3000/ again.' );
console.info( 'Compiling assets... Wait until you see Ready! and then try http://calypso.localhost:3000/ again.' );

// a special message for newcomers, because seeing a blank page is confusing
if ( request.url === '/' ) {
Expand Down