Skip to content

U
uBus
Commit 203bdd39 authored by ejcris's avatar ejcris
Browse files
Options

Merge branch 'master' of https://github.com/chiawase/CS123-uBus

parents a631e88c ffaf6a16
Hide whitespace changes
Inline Side-by-side
Showing with 2863 additions and 181 deletions
.gitignore
View file @ 203bdd39
......@@ -25,3 +25,7 @@ proguard/
# Log Files
*.log
# Compressed Files
*.zip
*.rar
files/provincialbusfranchises2015.csv 0 → 100644
View file @ 203bdd39
This source diff could not be displayed because it is too large. You can view the blob instead.
img/favicons/browserconfig.xml 0 → 100644
View file @ 203bdd39
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square70x70logo src="/mstile-70x70.png"/>
<square150x150logo src="/mstile-150x150.png"/>
<square310x310logo src="/mstile-310x310.png"/>
<wide310x150logo src="/mstile-310x150.png"/>
<TileColor>#da532c</TileColor>
</tile>
</msapplication>
</browserconfig>
img/favicons/manifest.json 0 → 100644
View file @ 203bdd39
{
"name": "uBus",
"icons": [
{
"src": "\/android-chrome-36x36.png",
"sizes": "36x36",
"type": "image\/png",
"density": "0.75"
},
{
"src": "\/android-chrome-48x48.png",
"sizes": "48x48",
"type": "image\/png",
"density": "1.0"
},
{
"src": "\/android-chrome-72x72.png",
"sizes": "72x72",
"type": "image\/png",
"density": "1.5"
},
{
"src": "\/android-chrome-96x96.png",
"sizes": "96x96",
"type": "image\/png",
"density": "2.0"
},
{
"src": "\/android-chrome-144x144.png",
"sizes": "144x144",
"type": "image\/png",
"density": "3.0"
},
{
"src": "\/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image\/png",
"density": "4.0"
}
]
}
img/favicons/safari-pinned-tab.svg 0 → 100644
View file @ 203bdd39
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
width="630.000000pt" height="630.000000pt" viewBox="0 0 630.000000 630.000000"
preserveAspectRatio="xMidYMid meet">
<metadata>
Created by potrace 1.11, written by Peter Selinger 2001-2013
</metadata>
<g transform="translate(0.000000,630.000000) scale(0.100000,-0.100000)"
fill="#000000" stroke="none">
<path d="M945 5386 c-65 -31 -117 -86 -152 -161 l-28 -60 -3 -1772 -2 -1773
1865 0 1865 0 -2 1783 -3 1782 -28 60 c-34 72 -78 121 -132 146 -38 18 -104
19 -1685 19 l-1645 0 -50 -24z m2425 -313 c20 -29 25 -49 25 -98 0 -49 -5 -69
-25 -98 l-25 -37 -760 0 -761 0 -44 23 c-36 17 -49 32 -64 68 -18 45 -18 46 2
93 17 37 30 51 64 66 41 19 71 20 803 20 l760 0 25 -37z m621 -605 l24 -43 3
-472 3 -473 -1470 0 -1471 0 0 450 c0 491 1 498 57 538 16 11 44 25 63 30 22
7 529 11 1401 11 l1365 1 25 -42z"/>
<path d="M5066 5254 c-103 -25 -184 -72 -267 -154 -156 -154 -213 -356 -159
-564 28 -110 74 -190 155 -272 230 -231 600 -231 830 0 236 237 234 601 -4
836 -84 84 -164 129 -272 155 -79 18 -205 18 -283 -1z"/>
<path d="M5070 2830 l0 -1210 135 0 135 0 0 1210 0 1210 -135 0 -135 0 0
-1210z"/>
<path d="M1080 1256 c0 -267 1 -274 23 -306 46 -68 61 -73 245 -83 92 -4 223
-7 292 -5 141 4 176 17 217 77 21 31 22 41 23 312 l1 279 -56 0 c-30 0 -55 -4
-55 -10 0 -6 -40 -10 -100 -10 l-100 0 0 -265 0 -265 -173 0 c-156 0 -176 2
-190 18 -15 16 -17 50 -17 275 l0 257 -55 0 -55 0 0 -274z"/>
<path d="M2250 1200 l0 -330 332 0 c315 0 334 1 374 21 65 31 84 69 84 168 0
55 -5 92 -16 112 -14 28 -14 32 0 48 12 13 16 40 16 111 0 111 -19 151 -84
181 -37 17 -71 19 -373 19 l-333 0 0 -330z m674 198 c10 -13 16 -44 16 -75 0
-41 -4 -54 -19 -63 -12 -6 -118 -10 -275 -10 l-256 0 0 -50 0 -50 250 0 251 0
24 -25 c32 -31 34 -96 5 -125 -19 -19 -33 -20 -295 -20 l-275 0 0 220 0 220
279 0 c278 0 280 0 295 -22z"/>
<path d="M3420 1252 l0 -277 25 -37 c43 -63 73 -69 380 -71 256 -2 272 -1 305
19 19 11 45 35 57 54 23 32 23 39 23 311 l0 279 -50 0 c-27 0 -50 -4 -50 -10
0 -6 -42 -10 -105 -10 l-105 0 0 -265 0 -265 -170 0 c-157 0 -172 2 -190 20
-19 19 -20 33 -20 275 l0 255 -50 0 -50 0 0 -278z"/>
<path d="M4670 1508 c-67 -34 -93 -90 -87 -186 5 -81 20 -111 77 -149 32 -22
40 -23 299 -23 314 0 311 1 311 -84 0 -89 13 -86 -353 -86 l-317 0 0 -55 0
-56 339 3 c325 3 341 4 367 24 56 41 69 69 72 157 4 95 -13 137 -68 175 -32
21 -40 22 -297 22 -260 0 -295 4 -315 34 -13 20 -8 91 8 114 15 22 16 22 335
22 l319 0 0 55 0 55 -323 0 c-315 0 -324 -1 -367 -22z"/>
</g>
</svg>
mobile-app/10-16-15/Project/.idea/gradle.xml
View file @ 203bdd39
......@@ -5,8 +5,8 @@
<GradleProjectSettings>
<option name="distributionType" value="LOCAL" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.4" />
<option name="gradleJvm" value="1.7" />
<option name="gradleHome" value="D:\Program Files\Android Studio1\gradle\gradle-2.4" />
<option name="gradleJvm" value="1.8" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
......
mobile-app/10-16-15/Project/.idea/misc.xml
View file @ 203bdd39
......@@ -34,7 +34,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
......
mobile-app/10-16-15/Project/.idea/vcs.xml
View file @ 203bdd39
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="" />
<mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
</component>
</project>
\ No newline at end of file
mobile-app/10-16-15/Project/app/app.iml
View file @ 203bdd39
......@@ -86,12 +86,10 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
<orderEntry type="library" exported="" name="bolts-android-1.2.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
<orderEntry type="library" exported="" name="parse-android-1.10.3" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
......
mobile-app/10-16-15/Project/app/build.gradle
View file @ 203bdd39
......@@ -23,6 +23,6 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.parse.bolts:bolts-android:1.+'
//compile 'com.parse.bolts:bolts-android:1.+'
compile fileTree(dir: 'libs', include: 'Parse-*.jar')
}
mobile-app/10-16-15/Project/app/src/main/res/layout/activity_confirmation.xml
View file @ 203bdd39
......@@ -6,60 +6,96 @@
android:orientation="vertical"
tools:context="${relativePackage}.${activityClass}" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center"
android:layout_marginBottom="20dp"
android:layout_marginTop="20dp">
<TextView
android:id="@+id/noOfSeats"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="00 "
android:marginLeft="20dp"
android:marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
android:id="@+id/noOfSeatsLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Seats Reserved!"
android:marginLeft="20dp"
android:marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceLarge" />
</LinearLayout>
<LinearLayout
android:id="@+id/LinearLayout2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<LinearLayout
android:id="@+id/LinearLayout3"
android:layout_width="wrap_content"
<FrameLayout
android:layout_height="wrap_content"
android:orientation="vertical" >
android:layout_width="wrap_content"
android:marginLeft="20dp"
android:marginRight="20dp"
android:layout_weight="2">
<TextView
android:id="@+id/busNum"
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Large Text"
android:textAppearance="?android:attr/textAppearanceLarge" />
android:layout_gravity="center"
android:src="@drawable/ubus_logo"
android:id="@+id/busCompanyLogo2" />
<TextView
android:id="@+id/plateNum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Medium Text"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
</FrameLayout>
<LinearLayout
android:id="@+id/LinearLayout4"
android:id="@+id/LinearLayout3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical" >
android:orientation="vertical"
android:layout_weight="2">
<TextView
android:id="@+id/fromLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="From"
android:marginLeft="20dp"
android:marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/from"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:text="Medium Text"
android:text="PlaceA"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/depTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="ETD 00:00"
android:marginLeft="20dp"
android:marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
<LinearLayout
android:id="@+id/LinearLayout5"
android:id="@+id/LinearLayout4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical" >
android:orientation="vertical"
android:layout_weight="2">
<TextView
android:id="@+id/toLabel"
......@@ -72,67 +108,87 @@
android:id="@+id/to"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="27dp"
android:text="Medium Text"
android:text="PlaceB"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/depTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Medium Text"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/seatsAvailableLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Seats Available"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/arrTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="ETA 00:00"
android:marginLeft="20dp"
android:marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/seatsAvailable"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="25dp"
android:text="Medium Text"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/LinearLayout6"
android:layout_width="wrap_content"
android:id="@+id/LinearLayout5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="horizontal" >
<TextView
android:id="@+id/cost"
<LinearLayout
android:id="@+id/LinearLayout6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Large Text"
android:textAppearance="?android:attr/textAppearanceLarge" />
android:gravity="center"
android:layout_weight="2"
android:orientation="horizontal" >
<TextView
android:id="@+id/forLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="for"
android:textAppearance="?android:attr/textAppearanceLarge" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:id="@+id/seatsPurchasedLogo"
android:src="@drawable/ubus_logo"/>
<TextView
android:id="@+id/seatsPurchased"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="00"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/noOfSeatsReserved"
</LinearLayout>
<LinearLayout
android:id="@+id/LinearLayout8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Large Text"
android:textAppearance="?android:attr/textAppearanceLarge" />
android:layout_gravity="center"
android:layout_weight="2"
android:orientation="horizontal" >
<TextView
android:id="@+id/purchaseLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="TOTAL: P "
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
android:id="@+id/purchase"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="00"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/LinearLayout7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_gravity="right"
android:orientation="horizontal" >
<Button
......@@ -140,13 +196,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity = "center"
android:text="OK" />
<Button
android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity = "center"
android:text="Cancel" />
android:text="OK"
android:layout_marginRight="20dp"/>
</LinearLayout>
</LinearLayout>
mobile-app/10-16-15/Project/app/src/main/res/layout/activity_login__screen.xml
View file @ 203bdd39
......@@ -10,15 +10,15 @@
android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".Login_Screen"
>
<LinearLayout
android:layout_width="263dp"
android:layout_height="236dp"
android:layout_weight="0.5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/logo"
android:src="@drawable/ubus_logo3"
android:id="@+id/imageView"
android:layout_gravity="center"
/>
......@@ -30,7 +30,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Registration"
android:text="Reserve your tickets."
android:layout_gravity="center"
android:id="@+id/textView"
android:layout_weight="2"
......@@ -41,20 +41,20 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/name"
android:text="Name"
android:text="username/cellphone no."
android:layout_weight="1"
android:layout_gravity="center_horizontal" />
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Password"
android:text="password"
android:ems="10"
android:id="@+id/password"
android:layout_weight="1"
android:layout_gravity="center_horizontal" />
<LinearLayout
<!--LinearLayout
android:orientation="vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
......@@ -67,7 +67,7 @@
android:id="@+id/checkBox"
android:gravity="left"
android:layout_gravity="center"/>
</LinearLayout>
</LinearLayout-->
<LinearLayout
android:orientation="vertical"
......@@ -79,18 +79,40 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="SUBMIT"
android:text="LOGIN"
android:onClick="submit"
android:layout_weight="2"
android:id="@+id/submit" />
<Button
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Not yet a member? Sign up"
android:layout_gravity="center"
android:id="@+id/notYetAMember"
android:layout_weight="2"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true" />
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_gravity="center"
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="ABOUT"
android:layout_gravity="center"
android:text="NEW USER"
android:onClick="newUser"
android:id="@+id/about"
android:layout_weight="2"
android:id="@+id/newUser" />
android:layout_centerVertical="true"
android:layout_centerHorizontal="true" />
</LinearLayout>
</LinearLayout>
mobile-app/10-16-15/Project/app/src/main/res/layout/fragment_about.xml
View file @ 203bdd39
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.example.pearlsantos.project.Help">
tools:context="com.example.pearlsantos.project.Help"
android:orientation="vertical">
<TextView android:id="@android:id/empty" android:layout_width="match_parent"
android:layout_height="match_parent" android:gravity="center" android:text="Coming soon" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="About uBus"
android:layout_gravity="top|center"
android:id="@+id/about"
android:layout_weight="1"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true" />
</FrameLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="20dp"
android:layout_marginLeft="20dp"
android:text="uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor "
android:layout_gravity="center"
android:id="@+id/uBus_about"
android:layout_weight="2"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="OK"
android:id="@+id/okayButton"
android:layout_gravity="right"
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>
mobile-app/10-16-15/Project/app/src/main/res/layout/listview3.xml 0 → 100644
View file @ 203bdd39
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/LinearLayout1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="${relativePackage}.${activityClass}" >
<LinearLayout
android:id="@+id/LinearLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<LinearLayout
android:id="@+id/LinearLayout2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity = "center"
android:orientation="horizontal" >
<FrameLayout
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:marginLeft="20dp"
android:marginRight="20dp"
android:layout_weight="2">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:id="@+id/busCompanyLogo"
android:src="@drawable/ubus_logo"
/>
</FrameLayout>
<LinearLayout
android:id="@+id/LinearLayout3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_weight="2">
<TextView
android:id="@+id/fromLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="From"
android:marginLeft="20dp"
android:marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/from"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="PlaceA"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/depTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="ETD 00:00"
android:marginLeft="20dp"
android:marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
<LinearLayout
android:id="@+id/LinearLayout4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_weight="2">
<TextView
android:id="@+id/toLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="To"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/to"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="PlaceB"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/arrTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="ETA 00:00"
android:marginLeft="20dp"
android:marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/LinearLayout5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<LinearLayout
android:id="@+id/LinearLayout6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_weight="2"
android:orientation="horizontal" >
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:id="@+id/seatsAvailableLogo"
android:src="@drawable/ubus_logo"/>
<TextView
android:id="@+id/seatsAvailable"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="00"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
<LinearLayout
android:id="@+id/LinearLayout7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_weight="2"
android:orientation="horizontal" >
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:id="@+id/costLogo"
android:src="@drawable/ubus_logo"/>
<TextView
android:id="@+id/cost"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="00"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:gravity="right">
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Buy Tickets"
android:id="@+id/buyTickets"
android:layout_marginRight="20dp"
android:layout_gravity="center" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
mobile-app/10-16-15/Project/app/src/main/res/layout/number_of_tickets.xml 0 → 100644
View file @ 203bdd39
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="2"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="INDICATE NUMBER OF TICKETS"
android:id="@+id/numberOfTickets"
android:layout_gravity="top|center" />
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_weight="3"
android:orientation="horizontal"
android:gravity="center">
<NumberPicker
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/numberPicker"
android:layout_gravity="center_horizontal" />
<NumberPicker
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/numberPicker2"
android:layout_gravity="center_horizontal" />
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_weight="1"
android:orientation="horizontal"
android:gravity="right">
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Cancel"
android:id="@+id/cancel"
android:layout_gravity="center_horizontal" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="OK"
android:id="@+id/okButtonForBuying"
android:layout_gravity="right" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
mobile-app/10-16-15/Project/app/src/main/res/layout/sign_up.xml
View file @ 203bdd39
......@@ -11,13 +11,27 @@
android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".Login_Screen"
>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:layout_gravity="center|top">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ubus_logo3"
android:id="@+id/imageView"
android:layout_gravity="center|top"
/>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="New User"
android:text="Create an Account"
android:layout_gravity="center"
android:id="@+id/textView"
android:id="@+id/createAccount"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true"
android:layout_weight="2"/>
......@@ -25,16 +39,16 @@
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/name"
android:text="Name"
android:layout_weight="2" />
android:id="@+id/firstName"
android:text="First name"
android:layout_weight="2"
android:layout_gravity="center_horizontal" />
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Password"
android:ems="10"
android:id="@+id/password"
android:id="@+id/lastName"
android:text="Last name"
android:layout_weight="2"
android:layout_gravity="center_horizontal" />
......@@ -42,12 +56,26 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="phone"
android:text="Cellphone Number"
android:text="Cellphone no."
android:ems="10"
android:id="@+id/phone"
android:layout_weight="2"
android:layout_gravity="center_horizontal" />
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/password"
android:text="password"
android:layout_weight="2"
android:layout_gravity="center_horizontal" />
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/confirmPassword"
android:text="confirm password"
android:layout_weight="2"
android:layout_gravity="center_horizontal" />
<LinearLayout
android:orientation="horizontal"
......@@ -59,8 +87,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="OK"
android:id="@+id/ok" />
android:text="REGISTER"
android:onClick="okay"
android:id="@+id/submit" />
</LinearLayout>
......
web-app/adminAccount.html 0 → 100644
View file @ 203bdd39
<!DOCTYPE html>
<html>
<head>
<title>uBus | Bus Schedules</title>
<link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="css/style.css">
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.4.js"></script>
<script src="http://www.parsecdn.com/js/parse-1.6.6.min.js"></script>
</head>
<body>
<header>
<nav>
<a href="index.html"><img src="img/logo.png" width="40px"></a>
<a href="javascript:void(0);"><img src="img/add.png" width="40px"></a>
<a href="javascript:void(0);"><img src="img/search.png" width="40px"></a>
</nav>
</header>
<div class="wrapper">
<div class="title">
<img src="img/scheduling.png" width="40px">
<h1>Create Admin Account</h1>
</div>
<div class="card">
<div class="row">
<form method="post" class="card_adminAccount" id="create_adminAccount" style="display:block; margin:0 auto;">
<fieldset>
<label for="addUname"><i class="fa fa-2x fa-user"></i>
<input type="text" id="addUname" placeholder="Username"></label>
</fieldset>
<fieldset>
<label for="addPassword"><i class="fa fa-2x fa-key"></i>
<input type="password" id="addPassword" placeholder="Password">
</label>
</fieldset>
<fieldset>
<label for="addEmail"><i class="fa fa-2x fa-envelope"></i>
<input type="text" id="addEmail" placeholder="admin@example.com">
</label>
</fieldset>
<fieldset>
<label for="addBusCompany"><i class="fa fa-2x fa-bus"></i>
<input type="text" id="addBusCompany" placeholder="Example Lines">
</label>
</fieldset>
<fieldset style="margin-top: 40px;">
<input type="submit">
</fieldset>
</form>
</div>
</div>
<div class="schedules"></div>
</div>
<script type="text/javascript" src="js/app.js"></script>
</body>
</html>
web-app/css/style.css
View file @ 203bdd39
......@@ -3,6 +3,10 @@ html, body {
padding: 0;
}
body {
font-family: "Courier New", Courier, monospace;
}
nav {
position: relative;
height: 60px;
......@@ -21,6 +25,14 @@ nav a:first-child {
float: left;
}
nav > h1 {
display: inline-block;
margin: 0;
padding-top: 15px;
padding-left: 15px;
color: #fff;
}
.button {
display: inline-block;
width: 45% !important;
......@@ -75,8 +87,18 @@ nav a:first-child {
left: 0;
}
.row {
position: relative;
}
.card .img-placeholder {
position: absolute;
top: 0;
}
.card form {
display: inline-block;
margin-left: 80px;
width: calc(100% - 80px);
}
......@@ -113,6 +135,23 @@ nav a:first-child {
border-right: 0;
}
.card_adminAccount fieldset {
display: inline-block;
width: 40%;
border: none;
margin-bottom: 20px;
}
.card_adminAccount input[type="text"], .card_adminAccount input[type="password"] {
position: relative;
top: 50%;
transform: translateY(-50%);
margin-left: 15px;
border-top:0;
border-left: 0;
border-right: 0;
}
input[type="text"] {
}
......
web-app/index.html
View file @ 203bdd39
......@@ -3,18 +3,24 @@
<head>
<title>uBus | Admin System</title>
<meta name="description" content="uBus Ticket Reservation System administrator tools.">
<link rel="icon" type="image/x-icon" href="img/favicon.ico">
<link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="css/style.css">
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.4.js"></script>
<script src="http://www.parsecdn.com/js/parse-1.6.6.min.js"></script>
<script type="text/javascript" src="js/app.js"></script>
</head>
<body>
<header>
<nav>
<a href="index.html"><img src="img/logo.png" width="40px"></a>
<h1 style="display:inline-block; margin:0; padding-top:10px; padding-left:15px;">Bus Ticket Reservation System</h1>
<a href="adminAccount.html" style="color:white;padding:15px 20px;"><i class="fa fa-plus fa-2x"></i></a>
<a href="login.html"><i class="fa fa-2x fa-user"></i></a>
</nav>
</header>
<div class="wrapper">
<div class="wrapper" id="parent">
<div class="card button">
<a href="schedule.html" id="admin">
<img src="img/scheduling.png" width="50%">
......
web-app/js/app.js
View file @ 203bdd39
Parse.initialize("waBL5APV9kwdeqnm1kQ34BivGHQjjHQr1I58ubmJ", "01foVLqzLntdIIplsOJCOkfCGTL63wti1rcUlVCD");
var Schedule = Parse.Object.extend("Schedule");
var login = function(){
event.preventDefault();
var uname = document.getElementById("login_uname").value,
pass = document.getElementById("login_pass").value;
Parse.User.logIn(uname, pass, {
success: function(user){
// console.log("success");
window.location = "index.html";
},
error: function(user, error){
console.log("Error " + error.code + " " + error.message);
}
});
}
$('#reload').submit(function(){
var logout = function(){
event.preventDefault();
Parse.User.logOut();
location.href="login.html";
}
$('#reload').submit(function(event){
event.preventDefault();
var cell = document.getElementById("cellphone_number").value,
amt = document.getElementById("amount").value;
amt = document.getElementById("amount").value,
intAmt = parseInt(amt),
row = document.getElementById("load_card");
var accountDetailDiv = document.createElement("div"),
accountName = document.createElement("p"),
accountAmt = document.createElement("p");
var query = new Parse.Query(User);
query.equalTo("cellphoneNumber", cell);
var query = new Parse.Query(Parse.User);
query.equalTo("cellPhone", cell);
query.find({
success: function(results){
for (var i = 0; i < results.length; i++) {
var object = results[i];
alert(object.get('load'));
accountNameText = document.createTextNode("Name: " + object.get('username'));
accountAmtText = document.createTextNode("Previous Balance: " + object.get('load'));
accountName.appendChild(accountNameText);
accountAmt.appendChild(accountAmtText);
accountDetailDiv.appendChild(accountName);
accountDetailDiv.appendChild(accountAmt);
row.appendChild(accountDetailDiv);
var intLoad = parseInt(object.get('load'));
var newLoad = intLoad+intAmt;
object.set("load", newLoad.toString());
object.save(null,{
success: function(object){
console.log("Saved.");
},
error: function(error){
console.log("Error " + error.code + " " + error.message);
}
});
}
},
error: function(error){
......@@ -26,61 +71,16 @@ $('#reload').submit(function(){
//save
});
$("#create_schedule").submit(function(event){
event.preventDefault();
var destination = document.getElementById("destination").value,
initial = document.getElementById("initial").value,
etd = document.getElementById("etd").value,
eta = document.getElementById("eta").value,
company = document.getElementById("bus_company").value,
plate = document.getElementById("plate_number").value,
seats = document.getElementById("seats_available").value,
fare = document.getElementById("fare").value;
// console.log(typeof "plate");
var newSchedule = new Schedule();
newSchedule.save({
destination:destination,
startingTerminal: initial,
arrival: eta,
departure: etd,
busCompany: company,
busPlate: plate,
seatsAmount: seats,
ticketPrice: fare
}, {
success: function(newSchedule) {
// Execute any logic that should take place after the object is saved.
alert('New object created with objectId: ' + newSchedule.id);
console.log('New object created with objectId: ' + newSchedule.id);
},
error: function(newSchedule, error) {
// Execute any logic that should take place if the save fails.
// error is a Parse.Error with an error code and message.
alert('Failed to create new object, with error code: ' + error.message);
}
});
alert(destination);
});
var query = new Parse.Query(Schedule);
var id;
query.find({
success: function(results) {
console.log("Successfully retrieved " + results.length);
// Do something with the returned Parse.Object values
for (var i = 0; i < results.length; i++) {
var object = results[i];
id = object.id;
console.log(object);
}
},
error: function(error) {
status.error("Error: " + error.code + " " + error.message);
}
});
\ No newline at end of file
window.onload = function(){
var currentUser = Parse.User.current();
var currLoc = location.href;
if (!currentUser && currLoc.indexOf("login.html") == -1 ) {
location.href = "login.html";
} else {
var parent = document.getElementById("parent");
var outBtn = document.createElement("button");
outBtn.setAttribute("onclick", "logout()");
outBtn.innerHTML = "Logout";
parent.appendChild(outBtn);
}
}
\ No newline at end of file
web-app/loading.html
View file @ 203bdd39
<!DOCTYPE html>
<html>
<head>
<title>uBus | Bus Schedules</title>
<title>uBus | Loading User Accounts</title>
<link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="css/style.css">
<link rel="icon" type="image/x-icon" href="img/favicon.ico">
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.4.js"></script>
<script src="http://www.parsecdn.com/js/parse-1.6.6.min.js"></script>
</head>
......@@ -23,7 +24,7 @@
<img src="img/scheduling.png" width="40px">
<h1>Search User</h1>
</div>
<div class="card">
<div class="card" id="load_card">
<div class="row">
<img src="img/scheduling.png" width="60px">
<form method="post" class="card_schedule" id="reload">
......
web-app/login.html 0 → 100644
View file @ 203bdd39
<!DOCTYPE html>
<html>
<head>
<title>uBus | Admin System</title>
<meta name="description" content="uBus Ticket Reservation System administrator tools.">
<link rel="icon" type="image/x-icon" href="img/favicon.ico">
<link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="css/style.css">
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.4.js"></script>
<script src="http://www.parsecdn.com/js/parse-1.6.6.min.js"></script>
<script type="text/javascript" src="js/app.js"></script>
</head>
<body>
<header>
<nav>
<a href="index.html"><img src="img/logo.png" width="40px"></a>
<h1 style="display:inline-block; margin:0; padding-top:10px; padding-left:15px;">Bus Ticket Reservation System</h1>
<a href="adminAccount.html" style="color:white;padding:15px 20px;"><i class="fa fa-plus fa-2x"></i></a>
<a href="login.html"><i class="fa fa-2x fa-user"></i></a>
</nav>
</header>
<div class="wrapper">
<form method="post" id="adminLogin">
<input type="text" placeholder="Username" id="login_uname">
<input type="password" placeholder="Password" id="login_pass">
<button type="button" onclick="login()">Log-In</button>
</form>
</div>
</body>
</html>
web-app/schedule.html
View file @ 203bdd39
......@@ -4,6 +4,7 @@
<title>uBus | Bus Schedules</title>
<link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="css/style.css">
<link rel="icon" type="image/x-icon" href="img/favicon.ico">
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.4.js"></script>
<script src="http://www.parsecdn.com/js/parse-1.6.6.min.js"></script>
</head>
......@@ -13,8 +14,8 @@
<nav>
<a href="index.html"><img src="img/logo.png" width="40px"></a>
<a href="javascript:void(0);"><img src="img/add.png" width="40px"></a>
<a href="javascript:void(0);"><img src="img/search.png" width="40px"></a>
<a href="javascript:void(0);"><i class="fa fa-2x fa-plus" style="color:white; padding-top:5px; padding-right:10px;"></i></a>
<a href="javascript:void(0);"><i class="fa fa-2x fa-search" style="color:white; padding-top:5px; padding-right:10px;"></i></a>
</nav>
</header>
......@@ -25,15 +26,15 @@
</div>
<div class="card">
<div class="row">
<img src="img/scheduling.png" width="60px">
<img class="img-placeholder" src="img/scheduling.png" width="60px">
<form method="post" class="card_schedule" id="create_schedule">
<fieldset>
<label for="etd" style="display:block;">Starting Terminal</label>
<input type="text" id="initial" placeholder="hello">
<input type="text" id="initial" placeholder="Current Terminal">
</fieldset>
<fieldset>
<label for="etd" style="display:block;">Destination</label>
<input type="text" id="destination" placeholder="hello">
<input type="text" id="destination" placeholder="End Terminal">
</fieldset>
<fieldset>
<label for="etd" style="display:block;">ETD</label>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment