merge uiux to master

.gitignore

@@ -13,7 +13,7 @@ log.txt
 npm-debug.log*
 
 .idea/
-.sourcemaps/
+.sourcemaps/*
 .sass-cache/
 .tmp/
 .versions/
@@ -33,3 +33,6 @@ $RECYCLE.BIN/
 .DS_Store
 Thumbs.db
 UserInterfaceState.xcuserstate
+*.js.map
+.DS_Store
+src/.DS_Store

README

@@ -1,13 +1,55 @@
-NOTE: You must have Node.js installed 
+DineIn: How to Run
 
-To download Ionic, run
-npm install -g ionic
+1)  Install node.js (if you don't already have it)
+    https://nodejs.org/en/
+
+2)  Install Ionic
+    Run:
+    $ npm install -g ionic cordova
+
+3)  Clone our Github repo
+    https://github.com/DineIn2018/dinein.git
+
+4)  Checkout the branch "TEST"
 
-From within the repository, run
-npm install
-to install the dependencies. Then, still in the repository, run
-ionic serve
+5)  In terminal, cd to the directory where you have the repo cloned
 
-This will open a tab in your browser, running the app.
+6)  Install all the node.js dependencies
+    Run:
+    $ npm install
+
+7.1)  If you don't have an iPad
+      Run:
+      $ ionic serve
+      This will open a tab in your browser, running the app.
+
+      * Note:
+        At the login page, it is not necessary to enter a username or password.
+        This will look real ugly, our application is meant to be deployed on an iPad, it will look better there
+        Some scrolling also won't work in the browser, it will work on the iPad
+        The browser is just a debugging platform
+
+      **********************************************************************************************************
+      * IMPORTANT:
+      * When the browser is opened with the app, an error will show initially
+      * This is due to a bug in a plugin we used to handle drag and drop called interactJS (not our fault!)
+      * The program's functionality works fine though, even with this bug, it just affects it at compile time
+      * To make the error go away, while ionic is serving and your browser showing the error page,
+      * open up any typescript (.ts) file within the pages folder in our project and save it (no need to modify)
+      * The error should go away and the app will run smoothly
+      **********************************************************************************************************
+
+7.2)  If you have an iPad
+      Download the Ionic Dev App from the app store on your iPad
+      On your laptop, in the project directory, run:
+      $ ionic serve -c
+      Make sure your laptop and iPad are on the same Wifi network
+      Open the Ionic Dev App, DineIn should pop up, tap it to run the app
+
+      * Note: If you are on UW Wifi, you will have to add the IP address manually
+              See the terminal running the serve for the IP address and port is always 8100
 
-Note: from the login page, it is not necessary to enter a username or password.
+Our Bug Tracker (it's github issues):
+  https://github.com/DineIn2018/dinein/issues
+
+If you have any problems getting it running, send us an e-mail!

config.xml

@@ -19,6 +19,7 @@
     <preference name="SplashShowOnlyFirstTime" value="false" />
     <preference name="SplashScreen" value="screen" />
     <preference name="SplashScreenDelay" value="3000" />
+    <preference name="orientation" value="landscape" />
     <platform name="android">
         <allow-intent href="market:*" />
         <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
@@ -81,9 +82,14 @@
     <plugin name="cordova-plugin-splashscreen" spec="^5.0.2" />
     <plugin name="cordova-plugin-ionic-webview" spec="^1.1.16" />
     <plugin name="cordova-plugin-ionic-keyboard" spec="^2.0.5" />
-    <plugin name="cordova-plugin-screen-orientation" spec="^3.0.1" />
     <plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
-    <engine name="ios" spec="~4.5.4" />
     <allow-navigation href="http://172.16.92.37:8100" />
     <allow-navigation href="http://192.168.1.14:8101" />
+    <plugin name="cordova-plugin-camera" spec="^4.0.2" />
+    <plugin name="cordova-plugin-file" spec="^6.0.1" />
+    <plugin name="cordova-plugin-file-transfer" spec="^1.7.1" />
+    <plugin name="cordova-plugin-filepath" spec="^1.3.0" />
+    <engine name="ios" spec="~4.5.4" />
+    <plugin name="cordova-plugin-screen-orientation" spec="^3.0.1" />
+    <engine name="browser" spec="~5.0.3" />
 </widget>

npm_test

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd "$(dirname "$0")"
+npm test

npm_testcoverage

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd "$(dirname "$0")"
+npm testcoverage