Skip to content

Commit

Permalink
fixed all bugs forgot to commit after each fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Django0505 committed Nov 4, 2015
1 parent 7f84d80 commit 58843df
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 31 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules/
4 changes: 2 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ function errorHandler(err, req, res, next) {
//setup the handlers
app.get('/', issues.all);
app.get('/issues', issues.all);
app.get('/issues/add' issues.showAdd);
app.get('/issues/add',issues.showAdd);
app.get('/issues/:id', issues.get);
app.post('/issues/update/:id', issues.update);
app.post('/issuesss', issues.add);
app.post('/issues', issues.add);
app.get('/issues/delete/:id', issues.delete);

//this should be a post but this is only an illustration of CRUD - not on good practices
Expand Down
8 changes: 5 additions & 3 deletions issues.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,14 @@ exports.update = function (req, res) {

connection.query("update issues set ? where id = ?", [data, req.params.id], function(err, results){
// what will happen here?
console.log(data);
return res.redirect("/issues");
});
});
}

exports.showAdd = function (req, res) {
res.render('isue')
res.render('issue')
}

exports.add = function (req, res) {
Expand All @@ -44,6 +45,7 @@ exports.add = function (req, res) {
}
req.getConnection(function(err, connection){
// what can I do better here?
if (err) throw err
connection.query("insert into issues set ?", data, function(err, results){
// what can I do better here?
res.redirect('/issues')
Expand All @@ -53,8 +55,8 @@ exports.add = function (req, res) {

exports.delete = function (req, res, next) {
req.getConnection(function(err, connection){
connection.query("delete from isues where id = ?", req.params.id, function(err, results){
//if (err) return next(err);
connection.query("delete from issues where id = ?", req.params.id, function(err, results){
if (err) return next(err);
res.redirect('/issues')
});
});
Expand Down
15 changes: 8 additions & 7 deletions views/issue.handlebars
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
<h1>Add issue</h1>

<form class="" action="/issues" method="post">
<form class="navbar-form" action="/issues" method="post">
<input type="hidden" name="id" value="{{issue.id}}">

<div class="row">
<div class="six columns">
<label for="heading">Headingg</label>
<input type="text" name="heading" value = {{issue.heading}}>
<input type="text" class="form-control" name="heading" value = {{issue.heading}}>
<label for="description" >Description</label>
<textarea name="description" class="u-full-width" id="desc">{{issue.description}}</textarea>
<textarea name="description" class="u-full-width form-control" id="desc">{{issue.description}}</textarea>
</div>
<div class="six columns">
<div id="preview">

</div>
</div>
</div>
<input class="button-primary" type="submit" value="Submit">
<input class="button-success" type="submit" value="Submit">

</form>
<script type="text/javascript">
var desc = document.getElementById('desc');
var preview = document.getElementById('preview');
desc.addEventListener('input', function(e){
preview.innerHTML = marked(desc.value);
});
</script>
</form>
</script>
29 changes: 15 additions & 14 deletions views/issue_edit.handlebars
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
<h1>Edit issue</h1>

<script type="text/javascript">
var desc = document.getElementById('desc');
var preview = document.getElementById('preview');
preview.innerHTML = marked(desc.value);
desc.addEventListener('input', function(e){
preview.innerHTML = marked(desc.value);
});
</script>

<form class="" action="/issues/update/{{issue.id}}" method="post">
<form class="navbar-form" action="/issues/update/{{issue.id}}" method="post">
<input type="hidden" name="id" value="{{issue.id}}">
<div class="row">
<div class="six columns">
<label for="heading">Heading</label>
<input type="text" name="heading" value = {{issue.heading}}>
<input type="text" name="heading" class="form-control" value = {{issue.heading}}>
<label for="description">Description</label>
<textarea name="description" class="u-full-width" id= "desc">{{issue.description}}</textarea>
<textarea name="description" class="u-full-width form-control" id="desc">{{issue.description}}</textarea>
</div>
<div class="six columns">
<div id="preview">

</div>

</div>
</div>
<input class="button-primary" type="submit" value="Submit">
<input class="button-success" type="submit" value="Submit">

</form>
<script type="text/javascript">
var desc = document.getElementById('desc');
var preview = document.getElementById('preview');
//preview.innerHTML = marked(desc.value);
desc.addEventListener('input', function(e){
preview.innerHTML = marked(desc.value);
});
</script>
8 changes: 4 additions & 4 deletions views/issues.handlebars
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<h1>Issues</h1>

<a href="/issues/add">Add issue</a>
<a href="/issues/add" class="button button-default">Add issue</a>

<table>
<table class="table table-striped">
<thead>
<tr>
<th>
Expand All @@ -20,8 +20,8 @@
{{heading}}
</td>
<td>
<a href="/issues/{{id}}">Edit</a>
<a href="/issues/delete/{{id}}">Delete</a>
<a href="/issues/{{id}}" class="button button-default">Edit</a>
<a href="/issues/delete/{{id}}" class="button button-default">Delete</a>
</td>
</tr>
{{/issues}}
Expand Down
6 changes: 5 additions & 1 deletion views/layouts/main.handlebars
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@
<title></title>
<link rel="stylesheet" href="/css/normalize.css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="/css/skeleton.css" media="screen" title="no title" charset="utf-8">
<script src="/public/marked.js" charset="utf-8"></script>
<script src="../marked.js" charset="utf-8"></script>
</head>
<nav>
<a class="navbar-brand" href="#"><img src="../images/favicon.png"style="height:80px;width:80px"/></a>
</nav>
<body>
<div class="container">
{{{body}}}
</div>

</body>
</html>

0 comments on commit 58843df

Please sign in to comment.