Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Post create #14

Open
wants to merge 62 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
32e23b0
Created Login/Sign up
Mar 24, 2017
5de9818
no message
mateon-360 Mar 24, 2017
fd18db3
no message
mateon-360 Mar 24, 2017
a639593
no message
mateon-360 Mar 24, 2017
246fc04
asdasd
mateon-360 Mar 24, 2017
2c9f721
Updated Message
mateon-360 Mar 24, 2017
2a9acc2
Merge branch 'master' into Anthony
AGWeb18 Mar 24, 2017
751e4ba
Merge branch 'master' into Anthony
AGWeb18 Mar 24, 2017
1aa2155
Merge pull request #1 from AGWeb18/Anthony
AGWeb18 Mar 24, 2017
a9a5e9d
no message
mateon-360 Mar 24, 2017
97fb706
Updated cards for list view
hw2zheng Mar 24, 2017
3e05876
added register Page
Mar 24, 2017
dcabfd0
Merge branch 'Anthony' into haowei
hw2zheng Mar 25, 2017
eab5582
Merge pull request #2 from AGWeb18/haowei
hw2zheng Mar 25, 2017
51d06a3
merge
hw2zheng Mar 25, 2017
e07fb9b
updated index
hw2zheng Mar 25, 2017
0cd8b4d
sdfsedfs
mateon-360 Mar 25, 2017
1ac5c01
Merge pull request #3 from AGWeb18/newMatBranch
hw2zheng Mar 25, 2017
01d05f6
Map
MisterMousey Mar 25, 2017
fac9dde
Merge branch 'Anthony' into zach
hw2zheng Mar 25, 2017
26aca26
Merge pull request #4 from AGWeb18/zach
hw2zheng Mar 25, 2017
bda3ca0
merged
hw2zheng Mar 25, 2017
00f70b2
Refactored files
hw2zheng Mar 25, 2017
3280f6f
Map + Post
MisterMousey Mar 25, 2017
7878f2d
Fixed card sizes
hw2zheng Mar 25, 2017
e76c488
Merge pull request #5 from AGWeb18/ZacharyBrandLatest
hw2zheng Mar 25, 2017
8ec816c
merged
hw2zheng Mar 25, 2017
81f6320
Added validation for registration
heoegema Mar 25, 2017
91d25ab
Merge branch 'master2' into registration
heoegema Mar 25, 2017
54e5d64
Merge pull request #7 from AGWeb18/registration
heoegema Mar 25, 2017
7aa76ea
Added AJAX to postcards
hw2zheng Mar 25, 2017
1291786
Merge pull request #8 from AGWeb18/haowei2
hw2zheng Mar 25, 2017
91fdf98
added create post page
Mar 25, 2017
a43c04b
Merge pull request #9 from AGWeb18/Anthony2
AGWeb18 Mar 25, 2017
fac574a
merge i guess
hw2zheng Mar 25, 2017
4fbce46
Add Profile Page
MisterMousey Mar 25, 2017
ec2910b
Handled Login
heoegema Mar 25, 2017
dd60841
Merge pull request #10 from AGWeb18/ZacharyBrandLatest
MisterMousey Mar 25, 2017
41c87ca
Merge branch 'master2' of https://github.com/AGWeb18/hackathon into h…
hw2zheng Mar 25, 2017
d45f42f
Set window variable for user logged in as well as if user is logged in
heoegema Mar 25, 2017
ebf0a78
Merge pull request #11 from AGWeb18/login
heoegema Mar 25, 2017
80dc96a
Added logout ability
heoegema Mar 25, 2017
dd7a408
updated user permissions
heoegema Mar 25, 2017
eadf191
fixed the messagebar position
Mar 25, 2017
fd7fc70
Updated posts for ajax
hw2zheng Mar 25, 2017
234978f
Merge branch 'master2' into haowei2
hw2zheng Mar 25, 2017
437d1c8
Merge pull request #12 from AGWeb18/haowei2
hw2zheng Mar 25, 2017
247b294
Updated About Page
Mar 25, 2017
1f5580a
Merge branch 'master2' into Anthony4
AGWeb18 Mar 25, 2017
4266d96
Merge pull request #13 from AGWeb18/Anthony4
AGWeb18 Mar 25, 2017
5265003
Updated Messages
mateon-360 Mar 25, 2017
a23d35b
Ability to create posts
heoegema Mar 25, 2017
ac60701
Merge pull request #17 from AGWeb18/PostCreate
heoegema Mar 25, 2017
5ca5fea
Merge branch 'master2' into newBracnhMateo
mateon-360 Mar 25, 2017
4dc782f
Merge pull request #16 from AGWeb18/newBracnhMateo
mateon-360 Mar 25, 2017
5e3b43c
Added redirecting and fixed up navigation
heoegema Mar 25, 2017
12f50c5
Pls fix merge
heoegema Mar 25, 2017
a06b6e6
Merge branch 'master2' into PostCreate
heoegema Mar 25, 2017
baa7616
Merge pull request #18 from AGWeb18/PostCreate
heoegema Mar 25, 2017
bfc6892
Added id to profile
heoegema Mar 25, 2017
0a83dbc
Merge branch 'master2' of https://github.com/AGWeb18/hackathon into P…
heoegema Mar 25, 2017
896c1e7
Pls work
heoegema Mar 25, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
Binary file added OddJobb/.DS_Store
Binary file not shown.
14 changes: 12 additions & 2 deletions OddJobb/platforms/android/assets/www/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,18 @@
<div data-page="about" class="page">
<div class="page-content">
<div class="content-block">
<p>Here is About page!</p>
<p>Fusce eros lectus, accumsan eget mi vel, iaculis tincidunt felis. Nulla tincidunt pharetra sagittis. Fusce in felis eros. Nulla sit amet aliquam lorem, et gravida ipsum. Mauris consectetur nisl non sollicitudin tristique. Praesent vitae metus ac quam rhoncus mattis vel et nisi. Aenean aliquet, felis quis dignissim iaculis, lectus quam tincidunt ligula, et venenatis turpis risus sed lorem. Morbi eu metus elit. Ut vel diam dolor.</p>
<p><strong>Hack4Good - OddJobbs!</strong></p>
<p>
OddJobbs was inspired by a true story. One day after a big snowstorm, I received a text message from my mother saying there was an elderly woman who wasn't able to shovel her driveway. She lived on a street with a ton of kids, but wasn't able to connect with one of them to complete the task.
</p>
<br />
<p>
Soon after, the idea of a Hackathon was proposed to a group of us at 360insights. This got me thinking and OddJobbs was later planted to connect those
</p>
<br />
<p>
Anyone can use OddJobbs, if you're like my neighbour and just need a hand or if you travel frequently and want to support your local neighbourhood - OddJobbs was made for you.
</p>
</div>
</div>
</div>
Expand Down
139 changes: 137 additions & 2 deletions OddJobb/platforms/android/assets/www/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,142 @@

