Skip to content

Commit 6aab279

Browse files
nickhealynickhealy
committed
resolving conflicts
2 parents aaaac38 + 8ee6601 commit 6aab279

File tree

4 files changed

+21
-44
lines changed

4 files changed

+21
-44
lines changed

‎index.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<!-- <!DOCTYPE html>
1+
<!DOCTYPE html>
22
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
33
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
44
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
5-
<!--[if gt IE 8]>> <html class="no-js"> <!--<![endif]-->
6-
<!-- <head>
5+
<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
6+
<head>
77
<meta charset="utf-8">
88
<meta http-equiv="X-UA-Compatible" content="IE=edge">
99
<title>This is a test</title>
@@ -16,4 +16,4 @@
1616

1717
<script src="" async defer></script>
1818
</body>
19-
</html> -->
19+
</html>

‎src/client/components/containers/App.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import SidebarContainer from './SidebarContainer.jsx';
77
import UpdatePopUpContainer from './UpdatePopUpContainer.jsx';
88
import historyController from '../../controllers/historyController';
99
import collectionsController from '../../controllers/collectionsController';
10-
// const EventEmitter = require('events');
11-
// const {dialog} = require('electron').remote
10+
const EventEmitter = require('events');
11+
const {dialog} = require('electron').remote
1212
class App extends Component {
1313
constructor(props) {
1414
super(props);

‎src/client/controllers/httpController.js‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -150,35 +150,24 @@ const httpController = {
150150

151151
// initiate request
152152
const reqStream = client.request(formattedHeaders, { endStream: false });
153-
154-
console.log("reqStream at THIS moment : ", { ...reqStream });
155-
156153
// endStream false means we can continue to send more data, which we would for a body;
154+
157155
// Send body depending on method;
158156
if (
159157
reqResObj.request.method !== "GET" &&
160158
reqResObj.request.method !== "HEAD"
161159
) {
162160
reqStream.end(reqResObj.request.body);
163161
} else {
164-
console.log("ending request");
165162
reqStream.end();
166163
}
167164

168-
console.log("reqStream at THIS moment : ", { ...reqStream });
169-
170165
const openConnectionObj = {
171166
stream: reqStream,
172167
protocol: "HTTP2",
173168
id: reqResObj.id,
174169
};
175170

176-
console.log(
177-
"connectionArry before push: ",
178-
JSON.parse(JSON.stringify(connectionArray)),
179-
" openConnectionObj : ",
180-
JSON.parse(JSON.stringify(openConnectionObj))
181-
);
182171
connectionArray.push(openConnectionObj);
183172

184173
let isSSE;
@@ -193,6 +182,7 @@ const httpController = {
193182
reqResObj.connection = "closed";
194183
reqResObj.connectionType = "plain";
195184
}
185+
196186
reqResObj.isHTTP2 = true;
197187
reqResObj.timeReceived = Date.now();
198188
reqResObj.response.headers = headers;
@@ -456,8 +446,6 @@ const httpController = {
456446
}
457447
},
458448

459-
// ----------------------------------------------------------------------------
460-
461449
parseSSEFields(rawString) {
462450
return (
463451
rawString

‎webpack.dev.config.js‎

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,41 @@
11
const webpack = require('webpack');
22
const path = require('path');
33
const HtmlWebpackPlugin = require('html-webpack-plugin');
4-
const {
5-
spawn
6-
} = require('child_process');
4+
const { spawn } = require('child_process');
75
const nodeExternals = require('webpack-node-externals');
86

7+
98
// Any directories you will be adding code/files into,
109
// need to be added to this array so webpack will pick them up
1110
const defaultInclude = path.resolve(__dirname, 'src');
1211

1312
module.exports = {
1413
module: {
15-
rules: [{
14+
rules: [
15+
{
1616
test: /\.scss$/,
1717
use: ['style-loader', 'css-loader', 'sass-loader'],
1818
},
1919
{
2020
test: /\.css$/,
21-
use: [{
22-
loader: 'style-loader'
23-
}, {
24-
loader: 'css-loader'
25-
}],
21+
use: [{ loader: 'style-loader' }, { loader: 'css-loader' }],
2622
},
2723
{
2824
test: /\.(js|jsx)$/,
2925
exclude: /node_modules/,
30-
use: [{
31-
loader: 'babel-loader'
32-
}],
26+
use: [{ loader: 'babel-loader' }],
3327
},
3428
{
3529
test: /\.(jpe?g|png|gif)$/,
36-
use: [{
37-
loader: 'file-loader?name=img/[name]__[hash:base64:5].[ext]'
38-
}],
30+
use: [{ loader: 'file-loader?name=img/[name]__[hash:base64:5].[ext]' }],
3931
},
4032
{
4133
test: /\.(eot|svg|ttf|woff|woff2|mp3)$/,
42-
use: [{
43-
loader: 'file-loader?name=font/[name]__[hash:base64:5].[ext]'
44-
}]
34+
use: [{ loader: 'file-loader?name=font/[name]__[hash:base64:5].[ext]' }]
4535
}
4636
]
4737
},
48-
target: 'electron-main',
38+
target: 'electron-renderer',
4939
externals: [nodeExternals()],
5040
plugins: [
5141
new HtmlWebpackPlugin(),
@@ -62,12 +52,11 @@ module.exports = {
6252
children: false,
6353
},
6454
before() {
65-
console.log('firing the before line!');
6655
spawn('electron', ['.'], {
67-
shell: true,
68-
env: process.env,
69-
stdio: 'inherit',
70-
})
56+
shell: true,
57+
env: process.env,
58+
stdio: 'inherit',
59+
})
7160
.on('close', code => process.exit(0))
7261
.on('error', spawnError => console.error(spawnError));
7362
},

0 commit comments

Comments
 (0)