Skip to content

Commit 6c890fc

Browse files
committed
add multi feed types and navbar
1 parent d65ace0 commit 6c890fc

File tree

5 files changed

+30
-19
lines changed

5 files changed

+30
-19
lines changed

public/css/style.css

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
box-sizing: border-box;
33
}
44
body {
5-
padding: 50px;
6-
font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
5+
/*font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;*/
76
}
87

98
a {
10-
color: #00B7FF;
9+
/*color: #00B7FF;
1110
margin: 0 20px 20px 0;
12-
display: inline-block;
11+
display: inline-block;*/
1312
}
1413

1514
main {
@@ -21,26 +20,26 @@ img {
2120
}
2221

2322
input, label, textarea, button {
24-
margin: 15px 0;
23+
/*margin: 15px 0;
2524
width: 100%;
2625
border-radius: 3px;
27-
padding: 5px;
26+
padding: 5px;*/
2827
}
2928

3029
input, textarea {
31-
border: solid 1px #7b7b7b;
30+
/*border: solid 1px #7b7b7b;*/
3231
}
3332

3433
input:focus, textarea:focus {
35-
outline: 0;
34+
/*outline: 0;*/
3635
}
3736

3837
textarea {
39-
min-height: 400px;
38+
/*min-height: 400px;*/
4039
}
4140

4241
button, input[type="submit"] {
43-
cursor: pointer;
42+
/*cursor: pointer;*/
4443
}
4544

4645
.vote {

public/js/main.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
// EXAMPLE - FEED PAGE
33
if ($('main').hasClass('feed') ) {
44
let postInsert = '.feed-insert'
5+
let feedType = $('main.feed').data('feed-type')
6+
console.log(feedType)
57
steem.api.setOptions({ url: 'wss://rpc.buildteam.io' });
6-
steem.api.getState('/trending/', (err, result) => {
8+
steem.api.getState(`/${feedType}/`, (err, result) => {
79

810
let resultsArray = [];
911

routes/feed.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@ let util = require('../modules/util');
33
let router = express.Router();
44

55
/* GET users listing. */
6-
router.get('/', util.isAuthenticated, (req, res, next) => {
7-
res.render('feed', {});
6+
router.get('/:feed?', util.isAuthenticated, (req, res, next) => {
7+
let feed = req.params.feed
8+
console.log(feed)
9+
res.render('feed', {
10+
feed: feed
11+
});
812
});
913

1014
module.exports = router;

views/feed.pug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ extends layout
33
block content
44
include partials/nav
55

6-
main.feed
6+
main.feed(data-feed-type=`${feed}`)
77
h1 Feed - /Trending
88
.container
99
.row.feed-insert

views/partials/nav.pug

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
nav
2-
a(href="/user") Profile
3-
a(href="/feed") Feed
4-
a(href="/post") Create Post
5-
a(href="/auth/logout") Logout
1+
nav(class="navbar navbar-expand-lg navbar-dark bg-dark")
2+
a.navbar-brand(href="#") Boilerplate
3+
.collapse.navbar-collapse
4+
.navbar-nav
5+
a.nav-item.nav-link(href="/feed/trending") Trending
6+
a.nav-item.nav-link(href="/feed/created") New
7+
a.nav-item.nav-link(href="/feed/promoted") Promoted
8+
.navbar-nav.ml-auto
9+
a.nav-item.nav-link.btn.btn-outline-secondary(href="/post") Create Post
10+
a.nav-item.nav-link(href="/user") Profile
11+
a.nav-item.nav-link(href="/auth/logout") Logout

0 commit comments

Comments
 (0)