Skip to content
New issue

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

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

Already on GitHub? # to your account

pulling from master #1

Open
wants to merge 126 commits into
base: ListView
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
489a026
Left Side Bar complete
MXL88 Apr 21, 2015
8cdd58b
Merge branch 'orgView'
MXL88 Apr 21, 2015
2ca079d
sidebar's css
MXL88 Apr 21, 2015
c16163d
ap view done, start of createNew item
gnn2 Apr 26, 2015
5dd049a
Merge branch 'master' of https://github.com/Track-d/Tracked_Web_Clien…
gnn2 Apr 26, 2015
2a32942
adding ace logo and search icon
MXL88 Apr 26, 2015
6d3e4ba
Merge branch 'master' of https://github.com/Track-d/Tracked_Web_Clien…
gnn2 Apr 26, 2015
2384a7d
layout on new submit
gnn2 Apr 26, 2015
3faab60
geolocation fixed
gnn2 Apr 26, 2015
8765525
adding map button in list view
MXL88 Apr 27, 2015
78a0730
style updated
MXL88 Apr 30, 2015
b8d60ff
event view here
MXL88 Apr 30, 2015
5996b92
Merge branch 'eventView'
MXL88 Apr 30, 2015
82084e2
Merge branch 'master' into listview
MXL88 Apr 30, 2015
7dfbe6f
form styles
Apr 30, 2015
8973696
event details pulled from database
MXL88 May 2, 2015
115c083
took out alerts
MXL88 May 2, 2015
45df4bb
event listView is being pulled from database
MXL88 May 2, 2015
36cd6b5
fixing merge
MXL88 May 2, 2015
3f0e871
cleaned up the time and date event list view
MXL88 May 3, 2015
2e7da2a
about page created and style updated
MXL88 May 3, 2015
fdc0fde
updating listview branch
MXL88 May 3, 2015
52fbc14
Merge branch 'listview'
MXL88 May 3, 2015
95548d3
created support page and styled it
MXL88 May 3, 2015
219cc45
added important to style
MXL88 May 3, 2015
955487d
last min details before usability test
MXL88 May 6, 2015
312a294
range slider added
gnn2 May 6, 2015
4bf02d7
Rename file to have listView as the default view.
May 6, 2015
a177f49
small linking fix.
May 6, 2015
81d3521
Merge branch 'master' of https://github.com/Track-d/Tracked_Web_Clien…
gnn2 May 6, 2015
bc6b327
Merge branch 'mapview'
gnn2 May 6, 2015
6625373
replaced commons html to 2 separate html pages
MXL88 May 7, 2015
fbfbb78
After pull on Wed at 6pm css is messed up
MXL88 May 11, 2015
9183e2c
fixed mapview slider, started on submittion page
gnn2 May 13, 2015
38c0da4
cleaning up some code
gnn2 May 13, 2015
f26df87
fix mapview geolocation, add link to event page, added stuff for subm…
gnn2 May 14, 2015
8cd97db
mapview, submission form
gnn2 May 15, 2015
b79d8c8
added font fixed padding
May 18, 2015
2ccdf7f
fonts
May 18, 2015
0f904d9
fixed logo on far left top corner
May 18, 2015
d234d7a
logo changed
May 18, 2015
f3ddcb7
displaying nav and left sidebar with script
MXL88 May 18, 2015
5150f8a
changed logo
May 18, 2015
0209e22
merging Jenny's styles
MXL88 May 18, 2015
96b9603
submittion form validation
gnn2 May 18, 2015
521dea5
styles
May 21, 2015
79cbfca
Merge remote-tracking branch 'origin/Styling' into mapview
gnn2 May 21, 2015
3dd2dda
javascript for navs
May 21, 2015
be30777
small header
May 21, 2015
a6b858e
Added event images.
louisafan May 21, 2015
fe6aa96
Merge branch 'master' into Styling
May 21, 2015
1018f55
rso profile builder using a package
MXL88 May 21, 2015
c3bd1b3
fixed merge conflicts
May 21, 2015
398ad14
adding fonts
May 21, 2015
567dc2f
Change to https request
May 21, 2015
571e381
After pull on Wed at 6pm css is messed up
MXL88 May 11, 2015
a24a640
displaying nav and left sidebar with script
MXL88 May 18, 2015
c2973d0
Fix merge conflicts 然后谢谢学弟
May 23, 2015
0de2b38
accordian styled support page and using wizard for profile builder
MXL88 May 25, 2015
e82616c
rso profile builder is done, need more content
MXL88 May 26, 2015
d8e0a0a
Merge remote-tracking branch 'origin/rsoProfBuilder' into mapview
gnn2 May 26, 2015
5021772
merging michelles rso page branch
gnn2 May 26, 2015
0d4b14a
Merge branch 'master' of https://github.com/Track-d/Tracked_Web_Clien…
gnn2 May 26, 2015
e747317
working on linking listView to displaying event details in eventView
MXL88 May 26, 2015
7887eec
updating form submit
gnn2 May 27, 2015
510d738
merging rsoProfBuilder branch, includes scripted nav and side bars
MXL88 May 28, 2015
4dca16c
merged Styles
May 28, 2015
4a11771
marker clusters
May 28, 2015
3604c08
Merge remote-tracking branch 'origin/master' into mapview
gnn2 May 28, 2015
4bee96c
submission form tuggle between event and place
gnn2 May 28, 2015
f261d6d
change urls to https
gnn2 May 28, 2015
53c7dd0
resolved merge conflict
MXL88 May 28, 2015
ce33ac5
resolved merge conflict
MXL88 May 28, 2015
9bd5bb5
added sidebar to index
MXL88 May 28, 2015
689d3eb
https request
gnn2 May 28, 2015
c7e2586
Merge branch 'mapview'
gnn2 May 28, 2015
ce5bf70
Fix https request.
May 28, 2015
70eca4e
fix https errors
gnn2 May 29, 2015
2858b7d
Merge branch 'mapview'
gnn2 May 29, 2015
aa27102
Merge branch 'master' of https://github.com/Track-d/Tracked_Web_Client
gnn2 May 29, 2015
9e358fc
Merge branch 'master' of https://github.com/Track-d/Tracked_Web_Clien…
gnn2 May 29, 2015
c5c7ca3
Merge branch 'mapview'
gnn2 May 29, 2015
352a54d
check css
May 30, 2015
5a82be8
After pull on Wed at 6pm css is messed up
MXL88 May 11, 2015
105a30b
displaying nav and left sidebar with script
MXL88 May 18, 2015
3587702
Fix merge conflicts 然后谢谢学弟
May 23, 2015
901c63c
marker clusters
May 28, 2015
ee35233
Fix css
May 30, 2015
94a24a3
fix merge conflicts
gnn2 May 30, 2015
161d09f
fix merge conflicts
May 30, 2015
09b3463
Revert "Fix css"
May 30, 2015
18d870e
linking listview to eventview is working
MXL88 May 30, 2015
1a4f8ab
listView is now linked to eventView
MXL88 May 30, 2015
5dc8817
Merge branch 'master' of https://github.com/Track-d/Tracked_Web_Clien…
gnn2 May 30, 2015
29540fa
Merge branch 'master' of https://github.com/Track-d/Tracked_Web_Client
May 30, 2015
50cf2eb
Merge branch 'master' into Styling
May 30, 2015
139ace8
fix merge conficts
May 30, 2015
397ddca
fixed margin in index
May 30, 2015
2745f13
took out alerts and marker for map view button
May 31, 2015
3595dfe
changed nav header
May 31, 2015
9743c7f
Merge branch 'master' of https://github.com/Track-d/Tracked_Web_Clien…
gnn2 May 31, 2015
3d9885a
event start and end time is now in PST and took out login in nav bar
MXL88 Jun 2, 2015
9c76dd3
trying to get map view to event view
MXL88 Jun 2, 2015
afcd1e6
added missing quotation mark
MXL88 Jun 2, 2015
40b4432
fixed padding and search icon
Jun 2, 2015
747ec34
added new org icon, list view's layout is good, org name is pulled fr…
MXL88 Jun 3, 2015
2735f45
resolved merge conflict
MXL88 Jun 3, 2015
f2ea8de
styles for support and about
Jun 3, 2015
3813de1
pinterest style list view
Jun 3, 2015
94327f2
eventView margin
Jun 3, 2015
51d9970
Merge from Stying
Jun 4, 2015
0bb089b
Merge branch 'master' into mapview
gnn2 Jun 4, 2015
74aa21e
Delete angular script
Jun 4, 2015
d41fbf6
fix merge conflicts
MXL88 Jun 4, 2015
7029e30
Fix routing
Jun 4, 2015
c74e8f6
url routing and mapview to eventview is working
MXL88 Jun 4, 2015
2cb8786
list view event pictures link to event and more event pictures are ad…
MXL88 Jun 4, 2015
bb85801
adding event pictures
MXL88 Jun 4, 2015
8351096
merge conflict resolved
MXL88 Jun 4, 2015
ca3d539
Change to get real data
Jun 4, 2015
25eed8b
last changes
gnn2 Jun 4, 2015
f811f46
modify url
gnn2 Jun 4, 2015
50ff02a
fix merge conflicts
gnn2 Jun 4, 2015
4ad4dbd
nav bar and css
gnn2 Jun 4, 2015
7aebd73
fix time converting issue
Jun 4, 2015
3b1d33a
temp commit:use fake json data
Jun 4, 2015
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.
53 changes: 53 additions & 0 deletions about.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<html>
<head>
<title>About</title>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>

