Flare-k

Modify video mixin and Controller

...@@ -5,6 +5,7 @@ block content ...@@ -5,6 +5,7 @@ block content
5 .videos 5 .videos
6 each item in videos 6 each item in videos
7 +videoBlock({ 7 +videoBlock({
8 + id: item.id,
8 title : item.title, 9 title : item.title,
9 views: item.views, 10 views: item.views,
10 videoFile:item.videoFile 11 videoFile:item.videoFile
......
...@@ -3,9 +3,9 @@ extends layouts/main ...@@ -3,9 +3,9 @@ extends layouts/main
3 block content 3 block content
4 .form-container 4 .form-container
5 form(action=routes.join, method="post") 5 form(action=routes.join, method="post")
6 - input(type="text", name="name", placeholder="Full Name") 6 + input(type="text", name="name", placeholder="Full Name", required=true)
7 - input(type="email", name="email", placeholder="Email") 7 + input(type="email", name="email", placeholder="Email", required=true)
8 - input(type="password", name="password", placeholder="Password") 8 + input(type="password", name="password", placeholder="Password", required=true)
9 - input(type="password", name="password2", placeholder="Verify Password") 9 + input(type="password", name="password2", placeholder="Verify Password", required=true)
10 input(type="submit", value="Join Now") 10 input(type="submit", value="Join Now")
11 include partials/socialLogin 11 include partials/socialLogin
...\ No newline at end of file ...\ No newline at end of file
......
1 mixin videoBlock(video = {}) 1 mixin videoBlock(video = {})
2 .videoBlock 2 .videoBlock
3 - video.videoBlock__thumbnail(src=video.videoFile, controls=true) 3 + a(href=routes.videoDetail(video.id))
4 - h4.videoBlock__title=video.title 4 + video.videoBlock__thumbnail(src=video.videoFile, controls=true)
5 - h6.videoBlock__views=video.views 5 + h4.videoBlock__title=video.title
6 + h6.videoBlock__views=video.views
6 7
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -14,7 +14,7 @@ header.header ...@@ -14,7 +14,7 @@ header.header
14 a(href=routes.login) Log In 14 a(href=routes.login) Log In
15 else 15 else
16 li 16 li
17 - a(href=routes.upload) Upload 17 + a(href=`/videos${routes.upload}`) Upload
18 li 18 li
19 a(href=routes.userDetail(user.id)) Profile 19 a(href=routes.userDetail(user.id)) Profile
20 li 20 li
......