Merge pull request #557 from brickify/release/v0.9.3

Release/v0.9.3

README.md

@@ -2,9 +2,9 @@
 
 ## Installation
 
-`$ git clone https://github.com/stuikomma/lowfab.git`
+`$ git clone https://github.com/brickify/brickify.git`
 
-`$ cd lowfab`
+`$ cd brickify`
 
 Install dependencies: `$ npm install`
 

package.json

@@ -1,14 +1,14 @@
 {
   "name": "Brickify",
-  "version": "0.9.2",
-  "description": "Extend your LEGO® with 3D-printed parts!",
+  "version": "0.9.3",
+  "description": "Faster 3D-printing with LEGO bricks",
   "keywords": [
     "fabrication",
     "3d printing",
     "lego"
   ],
   "homepage": "http://brickify.it",
-  "bugs": "http://github.com/stuikomma/lowfab/issues",
+  "bugs": "http://github.com/brickify/brickify/issues",
   "dependencies": {
     "PEP": "brickify/PEP#0.3.1",
     "array.prototype.find": "^1.0.0",
@@ -87,7 +87,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "http://github.com/stuikomma/lowfab.git"
+    "url": "http://github.com/brickify/brickify.git"
   },
   "author": "HPI HCI-Bachelorprojekt 2014",
   "contributors": [

public/styles/app/index.styl

@@ -2,6 +2,12 @@ html
 	height 100%
 	width 100%
 
+h1 a
+	color inherit
+	&:hover
+		color inherit
+		text-decoration none
+
 #editor
 	height 100%
 	width 100%

public/styles/landingpage/footer.styl

@@ -1,6 +1,12 @@
 footer
-	padding-top 1em
+	padding-top 2em
 	width 100%
 
+	.links
+		margin-bottom 2em
+		a
+			color $gray-lighter
+
 	#legal
-		color #666
+		color lighten($gray-base, 40%)
+		font-size 9px

routes/landingpage.coffee

@@ -1,19 +1,34 @@
 path = require 'path'
 
 module.exports.getLandingpage = (request, response) ->
-	response.render path.join('landingpage','landingpage'), page: 'landing'
+	response.render(
+		path.join('landingpage','landingpage'),
+		page: 'landing'
+	)
 
 module.exports.getContribute = (request, response) ->
-	response.render path.join('landingpage','contribute'), pageTitle: 'contribute'
+	response.render(
+		path.join('landingpage','contribute'),
+		pageTitle: 'Contribute'
+	)
 
 module.exports.getTeam = (request, response) ->
-	response.render path.join('landingpage','team'), pageTitle: 'team'
+	response.render(
+		path.join('landingpage','team'),
+		pageTitle: 'Team'
+	)
 
 module.exports.getImprint = (request, response) ->
-	response.render path.join('landingpage','imprint'), pageTitle: 'imprint'
+	response.render(
+		path.join('landingpage','imprint'),
+		pageTitle: 'Imprint'
+	)
 
 module.exports.getEducators = (request, response) ->
 	response.render(
 		path.join('landingpage','educators')
-		{page: 'landing', pageTitle: 'educators'}
+		{
+			page: 'landing',
+			pageTitle: 'Educators'
+		}
 	)

src/server/main.coffee

@@ -207,8 +207,9 @@ module.exports.setupRouting = ->
 
 	webapp.use (req, res) ->
 		res
-		.status(404)
+		.status 404
 		.render '404'
+
 	return module.exports
 
 module.exports.startServer = (_port, _ip) ->

views/404.jade

@@ -1,11 +1,19 @@
-extends rootLayout
+extends ./rootLayout
+
+block styles
+	link(rel='stylesheet', href='/styles/screen.css')
 
 block body
-	p The requested URL
-		= ' '
-		del could not get fabricated
-		= ' '
-		ins was not found on this server!
-	p Go back to
-		= ' '
-		a(href="/") brickify
+	.container
+
+		h1: a(href='/') brickify
+
+		p The requested URL
+			= ' '
+			del could not get fabricated
+			= ' '
+			ins was not found on this server!
+
+		p Go back to
+			= ' '
+			a(href="/") brickify

views/app/sidebar.jade

@@ -4,7 +4,8 @@
 		span.icon-bar  
 		span.icon-bar  
 		span.icon-bar  
-	h1 brickify
+
+	h1: a(href='/') brickify
 
 #sidebar-content
 	include ./workflowComponents/load.jade

views/landingpage/footer.jade

@@ -1,16 +1,14 @@
-footer
-	center
-		a(href='/') brickify.it
-	center
-		a(href='/contribute') Contribute
+footer.text-center
+	.links
+		a(href='https://github.com/brickify/brickify', target='_blank') Contribute
 		|   •  
 		a(href='/team') Team
 		|   •  
 		a(href='/imprint') Imprint
-		p
-	p#legal.text-center
-		|LEGO#[sup ®] is a trademark of the LEGO Group of companies which
-		|does not sponsor, authorize or endorse this site
-		br
-		|This product uses the Thingiverse API but is not endorsed or certified by
-		|Thingiverse or its affiliates.
+
+	p#legal.
+		LEGO#[sup ®] is a trademark of the LEGO Group of companies which
+		does not sponsor, authorize or endorse this site.
+		#[br]
+		This product uses the Thingiverse API but is not endorsed or certified by
+		Thingiverse or its affiliates.

views/landingpage/imprint.jade

@@ -5,8 +5,13 @@ block styles
 
 block body
 	.container
-		h1 Imprint
+
+		h1: a(href='/') brickify
+
+		h2 Imprint
+
 		h4 Angaben gemäß § 5 TMG:
+
 		p
 			| Hasso-Plattner-Institut für Softwaresystemtechnik GmbH
 			br

views/landingpage/quickconvert.jade

@@ -13,5 +13,5 @@ section.quickConvert
 				canvas#renderArea2.quickConvertCanvas
 				#applinks
 					a.btn.btn-success#downloadButton Download
-					| 
+					= ' '
 					a.btn.btn-primary.applink(href='app#initialModel=1c2395a3145ad77aee7479020b461ddf') Customize

views/landingpage/team.jade

@@ -5,13 +5,20 @@ block styles
 
 block body
 	.container
-		h1 Team
+
+		h1: a(href='/') brickify
+
+		h2 Team
+
 		img(src='img/bp.png')
+
 		p.
 			Brickify is developed by Johannes, Stefan, Arthur, Adrian and
 			Yannis, a team of bachelor students at the chair of human computer
 			interaction at Hasso-Plattner-Institute Potsdam, Germany.
-		p Write us at 
+
+		p Write us at
+			= ' '
 			script(type='text/javascript').
 				var mailString = "%74%6b%6d%61%79%31%37%3d%5b%27%25%36%33%25%36%66%25%36%65%25%37%"
 				mailString += "34%25%36%31%25%36%33%25%37%34%27%2c%5b%27%25%36%39%25%37%34%27%2c%27%"
@@ -22,4 +29,5 @@ block body
 				mailString += "2e%77%72%69%74%65%28%6a%76%61%71%68%39%36%2e%6c%69%6e%6b%28%27%6d%61%"
 				mailString += "69%27%2b%27%6c%74%6f%3a%27%2b%74%6b%6d%61%79%31%37%29%29%3b"
 				eval(decodeURIComponent(mailString))
+
 	include footer

views/landingpage/teaser.jade

@@ -2,21 +2,44 @@ header
 	.container
 		.col-lg-8.pitch
 			h1 brickify
-			h2 Extend your LEGO#[sup ®] with 3D-printed parts!
+			h2 Faster 3D-printing with LEGO#[sup ®] bricks
+
 			.drop
-				label(for='fileInput').btn.btn-primary.dropper#loadButton
-					img(src='./img/spinner.gif' id="spinner")
-				input(type='file' accept=".stl"
-				style='display: none')#fileInput
-			a(href='/educators').btn#educators
+				label#loadButton.btn.btn-primary.dropper(for='fileInput')
+					img#spinner(src='./img/spinner.gif')
+
+				input#fileInput(
+					type='file'
+					accept='.stl'
+					style='display: none'
+				)
+
+			a#educators.btn(href='/educators')
 				#preview
-					img(src='/img/sample_ballista.png', draggable="true",
-					data-hash='708d0b0b44f491523de951afa44b3e06')
-					img(src='/img/sample_CitrusJuicer.png', draggable="true",
-					data-hash='cd8a7a94eac03bf07f32048269e5cc1f')
-					img(src='/img/sample_goggles.png', draggable="true",
-					data-hash='1c2395a3145ad77aee7479020b461ddf')
-					img(src='/img/sample_printableWrench.png', draggable="true",
-					data-hash='1b2512f0804dfd68b2783108d840ab6f')
+					img(
+						src='/img/sample_ballista.png',
+						draggable='true',
+						data-hash='708d0b0b44f491523de951afa44b3e06'
+					)
+
+					img(
+						src='/img/sample_CitrusJuicer.png',
+						draggable='true',
+						data-hash='cd8a7a94eac03bf07f32048269e5cc1f'
+					)
+
+					img(
+						src='/img/sample_goggles.png',
+						draggable='true',
+						data-hash='1c2395a3145ad77aee7479020b461ddf'
+					)
+
+					img(
+						src='/img/sample_printableWrench.png',
+						draggable='true',
+						data-hash='1b2512f0804dfd68b2783108d840ab6f'
+					)
+
 				p Are you an educator? Check out our example models!
+
 		#makey.col-lg-4

views/rootLayout.jade

@@ -2,20 +2,23 @@ doctype html
 html
 	head
 		meta(charset='utf-8')
-		if pageTitle != null
-			title #{pageTitle} - brickify - Extend your LEGO with 3D-printed parts!
-		else
-			title brickify - Extend your LEGO with 3D-printed parts!
-		meta(name='viewport' content='width=device-width, initial-scale=1')
+		title 
+			if pageTitle
+				| #{pageTitle} | Brickify
+			else
+				| Brickify - Faster 3D-printing with LEGO bricks
 
-		script(src='/js/piwik.js')
-		noscript
-			img(src='//piwik.brickify.it/piwik.php?idsite=1' style='border:0;' alt='')
+		meta(name='viewport' content='width=device-width, initial-scale=1')
+		meta(name="description" content='Faster 3D-printing with LEGO bricks')
+		meta(name="keywords" content='Brickify, 3D-printing, LEGO')
 
 		block styles
 
 	body(id=page)
 
 		block body
 
+		script(src='/js/piwik.js')
+		noscript
+			img(src='//piwik.brickify.it/piwik.php?idsite=1' style='border:0;' alt='')
 		block scripts