From f6a46245e5185ea1cdc9d71cd9a79faca4916412 Mon Sep 17 00:00:00 2001 From: emir Date: Thu, 27 Feb 2020 15:17:14 +0100 Subject: [PATCH] Deleted folders webapp and webapi. --- webapi/.dockerignore | 3 - webapi/Dockerfile | 15 -- webapi/minitwit-api.js | 237 ---------------------------- webapi/package.json | 16 -- webapp/.dockerignore | 3 - webapp/Dockerfile | 15 -- webapp/minitwit.js | 255 ------------------------------- webapp/package.json | 19 --- webapp/static/avatar.png | Bin 5905 -> 0 bytes webapp/static/style.css | 183 ---------------------- webapp/views/pages/login.ejs | 15 -- webapp/views/pages/register.ejs | 20 --- webapp/views/pages/timeline.ejs | 58 ------- webapp/views/partials/footer.ejs | 5 - webapp/views/partials/header.ejs | 44 ------ 15 files changed, 888 deletions(-) delete mode 100644 webapi/.dockerignore delete mode 100644 webapi/Dockerfile delete mode 100644 webapi/minitwit-api.js delete mode 100644 webapi/package.json delete mode 100644 webapp/.dockerignore delete mode 100644 webapp/Dockerfile delete mode 100644 webapp/minitwit.js delete mode 100644 webapp/package.json delete mode 100644 webapp/static/avatar.png delete mode 100755 webapp/static/style.css delete mode 100644 webapp/views/pages/login.ejs delete mode 100644 webapp/views/pages/register.ejs delete mode 100644 webapp/views/pages/timeline.ejs delete mode 100644 webapp/views/partials/footer.ejs delete mode 100644 webapp/views/partials/header.ejs diff --git a/webapi/.dockerignore b/webapi/.dockerignore deleted file mode 100644 index 29d6828..0000000 --- a/webapi/.dockerignore +++ /dev/null @@ -1,3 +0,0 @@ -node_modules -npm-debug.log - diff --git a/webapi/Dockerfile b/webapi/Dockerfile deleted file mode 100644 index 1891ac1..0000000 --- a/webapi/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# Start image -FROM node:11 - -# Create app directory -WORKDIR /usr/src/app - -# Install app dependencies -# A wildcard is used to ensure both package.json AND package-lock.json are copied -# where available (npm@5+) -COPY package*.json ./ - -RUN npm install - -# Bundle app source -COPY . . \ No newline at end of file diff --git a/webapi/minitwit-api.js b/webapi/minitwit-api.js deleted file mode 100644 index 9665bc6..0000000 --- a/webapi/minitwit-api.js +++ /dev/null @@ -1,237 +0,0 @@ -const db = require('../app/persistence/sqlite'); - -// Express web framework https://expressjs.com/ -const express = require('express'); -const app = express(); -const bodyParser = require('body-parser'); - -let LATEST = 0; - -app.use(bodyParser.json()); - -// Get latest value -app.get('/latest', function (req, res) { - return res.json({"latest": LATEST}); -}); - -// Register handler -app.post('/register', async function(req, res) { - updateLatest(req); - const username = req.body.username; - const email = req.body.email; - const password = req.body.pwd; - console.log(username, email, password); - let error; - if(!username) { - error = 'You have to enter a username'; - } else if (!email || !email.includes('@')) { - error = 'You have to enter a valid email address'; - } else if (!password) { - error = 'You have to enter a password'; - } else if (await selectOne('SELECT 1 FROM user WHERE username = ?',[username])) { - error = 'The username is already taken'; - } else { - await insertOne( - 'INSERT INTO user(username, email, pw_hash) VALUES(?, ?, ?)', - [username, email, password.lameHash()]); - return res.status(204).send(); - - } - return res.json({"status": 400, "error_msg": error}).status(400).send(); -}); - -// Public timeline page -app.get('/msgs', async function(req, res) { - updateLatest(req); - let not_from_sim = notReqFromSimulator(req); - if (not_from_sim) { - let error = "You are not authorized to use this resource!"; - return res.json({"status": 403, "error_msg": error}).status(403).send(); - } - - let no_msgs = req.query.no ? req.query.no : 100; - let messages = await selectAll( - `select message.*, user.* from message, user - where message.author_id = user.user_id - order by message.pub_date desc limit ?`, - [no_msgs] - ); - - let filteredMsgs = []; - messages.forEach(function(msg) { - let filteredMsg = {}; - filteredMsg["content"] = msg["text"]; - filteredMsg["pub_date"] = msg["pub_date"]; - filteredMsg["user"] = msg["username"]; - filteredMsgs.push(filteredMsg); - }); - return res.json(filteredMsgs); -}); - -app.get('/msgs/:username', async function(req, res) { - updateLatest(req); - - let not_from_sim = notReqFromSimulator(req); - if (not_from_sim) { - let error = "You are not authorized to use this resource!"; - return res.json({"status": 403, "error_msg": error}).status(403).send(); - } - const { username } = req.params; - let no_msgs = req.query.no ? req.query.no : 100; - - let profile_user = await selectOne( - 'SELECT * FROM user WHERE username = ?', - [username]); - - if(!profile_user) { - return res.status(404).send(); - } - - let messages = await selectAll( - `SELECT message.*, user.* FROM message, user WHERE - user.user_id = message.author_id AND user.user_id = ? - ORDER BY message.pub_date DESC LIMIT ?`, - [profile_user.user_id, no_msgs]); - - let filteredMsgs = []; - messages.forEach(function(msg) { - let filteredMsg = {}; - filteredMsg["content"] = msg["text"]; - filteredMsg["pub_date"] = msg["pub_date"]; - filteredMsg["user"] = msg["username"]; - filteredMsgs.push(filteredMsg); - }); - - return res.json(filteredMsgs); -}); - -app.post('/msgs/:username', async function (req, res) { - updateLatest(req); - - let not_from_sim = notReqFromSimulator(req); - if (not_from_sim) { - let error = "You are not authorized to use this resource!"; - return res.json({"status": 403, "error_msg": error}).status(403).send(); - } - const { username } = req.params; - let profile_user = await selectOne( - 'SELECT * FROM user WHERE username = ?', - [username]); - - if(!profile_user) { - return res.status(404).send(); - } - - let content = req.body.content; - - await insertOne( - 'INSERT INTO message(author_id, text, pub_date) VALUES(?, ?, ?)', - [profile_user.user_id, content, Date.now()]); - - return res.status(204).send(); -}); - -app.get('/fllws/:username', async function (req, res) { - updateLatest(req); - - let not_from_sim = notReqFromSimulator(req); - if (not_from_sim) { - let error = "You are not authorized to use this resource!"; - return res.json({"status": 403, "error_msg": error}).status(403).send(); - } - const { username } = req.params; - - let profile_user = await selectOne( - 'SELECT * FROM user WHERE username = ?', - [username]); - - if(!profile_user) { - return res.status(404).send(); - } - - let no_followers = req.query.no ? req.query.no : 100; - - let followers = await selectAll( - `SELECT user.username FROM user - INNER JOIN follower ON follower.whom_id = user.user_id - WHERE follower.who_id = ? - LIMIT ?`, - [profile_user.user_id, no_followers] - ); - let followers_names = []; - followers.forEach((follower) => { - followers_names.push(follower["username"]) - }); - - return res.json({"follows": followers_names}); -}); - -app.post('/fllws/:username', async function (req, res) { - updateLatest(req); - - let not_from_sim = notReqFromSimulator(req); - if (not_from_sim) { - let error = "You are not authorized to use this resource!"; - return res.json({"status": 403, "error_msg": error}).status(403).send(); - } - const { username } = req.params; - - let profile_user = await selectOne( - 'SELECT * FROM user WHERE username = ?', - [username]); - - if(!profile_user) { - return res.status(404).send(); - } - - if (req.body.follow) { - let follow_username = req.body.follow; - let follows_user = await selectOne( - 'SELECT * FROM user WHERE username = ?', - [follow_username]); - - if (!follows_user) { - return res.status(404).send(); - } - - await insertOne( - 'INSERT INTO follower (who_id, whom_id) VALUES (?, ?)', - [profile_user.user_id, follows_user.user_id]); - - return res.status(204).send(); - } - - if (req.body.unfollow) { - let unfollow_username = req.body.unfollow; - let unfollows_user = await selectOne( - 'SELECT * FROM user WHERE username = ?', - [unfollow_username]); - - if (!unfollows_user){ - return res.status(404).send(); - } - - await deleteRows( - 'DELETE FROM follower WHERE who_id = ? AND whom_id = ?', - [profile_user.user_id, unfollows_user.user_id]); - - return res.status(204).send(); - } -}); - - -// Start application -app.listen(5001); -console.log('MiniTwit API is running on port 5001..'); - -// Checks if simulator -function notReqFromSimulator(request) { - let from_sim = request.headers.authorization; - return from_sim !== "Basic c2ltdWxhdG9yOnN1cGVyX3NhZmUh"; -} - -// Update latest -function updateLatest(request) { - let try_latest = request.query.latest ? request.query.latest : -1; - LATEST = try_latest !== -1 ? parseInt(try_latest) : LATEST; -} diff --git a/webapi/package.json b/webapi/package.json deleted file mode 100644 index 9e41a47..0000000 --- a/webapi/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "minitwit", - "version": "0.0.1", - "description": "Minitwit.py refactor in Nodejs/Express", - "main": "minitwit.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "", - "license": "ISC", - "dependencies": { - "express": "^4.17.1", - "sqlite3": "^4.1.1", - "body-parser": "latest" - } -} diff --git a/webapp/.dockerignore b/webapp/.dockerignore deleted file mode 100644 index 29d6828..0000000 --- a/webapp/.dockerignore +++ /dev/null @@ -1,3 +0,0 @@ -node_modules -npm-debug.log - diff --git a/webapp/Dockerfile b/webapp/Dockerfile deleted file mode 100644 index 1891ac1..0000000 --- a/webapp/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# Start image -FROM node:11 - -# Create app directory -WORKDIR /usr/src/app - -# Install app dependencies -# A wildcard is used to ensure both package.json AND package-lock.json are copied -# where available (npm@5+) -COPY package*.json ./ - -RUN npm install - -# Bundle app source -COPY . . \ No newline at end of file diff --git a/webapp/minitwit.js b/webapp/minitwit.js deleted file mode 100644 index d95e44b..0000000 --- a/webapp/minitwit.js +++ /dev/null @@ -1,255 +0,0 @@ -const db = require('../app/persistence/sqlite'); - -// Express web framework https://expressjs.com/ -const express = require('express'); -const app = express(); - -// Sessions https://github.com/expressjs/session#readme -var cookieParser = require('cookie-parser'); -var session = require('express-session'); - -// Constants -const PER_PAGE = 20; -const SECRET = 'shhhhhhhhhh'; - -// EJS template engine https://ejs.co/ -app.set('view engine', 'ejs'); -// Static files -app.use(express.static('static')); -// Form data -app.use(express.urlencoded()) -// Sessions -app.use(cookieParser()); -app.use(session({secret: SECRET})); - -//// Endpoints - -// Home (User feed or redirect to public timeline) -app.get('/', async function(req, res) { - if(!req.session.user_id) { - return res.redirect('/public') - } - let messages = await db.selectAll( - `SELECT message.*, user.* FROM message, user - WHERE message.author_id = user.user_id AND ( - user.user_id = ? OR - user.user_id IN ( - SELECT whom_id FROM follower - WHERE who_id = ?)) - ORDER BY message.pub_date DESC LIMIT ?`, - [req.session.user_id, req.session.user_id, PER_PAGE] - ); - res.render('pages/timeline', { - session_username: req.session.username, - session_user_id: req.session.user_id, - messages: messages, - myFeed: true - }); -}); - -// Public timeline page -app.get('/public', async function(req, res) { - let messages = await db.selectAll( - `select message.*, user.* from message, user - where message.author_id = user.user_id - order by message.pub_date desc limit ?`, - [PER_PAGE] - ); - res.render('pages/timeline', { - session_username: req.session.username, - session_user_id: req.session.user_id, - messages: messages - }); -}); - -// Add message handler -app.post('/add_message', async function(req, res) { - const user_id = req.session.user_id; - const text = req.body.text; - if(!user_id) { - return res.status(401).send(); - } else { - await db.insertOne( - 'INSERT INTO message(author_id, text, pub_date) VALUES(?, ?, ?)', - [user_id, text, Date.now()]) - let messages = await db.selectAll( - `SELECT message.*, user.* FROM message, user - WHERE message.author_id = user.user_id AND ( - user.user_id = ? OR - user.user_id IN ( - SELECT whom_id FROM follower - WHERE who_id = ?)) - ORDER BY message.pub_date DESC LIMIT ?`, - [req.session.user_id, req.session.user_id, PER_PAGE] - ); - return res.render('pages/timeline', { - flashes: ['Your message was recorded'], - session_user_id: req.session.user_id, - session_username: req.session.username, - messages: messages, - myFeed: true - }); - } -}); - -// Register page -app.get('/register', function(req, res) { - res.render('pages/register', { - username: '', - email: '', - }); -}); - -// Register handler -app.post('/register', async function(req, res) { - const username = req.body.username; - const email = req.body.email; - const password = req.body.password; - const password2 = req.body.password2; - let error; - if(!username) { - error = 'You have to enter a username'; - } else if (!email || !email.includes('@')) { - error = 'You have to enter a valid email address'; - } else if (!password) { - error = 'You have to enter a password'; - } else if (password !== password2) { - error = 'The two passwords do not match'; - } else if (await db.selectOne('SELECT 1 FROM user WHERE username = ?',[username])) { - error = 'The username is already taken'; - } else { - await db.insertOne( - 'INSERT INTO user(username, email, pw_hash) VALUES(?, ?, ?)', - [username, email, password.lameHash()]); - return res.render('pages/login', { - username: username, - flashes: ['You were successfully registered and can login now'] - }); - - } - res.render('pages/register', { - username: username, - email: email, - error: error - }); -}); - -// Login page -app.get('/login', function(req, res) { - res.render('pages/login', { - username: '', - }); -}); - -// Login handler -app.post('/login', async function(req, res) { - const username = req.body.username; - const password = req.body.password; - let error; - if(!username) { - error = 'You have to enter a username'; - } else if (!password) { - error = 'You have to enter a password'; - } else { - const user = await db.selectOne('SELECT * FROM user WHERE username = ?',[username]) - if(!user) { - error = 'Invalid username'; - } else if (user.pw_hash !== password.lameHash()) { - error = 'Invalid password'; - } else { - req.session.user_id = user.user_id; - req.session.username = username; - let messages = await db.selectAll( - `SELECT message.*, user.* FROM message, user - WHERE message.author_id = user.user_id AND ( - user.user_id = ? OR - user.user_id IN ( - SELECT whom_id FROM follower - WHERE who_id = ?)) - ORDER BY message.pub_date DESC LIMIT ?`, - [req.session.user_id, req.session.user_id, PER_PAGE] - ); - return res.render('pages/timeline', { - flashes: ['You were logged in'], - session_user_id: req.session.user_id, - session_username: req.session.username, - messages - }); - } - } - res.render('pages/login', { - username: username, - error: error - }); -}); - -// Logout -app.get('/logout', function(req, res) { - req.session.user_id = null; - req.session.username = null; - res.render('pages/timeline', { - flashes: ['You were logged out'] - }); -}); - -// User timeline page -app.get('/:username', async function(req, res) { - const { username } = req.params; - let profile_user = await db.selectOne( - 'SELECT * FROM user WHERE username = ?', - [username]); - if(!profile_user) { - return res.status(404).send(); - } - - let followed; - if(req.session.user_id) { - followed = await db.selectOne( - 'SELECT 1 FROM follower WHERE follower.who_id = ? and follower.whom_id = ?', - [req.session.user_id, profile_user.user_id]); - } - - let messages = await db.selectAll( - `SELECT message.*, user.* FROM message, user WHERE - user.user_id = message.author_id AND user.user_id = ? - ORDER BY message.pub_date DESC LIMIT ?`, - [profile_user.user_id, PER_PAGE] - ); - - res.render('pages/timeline', { - session_username: req.session.username, - session_user_id: req.session.user_id, - profile_username: profile_user.username, - profile_user_id: profile_user.user_id, - followed: !!followed, - messages: messages - }); -}); - -app.get('/:username/follow', async function(req, res) { - const { username } = req.params; - if (!req.session.user_id) - res.status(401).send(); - let whom = await db.selectOne('SELECT * FROM user WHERE username = ?',[username]); - if (!whom) - res.status(404).send(); - await db.insertOne('INSERT INTO follower (who_id, whom_id) VALUES (?, ?)', [req.session.user_id, whom.user_id]) - - return res.redirect('/' + username); -}); - -app.get('/:username/unfollow', async function(req, res) { - const { username } = req.params; - if (!req.session.user_id) - res.status(401).send(); - let whom = await db.selectOne('SELECT * FROM user WHERE username = ?',[username]); - if (!whom) - res.status(404).send(); - await db.deleteRows('DELETE FROM follower WHERE who_id = ? AND whom_id = ?', [req.session.user_id, whom.user_id]); - - return res.redirect('/' + username); -}); - -// Start application -app.listen(8080); -console.log('MiniTwit is running on port 8080..'); diff --git a/webapp/package.json b/webapp/package.json deleted file mode 100644 index 61bbabf..0000000 --- a/webapp/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "minitwit", - "version": "0.0.1", - "description": "Minitwit.py refactor in Nodejs/Express", - "main": "minitwit.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "", - "license": "ISC", - "dependencies": { - "cookie-parser": "^1.4.4", - "ejs": "^3.0.1", - "express": "^4.17.1", - "express-session": "^1.17.0", - "sqlite3": "^4.1.1", - "body-parser": "latest" - } -} diff --git a/webapp/static/avatar.png b/webapp/static/avatar.png deleted file mode 100644 index 0174d880b19886299384386957deb2efc658ea1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5905 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 diff --git a/webapp/static/style.css b/webapp/static/style.css deleted file mode 100755 index 25587c4..0000000 --- a/webapp/static/style.css +++ /dev/null @@ -1,183 +0,0 @@ -body { - background: #CAECE9; - font-family: 'Trebuchet MS', sans-serif; - font-size: 14px; -} - -a { - color: #26776F; -} - -a:hover { - color: #333; -} - -input[type="text"], -input[type="password"] { - background: white; - border: 1px solid #BFE6E2; - padding: 2px; - font-family: 'Trebuchet MS', sans-serif; - font-size: 14px; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - color: #105751; -} - -input[type="submit"] { - background: #105751; - border: 1px solid #073B36; - padding: 1px 3px; - font-family: 'Trebuchet MS', sans-serif; - font-size: 14px; - font-weight: bold; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - color: white; -} - -div.page { - background: white; - border: 1px solid #6ECCC4; - width: 700px; - margin: 30px auto; -} - -div.page h1 { - background: #6ECCC4; - margin: 0; - padding: 10px 14px; - color: white; - letter-spacing: 1px; - text-shadow: 0 0 3px #24776F; - font-weight: normal; -} - -div.page div.navigation { - background: #DEE9E8; - padding: 4px 10px; - border-top: 1px solid #ccc; - border-bottom: 1px solid #eee; - color: #888; - font-size: 12px; - letter-spacing: 0.5px; -} - -div.page div.navigation a { - color: #444; - font-weight: bold; -} - -div.page h2 { - margin: 0 0 15px 0; - color: #105751; - text-shadow: 0 1px 2px #ccc; -} - -div.page div.body { - padding: 10px; -} - -div.page div.footer { - background: #eee; - color: #888; - padding: 5px 10px; - font-size: 12px; -} - -div.page div.followstatus { - border: 1px solid #ccc; - background: #E3EBEA; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - padding: 3px; - font-size: 13px; -} - -div.page ul.messages { - list-style: none; - margin: 0; - padding: 0; -} - -div.page ul.messages li { - margin: 10px 0; - padding: 5px; - background: #F0FAF9; - border: 1px solid #DBF3F1; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - min-height: 48px; -} - -div.page ul.messages p { - margin: 0; -} - -div.page ul.messages li img { - float: left; - padding: 0 10px 0 0; -} - -div.page ul.messages li small { - font-size: 0.9em; - color: #888; -} - -div.page div.twitbox { - margin: 10px 0; - padding: 5px; - background: #F0FAF9; - border: 1px solid #94E2DA; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -div.page div.twitbox h3 { - margin: 0; - font-size: 1em; - color: #2C7E76; -} - -div.page div.twitbox p { - margin: 0; -} - -div.page div.twitbox input[type="text"] { - width: 585px; -} - -div.page div.twitbox input[type="submit"] { - width: 70px; - margin-left: 5px; -} - -ul.flashes { - list-style: none; - margin: 10px 10px 0 10px; - padding: 0; -} - -ul.flashes li { - background: #B9F3ED; - border: 1px solid #81CEC6; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - padding: 4px; - font-size: 13px; -} - -div.error { - margin: 10px 0; - background: #FAE4E4; - border: 1px solid #DD6F6F; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - padding: 4px; - font-size: 13px; -} - -.avatar{ - height: 3rem; - width: 3rem; -} diff --git a/webapp/views/pages/login.ejs b/webapp/views/pages/login.ejs deleted file mode 100644 index fd182e8..0000000 --- a/webapp/views/pages/login.ejs +++ /dev/null @@ -1,15 +0,0 @@ -<%- include('../partials/header.ejs'); %> -

Sign In

-<% if (locals.error) { %> -
Error: <%= error %>
-<% } %> -
-
-
Username: -
-
Password: -
-
-
-
-<%- include('../partials/footer.ejs'); %> diff --git a/webapp/views/pages/register.ejs b/webapp/views/pages/register.ejs deleted file mode 100644 index 126941f..0000000 --- a/webapp/views/pages/register.ejs +++ /dev/null @@ -1,20 +0,0 @@ -<%- include('../partials/header.ejs'); %> -

Sign Up

-<% if (locals.error) { %> -
Error: <%= error %>
-<% } %> - -
-
-
Username: -
-
E-Mail: -
-
Password: -
-
Password (repeat): -
-
-
-
-<%- include('../partials/footer.ejs'); %> \ No newline at end of file diff --git a/webapp/views/pages/timeline.ejs b/webapp/views/pages/timeline.ejs deleted file mode 100644 index f282571..0000000 --- a/webapp/views/pages/timeline.ejs +++ /dev/null @@ -1,58 +0,0 @@ -<%- include('../partials/header.ejs'); %> -<% if (locals.profile_user_id) { %> - <% if (locals.session_user_id) { %> - <% if (session_user_id == profile_user_id) { %> -

My timeline

- <% } else { %> -

<%= profile_username %>'s timeline

- <% } %> - <% } %> -<% } else { %> - <% if (locals.myFeed) { %> -

My feed

- <% } else { %> -

Public timeline

- <% } %> -<% } %> - -<% if (locals.session_user_id) { %> - <% if (locals.profile_user_id) { %> -
- <% if (session_user_id == profile_user_id) { %> - This is you! - <% } else if (followed) { %> - You are currently following this user. - Unfollow user - <% } else { %> - You are not yet following this user. - - <% } %> - <% } else { %> -
-

What's on your mind <%= session_username %>?

-
-

-

-
- <% } %> -<% } %> -
    - <% if (locals.messages) { %> - <% messages.forEach( msg => { %> -
  • - -

    - <%= msg.username %> - <%= msg.text %> - — <%= msg.pub_date %> -

    -
    • - <% }) %> - <% } else { %> -
  • There's no message so far.
    • - <% } %> -
