Skip to content

Commit 26aca26

Browse files
hw2zhenghw2zheng
authored
Merge pull request #4 from AGWeb18/zach
Zach
2 parents 1ac5c01 + fac9dde commit 26aca26

File tree

13 files changed

+2622
-65
lines changed

13 files changed

+2622
-65
lines changed

‎OddJobb/platforms/android/assets/www/css/styles.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
1010
See https://github.com/apache/cordova-plugin-statusbar
1111
*/
12-
12+
#map { height: 380px; width: 80%;}
1313
.statusbar-overlay {
1414
background: #000000;
1515
}

‎OddJobb/platforms/android/assets/www/index.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* Disables use of inline scripts in order to mitigate risk of XSS vulnerabilities. To change this:
1111
* Enable inline JS: add 'unsafe-inline' to default-src
1212
-->
13+
<!-- <meta http-equiv="Content-Security-Policy" content="default-src 'self' data: gap: https://ssl.gstatic.com 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *"> -->
1314

1415
<!-- Required meta tags-->
1516
<meta charset="utf-8">
@@ -48,10 +49,10 @@
4849
<a href="#" class="item-link list-button">Profile</a>
4950
</li>
5051
<li>
51-
<a href="#" class="item-link list-button">Submit a new post</a>
52+
<a href="defaultpage.html" class="item-link list-button">Submit a new post</a>
5253
</li>
5354
<li>
54-
<a href="#" class="item-link list-button">View current posts</a>
55+
<a href="postList.html" class="item-link list-button close-panel">View current posts</a>
5556
</li>
5657
<li>
5758
<a href="messages.html" class="item-link list-button">Messages</a>
@@ -139,9 +140,11 @@
139140

140141
<script type="text/javascript" src="cordova.js"></script>
141142
<script type="text/javascript" src="lib/framework7/js/framework7.min.js"></script>
143+
<script src="https://maps.google.com/maps/api/js?key=AIzaSyDqwL4NIot6kxkU47LWMQl5-f4sKvHMKrM"></script>
144+
<script type="text/javascript" src="js/gmaps.js"></script>
142145
<script type="text/javascript" src="js/my-app.js"></script>
143146
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
144-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
147+
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.7.3/socket.io.js"></script>
145148
<script src="js/messages.js"></script>
146149
</body>
147150

‎OddJobb/platforms/android/assets/www/js/messages.js‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,27 @@ function messagesMain() {
1010
var msgBar = msgHandler.messagebar('.messagebar');
1111
var currentMsg = "";
1212

13+
$$('.messagebar').on('keypress', function (e) {
14+
if (e.keyCode == 13) {
15+
sendMsg();
16+
}
17+
})
18+
1319
$$('.messagebar').on('click', function () {
20+
sendMsg();
21+
22+
})
23+
24+
var sendMsg = function () {
1425
currentMsg = msgBar.value().trim();
1526
msgBar.clear();
16-
messages.add
1727

1828
messages.addMessage({
1929
text: currentMsg,
2030
name: "Mateo"
2131

2232
}, "append", true);
23-
24-
})
33+
console.log("message sent");
34+
}
2535

2636
};

‎OddJobb/platforms/android/assets/www/js/my-app.js‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,36 @@
11
// Initialize app
2-
var myApp = new Framework7();
2+
var myApp = new Framework7({
3+
swipePanel: 'left'
4+
5+
});
36

7+
myApp.onPageInit('defaultpage', function (page) {
8+
myApp.params.swipePanel = false;
9+
new GMaps({
10+
div: '#map',
11+
lat: -12.043333,
12+
lng: -77.028333
13+
});
14+
$$('#addressButton').on('click', function (e){
15+
address();
16+
});
17+
});
418

19+
function address(){
20+
GMaps.geocode({
21+
address: $('#address').val(),
22+
callback: function(results, status) {
23+
if (status == 'OK') {
24+
var latlng = results[0].geometry.location;
25+
map.setCenter(latlng.lat(), latlng.lng());
26+
map.addMarker({
27+
lat: latlng.lat(),
28+
lng: latlng.lng()
29+
});
30+
}
31+
}
32+
});
33+
}
534
// If we need to use custom DOM library, let's save it to $$ variable:
635
var $$ = Dom7;
736

@@ -25,7 +54,6 @@ myApp.onPageInit('about', function (page) {
2554
myApp.alert('Here comes About page');
2655
})
2756

28-
2957
//Each message Page
3058
myApp.onPageInit('indMsg', function (page) {
3159
messagesMain();

‎OddJobb/platforms/android/assets/www/messages.html‎

Lines changed: 21 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,25 @@
1-
<div class="page toolbar-fixed" data-page="messages">
2-
<div class="page-content messages-content">
3-
<div class="messages">
4-
<div class="messages-date">Sunday, Feb 9 <span>12:58</span></div>
5-
<div class="message message-sent">
6-
<div class="message-text">Hello</div>
7-
</div>
8-
<div class="message message-sent">
9-
<div class="message-text">How are you?</div>
10-
</div>
11-
<div class="message message-received">
12-
<div class="message-name">Kate</div>
13-
<div class="message-text">I am fine, thanks</div>
14-
<div style="background-image:url(http://lorempixel.com/output/people-q-c-100-100-9.jpg)" class="message-avatar"></div>
15-
</div>
16-
<div class="messages-date">Sunday, Feb 3 <span>11:58</span></div>
17-
<div class="message message-sent">
18-
<div class="message-text">Nice photo?</div>
19-
</div>
20-
<div class="message message-sent message-pic">
21-
<div class="message-text"><img src="http://lorempixel.com/300/300/"></div>
22-
<div class="message-label">Delivered</div>
23-
</div>
24-
<div class="message message-received">
25-
<div class="message-name">Kate</div>
26-
<div class="message-text">Wow, awesome!</div>
27-
<div style="background-image:url(http://lorempixel.com/output/people-q-c-100-100-9.jpg)" class="message-avatar"></div>
28-
</div>
1+
<div class="navbar">
2+
<div class="navbar-inner">
3+
<div class="left">
4+
<a href="#" class="back link">
5+
<i class="icon icon-back"></i>
6+
<span>Back</span>
7+
</a>
8+
</div>
9+
<!---->
10+
<div class="center sliding">Messages</div>
11+
<div class="right">
12+
<a href="#" class="link icon-only open-panel"><i class="icon icon-bars"></i></a>
2913
</div>
30-
<div class="toolbar messagebar">
31-
<div class="toolbar-inner">
32-
<textarea placeholder="Message"></textarea><a href="#" class="link">Send</a>
14+
</div>
15+
</div>
16+
17+
<div class="pages">
18+
<div data-page="messages" class="page">
19+
<div class="page-content">
20+
<div class="list-block virtual-list">
21+
<a href="#"></a>
3322
</div>
34-
</div>
23+
</div>
3524
</div>
3625
</div>

‎OddJobb/platforms/browser/www/css/styles.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
1010
See https://github.com/apache/cordova-plugin-statusbar
1111
*/
12-
12+
#map { height: 380px; width: 80%;}
1313
.statusbar-overlay {
1414
background: #000000;
1515
}

‎OddJobb/platforms/browser/www/index.html‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* Disables use of inline scripts in order to mitigate risk of XSS vulnerabilities. To change this:
1111
* Enable inline JS: add 'unsafe-inline' to default-src
1212
-->
13+
<!-- <meta http-equiv="Content-Security-Policy" content="default-src 'self' data: gap: https://ssl.gstatic.com 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *"> -->
1314

1415
<!-- Required meta tags-->
1516
<meta charset="utf-8">
@@ -45,22 +46,22 @@
4546
<div class="list-block">
4647
<ul>
4748
<li>
48-
<a href="#" class="item-link list-button close-panel">Profile</a>
49+
<a href="#" class="item-link list-button">Profile</a>
4950
</li>
5051
<li>
51-
<a href="#" class="item-link list-button close-panel">Submit a new post</a>
52+
<a href="defaultpage.html" class="item-link list-button">Submit a new post</a>
5253
</li>
5354
<li>
54-
<a href="/" class="item-link list-button close-panel">View current posts</a>
55+
<a href="postList.html" class="item-link list-button close-panel">View current posts</a>
5556
</li>
5657
<li>
57-
<a href="#" class="item-link list-button close-panel">Messages</a>
58+
<a href="messages.html" class="item-link list-button">Messages</a>
5859
</li>
5960
<li>
6061
<a href="about.html" class="item-link list-button close-panel">About</a>
6162
</li>
6263
<li>
63-
<a href="#" class="item-link list-button close-panel">Logout</a>
64+
<a href="#" class="item-link list-button">Logout</a>
6465
</li>
6566
</ul>
6667
</div>
@@ -127,21 +128,24 @@
127128
</div>
128129
</div>
129130
<!-- Bottom Toolbar-->
130-
<div class="toolbar">
131+
<!---<div class="toolbar">
131132
<div class="toolbar-inner">
132-
<!-- Toolbar links -->
133+
<!-- Toolbar links
133134
<a href="#" class="link">Link 1</a>
134135
<a href="#" class="link">Link 2</a>
135136
</div>
136-
</div>
137+
</div> -->
137138
</div>
138139
</div>
139140

140141
<script type="text/javascript" src="cordova.js"></script>
141142
<script type="text/javascript" src="lib/framework7/js/framework7.min.js"></script>
143+
<script src="https://maps.google.com/maps/api/js?key=AIzaSyDqwL4NIot6kxkU47LWMQl5-f4sKvHMKrM"></script>
144+
<script type="text/javascript" src="js/gmaps.js"></script>
142145
<script type="text/javascript" src="js/my-app.js"></script>
143146
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
144-
147+
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.7.3/socket.io.js"></script>
148+
<script src="js/messages.js"></script>
145149
</body>
146150

147-
</html>
151+
</html>

‎OddJobb/platforms/browser/www/js/my-app.js‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,36 @@
11
// Initialize app
2-
var myApp = new Framework7();
2+
var myApp = new Framework7({
3+
swipePanel: 'left'
4+
5+
});
36

7+
myApp.onPageInit('defaultpage', function (page) {
8+
myApp.params.swipePanel = false;
9+
new GMaps({
10+
div: '#map',
11+
lat: -12.043333,
12+
lng: -77.028333
13+
});
14+
$$('#addressButton').on('click', function (e){
15+
address();
16+
});
17+
});
418

19+
function address(){
20+
GMaps.geocode({
21+
address: $('#address').val(),
22+
callback: function(results, status) {
23+
if (status == 'OK') {
24+
var latlng = results[0].geometry.location;
25+
map.setCenter(latlng.lat(), latlng.lng());
26+
map.addMarker({
27+
lat: latlng.lat(),
28+
lng: latlng.lng()
29+
});
30+
}
31+
}
32+
});
33+
}
534
// If we need to use custom DOM library, let's save it to $$ variable:
635
var $$ = Dom7;
736

@@ -25,7 +54,6 @@ myApp.onPageInit('about', function (page) {
2554
myApp.alert('Here comes About page');
2655
})
2756

28-
2957
//Each message Page
3058
myApp.onPageInit('indMsg', function (page) {
3159
messagesMain();

‎OddJobb/www/css/styles.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
1010
See https://github.com/apache/cordova-plugin-statusbar
1111
*/
12-
12+
#map { height: 380px; width: 80%;}
1313
.statusbar-overlay {
1414
background: #000000;
1515
}

‎OddJobb/www/defaultpage.html‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<!-- We don't need a full layout in this file because this page will be parsed with Ajax. -->
2+
<!-- Top Navbar-->
3+
<div class="navbar">
4+
<div class="navbar-inner">
5+
<div class="left">
6+
<a href="defaultpage.html" class="back link">
7+
<i class="icon icon-back"></i>
8+
<span>Back</span>
9+
</a>
10+
</div>
11+
<div class="center sliding">View Postings</div>
12+
<div class="right">
13+
<a href="defaultpage.html" class="link icon-only open-panel"><i class="icon icon-bars"></i></a>
14+
</div>
15+
</div>
16+
</div>
17+
<div class="pages">
18+
<div data-page="defaultpage" class="page">
19+
<div class="page-content">
20+
<div class="content-block">
21+
<form method="post" id="geocoding_form">
22+
<label for="address">Address:</label>
23+
<div class="input">
24+
<input type="text" id="address" name="address">
25+
<input type="button" id="addressButton" value="Search">
26+
</div>
27+
</form>
28+
<div id="map">
29+
</div>
30+
</div>
31+
</div>
32+
</div>
33+
</div>

0 commit comments

Comments
 (0)