Skip to content

B
Blazer-App
Commit 27f1afad authored by Bon Lemuel Dela Cruz's avatar Bon Lemuel Dela Cruz
Browse files
Options

All features done

parent 127bf5ad
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 31110 additions and 15060 deletions
platforms/android/assets/www/app/calendar/calendar.html
View file @ 27f1afad
<ion-view view-title="Trip Logging" ng-init=""> <ion-view view-title="Trip Logging" ng-init="onLoadGetCalendarData();">
<!--<ion-nav-buttons side="right"> <ion-header-bar class="bar bar-subheader darkbackground">
<button class="button button-clear icon ion-refresh" ng-click="loadEvents()"></button>
</ion-nav-buttons>-->
<ion-header-bar class="bar bar-subheader bgbluegreen">
<!--<div class="buttons">
<button class="button button-clear text-light button-light button-icon ion-help-circled" ng-click=""></button>
</div>-->
<h1 class="title text-light">{{viewTitle}}</h1>
<div class="buttons"> <div class="buttons">
<button class="button button-light" ng-click="today();">Today</button> <button class="button button-clear text-light button-light button-icon ion-help-circled" ng-click="showLegend();"></button>
</div>
<h1 class="title text-light">Calendar</h1>
<div class="buttons">
<button class="button button-clear text-light icon ion-refresh" ng-click="onLoadGetCalendarData()"></button>
</div> </div>
</ion-header-bar> </ion-header-bar>
<ion-content class="has-footer" padding="true"> <ion-content padding="true">
<calendar title-changed="onViewTitleChanged(title)" ng-model="calendar.currentDate" calendar-mode="calendar.mode" event-source="calendar.eventSource" range-changed="reloadSource(startTime, endTime)" event-selected="onEventSelected(event, 1)" time-selected="onTimeSelected(selectedTime, events, disabled)" <flex-calendar options="calendarOptions" events="calendarEvents"></flex-calendar>
step="30"></calendar> <div ng-if="!dayData" class="row header">
</ion-content> <div class="col"><center>Please select a valid date</center></div>
<!--<ion-footer-bar>
<div class="button-bar">
<button ng-if="cal_type == 1" class="button button-clear monthview-primary-with-event-complete">Completed</button>
<button ng-if="cal_type == 2" class="button button-clear monthview-primary-with-event-incomplete">Incompleted</button>
<button ng-if="cal_type == 3" class="button button-clear monthview-primary-with-event-notrip">No Trips</button>
</div> </div>
</ion-footer-bar>--> <div ng-if="dayData">
<div class="row header">
<div class="col">Home - School</div>
</div>
<div class="row">
<div class="col col-50">{{dayData.event[0].data.depart | date:'MM:ss'}} - {{dayData.event[0].data.arrive | date:'MM:ss a'}}</div>
<div class="col">{{dayData.event[0].data.mode}}</div>
<div class="col"><center><button class="button button-outline button-dark button-small" ng-click="openAddHTSTrip()">Add</button></center></div>
<div class="col"><center><button class="button button-outline button-dark button-small" ng-click="openUpdateHTSTrip(dayData.event[0])" ng-disabled="!dayData.event[0]">Update</button></center></div>
</div>
<div class="row header">
<div class="col">School - Home</div>
</div>
<div class="row">
<div class="col col-50">{{dayData.event[1].data.depart | date:'MM:ss'}} - {{dayData.event[1].data.arrive | date:'MM:ss a'}}</div>
<div class="col">{{dayData.event[1].data.mode}}</div>
<div class="col"><center><button class="button button-outline button-dark button-small" ng-click="openAddSTHTrip()">Add</button></center></div>
<div class="col"><center><button class="button button-outline button-dark button-small" ng-click="openUpdateSTHTrip(dayData.event[1])" ng-disabled="!dayData.event[1]">Update</button></center></div>
</div>
<div class="row">
<div class="button-bar">
<button class="button button-balanced button-small" ng-click="onValidateTrip();">Validate</button>
<button class="button button-assertive button-small" ng-click="onNoTrip()">No Trip</button>
</div>
</div>
</div>
</ion-content>
</ion-view> </ion-view>
\ No newline at end of file
platforms/android/assets/www/app/calendar/forms/add_trip.html → platforms/android/assets/www/app/calendar/forms/add_trip_hts.html
View file @ 27f1afad
...@@ -2,15 +2,15 @@ ...@@ -2,15 +2,15 @@
<form name="addtrip"> <form name="addtrip">
<ion-header-bar align-title="center" class="bar bar-clear darkblue"> <ion-header-bar align-title="center" class="bar bar-clear darkblue">
<div class="buttons"> <div class="buttons">
<button class="button button-clear button-light" ng-click="closeAddTrip()"><i class="button-icon icon ion-android-close"></i></button> <button class="button button-clear button-light" ng-click="addTrip_hts.hide()"><i class="button-icon icon ion-android-close"></i></button>
</div> </div>
<h1 class="title">Add New Trip</h1> <h1 class="title">Add New Trip</h1>
<div class="buttons"> <div class="buttons">
<button class="button button-clear button-light" ng-disabled="addtrip.$invalid" ng-click="postNewTrip(); closeAddTrip();"><i class="button-icon icon ion-android-send"></i></button> <button class="button button-clear button-light" ng-disabled="addtrip.$invalid" ng-click="postNewTrip(); addTrip_hts.hide();"><i class="button-icon icon ion-android-send"></i></button>
</div> </div>
</ion-header-bar> </ion-header-bar>
<ion-header-bar class="bar bar-subheader bgbluegreen"> <ion-header-bar class="bar bar-subheader bgbluegreen">
<h1 class="title text-light">{{tripData.type}}</h1> <h1 class="title text-light">Home to School</h1>
</ion-header-bar> </ion-header-bar>
<ion-content padding="true"> <ion-content padding="true">
<div class="item item-stable"></div> <div class="item item-stable"></div>
...@@ -22,14 +22,6 @@ ...@@ -22,14 +22,6 @@
<span class="input-label">Time of Arrival</span> <span class="input-label">Time of Arrival</span>
<p>{{tripData.time_arrived| date: "HH:mm:ss a"}}</p> <p>{{tripData.time_arrived| date: "HH:mm:ss a"}}</p>
</div> </div>
<!--<label class="item item-input">
<span class="input-label">Trip Duration (Hours)</span>
<input type="text" ng-model="tripData.trip_duration_hours">
</label>
<label class="item item-input">
<span class="input-label">Trip Duration (Minutes)</span>
<input type="number" ng-model="tripData.trip_duration_minutes">
</label>-->
<div class="item item-stable"></div> <div class="item item-stable"></div>
<label class="item item-input"> <label class="item item-input">
<span class="input-label">Origin</span> <span class="input-label">Origin</span>
...@@ -78,7 +70,7 @@ ...@@ -78,7 +70,7 @@
<div class="item text-dark"> <div class="item text-dark">
Emotion Emotion
</div> </div>
<label class="item item-input item-select"> <label class="item item-input item-select" ng-if="tripData.experience == 'positive'">
<div class="input-label"> <div class="input-label">
&nbsp &nbsp
</div> </div>
...@@ -88,6 +80,14 @@ ...@@ -88,6 +80,14 @@
<option value="fair">Fair</option> <option value="fair">Fair</option>
<option value="good">Good</option> <option value="good">Good</option>
<option value="pleasant">Pleasant</option> <option value="pleasant">Pleasant</option>
</select>
</label>
<label class="item item-input item-select" ng-if="tripData.experience == 'negative'">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripData.emotion">
<option></option>
<option value="unberable">Unbearable</option> <option value="unberable">Unbearable</option>
<option value="undesirable">Undesirable</option> <option value="undesirable">Undesirable</option>
<option value="uncomfortable">Uncomfortable</option> <option value="uncomfortable">Uncomfortable</option>
......
platforms/android/assets/www/app/calendar/forms/add_trip_sth.html 0 → 100644
View file @ 27f1afad
<ion-modal-view>
<form name="addtrip">
<ion-header-bar align-title="center" class="bar bar-clear darkblue">
<div class="buttons">
<button class="button button-clear button-light" ng-click="addTrip_sth.hide()"><i class="button-icon icon ion-android-close"></i></button>
</div>
<h1 class="title">Add New Trip</h1>
<div class="buttons">
<button class="button button-clear button-light" ng-disabled="addtrip.$invalid" ng-click="postNewTrip(); addTrip_sth.hide();"><i class="button-icon icon ion-android-send"></i></button>
</div>
</ion-header-bar>
<ion-header-bar class="bar bar-subheader bgbluegreen">
<h1 class="title text-light">School to Home</h1>
</ion-header-bar>
<ion-content padding="true">
<div class="item item-stable"></div>
<div class="item item-stacked-label" ion-datetime-picker time am-pm ng-model="tripData.time_departed" required>
<span class="input-label">Time of Departure</span>
<p>{{tripData.time_departed| date: "HH:mm:ss a"}}</p>
</div>
<div class="item item-stacked-label" ion-datetime-picker time am-pm ng-model="tripData.time_arrived" required>
<span class="input-label">Time of Arrival</span>
<p>{{tripData.time_arrived| date: "HH:mm:ss a"}}</p>
</div>
<div class="item item-stable"></div>
<label class="item item-input">
<span class="input-label">Origin</span>
<input type="text" ng-model="tripData.origin" required>
</label>
<label class="item item-input">
<span class="input-label">Destination</span>
<input type="text" ng-model="tripData.destination" required>
</label>
<div class="item item-stable"></div>
<div class="item text-dark">
Mode Type
</div>
<label class="item item-input item-select">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripData.mode" >
<option></option>
<option value="car">Car</option>
<option value="tricycle">Tricycle</option>
<option value="pedicab">Pedicab</option>
<option value="jeep">Jeep</option>
<option value="bus">Bus</option>
<option value="van">Van</option>
<option value="walk">Walk</option>
<option value="carpool">Carpool</option>
<option value="bicycle">Bicycle</option>
<option value="train">Train</option>
<option value="taxi">Taxi</option>
</select>
</label>
<div class="item text-dark">
Experience
</div>
<label class="item item-input item-select">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripData.experience">
<option></option>
<option value="positive">Positive</option>
<option value="negative">Negative</option>
</select>
</label>
<div class="item text-dark">
Emotion
</div>
<label class="item item-input item-select" ng-if="tripData.experience == 'positive'">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripData.emotion">
<option></option>
<option value="acceptable">Acceptable</option>
<option value="fair">Fair</option>
<option value="good">Good</option>
<option value="pleasant">Pleasant</option>
</select>
</label>
<label class="item item-input item-select" ng-if="tripData.experience == 'negative'">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripData.emotion">
<option></option>
<option value="unberable">Unbearable</option>
<option value="undesirable">Undesirable</option>
<option value="uncomfortable">Uncomfortable</option>
<option value="tolerable">Tolerable</option>
</select>
</label>
<div class="item item-stable"></div>
</form>
</ion-content>
</ion-modal-view>
\ No newline at end of file
platforms/android/assets/www/app/calendar/forms/update_trip.html deleted 100644 → 0
View file @ 127bf5ad
<ion-modal-view>
<form name="addtrip">
<ion-header-bar align-title="center" class="bar bar-clear darkblue">
<div class="buttons">
<button class="button button-clear button-light" ng-click="closeUpdateTrip();"><i class="button-icon icon ion-android-close"></i></button>
</div>
<h1 class="title">Update Trip</h1>
<div class="buttons">
<button class="button button-clear button-light" ng-disabled="addtrip.$invalid" ng-click="postUpdateTrip(); closeUpdateTrip();"><i class="button-icon icon ion-android-send"></i></button>
</div>
</ion-header-bar>
<ion-header-bar class="bar bar-subheader bgbluegreen">
<h1 class="title text-light">{{tripDataDetails.type}}</h1>
</ion-header-bar>
<ion-content padding="true">
<div class="item item-stable"></div>
<div class="item item-stacked-label" ion-datetime-picker time am-pm ng-model="tripDataDetails.time_departed" required>
<span class="input-label">Time of Departure</span>
<p>{{tripDataDetails.time_departed| date: "HH:mm:ss a"}}</p>
</div>
<div class="item item-stacked-label" ion-datetime-picker time am-pm ng-model="tripDataDetails.time_arrived" required>
<span class="input-label">Time of Arrival</span>
<p>{{tripDataDetails.time_arrived| date: "HH:mm:ss a"}}</p>
</div>
<div class="item item-stable"></div>
<label class="item item-input">
<span class="input-label">Origin</span>
<input type="text" ng-model="tripDataDetails.origin" required>
</label>
<label class="item item-input">
<span class="input-label">Destination</span>
<input type="text" ng-model="tripDataDetails.destination" required>
</label>
<div class="item item-stable"></div>
<div class="item text-dark">
Mode Type
</div>
<label class="item item-input item-select">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripDataDetails.mode" >
<option></option>
<option value="car">Car</option>
<option value="tricycle">Tricycle</option>
<option value="pedicab">Pedicab</option>
<option value="jeep">Jeep</option>
<option value="bus">Bus</option>
<option value="van">Van</option>
<option value="walk">Walk</option>
<option value="carpool">Carpool</option>
<option value="bicycle">Bicycle</option>
<option value="train">Train</option>
<option value="taxi">Taxi</option>
</select>
</label>
<div class="item text-dark">
Experience
</div>
<label class="item item-input item-select">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripDataDetails.experience">
<option></option>
<option value="positive">Positive</option>
<option value="negative">Negative</option>
</select>
</label>
<div class="item text-dark">
Emotion
</div>
<label class="item item-input item-select">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripDataDetails.emotion">
<option></option>
<option value="acceptable">Acceptable</option>
<option value="fair">Fair</option>
<option value="good">Good</option>
<option value="pleasant">Pleasant</option>
<option value="unberable">Unbearable</option>
<option value="undesirable">Undesirable</option>
<option value="uncomfortable">Uncomfortable</option>
<option value="tolerable">Tolerable</option>
</select>
</label>
<div class="item item-stable"></div>
</form>
</ion-content>
</ion-modal-view>
\ No newline at end of file
platforms/android/assets/www/app/calendar/forms/update_trip_hts.html 0 → 100644
View file @ 27f1afad
<ion-modal-view>
<form name="addtrip">
<ion-header-bar align-title="center" class="bar bar-clear darkblue">
<div class="buttons">
<button class="button button-clear button-light" ng-click="updateTrip_hts.hide();"><i class="button-icon icon ion-android-close"></i></button>
</div>
<h1 class="title">Update Trip</h1>
<div class="buttons">
<button class="button button-clear button-light" ng-disabled="addtrip.$invalid" ng-click="postUpdateTrip(); updateTrip_hts.hide();"><i class="button-icon icon ion-android-send"></i></button>
</div>
</ion-header-bar>
<ion-header-bar class="bar bar-subheader bgbluegreen">
<h1 class="title text-light">Home to School</h1>
</ion-header-bar>
<ion-content padding="true">
<div class="item item-stable"></div>
<div class="item item-stacked-label" ion-datetime-picker time am-pm ng-model="tripData.time_departed" required>
<span class="input-label">Time of Departure</span>
<p>{{tripData.time_departed| date: "HH:mm:ss a"}}</p>
</div>
<div class="item item-stacked-label" ion-datetime-picker time am-pm ng-model="tripData.time_arrived" required>
<span class="input-label">Time of Arrival</span>
<p>{{tripData.time_arrived| date: "HH:mm:ss a"}}</p>
</div>
<div class="item item-stable"></div>
<label class="item item-input">
<span class="input-label">Origin</span>
<input type="text" ng-model="tripData.origin" required>
</label>
<label class="item item-input">
<span class="input-label">Destination</span>
<input type="text" ng-model="tripData.destination" required>
</label>
<div class="item item-stable"></div>
<div class="item text-dark">
Mode Type
</div>
<label class="item item-input item-select">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripData.mode" >
<option></option>
<option value="car">Car</option>
<option value="tricycle">Tricycle</option>
<option value="pedicab">Pedicab</option>
<option value="jeep">Jeep</option>
<option value="bus">Bus</option>
<option value="van">Van</option>
<option value="walk">Walk</option>
<option value="carpool">Carpool</option>
<option value="bicycle">Bicycle</option>
<option value="train">Train</option>
<option value="taxi">Taxi</option>
</select>
</label>
<div class="item text-dark">
Experience
</div>
<label class="item item-input item-select">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripData.experience">
<option></option>
<option value="positive">Positive</option>
<option value="negative">Negative</option>
</select>
</label>
<div class="item text-dark">
Emotion
</div>
<label class="item item-input item-select" ng-if="tripData.experience == 'positive'">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripData.emotion">
<option></option>
<option value="acceptable">Acceptable</option>
<option value="fair">Fair</option>
<option value="good">Good</option>
<option value="pleasant">Pleasant</option>
</select>
</label>
<label class="item item-input item-select" ng-if="tripData.experience == 'negative'">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripData.emotion">
<option></option>
<option value="unberable">Unbearable</option>
<option value="undesirable">Undesirable</option>
<option value="uncomfortable">Uncomfortable</option>
<option value="tolerable">Tolerable</option>
</select>
</label>
<div class="item item-stable"></div>
</form>
</ion-content>
</ion-modal-view>
\ No newline at end of file
platforms/ios/www/app/calendar/forms/update_trip.html → platforms/android/assets/www/app/calendar/forms/update_trip_sth.html
View file @ 27f1afad
...@@ -2,34 +2,34 @@ ...@@ -2,34 +2,34 @@
<form name="addtrip"> <form name="addtrip">
<ion-header-bar align-title="center" class="bar bar-clear darkblue"> <ion-header-bar align-title="center" class="bar bar-clear darkblue">
<div class="buttons"> <div class="buttons">
<button class="button button-clear button-light" ng-click="closeUpdateTrip();"><i class="button-icon icon ion-android-close"></i></button> <button class="button button-clear button-light" ng-click="updateTrip_sth.hide();"><i class="button-icon icon ion-android-close"></i></button>
</div> </div>
<h1 class="title">Update Trip</h1> <h1 class="title">Update Trip</h1>
<div class="buttons"> <div class="buttons">
<button class="button button-clear button-light" ng-disabled="addtrip.$invalid" ng-click="postUpdateTrip(); closeUpdateTrip();"><i class="button-icon icon ion-android-send"></i></button> <button class="button button-clear button-light" ng-disabled="addtrip.$invalid" ng-click="postUpdateTrip(); updateTrip_sth.hide();"><i class="button-icon icon ion-android-send"></i></button>
</div> </div>
</ion-header-bar> </ion-header-bar>
<ion-header-bar class="bar bar-subheader bgbluegreen"> <ion-header-bar class="bar bar-subheader bgbluegreen">
<h1 class="title text-light">{{tripDataDetails.type}}</h1> <h1 class="title text-light">School to Home</h1>
</ion-header-bar> </ion-header-bar>
<ion-content padding="true"> <ion-content padding="true">
<div class="item item-stable"></div> <div class="item item-stable"></div>
<div class="item item-stacked-label" ion-datetime-picker time am-pm ng-model="tripDataDetails.time_departed" required> <div class="item item-stacked-label" ion-datetime-picker time am-pm ng-model="tripData.time_departed" required>
<span class="input-label">Time of Departure</span> <span class="input-label">Time of Departure</span>
<p>{{tripDataDetails.time_departed| date: "HH:mm:ss a"}}</p> <p>{{tripData.time_departed| date: "HH:mm:ss a"}}</p>
</div> </div>
<div class="item item-stacked-label" ion-datetime-picker time am-pm ng-model="tripDataDetails.time_arrived" required> <div class="item item-stacked-label" ion-datetime-picker time am-pm ng-model="tripData.time_arrived" required>
<span class="input-label">Time of Arrival</span> <span class="input-label">Time of Arrival</span>
<p>{{tripDataDetails.time_arrived| date: "HH:mm:ss a"}}</p> <p>{{tripData.time_arrived| date: "HH:mm:ss a"}}</p>
</div> </div>
<div class="item item-stable"></div> <div class="item item-stable"></div>
<label class="item item-input"> <label class="item item-input">
<span class="input-label">Origin</span> <span class="input-label">Origin</span>
<input type="text" ng-model="tripDataDetails.origin" required> <input type="text" ng-model="tripData.origin" required>
</label> </label>
<label class="item item-input"> <label class="item item-input">
<span class="input-label">Destination</span> <span class="input-label">Destination</span>
<input type="text" ng-model="tripDataDetails.destination" required> <input type="text" ng-model="tripData.destination" required>
</label> </label>
<div class="item item-stable"></div> <div class="item item-stable"></div>
<div class="item text-dark"> <div class="item text-dark">
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<div class="input-label"> <div class="input-label">
&nbsp &nbsp
</div> </div>
<select ng-model="tripDataDetails.mode" > <select ng-model="tripData.mode" >
<option></option> <option></option>
<option value="car">Car</option> <option value="car">Car</option>
<option value="tricycle">Tricycle</option> <option value="tricycle">Tricycle</option>
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<div class="input-label"> <div class="input-label">
&nbsp &nbsp
</div> </div>
<select ng-model="tripDataDetails.experience"> <select ng-model="tripData.experience">
<option></option> <option></option>
<option value="positive">Positive</option> <option value="positive">Positive</option>
<option value="negative">Negative</option> <option value="negative">Negative</option>
...@@ -70,16 +70,24 @@ ...@@ -70,16 +70,24 @@
<div class="item text-dark"> <div class="item text-dark">
Emotion Emotion
</div> </div>
<label class="item item-input item-select"> <label class="item item-input item-select" ng-if="tripData.experience == 'positive'">
<div class="input-label"> <div class="input-label">
&nbsp &nbsp
</div> </div>
<select ng-model="tripDataDetails.emotion"> <select ng-model="tripData.emotion">
<option></option> <option></option>
<option value="acceptable">Acceptable</option> <option value="acceptable">Acceptable</option>
<option value="fair">Fair</option> <option value="fair">Fair</option>
<option value="good">Good</option> <option value="good">Good</option>
<option value="pleasant">Pleasant</option> <option value="pleasant">Pleasant</option>
</select>
</label>
<label class="item item-input item-select" ng-if="tripData.experience == 'negative'">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripData.emotion">
<option></option>
<option value="unberable">Unbearable</option> <option value="unberable">Unbearable</option>
<option value="undesirable">Undesirable</option> <option value="undesirable">Undesirable</option>
<option value="uncomfortable">Uncomfortable</option> <option value="uncomfortable">Uncomfortable</option>
......
platforms/android/assets/www/app/diary/diary.html
View file @ 27f1afad
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<ion-refresher pulling-text="Pull to refresh" on-refresh="loadComparisonMessages(); clearGraphs();"></ion-refresher> <ion-refresher pulling-text="Pull to refresh" on-refresh="loadComparisonMessages(); clearGraphs();"></ion-refresher>
<div class="card"> <div class="card">
<div class="item item-header item-clear bgbluegreen text-light"> Home to School Travel Times </div> <div class="item item-header item-clear darkblue text-light"> Home to School Travel Times </div>
<div class="item"> <div class="item">
<form name="form_1"> <form name="form_1">
<label class="item item-input"> <label class="item item-input">
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<div class="item item-body"> <div class="item item-body">
<p>Some Interesting Facts:</p> <p>Some Interesting Facts:</p>
<p ng-if="comparisonMessage">"Your worst travel time is <b>{{comparisonMessage.worst_time}}</b> minutes and your shortest travel time is <b>{{comparisonMessage.best_time}}</b> minutes."</p> <p ng-if="comparisonMessage">"Your worst travel time is <b>{{comparisonMessage.worst_time}}</b> minutes and your shortest travel time is <b>{{comparisonMessage.best_time}}</b> minutes."</p>
<p ng-if="comparisonMessage.best_time_near > comparisonMessage.best_time">"In comparison, <b>{{comparisonMessage.best_time_user}}</b> has the best travel time of <b>{{comparisonMessage.best_time_near | number:0}}</b> minutes.”</p> <p ng-if="comparisonMessage.best_time_near < comparisonMessage.best_time">"In comparison, <b>{{comparisonMessage.best_time_user}}</b> has the best travel time of <b>{{comparisonMessage.best_time_near | number:0}}</b> minutes.”</p>
<p ng-if="comparisonMessage.best_time > comparisonMessage.best_time_near">“You have the best travel time in your barangay”</p> <p ng-if="comparisonMessage.best_time > comparisonMessage.best_time_near">“You have the best travel time in your barangay”</p>
</div> </div>
</div> </div>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</div> </div>
<div class="card"> <div class="card">
<div class="item item-header item-clear bgbluegreen text-light"> Mode Use by Trips in Percentage(%) </div> <div class="item item-header item-clear darkblue text-light"> Mode Use by Trips in Percentage(%) </div>
<div class="item item-body"> <div class="item item-body">
<form name="form_2"> <form name="form_2">
<label class="item item-input"> <label class="item item-input">
......
platforms/android/assets/www/app/map/map.html
View file @ 27f1afad
<ion-view view-title="BLAZE" ng-init="initializedLocateUser();loadWeeklySurvey();getAllBarangay();"> <ion-view view-title="BLAZE" ng-init="initializedLocateUser();loadWeeklySurvey();getAllBarangay();">
<ion-nav-buttons side="left"> <ion-nav-buttons side="left">
<button ng-click="openMenu()" class="button button-icon ion-android-menu" ng-disabled="tripStatus"></button> <button ng-click="openMenu()" class="button button-icon ion-navicon-round" ng-disabled="tripStatus"></button>
</ion-nav-buttons> </ion-nav-buttons>
<ion-nav-buttons side="right"> <ion-nav-buttons side="right">
<button ng-click="openPopover($event);" class="button button-icon ion-android-apps" ng-disabled="tripStatus"></button> <button ng-click="openPopover($event);" class="button button-icon ion-android-more-vertical" ng-disabled="tripStatus"></button>
</ion-nav-buttons> </ion-nav-buttons>
<ion-floating-button style='opacity: 0.8;' click="refreshMap();" has-footer="true" button-color="#333333" icon="ion-android-refresh" icon-color="#fff" ng-hide="tripStatus"> <ion-floating-button style='opacity: 0.8;' click="refreshMap();" has-footer="true" button-color="#333333" icon="ion-android-refresh" icon-color="#fff" ng-hide="tripStatus">
</ion-floating-button> </ion-floating-button>
<div class="bar bar-subheader bar-clear darkblue item-input-inset"> <div class="bar bar-subheader bar-clear darkbackground item-input-inset">
<a class="item-input-wrapper" ng-click="onLoadSelection();"> <a class="item-input-wrapper" ng-click="onLoadSelection();">
<i class="icon ion-ios-search placeholder-icon"></i> <i class="icon ion-ios-search placeholder-icon"></i>
<input type="text" placeholder="Search Barangay" ng-model="selectedBarangayData" disabled> <input type="text" placeholder="Search Barangay" ng-model="selectedBarangayData" disabled>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<div id="mapid"></div> <div id="mapid"></div>
</ion-content> </ion-content>
<ion-footer-bar align-title="center" class="bar bar-clear darkblue"> <ion-footer-bar align-title="center" class="bar bar-clear darkbackground">
<div class="button-bar"> <div class="button-bar">
<div class="button-bar" ng-if="!tripStatus"> <div class="button-bar" ng-if="!tripStatus">
<button ng-click="confirmTripDestination();" class="button button-icon ion-android-arrow-dropright-circle light"> Start Trip</button> <button ng-click="confirmTripDestination();" class="button button-icon ion-android-arrow-dropright-circle light"> Start Trip</button>
......
platforms/android/assets/www/app/menu/menu.html
View file @ 27f1afad
<ion-side-menus enable-menu-with-back-views="false"> <ion-side-menus enable-menu-with-back-views="false">
<ion-side-menu-content> <ion-side-menu-content>
<ion-nav-bar class="bar bar-clear darkblue"> <ion-nav-bar class="bar bar-clear darkbackground">
<ion-nav-back-button> <ion-nav-back-button>
</ion-nav-back-button> </ion-nav-back-button>
<ion-nav-buttons side="left"> <ion-nav-buttons side="left">
<button class="button button-clear button-icon button-clear ion-android-menu" menu-toggle="left"></button> <button class="button button-clear button-icon button-clear ion-navicon-round" menu-toggle="left"></button>
</ion-nav-buttons> </ion-nav-buttons>
</ion-nav-bar> </ion-nav-bar>
<ion-nav-view name="menuContent"></ion-nav-view> <ion-nav-view name="menuContent"></ion-nav-view>
......
platforms/android/assets/www/app/performance/js/performance.js
View file @ 27f1afad
...@@ -12,17 +12,13 @@ angular.module('blazer.performancecontrollers', []) ...@@ -12,17 +12,13 @@ angular.module('blazer.performancecontrollers', [])
$scope.datasetOverride = [{ yAxisID: 'y-axis-1' }]; $scope.datasetOverride = [{ yAxisID: 'y-axis-1' }];
$scope.per_options = { $scope.per_options = {
tooltipTemplate: "<%if (value == 1){%><%=' Not Thinking'%><%}%><%if (value == 2){%><%='Thinking/Exploring'%><%}%><%if (value == 3){%><%='Planning'%><%}%><%if (value == 4){%><%='Attempting'%><%}%><%if (value == 5){%><%='Car-use Reduced'%><%}%><%if (value == 6){%><%='Regular Alternatives'%><%}%><%if (value == 0){%><%='No Entry'%><%}%>",
scales: { scales: {
yAxes: [{ yAxes: [{
id: 'y-axis-1', id: 'y-axis-1',
type: 'linear', type: 'linear',
display: true, display: true,
position: 'left', position: 'right'
labelString: ["Not Thinking", "Thinking/Exploring", "Planning", "Attempting", "Car-use Reduced", "Regular Alternatives User"],
ticks: {
suggestedMin: 0,
beginAtZero: true
}
}] }]
} }
}; };
...@@ -43,6 +39,8 @@ angular.module('blazer.performancecontrollers', []) ...@@ -43,6 +39,8 @@ angular.module('blazer.performancecontrollers', [])
$scope.perdata = []; $scope.perdata = [];
for (var i = 0; i < $scope.performanceData.length; i++) { for (var i = 0; i < $scope.performanceData.length; i++) {
console.log("[ PERFORMANCE PARSED DATA ]", JSON.stringify($scope.performanceData[i])); console.log("[ PERFORMANCE PARSED DATA ]", JSON.stringify($scope.performanceData[i]));
// DATA PARSE
var pushData; var pushData;
if ($scope.performanceData[i].y == null) { if ($scope.performanceData[i].y == null) {
pushData = 0; pushData = 0;
...@@ -50,6 +48,25 @@ angular.module('blazer.performancecontrollers', []) ...@@ -50,6 +48,25 @@ angular.module('blazer.performancecontrollers', [])
pushData = $scope.performanceData[i].y; pushData = $scope.performanceData[i].y;
} }
// LABEL PARSE
var pushLabel;
if (pushData == 1) {
pushLabel = "Not Thinking";
} else if (pushData == 2) {
pushLabel = "Thinking/Exploring";
} else if (pushData == 3) {
pushLabel = "Planning";
} else if (pushData == 4) {
pushLabel = "Attempting";
} else if (pushData == 5) {
pushLabel = "Car-use Reduced";
} else if (pushData == 6) {
pushLabel = "Regular Alternatives";
} else {
pushLabel = "No Data";
}
console.log("[ Y-AXIS LABEL ]", pushLabel);
$scope.perlabels.push($scope.performanceData[i].label); $scope.perlabels.push($scope.performanceData[i].label);
$scope.perdata.push(pushData); $scope.perdata.push(pushData);
} }
......
platforms/android/assets/www/app/performance/performance.html
View file @ 27f1afad
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
<ion-refresher pulling-text="Pull to refresh" on-refresh="loadPerformanceSummary();"></ion-refresher> <ion-refresher pulling-text="Pull to refresh" on-refresh="loadPerformanceSummary();"></ion-refresher>
<div class="card"> <div class="card">
<div class="item item-header item-clear bgbluegreen text-light"> Readiness-to-Blaze Over Time </div> <div class="item item-header item-clear darkblue text-light"> Readiness-to-Blaze Over Time </div>
<div class="item"> <div class="item">
<button class="button button-block button-dark button-outline" ng-click="loadPerformanceSummary();"> Refresh </button> <button class="button button-block button-dark button-outline" ng-click="loadPerformanceSummary();"> Refresh </button>
</div> </div>
<div class="item item-body"> <div class="item item-body">
<p>Readiness-to-Blaze Over Time</p> <p>Readiness-to-Blaze Over Time</p>
<canvas id="line" class="chart chart-line" chart-labels="performance_data.labels" chart-data="performance_data.data" chart-options="per_options" chart-series="series" chart-dataset-override="datasetOverride" chart-legend="false"></canvas> <canvas id="line" class="chart chart-line" chart-labels="performance_data.labels" chart-data="performance_data.data" chart-options="per_options" chart-series="series" chart-dataset-override="datasetOverride" chart-legend="false" chart-click="onClick"></canvas>
</div> </div>
<div class="row"> <div class="row">
<div class="col"> <div class="col">
......
platforms/android/assets/www/app/sharedride/sharedride.html
View file @ 27f1afad
<ion-view view-title="Shared Ride" ng-init="getSharedRideData();"> <ion-view view-title="Shared Ride" ng-init="getSharedRideData();">
<ion-nav-buttons side="right"> <ion-nav-buttons side="right">
<button class="button button-outline button-icon button-light" ui-sref='app.offerride'> <button class="button button-stable text-dark" ui-sref='app.offerride'>
Offer Offer
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>
<ion-content> <ion-content>
<ion-tabs class="tabs-clear tabs-icon-top"> <ion-tabs class="tabs-clear tabs-icon-top">
<ion-tab title="Available" class="text-light darkblue" badge="availableRide.length" badge-style="badge-assertive" icon-on="light ion-android-car" icon-off="light ion-android-car"> <ion-tab title="Available" class="text-light darkbackground" badge="availableRide.length" badge-style="badge-assertive" icon-on="light ion-android-car" icon-off="light ion-android-car">
<ion-content class="background-feed"> <ion-content class="background-feed">
<ion-refresher pulling-text="Pull to refresh" on-refresh="getSharedRideData();"></ion-refresher> <ion-refresher pulling-text="Pull to refresh" on-refresh="getSharedRideData();"></ion-refresher>
<div class="card" ng-repeat="ride in availableRide"> <div class="card" ng-repeat="ride in availableRide">
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</ion-content> </ion-content>
</ion-tab> </ion-tab>
<ion-tab title="Riding" class="text-light darkblue" badge="ridingRide.length" badge-style="badge-assertive" icon-on="light ion-android-bicycle" icon-off="light ion-android-bicycle"> <ion-tab title="Riding" class="text-light darkbackground" badge="ridingRide.length" badge-style="badge-assertive" icon-on="light ion-android-bicycle" icon-off="light ion-android-bicycle">
<ion-content class="background-feed"> <ion-content class="background-feed">
<ion-refresher pulling-text="Pull to refresh" on-refresh="getSharedRideData();"></ion-refresher> <ion-refresher pulling-text="Pull to refresh" on-refresh="getSharedRideData();"></ion-refresher>
<div class="card" ng-repeat="ride in ridingRide"> <div class="card" ng-repeat="ride in ridingRide">
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</ion-content> </ion-content>
</ion-tab> </ion-tab>
<ion-tab title="Interested" class="text-light darkblue" badge="interestedRides.length" badge-style="badge-assertive" icon-on="light ion-android-checkbox-outline" icon-off="light ion-android-checkbox-outline"> <ion-tab title="Interested" class="text-light darkbackground" badge="interestedRides.length" badge-style="badge-assertive" icon-on="light ion-android-checkbox-outline" icon-off="light ion-android-checkbox-outline">
<ion-content class="background-feed"> <ion-content class="background-feed">
<ion-refresher pulling-text="Pull to refresh" on-refresh="getSharedRideData();"></ion-refresher> <ion-refresher pulling-text="Pull to refresh" on-refresh="getSharedRideData();"></ion-refresher>
<div class="card" ng-repeat="ride in interestedRides"> <div class="card" ng-repeat="ride in interestedRides">
......
platforms/android/assets/www/app/status/status.html
View file @ 27f1afad
...@@ -6,18 +6,18 @@ ...@@ -6,18 +6,18 @@
<div class="list card"> <div class="list card">
<div class="item item-divider"> Mode of Use </div> <div class="item item-divider"> Mode of Use </div>
<div class="item"> <div class="item">
<i class="button button-block button-clear bgbluegreen text-light">Latest</i> <i class="button button-block button-clear darkblue text-light">Latest</i>
<i class="button button-block icon-left ion-android-car"><b>{{ blazersStats.latest_mode.mode }}</b></i> <i class="button button-block icon-left ion-android-car"><b>{{ blazersStats.latest_mode.mode }}</b></i>
<!--<i class="button button-block icon-left ion-android-bulb"><b>{{ blazersStats.emo_latest }}</b></i>--> <!--<i class="button button-block icon-left ion-android-bulb"><b>{{ blazersStats.emo_latest }}</b></i>-->
<!--<i class="button button-block icon-left ion-android-time"><b>{{blazersStats.time_latest}}</b></i>--> <!--<i class="button button-block icon-left ion-android-time"><b>{{blazersStats.time_latest}}</b></i>-->
</div> </div>
<div class="item"> <div class="item">
<i class="button button-block button-clear bgbluegreen text-light">Frequently Used</i> <i class="button button-block button-clear darkblue text-light">Frequently Used</i>
<i class="button button-block icon-left ion-android-car"><b>{{ blazersStats.frequent_mode.mode }}</b></i> <i class="button button-block icon-left ion-android-car"><b>{{ blazersStats.frequent_mode.mode }}</b></i>
<!--<i class="button button-block icon-left ion-android-bulb"><b>{{ blazersStats.emo_frequent }}</b></i>--> <!--<i class="button button-block icon-left ion-android-bulb"><b>{{ blazersStats.emo_frequent }}</b></i>-->
</div> </div>
<div class="item"> <div class="item">
<i class="button button-block button-clear bgbluegreen text-light">Low-Carbon</i> <i class="button button-block button-clear darkblue text-light">Low-Carbon</i>
<i class="button button-block icon-left ion-android-car"><b>{{ blazersStats.low_carbon_mode.mode }}</b></i> <i class="button button-block icon-left ion-android-car"><b>{{ blazersStats.low_carbon_mode.mode }}</b></i>
<!--<i class="button button-block icon-left ion-android-bulb"><b>{{ blazersStats.emo_frequent_positive }}</b></i>--> <!--<i class="button button-block icon-left ion-android-bulb"><b>{{ blazersStats.emo_frequent_positive }}</b></i>-->
</div> </div>
...@@ -25,15 +25,15 @@ ...@@ -25,15 +25,15 @@
<div class="list card"> <div class="list card">
<div class="item item-divider"> Time </div> <div class="item item-divider"> Time </div>
<div class="item"> <div class="item">
<i class="button button-block button-clear bgbluegreen text-light">Latest</i> <i class="button button-block button-clear darkblue text-light">Latest</i>
<i class="button button-block icon-left ion-android-time"><b>{{ blazersStats.latest_time | number:0}} minutes</b></i> <i class="button button-block icon-left ion-android-time"><b>{{ blazersStats.latest_time | number:0}} minutes</b></i>
</div> </div>
<div class="item"> <div class="item">
<i class="button button-block button-clear bgbluegreen text-light">Average</i> <i class="button button-block button-clear darkblue text-light">Average</i>
<i class="button button-block icon-left ion-android-time"><b>{{ blazersStats.average_time | number:0}} minutes</b></i> <i class="button button-block icon-left ion-android-time"><b>{{ blazersStats.average_time | number:0}} minutes</b></i>
</div> </div>
<div class="item"> <div class="item">
<i class="button button-block button-clear bgbluegreen text-light">Best</i> <i class="button button-block button-clear darkblue text-light">Best</i>
<i class="button button-block icon-left ion-android-time"><b>{{ blazersStats.best_time | number:0}} minutes</b></i> <i class="button button-block icon-left ion-android-time"><b>{{ blazersStats.best_time | number:0}} minutes</b></i>
</div> </div>
</div> </div>
......
platforms/android/assets/www/css/style.css
View file @ 27f1afad
...@@ -45,6 +45,10 @@ body { ...@@ -45,6 +45,10 @@ body {
color: #fff !important; color: #fff !important;
} }
.text-dark{
color: #000 !important;
}
.darkgreen { .darkgreen {
color: #333333; color: #333333;
} }
...@@ -58,17 +62,22 @@ body { ...@@ -58,17 +62,22 @@ body {
} }
.monthview-primary-with-event-complete { .monthview-primary-with-event-complete {
background-color: #009900; background-color: #028002;
color: white; color: white;
} }
.monthview-primary-with-event-incomplete { .monthview-primary-with-event-incomplete {
background-color: #99ff99; background-color: #a5ce86;
color: black; color: white;
}
.monthview-primary-with-event-missed {
background-color: #e2afb8;
color: white;
} }
.monthview-primary-with-event-notrip { .monthview-primary-with-event-notrip {
background-color: #808080; background-color: #929c98;
color: white; color: white;
} }
...@@ -304,7 +313,7 @@ h3 { ...@@ -304,7 +313,7 @@ h3 {
/* USER PROFILE */ /* USER PROFILE */
#dashboards { #dashboards {
background: linear-gradient(0deg, #FBFBFB 50%, #165c5b 50%); background: linear-gradient(0deg, #FBFBFB 50%, #202a36 50%);
} }
#profile-photo { #profile-photo {
...@@ -312,7 +321,7 @@ h3 { ...@@ -312,7 +321,7 @@ h3 {
max-height: 23vh; max-height: 23vh;
display: block; display: block;
margin: 0 auto; margin: 0 auto;
border: 8px solid #FBFBFB; border: 5px solid #FBFBFB;
border-bottom: #000 !important; border-bottom: #000 !important;
} }
...@@ -417,4 +426,24 @@ h3 { ...@@ -417,4 +426,24 @@ h3 {
.background-feed { .background-feed {
background-color: #eaebef; background-color: #eaebef;
}
/* TABLE CSS */
.header .col {
background-color:lightgrey;
}
.col {
border: solid 1px lightgrey;
border-bottom-style: none;
border-right-style: none;
color: grey;
}
.col:last-child {
border-right: solid 1px lightgrey;
}
.row:last-child .col {
border-bottom: solid 1px lightgrey;
} }
\ No newline at end of file
platforms/android/assets/www/index.html
View file @ 27f1afad
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
<link href="css/style.css" rel="stylesheet"> <link href="css/style.css" rel="stylesheet">
<link rel="stylesheet" href="css/leaflet.css"> <link rel="stylesheet" href="css/leaflet.css">
<link rel="stylesheet" href="css/leaflet-routing-machine.css"> <link rel="stylesheet" href="css/leaflet-routing-machine.css">
<link rel="stylesheet" href="lib/flex-calendar/flex-calendar.css">
<link href="lib/ion-floating-menu/dist/ion-floating-menu.css" rel="stylesheet" type="text/css"> <link href="lib/ion-floating-menu/dist/ion-floating-menu.css" rel="stylesheet" type="text/css">
<!--<link href="lib/leaflet-markercluster/dist/MarkerCluster.css" rel="stylesheet" type="text/css"/>--> <!--<link href="lib/leaflet-markercluster/dist/MarkerCluster.css" rel="stylesheet" type="text/css"/>-->
...@@ -36,6 +38,7 @@ ...@@ -36,6 +38,7 @@
<!-- your app's js --> <!-- your app's js -->
<script src="js/app.js"></script> <script src="js/app.js"></script>
<script src="app/landing/js/landing.js"></script> <script src="app/landing/js/landing.js"></script>
<script src="app/menu/js/menu.js"></script> <script src="app/menu/js/menu.js"></script>
<script src="app/auth/js/auth.js"></script> <script src="app/auth/js/auth.js"></script>
...@@ -60,8 +63,9 @@ ...@@ -60,8 +63,9 @@
<!--<script src="lib/leaflet-markercluster/dist/leaflet.markercluster.js" type="text/javascript"></script>--> <!--<script src="lib/leaflet-markercluster/dist/leaflet.markercluster.js" type="text/javascript"></script>-->
<script src="lib/ion-datetime-picker/release/ion-datetime-picker.min.js"></script> <script src="lib/ion-datetime-picker/release/ion-datetime-picker.min.js"></script>
<script src="lib/flex-calendar/angular-translate.js"></script>
<script src="lib/flex-calendar/flex-calendar.js"></script>
<script src="js/directives/radioButtons.js"></script> <script src="js/directives/radioButtons.js"></script>
<script src="lib/ionic-calendar/calendar-tpls.js"></script> <script src="lib/ionic-calendar/calendar-tpls.js"></script>
</head> </head>
......
platforms/android/assets/www/js/app.js
View file @ 27f1afad
...@@ -22,7 +22,8 @@ angular.module('blazer', [ ...@@ -22,7 +22,8 @@ angular.module('blazer', [
'ion-floating-menu', 'ion-floating-menu',
'ion-datetime-picker', 'ion-datetime-picker',
'chart.js', 'chart.js',
'ui.rCalendar' // 'ui.rCalendar',
'flexcalendar'
]) ])
.run(function($ionicPlatform, $ionicPickerI18n) { .run(function($ionicPlatform, $ionicPickerI18n) {
...@@ -54,7 +55,7 @@ angular.module('blazer', [ ...@@ -54,7 +55,7 @@ angular.module('blazer', [
$stateProvider $stateProvider
/* LANDING */ /* LANDING */
.state('landing', { .state(' ', {
url: '/landing', url: '/landing',
templateUrl: 'app/landing/landing.html', templateUrl: 'app/landing/landing.html',
controller: 'LandingCtrl' controller: 'LandingCtrl'
......
platforms/android/assets/www/lib/chart/Chart.min.js
View file @ 27f1afad
This source diff could not be displayed because it is too large. You can view the blob instead.
platforms/android/assets/www/lib/flex-calendar/flex-calendar.css 0 → 100755
View file @ 27f1afad
.flex-calendar {
width: 100%;
min-height: 60px;
color: #FFFFFF;
font-weight: 400;
}
.flex-calendar .month {
position:relative;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-webkit-flex-direction: row;
-ms-flex-direction: row;
flex-direction: row;
-webkit-flex-wrap: nowrap;
-ms-flex-wrap: nowrap;
flex-wrap: nowrap;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
-webkit-align-content: flex-start;
-ms-flex-line-pack: start;
align-content: flex-start;
-webkit-box-align: start;
-webkit-align-items: flex-start;
-ms-flex-align: start;
align-items: flex-start;
background-color: #165c5b;
}
.flex-calendar .month .arrow,
.flex-calendar .month .label{
height: 40px;
-webkit-box-ordinal-group: 1;
-webkit-order: 0;
-ms-flex-order: 0;
order: 0;
-webkit-box-flex: 0;
-webkit-flex: 0 1 auto;
-ms-flex: 0 1 auto;
flex: 0 1 auto;
-webkit-align-self: auto;
-ms-flex-item-align: auto;
align-self: auto;
line-height: 40px;
font-size:20px;
}
.flex-calendar .month .arrow {
width: 40px;
box-sizing: border-box;
background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAABqUlEQVR4Xt3b0U3EMBCE4XEFUAolHB0clUFHUAJ0cldBkKUgnRDh7PWsd9Z5Tpz8nyxFspOCJMe2bU8AXgG8lFIurMcurIE8x9nj3wE8AvgE8MxCkAf4Ff/jTEOQBjiIpyLIAtyJpyFIAjTGUxDkADrjhxGkAIzxQwgyAIPxZgQJAFJ8RbgCOJVS6muy6QgHiIyvQqEA0fGhAArxYQAq8SEASvHTAdTipwIoxk8DUI2fAqAc7w6gHu8KkCHeDSBLvAtApng6QLZ4KkDGeBpA1ngKQOb4YYDs8UMAK8SbAVaJNwGsFN8NsFq8FeADwEPTmvPxSXV/v25xNy9fD97v8PLuVeF9FiyD0A1QKVdCMAGshGAGWAVhCGAFhGGA7AgUgMwINICsCFSAjAh0gGwILgCZENwAsiC4AmRAcAdQR5gCoIwwDUAVYSqAIsJ0ADWEEAAlhDAAFYRQAAWEcIBoBAkAIsLX/rV48291MgAEhO747o0Rr82J23GNS+6meEkAw0wwx8sCdCAMxUsDNCAMx8sD/INAiU8B8AcCLT4NwA3CG4Az68/xOu43keZ+UGLOkN4AAAAASUVORK5CYII=') no-repeat;
background-size: contain;
background-origin: content-box;
padding:15px 5px;
cursor:pointer;
-webkit-transition: all 0.3s;
-moz-transition: all 0.3s;
-o-transition: all 0.3s;
-ms-transition: all 0.3s;
transition: all 0.3s;
}
.flex-calendar .month .arrow:last-child {
-webkit-transform: rotate(180deg);
-ms-transform: rotate(180deg);
transform: rotate(180deg);
}
.flex-calendar .month .arrow.visible{
opacity:1;
visibility: visible;
cursor: pointer;
}
.flex-calendar .month .arrow.hidden{
opacity:0;
visibility: hidden;
cursor: default;
}
.flex-calendar .week,
.flex-calendar .days {
line-height: 40px;
font-size: 16px;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: wrap;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
}
.flex-calendar .days {
background-color: #FFF;
}
.flex-calendar .week {
background-color: #165c5b;
}
.flex-calendar .week .day,
.flex-calendar .days .day{
-webkit-box-flex: 0;
-webkit-flex-grow: 0;
-ms-flex-positive: 0;
flex-grow: 0;
min-width: 14.285714286%;
text-align: center;
}
.flex-calendar .days .day{
min-height: 40px;
box-sizing: border-box;
position: relative;
line-height: 40px;
border-top:1px solid #FCFCFC;
background-color: #fff;
color: #8B8B8B;
-webkit-transition: all 0.3s ease;
transition: all 0.3s ease;
}
.flex-calendar .days .day.out {
background-color: #fCFCFC;
}
/* TODAY */
.flex-calendar .days .day.today,
.flex-calendar .days .day.disabled.today{
color: #FFB835;
border: 1px solid;
}
.flex-calendar .days .day.complete,
.flex-calendar .days .day.incomplete,
.flex-calendar .days .day.notrip,
.flex-calendar .days .day.missed {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-webkit-flex-direction: row;
-ms-flex-direction: row;
flex-direction: row;
-webkit-flex-wrap: nowrap;
-ms-flex-wrap: nowrap;
flex-wrap: nowrap;
-webkit-box-pack: center;
-webkit-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
-webkit-align-content: center;
-ms-flex-line-pack: center;
align-content: center;
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
}
/* SELECTED */
.flex-calendar .days .day.selected .number {
width: 100%;
height: 40px;
background-color: #08ae9e;
/*border-radius: 100%;*/
line-height: 40px;
color: white;
}
.flex-calendar .days .day.complete {
width: 40px;
height: 40px;
background-color: #028002;
/*border-radius: 100%;*/
line-height: 40px;
color: #FFFFFF;
}
.flex-calendar .days .day.incomplete {
width: 40px;
height: 40px;
background-color: #a5ce86;
/*border-radius: 100%;*/
line-height: 40px;
color: #FFFFFF;
}
.flex-calendar .days .day.notrip {
width: 40px;
height: 40px;
background-color: #929c98;
/*border-radius: 100%;*/
line-height: 40px;
color: #FFFFFF;
}
.flex-calendar .days .day.missed {
width: 40px;
height: 40px;
background-color: #e2afb8;
/*border-radius: 100%;*/
line-height: 40px;
color: #FFFFFF;
}
.flex-calendar .days .day:not(.disabled):not(.out){
cursor: pointer;
}
.flex-calendar .days .day.disabled {
border: none;
}
.flex-calendar .days .day.disabled .number {
background-color: #EFEFEF;
background-image: url('data:image/gif;base64,R0lGODlhBQAFAOMAAP/14////93uHt3uHt3uHt3uHv///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAFAAUAAAQL0ACAzpG0YnonNxEAOw==');
}
/*.flex-calendar .days .day.event:before {
content: "";
width: 6px;
height: 6px;
border-radius:100%;
background-color: #faac1c;
position:absolute;
bottom:10px;
margin-left:-3px;
}*/
platforms/android/assets/www/lib/ionic-calendar/calendar-tpls.js
View file @ 27f1afad
...@@ -522,7 +522,7 @@ angular.module('ui.rCalendar', ['ui.rCalendar.tpls']) ...@@ -522,7 +522,7 @@ angular.module('ui.rCalendar', ['ui.rCalendar.tpls'])
console.log("DOUBLE TAPPED"); console.log("DOUBLE TAPPED");
}; };
scope.getHighlightClass = function(date, data_type) { scope.getHighlightClass = function(date) {
var className = ''; var className = '';
if (date.hasEvent) { if (date.hasEvent) {
...@@ -531,16 +531,23 @@ angular.module('ui.rCalendar', ['ui.rCalendar.tpls']) ...@@ -531,16 +531,23 @@ angular.module('ui.rCalendar', ['ui.rCalendar.tpls'])
} else { } else {
if (date.events) { if (date.events) {
console.log("[ DAY TYPE ]", date.events[0].type); console.log("[ DAY TYPE ]", date.events[0].type);
if (date.events[0].type == "1") { if (date.events[0].type === 1) {
className = 'monthview-primary-with-event-complete' console.log("INCOMPLETE");
} else if (date.events[0].type == "2") {
className = 'monthview-primary-with-event-incomplete' className = 'monthview-primary-with-event-incomplete'
} else if (date.events[0].type == "3") { } else if (date.events[0].type === 2) {
console.log("COMPLETE");
className = 'monthview-primary-with-event-complete'
} else if (date.events[0].type === 3) {
console.log("NO TRIP");
className = 'monthview-primary-with-event-notrip' className = 'monthview-primary-with-event-notrip'
} else if (date.events[0].type === 0) {
console.log("MISSED");
className = 'monthview-primary-with-event-missed'
} }
} }
} }
} }
if (date.selected) { if (date.selected) {
if (className) { if (className) {
...@@ -821,6 +828,7 @@ angular.module('ui.rCalendar', ['ui.rCalendar.tpls']) ...@@ -821,6 +828,7 @@ angular.module('ui.rCalendar', ['ui.rCalendar.tpls'])
}; };
scope.select = function(selectedTime, events) { scope.select = function(selectedTime, events) {
console.log("[ SELECT CALENDAR ]", JSON.stringify(selectedTime));
if (scope.timeSelected) { if (scope.timeSelected) {
var disabled; var disabled;
if (scope.isDateDisabled) { if (scope.isDateDisabled) {
......
platforms/android/assets/www/lib/ionic-calendar/calendar.css
View file @ 27f1afad
...@@ -139,17 +139,22 @@ ...@@ -139,17 +139,22 @@
} }
.monthview-primary-with-event-complete { .monthview-primary-with-event-complete {
background-color: #009900; background-color: #028002;
color: white; color: white;
} }
.monthview-primary-with-event-incomplete { .monthview-primary-with-event-incomplete {
background-color: #99ff99; background-color: #a5ce86;
color: black; color: white;
}
.monthview-primary-with-event-missed {
background-color: #e2afb8;
color: white;
} }
.monthview-primary-with-event-notrip { .monthview-primary-with-event-notrip {
background-color: #808080; background-color: #929c98;
color: white; color: white;
} }
......
platforms/android/assets/www/lib/ng-cordova.min.js deleted 100755 → 0
View file @ 127bf5ad
This diff is collapsed.
platforms/ios/Blaze.xcodeproj/xcuserdata/bonlemuel.xcuserdatad/xcschemes/Blaze.xcscheme
View file @ 27f1afad
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0810" LastUpgradeVersion = "0830"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
......
platforms/ios/Blaze/Blaze-Info.plist
View file @ 27f1afad
...@@ -28,21 +28,10 @@ ...@@ -28,21 +28,10 @@
<string>0.0.2</string> <string>0.0.2</string>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>
<true/> <true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>NSLocationWhenInUseUsageDescription</key>
<string/>
<key>NSMainNibFile</key> <key>NSMainNibFile</key>
<string/> <string/>
<key>NSMainNibFile~ipad</key> <key>NSMainNibFile~ipad</key>
<string/> <string/>
<key>UIRequiresFullScreen</key>
<true/>
<key>UIStatusBarHidden</key>
<true/>
<key>UISupportedInterfaceOrientations</key> <key>UISupportedInterfaceOrientations</key>
<array> <array>
<string>UIInterfaceOrientationPortrait</string> <string>UIInterfaceOrientationPortrait</string>
...@@ -56,5 +45,14 @@ ...@@ -56,5 +45,14 @@
<string>UIInterfaceOrientationPortraitUpsideDown</string> <string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeRight</string> <string>UIInterfaceOrientationLandscapeRight</string>
</array> </array>
<key>UIRequiresFullScreen</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>NSLocationWhenInUseUsageDescription</key>
<string/>
</dict> </dict>
</plist> </plist>
\ No newline at end of file
platforms/ios/Blaze/Images.xcassets/LaunchImage.launchimage/Contents.json
View file @ 27f1afad
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
{ {
"orientation" : "portrait", "orientation" : "portrait",
"idiom" : "iphone", "idiom" : "iphone",
"filename" : "Default-736h-1.png", "filename" : "Default-736h.png",
"extent" : "full-screen", "extent" : "full-screen",
"subtype" : "retina4", "subtype" : "retina4",
"scale" : "2x" "scale" : "2x"
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
{ {
"orientation" : "portrait", "orientation" : "portrait",
"idiom" : "ipad", "idiom" : "ipad",
"filename" : "Default-Portrait~ipad-1.png", "filename" : "Default-Portrait@2x~ipad.png",
"extent" : "full-screen", "extent" : "full-screen",
"scale" : "2x" "scale" : "2x"
}, },
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
"extent" : "full-screen", "extent" : "full-screen",
"idiom" : "iphone", "idiom" : "iphone",
"subtype" : "retina4", "subtype" : "retina4",
"filename" : "Default-568h@2x~iphone.png", "filename" : "Default-736h-1.png",
"minimum-system-version" : "7.0", "minimum-system-version" : "7.0",
"orientation" : "portrait", "orientation" : "portrait",
"scale" : "2x" "scale" : "2x"
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
{ {
"orientation" : "portrait", "orientation" : "portrait",
"idiom" : "ipad", "idiom" : "ipad",
"filename" : "Default-Portrait@2x~ipad.png", "filename" : "Default-Portrait~ipad-1.png",
"extent" : "full-screen", "extent" : "full-screen",
"minimum-system-version" : "7.0", "minimum-system-version" : "7.0",
"scale" : "2x" "scale" : "2x"
......
platforms/ios/Blaze/Images.xcassets/LaunchStoryboard.imageset/Contents.json
View file @ 27f1afad
{ {
"images" : [ "images": [
{ {
"idiom" : "universal", "idiom": "universal",
"scale" : "1x" "scale": "1x",
"width-class": "compact",
"height-class": "compact"
}, },
{ {
"idiom" : "universal", "idiom": "universal",
"scale" : "2x" "scale": "1x",
"width-class": "compact"
}, },
{ {
"idiom" : "universal", "idiom": "universal",
"scale" : "3x" "scale": "1x",
"height-class": "compact"
}, },
{ {
"idiom" : "universal", "idiom": "universal",
"scale" : "1x", "scale": "1x"
"height-class" : "compact"
}, },
{ {
"idiom" : "universal", "idiom": "universal",
"scale" : "2x", "scale": "2x",
"height-class" : "compact" "width-class": "compact",
"height-class": "compact"
}, },
{ {
"idiom" : "universal", "idiom": "universal",
"height-class" : "compact", "scale": "2x",
"scale" : "3x" "width-class": "compact"
}, },
{ {
"idiom" : "universal", "idiom": "universal",
"scale" : "1x", "scale": "2x",
"width-class" : "compact" "height-class": "compact"
}, },
{ {
"idiom" : "universal", "idiom": "universal",
"width-class" : "compact", "scale": "2x"
"scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom": "universal",
"width-class" : "compact", "scale": "3x",
"scale" : "3x" "width-class": "compact",
"height-class": "compact"
}, },
{ {
"idiom" : "universal", "idiom": "universal",
"width-class" : "compact", "scale": "3x",
"height-class" : "compact", "width-class": "compact"
"scale" : "1x"
}, },
{ {
"idiom" : "universal", "idiom": "universal",
"width-class" : "compact", "scale": "3x",
"height-class" : "compact", "height-class": "compact"
"scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom": "universal",
"width-class" : "compact", "scale": "3x"
"height-class" : "compact",
"scale" : "3x"
}, },
{ {
"idiom" : "iphone", "idiom": "ipad",
"scale" : "1x" "scale": "1x",
"width-class": "compact",
"height-class": "compact"
}, },
{ {
"idiom" : "iphone", "idiom": "ipad",
"scale" : "2x" "scale": "1x",
"width-class": "compact"
}, },
{ {
"idiom" : "iphone", "idiom": "ipad",
"scale" : "3x" "scale": "1x",
"height-class": "compact"
}, },
{ {
"idiom" : "iphone", "idiom": "ipad",
"scale" : "1x", "scale": "1x"
"height-class" : "compact"
}, },
{ {
"idiom" : "iphone", "idiom": "ipad",
"scale" : "2x", "scale": "2x",
"height-class" : "compact" "width-class": "compact",
"height-class": "compact"
}, },
{ {
"idiom" : "iphone", "idiom": "ipad",
"scale" : "3x", "scale": "2x",
"height-class" : "compact" "width-class": "compact"
}, },
{ {
"idiom" : "iphone", "idiom": "ipad",
"scale" : "1x", "scale": "2x",
"width-class" : "compact" "height-class": "compact"
}, },
{ {
"idiom" : "iphone", "idiom": "ipad",
"scale" : "2x", "scale": "2x"
"width-class" : "compact"
}, },
{ {
"idiom" : "iphone", "idiom": "iphone",
"scale" : "3x", "scale": "1x",
"width-class" : "compact" "width-class": "compact",
"height-class": "compact"
}, },
{ {
"idiom" : "iphone", "idiom": "iphone",
"width-class" : "compact", "scale": "1x",
"height-class" : "compact", "width-class": "compact"
"scale" : "1x"
}, },
{ {
"idiom" : "iphone", "idiom": "iphone",
"width-class" : "compact", "scale": "1x",
"height-class" : "compact", "height-class": "compact"
"scale" : "2x"
}, },
{ {
"idiom" : "iphone", "idiom": "iphone",
"width-class" : "compact", "scale": "1x"
"height-class" : "compact",
"scale" : "3x"
}, },
{ {
"idiom" : "ipad", "idiom": "iphone",
"scale" : "1x" "scale": "2x",
"width-class": "compact",
"height-class": "compact"
}, },
{ {
"idiom" : "ipad", "idiom": "iphone",
"scale" : "2x" "scale": "2x",
"width-class": "compact"
}, },
{ {
"idiom" : "ipad", "idiom": "iphone",
"scale" : "1x", "scale": "2x",
"height-class" : "compact" "height-class": "compact"
}, },
{ {
"idiom" : "ipad", "idiom": "iphone",
"scale" : "2x", "scale": "2x"
"height-class" : "compact"
}, },
{ {
"idiom" : "ipad", "idiom": "iphone",
"scale" : "1x", "scale": "3x",
"width-class" : "compact" "width-class": "compact",
"height-class": "compact"
}, },
{ {
"idiom" : "ipad", "idiom": "iphone",
"scale" : "2x", "scale": "3x",
"width-class" : "compact" "width-class": "compact"
}, },
{ {
"idiom" : "ipad", "idiom": "iphone",
"width-class" : "compact", "scale": "3x",
"height-class" : "compact", "height-class": "compact"
"scale" : "1x"
}, },
{ {
"idiom" : "ipad", "idiom": "iphone",
"width-class" : "compact", "scale": "3x"
"height-class" : "compact",
"scale" : "2x"
} }
], ],
"info" : { "info": {
"version" : 1, "author": "Xcode",
"author" : "xcode" "version": 1
} }
} }
\ No newline at end of file
platforms/ios/Blaze/config.xml
View file @ 27f1afad
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
<param name="ios-package" value="CDVGestureHandler" /> <param name="ios-package" value="CDVGestureHandler" />
<param name="onload" value="true" /> <param name="onload" value="true" />
</feature> </feature>
<feature name="Console">
<param name="ios-package" value="CDVLogger" />
</feature>
<feature name="Device"> <feature name="Device">
<param name="ios-package" value="CDVDevice" /> <param name="ios-package" value="CDVDevice" />
</feature> </feature>
...@@ -38,14 +41,11 @@ ...@@ -38,14 +41,11 @@
<param name="ios-package" value="CDVStatusBar" /> <param name="ios-package" value="CDVStatusBar" />
<param name="onload" value="true" /> <param name="onload" value="true" />
</feature> </feature>
<feature name="Keyboard">
<param name="ios-package" onload="true" value="IonicKeyboard" />
</feature>
<feature name="Toast"> <feature name="Toast">
<param name="ios-package" value="Toast" /> <param name="ios-package" value="Toast" />
</feature> </feature>
<feature name="Console"> <feature name="Keyboard">
<param name="ios-package" value="CDVLogger" /> <param name="ios-package" onload="true" value="IonicKeyboard" />
</feature> </feature>
<name>Blaze</name> <name>Blaze</name>
<description> <description>
......
platforms/ios/CordovaLib/Classes/Public/CDVAvailability.h
View file @ 27f1afad
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
#define __CORDOVA_4_2_0 40200 #define __CORDOVA_4_2_0 40200
#define __CORDOVA_4_2_1 40201 #define __CORDOVA_4_2_1 40201
#define __CORDOVA_4_3_0 40300 #define __CORDOVA_4_3_0 40300
#define __CORDOVA_4_3_1 40301
/* coho:next-version,insert-before */ /* coho:next-version,insert-before */
#define __CORDOVA_NA 99999 /* not available */ #define __CORDOVA_NA 99999 /* not available */
...@@ -77,7 +78,7 @@ ...@@ -77,7 +78,7 @@
*/ */
#ifndef CORDOVA_VERSION_MIN_REQUIRED #ifndef CORDOVA_VERSION_MIN_REQUIRED
/* coho:next-version-min-required,replace-after */ /* coho:next-version-min-required,replace-after */
#define CORDOVA_VERSION_MIN_REQUIRED __CORDOVA_4_3_0 #define CORDOVA_VERSION_MIN_REQUIRED __CORDOVA_4_3_1
#endif #endif
/* /*
......
platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/bonlemuel.xcuserdatad/xcschemes/CordovaLib.xcscheme
View file @ 27f1afad
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0810" LastUpgradeVersion = "0830"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
......
platforms/ios/CordovaLib/cordova.js
View file @ 27f1afad
// Platform: ios // Platform: ios
// f28234fbc27c578b9a335f1dabfa2d1b96bfc03d // a3732cb71d9b1dd590338e8cf44196f366d46da3
/* /*
Licensed to the Apache Software Foundation (ASF) under one Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file or more contributor license agreements. See the NOTICE file
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
under the License. under the License.
*/ */
;(function() { ;(function() {
var PLATFORM_VERSION_BUILD_LABEL = '4.3.0'; var PLATFORM_VERSION_BUILD_LABEL = '4.3.1';
// file: src/scripts/require.js // file: src/scripts/require.js
/*jshint -W079 */ /*jshint -W079 */
......
platforms/ios/cordova/build.xcconfig
View file @ 27f1afad
...@@ -23,9 +23,7 @@ ...@@ -23,9 +23,7 @@
// //
HEADER_SEARCH_PATHS = "$(TARGET_BUILD_DIR)/usr/local/lib/include" "$(OBJROOT)/UninstalledProducts/include" "$(OBJROOT)/UninstalledProducts/$(PLATFORM_NAME)/include" "$(BUILT_PRODUCTS_DIR)" HEADER_SEARCH_PATHS = "$(TARGET_BUILD_DIR)/usr/local/lib/include" "$(OBJROOT)/UninstalledProducts/include" "$(OBJROOT)/UninstalledProducts/$(PLATFORM_NAME)/include" "$(BUILT_PRODUCTS_DIR)"
IPHONEOS_DEPLOYMENT_TARGET = 8.0
OTHER_LDFLAGS = -ObjC OTHER_LDFLAGS = -ObjC
TARGETED_DEVICE_FAMILY = 1,2
// Type of signing identity used for codesigning, resolves to first match of given type. // Type of signing identity used for codesigning, resolves to first match of given type.
// "iPhone Developer": Development builds (default, local only; iOS Development certificate) or "iPhone Distribution": Distribution builds (Adhoc/In-House/AppStore; iOS Distribution certificate) // "iPhone Developer": Development builds (default, local only; iOS Development certificate) or "iPhone Distribution": Distribution builds (Adhoc/In-House/AppStore; iOS Distribution certificate)
......
platforms/ios/cordova/lib/build.js
View file @ 27f1afad
...@@ -76,7 +76,7 @@ module.exports.run = function (buildOpts) { ...@@ -76,7 +76,7 @@ module.exports.run = function (buildOpts) {
var buildType = buildOpts.release ? 'release' : 'debug'; var buildType = buildOpts.release ? 'release' : 'debug';
var config = buildConfig.ios[buildType]; var config = buildConfig.ios[buildType];
if(config) { if(config) {
['codeSignIdentity', 'codeSignResourceRules', 'provisioningProfile', 'developmentTeam', 'packageType'].forEach( ['codeSignIdentity', 'codeSignResourceRules', 'provisioningProfile', 'developmentTeam', 'packageType', 'buildFlag'].forEach(
function(key) { function(key) {
buildOpts[key] = buildOpts[key] || config[key]; buildOpts[key] = buildOpts[key] || config[key];
}); });
...@@ -84,7 +84,17 @@ module.exports.run = function (buildOpts) { ...@@ -84,7 +84,17 @@ module.exports.run = function (buildOpts) {
} }
} }
return check_reqs.run().then(function () { return require('./list-devices').run()
.then(function (devices) {
if (devices.length > 0 && !(buildOpts.emulator)) {
// we also explicitly set device flag in options as we pass
// those parameters to other api (build as an example)
buildOpts.device = true;
return check_reqs.check_ios_deploy();
}
}).then(function () {
return check_reqs.run();
}).then(function () {
return findXCodeProjectIn(projectPath); return findXCodeProjectIn(projectPath);
}).then(function (name) { }).then(function (name) {
projectName = name; projectName = name;
......
platforms/ios/cordova/lib/prepare.js
View file @ 27f1afad
This diff is collapsed.
platforms/ios/cordova/node_modules/abbrev/package.json
View file @ 27f1afad
{ {
"_args": [
[
{
"raw": "abbrev@1",
"scope": null,
"escapedName": "abbrev",
"name": "abbrev",
"rawSpec": "1",
"spec": ">=1.0.0 <2.0.0",
"type": "range"
},
"/Users/shazron/Documents/git/apache/cordova-ios/node_modules/ios-sim/node_modules/nopt"
]
],
"_from": "abbrev@>=1.0.0 <2.0.0",
"_id": "abbrev@1.0.9",
"_inCache": true,
"_location": "/abbrev",
"_nodeVersion": "4.4.4",
"_npmOperationalInternal": {
"host": "packages-16-east.internal.npmjs.com",
"tmp": "tmp/abbrev-1.0.9.tgz_1466016055839_0.7825860097073019"
},
"_npmUser": {
"name": "isaacs",
"email": "i@izs.me"
},
"_npmVersion": "3.9.1",
"_phantomChildren": {},
"_requested": {
"raw": "abbrev@1",
"scope": null,
"escapedName": "abbrev",
"name": "abbrev",
"rawSpec": "1",
"spec": ">=1.0.0 <2.0.0",
"type": "range"
},
"_requiredBy": [
"/ios-sim/nopt",
"/nopt"
],
"_resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
"_shasum": "91b4792588a7738c25f35dd6f63752a2f8776135",
"_shrinkwrap": null,
"_spec": "abbrev@1",
"_where": "/Users/shazron/Documents/git/apache/cordova-ios/node_modules/ios-sim/node_modules/nopt",
"author": { "author": {
"name": "Isaac Z. Schlueter", "name": "Isaac Z. Schlueter",
"email": "i@izs.me" "email": "i@izs.me"
...@@ -40,4 +87,4 @@ ...@@ -40,4 +87,4 @@
"test": "tap test.js --cov" "test": "tap test.js --cov"
}, },
"version": "1.0.9" "version": "1.0.9"
} }
\ No newline at end of file
platforms/ios/cordova/node_modules/ansi/package.json
View file @ 27f1afad
{ {
"_args": [
[
{
"raw": "ansi@^0.3.1",
"scope": null,
"escapedName": "ansi",
"name": "ansi",
"rawSpec": "^0.3.1",
"spec": ">=0.3.1 <0.4.0",
"type": "range"
},
"/Users/shazron/Documents/git/apache/cordova-ios/node_modules/cordova-common"
]
],
"_from": "ansi@>=0.3.1 <0.4.0",
"_id": "ansi@0.3.1",
"_inCache": true,
"_location": "/ansi",
"_nodeVersion": "5.3.0",
"_npmUser": {
"name": "tootallnate",
"email": "nathan@tootallnate.net"
},
"_npmVersion": "3.3.12",
"_phantomChildren": {},
"_requested": {
"raw": "ansi@^0.3.1",
"scope": null,
"escapedName": "ansi",
"name": "ansi",
"rawSpec": "^0.3.1",
"spec": ">=0.3.1 <0.4.0",
"type": "range"
},
"_requiredBy": [
"/cordova-common"
],
"_resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
"_shasum": "0c42d4fb17160d5a9af1e484bace1c66922c1b21",
"_shrinkwrap": null,
"_spec": "ansi@^0.3.1",
"_where": "/Users/shazron/Documents/git/apache/cordova-ios/node_modules/cordova-common",
"author": { "author": {
"name": "Nathan Rajlich", "name": "Nathan Rajlich",
"email": "nathan@tootallnate.net", "email": "nathan@tootallnate.net",
...@@ -48,4 +90,4 @@ ...@@ -48,4 +90,4 @@
}, },
"scripts": {}, "scripts": {},
"version": "0.3.1" "version": "0.3.1"
} }
\ No newline at end of file
platforms/ios/cordova/node_modules/balanced-match/package.json
View file @ 27f1afad
{ {
"_args": [
[
{
"raw": "balanced-match@^0.4.1",
"scope": null,
"escapedName": "balanced-match",
"name": "balanced-match",
"rawSpec": "^0.4.1",
"spec": ">=0.4.1 <0.5.0",
"type": "range"
},
"/Users/shazron/Documents/git/apache/cordova-ios/node_modules/brace-expansion"
]
],
"_from": "balanced-match@>=0.4.1 <0.5.0",
"_id": "balanced-match@0.4.2",
"_inCache": true,
"_location": "/balanced-match",
"_nodeVersion": "4.4.7",
"_npmOperationalInternal": {
"host": "packages-16-east.internal.npmjs.com",
"tmp": "tmp/balanced-match-0.4.2.tgz_1468834991581_0.6590619895141572"
},
"_npmUser": {
"name": "juliangruber",
"email": "julian@juliangruber.com"
},
"_npmVersion": "2.15.8",
"_phantomChildren": {},
"_requested": {
"raw": "balanced-match@^0.4.1",
"scope": null,
"escapedName": "balanced-match",
"name": "balanced-match",
"rawSpec": "^0.4.1",
"spec": ">=0.4.1 <0.5.0",
"type": "range"
},
"_requiredBy": [
"/brace-expansion"
],
"_resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
"_shasum": "cb3f3e3c732dc0f01ee70b403f302e61d7709838",
"_shrinkwrap": null,
"_spec": "balanced-match@^0.4.1",
"_where": "/Users/shazron/Documents/git/apache/cordova-ios/node_modules/brace-expansion",
"author": { "author": {
"name": "Julian Gruber", "name": "Julian Gruber",
"email": "mail@juliangruber.com", "email": "mail@juliangruber.com",
...@@ -61,4 +107,4 @@ ...@@ -61,4 +107,4 @@
] ]
}, },
"version": "0.4.2" "version": "0.4.2"
} }
\ No newline at end of file
platforms/ios/cordova/node_modules/base64-js/package.json
View file @ 27f1afad
{ {
"_args": [
[
{
"raw": "base64-js@0.0.8",
"scope": null,
"escapedName": "base64-js",
"name": "base64-js",
"rawSpec": "0.0.8",
"spec": "0.0.8",
"type": "version"
},
"/Users/shazron/Documents/git/apache/cordova-ios/node_modules/plist"
]
],
"_from": "base64-js@0.0.8",
"_id": "base64-js@0.0.8",
"_inCache": true,
"_location": "/base64-js",
"_nodeVersion": "0.10.35",
"_npmUser": {
"name": "feross",
"email": "feross@feross.org"
},
"_npmVersion": "2.1.16",
"_phantomChildren": {},
"_requested": {
"raw": "base64-js@0.0.8",
"scope": null,
"escapedName": "base64-js",
"name": "base64-js",
"rawSpec": "0.0.8",
"spec": "0.0.8",
"type": "version"
},
"_requiredBy": [
"/plist"
],
"_resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
"_shasum": "1101e9544f4a76b1bc3b26d452ca96d7a35e7978",
"_shrinkwrap": null,
"_spec": "base64-js@0.0.8",
"_where": "/Users/shazron/Documents/git/apache/cordova-ios/node_modules/plist",
"author": { "author": {
"name": "T. Jameson Little", "name": "T. Jameson Little",
"email": "t.jameson.little@gmail.com" "email": "t.jameson.little@gmail.com"
...@@ -56,4 +98,4 @@ ...@@ -56,4 +98,4 @@
] ]
}, },
"version": "0.0.8" "version": "0.0.8"
} }
\ No newline at end of file
platforms/ios/cordova/node_modules/big-integer/BigInteger.js
View file @ 27f1afad
...@@ -833,6 +833,7 @@ var bigInt = (function (undefined) { ...@@ -833,6 +833,7 @@ var bigInt = (function (undefined) {
newT = lastT.subtract(q.multiply(newT)); newT = lastT.subtract(q.multiply(newT));
newR = lastR.subtract(q.multiply(newR)); newR = lastR.subtract(q.multiply(newR));
} }
if (!r.equals(1)) throw new Error(this.toString() + " and " + n.toString() + " are not co-prime");
if (t.compare(0) === -1) { if (t.compare(0) === -1) {
t = t.add(n); t = t.add(n);
} }
......
platforms/ios/cordova/node_modules/big-integer/LICENSE 0 → 100755
View file @ 27f1afad
This is free and unencumbered software released into the public domain.
Anyone is free to copy, modify, publish, use, compile, sell, or
distribute this software, either in source code form or as a compiled
binary, for any purpose, commercial or non-commercial, and by any
means.
In jurisdictions that recognize copyright laws, the author or authors
of this software dedicate any and all copyright interest in the
software to the public domain. We make this dedication for the benefit
of the public at large and to the detriment of our heirs and
successors. We intend this dedication to be an overt act of
relinquishment in perpetuity of all present and future rights to this
software under copyright law.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
For more information, please refer to <http://unlicense.org>
platforms/ios/cordova/node_modules/big-integer/package.json
View file @ 27f1afad
{ {
"_args": [
[
{
"raw": "big-integer@^1.6.7",
"scope": null,
"escapedName": "big-integer",
"name": "big-integer",
"rawSpec": "^1.6.7",
"spec": ">=1.6.7 <2.0.0",
"type": "range"
},
"/Users/shazron/Documents/git/apache/cordova-ios/node_modules/bplist-parser"
]
],
"_from": "big-integer@>=1.6.7 <2.0.0",
"_id": "big-integer@1.6.17",
"_inCache": true,
"_location": "/big-integer",
"_nodeVersion": "4.4.5",
"_npmOperationalInternal": {
"host": "packages-12-west.internal.npmjs.com",
"tmp": "tmp/big-integer-1.6.17.tgz_1478721202721_0.8068355675786734"
},
"_npmUser": {
"name": "peterolson",
"email": "peter.e.c.olson+npm@gmail.com"
},
"_npmVersion": "2.15.5",
"_phantomChildren": {},
"_requested": {
"raw": "big-integer@^1.6.7",
"scope": null,
"escapedName": "big-integer",
"name": "big-integer",
"rawSpec": "^1.6.7",
"spec": ">=1.6.7 <2.0.0",
"type": "range"
},
"_requiredBy": [
"/bplist-parser"
],
"_resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.17.tgz",
"_shasum": "f0dcf5109a949e42a993ee3e8fb2070452817b51",
"_shrinkwrap": null,
"_spec": "big-integer@^1.6.7",
"_where": "/Users/shazron/Documents/git/apache/cordova-ios/node_modules/bplist-parser",
"author": { "author": {
"name": "Peter Olson", "name": "Peter Olson",
"email": "peter.e.c.olson+npm@gmail.com" "email": "peter.e.c.olson+npm@gmail.com"
...@@ -21,13 +67,13 @@ ...@@ -21,13 +67,13 @@
}, },
"directories": {}, "directories": {},
"dist": { "dist": {
"shasum": "0ca30b58013db46b10084a09242ca1d8954724cc", "shasum": "f0dcf5109a949e42a993ee3e8fb2070452817b51",
"tarball": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz" "tarball": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.17.tgz"
}, },
"engines": { "engines": {
"node": ">=0.6" "node": ">=0.6"
}, },
"gitHead": "09b50ab4e701a2ec4d403fa3ecf12ae327227190", "gitHead": "d25d0bfcd96f31001ec8572c8d01de4770d99e63",
"homepage": "https://github.com/peterolson/BigInteger.js#readme", "homepage": "https://github.com/peterolson/BigInteger.js#readme",
"keywords": [ "keywords": [
"math", "math",
...@@ -58,5 +104,5 @@ ...@@ -58,5 +104,5 @@
"scripts": { "scripts": {
"test": "karma start my.conf.js" "test": "karma start my.conf.js"
}, },
"version": "1.6.16" "version": "1.6.17"
} }
\ No newline at end of file
platforms/ios/cordova/node_modules/bplist-creator/package.json
View file @ 27f1afad
{ {
"_args": [
[
{
"raw": "bplist-creator@0.0.4",
"scope": null,
"escapedName": "bplist-creator",
"name": "bplist-creator",
"rawSpec": "0.0.4",
"spec": "0.0.4",
"type": "version"
},
"/Users/shazron/Documents/git/apache/cordova-ios/node_modules/simple-plist"
]
],
"_from": "bplist-creator@0.0.4",
"_id": "bplist-creator@0.0.4",
"_inCache": true,
"_location": "/bplist-creator",
"_npmUser": {
"name": "joeferner",
"email": "joe@fernsroth.com"
},
"_npmVersion": "1.4.10",
"_phantomChildren": {},
"_requested": {
"raw": "bplist-creator@0.0.4",
"scope": null,
"escapedName": "bplist-creator",
"name": "bplist-creator",
"rawSpec": "0.0.4",
"spec": "0.0.4",
"type": "version"
},
"_requiredBy": [
"/simple-plist"
],
"_resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.4.tgz",
"_shasum": "4ac0496782e127a85c1d2026a4f5eb22a7aff991",
"_shrinkwrap": null,
"_spec": "bplist-creator@0.0.4",
"_where": "/Users/shazron/Documents/git/apache/cordova-ios/node_modules/simple-plist",
"author": { "author": {
"name": "https://github.com/nearinfinity/node-bplist-parser.git" "name": "https://github.com/nearinfinity/node-bplist-parser.git"
}, },
...@@ -43,4 +84,4 @@ ...@@ -43,4 +84,4 @@
"test": "./node_modules/nodeunit/bin/nodeunit test" "test": "./node_modules/nodeunit/bin/nodeunit test"
}, },
"version": "0.0.4" "version": "0.0.4"
} }
\ No newline at end of file
platforms/ios/cordova/node_modules/bplist-parser/package.json
View file @ 27f1afad
{ {
"_args": [
[
{
"raw": "bplist-parser@^0.1.0",
"scope": null,
"escapedName": "bplist-parser",
"name": "bplist-parser",
"rawSpec": "^0.1.0",
"spec": ">=0.1.0 <0.2.0",
"type": "range"
},
"/Users/shazron/Documents/git/apache/cordova-ios/node_modules/cordova-common"
]
],
"_from": "bplist-parser@>=0.1.0 <0.2.0",
"_id": "bplist-parser@0.1.1",
"_inCache": true,
"_location": "/bplist-parser",
"_nodeVersion": "5.1.0",
"_npmUser": {
"name": "joeferner",
"email": "joe@fernsroth.com"
},
"_npmVersion": "3.4.0",
"_phantomChildren": {},
"_requested": {
"raw": "bplist-parser@^0.1.0",
"scope": null,
"escapedName": "bplist-parser",
"name": "bplist-parser",
"rawSpec": "^0.1.0",
"spec": ">=0.1.0 <0.2.0",
"type": "range"
},
"_requiredBy": [
"/cordova-common"
],
"_resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
"_shasum": "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6",
"_shrinkwrap": null,
"_spec": "bplist-parser@^0.1.0",
"_where": "/Users/shazron/Documents/git/apache/cordova-ios/node_modules/cordova-common",
"author": { "author": {
"name": "Joe Ferner", "name": "Joe Ferner",
"email": "joe.ferner@nearinfinity.com" "email": "joe.ferner@nearinfinity.com"
...@@ -44,4 +86,4 @@ ...@@ -44,4 +86,4 @@
"test": "./node_modules/nodeunit/bin/nodeunit test" "test": "./node_modules/nodeunit/bin/nodeunit test"
}, },
"version": "0.1.1" "version": "0.1.1"
} }
\ No newline at end of file
platforms/ios/cordova/node_modules/brace-expansion/package.json
View file @ 27f1afad
{ {
"_args": [
[
{
"raw": "brace-expansion@^1.0.0",
"scope": null,
"escapedName": "brace-expansion",
"name": "brace-expansion",
"rawSpec": "^1.0.0",
"spec": ">=1.0.0 <2.0.0",
"type": "range"
},
"/Users/shazron/Documents/git/apache/cordova-ios/node_modules/minimatch"
]
],
"_from": "brace-expansion@>=1.0.0 <2.0.0",
"_id": "brace-expansion@1.1.6",
"_inCache": true,
"_location": "/brace-expansion",
"_nodeVersion": "4.4.7",
"_npmOperationalInternal": {
"host": "packages-16-east.internal.npmjs.com",
"tmp": "tmp/brace-expansion-1.1.6.tgz_1469047715600_0.9362958471756428"
},
"_npmUser": {
"name": "juliangruber",
"email": "julian@juliangruber.com"
},
"_npmVersion": "2.15.8",
"_phantomChildren": {},
"_requested": {
"raw": "brace-expansion@^1.0.0",
"scope": null,
"escapedName": "brace-expansion",
"name": "brace-expansion",
"rawSpec": "^1.0.0",
"spec": ">=1.0.0 <2.0.0",
"type": "range"
},
"_requiredBy": [
"/minimatch"
],
"_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz",
"_shasum": "7197d7eaa9b87e648390ea61fc66c84427420df9",
"_shrinkwrap": null,
"_spec": "brace-expansion@^1.0.0",
"_where": "/Users/shazron/Documents/git/apache/cordova-ios/node_modules/minimatch",
"author": { "author": {
"name": "Julian Gruber", "name": "Julian Gruber",
"email": "mail@juliangruber.com", "email": "mail@juliangruber.com",
...@@ -63,4 +109,4 @@ ...@@ -63,4 +109,4 @@
] ]
}, },
"version": "1.1.6" "version": "1.1.6"
} }
\ No newline at end of file
platforms/ios/cordova/node_modules/concat-map/package.json
View file @ 27f1afad
{ {
"_args": [
[
{
"raw": "concat-map@0.0.1",
"scope": null,
"escapedName": "concat-map",
"name": "concat-map",
"rawSpec": "0.0.1",
"spec": "0.0.1",
"type": "version"
},
"/Users/shazron/Documents/git/apache/cordova-ios/node_modules/brace-expansion"
]
],
"_from": "concat-map@0.0.1",
"_id": "concat-map@0.0.1",
"_inCache": true,
"_location": "/concat-map",
"_npmUser": {
"name": "substack",
"email": "mail@substack.net"
},
"_npmVersion": "1.3.21",
"_phantomChildren": {},
"_requested": {
"raw": "concat-map@0.0.1",
"scope": null,
"escapedName": "concat-map",
"name": "concat-map",
"rawSpec": "0.0.1",
"spec": "0.0.1",
"type": "version"
},
"_requiredBy": [
"/brace-expansion"
],
"_resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"_shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b",
"_shrinkwrap": null,
"_spec": "concat-map@0.0.1",
"_where": "/Users/shazron/Documents/git/apache/cordova-ios/node_modules/brace-expansion",
"author": { "author": {
"name": "James Halliday", "name": "James Halliday",
"email": "mail@substack.net", "email": "mail@substack.net",
...@@ -73,4 +114,4 @@ ...@@ -73,4 +114,4 @@
} }
}, },
"version": "0.0.1" "version": "0.0.1"
} }
\ No newline at end of file
platforms/ios/cordova/node_modules/cordova-common/package.json
View file @ 27f1afad
{ {
"_args": [
[
{
"raw": "cordova-common@^1.5.0",
"scope": null,
"escapedName": "cordova-common",
"name": "cordova-common",
"rawSpec": "^1.5.0",
"spec": ">=1.5.0 <2.0.0",
"type": "range"
},
"/Users/shazron/Documents/git/apache/cordova-ios"
]
],
"_from": "cordova-common@>=1.5.0 <2.0.0",
"_id": "cordova-common@1.5.1",
"_inCache": true,
"_location": "/cordova-common",
"_nodeVersion": "6.6.0",
"_npmOperationalInternal": {
"host": "packages-12-west.internal.npmjs.com",
"tmp": "tmp/cordova-common-1.5.1.tgz_1476725179180_0.39604957425035536"
},
"_npmUser": {
"name": "stevegill",
"email": "stevengill97@gmail.com"
},
"_npmVersion": "3.10.3",
"_phantomChildren": {},
"_requested": {
"raw": "cordova-common@^1.5.0",
"scope": null,
"escapedName": "cordova-common",
"name": "cordova-common",
"rawSpec": "^1.5.0",
"spec": ">=1.5.0 <2.0.0",
"type": "range"
},
"_requiredBy": [
"/"
],
"_resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-1.5.1.tgz",
"_shasum": "6770de0d6200ad6f94a1abe8939b5bd9ece139e3",
"_shrinkwrap": null,
"_spec": "cordova-common@^1.5.0",
"_where": "/Users/shazron/Documents/git/apache/cordova-ios",
"author": { "author": {
"name": "Apache Software Foundation" "name": "Apache Software Foundation"
}, },
...@@ -81,4 +127,4 @@ ...@@ -81,4 +127,4 @@
"test": "npm run jshint && npm run jasmine" "test": "npm run jshint && npm run jasmine"
}, },
"version": "1.5.1" "version": "1.5.1"
} }
\ No newline at end of file
platforms/ios/cordova/node_modules/cordova-registry-mapper/package.json
View file @ 27f1afad
{ {
"_args": [
[
{
"raw": "cordova-registry-mapper@^1.1.8",
"scope": null,
"escapedName": "cordova-registry-mapper",
"name": "cordova-registry-mapper",
"rawSpec": "^1.1.8",
"spec": ">=1.1.8 <2.0.0",
"type": "range"
},
"/Users/shazron/Documents/git/apache/cordova-ios/node_modules/cordova-common"
]
],
"_from": "cordova-registry-mapper@>=1.1.8 <2.0.0",
"_id": "cordova-registry-mapper@1.1.15",
"_inCache": true,
"_location": "/cordova-registry-mapper",
"_nodeVersion": "5.4.1",
"_npmUser": {
"name": "stevegill",
"email": "stevengill97@gmail.com"
},
"_npmVersion": "3.5.3",
"_phantomChildren": {},
"_requested": {
"raw": "cordova-registry-mapper@^1.1.8",
"scope": null,
"escapedName": "cordova-registry-mapper",
"name": "cordova-registry-mapper",
"rawSpec": "^1.1.8",
"spec": ">=1.1.8 <2.0.0",
"type": "range"
},
"_requiredBy": [
"/cordova-common"
],
"_resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz",
"_shasum": "e244b9185b8175473bff6079324905115f83dc7c",
"_shrinkwrap": null,
"_spec": "cordova-registry-mapper@^1.1.8",
"_where": "/Users/shazron/Documents/git/apache/cordova-ios/node_modules/cordova-common",
"author": { "author": {
"name": "Steve Gill" "name": "Steve Gill"
}, },
...@@ -40,4 +82,4 @@ ...@@ -40,4 +82,4 @@
"test": "node tests/test.js" "test": "node tests/test.js"
}, },
"version": "1.1.15" "version": "1.1.15"
} }
\ No newline at end of file
platforms/ios/cordova/node_modules/elementtree/package.json
View file @ 27f1afad
{ {
"_args": [
[
{
"raw": "elementtree@^0.1.6",
"scope": null,
"escapedName": "elementtree",
"name": "elementtree",
"rawSpec": "^0.1.6",
"spec": ">=0.1.6 <0.2.0",
"type": "range"
},
"/Users/shazron/Documents/git/apache/cordova-ios/node_modules/cordova-common"
]
],
"_from": "elementtree@>=0.1.6 <0.2.0",
"_id": "elementtree@0.1.6",
"_inCache": true,
"_location": "/elementtree",
"_npmUser": {
"name": "rphillips",
"email": "ryan@trolocsis.com"
},
"_npmVersion": "1.3.24",
"_phantomChildren": {},
"_requested": {
"raw": "elementtree@^0.1.6",
"scope": null,
"escapedName": "elementtree",
"name": "elementtree",
"rawSpec": "^0.1.6",
"spec": ">=0.1.6 <0.2.0",
"type": "range"
},
"_requiredBy": [
"/cordova-common"
],
"_resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz",
"_shasum": "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c",
"_shrinkwrap": null,
"_spec": "elementtree@^0.1.6",
"_where": "/Users/shazron/Documents/git/apache/cordova-ios/node_modules/cordova-common",
"author": { "author": {
"name": "Rackspace US, Inc." "name": "Rackspace US, Inc."
}, },
...@@ -64,4 +105,4 @@ ...@@ -64,4 +105,4 @@
"test": "make test" "test": "make test"
}, },
"version": "0.1.6" "version": "0.1.6"
} }
\ No newline at end of file
platforms/ios/cordova/node_modules/glob/package.json
View file @ 27f1afad
{ {
"_args": [
[
{
"raw": "glob@^5.0.13",
"scope": null,
"escapedName": "glob",
"name": "glob",
"rawSpec": "^5.0.13",
"spec": ">=5.0.13 <6.0.0",
"type": "range"
},
"/Users/shazron/Documents/git/apache/cordova-ios/node_modules/cordova-common"
]
],
"_from": "glob@>=5.0.13 <6.0.0",
"_id": "glob@5.0.15",
"_inCache": true,
"_location": "/glob",
"_nodeVersion": "4.0.0",
"_npmUser": {
"name": "isaacs",
"email": "isaacs@npmjs.com"
},
"_npmVersion": "3.3.2",
"_phantomChildren": {},
"_requested": {
"raw": "glob@^5.0.13",
"scope": null,
"escapedName": "glob",
"name": "glob",
"rawSpec": "^5.0.13",
"spec": ">=5.0.13 <6.0.0",
"type": "range"
},
"_requiredBy": [
"/cordova-common"
],
"_resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
"_shasum": "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1",
"_shrinkwrap": null,
"_spec": "glob@^5.0.13",
"_where": "/Users/shazron/Documents/git/apache/cordova-ios/node_modules/cordova-common",
"author": { "author": {
"name": "Isaac Z. Schlueter", "name": "Isaac Z. Schlueter",
"email": "i@izs.me", "email": "i@izs.me",
...@@ -61,4 +103,4 @@ ...@@ -61,4 +103,4 @@
"test-regen": "npm run profclean && TEST_REGEN=1 node test/00-setup.js" "test-regen": "npm run profclean && TEST_REGEN=1 node test/00-setup.js"
}, },
"version": "5.0.15" "version": "5.0.15"
} }
\ No newline at end of file
platforms/ios/cordova/node_modules/inflight/package.json
View file @ 27f1afad
{ {
"_args": [
[
{
"raw": "inflight@^1.0.4",
"scope": null,
"escapedName": "inflight",
"name": "inflight",
"rawSpec": "^1.0.4",
"spec": ">=1.0.4 <2.0.0",
"type": "range"
},
"/Users/shazron/Documents/git/apache/cordova-ios/node_modules/glob"
]
],
"_from": "inflight@>=1.0.4 <2.0.0",
"_id": "inflight@1.0.6",
"_inCache": true,
"_location": "/inflight",
"_nodeVersion": "6.5.0",
"_npmOperationalInternal": {
"host": "packages-16-east.internal.npmjs.com",
"tmp": "tmp/inflight-1.0.6.tgz_1476330807696_0.10388551792129874"
},
"_npmUser": {
"name": "isaacs",
"email": "i@izs.me"
},
"_npmVersion": "3.10.7",
"_phantomChildren": {},
"_requested": {
"raw": "inflight@^1.0.4",
"scope": null,
"escapedName": "inflight",
"name": "inflight",
"rawSpec": "^1.0.4",
"spec": ">=1.0.4 <2.0.0",
"type": "range"
},
"_requiredBy": [
"/glob"
],
"_resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"_shasum": "49bd6331d7d02d0c09bc910a1075ba8165b56df9",
"_shrinkwrap": null,
"_spec": "inflight@^1.0.4",
"_where": "/Users/shazron/Documents/git/apache/cordova-ios/node_modules/glob",
"author": { "author": {
"name": "Isaac Z. Schlueter", "name": "Isaac Z. Schlueter",
"email": "i@izs.me", "email": "i@izs.me",
...@@ -56,4 +102,4 @@ ...@@ -56,4 +102,4 @@
"test": "tap test.js --100" "test": "tap test.js --100"
}, },
"version": "1.0.6" "version": "1.0.6"
} }
\ No newline at end of file
platforms/ios/cordova/node_modules/inherits/package.json
View file @ 27f1afad
{ {
"_args": [
[
{
"raw": "inherits@2",
"scope": null,
"escapedName": "inherits",
"name": "inherits",
"rawSpec": "2",
"spec": ">=2.0.0 <3.0.0",
"type": "range"
},
"/Users/shazron/Documents/git/apache/cordova-ios/node_modules/glob"
]
],
"_from": "inherits@>=2.0.0 <3.0.0",
"_id": "inherits@2.0.3",
"_inCache": true,
"_location": "/inherits",
"_nodeVersion": "6.5.0",
"_npmOperationalInternal": {
"host": "packages-16-east.internal.npmjs.com",
"tmp": "tmp/inherits-2.0.3.tgz_1473295776489_0.08142363070510328"
},
"_npmUser": {
"name": "isaacs",
"email": "i@izs.me"
},
"_npmVersion": "3.10.7",
"_phantomChildren": {},
"_requested": {
"raw": "inherits@2",
"scope": null,
"escapedName": "inherits",
"name": "inherits",
"rawSpec": "2",
"spec": ">=2.0.0 <3.0.0",
"type": "range"
},
"_requiredBy": [
"/glob"
],
"_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
"_shasum": "633c2c83e3da42a502f52466022480f4208261de",
"_shrinkwrap": null,
"_spec": "inherits@2",
"_where": "/Users/shazron/Documents/git/apache/cordova-ios/node_modules/glob",
"browser": "./inherits_browser.js", "browser": "./inherits_browser.js",
"bugs": { "bugs": {
"url": "https://github.com/isaacs/inherits/issues" "url": "https://github.com/isaacs/inherits/issues"
...@@ -48,4 +94,4 @@ ...@@ -48,4 +94,4 @@
"test": "node test" "test": "node test"
}, },
"version": "2.0.3" "version": "2.0.3"
} }
\ No newline at end of file
platforms/ios/cordova/node_modules/ios-sim/.travis.yml
View file @ 27f1afad
...@@ -3,11 +3,14 @@ sudo: false ...@@ -3,11 +3,14 @@ sudo: false
git: git:
depth: 10 depth: 10
node_js: node_js:
- "0.10" - '0.10'
- "0.12" - '0.12'
- "4.2" - '4'
- '6'
install: install:
- npm install - npm install
script: script:
- "npm test" - npm test
\ No newline at end of file notifications:
slack:
secure: gn0YH0MCFOYR3Dd8Vsx3K/J9G0aazhnRjQVfqbeRKN3f6vToKif1CxhiDLXI6cxEB5DBiAtpK58jkoDYrXoNLGuSbiTHBJ+ankU8aG3s0OTIHa/8I0TjRKjBRc0PrMV7n7EiLC6LQxNe0x0mMSE1gdOUeS1UrZ5ZiVrS1u0eHHs=
platforms/ios/cordova/version
View file @ 27f1afad
This diff is collapsed.
platforms/ios/ios.json
View file @ 27f1afad
This diff is collapsed.
platforms/ios/platform_www/cordova.js
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/app/calendar/forms/add_trip_sth.html 0 → 100644
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/app/calendar/forms/update_trip_hts.html 0 → 100644
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/app/calendar/forms/update_trip_sth.html 0 → 100644
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/app/diary/diary.html
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/app/map/map.html
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/app/menu/menu.html
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/app/status/status.html
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/cordova.js
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/cordova_plugins.js
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/css/style.css
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/index.html
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/js/app.js
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/js/blazerAPI.js
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/lib/flex-calendar/angular-translate.js 0 → 100755
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/lib/flex-calendar/flex-calendar.css 0 → 100755
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/lib/flex-calendar/flex-calendar.js 0 → 100755
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/lib/ng-cordova.min.js deleted 100755 → 0
View file @ 127bf5ad
This diff is collapsed.
platforms/platforms.json
View file @ 27f1afad
This diff is collapsed.
plugins/ios.json
View file @ 27f1afad
This diff is collapsed.
www/app/calendar/calendar.html
View file @ 27f1afad
This diff is collapsed.
www/app/calendar/forms/add_trip_sth.html 0 → 100644
View file @ 27f1afad
This diff is collapsed.
www/app/calendar/forms/update_trip.html deleted 100644 → 0
View file @ 127bf5ad
This diff is collapsed.
www/app/calendar/forms/update_trip_hts.html 0 → 100644
View file @ 27f1afad
This diff is collapsed.
www/app/calendar/forms/update_trip_sth.html 0 → 100644
View file @ 27f1afad
This diff is collapsed.
www/app/calendar/js/calendar.js
View file @ 27f1afad
This diff is collapsed.
www/app/diary/diary.html
View file @ 27f1afad
This diff is collapsed.
www/app/map/map.html
View file @ 27f1afad
This diff is collapsed.
www/app/menu/menu.html
View file @ 27f1afad
This diff is collapsed.
www/app/performance/performance.html
View file @ 27f1afad
This diff is collapsed.
www/app/sharedride/sharedride.html
View file @ 27f1afad
This diff is collapsed.
www/app/status/status.html
View file @ 27f1afad
This diff is collapsed.
www/css/style.css
View file @ 27f1afad
This diff is collapsed.
www/index.html
View file @ 27f1afad
This diff is collapsed.
www/js/app.js
View file @ 27f1afad
This diff is collapsed.
www/js/blazerAPI.js
View file @ 27f1afad
This diff is collapsed.
www/lib/flex-calendar/angular-translate.js 0 → 100755
View file @ 27f1afad
This diff is collapsed.
www/lib/flex-calendar/flex-calendar.css 0 → 100755
View file @ 27f1afad
This diff is collapsed.
www/lib/flex-calendar/flex-calendar.js 0 → 100755
View file @ 27f1afad
This diff is collapsed.
www/lib/ionic-calendar/calendar-tpls.js
View file @ 27f1afad
This diff is collapsed.
www/lib/ng-cordova.min.js deleted 100755 → 0
View file @ 127bf5ad
This diff is collapsed.
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