diff --git a/.babelrc b/.babelrc
index da73fd8..137c328 100755
--- a/.babelrc
+++ b/.babelrc
@@ -2,13 +2,6 @@
"presets": ["es2015", "stage-0", "react"],
"plugins": [
"transform-runtime",
- "babel-plugin-transform-decorators-legacy",
- ["react-transform", {
- "transforms": [{
- "transform" : "react-transform-hmr",
- "imports" : ["react"],
- "locals" : ["module"]
- }]
- }]
+ "babel-plugin-transform-decorators-legacy"
]
}
diff --git a/api/api.js b/api/api.js
deleted file mode 100644
index 21f9a64..0000000
--- a/api/api.js
+++ /dev/null
@@ -1,106 +0,0 @@
-import express from 'express';
-import config from '../config';
-import uber from './service/uber';
-import geolocation from './service/geolocation';
-
-const { API_PORT, DOMAIN } = config;
-
-const api = express();
-
-api.use((req, res, next) => {
- res.header('Access-Control-Allow-Origin', DOMAIN);
- res.header('Access-Control-Allow-Methods', 'DELETE');
- res.header('Access-Control-Allow-Credentials', true);
- next();
-});
-
-/**
- * Geolocation
- * GET /geolocation
- */
-api.get('/geolocation', async (req, res) => res.json(await geolocation.lookup()));
-
-/**
- * Authenticate
- * GET /oauth/v2/authorize
- * @param {code}
- */
-api.post('/auth', async (req, res) =>
- res.json(await uber.authenticate(req.query.code)));
-
-/**
- * Product types
- * GET /v1/products
- * @param {latitude}
- * @param {longitude}
- */
-api.get('/products', async (req, res) =>
- res.json(await uber.request('v1/products', req.query)));
-
-/**
- * Time estimates
- * GET /v1/estimates/time
- * @param {start_latitude}
- * @param {start_longitude}
- * @param {customer_uuid?}
- * @param {product_id?}
- */
-api.get('/estimates/time', async (req, res) =>
- res.json(await uber.request('v1/estimates/time', req.query)));
-
-/**
- * Price estimates
- * GET /v1/estimates/price
- * @param {start_latitude}
- * @param {start_longitude}
- * @param {end_latitude}
- * @param {end_longitude}
- */
-api.get('/estimates/price', async (req, res) =>
- res.json(await uber.request('v1/estimates/price', req.query)));
-
-/**
- * Ride request - Map
- * GET /v1/request
- * @param {request_id}
- */
-api.get('/request/:request_id/map', async (req, res) =>
- res.json(await uber.request(`v1/requests/${req.params.request_id}/map`, req.query)));
-
-/**
- * Ride request
- * POST /v1/request
- * @param {start_latitude}
- * @param {start_longitude}
- * @param {product_id?}
- * @param {start_nickname?}
- * @param {start_address?}
- * @param {end_latitude?}
- * @param {end_longitude?}
- * @param {end_nickname?}
- * @param {end_address?}
- * @param {surge_confirmation_id?}
- */
-api.post('/request', async (req, res) =>
- res.json(await uber.request('v1/requests', req.query, 'POST')));
-
-/**
- * Ride request - Details
- * GET /v1/request
- * @param {request_id}
- */
-api.get('/request/:request_id', async (req, res) =>
- res.json(await uber.request(`v1/requests/${req.params.request_id}`, req.query)));
-
-/**
- * Ride request - Delete
- * DELETE /v1/request
- * @param {request_id}
- */
-api.delete('/request/:request_id', async (req, res) =>
- res.json(await uber.delete(`v1/requests/${req.params.request_id}`, req.query)));
-
-
-api.listen(API_PORT, () => {
- console.log(`Api started on port ${API_PORT}`);
-});
diff --git a/desktop/app.html b/app.html
similarity index 89%
rename from desktop/app.html
rename to app.html
index 801653e..0eb7929 100644
--- a/desktop/app.html
+++ b/app.html
@@ -31,10 +31,9 @@
+ height="515">
diff --git a/assets/fonts/light.woff b/assets/fonts/light.woff
deleted file mode 100755
index 29c1e85..0000000
Binary files a/assets/fonts/light.woff and /dev/null differ
diff --git a/assets/fonts/ultra.woff b/assets/fonts/ultra.woff
deleted file mode 100755
index 1b4786a..0000000
Binary files a/assets/fonts/ultra.woff and /dev/null differ
diff --git a/assets/img/bg.png b/assets/img/bg.png
deleted file mode 100644
index b5563b4..0000000
Binary files a/assets/img/bg.png and /dev/null differ
diff --git a/assets/img/logo.svg b/assets/img/logo.svg
deleted file mode 100644
index aa64914..0000000
--- a/assets/img/logo.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/img/star-light.svg b/assets/img/star-light.svg
deleted file mode 100644
index 2d42c01..0000000
--- a/assets/img/star-light.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
\ No newline at end of file
diff --git a/config-template.json b/config-template.json
index 867f459..61a67d4 100644
--- a/config-template.json
+++ b/config-template.json
@@ -1,8 +1,7 @@
{
"PORT": 5555,
- "API_PORT": 5556,
"DOMAIN": "http://localhost:5555",
- "API_ENDPOINT": "http://localhost:5556",
+ "API_ENDPOINT": "http://localhost:5555/api",
"REDIRECT_URI": "http://localhost:5555",
"UBER_AUTH_ENDPOINT": "https://login.uber.com/oauth",
"UBER_API_ENDPOINT": "https://sandbox-api.uber.com",
diff --git a/design/Fastlane-fullscreen.png b/design/Fastlane-fullscreen.png
deleted file mode 100644
index ca919ee..0000000
Binary files a/design/Fastlane-fullscreen.png and /dev/null differ
diff --git a/design/Fastlane.png b/design/Fastlane.png
deleted file mode 100644
index 7eb8352..0000000
Binary files a/design/Fastlane.png and /dev/null differ
diff --git a/design/Fastlane.sketch b/design/Fastlane.sketch
deleted file mode 100644
index 44ebcf9..0000000
Binary files a/design/Fastlane.sketch and /dev/null differ
diff --git a/desktop.js b/desktop.js
index 0596ef3..18fc29d 100644
--- a/desktop.js
+++ b/desktop.js
@@ -7,17 +7,14 @@ require('babel-register');
// start frontend server
require('./src/server.js');
-// start api server
-require('./api/api.js');
-
menubar({
- icon: path.join(__dirname, '/desktop/icons/UberLogo.png'),
- // transparent: true,
+ icon: path.join(__dirname, '/public/icons/UberLogo.png'),
+ transparent: true,
movable: false,
resizable: false,
useContentSize: true,
height: 525,
width: 340,
- index: `file://${__dirname}/desktop/app.html`,
+ index: `file://${__dirname}/app.html`,
y: 30,
});
diff --git a/desktop/icons/UberLogo.png b/desktop/icons/UberLogo.png
deleted file mode 100644
index 565a699..0000000
Binary files a/desktop/icons/UberLogo.png and /dev/null differ
diff --git a/desktop/icons/UberLogo@2x.png b/desktop/icons/UberLogo@2x.png
deleted file mode 100644
index bbbbc56..0000000
Binary files a/desktop/icons/UberLogo@2x.png and /dev/null differ
diff --git a/desktop/icons/UberLogo@3x.png b/desktop/icons/UberLogo@3x.png
deleted file mode 100644
index 75208fc..0000000
Binary files a/desktop/icons/UberLogo@3x.png and /dev/null differ
diff --git a/desktop/icons/UberLogo@4x.png b/desktop/icons/UberLogo@4x.png
deleted file mode 100644
index ecd538b..0000000
Binary files a/desktop/icons/UberLogo@4x.png and /dev/null differ
diff --git a/icon.icns b/icon.icns
new file mode 100644
index 0000000..716390d
Binary files /dev/null and b/icon.icns differ
diff --git a/index.html b/index.html
index 174d91f..55f775f 100755
--- a/index.html
+++ b/index.html
@@ -10,6 +10,6 @@
-
+