Permalink
Browse files

Updated to aid in deployment

  • Loading branch information...
1 parent 2f17155 commit 7630b0e7f751d7f85d899e80d7c29dd8b1814997 @underbluewaters committed Sep 25, 2011
Showing with 30 additions and 3 deletions.
  1. +2 −0 .gitignore
  2. +2 −0 .ndistro
  3. 0 .nodemonignore
  4. +10 −3 app.coffee
  5. BIN static/jen.pxm
  6. +14 −0 static/style.css
  7. +2 −0 views/index.haml
View
2 .gitignore
@@ -0,0 +1,2 @@
+node_modules
+.DS_Store
View
2 .ndistro
@@ -0,0 +1,2 @@
+module senchalabs connect
+module visionmedia express 2.8.6
View
0 .nodemonignore
No changes.
View
13 app.coffee
@@ -6,17 +6,24 @@ fs = require 'fs'
app = express.createServer()
# production
-static = 'http://share.underbluewaters.net/chadandjen.net/'
+# static = 'http://share.underbluewaters.net/chadandjen.net/'
# dev
-# static = './'
+static = './'
# Setup HAML template handling
app.configure ->
+ app.use express.static("#{__dirname}/transfer/public")
app.use('/static', express.static(__dirname + '/static'))
app.set 'view engine', 'haml'
+ app.set 'view options', layout: false
app.register '.haml', require('hamljs')
+try
+ require("#{__dirname}/transfer/photo_viewer").register app
+catch error
+ console.log 'could not register photo viewer'
+
# Favicon
app.get '/favicon.ico', (req, res) ->
fs.readFile __dirname + '/static/favicon.ico', (err, content) ->
@@ -29,4 +36,4 @@ app.get '/:email?', (req, res) ->
photos = (static + 'static/photos/' + file for file in files when file != 'portrait.jpg')
res.render 'index', layout: false, photos: photos, static: static
-app.listen 3000, '127.0.0.1'
+app.listen 3001, '127.0.0.1'
View
BIN static/jen.pxm
Binary file not shown.
View
14 static/style.css
@@ -370,3 +370,17 @@ p.desc {
#details ul.links.museum li a:hover {
text-decoration: underline;
}
+
+
+#photos a, #photos a:hover, #photos a:active, #photos a:visited {
+ color:white !important;
+ text-decoration:none;
+}
+
+#photos {
+ position:absolute;
+ top:320px;
+ left:340px;
+ z-index:100;
+/* width:auto;*/
+}
View
2 views/index.haml
@@ -23,6 +23,8 @@
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
%body
+ -# %h2#photos
+ -# %a{href: '/photos'} New! See photobooth sessions
#cloth
%img{src: static + 'static/jelly.jpg', width: 885, height: 1224}.jelly
%img{src: static + 'static/brittle.png', width: 357, height: 409}.brittle

0 comments on commit 7630b0e

Please sign in to comment.