From 5551f6cde855375e27c46c605afbba3ea10c1d4e Mon Sep 17 00:00:00 2001
From: Albertdj <albertusdjauharidjohan@gmail.com>
Date: Thu, 8 Feb 2018 17:44:54 +0700
Subject: [PATCH] add search and fix bugs
---
.../frontend/layout/messaging_index_index.xml | 2 --
.../frontend/layout/messaging_room_index.xml | 2 --
.../view/frontend/templates/messaging.phtml | 18 +++++++++++-------
.../view/frontend/templates/room.phtml | 2 +-
.../Messaging/view/frontend/web/js/chat.js | 5 -----
.../Messaging/view/frontend/web/js/firebase.js | 9 ---------
6 files changed, 12 insertions(+), 26 deletions(-)
delete mode 100644 app/code/Magento/Messaging/view/frontend/web/js/chat.js
delete mode 100644 app/code/Magento/Messaging/view/frontend/web/js/firebase.js
diff --git a/app/code/Magento/Messaging/view/frontend/layout/messaging_index_index.xml b/app/code/Magento/Messaging/view/frontend/layout/messaging_index_index.xml
index 09125c78958..d778b1473a8 100644
--- a/app/code/Magento/Messaging/view/frontend/layout/messaging_index_index.xml
+++ b/app/code/Magento/Messaging/view/frontend/layout/messaging_index_index.xml
@@ -2,9 +2,7 @@
<head>
<title>Messaging</title>
<css src="Magento_Messaging::css/chat.css" />
- <script src="Magento_Messaging::js/chat.js" />
<script src="Magento_Messaging::js/firebaselib.js" />
- <script src="Magento_Messaging::js/firebase.js" />
</head>
<body>
<referenceContainer name="content">
diff --git a/app/code/Magento/Messaging/view/frontend/layout/messaging_room_index.xml b/app/code/Magento/Messaging/view/frontend/layout/messaging_room_index.xml
index 5e80f411234..b118a86438f 100644
--- a/app/code/Magento/Messaging/view/frontend/layout/messaging_room_index.xml
+++ b/app/code/Magento/Messaging/view/frontend/layout/messaging_room_index.xml
@@ -2,9 +2,7 @@
<head>
<title>Messaging</title>
<css src="Magento_Messaging::css/chat.css" />
- <script src="Magento_Messaging::js/chat.js" />
<script src="Magento_Messaging::js/firebaselib.js" />
- <script src="Magento_Messaging::js/firebase.js" />
</head>
<body>
<referenceContainer name="content">
diff --git a/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml b/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml
index 14f77c9f09d..72d1c895c6f 100644
--- a/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml
+++ b/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml
@@ -13,9 +13,9 @@
<span class="name">Chats</span>
</div>
<div class = "chat-search">
- <form >
- <input type="text" name="chattext" placeholder="Search name" class="search-name">
- <input type="submit" name="search" value="Cari" class="search-button">
+ <form action='' name='searchForm' id="searchForm" method="GET">
+ <input type="text" name="email" id="email" placeholder="Search name" class="search-name">
+ <input type="submit" class="search-button">
</form>
</div>
<div id="chatlist" class="chat-list">
@@ -31,7 +31,7 @@
myFirebase.on("child_added", function(snapshot) {
var chatrooms = snapshot.val();
- if ((chatrooms.sender==<?= $email ?>)||(chatrooms.receiver==<?= $email ?>)){
+ if ((chatrooms.sender=="<?= $email ?>")||(chatrooms.receiver=="<?= $email ?>")){
var chatlist = document.getElementById("chatlist");
//Kalo usernamenya sama, hapus yang sebelumnya
for (i = 0; i < chatlist.childElementCount; i++) {
@@ -51,12 +51,12 @@
chatroom_lastmessage.classList.add('chatroom-lastmessage');
var chatroom_username_span = document.createElement("span");
- if (chatrooms.sender==<?= $email ?>) {
+ if (chatrooms.sender=="<?= $email ?>") {
chatroom_username_span.textContent = chatrooms.receiver;
- chatroom_item.href = "/messaging/room/?email=" + chatrooms.receiver;
+ chatroom_item.href = "../room/?email=" + chatrooms.receiver;
} else {
chatroom_username_span.textContent = chatrooms.sender;
- chatroom_item.href = "/messaging/room/?email=" + chatrooms.sender;
+ chatroom_item.href = "../room/?email=" + chatrooms.sender;
}
chatroom_username.appendChild(chatroom_username_span);
@@ -73,6 +73,10 @@
});
});
+ $('#searchForm').submit(function() {
+ var email = $('#email').val();
+ $(this).attr('action', "../room/?email=" + email);
+ });
});
</script>
\ No newline at end of file
diff --git a/app/code/Magento/Messaging/view/frontend/templates/room.phtml b/app/code/Magento/Messaging/view/frontend/templates/room.phtml
index e0088236c42..b1bea2f4b42 100644
--- a/app/code/Magento/Messaging/view/frontend/templates/room.phtml
+++ b/app/code/Magento/Messaging/view/frontend/templates/room.phtml
@@ -11,7 +11,7 @@
<div class="box">
<div class = "chat-title">
<span class="name">
- <?= $email ?>
+ <?= $_GET['email'] ?>
</span>
</div>
<div class="chat-form" >
diff --git a/app/code/Magento/Messaging/view/frontend/web/js/chat.js b/app/code/Magento/Messaging/view/frontend/web/js/chat.js
deleted file mode 100644
index c03fcb9e533..00000000000
--- a/app/code/Magento/Messaging/view/frontend/web/js/chat.js
+++ /dev/null
@@ -1,5 +0,0 @@
-require(['jquery'],function($){
- $(document).ready(function() {
- alert('hai');
- });
-});
\ No newline at end of file
diff --git a/app/code/Magento/Messaging/view/frontend/web/js/firebase.js b/app/code/Magento/Messaging/view/frontend/web/js/firebase.js
deleted file mode 100644
index de5fdc7445c..00000000000
--- a/app/code/Magento/Messaging/view/frontend/web/js/firebase.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const config = {
- projectId: "magentochat",
- apiKey: "AIzaSyAuWbHi2A1CljLjLdXxxI0sFY0jqPWxZHs",
- authDomain: "magentochat.firebaseapp.com",
- databaseURL: "https://magentochat.firebaseio.com/",
- storageBucket: ""
-};
-firebase.initializeApp(config);
-
--
GitLab