See https://github.com/apache/cordova-plugin-statusbar
*/

#map { height: 45%; width: 100%;}
.statusbar-overlay {
background: #000000;
}
}

@import url(https://fonts.googleapis.com/css?family=Roboto:300);

body{
background-color: #1cbb9b;
}
.login-box{
position:relative;
margin: 10px auto;
width: 500px;
height: 380px;
background-color: #fff;
padding: 10px;
border-radius: 3px;
-webkit-box-shadow: 0px 2px 3px 0px rgba(0,0,0,0.33);
-moz-box-shadow: 0px 2px 3px 0px rgba(0,0,0,0.33);
box-shadow: 0px 2px 3px 0px rgba(0,0,0,0.33);
}
.lb-header{
position:relative;
color: #00415d;
margin: 5px 5px 10px 5px;
padding-bottom:10px;
border-bottom: 1px solid #eee;
text-align:center;
height:28px;
}
.lb-header a{
margin: 0 25px;
padding: 0 20px;
text-decoration: none;
color: #666;
font-weight: bold;
font-size: 15px;
-webkit-transition: all 0.1s linear;
-moz-transition: all 0.1s linear;
transition: all 0.1s linear;
}
.lb-header .active{
color: #029f5b;
font-size: 18px;
}
.social-login{
position:relative;
float: left;
width: 100%;
height:auto;
padding: 10px 0 15px 0;
border-bottom: 1px solid #eee;
}
.social-login a{
position:relative;
float: left;
width:calc(40% - 8px);
text-decoration: none;
color: #fff;
border: 1px solid rgba(0,0,0,0.05);
padding: 12px;
border-radius: 2px;
font-size: 12px;
text-transform: uppercase;
margin: 0 3%;
text-align:center;
}
.social-login a i{
position: relative;
float: left;
width: 20px;
top: 2px;
}
.social-login a:first-child{
background-color: #49639F;
}
.social-login a:last-child{
background-color: #DF4A32;
}
.email-login,.email-signup{
position:relative;
float: left;
width: 100%;
height:auto;
margin-top: 20px;
text-align:center;
}
.u-form-group{
width:100%;
margin-bottom: 10px;
}
.u-form-group input[type="email"],
.u-form-group input[type="password"]{
width: calc(50% - 22px);
height:45px;
outline: none;
border: 1px solid #ddd;
padding: 0 10px;
border-radius: 2px;
color: #333;
font-size:0.8rem;
-webkit-transition:all 0.1s linear;
-moz-transition:all 0.1s linear;
transition:all 0.1s linear;
}
.u-form-group input:focus{
border-color: #358efb;
}
.u-form-group button{
width:50%;
background-color: #1CB94E;
border: none;
outline: none;
color: #fff;
font-size: 14px;
font-weight: normal;
padding: 14px 0;
border-radius: 2px;
text-transform: uppercase;
}
.forgot-password{
width:50%;
text-align: left;
text-decoration: underline;
color: #888;
font-size: 0.75rem;
}

.topmar{
margin: 0px 0;
font-size: 17px;

}

.abs{
position: absolute;
}

106 changes: 71 additions & 35 deletions OddJobb/platforms/android/assets/www/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html>

<head>
<!--
Customize this policy to fit your own app's needs. For more guidance, see:
Expand All @@ -10,7 +11,6 @@
* Disables use of inline scripts in order to mitigate risk of XSS vulnerabilities. To change this:
* Enable inline JS: add 'unsafe-inline' to default-src
-->
<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 *">

<!-- Required meta tags-->
<meta charset="utf-8">
Expand All @@ -21,7 +21,7 @@
<meta name="msapplication-tap-highlight" content="no">

<!-- Your app title -->
<title>My App</title>
<title>OddJobbs</title>

<!-- This template defaults to the iOS CSS theme. To support both iOS and material design themes, see the Framework7 Tutorial at the link below:
http://www.idangero.us/framework7/tutorials/maintain-both-ios-and-material-themes-in-single-app.html
Expand All @@ -30,6 +30,7 @@
<link rel="stylesheet" href="lib/framework7/css/framework7.ios.min.css">
<link rel="stylesheet" href="lib/framework7/css/framework7.ios.colors.min.css">

<link rel="stylesheet" href="css/card.css">
<link rel="stylesheet" href="css/styles.css">
</head>

Expand All @@ -43,25 +44,27 @@
<div class="panel panel-left panel-reveal">
<div class="content-block">
<div class="content-block-title">Navigation</div>
<div class="list-block">
<ul>
<li>
<a href="#" class="item-link list-button close-panel">Profile</a>
</li>
<li>
<a href="#" class="item-link list-button close-panel">Submit a new post</a>
</li>
<li>
<a href="/" class="item-link list-button close-panel">View current posts</a>
</li>
<li>
<a href="#" class="item-link list-button close-panel">Messages</a>
</li>
<li>
<a href="#" class="item-link list-button close-panel">Logout</a>
</li>
</ul>
</div>
<div class="list-block">
<ul>
<li>
<a href="profile.html" id="profile" class="item-link list-button close-panel">Profile</a>

</li>
<li>
<a href="createPost.html" id="createPost" class="item-link list-button close-panel">Submit a new post</a>
</li>
<li>
<a href="postList.html" class="item-link list-button close-panel">View current posts</a>
</li>
<li>
<a href="messages.html" id="viewMessages" class="item-link list-button close-panel">Messages</a>
</li>

<li>
<a href="#" id="logout" onclick="logout()" class="item-link list-button close-panel">Logout</a>
</li>
</ul>
</div>
</div>
</div>

Expand All @@ -73,7 +76,7 @@
<div class="navbar">
<div class="navbar-inner">
<!-- We need cool sliding animation on title element, so we have additional "sliding" class -->
<div class="center sliding">Awesome App</div>
<div class="center sliding">Odd Jobb</div>
<div class="right">
<!--
Right link contains only icon - additional "icon-only" class
Expand All @@ -85,33 +88,66 @@
</div>
<!-- Pages container, because we use fixed-through navbar and toolbar, it has additional appropriate classes-->
<div class="pages navbar-through toolbar-through">
<!-- Page, "data-page" contains page name -->
<div data-page="index" class="page">
<div data-page="login" class="page">
<!-- Scrollable page content -->
<div class="page-content">
<div class="content-block">
<p>Page content goes here</p>
<!-- Link to another page -->
<a href="about.html">About app</a>
<form>
<div class="list-block">
<ul>
<li class="item-content">
<div class="item-inner">
<div class="item-title label">Username</div>
<div class="item-input">
<input type="text" id="username" name="username" placeholder="Your username">
</div>
</div>
</li>
<li class="item-content">
<div class="item-inner">
<div class="item-title label">Password</div>
<div class="item-input">
<input type="password" id="pass" name="password" placeholder="Your password">
</div>
</div>
</li>
</ul>
</div>
<div class="list-block">
<ul>
<li><a href="#" id="login-box-link" class="item-link list-button">Sign In</a></li>
</ul>
<div class="list-block-label">
</div>
</div>
<p>Don't have an account? <a href="register.html"><strong> Register Now </strong></a>
</form>
</div>
</div>
</div>
</div>
<!-- Bottom Toolbar-->
<div class="toolbar">
<div class="toolbar-inner">
<!-- Toolbar links -->
<a href="#" class="link">Link 1</a>
<a href="#" class="link">Link 2</a>
</div>
</div>
</div>
</div>

<script type="text/javascript" src="cordova.js"></script>
<script type="text/javascript" src="lib/framework7/js/framework7.min.js"></script>
<script src="https://maps.google.com/maps/api/js?key=AIzaSyDqwL4NIot6kxkU47LWMQl5-f4sKvHMKrM"></script>

<!--Loading Controllers-->
<script type="text/javascript" src="js/my-app.js"></script>
<script type="text/javascript" src="js/controllers/about.js"></script>
<script type="text/javascript" src="js/controllers/defaultpage.js"></script>
<script type="text/javascript" src="js/controllers/message.js"></script>
<script type="text/javascript" src="js/controllers/register.js"></script>
<script type="text/javascript" src="js/controllers/jobpost.js"></script>
<script type="text/javascript" src="js/controllers/login.js"></script>
<script type="text/javascript" src="js/controllers/createPost.js"></script>


<script type="text/javascript" src="js/gmaps.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
<script src="js/messages.js"></script>
</body>

</html>
Loading