-
+
@@ -18,109 +21,90 @@
{% csrf_token %}
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
+
Smileys & People
- -
-
😄
-😅
-😁
-🤣
-😂
-😊
-😇
-😉
-🥰
-😭
-😍
-🤪
-🤔
-😏
-😒
-🙄
-😴
-🥳
-😎
-🙁
+Smileys & People
+ +
+
😄
+😅
+😁
+🤣
+😂
+😊
+😇
+😉
+🥰
+😭
+😍
+🤪
+🤔
+😏
+😒
+🙄
+😴
+🥳
+😎
+🙁
-
@@ -141,6 +125,7 @@
+
{% if latest_statuses_time_ago %}
{% for latest in latest_statuses_time_ago %}
Animals & Nature
- -
-
+
🌹
-🌷
-💐
-🌸
-🍀
-🥀
-🌼
-🌺
- -🦋
-🐌
-🐎
-🐆
-🦁
+Animals & Nature
+ +
+
🌹
+🌷
+💐
+🌸
+🍀
+🥀
+🌼
+🌺
+🦋
+🐌
+🐎
+🐆
+🦁
@@ -175,9 +160,10 @@
{%endif%}
-
{% if latest.status.reaction_set.all %}
-
+
@@ -203,9 +189,10 @@
+
+
+
+
+
+
diff --git a/osinaweb/osinaweb/__pycache__/__init__.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/__init__.cpython-311.pyc
index 2dbcad88..448f6420 100644
Binary files a/osinaweb/osinaweb/__pycache__/__init__.cpython-311.pyc and b/osinaweb/osinaweb/__pycache__/__init__.cpython-311.pyc differ
diff --git a/osinaweb/osinaweb/__pycache__/settings.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/settings.cpython-311.pyc
index a1fb5590..36923bc9 100644
Binary files a/osinaweb/osinaweb/__pycache__/settings.cpython-311.pyc and b/osinaweb/osinaweb/__pycache__/settings.cpython-311.pyc differ
diff --git a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc
index deb82863..62f1f336 100644
Binary files a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc and b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc differ
diff --git a/osinaweb/osinaweb/__pycache__/wsgi.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/wsgi.cpython-311.pyc
index dc94f70b..9d4c60f5 100644
Binary files a/osinaweb/osinaweb/__pycache__/wsgi.cpython-311.pyc and b/osinaweb/osinaweb/__pycache__/wsgi.cpython-311.pyc differ
diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css
index 3bfa6061..2e25cada 100644
--- a/osinaweb/static/dist/output.css
+++ b/osinaweb/static/dist/output.css
@@ -1104,10 +1104,6 @@ video {
width: 1.25rem;
}
-.w-\[100px\] {
- width: 100px;
-}
-
.w-\[120px\] {
width: 120px;
}
diff --git a/osinaweb/static/js/emoji-picker.js b/osinaweb/static/js/emoji-picker.js
index 9292019f..ef9b2ee7 100644
--- a/osinaweb/static/js/emoji-picker.js
+++ b/osinaweb/static/js/emoji-picker.js
@@ -1,21 +1,56 @@
-
document.addEventListener('DOMContentLoaded', function () {
// To open and close the emoji picker
- const emojiPicker = document.getElementById('emojiPicker');
+ const emojiPickers = document.querySelectorAll('.emojiPicker');
const closeEmojiPicker = document.getElementById('closeEmojiPicker');
const emojiPickerContainer = document.getElementById('emojiPickerContainer');
- let statusId;
+ let statusId;
- emojiPicker.addEventListener('click', function () {
- statusId = emojiPicker.dataset.statusId;
- emojiPickerContainer.classList.remove('hidden');
- console.log(statusId);
+ emojiPickers.forEach(emojiPicker => {
+ emojiPicker.addEventListener('click', function () {
+ statusId = emojiPicker.dataset.statusId;
+ emojiPickerContainer.classList.remove('hidden');
+ console.log(statusId);
+ });
});
closeEmojiPicker.addEventListener('click', function () {
emojiPickerContainer.classList.add('hidden');
});
-
+
+ // Handle emoji selection
+ const emojis = document.querySelectorAll('.emojisContainer p');
+ emojis.forEach(emoji => {
+ emoji.addEventListener('click', function () {
+ var emojiText = emoji.innerText;
+ var csrftoken = document.querySelector("[name=csrfmiddlewaretoken]").value;
+
+ if (statusId) {
+ fetch('/add_reaction/' + statusId + '/' + emojiText + '/', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-CSRFToken': csrftoken
+ },
+ body: JSON.stringify({ emoji: emojiText })
+ })
+ .then(response => {
+ if (!response.ok) {
+ throw new Error('Network response was not ok');
+ }
+ return response.json();
+ })
+ .then(data => {
+ location.reload();
+ })
+ .catch(error => {
+ console.error('Error:', error);
+ });
+ } else {
+ console.error('statusId is undefined');
+ }
+ });
+ });
+
// To navigate between categories
const categories = document.querySelectorAll('.emoji-category');
const categoryContainers = document.querySelectorAll('.emoji-category-container');
@@ -37,4 +72,3 @@ document.addEventListener('DOMContentLoaded', function () {
});
}
});
-
diff --git a/osinaweb/static/js/switch-status.js b/osinaweb/static/js/switch-status.js
index 9a7b810b..fd05b9e2 100644
--- a/osinaweb/static/js/switch-status.js
+++ b/osinaweb/static/js/switch-status.js
@@ -1,7 +1,7 @@
// TO SWITCH BETWEEN STATUSES FROM ONLINE TO OFFLINE
document.addEventListener('DOMContentLoaded', function () {
- document.getElementById('go-online-btn').addEventListener('click', function () {
+ document.getElementById('goOnlineButton').addEventListener('click', function () {
var xhr = new XMLHttpRequest();
xhr.open('GET', "{% url 'go_online' %}", true);
xhr.onload = function () {
{% for reaction in latest.status.reaction_set.all %}
-
{% endif %}
@@ -219,6 +206,11 @@
{{reaction.emoji}}
+{{reaction.emoji}}
{% endfor %}