Skip to content

Commit

Permalink
v2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@callmeclover
callmeclover committed Aug 30, 2023
1 parent f0cc8c2 commit 7d3abe5
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 19 deletions.
1 change: 1 addition & 0 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Use the official Node.js image as the base image
FROM node:19

RUN []
# Set the working directory in the container
WORKDIR /app

Expand Down
9 changes: 5 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ Chat app.

<br>

#### v2.0.0-indev7 NOT TO BE RELEASED
#### v2.1.0

</div>

- [x] Organized routes.
- [x] Make part one of login/signup.
- [ ] Added the ability to make a grilled cheese.
- [x] Fixed Dockerfile and added compose.yaml for Michael's self host update (on arcs.kielby.com)
- [x] Removed profile picture options, and added generic one until fixed.
- [x] Many, many bug fixes.
- [ ] A pizza.

<br>

Expand Down
5 changes: 5 additions & 0 deletions compose.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
services:
web:
build: .
ports:
- "8080"
8 changes: 4 additions & 4 deletions index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,12 @@ io.on('connection', function (client) {
*/

client.emit('broad', "<div class='chmscon'><div id='msghead' style='margin-bottom: 5px;'>" +/* "" +/* "<img style='width: 48px; height: 48px; border-radius: 2em; margin-right: 3px;' src='" + data.user.pfp */ + "'><strong id='user'><a id='a' >" + data.user.disName + " (" + data.user.genName + "): </a></strong><span id='date' style='color: #000000 !important; font-weight: 300 !important; font-size: small;'>[at <span id='datea'></span>]</span id='date'></div><div class='chat-msg user'>" + striptags(md.render(striptags(data.text)), ['strong', 'i', 'em', 'code', 'a', 'div', 'sub', 'sup', 's']) + "</div></div>");
client.to(data.room).emit('broad', "<div class='chmscon'><div id='msghead' style='margin-bottom: 5px;'>" +/* "<img style='width: 48px; height: 48px; border-radius: 2em; margin-right: 3px;' src='" + data.user.pfp */ + "'><strong id='user'><a id='a' >" + data.user.disName + " (" + data.user.genName + "): </a></strong><span id='date' style='color: #000000 !important; font-weight: 300 !important; font-size: small;'>[at <span id='datea'></span>]</span id='date'></div><div class='chat-msg other'>" + striptags(md.render(striptags(data.text)), ['strong', 'i', 'em', 'code', 'a', 'div', 'sub', 'sup', 's']) + "</div></div>");
client.emit('broad', "<div class='chmscon'><div id='msghead' style='margin-bottom: 5px;'>" + "<img style='width: 48px; height: 48px; border-radius: 2em; margin-right: 3px;' src='/img/pfp.png'><strong id='user'><a id='a' >" + data.user.disName + " (" + data.user.genName + "): </a></strong><span id='date' style='color: #000000 !important; font-weight: 300 !important; font-size: small;'>[at <span id='datea'></span>]</span id='date'></div><div class='chat-msg user'>" + striptags(md.render(striptags(data.text)), ['strong', 'i', 'em', 'code', 'a', 'div', 'sub', 'sup', 's']) + "</div></div>");
client.to(data.room).emit('broad', "<div class='chmscon'><div id='msghead' style='margin-bottom: 5px;'>es<img style='width: 48px; height: 48px; border-radius: 2em; margin-right: 3px;' src=''/img/pfp.png'><strong id='user'><a id='a' >" + data.user.disName + " (" + data.user.genName + "): </a></strong><span id='date' style='color: #000000 !important; font-weight: 300 !important; font-size: small;'>[at <span id='datea'></span>]</span id='date'></div><div class='chat-msg other'>" + striptags(md.render(striptags(data.text)), ['strong', 'i', 'em', 'code', 'a', 'div', 'sub', 'sup', 's']) + "</div></div>");
client.to(data.room).emit('broadNotif', data);
} else /* if (data.type == 'image') */ {
client.emit('broad', "<div class='chmscon'><div id='msghead' style='margin-bottom: 5px;'>" +/* "<img style='width: 48px; height: 48px; border-radius: 2em; margin-right: 3px;' src='" + data.user.pfp */ + "'><strong id='user'><a id='a' >" + data.user.disName + " (" + data.user.genName + "): </a></strong><span id='date' style='color: #000000 !important; font-weight: 300 !important; font-size: small;'>[at <span id='datea'></span>]</span id='date'></div><div class='chat-msg user'>" + striptags(md.render(striptags(data.text)), ['strong', 'i', 'em', 'code', 'a', 'div', 'sub', 'sup', 's']) + "<br><span id='imga' style='display:none;'>" + data.file + "</span><img id='imgtbd' class='sentImage' src=''></div></div>");
client.to(data.room).emit('broad', "<div class='chmscon'><div id='msghead' style='margin-bottom: 5px;'>" +/* "<img style='width: 48px; height: 48px; border-radius: 2em; margin-right: 3px;' src='" + data.user.pfp */ + "'><strong id='user'><a id='a' >" + data.user.disName + " (" + data.user.genName + "): </a></strong><span id='date' style='color: #000000 !important; font-weight: 300 !important; font-size: small;'>[at <span id='datea'></span>]</span id='date'></div><div class='chat-msg other'>" + striptags(md.render(striptags(data.text)), ['strong', 'i', 'em', 'code', 'a', 'div', 'sub', 'sup', 's']) + "<br><span id='imga' style='display:none;'>" + data.file + "</span><img id='imgtbd' class='sentImage' src=''></div></div>");
client.emit('broad', "<div class='chmscon'><div id='msghead' style='margin-bottom: 5px;'>" + "<img style='width: 48px; height: 48px; border-radius: 2em; margin-right: 3px;' src='/img/pfp.png'>'<strong id='user'><a id='a' >" + data.user.disName + " (" + data.user.genName + "): </a></strong><span id='date' style='color: #000000 !important; font-weight: 300 !important; font-size: small;'>[at <span id='datea'></span>]</span id='date'></div><div class='chat-msg user'>" + striptags(md.render(striptags(data.text)), ['strong', 'i', 'em', 'code', 'a', 'div', 'sub', 'sup', 's']) + "<br><span id='imga' style='display:none;'>" + data.file + "</span><img id='imgtbd' class='sentImage' src=''></div></div>");
client.to(data.room).emit('broad', "<div class='chmscon'><div id='msghead' style='margin-bottom: 5px;'>" + "<img style='width: 48px; height: 48px; border-radius: 2em; margin-right: 3px;' src=''/img/pfp.png'>'<strong id='user'><a id='a' >" + data.user.disName + " (" + data.user.genName + "): </a></strong><span id='date' style='color: #000000 !important; font-weight: 300 !important; font-size: small;'>[at <span id='datea'></span>]</span id='date'></div><div class='chat-msg other'>" + striptags(md.render(striptags(data.text)), ['strong', 'i', 'em', 'code', 'a', 'div', 'sub', 'sup', 's']) + "<br><span id='imga' style='display:none;'>" + data.file + "</span><img id='imgtbd' class='sentImage' src=''></div></div>");
client.to(data.room).emit('broadNotif', data);
} /* else if (data.type == 'video') {
client.emit('broad', "<div class='chmscon'><div id='msghead' style='margin-bottom: 5px;'>" +/* "<img style='width: 48px; height: 48px; border-radius: 2em; margin-right: 3px;' src='" + data.user.pfp / + "'><strong id='user'><a id='a' >" + data.user.disName + " (" + data.user.genName + "): </a></strong><span id='date' style='color: #000000 !important; font-weight: 300 !important; font-size: small;'>[at <span id='datea'></span>]</span id='date'></div><div class='chat-msg user'>" + striptags(md.render(striptags(data.text)), ['strong', 'i', 'em', 'code', 'a', 'div', 'sub', 'sup', 's']) + "<br><span id='imga' style='display:none;'>" + data.file + "</span><video id='imgtbd' class='sentImage' src='" + data.file + "' controls autoplay></video></div></div>");
Expand Down
Binary file added public/img/pfp.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions views/index.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,12 @@
f.textContent = new Date().toLocaleString();
f.removeAttribute("id");
var g = document.getElementById("imga");
/* var g = document.getElementById("imga");
var h = document.getElementById("imgtbd");
var j = decompress(g.textContent);
h.src = j;
g.removeAttribute("id");
h.removeAttribute("id");
h.removeAttribute("id"); */
scrollToBottom(document.getElementById("future"));
});
Expand Down
18 changes: 9 additions & 9 deletions views/login/login.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<%- include('../partials/header.ejs'); -%>
<body>
<div id="top-block">
<form id="login" method="post" action="/" onsubmit="finishUP()"> <!--finishUP()-->
<form id="login" method="post" action="/" onsubmit="finishUP()">
<!--
<label>Enter A Username...</label>
<input type="text" id="genName">
Expand All @@ -13,9 +13,9 @@
<label>Create A Display Name...</label>
<input type="text" id="disName">
<br><br>
<label>Create A Profile Picture...</label>
<!-- <label>Create A Profile Picture...</label>
<input id="pfp" type="text">
<br><br>
<br><br>-->
<label>Create A Bio...</label>
<input id="bio" type="text">
<br><br>
Expand All @@ -39,14 +39,14 @@
}
}
var user = localStorage.getItem('user')
var user = localStorage.getItem('user');
var base = "";
function getBase64(file) {
var reader = new FileReader();
reader.readAsDataURL(file)
reader.readAsDataURL(file);
reader.onloadend = function() {
globalThis.base = reader.result.toString()
globalThis.base = reader.result.toString();
// document.write(globalThis.base)
};
reader.onerror = function (error) {
Expand All @@ -55,9 +55,9 @@ function getBase64(file) {
}
function finishUP() {
var url = '/profile?pfp=' + $('#pfp').val() + '&disName=' + $('#disName').val() + '&genName=' + localStorage.getItem('user') + '&bio=' + $('#bio').val()
var obj = new uModel({ pfp: $('#pfp').val(), disName: $('#disName').val(), genName: localStorage.getItem('user'), url: url})
localStorage.setItem('uObj', JSON.stringify(obj))
var url = '/profile?pfp=' + '/img/pfp.png' + '&disName=' + $('#disName').val() + '&genName=' + localStorage.getItem('user') + '&bio=' + $('#bio').val();
var obj = new uModel({ pfp: '/img/pfp.png', disName: $('#disName').val(), genName: localStorage.getItem('user'), url: url});
localStorage.setItem('uObj', JSON.stringify(obj));
}
</script>
Expand Down

0 comments on commit 7d3abe5

Please sign in to comment.