Skip to content

Commit

Permalink
First release
Browse files Browse the repository at this point in the history
  • Loading branch information
Pontus Abrahamsson committed Apr 3, 2016
1 parent 6731285 commit 1988639
Showing 76 changed files with 21,172 additions and 16,499 deletions.
9 changes: 1 addition & 8 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -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"
]
}
106 changes: 0 additions & 106 deletions api/api.js

This file was deleted.

7 changes: 3 additions & 4 deletions desktop/app.html → app.html
Original file line number Diff line number Diff line change
@@ -31,10 +31,9 @@

<webview
id="uber"
src="https://github.com/atom/electron/blob/master/docs/api/web-view-tag.md"
src="http://localhost:5555"
width="340"
height="515"
useragent="Fastlane">
height="515">
</webview>

<script>
@@ -54,6 +53,6 @@
'header.contextual {position:fixed !important;} .wrapper {padding-top: 80px !important;}'
);

webview.openDevTools();
// webview.openDevTools();
});
</script>
Binary file removed assets/fonts/light.woff
Binary file not shown.
Binary file removed assets/fonts/ultra.woff
Binary file not shown.
Binary file removed assets/img/bg.png
Binary file not shown.
13 changes: 0 additions & 13 deletions assets/img/logo.svg

This file was deleted.

20 changes: 0 additions & 20 deletions assets/img/star-light.svg

This file was deleted.

3 changes: 1 addition & 2 deletions config-template.json
Original file line number Diff line number Diff line change
@@ -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",
Binary file removed design/Fastlane-fullscreen.png
Binary file not shown.
Binary file removed design/Fastlane.png
Binary file not shown.
Binary file removed design/Fastlane.sketch
Binary file not shown.
9 changes: 3 additions & 6 deletions desktop.js
Original file line number Diff line number Diff line change
@@ -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,
});
Binary file removed desktop/icons/UberLogo.png
Binary file not shown.
Binary file removed desktop/icons/UberLogo@2x.png
Binary file not shown.
Binary file removed desktop/icons/UberLogo@3x.png
Binary file not shown.
Binary file removed desktop/icons/UberLogo@4x.png
Binary file not shown.
Binary file added icon.icns
Binary file not shown.
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
@@ -10,6 +10,6 @@
<div id="root"></div>

<script src="https://maps.googleapis.com/maps/api/js?libraries=places"></script>
<script src="http://fastlaneapp.co/assets/bundle.js"></script>
<script src="http://localhost:5555/bundle"></script>
</body>
</html>
3 changes: 0 additions & 3 deletions index.js
Original file line number Diff line number Diff line change
@@ -3,6 +3,3 @@ require('babel-register');

// start frontend server
require('./src/server.js');

// start api server
require('./api/api.js');
16 changes: 6 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -6,9 +6,10 @@
"main": "desktop.js",
"private": true,
"scripts": {
"dev": "webpack -w & node index.js",
"desktop": "webpack -p & electron desktop.js",
"lint": "./node_modules/eslint/bin/eslint.js \"src/**/?(*.js|*.jsx)\" index.js"
"dev": "webpack -w --config webpack.dev.config.js & node index.js",
"desktop": "webpack --config webpack.prod.config.js && electron desktop.js",
"lint": "./node_modules/eslint/bin/eslint.js \"src/**/?(*.js|*.jsx)\" index.js",
"build": "NODE_ENV=production webpack --bail --config webpack.prod.config.js && npm install && npm prune && electron-packager . Fastlane --platform=darwin --arch=x64 --version=0.36.6 --out=release --overwrite --icon=icon.icns --ignore=design"
},
"dependencies": {
"babel-plugin-transform-decorators-legacy": "^1.3.4",
@@ -35,7 +36,6 @@
"babel-core": "^6.7.4",
"babel-eslint": "^6.0.2",
"babel-loader": "^6.2.4",
"babel-plugin-react-transform": "^2.0.2",
"babel-plugin-transform-runtime": "^6.6.0",
"babel-preset-es2015": "^6.6.0",
"babel-preset-react": "^6.5.0",
@@ -47,15 +47,11 @@
"json-loader": "^0.5.4",
"node-sass": "^3.4.2",
"pre-commit": "^1.1.2",
"react-transform-hmr": "^1.0.4",
"sass-loader": "^3.2.0",
"style-loader": "^0.13.1",
"webpack": "^2.1.0-beta.2",
"webpack-dev-middleware": "^1.6.1",
"webpack-hot-middleware": "^2.10.0"
"webpack": "^2.1.0-beta.2"
},
"pre-commit": [
"lint",
"test"
"lint"
]
}
Loading

0 comments on commit 1988639

Please sign in to comment.