From 2dd130f7a299de3370ff9c5ec0d2f644bf743363 Mon Sep 17 00:00:00 2001
From: kharisisriyant <kharisisriyant@gmail.com>
Date: Tue, 29 Nov 2016 20:26:30 +0700
Subject: [PATCH] benerin error angular
---
IdentService/build/web/WEB-INF/sun-web.xml | 11 ---
IdentService/build/web/gfv3ee6.dpf | 0
IdentService/dist/IdentService.war | Bin 892742 -> 892806 bytes
KAA-JSP/build/web/catalog.jsp | 26 ++++---
KAA-JSP/build/web/scripts/app.js | 70 ++++++++++++++----
KAA-JSP/dist/KAA-JSP.war | Bin 2190250 -> 2191905 bytes
KAA-JSP/web/catalog.jsp | 26 ++++---
KAA-JSP/web/scripts/app.js | 70 ++++++++++++++----
.../dist/MarketPlaceService.war | Bin 56098 -> 56098 bytes
firebase-messaging-sw.js | 24 ++++++
10 files changed, 166 insertions(+), 61 deletions(-)
delete mode 100644 IdentService/build/web/WEB-INF/sun-web.xml
delete mode 100644 IdentService/build/web/gfv3ee6.dpf
create mode 100644 firebase-messaging-sw.js
diff --git a/IdentService/build/web/WEB-INF/sun-web.xml b/IdentService/build/web/WEB-INF/sun-web.xml
deleted file mode 100644
index 1ac7af4..0000000
--- a/IdentService/build/web/WEB-INF/sun-web.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD GlassFish Application Server 3.0 Servlet 3.0//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_3_0-0.dtd">
-<sun-web-app error-url="">
- <class-loader delegate="true"/>
- <jsp-config>
- <property name="keepgenerated" value="true">
- <description>Keep a copy of the generated servlet class' java code.</description>
- </property>
- </jsp-config>
-</sun-web-app>
-
diff --git a/IdentService/build/web/gfv3ee6.dpf b/IdentService/build/web/gfv3ee6.dpf
deleted file mode 100644
index e69de29..0000000
diff --git a/IdentService/dist/IdentService.war b/IdentService/dist/IdentService.war
index 4414210f46b62a5a0861ed9887d3759bb181eba7..3f8440ad6c59a4b6ef74873792a554fe693495c8 100644
GIT binary patch
delta 3403
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
delta 3362
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
J%6gr9UjwdT*Yp4Y
diff --git a/KAA-JSP/build/web/catalog.jsp b/KAA-JSP/build/web/catalog.jsp
index d745aaf..30b8876 100644
--- a/KAA-JSP/build/web/catalog.jsp
+++ b/KAA-JSP/build/web/catalog.jsp
@@ -24,10 +24,10 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Sale Project - Catalog</title>
<link href="css/style.css" rel="stylesheet" type="text/css">
- <!--Angular -->
- <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.8/angular.min.js"></script>
<!-- Firebase -->
<script src="https://www.gstatic.com/firebasejs/3.6.1/firebase.js"></script>
+ <!--Angular -->
+ <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.8/angular.min.js"></script>
<!--<script src="https://cdn.firebase.com/js/client/2.0.4/firebase.js"></script>-->
<!--<script src="https://www.gstatic.com/firebasejs/3.6.1/firebase-app.js"></script>
<script src="https://www.gstatic.com/firebasejs/3.6.1/firebase-auth.js"></script>
@@ -35,7 +35,7 @@
<script src="https://www.gstatic.com/firebasejs/3.6.1/firebase-messaging.js"></script>
<!-- <script src="https://www.gstatic.com/firebasejs/3.6.1/firebase-storage.js"></script> -->
<!-- AngularFire -->
- <!--<script src="https://cdn.firebase.com/libs/angularfire/0.9.2/angularfire.min.js"></script>-->
+<!-- <script src="https://cdn.firebase.com/libs/angularfire/0.9.2/angularfire.min.js"></script>-->
<script>
// Initialize Firebase
@@ -47,7 +47,7 @@
storageBucket: "kaa-saleproject.appspot.com",
messagingSenderId: "815161898662"
};*/
- var config = {
+/* var config = {
apiKey: "AIzaSyAQ2WIB6GWOxmtwMdGd8eHawL4PWxK8evU",
authDomain: "tugas-besar-wbd.firebaseapp.com",
databaseURL: "https://tugas-besar-wbd.firebaseio.com",
@@ -69,7 +69,9 @@
})
.catch(function(err) {
console.log('Unable to get permission to notify.', err);
- });
+ });*/
+
+
/*messaging.requestPermission().then(function(){
console.log('Notification permission granted');
messaging.getToken().then(function(){
@@ -109,11 +111,11 @@
</script>
<!--Application -->
- <!--<script src="scripts/app.js"></script>-->
+ <script src="scripts/app.js"></script>
</head>
- <body>
+ <body ng-app="chatApp" ng-controller="chatController">
<div class="catalog_content">
<div class="logo">
<span id="red">Sale</span><span id="blue">Project</span>
@@ -309,8 +311,8 @@
out.print("<p>No product to be sold.</p>");
} else {
for (int i = 0; i < result.size(); i++) {
- out.print("<div ng-click=\"setReceiver(\""+result.get(i).getUsername()+"\"<p><b>" + result.get(i).getUsername() + "</b></div><br/>");
- out.print("added this on " + result.get(i).getDate().getDate() + "</p>");
+ out.print("<div ng-click=\"setReceiver(\""+result.get(i).getUsername()+"\")\"><p><b>" + result.get(i).getUsername() + "</b><br/>");
+ out.print("added this on " + result.get(i).getDate().getDate() + "</p></div>");
out.print("<hr/>");
out.print("<table>");
out.print("<tr class = \"container\">");
@@ -361,7 +363,7 @@
out.print("<p>Nothing matches your search.</p>");
} else {
for (int i = 0; i < result.size(); i++) {
- out.print("<div ng-click=\""+result.get(i).getUsername()+"\"><p><b>" + result.get(i).getUsername() + "</b></div><br/>");
+ out.print("<div ng-click=\"setReceiver(\""+result.get(i).getUsername()+"\")\"><p><b>" + result.get(i).getUsername() + "</b></div><br/>");
out.print("added this on " + result.get(i).getDate().getDate() + "</p>");
out.print("<hr/>");
out.print("<table>");
@@ -395,6 +397,10 @@
}
%>
+ <br>
+ {{user}}
+ {{receiver}}
+
<!-- <div ng-app="chatApp" ng-controller="chatController">
<p>Name: <input type="text" ng-model="newmessage.user"></p>
<p>Message: <input type="text" ng-model="newmessage.text"></p>
diff --git a/KAA-JSP/build/web/scripts/app.js b/KAA-JSP/build/web/scripts/app.js
index b7ffb79..d7578f0 100644
--- a/KAA-JSP/build/web/scripts/app.js
+++ b/KAA-JSP/build/web/scripts/app.js
@@ -5,17 +5,17 @@
*/
-var app = angular.module('chatApp', ['firebase']);
+var app = angular.module('chatApp', []);
-app.controller('chatController', ['$scope','Message', function($scope,Message,){
- $scope.user = "";
+app.controller('chatController', ['$scope','Message', function($scope,Message){
+ $scope.user = "testst";
$scope.receiver = "";
- $scope.messages= Message.all;
+ $scope.messages= "";
$scope.insert = function(message){
- Message.create(message);
+ //Message.create(message);
};
$scope.setUser = function(username){
@@ -29,13 +29,53 @@ app.controller('chatController', ['$scope','Message', function($scope,Message,){
$scope.isReceiverSet = function(){
return !(receiver === "");
};
+
+ var config = {
+ apiKey: "AIzaSyAQ2WIB6GWOxmtwMdGd8eHawL4PWxK8evU",
+ authDomain: "tugas-besar-wbd.firebaseapp.com",
+ databaseURL: "https://tugas-besar-wbd.firebaseio.com",
+ storageBucket: "tugas-besar-wbd.appspot.com",
+ messagingSenderId: "1049009619420"
+ };
+ firebase.initializeApp(config);
+
+ const messaging = firebase.messaging();
+ messaging.requestPermission()
+ .then(function() {
+ console.log('Notification permission granted.');
+ return messaging.getToken();
+ // TODO(developer): Retrieve an Instance ID token for use with FCM.
+ // ...
+ })
+ .then(function(token){
+ console.log(token);
+ })
+ .catch(function(err) {
+ console.log('Unable to get permission to notify.', err);
+ });
}]);
-app.factory('Message', ['$firebase', function($firebase) {
- var ref= new Firebase('https://kaa-saleproject.firebaseio.com');
+app.factory('Message', function() {
+ var messages = [{'name':'Pippo','text':'Hello'},
+ {'name':'Pluto','text':'Hello'},
+ {'name':'Pippo','text':'how are you ?'},
+ {'name':'Pluto','text':'fine thanks'},
+ {'name':'Pippo','text':'Bye'},
+ {'name':'Pluto','text':'Bye'}];
+
+ var Message= {
+ all:messages
+ };
+
+ return Message;
+
+});
+
+/*app.factory('Message', function() {
+// var ref= new Firebase('https://kaa-saleproject.firebaseio.com');
- var messages = $firebase(ref.child('messages')).$asArray();
+/* var messages = $firebase(ref.child('messages')).$asArray();
/* var messages = [{'name':'Pippo','text':'Hello'},
{'name':'Pluto','text':'Hello'},
{'name':'Pippo','text':'how are you ?'},
@@ -43,15 +83,15 @@ app.factory('Message', ['$firebase', function($firebase) {
{'name':'Pippo','text':'Bye'},
{'name':'Pluto','text':'Bye'}];*/
- var Message = {
+/* var Message = {
all : messages,
create: function(message){
- return messages.$add(message);
+// return messages.$add(message);
},
- get: function(messageId){
+/* get: function(messageId){
return $firebase(ref.child('messages').child(messageId)).$asObject();
- },
- delete: function(message){
+ },*/
+/* delete: function(message){
return messages.$remove(message);
}
};
@@ -59,6 +99,6 @@ app.factory('Message', ['$firebase', function($firebase) {
all: messages
};*/
- return Message;
+// return Message;
-}]);
+//});
diff --git a/KAA-JSP/dist/KAA-JSP.war b/KAA-JSP/dist/KAA-JSP.war
index 5bf48ddb056abf0ac4b3a627065137a7333f3e1f..7dde69db16939876c78a7f9ab52916a22b9eaa55 100644
GIT binary patch
delta 3009
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
delta 2456
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
F9|0kB2R#4)
diff --git a/KAA-JSP/web/catalog.jsp b/KAA-JSP/web/catalog.jsp
index d745aaf..30b8876 100644
--- a/KAA-JSP/web/catalog.jsp
+++ b/KAA-JSP/web/catalog.jsp
@@ -24,10 +24,10 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Sale Project - Catalog</title>
<link href="css/style.css" rel="stylesheet" type="text/css">
- <!--Angular -->
- <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.8/angular.min.js"></script>
<!-- Firebase -->
<script src="https://www.gstatic.com/firebasejs/3.6.1/firebase.js"></script>
+ <!--Angular -->
+ <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.8/angular.min.js"></script>
<!--<script src="https://cdn.firebase.com/js/client/2.0.4/firebase.js"></script>-->
<!--<script src="https://www.gstatic.com/firebasejs/3.6.1/firebase-app.js"></script>
<script src="https://www.gstatic.com/firebasejs/3.6.1/firebase-auth.js"></script>
@@ -35,7 +35,7 @@
<script src="https://www.gstatic.com/firebasejs/3.6.1/firebase-messaging.js"></script>
<!-- <script src="https://www.gstatic.com/firebasejs/3.6.1/firebase-storage.js"></script> -->
<!-- AngularFire -->
- <!--<script src="https://cdn.firebase.com/libs/angularfire/0.9.2/angularfire.min.js"></script>-->
+<!-- <script src="https://cdn.firebase.com/libs/angularfire/0.9.2/angularfire.min.js"></script>-->
<script>
// Initialize Firebase
@@ -47,7 +47,7 @@
storageBucket: "kaa-saleproject.appspot.com",
messagingSenderId: "815161898662"
};*/
- var config = {
+/* var config = {
apiKey: "AIzaSyAQ2WIB6GWOxmtwMdGd8eHawL4PWxK8evU",
authDomain: "tugas-besar-wbd.firebaseapp.com",
databaseURL: "https://tugas-besar-wbd.firebaseio.com",
@@ -69,7 +69,9 @@
})
.catch(function(err) {
console.log('Unable to get permission to notify.', err);
- });
+ });*/
+
+
/*messaging.requestPermission().then(function(){
console.log('Notification permission granted');
messaging.getToken().then(function(){
@@ -109,11 +111,11 @@
</script>
<!--Application -->
- <!--<script src="scripts/app.js"></script>-->
+ <script src="scripts/app.js"></script>
</head>
- <body>
+ <body ng-app="chatApp" ng-controller="chatController">
<div class="catalog_content">
<div class="logo">
<span id="red">Sale</span><span id="blue">Project</span>
@@ -309,8 +311,8 @@
out.print("<p>No product to be sold.</p>");
} else {
for (int i = 0; i < result.size(); i++) {
- out.print("<div ng-click=\"setReceiver(\""+result.get(i).getUsername()+"\"<p><b>" + result.get(i).getUsername() + "</b></div><br/>");
- out.print("added this on " + result.get(i).getDate().getDate() + "</p>");
+ out.print("<div ng-click=\"setReceiver(\""+result.get(i).getUsername()+"\")\"><p><b>" + result.get(i).getUsername() + "</b><br/>");
+ out.print("added this on " + result.get(i).getDate().getDate() + "</p></div>");
out.print("<hr/>");
out.print("<table>");
out.print("<tr class = \"container\">");
@@ -361,7 +363,7 @@
out.print("<p>Nothing matches your search.</p>");
} else {
for (int i = 0; i < result.size(); i++) {
- out.print("<div ng-click=\""+result.get(i).getUsername()+"\"><p><b>" + result.get(i).getUsername() + "</b></div><br/>");
+ out.print("<div ng-click=\"setReceiver(\""+result.get(i).getUsername()+"\")\"><p><b>" + result.get(i).getUsername() + "</b></div><br/>");
out.print("added this on " + result.get(i).getDate().getDate() + "</p>");
out.print("<hr/>");
out.print("<table>");
@@ -395,6 +397,10 @@
}
%>
+ <br>
+ {{user}}
+ {{receiver}}
+
<!-- <div ng-app="chatApp" ng-controller="chatController">
<p>Name: <input type="text" ng-model="newmessage.user"></p>
<p>Message: <input type="text" ng-model="newmessage.text"></p>
diff --git a/KAA-JSP/web/scripts/app.js b/KAA-JSP/web/scripts/app.js
index b7ffb79..d7578f0 100644
--- a/KAA-JSP/web/scripts/app.js
+++ b/KAA-JSP/web/scripts/app.js
@@ -5,17 +5,17 @@
*/
-var app = angular.module('chatApp', ['firebase']);
+var app = angular.module('chatApp', []);
-app.controller('chatController', ['$scope','Message', function($scope,Message,){
- $scope.user = "";
+app.controller('chatController', ['$scope','Message', function($scope,Message){
+ $scope.user = "testst";
$scope.receiver = "";
- $scope.messages= Message.all;
+ $scope.messages= "";
$scope.insert = function(message){
- Message.create(message);
+ //Message.create(message);
};
$scope.setUser = function(username){
@@ -29,13 +29,53 @@ app.controller('chatController', ['$scope','Message', function($scope,Message,){
$scope.isReceiverSet = function(){
return !(receiver === "");
};
+
+ var config = {
+ apiKey: "AIzaSyAQ2WIB6GWOxmtwMdGd8eHawL4PWxK8evU",
+ authDomain: "tugas-besar-wbd.firebaseapp.com",
+ databaseURL: "https://tugas-besar-wbd.firebaseio.com",
+ storageBucket: "tugas-besar-wbd.appspot.com",
+ messagingSenderId: "1049009619420"
+ };
+ firebase.initializeApp(config);
+
+ const messaging = firebase.messaging();
+ messaging.requestPermission()
+ .then(function() {
+ console.log('Notification permission granted.');
+ return messaging.getToken();
+ // TODO(developer): Retrieve an Instance ID token for use with FCM.
+ // ...
+ })
+ .then(function(token){
+ console.log(token);
+ })
+ .catch(function(err) {
+ console.log('Unable to get permission to notify.', err);
+ });
}]);
-app.factory('Message', ['$firebase', function($firebase) {
- var ref= new Firebase('https://kaa-saleproject.firebaseio.com');
+app.factory('Message', function() {
+ var messages = [{'name':'Pippo','text':'Hello'},
+ {'name':'Pluto','text':'Hello'},
+ {'name':'Pippo','text':'how are you ?'},
+ {'name':'Pluto','text':'fine thanks'},
+ {'name':'Pippo','text':'Bye'},
+ {'name':'Pluto','text':'Bye'}];
+
+ var Message= {
+ all:messages
+ };
+
+ return Message;
+
+});
+
+/*app.factory('Message', function() {
+// var ref= new Firebase('https://kaa-saleproject.firebaseio.com');
- var messages = $firebase(ref.child('messages')).$asArray();
+/* var messages = $firebase(ref.child('messages')).$asArray();
/* var messages = [{'name':'Pippo','text':'Hello'},
{'name':'Pluto','text':'Hello'},
{'name':'Pippo','text':'how are you ?'},
@@ -43,15 +83,15 @@ app.factory('Message', ['$firebase', function($firebase) {
{'name':'Pippo','text':'Bye'},
{'name':'Pluto','text':'Bye'}];*/
- var Message = {
+/* var Message = {
all : messages,
create: function(message){
- return messages.$add(message);
+// return messages.$add(message);
},
- get: function(messageId){
+/* get: function(messageId){
return $firebase(ref.child('messages').child(messageId)).$asObject();
- },
- delete: function(message){
+ },*/
+/* delete: function(message){
return messages.$remove(message);
}
};
@@ -59,6 +99,6 @@ app.factory('Message', ['$firebase', function($firebase) {
all: messages
};*/
- return Message;
+// return Message;
-}]);
+//});
diff --git a/MarketPlaceService/dist/MarketPlaceService.war b/MarketPlaceService/dist/MarketPlaceService.war
index a940acf314d11c2ee3e7acabaa28be64ead1ddce..560c3e09f19e3da13fe2a674090f0d3e28f1f875 100644
GIT binary patch
delta 303
zcmZ3qjd{^FW}X0VW)?061`Y-Wm1z@sG?|pAO*EeYA}^|d$nQEpa<VF;0f-7`Gyze)
zjP4-n8lyjmQfJZtQkw&r&a;AOC5}TzAo`h=6*HJ`SHlLP7r4yk2GO<wz8oOBC!&-E
zL^H?k76Z`-ioeBx=p7ffGlJ;COV1dYRHjXiykZIDPM&hb0YqK90(Jq<RT~h`>nd2V
z=c)^ccj;<4h|<0m52AXmS%9cx*NQ-t)%9`^wfTAph|;`~1EQwi$OTbsH%mcO?ag!$
X_3UOIhzh&q3!;|ZvIbF)ZaDw|*jsT4
delta 303
zcmZ3qjd{^FW}X0VW)?061`Y-W@7RevnoM4?6U}FU$cri<^1BX@oUF=d0HVSfO+ZvH
zqdSPY#^?{C)R{DZ)aF2@^Q<6RiQ|wFh<;{e#SG@#)v$r+1unC>L9}gvF9(S3i6~_O
z(af>C#X$6d;%_k^ddG$Bj3B!3(lbUT@7T$aS1f_t$y2U4fT(L%z%JmqY6IeVT?GsF
zTy+8QE?o@=QQFtyK~&E*3lMeeS`mn{x?T>VHeW9RQJOb$K-Babxgd(|W+{lOy_pW8
Wp54p?QDL`yLDbS))*$N9Ee8NahHg0k
diff --git a/firebase-messaging-sw.js b/firebase-messaging-sw.js
new file mode 100644
index 0000000..a4ffdcf
--- /dev/null
+++ b/firebase-messaging-sw.js
@@ -0,0 +1,24 @@
+// Give the service worker access to Firebase Messaging.
+// Note that you can only use Firebase Messaging here, other Firebase libraries
+// are not available in the service worker.
+importScripts('https://www.gstatic.com/firebasejs/3.5.2/firebase-app.js');
+importScripts('https://www.gstatic.com/firebasejs/3.5.2/firebase-messaging.js');
+
+var config = {
+ apiKey: "AIzaSyAQ2WIB6GWOxmtwMdGd8eHawL4PWxK8evU",
+ authDomain: "tugas-besar-wbd.firebaseapp.com",
+ databaseURL: "https://tugas-besar-wbd.firebaseio.com",
+ storageBucket: "tugas-besar-wbd.appspot.com",
+ messagingSenderId: "1049009619420"
+};
+firebase.initializeApp(config);
+
+// Initialize the Firebase app in the service worker by passing in the
+// messagingSenderId.
+//firebase.initializeApp({
+ // 'messagingSenderId': 'YOUR-SENDER-ID'
+//});
+
+// Retrieve an instance of Firebase Messaging so that it can handle background
+// messages.
+const messaging = firebase.messaging();
\ No newline at end of file
--
GitLab