fix bug on css and js

78e7617c · Dewita Sonya Tarabunga · cae74f27 · 78e7617c · 78e7617c · 78e7617c
Commit 78e7617c authored 7 years ago by Dewita Sonya Tarabunga
--- a/app/code/Magento/Messaging/Block/Messaging.php
+++ b/app/code/Magento/Messaging/Block/Messaging.php
@@ -3,8 +3,29 @@ namespace Magento\Messaging\Block;
 
 class Messaging extends \Magento\Framework\View\Element\Template
 {
-    public function getText()
-    {
+	/**
+	  * @var \Magento\Framework\App\ObjectManager
+	  */
+	public $om;
+
+	/**
+	  * @var \Magento\Customer\Model\Session
+	  */
+	public $session;
+
+    public function getText() {
        return 'Hello world!';
    }
+
+    public function getId() {
+    	if ($om === null || $session === null) {
+    		$om = \Magento\Framework\App\ObjectManager::getInstance();
+    		$session = $om->get('\Magento\Customer\Model\Session');
+    	}
+    	if ($session->isLoggedIn()) {
+    		return $session->getCustomer()->getId();
+    	} else {
+    		return -1;
+    	}
+    }
 }
\ No newline at end of file
--- a/app/code/Magento/Messaging/view/frontend/layout/messaging_index_index.xml
+++ b/app/code/Magento/Messaging/view/frontend/layout/messaging_index_index.xml
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" layout="1column">
 	<head>
 		<title>Messaging</title>
-		<css src="Messaging::css/chat.css" />
-		<script src="Messaging::js/chat.js" />
-		<script src="Messaging::js/angular.js" />
-		<script src="Messaging::js/jquery.js" />
+		<css src="Magento_Messaging::css/chat.css" />
+		<script src="Magento_Messaging::js/chat.js" />
+		<script src="Magento_Messaging::js/angular.js" />
+		<script src="Magento_Messaging::js/jquery.js" />
 	</head>
    <body ng-app="chatlistbox" ng-controller="controller">
        <referenceContainer name="content">

--- a/app/code/Magento/Messaging/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Messaging/view/frontend/requirejs-config.js
+var config = {
+   map: {
+       '*': {
+           messaging: 'Magento_Messaging/js/test',
+       }
+   }
+};
\ No newline at end of file
--- a/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml
+++ b/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml
@@ -17,4 +17,12 @@
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
+
+<script type="text/javascript">
+require(['jquery'],function($){
+    $(document).ready(function() {
+    	alert('hai');
+    });
+});
+</script>
\ No newline at end of file