Skip to content

Commit 54e5d64

Browse files
heoegemaheoegema
authored
Merge pull request #7 from AGWeb18/registration
Added validation for registration
2 parents 8ec816c + 91d25ab commit 54e5d64

File tree

13 files changed

+184
-390
lines changed

13 files changed

+184
-390
lines changed

‎.DS_Store‎

6 KB
Binary file not shown.

‎OddJobb/.DS_Store‎

6 KB
Binary file not shown.

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

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
* Disables use of inline scripts in order to mitigate risk of XSS vulnerabilities. To change this:
1212
* Enable inline JS: add 'unsafe-inline' to default-src
1313
-->
14-
<!-- <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 *"> -->
1514

1615
<!-- Required meta tags-->
1716
<meta charset="utf-8">
@@ -22,7 +21,7 @@
2221
<meta name="msapplication-tap-highlight" content="no">
2322

2423
<!-- Your app title -->
25-
<title>My App</title>
24+
<title>OddJobbs</title>
2625

2726
<!-- This template defaults to the iOS CSS theme. To support both iOS and material design themes, see the Framework7 Tutorial at the link below:
2827
http://www.idangero.us/framework7/tutorials/maintain-both-ios-and-material-themes-in-single-app.html
@@ -70,7 +69,7 @@
7069
</div>
7170

7271
<!-- Views -->
73-
<div class="views">
72+
<div class="views">
7473
<!-- Your main view, should have "view-main" class -->
7574
<div class="view view-main">
7675
<!-- Top Navbar-->
@@ -132,12 +131,21 @@
132131

133132
<script type="text/javascript" src="cordova.js"></script>
134133
<script type="text/javascript" src="lib/framework7/js/framework7.min.js"></script>
135-
<script src="https://maps.google.com/maps/api/js?key=AIzaSyDqwL4NIot6kxkU47LWMQl5-f4sKvHMKrM"></script>
136-
<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-->
137137
<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+
<script type="text/javascript" src="js/controllers/register.js"></script>
144+
145+
<script type="text/javascript" src="js/gmaps.js"></script>
146+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
138147
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
139-
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.7.3/socket.io.js"></script>
140148
<script src="js/messages.js"></script>
141149
</body>
142150

143-
</html>
151+
</html>

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

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
var msgTemplate = '{{#if day}}' +
66
'<div class="messages-date">{{day}} {{#if time}}, <span>{{time}}</span>{{/if}}</div>' +
77
'{{/if}}' +
8-
'<div class="message message-{{type}} {{id}} hidden {{#if hasImage}}message-pic{{/if}} {{#if avatar}}message-with-avatar{{/if}} {{#if position}}message-appear-from-{{position}}{{/if}}">' +
9-
'{{#if name}}<div class="message-name {{id}} hidden">{{name}}</div>{{/if}}' +
10-
'<div class="message-text {{id}}">{{text}}{{#if date}}<div class="message-date hidden">{{date}}</div>{{/if}}</div>' +
11-
'{{#if avatar}}<div class="message-avatar" style="background-image:url({{avatar}})"></div>{{/if}}' +
12-
'{{#if label}}<div class="message-label">{{label}}</div>{{/if}}' +
8+
'<div class="message message-{{type}} hidden {{id}} {{#if hasImage}}message-pic{{/if}} {{#if avatar}}message-with-avatar{{/if}} {{#if position}}message-appear-from-{{position}}{{/if}}">' +
9+
'{{#if name}}<div class="message-name hidden {{id}}">{{name}}</div>{{/if}}' +
10+
'<div class="message-text {{id}}">{{text}}{{#if date}}<div class="message-date hidden {{id}}">{{date}}</div>{{/if}}</div>' +
11+
'{{#if avatar}}<div class="message-avatar hidden {{id}}" style="background-image:url({{avatar}})"></div>{{/if}}' +
12+
'{{#if label}}<div class="message-label hidden {{id}}">{{label}}</div>{{/if}}' +
1313
'</div>';
1414

