Skip to content

U
uBus
Commit bdefb981 authored by Ian De La Cruz's avatar Ian De La Cruz
Browse files
Options

merge edits

parents 7d5b052d 4ff92d79
Hide whitespace changes
Inline Side-by-side
Showing with 210 additions and 44 deletions
mobile-app/10-16-15/Project/.idea/gradle.xml
View file @ bdefb981
......@@ -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 @ bdefb981
......@@ -37,7 +37,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_7" 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 @ bdefb981
<?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 @ bdefb981
......@@ -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 @ bdefb981
......@@ -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/java/com/example/pearlsantos/project/ReservingSeats.java
View file @ bdefb981
......@@ -30,7 +30,7 @@ public class ReservingSeats extends Dialog {
busSchedule = getContext().getSharedPreferences("bus", Context.MODE_PRIVATE);
this.setTitle("Reserve Seat(s) for Bus");
setContentView(R.layout.activity_reserving_seats);
setContentView(R.layout.number_of_tickets);
String bN = busSchedule.getString("busNum", "").trim();
String pN = busSchedule.getString("plateNum", "").trim();
......
mobile-app/10-16-15/Project/app/src/main/res/layout/activity_login__screen.xml
View file @ bdefb981
......@@ -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 @ bdefb981
<?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/number_of_tickets.xml 0 → 100644
View file @ bdefb981
<?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 @ bdefb981
......@@ -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/css/style.css
View file @ bdefb981
......@@ -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);
}
......
web-app/index.html
View file @ bdefb981
......@@ -3,7 +3,7 @@
<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>
......@@ -15,6 +15,7 @@
<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>
<h1>Bus Ticket Reservation System</h1>
</nav>
</header>
......
web-app/loading.html
View file @ bdefb981
<!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>
......
web-app/schedule.html
View file @ bdefb981
......@@ -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>
......@@ -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