Skip to content

Commit

Permalink
drying up views #inprogress
Browse files Browse the repository at this point in the history
  • Loading branch information
davidguttman committed Aug 4, 2012
1 parent 03e12ca commit 62ba92c
Show file tree
Hide file tree
Showing 11 changed files with 84 additions and 56 deletions.
9 changes: 9 additions & 0 deletions app.js
Expand Up @@ -13,6 +13,11 @@ var express = require('express')

var app = express();

setUser = function(req, res, next) {
app.locals.currentUser = req.session.currentUser
next()
}

app.configure(function(){
app.set('port', process.env.PORT || 3000);
app.set('views', __dirname + '/views');
Expand All @@ -24,6 +29,7 @@ app.configure(function(){
secret: "the joined advice reads across whatever reserved"
, store: new RedisStore
}))
app.use(setUser)
app.use(express.bodyParser());
app.use(express.methodOverride());
app.use(app.router);
Expand All @@ -34,6 +40,9 @@ app.configure('development', function(){
app.use(express.errorHandler());
});




var helpers = {
auth: function(req, res, next) {
if (req.session.currentUser) {
Expand Down
5 changes: 4 additions & 1 deletion public/css/style.css
@@ -1,10 +1,13 @@
body {
font-size: 14px; }

a {
cursor: pointer; }

textarea.posting_body {
height: 300px; }

.new {
#header .user {
float: right; }

.jobs a:hover {
Expand Down
12 changes: 10 additions & 2 deletions public/css/style.scss
Expand Up @@ -3,12 +3,20 @@ body {
// "Lucida Grande", Helvetica, Arial, sans-serif;
}

a {
cursor: pointer;
}

textarea.posting_body {
height: 300px;
}

.new {
float: right;
#header {

.user {
float: right;
}

}

.jobs {
Expand Down
15 changes: 6 additions & 9 deletions views/accounts/jobs.jade
@@ -1,17 +1,14 @@
extends ../layout

block content
.row
.span12
.site
h3 LA.js Jobs
.back
a(href='/jobs') Back to Jobs
append header
.back
a(href='/jobs') Back to All Jobs

block content

.page-header
h1 My Postings



.jobs.row
.span12

Expand Down
7 changes: 7 additions & 0 deletions views/includes/head.jade
@@ -0,0 +1,7 @@
head
title= title

link(rel='stylesheet', href='/css/bootstrap.min.css')
link(rel='stylesheet', href='/css/bootstrap-responsive.min.css')

link(rel='stylesheet', href='/css/style.css')
18 changes: 18 additions & 0 deletions views/includes/header.jade
@@ -0,0 +1,18 @@
#header
.user
if currentUser
span.my-jobs
a(href='/my/jobs') View My Jobs
| or
span.new
a(href='/jobs/new') Create a Job Posting
else
span.login
a Sign In
| or
span.login
a Sign Up
| to create a job posting

.page-header
h1 LA.js Job Board
11 changes: 11 additions & 0 deletions views/includes/scripts.jade
@@ -0,0 +1,11 @@
script(src='https://login.persona.org/include.js')
script(src='http://cdnjs.cloudflare.com/ajax/libs/jquery/1.7.2/jquery.min.js')
script(src='http://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.0.4/bootstrap.min.js')

script(src='https://js.stripe.com/v1/')
script(type='text/javascript')
Stripe.setPublishableKey('pk_05DZzfxqFiSJFgjCtMSsaI7rt9YNE');

script(src='/js/vendor/timeago.js')

script(src='/js/main.js')
13 changes: 4 additions & 9 deletions views/jobs/edit.jade
@@ -1,15 +1,10 @@
extends ../layout

append header
.back
a(href='/my/jobs') Back to My Jobs

block content
.row
.span12
.site
h3 LA.js Jobs
.back
a(href='/jobs') Back to Jobs

.page-header
h2 Edit Job Posting

.row
.new-job.span12
Expand Down
11 changes: 1 addition & 10 deletions views/jobs/index.jade
@@ -1,17 +1,8 @@
extends ../layout


block content

.page-header
h1 LA.js Job Board

.new
a(href='/jobs/new') Create Job Posting

if currentUser
.my-jobs
a(href='/my/jobs') View My Jobs

.jobs.row
.span12

Expand Down
11 changes: 5 additions & 6 deletions views/jobs/new.jade
@@ -1,12 +1,11 @@
extends ../layout

append header

.back
a(href='/my/jobs') Back to My Jobs

block content
.row
.span12
.site
h3 LA.js Jobs
.back
a(href='/jobs') Back to Jobs

.page-header
h2 New Job Posting
Expand Down
28 changes: 9 additions & 19 deletions views/layout.jade
@@ -1,26 +1,16 @@
doctype 5
html
head
title= title

link(rel='stylesheet', href='/css/bootstrap.min.css')
link(rel='stylesheet', href='/css/bootstrap-responsive.min.css')

link(rel='stylesheet', href='/css/style.css')
include includes/head

body
.container
block content
block header
include includes/header

#main
block content
#footer
block footer

script(src='https://login.persona.org/include.js')
script(src='http://cdnjs.cloudflare.com/ajax/libs/jquery/1.7.2/jquery.min.js')
script(src='http://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.0.4/bootstrap.min.js')

script(src='https://js.stripe.com/v1/')
script(type='text/javascript')
Stripe.setPublishableKey('pk_05DZzfxqFiSJFgjCtMSsaI7rt9YNE');

script(src='/js/vendor/timeago.js')

script(src='/js/main.js')
include includes/scripts

0 comments on commit 62ba92c

Please sign in to comment.