<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">

<!-- Optional theme -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap-theme.min.css">

<!-- Latest compiled and minified JavaScript -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.min.js"></script>
<link rel="stylesheet" type="text/css" href="css/style.css">
<script>
$(function(){
$("#nav_bar").load("nav.html");
$("#left_sidebar").load("left_sidebar.html");
});
</script>
</head>
<body>
<div id="nav_bar"></div>
<div id="left_sidebar"></div>
<div id="page-content-wrapper" class="about_page">
<div class="page-content">
<div class="container" id="about-container">
<center>
<img id="about-logo" src="img/logo2.png">
<p id="about-text">
Track'd is an application developed by University of Washington Informatics students as a part of their 2015 capstone project.<p>

</center>

<div id="about-credits">

<h4 class="about-names"><b>Louisa Fan </b>Project Manager | </h4> <h4 class="about-names"><b> Jenny Chen </b>Design Lead</h4> <h4 class="about-names"> <b>Michelle Le</b> UX / Dev Lead |</h4>

<h4 class="about-names"><b> Gabby Nikolova </b>Dev Lead</h4> <h4 class="about-names"><b> Shengyao Qian </b>Dev Lead</h4>

</div>
<center id="about-copyrt">
<h4>Copyright 2015. All Rights Reserved</h4>
</center>
</div>
</div>
</div>
</div>