1515
var error = "";
@@ -22,11 +22,9 @@ function messagesMain(queryParams) {
2222
var msgBar = msgHandler.messagebar('.messagebar');
2323
var currentMsg = "";
2424

25-
$$('.messagebar').on('keypress', function (e) {
26-
if (e.keyCode == 13) {
2725
//Have to read from api to know which user to read from
2826
//console.log(queryParams);
29-
var prevMessages = loadMessages(queryParams);
27+
//loadMessages(queryParams);
3028

3129
//Really only applicable to desktop version
3230
$$('.messagebar').on('keypress', function (e) {
@@ -42,13 +40,13 @@ function messagesMain(queryParams) {
4240
var sendMsg = function () {
4341
currentMsg = msgBar.value().trim();
4442
msgBar.clear();
45-
4643
messages.addMessage({
4744
text: currentMsg,
4845
name: "Mateo",
49-
id: "Mateo"
46+
id: queryParams
5047
}, "append", true);
51-
console.log("message sent");
48+
49+
console.log("Message Sent");
5250
}
5351

5452
printErr(error);
@@ -57,30 +55,29 @@ function messagesMain(queryParams) {
5755

5856
//Load messages of a particular person.
5957
var loadMessages = function (person) {
60-
allMsgs = $$("." + person);
58+
allMsgs = document.getElementsByClassName(person);
6159
console.log(allMsgs);
62-
allMsgs.addClass("visible");
63-
allMsgs.removeClass("hidden");
64-
65-
/*
66-
var msgs = $$("." + person);
67-
if (msgs === null) {
68-
error = "Invalid Person Called";
60+
if (allMsgs === null) {
6961
return;
7062
}
71-
var people = [];
72-
for (var i = 0; i < msgs.length; i++) {
73-
var current = msgs[i];
74-
if (people.indexOf(current.innerHTML) === -1) {
75-
people.push(current);
63+
for (var i = 0; i < allMsgs.length; i++) {
64+
var current = allMsgs[i];
65+
if (current.classList.contains("hidden")) {
66+
current.classList.remove("hidden");
67+
current.style["display"] = "inline";
7668
}
7769
}
78-
//console.log(people);
79-
return people;
80-
*/
70+
}
71+
72+
var hideAll = function () {
73+
var allElements = document.getElementsByClassName("hidden");
74+
for (var i = 0; i < allElements.length; i++) {
75+
var current = allElements[i];
76+
current.style["display"] = "none";
77+
}
8178
}
8279

8380

8481
var printErr = function(err){
8582
console.log(err);
86-
}
83+
}

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

Lines changed: 0 additions & 145 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,121 +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-
var queryParams = page.query["messageId"];
60-
var title = document.getElementById("currentPerson");
61-
title.innerHTML = queryParams;
62-
messagesMain(queryParams);
63-
})
64-
65-
66-
//Messages Page
67-
myApp.onPageInit('messages', function (page) {
68-
69-
//Will be reading this from the database
70-
const people = [{ item: "Mateo" }, { item: "Holly" }, { item: "Anthony" }, { item: "Haowei" }];
71-
72-
const myListOfPeople = myApp.virtualList('.list-block.virtual-list', {
73-
items: people,
74-
template:
75-
'<li>' +
76-
'<a href="indMsg.html?messageId={{item}}" class="item-link item-content">' +
77-
'<div>{{item}}</div>' +
78-
'</a>' +
79-
'</div>' +
80-
'</li>'
81-
});
82-
})
83-
84-
myApp.onPageInit('post', function (page) {
85-
/*
86-
1. Do AJAX call to get post based on postID
87-
2. Generate post data!
88-
*/
89-
90-
91-
const testPost = {
92-
season: 'img/green.jpg',
93-
title: 'Grass Mowing Required',
94-
date: 'January 21, 2015',
95-
text: 'Guys please help my grass is growing too large'
96-
}
97-
98-
const posts = [];
99-
100-
if (page.query) {
101-
console.log(page.query);
102-
posts.push(testPost);
103-
104-
105-
} else {
106-
posts.push(testPost);
107-
posts.push(testPost);
108-
posts.push(testPost);
109-
}
110-
111-
112-
const myList = myApp.virtualList('.list-block.virtual-list.cardslist', {
113-
items: posts,
114-
template:
115-
'<div class="card demo-card-header-pic" >' +
116-
' <div style="background-image:url(img/green.jpg)" valign="bottom" class="card-header color-white no-border"></div>' +
117-
' <div class="card-content">' +
118-
' <div class="card-content-inner">' +
119-
' <h1>Grass Mowing Required</h1>' +
120-
' <p class="color-gray">Posted on January 21, 2015</p>' +
121-
' <p>Quisque eget vestibulum nulla...</p>' +
122-
' </div>' +
123-
' </div>' +
124-
' <div class="card-footer">' +
125-
' <a href="#" class="button button-big">Contact</a>' +
126-
' <a href="#" class="button button-big">Map</a>' +
127-
' </div>' +
128-
'</div >'
129-
});
130-
})
131-
132-
myApp.onPageInit('postList', function (page) {
133-
console.log('posted!');
134-
135-
/*
136-
1. Do AJAX call
137-
2. Put data into Array
138-
3. Set array
139-
*/
140-
const posts = [
141-
/*
142-
{
143-
title: 'Need people to show shovel for me tomorrow!',
144-
text: 'House is not too large, so should not be an issue!',
145-
price: '5',*/
146-
];
147-
148-
for (var i = 0; i < 50; i++) {
149-
posts.push({
150-
item: i
151-
});
152-
}
153-
154-
const myList = myApp.virtualList('.list-block.virtual-list.postlist', {
155-
items: posts,
156-
template:
157-
'<li>' +
158-
' <a href="post.html?postID={{item}}" class="item-link item-content">' +
159-
' <div>{{item}}</div>' +
160-
' </a>' +
161-
'</li>'
162-
});
163-
})

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,3 @@
1-
<<<<<<< Updated upstream
2-
<div class="navbar">
3-
<div class="navbar-inner">
4-
<div class="left">
5-
<a href="#" class="back link">
6-
<i class="icon icon-back"></i>
7-
<span>Back</span>
8-
</a>
9-
</div>
10-
<!---->
11-
<div class="center sliding">Messages</div>
12-
<div class="right">
13-
<a href="#" class="link icon-only open-panel"><i class="icon icon-bars"></i></a>
14-
</div>
15-
</div>
16-
</div>
17-
18-
<div class="pages">
19-
<div data-page="messages" class="page">
20-
<div class="page-content">
21-
<div class="list-block virtual-list">
22-
<a href="#"></a>
23-
=======
241
<html>
252
<head></head>
263
<body>
@@ -46,7 +23,6 @@
4623
<div class="list-block virtual-list">
4724
<a href="#"></a>
4825
</div>
49-
>>>>>>> Stashed changes
5026
</div>
5127
</div>
5228
</div>

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

Lines changed: 13 additions & 4 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,12 +131,21 @@
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+
<script type="text/javascript" src="js/controllers/register.js"></script>
144+
145+
<script type="text/javascript" src="js/gmaps.js"></script>
137146
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
138147
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
139148
<script src="js/messages.js"></script>
140149
</body>
141150

142-
</html>
151+
</html>

0 commit comments

Comments
 (0)