- - -<%- include('../partials/footer.ejs'); %> \ No newline at end of file diff --git a/webapp/views/partials/footer.ejs b/webapp/views/partials/footer.ejs deleted file mode 100644 index 0b4316a..0000000 --- a/webapp/views/partials/footer.ejs +++ /dev/null @@ -1,5 +0,0 @@ -
-
- MiniTwit — A NodeJS/Express/EJS Application -
- \ No newline at end of file diff --git a/webapp/views/partials/header.ejs b/webapp/views/partials/header.ejs deleted file mode 100644 index cc9c5c0..0000000 --- a/webapp/views/partials/header.ejs +++ /dev/null @@ -1,44 +0,0 @@ - - - - - <% if (locals.profile_user_id) { %> - <% if (locals.session_user_id) { %> - <% if (session_user_id == profile_user_id) { %> - My timeline | MiniTwit - <% } else { %> - <%= profile_username %>'s timeline | MiniTwit - <% } %> - <% } %> - <% } else { %> - <% if (locals.myFeed) { %> - My feed | MiniTwit - <% } else { %> - Public timeline | MiniTwit - <% } %> - - <% } %> - - - -
-

MiniTwit

 -
- <% if (locals.session_username) { %> - my timeline | - public timeline | - sign out [<%= session_username %>] - <% } else { %> - public timeline | - sign up | - sign in - <% } %> -
- <% if (locals.flashes) { %> -
    - <% flashes.forEach( flash => { %> -
  • <%= flash %>
    • - <% }) %> -
- <% } %> -
\ No newline at end of file