Skip to content

Commit bda3ca0

Browse files
hw2zhenghw2zheng
committed
merged
1 parent 26aca26 commit bda3ca0

File tree

7 files changed

+210
-173
lines changed

7 files changed

+210
-173
lines changed

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

Lines changed: 53 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<!DOCTYPE html>
22
<html>
3+
34
<head>
45
<!--
56
Customize this policy to fit your own app's needs. For more guidance, see:
@@ -43,33 +44,33 @@
4344
<div class="panel panel-left panel-reveal">
4445
<div class="content-block">
4546
<div class="content-block-title">Navigation</div>
46-
<div class="list-block">
47-
<ul>
48-
<li>
49-
<a href="#" class="item-link list-button">Profile</a>
50-
</li>
51-
<li>
52-
<a href="defaultpage.html" class="item-link list-button">Submit a new post</a>
53-
</li>
54-
<li>
55-
<a href="postList.html" class="item-link list-button close-panel">View current posts</a>
56-
</li>
57-
<li>
58-
<a href="messages.html" class="item-link list-button">Messages</a>
59-
</li>
60-
<li>
61-
<a href="about.html" class="item-link list-button close-panel">About</a>
47+
<div class="list-block">
48+
<ul>
49+
<li>
50+
<a href="#" class="item-link list-button close-panel">Profile</a>
51+
</li>
52+
<li>
53+
<a href="defaultpage.html" class="item-link list-button close-panel">Submit a new post</a>
54+
</li>
55+
<li>
56+
<a href="postList.html" class="item-link list-button close-panel">View current posts</a>
57+
</li>
58+
<li>
59+
<a href="messages.html" class="item-link list-button close-panel">Messages</a>
6260
</li>
63-
<li>
64-
<a href="#" class="item-link list-button">Logout</a>
65-
</li>
66-
</ul>
67-
</div>
61+
<li>
62+
<a href="about.html" class="item-link list-button close-panel">About</a>
63+
</li>
64+
<li>
65+
<a href="#" class="item-link list-button close-panel">Logout</a>
66+
</li>
67+
</ul>
68+
</div>
6869
</div>
6970
</div>
7071

7172
<!-- Views -->
72-
<div class="views">
73+
<div class="views">
7374
<!-- Your main view, should have "view-main" class -->
7475
<div class="view view-main">
7576
<!-- Top Navbar-->
@@ -88,53 +89,44 @@
8889
</div>
8990
<!-- Pages container, because we use fixed-through navbar and toolbar, it has additional appropriate classes-->
9091
<div class="pages navbar-through toolbar-through">
91-
<!-- Page, "data-page" contains page name -->
9292
<div data-page="index" class="page">
9393
<!-- Scrollable page content -->
9494
<div class="page-content">
9595
<div class="content-block">
96-
<!-- Link to another page -->
97-
<div class="login-box">
98-
<div class="lb-header">
99-
<a href="index.html" class="active" id="login-box-link">Login</a>
100-
<a href="login.html" id="signup-box-link">Sign Up</a>
101-
</div>
102-
<div class="social-login">
103-
<a href="#">
104-
<i class="fa fa-facebook fa-lg"></i>
105-
Login with facebook
106-
</a>
107-
<a href="#">
108-
<i class="fa fa-google-plus fa-lg"></i>
109-
Log in with Google
110-
</a>
111-
</div>
112-
<form class="email-login">
113-
<div class="u-form-group">
114-
<input type="email" placeholder="Email"/>
115-
</div>
116-
<div class="u-form-group">
117-
<input type="password" placeholder="Password"/>
118-
</div>
119-
<div class="u-form-group">
120-
<button>Log in</button>
121-
</div>
122-
<div class="u-form-group">
123-
<a href="#" class="forgot-password">Forgot password?</a>
124-
</div>
125-
</div>
96+
<form>
97+
<div class="list-block">
98+
<ul>
99+
<li class="item-content">
100+
<div class="item-inner">
101+
<div class="item-title label">Username</div>
102+
<div class="item-input">
103+
<input type="text" name="username" placeholder="Your username">
104+
</div>
105+
</div>
106+
</li>
107+
<li class="item-content">
108+
<div class="item-inner">
109+
<div class="item-title label">Password</div>
110+
<div class="item-input">
111+
<input type="password" name="password" placeholder="Your password">
112+
</div>
113+
</div>
114+
</li>
115+
</ul>
116+
</div>
117+
<div class="list-block">
118+
<ul>
119+
<li><a href="#" class="item-link list-button">Sign In</a></li>
120+
</ul>
121+
<div class="list-block-label">
122+
</div>
123+
</div>
124+
<p>Don't have an account? <a href="register.html"><strong> Register Now </strong></a>
125+
</form>
126126
</div>
127127
</div>
128128
</div>
129129
</div>
130-
<!-- Bottom Toolbar-->
131-
<!---<div class="toolbar">
132-
<div class="toolbar-inner">
133-
<!-- Toolbar links
134-
<a href="#" class="link">Link 1</a>
135-
<a href="#" class="link">Link 2</a>
136-
</div>
137-
</div> -->
138130
</div>
139131
</div>
140132

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

