Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Like dislike buttons #3

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Like dislike buttons #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1a9f19d
Added all contents of the posts - link to next/prev pages
Aug 22, 2022
79252c4
Create Post added
Aug 22, 2022
6e1e5ef
Adding required to create-user for client side validation
Aug 22, 2022
91ec213
Required input
Aug 22, 2022
ab9a26b
Adding required to create-user for client side validation - working
Aug 22, 2022
36cc502
Like button sort of working, dislike button not
OliGoodall Aug 22, 2022
9f3b97f
Added required to all fields in create-user also added links in _head…
Aug 22, 2022
e13f880
Working Like and Dislike + combined Oli and Noor's code
OliGoodall Aug 23, 2022
86889a9
Merge branch 'main' into Like-dislike-buttons
Oli-Goodall Aug 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,802 changes: 834 additions & 1,968 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 8 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,21 @@
"author": "",
"license": "ISC",
"devDependencies": {
"nodemon": "^2.0.7",
"typescript": "^4.1.3"
"nodemon": "^2.0.19",
"typescript": "^4.7.4"
},
"dependencies": {
"@types/cors": "^2.8.9",
"@types/date-fns": "^2.6.0",
"@types/express": "^4.17.11",
"@types/express-validator": "^3.0.0",
"@types/knex": "^0.16.1",
"cors": "^2.8.5",
"date-fns": "^2.28.0",
"ejs": "3.1.5",
"express": "^4.17.1",
"date-fns": "^2.29.1",
"ejs": "3.1.8",
"express": "^4.18.1",
"express-async-errors": "3.1.1",
"express-validator": "^6.9.2",
"express-validator": "^6.14.2",
"knex": "^0.21.16",
"sqlite3": "^5.0.0",
"ts-node": "^9.1.1"
"ts-node": "^10.9.1"
}
}
}
2 changes: 1 addition & 1 deletion src/services/userService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export async function getPageOfUsers(
page * pageSize < userCount
? `/users/?page=${page + 1}&pageSize=${pageSize}`
: null,
previous: page > 1 ? `/posts/?page=${page - 1}&pageSize=${pageSize}` : null,
previous: page > 1 ? `/users/?page=${page - 1}&pageSize=${pageSize}` : null,
total: userCount,
};
}
Expand Down
3 changes: 3 additions & 0 deletions views/_header.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@
<nav>
<a href="/posts">Posts</a>
<a href="/users">Users</a>
<a href="/posts/create">Create Post</a>
<a href="/users/create">Create User</a>

</nav>
</header>
12 changes: 12 additions & 0 deletions views/create_post.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
<%- include('_header') -%>
<body>
<h1>Create Post</h1>
<form method="post" action="/posts/create">
<label>
Message:
</label>
<input type="text" name="message"/>
<label>
Image:
</label>
<input type="text" name="imageUrl"/>

<button type="submit">Submit</button>
</form>
</body>
<%- include('_footer') -%>
</html>
21 changes: 11 additions & 10 deletions views/create_user.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,27 @@
<%- include('_header') -%>
<body>
<h1>Create User</h1>
<h2>All fields marked with * are required</h2>
<form method="post" action="/users/create">
<label>
Name:
<input type="text" name="name"/>
Name*:
<input type="text" name="name" required="required"/>
</label>
<label>
Username:
<input type="text" name="username"/>
Username*:
<input type="text" name="username" required="required"/>
</label>
<label>
Email:
<input type="text" name="email"/>
Email*:
<input type="email" name="email" required="required"/>
</label>
<label>
ProfileImageUrl:
<input type="text" name="profileImageUrl"/>
ProfileImageUrl*:
<input type="text" name="profileImageUrl" required="required"/>
</label>
<label>
CoverImageUrl:
<input type="text" name="coverImageUrl"/>
CoverImageUrl*:
<input type="text" name="coverImageUrl" required="required"/>
</label>
<button type="submit">Submit</button>
</form>
Expand Down
33 changes: 30 additions & 3 deletions views/post_list.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,40 @@
<%- include('_header') -%>
<body>
<h1>Posts</h1>
<ol>

<ul>
<% postList.results.forEach(function(post) {%>
<li>
<%= post.message %> - <%= format(post.createdAt, "yyyy-MM-dd HH:mm:ss") %>
<h3>
<%= post.message %>
</h3>
<p><b>Posted At :</b> <%= format(post.createdAt, "yyyy-MM-dd HH:mm:ss") %>
<b>Posted By :</b> <%= post.postedBy.name %> - <%= post.postedBy.username%> -
<b>Liked By:</b> <%=post.likedBy.length%> - <b>Disliked By:</b> <%=post.dislikedBy.length%></p>

<img src= <%= post.imageUrl %> width="200" height="300">
<form method="post" action="/posts/<%=post.id %>/like">
<button type="submit">Like</button>
</form>
Liked by : <%for (let i = 0; i < post.likedBy.length; i++) { %>
<%= post.likedBy[i].name %>
<% } %>
<form method="post" action="/posts/<%=post.id %>/dislike">
<button type="submit">Dislike</button>
</form>
Disliked by : <%for (let i = 0; i < post.dislikedBy.length; i++) { %>
<%= post.dislikedBy[i].name %>
<% } %>
</li>

<% }); %>
</ol>
</ul>
<%if (postList.next) { %>
<a href=<%= postList.next %>>Next</a>
<% } %>
<%if (postList.previous) { %>
<a href=<%= postList.previous %>>Previous</a>
<% } %>
</body>
<%- include('_footer') -%>
</html>
13 changes: 10 additions & 3 deletions views/user_list.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,22 @@
<ol>
<% results.forEach(function(user) {%>
<li>
<%= user.name %>
<h4>
Name: <%= user.name %>
</h4>
<img src= <%= user.profileImageUrl %> width="100" height="150">
<p> <b>Username:</b> <%= user.username %> -
<b>Email:</b> <%= user.email %> - <b>Posts:</b> <%= user.posts.length %>
<b>Likes:</b> <%= user.likes.length %> - <b>Dislikes:</b> <%= user.dislikes.length %>
</p>
</li>
<% }); %>
</ol>
<%if (next) { %>
<a href="<%= next %>">Next</a>
<a href=<%= next %>>Next</a>
<% } %>
<%if (previous) { %>
<a href="<%= previous %>">Previous</a>
<a href=<%= previous %>>Previous</a>
<% } %>
</body>
<%- include('_footer') -%>
Expand Down