Merge branch 'master' of https://github.com/freecodecamp/freecodecamp
commit
ac89c44064
|
@ -47,12 +47,3 @@ var storySchema = new mongoose.Schema({
|
||||||
});
|
});
|
||||||
|
|
||||||
module.exports = mongoose.model('Story', storySchema);
|
module.exports = mongoose.model('Story', storySchema);
|
||||||
|
|
||||||
/*
|
|
||||||
author: {
|
|
||||||
userId: {
|
|
||||||
type: mongoose.Schema.Types.ObjectId,
|
|
||||||
ref: 'User'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
*/
|
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
"<div class='row'>" +
|
"<div class='row'>" +
|
||||||
"<div class='story-headline col-xs-12'>" +
|
"<div class='story-headline col-xs-12'>" +
|
||||||
"<a href='/stories/" + linkedName + "'>"
|
"<a href='/stories/" + linkedName + "'>"
|
||||||
+ data[i].storyLink +
|
+ data[i].headline +
|
||||||
"</a>" +
|
"</a>" +
|
||||||
"</div>" +
|
"</div>" +
|
||||||
"<div class='col-xs-12'>" +
|
"<div class='col-xs-12'>" +
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
"<div class='row'>" +
|
"<div class='row'>" +
|
||||||
"<div class='story-headline col-xs-12'>" +
|
"<div class='story-headline col-xs-12'>" +
|
||||||
"<a href='/stories/" + linkedName + "'>"
|
"<a href='/stories/" + linkedName + "'>"
|
||||||
+ data[i].storyLink +
|
+ data[i].headline +
|
||||||
"</a>" +
|
"</a>" +
|
||||||
"</div>" +
|
"</div>" +
|
||||||
"<div class='col-xs-12'>" +
|
"<div class='col-xs-12'>" +
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
.input-group
|
.input-group
|
||||||
input#searchArea.big-text-field.field-responsive.form-control(type='text', placeholder='Search our stories', autofocus)
|
input#searchArea.big-text-field.field-responsive.form-control(type='text', placeholder='Search our stories', autofocus)
|
||||||
span.input-group-btn
|
span.input-group-btn
|
||||||
button.disabled#searchbutton.btn.btn-big.btn-primary.btn-responsive(type='button') Search
|
button#searchbutton.btn.btn-big.btn-primary.btn-responsive(type='button') Search
|
||||||
.spacer
|
.spacer
|
||||||
|
|
||||||
#story-list
|
#story-list
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
.negative-5
|
.negative-5
|
||||||
span Posted #{timeAgo}
|
span Posted #{timeAgo}
|
||||||
span  by 
|
span  by 
|
||||||
a(href="/" + author.username)@#{author.username}
|
a(href="/" + author.username) @#{author.username}
|
||||||
| ·
|
| ·
|
||||||
a#reply-to-main-post Reply
|
a#reply-to-main-post Reply
|
||||||
.col-xs-12#reply-area
|
.col-xs-12#reply-area
|
||||||
|
|
Loading…
Reference in New Issue