Lines changed: 57 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,41 @@
22
//Js file that deal with the messages
33

44

5-
function messagesMain() {
5+
var msgTemplate = '{{#if day}}' +
6+
'<div class="messages-date">{{day}} {{#if time}}, <span>{{time}}</span>{{/if}}</div>' +
7+
'{{/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}}' +
13+
'</div>';
14+
15+
var error = "";
16+
17+
function messagesMain(queryParams) {
618
var msgHandler = new Framework7();
719
var $$ = Dom7;
820

9-
var messages = msgHandler.messages('.messages');
21+
var messages = msgHandler.messages('.messages', { messageTemplate: msgTemplate });
1022
var msgBar = msgHandler.messagebar('.messagebar');
1123
var currentMsg = "";
1224

1325
$$('.messagebar').on('keypress', function (e) {
1426
if (e.keyCode == 13) {
27+
//Have to read from api to know which user to read from
28+
//console.log(queryParams);
29+
var prevMessages = loadMessages(queryParams);
30+
31+
//Really only applicable to desktop version
32+
$$('.messagebar').on('keypress', function (e) {
33+
if (e.keyCode === 13) {
1534
sendMsg();
1635
}
1736
})
1837

1938
$$('.messagebar').on('click', function () {
2039
sendMsg();
21-
2240
})
2341

2442
var sendMsg = function () {
@@ -27,10 +45,42 @@ function messagesMain() {
2745

2846
messages.addMessage({
2947
text: currentMsg,
30-
name: "Mateo"
31-
48+
name: "Mateo",
49+
id: "Mateo"
3250
}, "append", true);
33-
console.log("message sent");
51+
console.log("message sent");
52+
}
53+
54+
printErr(error);
55+
56+
};
57+
58+
//Load messages of a particular person.
59+
var loadMessages = function (person) {
60+
allMsgs = $$("." + person);
61+
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";
69+
return;
3470
}
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);
76+
}
77+
}
78+
//console.log(people);
79+
return people;
80+
*/
81+
}
82+
3583

36-
};
84+
var printErr = function(err){
85+
console.log(err);
86+
}

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

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -56,31 +56,18 @@ myApp.onPageInit('about', function (page) {
5656

5757
//Each message Page
5858
myApp.onPageInit('indMsg', function (page) {
59-
messagesMain();
59+
var queryParams = page.query["messageId"];
60+
var title = document.getElementById("currentPerson");
61+
title.innerHTML = queryParams;
62+
messagesMain(queryParams);
6063
})
6164

65+
6266
//Messages Page
6367
myApp.onPageInit('messages', function (page) {
64-
//messagesMain();
65-
/*
66-
1. Do AJAX call
67-
2. Put data into Array
68-
3. Set array
69-
*/
70-
const people = [
71-
/*
72-
{
73-
name: nameOfPerson
74-
message: This is a mess...
75-
76-
}*/
77-
];
7868

79-
for (var i = 0; i < 10; i++) {
80-
people.push({
81-
item: i
82-
});
83-
}
69+
//Will be reading this from the database
70+
const people = [{ item: "Mateo" }, { item: "Holly" }, { item: "Anthony" }, { item: "Haowei" }];
8471

8572
const myListOfPeople = myApp.virtualList('.list-block.virtual-list', {
8673
items: people,

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

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<<<<<<< Updated upstream
12
<div class="navbar">
23
<div class="navbar-inner">
34
<div class="left">
@@ -19,7 +20,35 @@
1920
<div class="page-content">
2021
<div class="list-block virtual-list">
2122
<a href="#"></a>
23+
=======
24+
<html>
25+
<head></head>
26+
<body>
27+
<div class="navbar">
28+
<div class="navbar-inner">
29+
<div class="left">
30+
<a href="#" class="back link">
31+
<i class="icon icon-back"></i>
32+
<span>Back</span>
33+
</a>
34+
</div>
35+
<!---->
36+
<div class="center sliding">Messages</div>
37+
<div class="right">
38+
<a href="#" class="link icon-only open-panel"><i class="icon icon-bars"></i></a>
39+
</div>
40+
</div>
41+
</div>
42+
43+
<div class="pages">
44+
<div data-page="messages" class="page">
45+
<div class="page-content">
46+
<div class="list-block virtual-list">
47+
<a href="#"></a>
48+
</div>
49+
>>>>>>> Stashed changes
2250
</div>
2351
</div>
2452
</div>
25-
</div>
53+
</body>
54+
</html>

0 commit comments

Comments
 (0)