Compare commits
2 Commits
44b14487bf
...
5435ba2d45
| Author | SHA1 | Date | |
|---|---|---|---|
|
5435ba2d45 | ||
|
|
bb72b9d1d5 |
39
migrations/20220301193849-modify_users_add_fields.js
Normal file
39
migrations/20220301193849-modify_users_add_fields.js
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
'use strict';
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
async up (queryInterface, Sequelize) {
|
||||||
|
/**
|
||||||
|
* Add altering commands here.
|
||||||
|
*
|
||||||
|
* Example:
|
||||||
|
* await queryInterface.createTable('users', { id: Sequelize.INTEGER });
|
||||||
|
*/
|
||||||
|
await queryInterface.addColumn(
|
||||||
|
'Users',
|
||||||
|
'avatar',
|
||||||
|
{
|
||||||
|
type: Sequelize.BLOB,
|
||||||
|
allowNull: true,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
await queryInterface.addColumn(
|
||||||
|
'Users',
|
||||||
|
'bio',
|
||||||
|
{
|
||||||
|
type: Sequelize.TEXT,
|
||||||
|
allowNull: true,
|
||||||
|
}
|
||||||
|
);
|
||||||
|
},
|
||||||
|
|
||||||
|
async down (queryInterface, Sequelize) {
|
||||||
|
/**
|
||||||
|
* Add reverting commands here.
|
||||||
|
*
|
||||||
|
* Example:
|
||||||
|
* await queryInterface.dropTable('users');
|
||||||
|
*/
|
||||||
|
await queryInterface.removeColumn('Users', 'avatar');
|
||||||
|
await queryInterface.removeColumn('Users', 'bio');
|
||||||
|
}
|
||||||
|
};
|
||||||
@ -122,43 +122,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="lg:w-72 lg:overflow-y-hidden">
|
<%- include('partials/_sidebar_menu.ejs') %>
|
||||||
<ul class="p-5">
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block" href="/"><i class="fa fa-home mr-2"></i>Home</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-bell mr-2"></i>Notifications</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-group mr-2"></i>Local</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-globe mr-2"></i>Federated</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-envelope mr-2"></i>Direct messages</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-star mr-2"></i>Favourites</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-bookmark mr-2"></i>Bookmarks</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-list mr-2"></i>Lists</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-address-book mr-2"></i>Profile directory</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-cog mr-2"></i>Preferences</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-group mr-2"></i>Follows and followers</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
38
views/me.ejs
38
views/me.ejs
@ -122,43 +122,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="lg:w-72 lg:overflow-y-hidden">
|
<%- include('partials/_sidebar_menu.ejs') %>
|
||||||
<ul class="p-5">
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-home mr-2"></i>Home</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-bell mr-2"></i>Notifications</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-group mr-2"></i>Local</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-globe mr-2"></i>Federated</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-envelope mr-2"></i>Direct messages</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-star mr-2"></i>Favourites</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-bookmark mr-2"></i>Bookmarks</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-list mr-2"></i>Lists</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-address-book mr-2"></i>Profile directory</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-cog mr-2"></i>Preferences</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-group mr-2"></i>Follows and followers</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -11,7 +11,9 @@
|
|||||||
</h5>
|
</h5>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<%- messages[i].body.replace(/\n/g, '<br>') %>
|
<% messages[i].body.split('\n').forEach(line => { %>
|
||||||
|
<%= line %><br>
|
||||||
|
<% }) %>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="text-xs text-gray-500 mt-3">Posted on: <%= messages[i].createdAt %>
|
<div class="text-xs text-gray-500 mt-3">Posted on: <%= messages[i].createdAt %>
|
||||||
|
|||||||
37
views/partials/_sidebar_menu.ejs
Normal file
37
views/partials/_sidebar_menu.ejs
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
<div class="lg:w-72 lg:overflow-y-hidden">
|
||||||
|
<ul class="p-5">
|
||||||
|
<li>
|
||||||
|
<a href="/" class="font-bold text-lg mb-4 block"><i class="fa fa-home mr-2"></i>Home</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a class="font-bold text-lg mb-4 block"><i class="fa fa-bell mr-2"></i>Notifications</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a class="font-bold text-lg mb-4 block"><i class="fa fa-group mr-2"></i>Local</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a class="font-bold text-lg mb-4 block"><i class="fa fa-globe mr-2"></i>Federated</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a class="font-bold text-lg mb-4 block"><i class="fa fa-envelope mr-2"></i>Direct messages</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a class="font-bold text-lg mb-4 block"><i class="fa fa-star mr-2"></i>Favourites</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a class="font-bold text-lg mb-4 block"><i class="fa fa-bookmark mr-2"></i>Bookmarks</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a class="font-bold text-lg mb-4 block"><i class="fa fa-list mr-2"></i>Lists</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a class="font-bold text-lg mb-4 block"><i class="fa fa-address-book mr-2"></i>Profile directory</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a class="font-bold text-lg mb-4 block"><i class="fa fa-cog mr-2"></i>Preferences</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a class="font-bold text-lg mb-4 block"><i class="fa fa-group mr-2"></i>Follows and followers</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
@ -11,7 +11,9 @@
|
|||||||
</h5>
|
</h5>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<%= messages[i].body%>
|
<% messages[i].body.split('\n').forEach(line => { %>
|
||||||
|
<%= line %><br>
|
||||||
|
<% }) %>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="text-xs text-gray-500 mt-3">Posted on: <%= messages[i].createdAt %>
|
<div class="text-xs text-gray-500 mt-3">Posted on: <%= messages[i].createdAt %>
|
||||||
|
|||||||
@ -96,14 +96,6 @@
|
|||||||
<img src="/images/avatar_94.png" alt="<%= user.name %>" class="rounded-md overflow-visible">
|
<img src="/images/avatar_94.png" alt="<%= user.name %>" class="rounded-md overflow-visible">
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-center pt-3 px-2 mx-2">
|
<div class="flex items-center pt-3 px-2 mx-2">
|
||||||
<button class="bg-blue-600
|
|
||||||
py-2
|
|
||||||
px-5
|
|
||||||
rounded-md
|
|
||||||
mr-3
|
|
||||||
focus:outline-none
|
|
||||||
focus:shadow-outline"
|
|
||||||
type="submit">Follow</button>
|
|
||||||
<a class="bg-blue-600
|
<a class="bg-blue-600
|
||||||
py-2
|
py-2
|
||||||
px-5
|
px-5
|
||||||
@ -115,7 +107,7 @@
|
|||||||
inline-flex
|
inline-flex
|
||||||
items-center
|
items-center
|
||||||
"
|
"
|
||||||
href="/follow/add/<%= user.id %>">Link</a>
|
href="/follow/add/<%= user.id %>">Follow</a>
|
||||||
<button
|
<button
|
||||||
class="bg-gray-600 border border-b-gray-400 py-2 px-5 rounded-md focus:outline-none focus:shadow-outline shadow-xl"
|
class="bg-gray-600 border border-b-gray-400 py-2 px-5 rounded-md focus:outline-none focus:shadow-outline shadow-xl"
|
||||||
type="submit"><i class="fa fa-ellipsis-v"></i></button>
|
type="submit"><i class="fa fa-ellipsis-v"></i></button>
|
||||||
@ -140,43 +132,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="lg:w-72 lg:overflow-y-hidden">
|
<%- include('partials/_sidebar_menu.ejs') %>
|
||||||
<ul class="p-5">
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-home mr-2"></i>Home</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-bell mr-2"></i>Notifications</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-group mr-2"></i>Local</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-globe mr-2"></i>Federated</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-envelope mr-2"></i>Direct messages</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-star mr-2"></i>Favourites</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-bookmark mr-2"></i>Bookmarks</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-list mr-2"></i>Lists</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-address-book mr-2"></i>Profile directory</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-cog mr-2"></i>Preferences</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="font-bold text-lg mb-4 block"><i class="fa fa-group mr-2"></i>Follows and followers</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user