</body>
</html>
180 changes: 180 additions & 0 deletions createNew.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
<!DOCTYPE html>
<html>
<head>
<title>Track'd</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
<meta charset="utf-8">


<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js" type="text/javascript"></script>
<!--<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDrfqu9Nw7UW-ZJGYvJqXP7Y3J2q1JDAkE"></script>-->
<script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.9/jquery.validate.js"></script>
<script src="https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&libraries=places"></script>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">

<!-- Optional theme -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap-theme.min.css">

<!-- Latest compiled and minified JavaScript -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.min.js"></script>
<!-- our own JavaScript files -->
<script src="js/newPost.js"></script>
<script src="js/searchLocation.js"></script>
<link rel="stylesheet" type="text/css" href="css/style.css">
<!--<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3&sensor=true&callback=init"></script>-->
<script>
$(function(){
$("#nav_bar").load("nav.html");
$("#left_sidebar").load("left_sidebar.html");
});
</script>

</head>
<body>

<div id="nav_bar"></div>
<div id="main">
<div id="left_sidebar"></div>
<div class="submission_form">
<div id="sub_container" class = "container">
<div id="filter">
<h4>Add New</h4>
<form class="form-inline" id = "subForm" action="#">
<div class="form-group">
<input class="form-control" id="name" placeholder=" * Name" name="event_name" >
<div class="error_label"></div>
<!-- <label class="sr-only" for="exampleInputEmail3">Name</label>
<input type="email" class="form-control" id="exampleInputEmail3" placeholder="Name">-->
</div>
<div class="form-group">
<input class="form-control" id="fbLink" placeholder="Facebook Export Link">
<div class="error_label"></div>

<!-- <label class="sr-only" for="exampleInputPassword3">Facebook Export Link</label>
<input type="password" class="form-control" id="exampleInputPassword3" placeholder="Facebook Export Link">-->
</div>
</br>
<label id="filter-event"><input id="event" type="radio" name="optradio" checked="checked" onclick="selectEvent()"> Event </label>
<label id="filter-place"><input id="place" type="radio" name="optradio" onclick="selectPlace()"> Place </label>

<div class="error_label"></div>
<div class="form-group">
<!-- <label class="sr-only" for="exampleInputEmail3">Name</label>
<input type="email" class="form-control" id="exampleInputEmail3" placeholder="Date">-->
<input class="form-control" id="org_name" name="org_name" placeholder=" * Organization Name" ></input>
<div class="error_label"></div>
<input class="form-control" id="date" name="date" placeholder=" * Date: mm/dd/yyyy"></input>
<div class="error_label"></div>
</div>
<div class="form-group">
<!-- <label class="sr-only" for="exampleInputPassword3">Facebook Export Link</label>
<input type="password" class="form-control" id="exampleInputPassword3" placeholder="Time">-->
<input class="form-control" id="s_time" name="s_time" placeholder=" * Start Time: hh:mm AM/PM">
<div class="error_label"></div>
<input class="form-control" id="e_time" name="e_time" placeholder="* End Time: hh:mm AM/PM">
<div class="error_label"></div>

