Skip to content
Snippets Groups Projects
Commit 2dd130f7 authored by kharisisriyant's avatar kharisisriyant
Browse files

benerin error angular

parent 35ac4ee0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 166 additions and 61 deletions
IdentService/build/web/WEB-INF/sun-web.xml deleted 100644 → 0
+ 0
− 11
View file @ 35ac4ee0
<?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>
IdentService/build/web/gfv3ee6.dpf deleted 100644 → 0
+ 0
− 0
View file @ 35ac4ee0
IdentService/dist/IdentService.war
+ 0
− 0
View file @ 2dd130f7
No preview for this file type
KAA-JSP/build/web/catalog.jsp
+ 16
− 10
View file @ 2dd130f7
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Sale Project - Catalog</title> <title>Sale Project - Catalog</title>
<link href="css/style.css" rel="stylesheet" type="text/css"> <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 --> <!-- Firebase -->
<script src="https://www.gstatic.com/firebasejs/3.6.1/firebase.js"></script> <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://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-app.js"></script>
<script src="https://www.gstatic.com/firebasejs/3.6.1/firebase-auth.js"></script> <script src="https://www.gstatic.com/firebasejs/3.6.1/firebase-auth.js"></script>
...@@ -35,7 +35,7 @@ ...@@ -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-messaging.js"></script>
<!-- <script src="https://www.gstatic.com/firebasejs/3.6.1/firebase-storage.js"></script> --> <!-- <script src="https://www.gstatic.com/firebasejs/3.6.1/firebase-storage.js"></script> -->
<!-- AngularFire --> <!-- 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> <script>
// Initialize Firebase // Initialize Firebase
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
storageBucket: "kaa-saleproject.appspot.com", storageBucket: "kaa-saleproject.appspot.com",
messagingSenderId: "815161898662" messagingSenderId: "815161898662"
};*/ };*/
var config = { /* var config = {
apiKey: "AIzaSyAQ2WIB6GWOxmtwMdGd8eHawL4PWxK8evU", apiKey: "AIzaSyAQ2WIB6GWOxmtwMdGd8eHawL4PWxK8evU",
authDomain: "tugas-besar-wbd.firebaseapp.com", authDomain: "tugas-besar-wbd.firebaseapp.com",
databaseURL: "https://tugas-besar-wbd.firebaseio.com", databaseURL: "https://tugas-besar-wbd.firebaseio.com",
...@@ -69,7 +69,9 @@ ...@@ -69,7 +69,9 @@
}) })
.catch(function(err) { .catch(function(err) {
console.log('Unable to get permission to notify.', err); console.log('Unable to get permission to notify.', err);
}); });*/
/*messaging.requestPermission().then(function(){ /*messaging.requestPermission().then(function(){
console.log('Notification permission granted'); console.log('Notification permission granted');
messaging.getToken().then(function(){ messaging.getToken().then(function(){
...@@ -109,11 +111,11 @@ ...@@ -109,11 +111,11 @@
</script> </script>
<!--Application --> <!--Application -->
<!--<script src="scripts/app.js"></script>--> <script src="scripts/app.js"></script>
</head> </head>
<body> <body ng-app="chatApp" ng-controller="chatController">
<div class="catalog_content"> <div class="catalog_content">
<div class="logo"> <div class="logo">
<span id="red">Sale</span><span id="blue">Project</span> <span id="red">Sale</span><span id="blue">Project</span>
...@@ -309,8 +311,8 @@ ...@@ -309,8 +311,8 @@
out.print("<p>No product to be sold.</p>"); out.print("<p>No product to be sold.</p>");
} else { } else {
for (int i = 0; i < result.size(); i++) { 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("<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>"); out.print("added this on " + result.get(i).getDate().getDate() + "</p></div>");
out.print("<hr/>"); out.print("<hr/>");
out.print("<table>"); out.print("<table>");
out.print("<tr class = \"container\">"); out.print("<tr class = \"container\">");
...@@ -361,7 +363,7 @@ ...@@ -361,7 +363,7 @@
out.print("<p>Nothing matches your search.</p>"); out.print("<p>Nothing matches your search.</p>");
} else { } else {
for (int i = 0; i < result.size(); i++) { 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("added this on " + result.get(i).getDate().getDate() + "</p>");
out.print("<hr/>"); out.print("<hr/>");
out.print("<table>"); out.print("<table>");
...@@ -395,6 +397,10 @@ ...@@ -395,6 +397,10 @@
} }
%> %>
<br>
{{user}}
{{receiver}}
<!-- <div ng-app="chatApp" ng-controller="chatController"> <!-- <div ng-app="chatApp" ng-controller="chatController">
<p>Name: <input type="text" ng-model="newmessage.user"></p> <p>Name: <input type="text" ng-model="newmessage.user"></p>
<p>Message: <input type="text" ng-model="newmessage.text"></p> <p>Message: <input type="text" ng-model="newmessage.text"></p>
......
KAA-JSP/build/web/scripts/app.js
+ 55
− 15
View file @ 2dd130f7
...@@ -5,17 +5,17 @@ ...@@ -5,17 +5,17 @@
*/ */
var app = angular.module('chatApp', ['firebase']); var app = angular.module('chatApp', []);
app.controller('chatController', ['$scope','Message', function($scope,Message,){ app.controller('chatController', ['$scope','Message', function($scope,Message){
$scope.user = ""; $scope.user = "testst";
$scope.receiver = ""; $scope.receiver = "";
$scope.messages= Message.all; $scope.messages= "";
$scope.insert = function(message){ $scope.insert = function(message){
Message.create(message); //Message.create(message);
}; };
$scope.setUser = function(username){ $scope.setUser = function(username){
...@@ -29,13 +29,53 @@ app.controller('chatController', ['$scope','Message', function($scope,Message,){ ...@@ -29,13 +29,53 @@ app.controller('chatController', ['$scope','Message', function($scope,Message,){
$scope.isReceiverSet = function(){ $scope.isReceiverSet = function(){
return !(receiver === ""); 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) { app.factory('Message', function() {
var ref= new Firebase('https://kaa-saleproject.firebaseio.com'); 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'}, /* var messages = [{'name':'Pippo','text':'Hello'},
{'name':'Pluto','text':'Hello'}, {'name':'Pluto','text':'Hello'},
{'name':'Pippo','text':'how are you ?'}, {'name':'Pippo','text':'how are you ?'},
...@@ -43,15 +83,15 @@ app.factory('Message', ['$firebase', function($firebase) { ...@@ -43,15 +83,15 @@ app.factory('Message', ['$firebase', function($firebase) {
{'name':'Pippo','text':'Bye'}, {'name':'Pippo','text':'Bye'},
{'name':'Pluto','text':'Bye'}];*/ {'name':'Pluto','text':'Bye'}];*/
var Message = { /* var Message = {
all : messages, all : messages,
create: function(message){ 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(); return $firebase(ref.child('messages').child(messageId)).$asObject();
}, },*/
delete: function(message){ /* delete: function(message){
return messages.$remove(message); return messages.$remove(message);
} }
}; };
...@@ -59,6 +99,6 @@ app.factory('Message', ['$firebase', function($firebase) { ...@@ -59,6 +99,6 @@ app.factory('Message', ['$firebase', function($firebase) {
all: messages all: messages
};*/ };*/
return Message; // return Message;
}]); //});
KAA-JSP/dist/KAA-JSP.war
+ 0
− 0
View file @ 2dd130f7
No preview for this file type
KAA-JSP/web/catalog.jsp
+ 16
− 10
View file @ 2dd130f7
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Sale Project - Catalog</title> <title>Sale Project - Catalog</title>
<link href="css/style.css" rel="stylesheet" type="text/css"> <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 --> <!-- Firebase -->
<script src="https://www.gstatic.com/firebasejs/3.6.1/firebase.js"></script> <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://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-app.js"></script>
<script src="https://www.gstatic.com/firebasejs/3.6.1/firebase-auth.js"></script> <script src="https://www.gstatic.com/firebasejs/3.6.1/firebase-auth.js"></script>
...@@ -35,7 +35,7 @@ ...@@ -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-messaging.js"></script>
<!-- <script src="https://www.gstatic.com/firebasejs/3.6.1/firebase-storage.js"></script> --> <!-- <script src="https://www.gstatic.com/firebasejs/3.6.1/firebase-storage.js"></script> -->
<!-- AngularFire --> <!-- 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> <script>
// Initialize Firebase // Initialize Firebase
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
storageBucket: "kaa-saleproject.appspot.com", storageBucket: "kaa-saleproject.appspot.com",
messagingSenderId: "815161898662" messagingSenderId: "815161898662"
};*/ };*/
var config = { /* var config = {
apiKey: "AIzaSyAQ2WIB6GWOxmtwMdGd8eHawL4PWxK8evU", apiKey: "AIzaSyAQ2WIB6GWOxmtwMdGd8eHawL4PWxK8evU",
authDomain: "tugas-besar-wbd.firebaseapp.com", authDomain: "tugas-besar-wbd.firebaseapp.com",
databaseURL: "https://tugas-besar-wbd.firebaseio.com", databaseURL: "https://tugas-besar-wbd.firebaseio.com",
...@@ -69,7 +69,9 @@ ...@@ -69,7 +69,9 @@
}) })
.catch(function(err) { .catch(function(err) {
console.log('Unable to get permission to notify.', err); console.log('Unable to get permission to notify.', err);
}); });*/
/*messaging.requestPermission().then(function(){ /*messaging.requestPermission().then(function(){
console.log('Notification permission granted'); console.log('Notification permission granted');
messaging.getToken().then(function(){ messaging.getToken().then(function(){
...@@ -109,11 +111,11 @@ ...@@ -109,11 +111,11 @@
</script> </script>
<!--Application --> <!--Application -->
<!--<script src="scripts/app.js"></script>--> <script src="scripts/app.js"></script>
</head> </head>
<body> <body ng-app="chatApp" ng-controller="chatController">
<div class="catalog_content"> <div class="catalog_content">
<div class="logo"> <div class="logo">
<span id="red">Sale</span><span id="blue">Project</span> <span id="red">Sale</span><span id="blue">Project</span>
...@@ -309,8 +311,8 @@ ...@@ -309,8 +311,8 @@
out.print("<p>No product to be sold.</p>"); out.print("<p>No product to be sold.</p>");
} else { } else {
for (int i = 0; i < result.size(); i++) { 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("<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>"); out.print("added this on " + result.get(i).getDate().getDate() + "</p></div>");
out.print("<hr/>"); out.print("<hr/>");
out.print("<table>"); out.print("<table>");
out.print("<tr class = \"container\">"); out.print("<tr class = \"container\">");
...@@ -361,7 +363,7 @@ ...@@ -361,7 +363,7 @@
out.print("<p>Nothing matches your search.</p>"); out.print("<p>Nothing matches your search.</p>");
} else { } else {
for (int i = 0; i < result.size(); i++) { 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("added this on " + result.get(i).getDate().getDate() + "</p>");
out.print("<hr/>"); out.print("<hr/>");
out.print("<table>"); out.print("<table>");
...@@ -395,6 +397,10 @@ ...@@ -395,6 +397,10 @@
} }
%> %>
<br>
{{user}}
{{receiver}}
<!-- <div ng-app="chatApp" ng-controller="chatController"> <!-- <div ng-app="chatApp" ng-controller="chatController">
<p>Name: <input type="text" ng-model="newmessage.user"></p> <p>Name: <input type="text" ng-model="newmessage.user"></p>
<p>Message: <input type="text" ng-model="newmessage.text"></p> <p>Message: <input type="text" ng-model="newmessage.text"></p>
......
KAA-JSP/web/scripts/app.js
+ 55
− 15
View file @ 2dd130f7
...@@ -5,17 +5,17 @@ ...@@ -5,17 +5,17 @@
*/ */
var app = angular.module('chatApp', ['firebase']); var app = angular.module('chatApp', []);
app.controller('chatController', ['$scope','Message', function($scope,Message,){ app.controller('chatController', ['$scope','Message', function($scope,Message){
$scope.user = ""; $scope.user = "testst";
$scope.receiver = ""; $scope.receiver = "";
$scope.messages= Message.all; $scope.messages= "";
$scope.insert = function(message){ $scope.insert = function(message){
Message.create(message); //Message.create(message);
}; };
$scope.setUser = function(username){ $scope.setUser = function(username){
...@@ -29,13 +29,53 @@ app.controller('chatController', ['$scope','Message', function($scope,Message,){ ...@@ -29,13 +29,53 @@ app.controller('chatController', ['$scope','Message', function($scope,Message,){
$scope.isReceiverSet = function(){ $scope.isReceiverSet = function(){
return !(receiver === ""); 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) { app.factory('Message', function() {
var ref= new Firebase('https://kaa-saleproject.firebaseio.com'); 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'}, /* var messages = [{'name':'Pippo','text':'Hello'},
{'name':'Pluto','text':'Hello'}, {'name':'Pluto','text':'Hello'},
{'name':'Pippo','text':'how are you ?'}, {'name':'Pippo','text':'how are you ?'},
...@@ -43,15 +83,15 @@ app.factory('Message', ['$firebase', function($firebase) { ...@@ -43,15 +83,15 @@ app.factory('Message', ['$firebase', function($firebase) {
{'name':'Pippo','text':'Bye'}, {'name':'Pippo','text':'Bye'},
{'name':'Pluto','text':'Bye'}];*/ {'name':'Pluto','text':'Bye'}];*/
var Message = { /* var Message = {
all : messages, all : messages,
create: function(message){ 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(); return $firebase(ref.child('messages').child(messageId)).$asObject();
}, },*/
delete: function(message){ /* delete: function(message){
return messages.$remove(message); return messages.$remove(message);
} }
}; };
...@@ -59,6 +99,6 @@ app.factory('Message', ['$firebase', function($firebase) { ...@@ -59,6 +99,6 @@ app.factory('Message', ['$firebase', function($firebase) {
all: messages all: messages
};*/ };*/
return Message; // return Message;
}]); //});
MarketPlaceService/dist/MarketPlaceService.war
+ 0
− 0
View file @ 2dd130f7
No preview for this file type
firebase-messaging-sw.js 0 → 100644
+ 24
− 0
View file @ 2dd130f7
// 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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment