Skip to content

Commit 00f70b2

Browse files
hw2zhenghw2zheng
committed
Refactored files
1 parent bda3ca0 commit 00f70b2

File tree

7 files changed

+146
-163
lines changed

7 files changed

+146
-163
lines changed

‎OddJobb/www/index.html‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
</div>
7070

7171
<!-- Views -->
72-
<div class="views">
72+
<div class="views">
7373
<!-- Your main view, should have "view-main" class -->
7474
<div class="view view-main">
7575
<!-- Top Navbar-->
@@ -131,9 +131,17 @@
131131

132132
<script type="text/javascript" src="cordova.js"></script>
133133
<script type="text/javascript" src="lib/framework7/js/framework7.min.js"></script>
134-
<script src="https://maps.google.com/maps/api/js?key=AIzaSyDqwL4NIot6kxkU47LWMQl5-f4sKvHMKrM"></script>
135-
<script type="text/javascript" src="js/gmaps.js"></script>
134+
<script src="https://maps.google.com/maps/api/js?key=AIzaSyDqwL4NIot6kxkU47LWMQl5-f4sKvHMKrM"></script>
135+
136+
<!--Loading Controllers-->
136137
<script type="text/javascript" src="js/my-app.js"></script>
138+
<script type="text/javascript" src="js/controllers/about.js"></script>
139+
<script type="text/javascript" src="js/controllers/defaultpage.js"></script>
140+
<script type="text/javascript" src="js/controllers/message.js"></script>
141+
<script type="text/javascript" src="js/controllers/post_card.js"></script>
142+
<script type="text/javascript" src="js/controllers/post_list.js"></script>
143+
144+
<script type="text/javascript" src="js/gmaps.js"></script>
137145
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
138146
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
139147
<script src="js/messages.js"></script>

‎OddJobb/www/js/controllers/about.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
myApp.onPageInit('about', function (page) {
2+
// Do something here for "about" page
3+
myApp.alert('Here comes About page');
4+
})

‎OddJobb/www/js/controllers/defaultpage.js‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
myApp.onPageInit('defaultpage', function (page) {
2+
myApp.params.swipePanel = false;
3+
new GMaps({
4+
div: '#map',
5+
lat: -12.043333,
6+
lng: -77.028333
7+
});
8+
$$('#addressButton').on('click', function (e){
9+
address();
10+
});
11+
});
12+
13+
function address(){
14+
GMaps.geocode({
15+
address: $('#address').val(),
16+
callback: function(results, status) {
17+
if (status == 'OK') {
18+
var latlng = results[0].geometry.location;
19+
map.setCenter(latlng.lat(), latlng.lng());
20+
map.addMarker({
21+
lat: latlng.lat(),
22+
lng: latlng.lng()
23+
});
24+
}
25+
}
26+
});
27+
}

‎OddJobb/www/js/controllers/message.js‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
//Each message Page
2+
myApp.onPageInit('indMsg', function (page) {
3+
var queryParams = page.query["messageId"];
4+
var title = document.getElementById("currentPerson");
5+
title.innerHTML = queryParams;
6+
messagesMain(queryParams);
7+
})
8+
9+
//Messages Page
10+
myApp.onPageInit('messages', function (page) {
11+
12+
//Will be reading this from the database
13+
const people = [{ item: "Mateo" }, { item: "Holly" }, { item: "Anthony" }, { item: "Haowei" }];
14+
15+
const myListOfPeople = myApp.virtualList('.list-block.virtual-list', {
16+
items: people,
17+
template:
18+
'<li>' +
19+
'<a href="indMsg.html?messageId={{item}}" class="item-link item-content">' +
20+
'<div>{{item}}</div>' +
21+
'</a>' +
22+
'</div>' +
23+
'</li>'
24+
});
25+
})

‎OddJobb/www/js/controllers/post_card.js‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
myApp.onPageInit('post', function (page) {
2+
/*
3+
1. Do AJAX call to get post based on postID
4+
2. Generate post data!
5+
*/
6+
7+
8+
const testPost = {
9+
season: 'img/green.jpg',
10+
title: 'Grass Mowing Required',
11+
date: 'January 21, 2015',
12+
text: 'Guys please help my grass is growing too large'
13+
}
14+
15+
const posts = [];
16+
17+
if (page.query) {
18+
console.log(page.query);
19+
posts.push(testPost);
20+
21+
22+
} else {
23+
posts.push(testPost);
24+
posts.push(testPost);
25+
posts.push(testPost);
26+
}
27+
28+
29+
const myList = myApp.virtualList('.list-block.virtual-list.cardslist', {
30+
items: posts,
31+
template:
32+
'<div class="card demo-card-header-pic" >' +
33+
' <div style="background-image:url(img/green.jpg)" valign="bottom" class="card-header color-white no-border"></div>' +
34+
' <div class="card-content">' +
35+
' <div class="card-content-inner">' +
36+
' <h1>Grass Mowing Required</h1>' +
37+
' <p class="color-gray">Posted on January 21, 2015</p>' +
38+
' <p>Quisque eget vestibulum nulla...</p>' +
39+
' </div>' +
40+
' </div>' +
41+
' <div class="card-footer">' +
42+
' <a href="#" class="button button-big">Contact</a>' +
43+
' <a href="#" class="button button-big">Map</a>' +
44+
' </div>' +
45+
'</div >'
46+
});
47+
})

‎OddJobb/www/js/controllers/post_list.js‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
myApp.onPageInit('postList', function (page) {
2+
console.log('posted!');
3+
4+
/*
5+
1. Do AJAX call
6+
2. Put data into Array
7+
3. Set array
8+
*/
9+
const posts = [
10+
/*
11+
{
12+
title: 'Need people to show shovel for me tomorrow!',
13+
text: 'House is not too large, so should not be an issue!',
14+
price: '5',*/
15+
];
16+
17+
for (var i = 0; i < 50; i++) {
18+
posts.push({
19+
item: i
20+
});
21+
}
22+
23+
const myList = myApp.virtualList('.list-block.virtual-list.postlist', {
24+
items: posts,
25+
template:
26+
'<li>' +
27+
' <a href="post.html?postID={{item}}" class="item-link item-content">' +
28+
' <div>{{item}}</div>' +
29+
' </a>' +
30+
'</li>'
31+
});
32+
})

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

Lines changed: 0 additions & 160 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,6 @@ var myApp = new Framework7({
44

55
});
66

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-
});
18-
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-
}
347
// If we need to use custom DOM library, let's save it to $$ variable:
358
var $$ = Dom7;
369

@@ -43,136 +16,3 @@ var mainView = myApp.addView('.view-main', {
4316
$$(document).on('deviceready', function () {
4417
console.log("Device is ready!");
4518
});
46-
47-
48-
49-
// Now we need to run the code that will be executed only for About page.
50-
51-
// Option 1. Using page callback for page (for "about" page in this case) (recommended way):
52-
myApp.onPageInit('about', function (page) {
53-
// Do something here for "about" page
54-
myApp.alert('Here comes About page');
55-
})
56-
57-
//Each message Page
58-
myApp.onPageInit('indMsg', function (page) {
59-
messagesMain();
60-
})
61-
62-
63-
//Messages Page
64-
myApp.onPageInit('messages', function (page) {
65-
//messagesMain();
66-
/*
67-
1. Do AJAX call
68-
2. Put data into Array
69-
3. Set array
70-
*/
71-
const people = [
72-
/*
73-
{
74-
name: nameOfPerson
75-
message: This is a mess...
76-
77-
}*/
78-
];
79-
80-
for (var i = 0; i < 10; i++) {
81-
people.push({
82-
item: i
83-
});
84-
}
85-
86-
const myListOfPeople = myApp.virtualList('.list-block.virtual-list', {
87-
items: people,
88-
template:
89-
'<li>' +
90-
'<a href="indMsg.html?messageId={{item}}" class="item-link item-content">' +
91-
'<div>{{item}}</div>' +
92-
'</a>' +
93-
'</div>' +
94-
'</li>'
95-
});
96-
})
97-
98-
myApp.onPageInit('post', function (page) {
99-
/*
100-
1. Do AJAX call to get post based on postID
101-
2. Generate post data!
102-
*/
103-
104-
105-
const testPost = {
106-
season: 'img/green.jpg',
107-
title: 'Grass Mowing Required',
108-
date: 'January 21, 2015',
109-
text: 'Guys please help my grass is growing too large'
110-
}
111-
112-
const posts = [];
113-
114-
if (page.query) {
115-
console.log(page.query);
116-
posts.push(testPost);
117-
118-
119-
} else {
120-
posts.push(testPost);
121-
posts.push(testPost);
122-
posts.push(testPost);
123-
}
124-
125-
126-
const myList = myApp.virtualList('.list-block.virtual-list.cardslist', {
127-
items: posts,
128-
template:
129-
'<div class="card demo-card-header-pic" >' +
130-
' <div style="background-image:url(img/green.jpg)" valign="bottom" class="card-header color-white no-border"></div>' +
131-
' <div class="card-content">' +
132-
' <div class="card-content-inner">' +
133-
' <h1>Grass Mowing Required</h1>' +
134-
' <p class="color-gray">Posted on January 21, 2015</p>' +
135-
' <p>Quisque eget vestibulum nulla...</p>' +
136-
' </div>' +
137-
' </div>' +
138-
' <div class="card-footer">' +
139-
' <a href="#" class="button button-big">Contact</a>' +
140-
' <a href="#" class="button button-big">Map</a>' +
141-
' </div>' +
142-
'</div >'
143-
});
144-
})
145-
146-
myApp.onPageInit('postList', function (page) {
147-
console.log('posted!');
148-
149-
/*
150-
1. Do AJAX call
151-
2. Put data into Array
152-
3. Set array
153-
*/
154-
const posts = [
155-
/*
156-
{
157-
title: 'Need people to show shovel for me tomorrow!',
158-
text: 'House is not too large, so should not be an issue!',
159-
price: '5',*/
160-
];
161-
162-
for (var i = 0; i < 50; i++) {
163-
posts.push({
164-
item: i
165-
});
166-
}
167-
168-
const myList = myApp.virtualList('.list-block.virtual-list.postlist', {
169-
items: posts,
170-
template:
171-
'<li>' +
172-
' <a href="post.html?postID={{item}}" class="item-link item-content">' +
173-
' <div>{{item}}</div>' +
174-
' </a>' +
175-
'</li>'
176-
});
177-
})
178-

0 commit comments

Comments
 (0)