</div>
</br>
<div class="form-group">
<input class="form-control" type="text" id="room" name="room" placeholder="room #"></input>
<input class="form-control"type="text" id="location" name="location" placeholder=" * Location "></input>
<div class="error_label"></div>
</div>
<textarea class="form-control" rows="5" id = "event_desc_short" name="event_desc_short" placeholder="Tagline: (5-10 words)"></textarea>
<div class="error_label"></div>
<textarea class="form-control" rows="100" name="event_desc_long" placeholder=" * Description"></textarea>
<div class="error_label"></div>
<div class="form-group">
<!-- <label class="sr-only" for="exampleInputPassword3">Facebook Export Link</label>
<input type="password" class="form-control" id="exampleInputPassword3" placeholder="Location">-->
</div>
<!--<<button id = "repeat" type ="button" onclick ="addImage()">x Repeat</button>
<button id = "addImage" type ="button" onclick ="addImage()">+ Add Image</button>
</div>
<div class="form-group">
<div id="week">
<button type ="button" id="week-m" class ="btn-week" onclick="activateItem(this); return false;">Mon</button>
<button type ="button" id="week-t"class ="btn-week">Tue</button>
<button type ="button" id="week-w" class ="btn-week">Wed</button>
<button type ="button" id="week-th" class ="btn-week">Thur</button>
<button type ="button" id="week-f" class ="btn-week">Fri</button>
<button type ="button" id="week-s" class ="btn-week">Sat</button>
<button type ="button" id="week-su"class ="btn-week">Sun</button>
</div>

</div>-->
<input type="hidden" id="lat" name="lat" />
<input type="hidden" id="long" name="long" />
<input type="hidden" id="start_time" name="start_time" />
<input type="hidden" id="end_time" name="end_time" />
</br>
<Button class="sub-btn" type="submit" id="submit" onclick="submitForm();">Post</Button>
<Button id = "cancel" type ="button" onclick ="location.href='http://trackd.info/index.html'">Cancel</Button>
</div>




<!-- <div class="checkbox">
<label>
<input type="checkbox"> Remember me
</label>
</div>
<button type="submit" class="btn btn-default">#</button></div>
</form>
<br>

<form >
<div class="column">
Name:<br>
<input type="text" name="name" placeholder ="Name">
<br>
<label id="filter-event"><input type="radio" name="optradio"> Event </label>
<label id="filter-place"><input type="radio" name="optradio"> Place </label>
<br>
Description:<br>
<input type="text" name="description" placeholder ="Description">
<br>
Host:<br>
<input type="text" name="host" placeholder ="Host">
<br>
Date:<br>
<input type="text" name="date" placeholder ="Date">
<br>
Time:<br>
<input type="text" name="time" placeholder ="Time">
<br>
Location:<br>
<input type="text" name="location" placeholder ="Location">
<br>
Event Link:<br>
<input type="text" name="link" placeholder ="Export From Facebook (Event Link)">
<br>
<br>

<button id = "addImage" type ="button" onclick ="addImage()">+ Add Image</button>
<div id="week">
<button type ="button" id="week-m" class ="btn-week" onclick="activateItem(this); return false;">Mon</button>
<button type ="button" id="week-t"class ="btn-week">Tue</button>
<button type ="button" id="week-w" class ="btn-week">Wed</button>
<button type ="button" id="week-th" class ="btn-week">Thur</button>
<button type ="button" id="week-f" class ="btn-week">Fri</button>
<button type ="button" id="week-s" class ="btn-week">Sat</button>
<button type ="button" id="week-su"class ="btn-week">Sun</button>
</div>

<Button type="submit" id = "submit" formaction="delete.php" formmethod="POST">Post</Button>
</div>-->

</form>
</div>
<!-- our own JavaScript files -->
<script type="text/javascript" src="js/newPost.js"></script>
</div>

</div>

</body>
</html>
Binary file added css/Font/ProximaNova/ProximaNova-Light.otf
Binary file not shown.
Binary file added css/Font/ProximaNova/ProximaNova-Regular.otf
Binary file not shown.
Binary file added css/Font/ProximaNova/ProximaNova-Semibold.otf
Binary file not shown.
Loading