conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
borderRadius: [ 0 ],
flex: [ 'none' ],
flexDirection: [
'column',
'row'
],
flexWrap: [ 'wrap' ],
alignItems: [
'flex-start',
'flex-end',
'center',
'baseline',
'stretch'
],
alignSelf: [
'flex-start',
'flex-end',
'center',
'baseline',
'stretch'
],
justifyContent: [
'flex-start',
'flex-end',
'center',
'space-around',
'space-between'
],
alignContent: [
'flex-start',
'flex-end',
'center',
'space-around',
'space-between',
'stretch'
]
=======
borderRadius: [ 0 ],
backgroundSize: [
'contain',
'cover'
],
backgroundRepeat: [
'no-repeat',
'repeat',
'repeat-x',
'repeat-y'
],
backgroundPosition: [
'top',
'right',
'bottom',
'left',
'center'
]
>>>>>>>
borderRadius: [ 0 ],
flex: [ 'none' ],
flexDirection: [
'column',
'row'
],
flexWrap: [ 'wrap' ],
alignItems: [
'flex-start',
'flex-end',
'center',
'baseline',
'stretch'
],
alignSelf: [
'flex-start',
'flex-end',
'center',
'baseline',
'stretch'
],
justifyContent: [
'flex-start',
'flex-end',
'center',
'space-around',
'space-between'
],
alignContent: [
'flex-start',
'flex-end',
'center',
'space-around',
'space-between',
'stretch'
],
backgroundSize: [
'contain',
'cover'
],
backgroundRepeat: [
'no-repeat',
'repeat',
'repeat-x',
'repeat-y'
],
backgroundPosition: [
'top',
'right',
'bottom',
'left',
'center'
] |
<<<<<<<
// Special case on reserved package namespaces, such as 'cordova'
var filteredPackages = cordova.filterPackages(options.args);
var cordovaPlugins = filteredPackages.plugins;
// Update the plugins list
project.removeCordovaPlugins(cordovaPlugins);
_.each(cordovaPlugins, function (plugin) {
process.stdout.write("removed cordova plugin " + plugin + "\n");
});
var args = filteredPackages.rest;
if (_.isEmpty(args))
return 0;
// Refresh the catalog, checking the remote package data on the
// server. Technically, we don't need to do this, since it is unlikely that
// new data will change our constraint solver decisions. But as a user, I
// would expect this command to update the local catalog.
// XXX what if we're offline?
refreshOfficialCatalogOrDie();
=======
// As user may expect this to update the catalog, but we con't actually need
// to, and it takes frustratingly long.
// refreshOfficialCatalogOrDie();
>>>>>>>
// Special case on reserved package namespaces, such as 'cordova'
var filteredPackages = cordova.filterPackages(options.args);
var cordovaPlugins = filteredPackages.plugins;
// Update the plugins list
project.removeCordovaPlugins(cordovaPlugins);
_.each(cordovaPlugins, function (plugin) {
process.stdout.write("removed cordova plugin " + plugin + "\n");
});
var args = filteredPackages.rest;
if (_.isEmpty(args))
return 0;
// As user may expect this to update the catalog, but we con't actually need
// to, and it takes frustratingly long.
// refreshOfficialCatalogOrDie(); |
<<<<<<<
api.use(['blaze', 'templating', 'spacebars',
'livedata', 'deps'], 'client');
=======
api.use(['ui', 'templating', 'spacebars',
'livedata', 'tracker'], 'client');
>>>>>>>
api.use(['blaze', 'templating', 'spacebars',
'livedata', 'tracker'], 'client'); |
<<<<<<<
=======
const initExpress = (app) => {
app.use(express.bodyParser());
app.use(express.query());
app.use(express.methodOverride());
app.use(cors());
// remove express info.
app.use((req, res, next) => {
res.removeHeader("X-Powered-By");
next();
});
};
const initServer = (app, server) => {
// expose resources
server.resources = resources;
// expose functions
server.functions = functions;
['get', 'put', 'del', 'post'].map((method) => {
server[method] = (url, handle, auth) => {
functions.register({
url: url,
method: method,
handle: handle,
auth: auth,
});
};
});
// expose repository
server.repository = getRepository;
// expose listen.
server.listen = (...args) => {
app.listen.apply(app, args);
};
//expose use
server.use = (...args) => {
app.use.apply(app, args);
};
// expose config
server.config = {
get : config.get,
set : config.set,
};
// expose privite object for special situation.
server._app = app;
server._mongoose = mongoose;
};
/**
* Expose `createService()`.
*/
>>>>>>> |
<<<<<<<
import filenamify from 'filenamify'
=======
import queryString from 'query-string'
>>>>>>>
import filenamify from 'filenamify'
import queryString from 'query-string'
<<<<<<<
handleExportClick (e, note, fileType) {
const options = {
defaultPath: filenamify(note.title, {
replacement: '_'
}),
filters: [{ name: 'Documents', extensions: [fileType] }],
properties: ['openFile', 'createDirectory']
}
dialog.showSaveDialog(remote.getCurrentWindow(), options, filename => {
if (filename) {
const { config } = this.props
dataApi
.exportNoteAs(note, filename, fileType, config)
.then(res => {
dialog.showMessageBox(remote.getCurrentWindow(), {
type: 'info',
message: `Exported to ${filename}`
})
})
.catch(err => {
dialog.showErrorBox(
'Export error',
err ? err.message || err : 'Unexpected error during export'
)
throw err
})
}
})
}
handleNoteContextMenu (e, uniqueKey) {
=======
handleNoteContextMenu(e, uniqueKey) {
>>>>>>>
handleExportClick(e, note, fileType) {
const options = {
defaultPath: filenamify(note.title, {
replacement: '_'
}),
filters: [{ name: 'Documents', extensions: [fileType] }],
properties: ['openFile', 'createDirectory']
}
dialog.showSaveDialog(remote.getCurrentWindow(), options, filename => {
if (filename) {
const { config } = this.props
dataApi
.exportNoteAs(note, filename, fileType, config)
.then(res => {
dialog.showMessageBox(remote.getCurrentWindow(), {
type: 'info',
message: `Exported to ${filename}`
})
})
.catch(err => {
dialog.showErrorBox(
'Export error',
err ? err.message || err : 'Unexpected error during export'
)
throw err
})
}
})
}
handleNoteContextMenu(e, uniqueKey) {
<<<<<<<
templates.push({
label: deleteLabel,
click: this.deleteNote
}, {
label: cloneNote,
click: this.cloneNote.bind(this)
}, {
label: copyNoteLink,
click: this.copyNoteLink.bind(this, note)
}, {
type: 'separator'
}, {
label: i18n.__('Export Note'),
submenu: [
{
label: i18n.__('Export as Plain Text (.txt)'),
click: e => this.handleExportClick(e, note, 'txt')
},
{
label: i18n.__('Export as Markdown (.md)'),
click: e => this.handleExportClick(e, note, 'md')
},
{
label: i18n.__('Export as HTML (.html)'),
click: e => this.handleExportClick(e, note, 'html')
}
]
})
=======
templates.push(
{
label: deleteLabel,
click: this.deleteNote
},
{
label: cloneNote,
click: this.cloneNote.bind(this)
},
{
label: copyNoteLink,
click: this.copyNoteLink.bind(this, note)
}
)
>>>>>>>
templates.push(
{
label: deleteLabel,
click: this.deleteNote
},
{
label: cloneNote,
click: this.cloneNote.bind(this)
},
{
label: copyNoteLink,
click: this.copyNoteLink.bind(this, note)
},
{
type: 'separator'
},
{
label: i18n.__('Export Note'),
submenu: [
{
label: i18n.__('Export as Plain Text (.txt)'),
click: e => this.handleExportClick(e, note, 'txt')
},
{
label: i18n.__('Export as Markdown (.md)'),
click: e => this.handleExportClick(e, note, 'md')
},
{
label: i18n.__('Export as HTML (.html)'),
click: e => this.handleExportClick(e, note, 'html')
},
{
label: i18n.__('Export as PDF (.pdf)'),
click: e => this.handleExportClick(e, note, 'pdf')
}
]
}
)
<<<<<<<
templates.push({
type: 'separator'
}, {
label: updateLabel,
click: this.publishMarkdown.bind(this)
}, {
label: openBlogLabel,
click: () => this.openBlog.bind(this)(note)
})
=======
templates.push(
{
label: updateLabel,
click: this.publishMarkdown.bind(this)
},
{
label: openBlogLabel,
click: () => this.openBlog.bind(this)(note)
}
)
>>>>>>>
templates.push(
{
type: 'separator'
},
{
label: updateLabel,
click: this.publishMarkdown.bind(this)
},
{
label: openBlogLabel,
click: () => this.openBlog.bind(this)(note)
}
) |
<<<<<<<
var rootUrl = Ctl.rootUrl;
if (! rootUrl) {
var bindPathPrefix = "";
if (admin) {
bindPathPrefix = "/" + encodeURIComponent(Ctl.myAppName()).replace(/\./g, '_');
}
rootUrl = "https://" + appConfig.sitename + bindPathPrefix;
=======
var proxyConfig;
var bindPathPrefix = "";
var jobId = null;
if (admin) {
bindPathPrefix = "/" + encodeURIComponent(Ctl.myAppName()).replace(/\./g, '_');
>>>>>>>
var jobId = null;
var rootUrl = Ctl.rootUrl;
if (! rootUrl) {
var bindPathPrefix = "";
if (admin) {
bindPathPrefix = "/" + encodeURIComponent(Ctl.myAppName()).replace(/\./g, '_');
}
rootUrl = "https://" + appConfig.sitename + bindPathPrefix; |
<<<<<<<
send(req, info.absolutePath)
.maxage(maxAge)
.hidden(true) // if we specified a dotfile in the manifest, serve it
.on('error', function (err) {
Log.error("Error serving static file " + err);
res.writeHead(500);
res.end();
})
.on('directory', function () {
Log.error("Unexpected directory " + info.absolutePath);
res.writeHead(500);
res.end();
})
.pipe(res);
=======
if (info.content) {
res.write(info.content);
res.end();
} else {
send(req, info.absolutePath)
.maxage(maxAge)
.hidden(true) // if we specified a dotfile in the manifest, serve it
.on('error', function (err) {
Log.error("Error serving static file " + err);
res.writeHead(500);
res.end();
})
.on('directory', function () {
Log.error("Unexpected directory " + info.absolutePath);
res.writeHead(500);
res.end();
})
.pipe(res);
}
};
var getUrlPrefixForArch = function (arch) {
// XXX we rely on the fact that arch names don't contain slashes
// in that case we would need to uri escape it
// We add '__' to the beginning of non-standard archs to "scope" the url
// to Meteor internals.
return arch === WebApp.defaultArch ?
'' : '/' + '__' + arch.replace(/^web\./, '');
>>>>>>>
if (info.content) {
res.write(info.content);
res.end();
} else {
send(req, info.absolutePath)
.maxage(maxAge)
.hidden(true) // if we specified a dotfile in the manifest, serve it
.on('error', function (err) {
Log.error("Error serving static file " + err);
res.writeHead(500);
res.end();
})
.on('directory', function () {
Log.error("Unexpected directory " + info.absolutePath);
res.writeHead(500);
res.end();
})
.pipe(res);
}
<<<<<<<
clientJsonPath = path.join(__meteor_bootstrap__.serverDir,
clientPath);
clientDir = path.dirname(clientJsonPath);
clientJson = JSON.parse(readUtf8FileSync(clientJsonPath));
=======
var clientJsonPath = path.join(__meteor_bootstrap__.serverDir,
clientPath);
var clientDir = path.dirname(clientJsonPath);
var clientJson = JSON.parse(readUtf8FileSync(clientJsonPath));
>>>>>>>
var clientJsonPath = path.join(__meteor_bootstrap__.serverDir,
clientPath);
var clientDir = path.dirname(clientJsonPath);
var clientJson = JSON.parse(readUtf8FileSync(clientJsonPath));
<<<<<<<
var urlPrefix = getUrlPrefixForArch(arch);
_.each(clientJson.manifest, function (item) {
=======
if (! clientJsonPath || ! clientDir || ! clientJson)
throw new Error("Client config file not parsed.");
var urlPrefix = getUrlPrefixForArch(arch);
var manifest = clientJson.manifest;
_.each(manifest, function (item) {
>>>>>>>
if (! clientJsonPath || ! clientDir || ! clientJson)
throw new Error("Client config file not parsed.");
var urlPrefix = getUrlPrefixForArch(arch);
var manifest = clientJson.manifest;
_.each(manifest, function (item) {
<<<<<<<
staticFiles[urlPrefix + getItemPathname(item.url)] = {
path: item.path,
absolutePath: path.join(clientDir, item.path),
=======
staticFiles[urlPrefix + getItemPathname(item.url)] = {
absolutePath: path.join(clientDir, item.path),
>>>>>>>
staticFiles[urlPrefix + getItemPathname(item.url)] = {
absolutePath: path.join(clientDir, item.path),
<<<<<<<
staticFiles[urlPrefix + getItemPathname(item.sourceMapUrl)] = {
path: item.sourceMap,
absolutePath: path.join(clientDir, item.sourceMap),
=======
staticFiles[urlPrefix + getItemPathname(item.sourceMapUrl)] = {
absolutePath: path.join(clientDir, item.sourceMap),
>>>>>>>
staticFiles[urlPrefix + getItemPathname(item.sourceMapUrl)] = {
absolutePath: path.join(clientDir, item.sourceMap),
<<<<<<<
if (! clientJsonPath || ! clientDir || ! clientJson)
throw new Error("Client config file not parsed.");
return clientJson.manifest;
};
try {
var clientPaths = __meteor_bootstrap__.configJson.clientPaths;
_.each(clientPaths, function (clientPath, arch) {
archPath[arch] = path.dirname(clientPath);
var manifest = getClientManifest(clientPath, arch);
WebApp.clientPrograms[arch] = {
manifest: manifest,
version: WebAppHashing.calculateClientHash(manifest, null, _.pick(
__meteor_runtime_config__, 'PUBLIC_SETTINGS')),
PUBLIC_SETTINGS: __meteor_runtime_config__.PUBLIC_SETTINGS
};
});
=======
var program = {
manifest: manifest,
version: WebAppHashing.calculateClientHash(manifest, null, _.pick(
__meteor_runtime_config__, 'PUBLIC_SETTINGS')),
PUBLIC_SETTINGS: __meteor_runtime_config__.PUBLIC_SETTINGS
};
>>>>>>>
var program = {
manifest: manifest,
version: WebAppHashing.calculateClientHash(manifest, null, _.pick(
__meteor_runtime_config__, 'PUBLIC_SETTINGS')),
PUBLIC_SETTINGS: __meteor_runtime_config__.PUBLIC_SETTINGS
};
<<<<<<<
WebAppInternals.generateBoilerplate = function () {
syncQueue.runTask(function() {
_.each(WebApp.clientPrograms, function (program, archName) {
boilerplateByArch[archName] =
generateBoilerplateInstance(archName, program.manifest);
});
// Clear the memoized boilerplate cache.
memoizedBoilerplate = {};
// Configure CSS injection for the default arch
// XXX implement the CSS injection for all archs?
WebAppInternals.refreshableAssets = {
allCss: boilerplateByArch[WebApp.defaultArch].baseData.css
};
});
};
WebAppInternals.reloadClientPrograms();
=======
WebAppInternals.generateBoilerplate = function () {
// This boilerplate will be served to the mobile devices when used with
// Meteor/Cordova for the Hot-Code Push and since the file will be served by
// the device's server, it is important to set the DDP url to the actual
// Meteor server accepting DDP connections and not the device's file server.
var defaultOptionsForArch = {
'web.cordova': {
runtimeConfigDefaults: {
DDP_DEFAULT_CONNECTION_URL: __meteor_runtime_config__.ROOT_URL
}
}
};
syncQueue.runTask(function() {
_.each(WebApp.clientPrograms, function (program, archName) {
boilerplateByArch[archName] =
generateBoilerplateInstance(archName, program.manifest,
defaultOptionsForArch[archName]);
});
// Clear the memoized boilerplate cache.
memoizedBoilerplate = {};
// Configure CSS injection for the default arch
// XXX implement the CSS injection for all archs?
WebAppInternals.refreshableAssets = {
allCss: boilerplateByArch[WebApp.defaultArch].baseData.css
};
});
};
WebAppInternals.reloadClientPrograms();
>>>>>>>
WebAppInternals.generateBoilerplate = function () {
// This boilerplate will be served to the mobile devices when used with
// Meteor/Cordova for the Hot-Code Push and since the file will be served by
// the device's server, it is important to set the DDP url to the actual
// Meteor server accepting DDP connections and not the device's file server.
var defaultOptionsForArch = {
'web.cordova': {
runtimeConfigDefaults: {
DDP_DEFAULT_CONNECTION_URL: __meteor_runtime_config__.ROOT_URL
}
}
};
syncQueue.runTask(function() {
_.each(WebApp.clientPrograms, function (program, archName) {
boilerplateByArch[archName] =
generateBoilerplateInstance(archName, program.manifest,
defaultOptionsForArch[archName]);
});
// Clear the memoized boilerplate cache.
memoizedBoilerplate = {};
// Configure CSS injection for the default arch
// XXX implement the CSS injection for all archs?
WebAppInternals.refreshableAssets = {
allCss: boilerplateByArch[WebApp.defaultArch].baseData.css
};
});
};
WebAppInternals.reloadClientPrograms();
<<<<<<<
// /packages/asdfsad ... /cordova/dafsdf.js
var pathname = connect.utils.parseUrl(req).pathname;
var archKey = 'web.' + pathname.split('/')[1];
if (!_.has(archPath, archKey)) {
archKey = WebApp.defaultArch;
}
=======
// /packages/asdfsad ... /__cordova/dafsdf.js
var pathname = connect.utils.parseUrl(req).pathname;
var archKey = pathname.split('/')[1];
var archKeyCleaned = 'web.' + archKey.replace(/^__/, '');
if (! /^__/.test(archKey) || ! _.has(archPath, archKeyCleaned)) {
archKey = WebApp.defaultArch;
} else {
archKey = archKeyCleaned;
}
>>>>>>>
// /packages/asdfsad ... /__cordova/dafsdf.js
var pathname = connect.utils.parseUrl(req).pathname;
var archKey = pathname.split('/')[1];
var archKeyCleaned = 'web.' + archKey.replace(/^__/, '');
if (! /^__/.test(archKey) || ! _.has(archPath, archKeyCleaned)) {
archKey = WebApp.defaultArch;
} else {
archKey = archKeyCleaned;
} |
<<<<<<<
OAuth.showPopup(
loginUrl,
_.bind(credentialRequestCompleteCallback, null, credentialToken),
{width: 900, height: height}
);
});
=======
Oauth.showPopup(
loginUrl,
_.bind(credentialRequestCompleteCallback, null, credentialToken),
{width: 900, height: height}
);
>>>>>>>
OAuth.showPopup(
loginUrl,
_.bind(credentialRequestCompleteCallback, null, credentialToken),
{width: 900, height: height}
); |
<<<<<<<
assert.ok(data.length > 16000);
=======
assert.deepEqual(warnings, []);
assert.ok(data.length > 15000);
>>>>>>>
assert.deepEqual(warnings, []);
assert.ok(data.length > 16000);
<<<<<<<
assert.ok(data.length <= 16000);
=======
assert.deepEqual(warnings, []);
assert.ok(data.length <= 15000);
>>>>>>>
assert.deepEqual(warnings, []);
assert.ok(data.length <= 16000); |
<<<<<<<
Tinytest.add("ui - render - isolate GC", function (test) {
=======
// IE strips malformed styles like "bar::d" from the `style`
// attribute. We detect this to adjust expectations for the StyleHandler
// test below.
var malformedStylesAllowed = function () {
var div = document.createElement("div");
div.setAttribute("style", "bar::d;");
return (div.getAttribute("style") === "bar::d;");
};
Tinytest.add("ui - render - closure GC", function (test) {
>>>>>>>
// IE strips malformed styles like "bar::d" from the `style`
// attribute. We detect this to adjust expectations for the StyleHandler
// test below.
var malformedStylesAllowed = function () {
var div = document.createElement("div");
div.setAttribute("style", "bar::d;");
return (div.getAttribute("style") === "bar::d;");
};
Tinytest.add("ui - render - isolate GC", function (test) {
<<<<<<<
=======
Tinytest.add("ui - UI.insert fails on jQuery objects", function (test) {
var tmpl = UI.Component.extend({
render: function () {
return SPAN();
}
});
test.throws(function () {
UI.insert(UI.render(tmpl), $('body'));
}, /'parentElement' must be a DOM node/);
test.throws(function () {
UI.insert(UI.render(tmpl), document.body, $('body'));
}, /'nextNode' must be a DOM node/);
});
Tinytest.add("ui - UI.getDataContext", function (test) {
var div = document.createElement("DIV");
var tmpl = UI.Component.extend({
render: function () {
return SPAN();
}
});
UI.insert(UI.renderWithData(tmpl, {foo: "bar"}), div);
var span = $(div).children('SPAN')[0];
test.isTrue(span);
test.equal(UI.getElementData(span), {foo: "bar"});
});
>>>>>>>
Tinytest.add("ui - UI.insert fails on jQuery objects", function (test) {
var tmpl = UI.Component.extend({
render: function () {
return SPAN();
}
});
test.throws(function () {
UI.insert(UI.render(tmpl), $('body'));
}, /'parentElement' must be a DOM node/);
test.throws(function () {
UI.insert(UI.render(tmpl), document.body, $('body'));
}, /'nextNode' must be a DOM node/);
});
Tinytest.add("ui - UI.getDataContext", function (test) {
var div = document.createElement("DIV");
var tmpl = UI.Component.extend({
render: function () {
return SPAN();
}
});
UI.insert(UI.renderWithData(tmpl, {foo: "bar"}), div);
var span = $(div).children('SPAN')[0];
test.isTrue(span);
test.equal(UI.getElementData(span), {foo: "bar"});
}); |
<<<<<<<
npm: "6.13.1",
pacote: "https://github.com/meteor/pacote/tarball/a1853763676463c458aa8ce7b91c20205c44ae6a",
"node-gyp": "6.0.1",
"node-pre-gyp": "0.14.0",
typescript: "3.7.2",
"meteor-babel": "7.7.4",
=======
npm: "6.13.4",
pacote: "https://github.com/meteor/pacote/tarball/6c03d5b9497d6c96c5e421a63bdf70b843657ae7",
"node-gyp": "5.0.1",
"node-pre-gyp": "0.13.0",
typescript: "3.7.3",
"meteor-babel": "7.7.5",
>>>>>>>
npm: "6.13.4",
pacote: "https://github.com/meteor/pacote/tarball/6c03d5b9497d6c96c5e421a63bdf70b843657ae7",
"node-gyp": "6.0.1",
"node-pre-gyp": "0.14.0",
typescript: "3.7.3",
"meteor-babel": "7.7.5", |
<<<<<<<
// Special case on reserved package namespaces, such as 'cordova'
var cordovaPlugins;
try {
var filteredPackages = cordova.filterPackages(options.args);
cordovaPlugins = filteredPackages.plugins;
_.each(cordovaPlugins, function (plugin) {
cordova.checkIsValidPlugin(plugin);
});
} catch (err) {
process.stderr.write(err.message + '\n');
return 1;
}
var oldPlugins = project.getCordovaPlugins();
var pluginsDict = {};
_.each(cordovaPlugins, function (s) {
var splt = s.split('@');
if (splt.length !== 2)
throw new Error(s + ': exact version or tarball url is required');
pluginsDict[splt[0]] = splt[1];
});
project.addCordovaPlugins(pluginsDict);
_.each(cordovaPlugins, function (plugin) {
process.stdout.write("added cordova plugin " + plugin + "\n");
});
var args = filteredPackages.rest;
if (_.isEmpty(args))
return 0;
=======
// For every package name specified, add it to our list of package
// constraints. Don't run the constraint solver until you have added all of
// them -- add should be an atomic operation regardless of the package
// order. Even though the package file should specify versions of its inputs,
// we don't specify these constraints until we get them back from the
// constraint solver.
//
// In the interests of failing fast, we do this check before refreshing the
// catalog, touching the project, etc, since these parsings are purely
// syntactic.
var constraints = _.map(options.args, function (packageReq) {
try {
return utils.parseConstraint(packageReq);
} catch (e) {
if (!e.versionParserError)
throw e;
console.log("Error: " + e.message);
throw new main.ExitWithCode(1);
}
});
>>>>>>>
// Special case on reserved package namespaces, such as 'cordova'
var cordovaPlugins;
try {
var filteredPackages = cordova.filterPackages(options.args);
cordovaPlugins = filteredPackages.plugins;
_.each(cordovaPlugins, function (plugin) {
cordova.checkIsValidPlugin(plugin);
});
} catch (err) {
process.stderr.write(err.message + '\n');
return 1;
}
var oldPlugins = project.getCordovaPlugins();
var pluginsDict = {};
_.each(cordovaPlugins, function (s) {
var splt = s.split('@');
if (splt.length !== 2)
throw new Error(s + ': exact version or tarball url is required');
pluginsDict[splt[0]] = splt[1];
});
project.addCordovaPlugins(pluginsDict);
_.each(cordovaPlugins, function (plugin) {
process.stdout.write("added cordova plugin " + plugin + "\n");
});
var args = filteredPackages.rest;
if (_.isEmpty(args))
return 0;
// For every package name specified, add it to our list of package
// constraints. Don't run the constraint solver until you have added all of
// them -- add should be an atomic operation regardless of the package
// order. Even though the package file should specify versions of its inputs,
// we don't specify these constraints until we get them back from the
// constraint solver.
//
// In the interests of failing fast, we do this check before refreshing the
// catalog, touching the project, etc, since these parsings are purely
// syntactic.
var constraints = _.map(options.args, function (packageReq) {
try {
return utils.parseConstraint(packageReq);
} catch (e) {
if (!e.versionParserError)
throw e;
console.log("Error: " + e.message);
throw new main.ExitWithCode(1);
}
});
<<<<<<<
// For every package name specified, add it to our list of package
// constraints. Don't run the constraint solver until you have added all of
// them -- add should be an atomic operation regardless of the package
// order. Even though the package file should specify versions of its inputs,
// we don't specify these constraints until we get them back from the
// constraint solver.
var constraints = _.map(args, function (packageReq) {
return utils.parseConstraint(packageReq);
});
=======
>>>>>>>
// For every package name specified, add it to our list of package
// constraints. Don't run the constraint solver until you have added all of
// them -- add should be an atomic operation regardless of the package
// order. Even though the package file should specify versions of its inputs,
// we don't specify these constraints until we get them back from the
// constraint solver.
var constraints = _.map(args, function (packageReq) {
return utils.parseConstraint(packageReq);
}); |
<<<<<<<
};
UI._parentData = Blaze._parentData;
=======
};
UI.getElementData = function (el) {
return Blaze.getElementDataVar(el).get();
};
UI._parentData = Blaze._parentData;
>>>>>>>
};
UI._parentData = Blaze._parentData;
UI.getElementData = function (el) {
return Blaze.getElementDataVar(el).get();
}; |
<<<<<<<
api.use('htmljs');
api.use('spacebars-compiler'); // for `HTML.toJS`
=======
api.use('blaze-tools'); // for `toJS`
>>>>>>>
api.use('htmljs');
api.use('blaze-tools'); // for `toJS` |
<<<<<<<
self.server = sockjs.createServer({
prefix: self.prefix, log: function(){},
=======
var serverOptions = {
prefix: '/sockjs',
log: function() {},
>>>>>>>
var serverOptions = {
prefix: self.prefix,
log: function() {}, |
<<<<<<<
DOMBackend.onRemoveElement(parentNode, function () {
rangeRemoved(range);
=======
DomBackend.onRemoveElement(parentNode, function () {
rangeRemoved(range, true /* elementsAlreadyRemoved */);
>>>>>>>
DOMBackend.onRemoveElement(parentNode, function () {
rangeRemoved(range, true /* elementsAlreadyRemoved */);
<<<<<<<
if (! viaBackend)
DOMBackend.removeElement(node);
=======
if (! elementsAlreadyRemoved)
DomBackend.removeElement(node);
>>>>>>>
if (! elementsAlreadyRemoved)
DOMBackend.removeElement(node); |
<<<<<<<
=======
try {
var ast = Handlebars.to_json_ast(contents);
} catch (e) {
if (e instanceof Handlebars.ParseError) {
if (typeof(e.line) === "number")
// subtract one from e.line because it is one-based but we
// need it to be an offset from contentsStartIndex
throwParseError(e.message, contentsStartIndex, e.line - 1);
else
// No line number available from Handlebars parser, so
// generate the parse error at the <template> tag itself
throwParseError("error in template: " + e.message, tagStartIndex);
}
else
throw e;
}
var code = 'Package.handlebars.Handlebars.json_ast_to_func(' +
JSON.stringify(ast) + ')';
>>>>>>> |
<<<<<<<
},
{
title: "#FreeApril",
logo: "/img/pluralsight.png",
alt: 'Logo do Pluralsight',
content: "Mais de 7.000 cursos gratuitos no Pluralsight, uma das maiores plataformas de cursos de tecnologia do mundo",
url: "https://www.pluralsight.com/offer/2020/free-april-month",
className: "-radius"
}
=======
},
{
title: "#CloudCamp",
logo: "/img/cloudcamp.png",
alt: "Logo CloudCamp",
content:
"Durante o período da quarentena, Vamos liberar nosso treinamento de forma 100% Gratuita com conteúdo focado em Cloud e Devops. E nosso desafio principal será subir uma arquitetura em cloud robusta com pipelines CI/CD. Então #BORAAPRENDER",
url: "https://treinacloud.com.br/cloudcamp/quarentena/",
className: "-radius"
}
>>>>>>>
},
{
title: "#FreeApril",
logo: "/img/pluralsight.png",
alt: 'Logo do Pluralsight',
content: "Mais de 7.000 cursos gratuitos no Pluralsight, uma das maiores plataformas de cursos de tecnologia do mundo",
url: "https://www.pluralsight.com/offer/2020/free-april-month",
className: "-radius"
},
{
title: "#CloudCamp",
logo: "/img/cloudcamp.png",
alt: "Logo CloudCamp",
content:
"Durante o período da quarentena, Vamos liberar nosso treinamento de forma 100% Gratuita com conteúdo focado em Cloud e Devops. E nosso desafio principal será subir uma arquitetura em cloud robusta com pipelines CI/CD. Então #BORAAPRENDER",
url: "https://treinacloud.com.br/cloudcamp/quarentena/",
className: "-radius"
} |
<<<<<<<
customMarkdownLintConfig: DEFAULT_MARKDOWN_LINT_CONFIG,
dateFormatISO8601: false
=======
customMarkdownLintConfig: DEFAULT_MARKDOWN_LINT_CONFIG,
prettierConfig: ` {
"trailingComma": "es5",
"tabWidth": 4,
"semi": false,
"singleQuote": true
}`,
deleteUnusedAttachments: true
>>>>>>>
customMarkdownLintConfig: DEFAULT_MARKDOWN_LINT_CONFIG,
dateFormatISO8601: false
prettierConfig: ` {
"trailingComma": "es5",
"tabWidth": 4,
"semi": false,
"singleQuote": true
}`,
deleteUnusedAttachments: true |
<<<<<<<
if (files.exists(nodeModuleDir)) {
// We need to convert to OS path here because the path is coming
// from inside Meteor so it will be posixy.
return require(files.convertToOSPath(nodeModuleDir));
=======
var nodeModuleTopDir =
files.pathJoin(item.nodeModulesDirectory.sourcePath,
name.split("/")[0]);
if (files.exists(nodeModuleTopDir)) {
return require(nodeModuleDir);
>>>>>>>
var nodeModuleTopDir =
files.pathJoin(item.nodeModulesDirectory.sourcePath,
name.split("/")[0]);
if (files.exists(nodeModuleTopDir)) {
return require(files.convertToOSPath(nodeModuleDir)); |
<<<<<<<
Accounts.connection.call("removeUser", self.username);
});
=======
Meteor.call("removeUser", self.username);
}));
>>>>>>>
Accounts.connection.call("removeUser", self.username);
})); |
<<<<<<<
exports.handlePackageServerConnectionError(err);
ret.data = null;
=======
self.handlePackageServerConnectionError(err);
ret.connectionFailed = true;
>>>>>>>
exports.handlePackageServerConnectionError(err);
ret.connectionFailed = true; |
<<<<<<<
var supported = function (expected, selector, options) {
var cursor = OplogCollection.find(selector, options);
=======
var oplogEnabled =
!!MongoInternals.defaultRemoteCollectionDriver().mongo._oplogHandle;
var supported = function (expected, selector) {
var cursor = OplogCollection.find(selector);
>>>>>>>
var oplogEnabled =
!!MongoInternals.defaultRemoteCollectionDriver().mongo._oplogHandle;
var supported = function (expected, selector, options) {
var cursor = OplogCollection.find(selector, options); |
<<<<<<<
this.getNoteStorage = this.getNoteStorage.bind(this)
this.getNoteFolder = this.getNoteFolder.bind(this)
this.getViewType = this.getViewType.bind(this)
=======
this.restoreNote = this.restoreNote.bind(this)
>>>>>>>
this.getNoteStorage = this.getNoteStorage.bind(this)
this.getNoteFolder = this.getNoteFolder.bind(this)
this.getViewType = this.getViewType.bind(this)
this.restoreNote = this.restoreNote.bind(this) |
<<<<<<<
// Pick a path in the bundle for each target
var paths = {};
_.each(targets, function (target, name) {
var p = path.join('programs', name);
builder.reserve(p, { directory: true });
paths[name] = p;
});
// Hack to let servers find relative paths to clients. Should find
// another solution eventually (probably some kind of mount
// directive that mounts the client bundle in the server at runtime)
var getRelativeTargetPath = function (options) {
var pathForTarget = function (target) {
var name;
_.each(targets, function (t, n) {
if (t === target)
name = n;
});
if (! name)
throw new Error("missing target?");
if (! (name in paths))
throw new Error("missing target path?");
return paths[name];
};
return path.relative(pathForTarget(options.relativeTo),
pathForTarget(options.forTarget));
};
// Write out each target
_.each(targets, function (target, name) {
var relControlFilePath =
target.write(builder.enter(paths[name]), {
includeNodeModulesSymlink: options.includeNodeModulesSymlink,
getRelativeTargetPath: getRelativeTargetPath });
_.each(target.cordovaDependencies, function (version, name) {
json.cordovaDependencies[name] = version;
});
json.programs.push({
name: name,
arch: target.mostCompatibleArch(),
path: path.join(paths[name], relControlFilePath)
});
});
=======
>>>>>>>
// Pick a path in the bundle for each target
var paths = {};
_.each(targets, function (target, name) {
var p = path.join('programs', name);
builder.reserve(p, { directory: true });
paths[name] = p;
});
// Hack to let servers find relative paths to clients. Should find
// another solution eventually (probably some kind of mount
// directive that mounts the client bundle in the server at runtime)
var getRelativeTargetPath = function (options) {
var pathForTarget = function (target) {
var name;
_.each(targets, function (t, n) {
if (t === target)
name = n;
});
if (! name)
throw new Error("missing target?");
if (! (name in paths))
throw new Error("missing target path?");
return paths[name];
};
return path.relative(pathForTarget(options.relativeTo),
pathForTarget(options.forTarget));
};
// Write out each target
_.each(targets, function (target, name) {
var relControlFilePath =
target.write(builder.enter(paths[name]), {
includeNodeModulesSymlink: options.includeNodeModulesSymlink,
getRelativeTargetPath: getRelativeTargetPath });
json.programs.push({
name: name,
arch: target.mostCompatibleArch(),
path: path.join(paths[name], relControlFilePath)
});
});
<<<<<<<
var server = options.cachedServerTarget ||
makeServerTarget(app, clientTargets);
targets.server = server;
=======
if (! options.hasCachedBundle) {
var server = makeServerTarget(app, client);
server.clientTarget = client;
targets.server = server;
}
>>>>>>>
if (! options.hasCachedBundle) {
var server = makeServerTarget(app, client);
server.clientTarget = client;
targets.server = server;
} |
<<<<<<<
var clientJsonPath = path.join(__meteor_bootstrap__.serverDir,
clientPath);
var clientDir = path.dirname(clientJsonPath);
var clientJson = JSON.parse(readUtf8FileSync(clientJsonPath));
if (clientJson.format !== "client-program-pre1")
=======
clientJsonPath = path.join(__meteor_bootstrap__.serverDir,
__meteor_bootstrap__.configJson.client);
clientDir = path.dirname(clientJsonPath);
clientJson = JSON.parse(readUtf8FileSync(clientJsonPath));
if (clientJson.format !== "web-program-pre1")
>>>>>>>
clientJsonPath = path.join(__meteor_bootstrap__.serverDir,
clientPath);
clientDir = path.dirname(clientJsonPath);
clientJson = JSON.parse(readUtf8FileSync(clientJsonPath));
if (clientJson.format !== "web-program-pre1") |
<<<<<<<
onDown: undefined,
onUp: undefined,
onMove: undefined,
transform: {
x: x => x,
y: y => y
}
=======
onGestureStart: undefined, // [V5] old onDown
onGestureEnd: undefined, // [V5] old onUp
onGesture: undefined // [V5] old onMove
>>>>>>>
onGestureStart: undefined, // [V5] old onDown
onGestureEnd: undefined, // [V5] old onUp
onGesture: undefined, // [V5] old onMove
transform: {
x: x => x,
y: y => y
}
<<<<<<<
transform: event.transform || props.transform || defaultProps.transform,
=======
>>>>>>>
transform: event.transform || props.transform || defaultProps.transform,
<<<<<<<
const x_dist = state.transform.x(pageX - state.xy[0])
const y_dist = state.transform.y(pageY - state.xy[1])
const delta_x = state.transform.x(pageX - state.initial[0])
const delta_y = state.transform.y(pageY - state.initial[1])
=======
// [v5] because wheel events returns deltas since the last event,
// we need to increment x, y delta_x and delta_y accordingly
const x = type === 'wheel' ? mov_x + state.xy[0] : mov_x
const y = type === 'wheel' ? mov_y + state.xy[1] : mov_y
const x_dist = x - state.xy[0]
const y_dist = y - state.xy[1]
const delta_x =
type === 'wheel' ? mov_x + state.delta[0] : x - state.initial[0]
const delta_y =
type === 'wheel' ? mov_y + state.delta[1] : y - state.initial[1]
const delta_t = time - state.time
>>>>>>>
// [v5] because wheel events returns deltas since the last event,
// we need to increment x, y delta_x and delta_y accordingly
const x = type === 'wheel' ? mov_x + state.xy[0] : mov_x
const y = type === 'wheel' ? mov_y + state.xy[1] : mov_y
const x_dist = state.transform.x(x - state.xy[0])
const y_dist = state.transform.y(y - state.xy[1])
const delta_x = state.transform.x(
type === 'wheel' ? mov_x + state.delta[0] : x - state.initial[0]
)
const delta_y = state.transform.y(
type === 'wheel' ? mov_y + state.delta[1] : y - state.initial[1]
)
const delta_t = time - state.time
const local_x = state.lastLocal[0] + delta_x
const local_y = state.lastLocal[1] + delta_y
<<<<<<<
const local_x = state.lastLocal[0] + delta_x
const local_y = state.lastLocal[1] + delta_y
let newProps = {
=======
const newProps = {
>>>>>>>
const newProps = {
<<<<<<<
local: [local_x, local_y],
velocity: len / (time - state.time),
=======
local: [
state.lastLocal[0] + x - state.initial[0],
state.lastLocal[1] + y - state.initial[1]
],
velocity: len / delta_t,
vxvy: [x_dist / delta_t, y_dist / delta_t],
>>>>>>>
local: [local_x, local_y],
velocity: len / delta_t,
vxvy: [x_dist / delta_t, y_dist / delta_t], |
<<<<<<<
useGemini: PropTypes.bool,
=======
useGemini: React.PropTypes.bool,
// Disable dropdown
disabled: React.PropTypes.bool,
>>>>>>>
useGemini: PropTypes.bool,
// Disable dropdown
disabled: PropTypes.bool, |
<<<<<<<
return Math.floor(Number(coord) * scalingFactor[dimension]);
=======
return padding[dimension] + Math.floor(Number(coord) * scallingFactor[dimension]);
>>>>>>>
return padding[dimension] + Math.floor(Number(coord) * scalingFactor[dimension]); |
<<<<<<<
' <input id="grid_'+ this.name +'_column_ln_check" type="checkbox" tabindex="-1" '+ (obj.show.lineNumbers ? 'checked' : '') +
' onchange="w2ui[\''+ obj.name +'\'].columnOnOff(this, event, \'line-numbers\');">'+
=======
' <input id="grid_'+ this.name +'_column_ln_check" type="checkbox" tabindex="-1" '+ (obj.show.lineNumbers ? 'checked="checked"' : '') +
' onclick="w2ui[\''+ obj.name +'\'].columnOnOff(this, event, \'line-numbers\');"/>'+
>>>>>>>
' <input id="grid_'+ this.name +'_column_ln_check" type="checkbox" tabindex="-1" '+ (obj.show.lineNumbers ? 'checked="checked"' : '') +
' onchange="w2ui[\''+ obj.name +'\'].columnOnOff(this, event, \'line-numbers\');"/>'+
<<<<<<<
' <input id="grid_'+ this.name +'_column_'+ c +'_check" type="checkbox" tabindex="-1" '+ (col.hidden ? '' : 'checked') +
' onchange="w2ui[\''+ obj.name +'\'].columnOnOff(this, event, \''+ col.field +'\');">'+
=======
' <input id="grid_'+ this.name +'_column_'+ c +'_check" type="checkbox" tabindex="-1" '+ (col.hidden ? '' : 'checked="checked"') +
' onclick="w2ui[\''+ obj.name +'\'].columnOnOff(this, event, \''+ col.field +'\');"/>'+
>>>>>>>
' <input id="grid_'+ this.name +'_column_'+ c +'_check" type="checkbox" tabindex="-1" '+ (col.hidden ? '' : 'checked="checked"') +
' onchange="w2ui[\''+ obj.name +'\'].columnOnOff(this, event, \''+ col.field +'\');"/>'+
<<<<<<<
' $(\'.w2ui-overlay\')[0].hide(); '+
' }"> '+ w2utils.lang('Records')+
=======
' $(document).click(); '+
' }"/> '+ w2utils.lang('Records')+
>>>>>>>
' $(\'.w2ui-overlay\')[0].hide(); '+
' }"/> '+ w2utils.lang('Records')+ |
<<<<<<<
* - send parsed URL to the event if there is parseData
* - if you set searchData or sortData and call refresh() it should work
* - bug: vs_start = 100 and more then 500 records, when scrolling empty sets
* - use column field for style: { 1: 'color: red' }
* - unselect fires too many times (if many is unselected, one event should fire)
* - add selectType: 'none' so that no selection can be make but with mouse
=======
* - send parsed URL to the event if there is parseData
* - if you set searchData or sortData and call refresh() it should work
* - send parsed URL to the event if there is routeData
>>>>>>>
* - send parsed URL to the event if there is parseData
* - if you set searchData or sortData and call refresh() it should work
* - bug: vs_start = 100 and more then 500 records, when scrolling empty sets
* - use column field for style: { 1: 'color: red' }
* - unselect fires too many times (if many is unselected, one event should fire)
* - add selectType: 'none' so that no selection can be make but with mouse
* - send parsed URL to the event if there is routeData
<<<<<<<
var recEl = null;
if (this.searchData.length !== 0 || (index + 1 >= this.last.range_start && index + 1 <= this.last.range_end)) {
recEl = $('#grid_'+ this.name +'_rec_'+ w2utils.escapeId(recid));
=======
var recEl1 = null;
var recEl2 = null;
if (index + 1 >= this.last.range_start && index + 1 <= this.last.range_end) {
recEl1 = $('#grid_'+ this.name +'_frec_'+ w2utils.escapeId(recid));
recEl2 = $('#grid_'+ this.name +'_rec_'+ w2utils.escapeId(recid));
>>>>>>>
var recEl1 = null;
var recEl2 = null;
if (this.searchData.length !== 0 || (index + 1 >= this.last.range_start && index + 1 <= this.last.range_end)) {
recEl1 = $('#grid_'+ this.name +'_frec_'+ w2utils.escapeId(recid));
recEl2 = $('#grid_'+ this.name +'_rec_'+ w2utils.escapeId(recid));
<<<<<<<
* - added btn_yes and btn_no
* - dismissed message will slide up - added parameter unlock(speed)
* - refactore -webkit-* -moz-* to a function
* - resize nested elements in popup for onMin, onMax
* - rename btn -> w2ui-btn and same for colored ones
* - added options.body and options.buttons for w2popup.message
=======
* - added btn_yes and btn_no
>>>>>>>
* - added btn_yes and btn_no
* - dismissed message will slide up - added parameter unlock(speed)
* - refactore -webkit-* -moz-* to a function
* - resize nested elements in popup for onMin, onMax
* - rename btn -> w2ui-btn and same for colored ones
* - added options.body and options.buttons for w2popup.message |
<<<<<<<
=======
/**
* @type SoundManager
*/
this.soundManager = new SoundManager( this.scene );
/**
* The default input handler.
* @type InputHandler
*/
// this.input = new InputHandler();
>>>>>>>
/**
* @type SoundManager
*/
this.soundManager = new SoundManager( this.scene ); |
<<<<<<<
Blockly.Msg.WEBDUINO_ULTRASONIC_NEW_TRIG = "超音波傳感器，Trig：";
Blockly.Msg.WEBDUINO_ULTRASONIC_NEW_ECHO = " Echo：";
Blockly.Msg.WEBDUINO_ULTRASONIC_GET_DISTANCE = "擷取距離，每";
Blockly.Msg.WEBDUINO_ULTRASONIC_GET_TIME = "豪秒 ( 1/1000 秒 ) 擷取一次";
Blockly.Msg.WEBDUINO_ULTRASONIC_GET_DO = "執行";
Blockly.Msg.WEBDUINO_ULTRASONIC_DISTANCE = "所截取的距離 ( 公分 )";
Blockly.Msg.WEBDUINO_CAR_INIT_CONTROL = "遙控車控制：";
Blockly.Msg.WEBDUINO_CAR_INIT_CONTROL_F = "前";
Blockly.Msg.WEBDUINO_CAR_INIT_CONTROL_B = "後";
Blockly.Msg.WEBDUINO_CAR_INIT_CONTROL_L = "左";
Blockly.Msg.WEBDUINO_CAR_INIT_CONTROL_R = "右";
=======
Blockly.Msg.WEBDUINO_CAR = "遙控車";
Blockly.Msg.WEBDUINO_CAR_F = "前進";
Blockly.Msg.WEBDUINO_CAR_B = "後退";
Blockly.Msg.WEBDUINO_CAR_L = "左轉";
Blockly.Msg.WEBDUINO_CAR_R = "右轉";
>>>>>>>
Blockly.Msg.WEBDUINO_ULTRASONIC_NEW_TRIG = "超音波傳感器，Trig：";
Blockly.Msg.WEBDUINO_ULTRASONIC_NEW_ECHO = " Echo：";
Blockly.Msg.WEBDUINO_ULTRASONIC_GET_DISTANCE = "擷取距離，每";
Blockly.Msg.WEBDUINO_ULTRASONIC_GET_TIME = "豪秒 ( 1/1000 秒 ) 擷取一次";
Blockly.Msg.WEBDUINO_ULTRASONIC_GET_DO = "執行";
Blockly.Msg.WEBDUINO_ULTRASONIC_DISTANCE = "所截取的距離 ( 公分 )";
Blockly.Msg.WEBDUINO_CAR = "遙控車";
Blockly.Msg.WEBDUINO_CAR_F = "前進";
Blockly.Msg.WEBDUINO_CAR_B = "後退";
Blockly.Msg.WEBDUINO_CAR_L = "左轉";
Blockly.Msg.WEBDUINO_CAR_R = "右轉"; |
<<<<<<<
updateInterval: '60 seconds',
logger: console
=======
updateInterval: '10 minutes',
debug: true
>>>>>>>
updateInterval: '10 minutes',
logger: console |
<<<<<<<
}
function getUltrasonic(board, trig, echo) {
return new webduino.module.Ultrasonic(board, board.getDigitalPin(trig), board.getDigitalPin(echo));
=======
}
function getCar(board, F, B, L, R) {
return new Car(board, F, B, L, R);
}
function Car(board, F, B, L, R) {
this._board = board;
}
Car.prototype.forward = function (secs) {
var self = this;
return new Promise(function (resolve, reject) {
self._board.send([0x90, 0x00, 0x01, 0x91, 0x01, 0x00]);
setTimeout(function () {
self._board.send([0x90, 0x00, 0x00, 0x91, 0x00, 0x00]);
resolve();
}, secs * 1000);
});
};
Car.prototype.backward = function (secs) {
var self = this;
return new Promise(function (resolve, reject) {
self._board.send([0x90, 0x40, 0x00, 0x91, 0x02, 0x00]);
setTimeout(function () {
self._board.send([0x90, 0x00, 0x00, 0x91, 0x00, 0x00]);
resolve();
}, secs * 1000);
});
};
Car.prototype.left = function (secs) {
var self = this;
return new Promise(function (resolve, reject) {
self._board.send([0x90, 0x40, 0x00, 0x91, 0x01, 0x00]);
setTimeout(function () {
self._board.send([0x90, 0x00, 0x00, 0x91, 0x00, 0x00]);
resolve();
}, secs * 1000);
});
};
Car.prototype.right = function (secs) {
var self = this;
return new Promise(function (resolve, reject) {
self._board.send([0x90, 0x00, 0x01, 0x91, 0x02, 0x00]);
setTimeout(function () {
self._board.send([0x90, 0x00, 0x00, 0x91, 0x00, 0x00]);
resolve();
}, secs * 1000);
});
};
Car.prototype.stop = function (secs) {
return new Promise(function (resolve, reject) {
setTimeout(function () {
resolve();
}, secs * 1000);
});
};
Blockly.JavaScript.addReservedWords('Car');
function getPreviousBlock(block) {
if (block && block.previousConnection && block.previousConnection.targetConnection) {
return block.previousConnection.targetConnection.sourceBlock_;
}
return null;
}
function getNextBlock(block) {
if (block && block.nextConnection && block.nextConnection.targetConnection) {
return block.nextConnection.targetConnection.sourceBlock_;
}
return null;
}
function promisifyBlockCode(block, code) {
var prev = getPreviousBlock(block),
next = getNextBlock(block);
if (prev && prev.type === 'car_move') {
code = '.then(function () {\n return ' + code + ';\n})';
}
if (next === null || ['car_move', 'exec_then', 'exec_then_stms'].indexOf(next.type) === -1) {
code += ';\n';
}
return code;
>>>>>>>
}
function getUltrasonic(board, trig, echo) {
return new webduino.module.Ultrasonic(board, board.getDigitalPin(trig), board.getDigitalPin(echo));
}
function getCar(board, F, B, L, R) {
return new Car(board, F, B, L, R);
}
function Car(board, F, B, L, R) {
this._board = board;
}
Car.prototype.forward = function (secs) {
var self = this;
return new Promise(function (resolve, reject) {
self._board.send([0x90, 0x00, 0x01, 0x91, 0x01, 0x00]);
setTimeout(function () {
self._board.send([0x90, 0x00, 0x00, 0x91, 0x00, 0x00]);
resolve();
}, secs * 1000);
});
};
Car.prototype.backward = function (secs) {
var self = this;
return new Promise(function (resolve, reject) {
self._board.send([0x90, 0x40, 0x00, 0x91, 0x02, 0x00]);
setTimeout(function () {
self._board.send([0x90, 0x00, 0x00, 0x91, 0x00, 0x00]);
resolve();
}, secs * 1000);
});
};
Car.prototype.left = function (secs) {
var self = this;
return new Promise(function (resolve, reject) {
self._board.send([0x90, 0x40, 0x00, 0x91, 0x01, 0x00]);
setTimeout(function () {
self._board.send([0x90, 0x00, 0x00, 0x91, 0x00, 0x00]);
resolve();
}, secs * 1000);
});
};
Car.prototype.right = function (secs) {
var self = this;
return new Promise(function (resolve, reject) {
self._board.send([0x90, 0x00, 0x01, 0x91, 0x02, 0x00]);
setTimeout(function () {
self._board.send([0x90, 0x00, 0x00, 0x91, 0x00, 0x00]);
resolve();
}, secs * 1000);
});
};
Car.prototype.stop = function (secs) {
return new Promise(function (resolve, reject) {
setTimeout(function () {
resolve();
}, secs * 1000);
});
};
Blockly.JavaScript.addReservedWords('Car');
function getPreviousBlock(block) {
if (block && block.previousConnection && block.previousConnection.targetConnection) {
return block.previousConnection.targetConnection.sourceBlock_;
}
return null;
}
function getNextBlock(block) {
if (block && block.nextConnection && block.nextConnection.targetConnection) {
return block.nextConnection.targetConnection.sourceBlock_;
}
return null;
}
function promisifyBlockCode(block, code) {
var prev = getPreviousBlock(block),
next = getNextBlock(block);
if (prev && prev.type === 'car_move') {
code = '.then(function () {\n return ' + code + ';\n})';
}
if (next === null || ['car_move', 'exec_then', 'exec_then_stms'].indexOf(next.type) === -1) {
code += ';\n';
}
return code; |
<<<<<<<
// DNR: adding origin to msg
m._origin = this.id;
/* istanbul ignore else */
if (!sentMessageId) {
sentMessageId = m._msgid;
}
if (msgSent) {
var clonedmsg = redUtil.cloneMessage(m);
sendEvents.push({n:node,m:clonedmsg});
} else {
sendEvents.push({n:node,m:m});
msgSent = true;
=======
if (m !== null && m !== undefined) {
/* istanbul ignore else */
if (!sentMessageId) {
sentMessageId = m._msgid;
}
if (msgSent) {
var clonedmsg = redUtil.cloneMessage(m);
sendEvents.push({n:node,m:clonedmsg});
} else {
sendEvents.push({n:node,m:m});
msgSent = true;
}
>>>>>>>
if (m !== null && m !== undefined) {
m._origin = this.id;
/* istanbul ignore else */
if (!sentMessageId) {
sentMessageId = m._msgid;
}
if (msgSent) {
var clonedmsg = redUtil.cloneMessage(m);
sendEvents.push({n:node,m:clonedmsg});
} else {
sendEvents.push({n:node,m:m});
msgSent = true;
} |
<<<<<<<
RED.dnr.redrawLinkConstraint(link)
return "M "+d.x1+" "+d.y1+
" C "+(d.x1+scale*node_width)+" "+(d.y1+scaleY*node_height)+" "+
(d.x2-scale*node_width)+" "+(d.y2-scaleY*node_height)+" "+
d.x2+" "+d.y2;
=======
// return "M "+d.x1+" "+d.y1+
// " C "+(d.x1+scale*node_width)+" "+(d.y1+scaleY*node_height)+" "+
// (d.x2-scale*node_width)+" "+(d.y2-scaleY*node_height)+" "+
// d.x2+" "+d.y2;
return generateLinkPath(d.x1,d.y1,d.x2,d.y2,1);
>>>>>>>
RED.dnr.redrawLinkConstraint(link)
// return "M "+d.x1+" "+d.y1+
// " C "+(d.x1+scale*node_width)+" "+(d.y1+scaleY*node_height)+" "+
// (d.x2-scale*node_width)+" "+(d.y2-scaleY*node_height)+" "+
// d.x2+" "+d.y2;
return generateLinkPath(d.x1,d.y1,d.x2,d.y2,1); |
<<<<<<<
carUltraSonic: "Ultra Sonic",
catUtil: "Util",
=======
>>>>>>>
carUltraSonic: "Ultra Sonic", |
<<<<<<<
done(err);
});
=======
testSslPort += 1;
var sslOptions = {
key: fs.readFileSync('test/resources/ssl/server.key'),
cert: fs.readFileSync('test/resources/ssl/server.crt')
/*
Country Name (2 letter code) [AU]:
State or Province Name (full name) [Some-State]:
Locality Name (eg, city) []:
Organization Name (eg, company) [Internet Widgits Pty Ltd]:
Organizational Unit Name (eg, section) []:
Common Name (e.g. server FQDN or YOUR name) []:localhost
Email Address []:
Please enter the following 'extra' attributes to be sent with your certificate request
A challenge password []:
An optional company name []:
*/
};
testSslServer = https.createServer(sslOptions,testApp);
testSslServer.listen(testSslPort);
testProxyPort += 1;
testProxyServer = httpProxy.createProxyServer({target:'http://localhost:' + testPort});
testProxyServer.on('proxyReq', function(proxyReq, req, res, options) {
proxyReq.setHeader('x-testproxy-header', 'foobar');
});
testProxyServer.on('proxyRes', function (proxyRes, req, res, options) {
if (req.url == getTestURL('/proxyAuthenticate')){
var user = auth.parse(req.headers['proxy-authorization']);
if (!(user.name == "foouser" && user.pass == "barpassword")){
proxyRes.headers['proxy-authenticate'] = 'BASIC realm="test"';
proxyRes.statusCode = 407;
}
}
});
testProxyServer.listen(testProxyPort);
done();
});
>>>>>>>
testSslPort += 1;
var sslOptions = {
key: fs.readFileSync('test/resources/ssl/server.key'),
cert: fs.readFileSync('test/resources/ssl/server.crt')
/*
Country Name (2 letter code) [AU]:
State or Province Name (full name) [Some-State]:
Locality Name (eg, city) []:
Organization Name (eg, company) [Internet Widgits Pty Ltd]:
Organizational Unit Name (eg, section) []:
Common Name (e.g. server FQDN or YOUR name) []:localhost
Email Address []:
Please enter the following 'extra' attributes to be sent with your certificate request
A challenge password []:
An optional company name []:
*/
};
testSslServer = https.createServer(sslOptions,testApp);
testSslServer.listen(testSslPort);
testProxyPort += 1;
testProxyServer = httpProxy.createProxyServer({target:'http://localhost:' + testPort});
testProxyServer.on('proxyReq', function(proxyReq, req, res, options) {
proxyReq.setHeader('x-testproxy-header', 'foobar');
});
testProxyServer.on('proxyRes', function (proxyRes, req, res, options) {
if (req.url == getTestURL('/proxyAuthenticate')){
var user = auth.parse(req.headers['proxy-authorization']);
if (!(user.name == "foouser" && user.pass == "barpassword")){
proxyRes.headers['proxy-authenticate'] = 'BASIC realm="test"';
proxyRes.statusCode = 407;
}
}
});
testProxyServer.listen(testProxyPort);
done(err);
});
<<<<<<<
startServer(function(err) {
if (err) {
done(err);
}
=======
testApp.put('/putInspect', function(req,res) {
var result = {
body: req.body.toString(),
headers: req.headers
};
res.json(result);
});
testApp.delete('/deleteInspect', function(req,res) { res.status(204).end();});
testApp.head('/headInspect', function(req,res) { res.status(204).end();});
testApp.patch('/patchInspect', function(req,res) {
var result = {
body: req.body.toString(),
headers: req.headers
};
res.json(result);
});
testApp.trace('/traceInspect', function(req,res) {
var result = {
body: req.body.toString(),
headers: req.headers
};
res.json(result);
});
testApp.options('/*', function(req,res) {
res.status(200).end();
});
startServer(function() {
>>>>>>>
testApp.put('/putInspect', function(req,res) {
var result = {
body: req.body.toString(),
headers: req.headers
};
res.json(result);
});
testApp.delete('/deleteInspect', function(req,res) { res.status(204).end();});
testApp.head('/headInspect', function(req,res) { res.status(204).end();});
testApp.patch('/patchInspect', function(req,res) {
var result = {
body: req.body.toString(),
headers: req.headers
};
res.json(result);
});
testApp.trace('/traceInspect', function(req,res) {
var result = {
body: req.body.toString(),
headers: req.headers
};
res.json(result);
});
testApp.options('/*', function(req,res) {
res.status(200).end();
});
startServer(function(err) {
if (err) {
done(err);
}
<<<<<<<
after(function(done) {
testServer.stop(() => {
helper.stopServer(done);
});
=======
after(function() {
testServer.close();
testProxyServer.close();
>>>>>>>
after(function(done) {
testServer.stop(() => {
testProxyServer.close();
helper.stopServer(done);
}); |
<<<<<<<
it('should allow accessing node.id', function(done) {
var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"msg.payload = node.id; return msg;"},
{id:"n2", type:"helper"}];
helper.load(functionNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
n2.on("input", function(msg) {
msg.should.have.property('payload', n1.id);
done();
});
n1.receive({payload:"foo",topicb: "bar"});
});
});
it('should allow accessing node.name', function(done) {
var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"msg.payload = node.name; return msg;", "name":"name of node"},
{id:"n2", type:"helper"}];
helper.load(functionNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
n2.on("input", function(msg) {
msg.should.have.property('payload', n1.name);
done();
});
n1.receive({payload:"foo",topicb: "bar"});
});
});
=======
it('should use the same Date object from outside the sandbox', function(done) {
var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"msg.payload=global.get('typeTest')(new Date());return msg;"},
{id:"n2", type:"helper"}];
helper.load(functionNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
n1.context().global.set("typeTest",function(d) { return d instanceof Date });
n2.on("input", function(msg) {
msg.should.have.property('payload', true);
done();
});
n1.receive({payload:"foo",topic: "bar"});
});
});
>>>>>>>
it('should allow accessing node.id', function(done) {
var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"msg.payload = node.id; return msg;"},
{id:"n2", type:"helper"}];
helper.load(functionNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
n2.on("input", function(msg) {
msg.should.have.property('payload', n1.id);
done();
});
n1.receive({payload:"foo",topicb: "bar"});
});
});
it('should allow accessing node.name', function(done) {
var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"msg.payload = node.name; return msg;", "name":"name of node"},
{id:"n2", type:"helper"}];
helper.load(functionNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
n2.on("input", function(msg) {
msg.should.have.property('payload', n1.name);
done();
});
n1.receive({payload:"foo",topicb: "bar"});
});
});
it('should use the same Date object from outside the sandbox', function(done) {
var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"msg.payload=global.get('typeTest')(new Date());return msg;"},
{id:"n2", type:"helper"}];
helper.load(functionNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
n1.context().global.set("typeTest",function(d) { return d instanceof Date });
n2.on("input", function(msg) {
msg.should.have.property('payload', true);
done();
});
n1.receive({payload:"foo",topic: "bar"});
});
}); |
<<<<<<<
status: function(s) {
if (s == null) {
return showStatus;
} else {
showStatus = s;
RED.nodes.eachNode(function(n) { n.dirty = true;});
//TODO: subscribe/unsubscribe here
redraw();
}
},
constraints: function(s) {
if (s == null) {
return showConstraints;
} else {
showConstraints = s;
RED.nodes.eachNode(function(n) { n.dirty = true;});
//TODO: subscribe/unsubscribe here
redraw();
}
},
=======
>>>>>>>
constraints: function(s) {
if (s == null) {
return showConstraints;
} else {
showConstraints = s;
RED.nodes.eachNode(function(n) { n.dirty = true;});
//TODO: subscribe/unsubscribe here
redraw();
}
}, |
<<<<<<<
var stoppable = require('stoppable');
var helper = require("../../helper.js");
=======
var helper = require("node-red-node-test-helper");
>>>>>>>
var stoppable = require('stoppable');
var helper = require("node-red-node-test-helper"); |
<<<<<<<
'academic-cap': ['hat', 'school', 'university', 'graduation', 'diploma'],
adjustments: ['filter', 'settings'],
annotation: ['speech', 'bubble', 'chat'],
=======
'academic-cap': ['hat', 'school', 'university', 'graduation-cap'],
adjustments: ['filter', 'settings', 'sliders'],
annotation: ['speech', 'bubble', 'chat', 'comment', 'response'],
>>>>>>>
'academic-cap': ['hat', 'school', 'university', 'graduation', 'diploma'],
adjustments: ['filter', 'settings', 'sliders'],
annotation: ['speech', 'bubble', 'chat', 'comment', 'response'],
<<<<<<<
'badge-check': ['tick', 'check', 'validated'],
ban: ['stop', 'unauthorized', 'bad'],
beaker: ['science', 'chemistry', 'formula', 'potion'],
bell: ['notification', 'ding', 'ring'],
briefcase: ['business', 'work', 'job', 'office'],
=======
backspace: ['delete'],
'badge-check': ['tick'],
ban: ['stop', 'block', 'halt', 'end'],
beaker: ['science', 'chemistry', 'chemical'],
bell: ['notification'],
bookmark: ['save'],
briefcase: ['business', 'work', 'office'],
>>>>>>>
backspace: ['delete'],
'badge-check': ['tick', 'validated'],
ban: ['stop', 'block', 'halt', 'end', 'unauthorized', 'bad'],
beaker: ['science', 'chemistry', 'chemical', 'formula', 'potion'],
bell: ['notification'],
bookmark: ['save'],
briefcase: ['business', 'work', 'job', 'office'],
<<<<<<<
calculator: ['maths', 'numbers'],
calendar: ['event'],
=======
calculator: ['maths', 'mathematics'],
calendar: ['event', 'date', 'month', 'year'],
>>>>>>>
calculator: ['maths', 'mathematics', 'numbers'],
calendar: ['event', 'date', 'month', 'year'],
<<<<<<<
check: ['tick', 'correct', 'valid', 'ok'],
=======
check: ['tick', 'correct', 'ok'],
>>>>>>>
check: ['tick', 'correct', 'valid', 'ok'],
<<<<<<<
'dots-circle-horizontal': ['more', 'options'],
'dots-horizontal': ['more'],
'dots-vertical': ['more'],
duplicate: ['copy'],
=======
document: ['sim'],
'dots-circle-horizontal': ['more'],
'dots-horizontal': ['more', 'meatballs'],
'dots-vertical': ['more', 'kebab'],
duplicate: ['copy', 'clone'],
>>>>>>>
document: ['sim'],
'dots-circle-horizontal': ['more', 'options'],
'dots-horizontal': ['more', 'meatballs'],
'dots-vertical': ['more', 'kebab'],
duplicate: ['copy', 'clone'],
<<<<<<<
exclamation: ['warning', 'caution'],
'eye-off': ['invisible', 'hidden'],
eye: ['visible'],
=======
exclamation: ['warning'],
'eye-off': ['invisible', 'hidden', 'unseen', 'private'],
eye: ['visible', 'seen', 'public'],
>>>>>>>
exclamation: ['warning', 'caution'],
'eye-off': ['invisible', 'hidden', 'unseen', 'private'],
eye: ['visible', 'seen', 'public'],
<<<<<<<
'globe-alt': ['earth'],
globe: ['earth', 'planet', 'worldwide'],
=======
'globe-alt': ['earth', 'website', 'www'],
globe: ['earth', 'website', 'www'],
hand: ['grab'],
>>>>>>>
'globe-alt': ['earth', 'website', 'www'],
globe: ['earth', 'website', 'www', 'planet', 'worldwide'],
hand: ['grab'],
<<<<<<<
'library': ['institution', 'building', 'administration'],
'link': ['url', 'attachment'],
'microphone': ['audio'],
=======
library: ['institution', 'building'],
'light-bulb': ['insight'],
'lightning-bolt': ['electric', 'electricity', 'zap', 'power', 'flash'],
link: ['url'],
'location-marker': ['pin'],
login: ['enter'],
logout: ['exit'],
microphone: ['audio'],
menu: ['hamburger'],
>>>>>>>
library: ['institution', 'building', 'administration'],
'light-bulb': ['insight'],
'lightning-bolt': ['electric', 'electricity', 'zap', 'power', 'flash'],
link: ['url', 'attachment'],
'location-marker': ['pin'],
login: ['enter'],
logout: ['exit'],
microphone: ['audio'],
menu: ['hamburger'],
<<<<<<<
truck: ['vehicle', 'lorry'],
variable: ['maths', 'equation', 'calculus'],
=======
truck: ['vehicle', 'lorry'],
variable: ['maths', 'mathematics', 'formula'],
>>>>>>>
truck: ['vehicle', 'lorry'],
variable: ['maths', 'mathematics', 'formula', 'equation', 'calculus'],
<<<<<<<
'volume-off': ['mute'],
'volume-up': ['unmute'],
wifi: ['online', 'connected', 'wireless'],
=======
'volume-off': ['mute', 'sound', 'audio'],
'volume-up': ['unmute', 'sound', 'audio'],
wifi: ['online', 'signal', 'connection'],
>>>>>>>
'volume-off': ['mute', 'sound', 'audio'],
'volume-up': ['unmute', 'sound', 'audio'],
wifi: ['online', 'signal', 'connection', 'wireless'], |
<<<<<<<
this.stop = function(stopList) {
if (1) {
return;
}
=======
this.stop = function(stopList, removedList) {
>>>>>>>
this.stop = function(stopList, removedList) {
if (1) {
return;
} |
<<<<<<<
'badge-check': ['tick'],
ban: ['stop', 'not-allowed'],
beaker: ['science', 'chemistry'],
bell: ['notification', 'alert'],
briefcase: ['business'],
cake: ['birthday', 'celebrate', 'party'],
calculator: ['maths'],
calendar: ['event', 'date'],
camera: ['photo', 'picture'],
=======
backspace: ['delete'],
'badge-check': ['tick', 'validated'],
ban: ['stop', 'block', 'halt', 'end', 'unauthorized', 'bad'],
beaker: ['science', 'chemistry', 'chemical', 'formula', 'potion'],
bell: ['notification'],
bookmark: ['save'],
briefcase: ['business', 'work', 'job', 'office'],
cake: ['birthday', 'celebrate'],
calculator: ['maths', 'mathematics', 'numbers'],
calendar: ['event', 'date', 'month', 'year'],
camera: ['photo'],
>>>>>>>
backspace: ['delete'],
'badge-check': ['tick', 'validated'],
ban: ['stop', 'block', 'halt', 'end', 'unauthorized', 'bad', 'not-allowed'],
beaker: ['science', 'chemistry', 'chemical', 'formula', 'potion'],
bell: ['notification', 'alert'],
bookmark: ['save'],
briefcase: ['business', 'work', 'job', 'office'],
cake: ['birthday', 'celebrate', 'party'],
calculator: ['maths', 'mathematics', 'numbers'],
calendar: ['event', 'date', 'month', 'year'],
camera: ['photo', 'picture'],
<<<<<<<
'chart-bar': ['graph', 'stats'],
'chart-pie': ['graph', 'stats'],
'chart-square-bar': ['graph', 'stats'],
'chat-alt-2': ['speech', 'bubble', 'message'],
'chat-alt': ['speech', 'bubble', 'message'],
chat: ['speech', 'bubble', 'message'],
'check-circle': ['tick', 'correct', 'confirm'],
check: ['tick', 'correct', 'confirm'],
=======
'chart-bar': ['graph', 'stats', 'statistics'],
'chart-pie': ['graph', 'stats', 'statistics'],
'chart-square-bar': ['graph', 'stats', 'statistics'],
'chat-alt-2': ['speech', 'bubble', 'comment', 'response'],
'chat-alt': ['speech', 'bubble','comment', 'response'],
chat: ['speech', 'bubble', 'comment', 'response'],
'check-circle': ['tick', 'correct'],
check: ['tick', 'correct', 'valid', 'ok'],
>>>>>>>
'chart-bar': ['graph', 'stats', 'statistics'],
'chart-pie': ['graph', 'stats', 'statistics'],
'chart-square-bar': ['graph', 'stats', 'statistics'],
'chat-alt-2': ['speech', 'bubble', 'comment', 'response', 'message'],
'chat-alt': ['speech', 'bubble','comment', 'response', 'message'],
chat: ['speech', 'bubble', 'comment', 'response', 'message'],
'check-circle': ['tick', 'correct', 'confirm'],
check: ['tick', 'correct', 'valid', 'ok', 'confirm'],
<<<<<<<
'desktop-computer': ['pc', 'mac', 'windows'],
=======
'desktop-computer': ['pc', 'mac', 'monitor'],
>>>>>>>
'desktop-computer': ['pc', 'mac', 'monitor', 'windows'],
<<<<<<<
fire: ['flame'],
gift: ['present', 'reward'],
'globe-alt': ['earth', 'world', 'planet'],
globe: ['earth', 'world', 'planet'],
=======
'finger-print': ['touch-id'],
fire: ['flame', 'hot', 'burn', 'lit'],
'folder-remove': ['folder-delete'],
gift: ['present'],
'globe-alt': ['earth', 'website', 'www'],
globe: ['earth', 'website', 'www', 'planet', 'worldwide'],
hand: ['grab'],
>>>>>>>
'finger-print': ['touch-id'],
fire: ['flame', 'hot', 'burn', 'lit'],
'folder-remove': ['folder-delete'],
gift: ['present', 'reward'],
'globe-alt': ['earth', 'website', 'www', 'world', 'planet'],
globe: ['earth', 'website', 'www', 'world', 'planet'],
hand: ['grab'],
<<<<<<<
home: ['house'],
'inbox-in': ['email', 'message'],
inbox: ['email', 'message'],
=======
home: ['house', 'building'],
'inbox-in': ['email'],
inbox: ['email'],
>>>>>>>
home: ['house', 'building'],
'inbox-in': ['email', 'message'],
inbox: ['email', 'message'],
<<<<<<<
library: ['institution'],
link: ['url'],
microphone: ['audio', 'podcast', 'recording'],
'minus-circle': ['remove', 'delete', 'subtract'],
'minus-sm': ['remove', 'delete', 'subtract'],
minus: ['remove', 'delete', 'subtract'],
moon: ['night', 'dark'],
=======
library: ['institution', 'building', 'administration'],
'light-bulb': ['insight'],
'lightning-bolt': ['electric', 'electricity', 'zap', 'power', 'flash'],
link: ['url', 'attachment'],
'location-marker': ['pin'],
login: ['enter'],
logout: ['exit'],
microphone: ['audio'],
menu: ['hamburger'],
'minus-circle': ['remove', 'delete'],
'minus-sm': ['remove', 'delete'],
minus: ['remove', 'delete'],
moon: ['night', 'dark'],
'music-note': ['song'],
>>>>>>>
library: ['institution', 'building', 'administration'],
'light-bulb': ['insight'],
'lightning-bolt': ['electric', 'electricity', 'zap', 'power', 'flash'],
link: ['url', 'attachment'],
'location-marker': ['pin'],
login: ['enter'],
logout: ['exit'],
microphone: ['audio', 'podcast', 'record'],
menu: ['hamburger'],
'minus-circle': ['remove', 'delete', 'subtract'],
'minus-sm': ['remove', 'delete', 'subtract'],
minus: ['remove', 'delete', 'subtract'],
moon: ['night', 'dark'],
'music-note': ['song'],
<<<<<<<
photograph: ['picture', 'image'],
'plus-circle': ['add', 'create', 'new'],
'plus-sm': ['add', 'create', 'new'],
plus: ['add', 'create', 'new'],
=======
'pencil-alt': ['write', 'note', 'edit'],
pencil: ['write', 'note'],
photograph: ['picture', 'image', 'gallery'],
'plus-circle': ['add', 'create'],
'plus-sm': ['add', 'create'],
plus: ['add', 'create'],
>>>>>>>
'pencil-alt': ['write', 'note', 'edit'],
pencil: ['write', 'note'],
photograph: ['picture', 'image', 'gallery'],
'plus-circle': ['add', 'create'],
'plus-sm': ['add', 'create'],
plus: ['add', 'create'],
<<<<<<<
'shield-check': ['shield-tick', 'secure'],
=======
scale: ['balance', 'weigh'],
scissors: ['cut'],
'search-circle': ['magnifier'],
search: ['magnifier'],
selector: ['reorder', 'move'],
'shield-check': ['shield-tick'],
>>>>>>>
scale: ['balance', 'weigh'],
scissors: ['cut'],
'search-circle': ['magnifier'],
search: ['magnifier'],
selector: ['reorder', 'move'],
'shield-check': ['shield-tick', 'secure'],
<<<<<<<
sparkles: ['stars', 'glitter'],
=======
'shopping-bag': ['cart'],
sparkles: ['stars'],
>>>>>>>
'shopping-bag': ['cart'],
sparkles: ['stars', 'glitter'],
<<<<<<<
sun: ['day', 'light'],
terminal: ['console', 'code'],
trash: ['bin', 'rubbish', 'garbage'],
=======
sun: ['day', 'brightness', 'light'],
support: ['help'],
table: ['grid'],
terminal: ['console', 'cli'],
trash: ['bin', 'rubbish', 'delete', 'remove'],
>>>>>>>
sun: ['day', 'brightness', 'light'],
support: ['help'],
table: ['grid'],
terminal: ['console', 'cli', 'code'],
trash: ['bin', 'rubbish', 'delete', 'remove', 'garbage'],
<<<<<<<
'volume-off': ['mute', 'quiet'],
'volume-up': ['unmute', 'loud'],
wifi: ['online', 'connection'],
=======
'volume-off': ['mute', 'sound', 'audio'],
'volume-up': ['unmute', 'sound', 'audio'],
wifi: ['online', 'signal', 'connection', 'wireless'],
>>>>>>>
'volume-off': ['mute', 'sound', 'audio', 'quiet'],
'volume-up': ['unmute', 'sound', 'audio', 'loud'],
wifi: ['online', 'signal', 'connection', 'wireless'], |
<<<<<<<
devtool: '#cheap-module-eval-source-map',
entry: {
renderer: path.join(__dirname, '../src/renderer/index.js')
},
externals: [
...Object.keys(dependencies || {}).filter(d => !whiteListedModules.includes(d))
],
module: {
rules: [
{
test: /\.(js|vue)$/,
enforce: 'pre',
loader: 'eslint-loader',
include: [
path.resolve(__dirname, '../src/renderer'),
]
},
{
test: /\.css$/,
use: ExtractTextPlugin.extract({
fallback: 'style-loader',
use: 'css-loader'
})
},
{
test: /\.html$/,
use: 'vue-html-loader'
},
{
test: /\.js$/,
use: 'babel-loader',
exclude: /node_modules/
},
{
test: /\.node$/,
use: 'node-loader'
},
{
test: /\.vue$/,
use: {
loader: 'vue-loader',
options: {
extractCSS: process.env.NODE_ENV === 'production',
loaders: {
sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax=1',
scss: 'vue-style-loader!css-loader!sass-loader'
}
}
}
},
{
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
use: {
loader: 'url-loader',
query: {
limit: 10000,
name: 'imgs/[name]--[folder].[ext]'
}
}
},
{
test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
loader: 'url-loader',
options: {
limit: 10000,
name: 'media/[name]--[folder].[ext]'
}
},
{
test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
use: {
loader: 'url-loader',
query: {
limit: 10000,
name: 'fonts/[name]--[folder].[ext]'
}
}
}
]
},
node: {
__dirname: process.env.NODE_ENV !== 'production',
__filename: process.env.NODE_ENV !== 'production'
},
plugins: [
new ExtractTextPlugin('styles.css'),
new HtmlWebpackPlugin({
filename: 'assistant.html',
template: path.resolve(__dirname, '../src/assistant.ejs'),
minify: {
collapseWhitespace: true,
removeAttributeQuotes: true,
removeComments: true
},
nodeModules: process.env.NODE_ENV !== 'production'
? path.resolve(__dirname, '../node_modules')
: false
=======
mode: 'none',
entry: {
renderer: path.join(__dirname, '../src/renderer/main.js')
},
externals: [
...Object.keys(dependencies || {}).filter(d => !whiteListedModules.includes(d))
],
module: {
rules: [
{
test: /\.scss$/,
use: ['vue-style-loader', 'css-loader', 'sass-loader'],
},
{
test: /\.sass$/,
use: ['vue-style-loader', 'css-loader', 'sass-loader?indentedSyntax'],
},
{
test: /\.less$/,
use: ['vue-style-loader', 'css-loader', 'less-loader'],
},
{
test: /\.css$/,
use: ['vue-style-loader', 'css-loader'],
},
{
test: /\.html$/,
use: 'vue-html-loader',
},
{
test: /\.js$/,
use: 'babel-loader',
exclude: /node_modules/,
},
{
test: /\.node$/,
use: 'node-loader',
},
{
test: /\.vue$/,
use: {
loader: 'vue-loader',
options: {
extractCSS: process.env.NODE_ENV === 'production',
loaders: {
sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax=1',
scss: 'vue-style-loader!css-loader!sass-loader',
less: 'vue-style-loader!css-loader!less-loader',
},
},
},
},
{
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
use: {
loader: 'url-loader',
query: {
limit: 10000,
name: 'imgs/[name]--[folder].[ext]',
},
},
},
{
test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
loader: 'url-loader',
options: {
limit: 10000,
name: 'media/[name]--[folder].[ext]',
},
},
{
test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
use: {
loader: 'url-loader',
query: {
limit: 10000,
name: 'fonts/[name]--[folder].[ext]',
},
},
},
],
},
node: {
__dirname: process.env.NODE_ENV !== 'production',
__filename: process.env.NODE_ENV !== 'production'
},
plugins: [
new HtmlWebpackPlugin({
filename: 'assistant.html',
template: path.resolve(__dirname, '../src/assistant.ejs'),
nodeModules: process.env.NODE_ENV !== 'production'
? path.resolve(__dirname, '../node_modules')
: false
>>>>>>>
mode: 'none',
entry: {
renderer: path.join(__dirname, '../src/renderer/index.js')
},
externals: [
...Object.keys(dependencies || {}).filter(d => !whiteListedModules.includes(d))
],
module: {
rules: [
{
test: /\.scss$/,
use: ['vue-style-loader', 'css-loader', 'sass-loader'],
},
{
test: /\.sass$/,
use: ['vue-style-loader', 'css-loader', 'sass-loader?indentedSyntax'],
},
{
test: /\.less$/,
use: ['vue-style-loader', 'css-loader', 'less-loader'],
},
{
test: /\.css$/,
use: ['vue-style-loader', 'css-loader'],
},
{
test: /\.html$/,
use: 'vue-html-loader',
},
{
test: /\.js$/,
use: 'babel-loader',
exclude: /node_modules/,
},
{
test: /\.node$/,
use: 'node-loader',
},
{
test: /\.vue$/,
use: {
loader: 'vue-loader',
options: {
extractCSS: process.env.NODE_ENV === 'production',
loaders: {
sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax=1',
scss: 'vue-style-loader!css-loader!sass-loader',
less: 'vue-style-loader!css-loader!less-loader',
},
},
},
},
{
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
use: {
loader: 'url-loader',
query: {
limit: 10000,
name: 'imgs/[name]--[folder].[ext]',
},
},
},
{
test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
loader: 'url-loader',
options: {
limit: 10000,
name: 'media/[name]--[folder].[ext]',
},
},
{
test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
use: {
loader: 'url-loader',
query: {
limit: 10000,
name: 'fonts/[name]--[folder].[ext]',
},
},
},
],
},
node: {
__dirname: process.env.NODE_ENV !== 'production',
__filename: process.env.NODE_ENV !== 'production'
},
plugins: [
new HtmlWebpackPlugin({
filename: 'assistant.html',
template: path.resolve(__dirname, '../src/assistant.ejs'),
nodeModules: process.env.NODE_ENV !== 'production'
? path.resolve(__dirname, '../node_modules')
: false
<<<<<<<
filename: 'response.html',
template: path.resolve(__dirname, '../src/response.ejs'),
minify: {
collapseWhitespace: true,
removeAttributeQuotes: true,
removeComments: true
},
nodeModules: process.env.NODE_ENV !== 'production'
? path.resolve(__dirname, '../node_modules')
: false
}),
new webpack.HotModuleReplacementPlugin(),
new webpack.NoEmitOnErrorsPlugin(),
],
output: {
filename: '[name].js',
libraryTarget: 'commonjs2',
path: path.join(__dirname, '../dist/electron')
},
resolve: {
alias: {
'@': path.join(__dirname, '../src/renderer'),
'vue$': 'vue/dist/vue.esm.js'
},
=======
filename: 'response.html',
template: path.resolve(__dirname, '../src/response.ejs'),
nodeModules: process.env.NODE_ENV !== 'production'
? path.resolve(__dirname, '../node_modules')
: false
}),
new VueLoaderPlugin(),
new webpack.HotModuleReplacementPlugin(),
// new webpack.NoEmitOnErrorsPlugin(),
],
output: {
filename: '[name].js',
libraryTarget: 'commonjs2',
path: path.join(__dirname, '../dist/electron')
},
resolve: {
alias: {
'@': path.join(__dirname, '../src/renderer'),
vue$: path.resolve(__dirname, '../node_modules/vue/dist/vue.esm.js'),
},
>>>>>>>
filename: 'response.html',
template: path.resolve(__dirname, '../src/response.ejs'),
nodeModules: process.env.NODE_ENV !== 'production'
? path.resolve(__dirname, '../node_modules')
: false
}),
new VueLoaderPlugin(),
new webpack.HotModuleReplacementPlugin(),
// new webpack.NoEmitOnErrorsPlugin(),
],
output: {
filename: '[name].js',
libraryTarget: 'commonjs2',
path: path.join(__dirname, '../dist/electron')
},
resolve: {
alias: {
'@': path.join(__dirname, '../src/renderer'),
vue$: path.resolve(__dirname, '../node_modules/vue/dist/vue.esm.js'),
},
<<<<<<<
},
target: 'electron-renderer'
}
/**
* Adjust rendererConfig for development settings
*/
if (process.env.NODE_ENV !== 'production') {
rendererConfig.plugins.push(
new webpack.DefinePlugin({
'__static': `"${path.join(__dirname, '../static').replace(/\\/g, '\\\\')}"`
})
)
=======
},
target: 'electron-renderer'
>>>>>>>
},
target: 'electron-renderer'
<<<<<<<
rendererConfig.plugins.push(
new BabelMinifyPlugin(),
new CopyWebpackPlugin([
{
from: path.join(__dirname, '../static'),
to: path.join(__dirname, '../dist/electron/static'),
ignore: ['.*']
}
]),
new webpack.DefinePlugin({
'process.env.NODE_ENV': '"production"'
}),
new webpack.LoaderOptionsPlugin({
minimize: true
})
)
=======
rendererConfig.plugins.push(
new CopyWebpackPlugin([
{
from: path.join(__dirname, '../static'),
to: path.join(__dirname, '../dist/electron/static'),
}
]),
)
>>>>>>>
rendererConfig.plugins.push(
new CopyWebpackPlugin([
{
from: path.join(__dirname, '../static'),
to: path.join(__dirname, '../dist/electron/static'),
}
]),
) |
<<<<<<<
import { Animated, Dimensions, ImageBackground, ScrollView, View, Platform } from 'react-native'
import { getStatusBarHeight, ifIphoneX } from 'react-native-iphone-x-helper'
=======
import { Animated, Dimensions, ImageBackground, ScrollView, View } from 'react-native'
>>>>>>>
import { Animated, Dimensions, ImageBackground, ScrollView, View, Platform } from 'react-native' |
<<<<<<<
'academic-cap': ['hat', 'school', 'university', 'graduation-cap'],
adjustments: ['filter', 'settings', 'sliders'],
annotation: ['speech', 'bubble', 'chat'],
=======
'academic-cap': ['hat', 'school', 'university'],
adjustments: ['filter', 'settings'],
annotation: ['speech', 'bubble', 'chat', 'comment', 'response'],
>>>>>>>
'academic-cap': ['hat', 'school', 'university', 'graduation-cap'],
adjustments: ['filter', 'settings', 'sliders'],
annotation: ['speech', 'bubble', 'chat', 'comment', 'response'],
<<<<<<<
'dots-horizontal': ['more'],
'dots-vertical': ['more'],
duplicate: ['copy', 'clone'],
=======
'dots-horizontal': ['more', 'meatballs'],
'dots-vertical': ['more', 'kebab'],
duplicate: ['copy'],
>>>>>>>
'dots-horizontal': ['more', 'meatballs'],
'dots-vertical': ['more', 'kebab'],
duplicate: ['copy', 'clone'], |
<<<<<<<
var KEY$1 = "core-components-" + (Date.now());
var STATES = {};
var UUID = 0;
=======
var name$1 = "@nrk/core-datepicker";
var version$1 = "1.0.0";
>>>>>>>
var KEY$1 = "core-components-" + (Date.now());
var STATES = {};
var UUID = 0;
<<<<<<<
=======
exports.datepicker = datepicker;
exports.Datepicker = Datepicker$1;
exports.expand = expand;
exports.Expand = Expand$1;
>>>>>>> |
<<<<<<<
ban: ['stop', 'block'],
beaker: ['science', 'chemistry'],
=======
ban: ['stop', 'block', 'halt', 'end'],
beaker: ['science', 'chemistry', 'chemical'],
>>>>>>>
ban: ['stop', 'block', 'halt', 'end'],
beaker: ['science', 'chemistry', 'chemical'],
<<<<<<<
'currency-euro': ['money', 'payment', 'euro'],
=======
'currency-euro': ['money', 'payment', 'eur'],
>>>>>>>
'currency-euro': ['money', 'payment', 'eur', 'euro'],
<<<<<<<
'eye-off': ['invisible', 'hidden', 'private'],
eye: ['visible', 'public'],
=======
'eye-off': ['invisible', 'hidden', 'unseen'],
eye: ['visible', 'seen'],
>>>>>>>
'eye-off': ['invisible', 'hidden', 'unseen', 'private'],
eye: ['visible', 'seen', 'public'],
<<<<<<<
sun: ['day'],
terminal: ['console', 'cli'],
trash: ['bin', 'rubbish', 'delete', 'remove'],
=======
sun: ['day', 'brightness', 'light'],
support: ['help'],
table: ['grid'],
terminal: ['console'],
trash: ['bin', 'rubbish', 'delete', 'remove'],
>>>>>>>
sun: ['day', 'brightness', 'light'],
support: ['help'],
table: ['grid'],
terminal: ['console', 'cli'],
trash: ['bin', 'rubbish', 'delete', 'remove'],
<<<<<<<
truck: ['vehicle', 'lorry'],
variable: ['maths'],
=======
truck: ['vehicle'],
variable: ['maths', 'mathematics', 'formula'],
>>>>>>>
truck: ['vehicle', 'lorry'],
variable: ['maths', 'mathematics', 'formula'],
<<<<<<<
'volume-off': ['mute', 'sound', 'audio'],
'volume-up': ['unmute', 'sound', 'audio'],
wifi: ['online'],
=======
'volume-off': ['mute'],
'volume-up': ['unmute'],
wifi: ['online', 'signal', 'connection'],
>>>>>>>
'volume-off': ['mute', 'sound', 'audio'],
'volume-up': ['unmute', 'sound', 'audio'],
wifi: ['online', 'signal', 'connection'], |
<<<<<<<
function generateRandomOp (snapshot) {
console.log('Generate', _.cloneDeep(snapshot));
var composed = new Delta(_.cloneDeep(snapshot));
var length = snapshot.reduce(function(length, op) {
if (!op.insert) {
throw new Error('Snapshot should only have inserts');
}
=======
var generateRandomOp = function (snapshot) {
var snapshot = new Delta(snapshot);
var length = snapshot.ops.reduce(function(length, op) {
if (!op.insert) {
console.error(snapshot);
throw new Error('Snapshot should only have inserts');
}
>>>>>>>
function generateRandomOp (snapshot) {
console.log('Generate', _.cloneDeep(snapshot));
var composed = new Delta(_.cloneDeep(snapshot));
var length = snapshot.reduce(function(length, op) {
if (!op.insert) {
console.error(snapshot);
throw new Error('Snapshot should only have inserts');
}
<<<<<<<
var modIndex = fuzzer.randomInt(Math.min(length, 5) + 1);
var modLength = Math.min(length, fuzzer.randomInt(4) + 1);
console.log('skip retain', modIndex)
var ops = next(snapshot, modIndex);
delta.retain(modIndex);
for (var i in ops) {
console.log('pushing', ops[i]);
result.push(ops[i]);
}
length -= modIndex;
=======
var index = fuzzer.randomInt(Math.min(length, 5) + 1);
length -= index;
var modLength = Math.min(length, fuzzer.randomInt(4) + 1);
delta.retain(index);
>>>>>>>
var modIndex = fuzzer.randomInt(Math.min(length, 5) + 1);
length -= modIndex;
var modLength = Math.min(length, fuzzer.randomInt(4) + 1);
console.log('skip retain', modIndex)
var ops = next(snapshot, modIndex);
delta.retain(modIndex);
for (var i in ops) {
console.log('pushing', ops[i]);
result.push(ops[i]);
} |
<<<<<<<
if (options.hasOwnProperty('secret')) this.crypto = require('crypto'), this.secret = options.secret;
if (options.hasOwnProperty('algorithm')) this.algorithm = options.algorithm;
this.pool = options.client.config.connectionConfig ? true : false;
this.mysql = options.client;
=======
if(options.hasOwnProperty('pool')) {
var pool = options.pool;
if(isFunction(pool.getConnection)) {
this.usePool = true;
this.pool = pool;
}
else if(pool === true) {
this.usePool = true;
}
}
this.config = options.config;
>>>>>>>
if (options.hasOwnProperty('secret')) this.crypto = require('crypto'), this.secret = options.secret;
if (options.hasOwnProperty('algorithm')) this.algorithm = options.algorithm;
if(options.hasOwnProperty('pool')) {
var pool = options.pool;
if(isFunction(pool.getConnection)) {
this.usePool = true;
this.pool = pool;
}
else if(pool === true) {
this.usePool = true;
}
}
this.config = options.config; |
<<<<<<<
if (navigator.appVersion.indexOf("MSIE") != -1)
alert("You're using a pretty old browser, some parts of the website might not work properly.");
var CONNECTION_URL = "127.0.0.1:443", // Default Connection
SKIN_URL = "./skins/"; // Skin Directory
wHandle.setserver = function(arg) {
if (arg != CONNECTION_URL) {
CONNECTION_URL = arg;
showConnecting();
=======
Date.now || (Date.now = function() {
return (+new Date).getTime();
});
Array.prototype.remove = function(a) {
let i = this.indexOf(a);
if (i !== -1) {
this.splice(i, 1);
return true;
>>>>>>>
if (navigator.appVersion.indexOf("MSIE") != -1)
alert("You're using a pretty old browser, some parts of the website might not work properly.");
Date.now || (Date.now = function() {
return (+new Date).getTime();
});
Array.prototype.remove = function(a) {
let i = this.indexOf(a);
if (i !== -1) {
this.splice(i, 1);
return true; |
<<<<<<<
var CommonRegex = function(_text) {
this.text = _text || '';
if (_text !== undefined) {
// Uses lazy evaluation
regexesNames.forEach(function(r) {
Object.defineProperty(this, r, {
get: function() {
var propertyName = '_' + r;
if(!this[propertyName]) {
this[propertyName] = this.getMatches(this.text, regexes[r]);
}
return this[propertyName];
}
});
}.bind(this));
}
};
var regexes = {
dates: (function() {
var opt = function opt(regex) {
return '(?:' + regex + ')?';
},
group = function group(regex) {
return '(?:' + regex + ')';
},
any = function any(regexes) {
return regexes.join('|');
};
var monthRegex = '(?:jan\\.?|january|feb\\.?|february|mar\\.?|march|apr\\.?|april|may|jun\\.?|june|jul\\.?|july|aug\\.?|august|sep\\.?|september|oct\\.?|october|nov\\.?|november|dec\\.?|december)',
dayRegex = '[0-3]?\\d(?:st|nd|rd|th)?',
yearRegex = '\\d{4}';
var datesRegex = group(any([dayRegex + '\\s+(?:of\\s+)?' + monthRegex, monthRegex + '\\s+' + dayRegex])) + '(?:\\,)?\\s*' + opt(yearRegex) + '|[0-3]?\\d[-/][0-3]?\\d[-/]\\d{2,4}';
return new RegExp(datesRegex, 'gim');
}()),
times: /((0?[0-9]|1[0-2]):[0-5][0-9](am|pm)|([01]?[0-9]|2[0-3]):[0-5][0-9])/gim,
phones: /(\d?[^\s\w]*(?:\(?\d{3}\)?\W*)?\d{3}\W*\d{4})/gim,
links: /((?:https?:\/\/|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\((?:[^\s()<>]+|(?:\([^\s()<>]+\)))*\))+(?:\((?:[^\s()<>]+|(?:\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:\'".,<>?\xab\xbb\u201c\u201d\u2018\u2019]))/gim,
emails: /([a-z0-9!#$%&'*+\/=?\^_`{|}~\-]+@([a-z0-9]+\.)+([a-z0-9]+))/gim,
IPv4: /\b((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/gm,
IPv6: /((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))\b/gim,
hexColors: /#(?:[0-9a-fA-F]{3}){1,2}\b/gim,
acronyms: /\b(([A-Z]\.)+|([A-Z]){2,})/gm,
money: /((^|\b)US?)?\$\s?[0-9]{1,3}((,[0-9]{3})+|([0-9]{3})+)?(\.[0-9]{1,2})?\b/gm,
percentages: /(100(\.0+)?|[0-9]{1,2}(\.[0-9]+)?)%/gm,
creditCards: /((?:(?:\d{4}[- ]){3}\d{4}|\d{16}))(?![\d])/gm,
addresses: /\d{1,4} [\w\s]{1,20}(?:(street|avenue|road|highway|square|trail|drive|court|parkway|boulevard|circle)\b|(st|ave|rd|hwy|sq|trl|dr|ct|pkwy|blvd|cir)\.(?=\b)?)/gim
};
var regexesNames = Object.keys(regexes);
/**
* Used to get all the matches of a regex from a string
* @param {String} text Text to look for the matches
* @param {Regexp} regex Regex to match the text
* @return {Array} Array of matches
*/
CommonRegex.prototype.getMatches = function getMatches(text, regex) {
text = text || this.text;
var matches = text.match(regex);
if (matches === null) {
return [];
}
return matches;
};
var capitalize = function capitalize(string) {
return string.charAt(0).toUpperCase() + string.slice(1);
};
// Add a method relative to each one of the regexes
Object.keys(regexes).forEach(function(r) {
CommonRegex.prototype['get' + capitalize(r)] = function(_text) {
if(_text) {
return this.getMatches(_text, regexes[r]);
}
return this[r];
};
});
return CommonRegex;
=======
var CommonRegex = function(_text) {
this.text = _text || '';
if (_text !== undefined) {
this.dates = this.getDates();
this.times = this.getTimes();
this.phones = this.getPhones();
this.links = this.getLinks();
this.emails = this.getEmails();
this.IPv4 = this.getIPv4();
this.IPv6 = this.getIPv6();
this.hexColors = this.getHexColors();
this.acronyms = this.getAcronyms();
this.money = this.getMoney();
this.percentages = this.getPercentages();
this.creditCards = this.getCreditCards();
this.addresses = this.getAddresses();
}
return this;
};
CommonRegex.prototype = {
dateRegex: (function() {
var opt = function opt(regex) {
return '(?:' + regex + ')?';
},
group = function group(regex) {
return '(?:' + regex + ')';
},
any = function any(regexes) {
return regexes.join('|');
};
var monthRegex = '(?:jan\\.?|january|feb\\.?|february|mar\\.?|march|apr\\.?|april|may|jun\\.?|june|jul\\.?|july|aug\\.?|august|sep\\.?|september|oct\\.?|october|nov\\.?|november|dec\\.?|december)',
dayRegex = '[0-3]?\\d(?:st|nd|rd|th)?',
yearRegex = '\\d{4}';
dateRegex = group(any([dayRegex + '\\s+(?:of\\s+)?' + monthRegex, monthRegex + '\\s+' + dayRegex])) + '(?:\\,)?\\s*' + opt(yearRegex) + '|[0-3]?\\d[-/][0-3]?\\d[-/]\\d{2,4}';
return new RegExp(dateRegex, 'gim');
}()),
timeRegex: /\b((0?[0-9]|1[0-2])(:[0-5][0-9])?(am|pm)|([01]?[0-9]|2[0-3]):[0-5][0-9])/gim,
phoneRegex: /(\d?[^\s\w]*(?:\(?\d{3}\)?\W*)?\d{3}\W*\d{4})/gim,
linksRegex: /((?:https?:\/\/|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\((?:[^\s()<>]+|(?:\([^\s()<>]+\)))*\))+(?:\((?:[^\s()<>]+|(?:\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:\'".,<>?\xab\xbb\u201c\u201d\u2018\u2019]))/gim,
emailsRegex: /([a-z0-9!#$%&'*+\/=?\^_`{|}~\-]+@([a-z0-9]+\.)+([a-z0-9]+))/gim,
IPv4Regex: /\b((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/gm,
IPv6Regex: /((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))\b/gim,
hexColorsRegex: /#(?:[0-9a-fA-F]{3}){1,2}\b/gim,
acronymsRegex: /\b(([A-Z]\.)+|([A-Z]){2,})/gm,
moneyRegex: /((^|\b)US?)?\$\s?[0-9]{1,3}((,[0-9]{3})+|([0-9]{3})+)?(\.[0-9]{1,2})?\b/gm,
percentageRegex: /(100(\.0+)?|[0-9]{1,2}(\.[0-9]+)?)%/gm,
creditCardRegex: /((?:(?:\d{4}[- ]){3}\d{4}|\d{16}))(?![\d])/gm,
addressRegex: /\d{1,4} [\w\s]{1,20}(?:(street|avenue|road|highway|square|traill|drive|court|parkway|boulevard)\b|(st|ave|rd|hwy|sq|trl|dr|ct|pkwy|blvd)\.(?=\b)?)/gim,
/**
* Used to get all the matches of a regex from a string
* @param {String} text Text to look for the matches
* @param {Regexp} regex Regex to match the text
* @return {Array} Array of matches
*/
getMatches: function getMatches(text, regex) {
text = text || this.text;
var matches = text.match(regex);
if (matches === null) {
return [];
}
return matches;
},
getDates: function getDates(_text) {
return this.getMatches(_text, this.dateRegex);
},
getTimes: function getTimes(_text) {
return this.getMatches(_text, this.timeRegex);
},
getPhones: function getPhones(_text) {
return this.getMatches(_text, this.phoneRegex);
},
getLinks: function getLinks(_text) {
return this.getMatches(_text, this.linksRegex);
},
getEmails: function getEmails(_text) {
return this.getMatches(_text, this.emailsRegex);
},
getIPv4: function getIPv4(_text) {
return this.getMatches(_text, this.IPv4Regex);
},
getIPv6: function getIPv6(_text) {
return this.getMatches(_text, this.IPv6Regex);
},
getHexColors: function getHexColors(_text) {
return this.getMatches(_text, this.hexColorsRegex);
},
getAcronyms: function getAcronyms(_text) {
return this.getMatches(_text, this.acronymsRegex);
},
getMoney: function getMoney(_text) {
return this.getMatches(_text, this.moneyRegex);
},
getPercentages: function getPercentages(_text) {
return this.getMatches(_text, this.percentageRegex);
},
getCreditCards: function getCreditCards(_text) {
return this.getMatches(_text, this.creditCardRegex);
},
getAddresses: function getAddresses(_text) {
return this.getMatches(_text, this.addressRegex);
}
}
return CommonRegex;
>>>>>>>
var CommonRegex = function(_text) {
this.text = _text || '';
if (_text !== undefined) {
// Uses lazy evaluation
regexesNames.forEach(function(r) {
Object.defineProperty(this, r, {
get: function() {
var propertyName = '_' + r;
if(!this[propertyName]) {
this[propertyName] = this.getMatches(this.text, regexes[r]);
}
return this[propertyName];
}
});
}.bind(this));
}
};
var regexes = {
dates: (function() {
var opt = function opt(regex) {
return '(?:' + regex + ')?';
},
group = function group(regex) {
return '(?:' + regex + ')';
},
any = function any(regexes) {
return regexes.join('|');
};
var monthRegex = '(?:jan\\.?|january|feb\\.?|february|mar\\.?|march|apr\\.?|april|may|jun\\.?|june|jul\\.?|july|aug\\.?|august|sep\\.?|september|oct\\.?|october|nov\\.?|november|dec\\.?|december)',
dayRegex = '[0-3]?\\d(?:st|nd|rd|th)?',
yearRegex = '\\d{4}';
var datesRegex = group(any([dayRegex + '\\s+(?:of\\s+)?' + monthRegex, monthRegex + '\\s+' + dayRegex])) + '(?:\\,)?\\s*' + opt(yearRegex) + '|[0-3]?\\d[-/][0-3]?\\d[-/]\\d{2,4}';
return new RegExp(datesRegex, 'gim');
}()),
times: /\b((0?[0-9]|1[0-2])(:[0-5][0-9])?(am|pm)|([01]?[0-9]|2[0-3]):[0-5][0-9])/gim,
phones: /(\d?[^\s\w]*(?:\(?\d{3}\)?\W*)?\d{3}\W*\d{4})/gim,
links: /((?:https?:\/\/|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\((?:[^\s()<>]+|(?:\([^\s()<>]+\)))*\))+(?:\((?:[^\s()<>]+|(?:\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:\'".,<>?\xab\xbb\u201c\u201d\u2018\u2019]))/gim,
emails: /([a-z0-9!#$%&'*+\/=?\^_`{|}~\-]+@([a-z0-9]+\.)+([a-z0-9]+))/gim,
IPv4: /\b((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/gm,
IPv6: /((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))\b/gim,
hexColors: /#(?:[0-9a-fA-F]{3}){1,2}\b/gim,
acronyms: /\b(([A-Z]\.)+|([A-Z]){2,})/gm,
money: /((^|\b)US?)?\$\s?[0-9]{1,3}((,[0-9]{3})+|([0-9]{3})+)?(\.[0-9]{1,2})?\b/gm,
percentages: /(100(\.0+)?|[0-9]{1,2}(\.[0-9]+)?)%/gm,
creditCards: /((?:(?:\d{4}[- ]){3}\d{4}|\d{16}))(?![\d])/gm,
addresses: /\d{1,4} [\w\s]{1,20}(?:(street|avenue|road|highway|square|trail|drive|court|parkway|boulevard|circle)\b|(st|ave|rd|hwy|sq|trl|dr|ct|pkwy|blvd|cir)\.(?=\b)?)/gim
};
var regexesNames = Object.keys(regexes);
/**
* Used to get all the matches of a regex from a string
* @param {String} text Text to look for the matches
* @param {Regexp} regex Regex to match the text
* @return {Array} Array of matches
*/
CommonRegex.prototype.getMatches = function getMatches(text, regex) {
text = text || this.text;
var matches = text.match(regex);
if (matches === null) {
return [];
}
return matches;
};
var capitalize = function capitalize(string) {
return string.charAt(0).toUpperCase() + string.slice(1);
};
// Add a method relative to each one of the regexes
Object.keys(regexes).forEach(function(r) {
CommonRegex.prototype['get' + capitalize(r)] = function(_text) {
if(_text) {
return this.getMatches(_text, regexes[r]);
}
return this[r];
};
});
return CommonRegex; |
<<<<<<<
getCachedCardanoStatusChannel.onRequest(() => {
Logger.info('ipcMain: Received request from renderer for cardano status.');
=======
cardanoStatusChannel.onRequest(() => {
Logger.info('ipcMain: Received request from renderer for cardano status', { status: cardanoNode.status });
>>>>>>>
getCachedCardanoStatusChannel.onRequest(() => {
Logger.info('ipcMain: Received request from renderer for cardano status', { status: cardanoNode.status });
<<<<<<<
setCachedCardanoStatusChannel.onReceive((status: ?CardanoStatus) => {
Logger.info('ipcMain: Received request from renderer to cache cardano status.');
=======
cardanoStatusChannel.onReceive((status: CardanoStatus) => {
Logger.info('ipcMain: Received request from renderer to cache cardano status', { status });
>>>>>>>
setCachedCardanoStatusChannel.onReceive((status: ?CardanoStatus) => {
Logger.info('ipcMain: Received request from renderer to cache cardano status', { status }); |
<<<<<<<
import React, { Component, PropTypes } from 'react';
import { observer, inject } from 'mobx-react';
import Request from '../../stores/lib/Request';
import Wallet from '../../domain/Wallet';
=======
import React, { Component, PropTypes } from 'react';
import { inject, observer } from 'mobx-react';
>>>>>>>
import React, { Component, PropTypes } from 'react';
import { observer, inject } from 'mobx-react';
import Request from '../../stores/lib/Request';
import Wallet from '../../domain/Wallet';
<<<<<<<
@inject('stores', 'actions') @observer
=======
@inject('actions', 'stores') @observer
>>>>>>>
@inject('stores', 'actions') @observer
<<<<<<<
static propTypes = {
stores: PropTypes.shape({
wallets: PropTypes.shape({
active: PropTypes.instanceOf(Wallet),
}),
walletSettings: PropTypes.shape({
updateWalletRequest: PropTypes.instanceOf(Request).isRequired,
WALLET_ASSURANCE_LEVEL_OPTIONS: PropTypes.array.isRequired,
WALLET_UNIT_OPTIONS: PropTypes.array.isRequired,
}),
}),
actions: PropTypes.shape({
walletSettings: PropTypes.shape({
updateWalletAssuranceLevel: PropTypes.func.isRequired,
updateWalletUnit: PropTypes.func.isRequired,
}),
}),
};
handleWalletAssuranceLevelUpdate = (values: { assurance: string }) => {
this.props.actions.walletSettings.updateWalletAssuranceLevel(values);
};
handleWalletUnitUpdate = (values: { unit: number }) => {
this.props.actions.walletSettings.updateWalletUnit(values);
};
=======
static propTypes = {
stores: PropTypes.shape({
uiDialogs: PropTypes.instanceOf(UiDialogsStore).isRequired,
}).isRequired,
actions: PropTypes.shape({
dialogs: PropTypes.shape({
open: PropTypes.func.isRequired,
}).isRequired,
}).isRequired,
};
>>>>>>>
static propTypes = {
stores: PropTypes.shape({
wallets: PropTypes.shape({
active: PropTypes.instanceOf(Wallet),
}),
walletSettings: PropTypes.shape({
updateWalletRequest: PropTypes.instanceOf(Request).isRequired,
WALLET_ASSURANCE_LEVEL_OPTIONS: PropTypes.array.isRequired,
WALLET_UNIT_OPTIONS: PropTypes.array.isRequired,
}),
uiDialogs: PropTypes.instanceOf(UiDialogsStore).isRequired,
}),
actions: PropTypes.shape({
walletSettings: PropTypes.shape({
updateWalletAssuranceLevel: PropTypes.func.isRequired,
updateWalletUnit: PropTypes.func.isRequired,
}).isRequired,
dialogs: PropTypes.shape({
open: PropTypes.func.isRequired,
}).isRequired,
}).isRequired,
};
handleWalletAssuranceLevelUpdate = (values: { assurance: string }) => {
this.props.actions.walletSettings.updateWalletAssuranceLevel(values);
};
handleWalletUnitUpdate = (values: { unit: number }) => {
this.props.actions.walletSettings.updateWalletUnit(values);
};
<<<<<<<
const { wallets, walletSettings } = this.props.stores;
const wallet = wallets.active;
const {
updateWalletRequest,
WALLET_ASSURANCE_LEVEL_OPTIONS,
WALLET_UNIT_OPTIONS,
} = walletSettings;
=======
const { actions } = this.props;
const { uiDialogs } = this.props.stores;
>>>>>>>
const { wallets, walletSettings, uiDialogs } = this.props.stores;
const { actions } = this.props;
const wallet = wallets.active;
const {
updateWalletRequest,
WALLET_ASSURANCE_LEVEL_OPTIONS,
WALLET_UNIT_OPTIONS,
} = walletSettings;
<<<<<<<
<WalletSettings
assuranceLevels={WALLET_ASSURANCE_LEVEL_OPTIONS}
walletAssurance={wallet.assurance}
walletUnit={wallet.unit}
onWalletAssuranceLevelUpdate={this.handleWalletAssuranceLevelUpdate}
onWalletUnitUpdate={this.handleWalletUnitUpdate}
units={WALLET_UNIT_OPTIONS}
error={updateWalletRequest.error}
/>
=======
<WalletSettings
openDialogAction={actions.dialogs.open}
isDialogOpen={uiDialogs.isOpen}
/>
>>>>>>>
<WalletSettings
assuranceLevels={WALLET_ASSURANCE_LEVEL_OPTIONS}
walletAssurance={wallet.assurance}
walletUnit={wallet.unit}
onWalletAssuranceLevelUpdate={this.handleWalletAssuranceLevelUpdate}
onWalletUnitUpdate={this.handleWalletUnitUpdate}
units={WALLET_UNIT_OPTIONS}
error={updateWalletRequest.error}
openDialogAction={actions.dialogs.open}
isDialogOpen={uiDialogs.isOpen}
/> |
<<<<<<<
Logger.debug('AdaApi::getAddresses success', { accounts });
=======
const responseStats = accounts.map(account => (
Object.assign({}, account, { addresses: account.addresses.length })
));
Logger.debug(`AdaApi::getAddresses success: ${stringifyData(responseStats)}`);
>>>>>>>
const response = accounts.map(account => (
Object.assign({}, account, { addresses: account.addresses.length })
));
Logger.debug('AdaApi::getAddresses success', { response });
<<<<<<<
Logger.debug('AdaApi::searchHistory called', { parameters: request });
const { walletId, skip, limit } = request;
=======
const requestTimestamp = moment();
const requestStats = Object.assign({}, request, {
cachedTransactions: request.cachedTransactions.length,
});
Logger.debug(`AdaApi::searchHistory called: ${stringifyData(requestStats)}`);
const {
walletId, skip, limit,
isFirstLoad, // during first load we fetch all wallet's transactions
isRestoreActive, // during restoration we fetch only missing transactions
isRestoreCompleted, // once restoration is done we fetch potentially missing transactions
cachedTransactions,
} = request;
>>>>>>>
const requestTimestamp = moment();
const requestStats = Object.assign({}, request, {
cachedTransactions: request.cachedTransactions.length,
});
Logger.debug('AdaApi::searchHistory called', { parameters: requestStats });
const {
walletId, skip, limit,
isFirstLoad, // during first load we fetch all wallet's transactions
isRestoreActive, // during restoration we fetch only missing transactions
isRestoreCompleted, // once restoration is done we fetch potentially missing transactions
cachedTransactions,
} = request;
<<<<<<<
Logger.debug('AdaApi::searchHistory success', { txnHistory });
=======
const responseStats = {
apiRequested: limit || 'all',
apiFiltered: shouldLoadOnlyFresh ? 'fresh' : '',
apiReturned: totalTransactions,
apiPagesTotal: totalPages,
apiPagesRequested: params.page,
daedalusCached: cachedTransactions.length,
daedalusLoaded: total - cachedTransactions.length,
daedalusTotal: total,
requestDurationInMs: moment.duration(moment().diff(requestTimestamp)).as('milliseconds'),
};
// eslint-disable-next-line max-len
Logger.debug(`AdaApi::searchHistory success: ${total} transactions loaded ${stringifyData(responseStats)}`);
>>>>>>>
const responseStats = {
apiRequested: limit || 'all',
apiFiltered: shouldLoadOnlyFresh ? 'fresh' : '',
apiReturned: totalTransactions,
apiPagesTotal: totalPages,
apiPagesRequested: params.page,
daedalusCached: cachedTransactions.length,
daedalusLoaded: total - cachedTransactions.length,
daedalusTotal: total,
requestDurationInMs: moment.duration(moment().diff(requestTimestamp)).as('milliseconds'),
};
Logger.debug(`AdaApi::searchHistory success: ${total} transactions loaded`, { ...responseStats }); |
<<<<<<<
// ETC specific Request / Response params
=======
export type GetWalletsResponse = Array<Wallet>;
export type ImportWalletRequest = {
name: string,
privateKey: string,
password: ?string,
};
export type ImportWalletResponse = Wallet;
export type CreateWalletRequest = {
name: string,
mnemonic: string,
password: ?string,
};
export type CreateWalletResponse = Wallet;
>>>>>>>
// ETC specific Request / Response params
export type ImportWalletResponse = Wallet;
<<<<<<<
const response: EtcAccounts = await getEtcAccounts({ ca });
Logger.debug('EtcApi::getWallets success: ' + stringifyData(response));
const accounts = response;
=======
const accounts: GetEtcAccountsResponse = await getEtcAccounts({ ca });
Logger.debug('EtcApi::getWallets success: ' + stringifyData(accounts));
>>>>>>>
const accounts: EtcAccounts = await getEtcAccounts({ ca });
Logger.debug('EtcApi::getWallets success: ' + stringifyData(accounts));
<<<<<<<
async createTransaction(params: CreateTransactionRequest): Promise<CreateTransactionResponse> {
Logger.debug('EtcApi::createTransaction called with ' + stringifyData(params));
=======
async createTransaction(params: CreateTransactionRequest): CreateTransactionResponse {
Logger.debug('EtcApi::createTransaction called');
>>>>>>>
async createTransaction(params: CreateTransactionRequest): CreateTransactionResponse {
Logger.debug('EtcApi::createTransaction called');
<<<<<<<
const response: EtcWalletId = await createEtcAccount({
ca, privateKey, password,
});
Logger.debug('EtcApi::restoreWallet success: ' + stringifyData(response));
const id = response;
const amount = quantityToBigNumber('0');
const assurance = 'CWANormal';
const hasPassword = password !== null;
const passwordUpdateDate = hasPassword ? new Date() : null;
await setEtcWalletData({
id, name, assurance, hasPassword, passwordUpdateDate,
});
return new Wallet({ id, name, amount, assurance, hasPassword, passwordUpdateDate });
=======
const wallet: ImportWalletResponse = await this.importWallet({ name, privateKey, password });
Logger.debug('EtcApi::restoreWallet success: ' + stringifyData(wallet));
return wallet;
>>>>>>>
const wallet: ImportWalletResponse = await this.importWallet({ name, privateKey, password });
Logger.debug('EtcApi::restoreWallet success: ' + stringifyData(wallet));
return wallet; |
<<<<<<<
this.wechatWindow.on('close', (e) => {
if (this.wechatWindow.isVisible()) {
e.preventDefault();
this.hide();
}
});
this.wechatWindow.on('page-title-updated', (ev) => {
if (this.loginState.current === this.loginState.NULL) {
this.loginState.current = this.loginState.WAITING;
}
ev.preventDefault();
});
=======
>>>>>>>
<<<<<<<
show() {
this.wechatWindow.show();
this.wechatWindow.focus();
this.wechatWindow.webContents.send('show-wechat-window');
this.isShown = true;
}
hide() {
this.wechatWindow.hide();
this.wechatWindow.webContents.send('hide-wechat-window');
this.isShown = false;
=======
this.wechatWindow.on('page-title-updated', (ev) => {
if (this.loginState.current === this.loginState.NULL) {
this.loginState.current = this.loginState.WAITING;
}
ev.preventDefault();
});
this.wechatWindow.on('show', () => {
this.registerLocalShortcut();
});
>>>>>>>
this.wechatWindow.on('page-title-updated', (ev) => {
if (this.loginState.current === this.loginState.NULL) {
this.loginState.current = this.loginState.WAITING;
}
ev.preventDefault();
});
this.wechatWindow.on('show', () => {
this.registerLocalShortcut();
}); |
<<<<<<<
import ManualUpdateOverlay from './ManualUpdateOverlay';
=======
import StatusIcons from './StatusIcons';
>>>>>>>
import ManualUpdateOverlay from './ManualUpdateOverlay';
import StatusIcons from './StatusIcons';
<<<<<<<
onGetAvailableVersions: Function,
=======
disableDownloadLogs: boolean,
>>>>>>>
onGetAvailableVersions: Function,
disableDownloadLogs: boolean,
<<<<<<<
const { syncingTime, connectingTime } = this.state;
const {
isConnected, isSynced, isNotEnoughDiskSpace,
onGetAvailableVersions, isNewAppVersionLoading, availableAppVersion,
} = this.props;
const canResetSyncing = this._syncingTimerShouldStop(isSynced, isNotEnoughDiskSpace);
const canResetConnecting = this._connectingTimerShouldStop(isConnected, isNotEnoughDiskSpace);
if (canResetSyncing) { this._resetSyncingTime(); }
if (canResetConnecting) { this._resetConnectingTime(); }
const isAppLoadingStuck = (
(!isConnected && connectingTime >= REPORT_ISSUE_TIME_TRIGGER) ||
(isConnected && !isSynced && syncingTime >= REPORT_ISSUE_TIME_TRIGGER)
);
// If app loading is stuck, check if a newer version is available and set flag (state)
if (isAppLoadingStuck && !isNewAppVersionLoading && !availableAppVersion) {
onGetAvailableVersions();
}
=======
const { isConnected, isSynced, isNotEnoughDiskSpace } = this.props;
const canResetSyncing = this._syncingTimerShouldStop(
isSynced,
isNotEnoughDiskSpace
);
const canResetConnecting = this._connectingTimerShouldStop(
isConnected,
isNotEnoughDiskSpace
);
if (canResetSyncing) {
this._resetSyncingTime();
}
if (canResetConnecting) {
this._resetConnectingTime();
}
>>>>>>>
const { syncingTime, connectingTime } = this.state;
const {
isConnected,
isSynced,
isNotEnoughDiskSpace,
onGetAvailableVersions,
isNewAppVersionLoading,
availableAppVersion,
} = this.props;
const canResetSyncing = this._syncingTimerShouldStop(
isSynced,
isNotEnoughDiskSpace
);
const canResetConnecting = this._connectingTimerShouldStop(
isConnected,
isNotEnoughDiskSpace
);
if (canResetSyncing) {
this._resetSyncingTime();
}
if (canResetConnecting) {
this._resetConnectingTime();
}
const isAppLoadingStuck =
(!isConnected && connectingTime >= REPORT_ISSUE_TIME_TRIGGER) ||
(isConnected && !isSynced && syncingTime >= REPORT_ISSUE_TIME_TRIGGER);
// If app loading is stuck, check if a newer version is available and set flag (state)
if (isAppLoadingStuck && !isNewAppVersionLoading && !availableAppVersion) {
onGetAvailableVersions();
}
<<<<<<<
isNewAppVersionAvailable,
currentAppVersion,
availableAppVersion,
isNewAppVersionLoading,
onExternalLinkClick,
=======
disableDownloadLogs,
isNodeResponding,
isNodeSubscribed,
isNodeSyncing,
isNodeTimeCorrect,
isCheckingSystemTime,
>>>>>>>
disableDownloadLogs,
isNodeResponding,
isNodeSubscribed,
isNodeSyncing,
isNodeTimeCorrect,
isCheckingSystemTime,
isNewAppVersionAvailable,
currentAppVersion,
availableAppVersion,
isNewAppVersionLoading,
onExternalLinkClick,
<<<<<<<
const canReportConnectingIssue = (
!isConnected && (
connectingTime >= REPORT_ISSUE_TIME_TRIGGER ||
cardanoNodeState === CardanoNodeStates.UNRECOVERABLE
)
);
const canReportSyncingIssue = (
isConnected && !isSynced && syncingTime >= REPORT_ISSUE_TIME_TRIGGER
);
const showReportIssue = (
!isNewAppVersionAvailable && !isNewAppVersionLoading &&
(canReportConnectingIssue || canReportSyncingIssue)
);
=======
const canReportConnectingIssue =
!isConnected &&
(connectingTime >= REPORT_ISSUE_TIME_TRIGGER ||
cardanoNodeState === CardanoNodeStates.UNRECOVERABLE);
const canReportSyncingIssue =
isConnected && !isSynced && syncingTime >= REPORT_ISSUE_TIME_TRIGGER;
const showReportIssue = canReportConnectingIssue || canReportSyncingIssue;
>>>>>>>
const canReportConnectingIssue =
!isConnected &&
(connectingTime >= REPORT_ISSUE_TIME_TRIGGER ||
cardanoNodeState === CardanoNodeStates.UNRECOVERABLE);
const canReportSyncingIssue =
isConnected && !isSynced && syncingTime >= REPORT_ISSUE_TIME_TRIGGER;
const showReportIssue =
!isNewAppVersionAvailable &&
!isNewAppVersionLoading &&
(canReportConnectingIssue || canReportSyncingIssue);
<<<<<<<
{isNewAppVersionAvailable && (
<ManualUpdateOverlay
currentAppVersion={currentAppVersion}
availableAppVersion={availableAppVersion}
onExternalLinkClick={onExternalLinkClick}
/>
)}
=======
<StatusIcons
nodeState={cardanoNodeState}
isNodeResponding={isNodeResponding}
isNodeSubscribed={isNodeSubscribed}
isNodeTimeCorrect={isNodeTimeCheckedAndCorrect}
isNodeSyncing={isNodeSyncing}
/>
>>>>>>>
{isNewAppVersionAvailable && (
<ManualUpdateOverlay
currentAppVersion={currentAppVersion}
availableAppVersion={availableAppVersion}
onExternalLinkClick={onExternalLinkClick}
/>
)}
<StatusIcons
nodeState={cardanoNodeState}
isNodeResponding={isNodeResponding}
isNodeSubscribed={isNodeSubscribed}
isNodeTimeCorrect={isNodeTimeCheckedAndCorrect}
isNodeSyncing={isNodeSyncing}
/> |
<<<<<<<
props: {
onSubmit: Function,
onCancel: Function,
isSubmitting: boolean,
mnemonicValidator: Function,
error?: ?LocalizableError,
suggestedMnemonics: Array<string>,
};
=======
>>>>>>> |
<<<<<<<
const DOWNLOAD_LOGS_PROGRESS_NOTIFICATION_ID = 'settings-page-download-logs-progress';
const DOWNLOAD_LOGS_SUCCESS_NOTIFICATION_ID = 'settings-page-download-logs-success';
@inject('stores', 'actions') @observer
=======
@inject('stores', 'actions')
@observer
>>>>>>>
const DOWNLOAD_LOGS_PROGRESS_NOTIFICATION_ID =
'settings-page-download-logs-progress';
const DOWNLOAD_LOGS_SUCCESS_NOTIFICATION_ID =
'settings-page-download-logs-success';
@inject('stores', 'actions')
@observer
<<<<<<<
handleSupportRequestClick = async (event: SyntheticEvent<HTMLButtonElement>) => {
=======
constructor(props: any, context: any) {
super(props);
this.context = context;
this.registerOnDownloadLogsNotification();
}
componentWillUnmount() {
const { profile } = this.props.actions;
profile.downloadLogs.remove(this.openNotification);
this.closeNotification();
}
handleSupportRequestClick = async (
event: SyntheticEvent<HTMLButtonElement>
) => {
>>>>>>>
handleSupportRequestClick = async (
event: SyntheticEvent<HTMLButtonElement>
) => {
<<<<<<<
=======
closeNotification = () => {
const { id } = this.notification;
this.props.actions.notifications.closeActiveNotification.trigger({ id });
};
render() {
const { stores } = this.props;
const { id, message } = this.notification;
>>>>>>> |
<<<<<<<
const { email, subject, problem, compressedLogsFile } = requestFormData;
const reportUrl = url.parse(environment.REPORT_URL);
let platform;
switch (environment.platform) {
case 'darwin':
platform = 'macOS';
break;
case 'win32':
platform = 'Windows';
break;
case 'linux':
platform = 'Linux';
break;
default:
platform = '';
}
=======
const { email, subject, problem, compressedLog } = requestFormData;
const { version, os, buildNumber, REPORT_URL } = environment;
const reportUrl = url.parse(REPORT_URL);
>>>>>>>
const { email, subject, problem, compressedLogsFile } = requestFormData;
const { version, os, buildNumber, REPORT_URL } = environment;
const reportUrl = url.parse(REPORT_URL);
const { hostname, port } = reportUrl;
<<<<<<<
version: environment.version,
build: environment.build,
os: platform,
compressedLogsFile,
=======
version,
build: buildNumber,
os,
compressedLog,
>>>>>>>
version,
build: buildNumber,
os,
compressedLogsFile, |
<<<<<<<
import {
launcherConfig,
frontendOnlyMode,
pubLogsFolderPath,
APP_NAME,
} from './config';
=======
import { launcherConfig, frontendOnlyMode, stateDirectoryPath } from './config';
>>>>>>>
import {
launcherConfig,
frontendOnlyMode,
pubLogsFolderPath,
APP_NAME,
stateDirectoryPath
} from './config'; |
<<<<<<<
osxMenu(
app,
mainWindow,
menuActions,
isInSafeMode,
translations,
supportRequestData
)
=======
osxMenu(app, mainWindow, menuActions, translations)
>>>>>>>
osxMenu(app, mainWindow, menuActions, translations, supportRequestData)
<<<<<<<
winLinuxMenu(
app,
mainWindow,
menuActions,
isInSafeMode,
translations,
supportRequestData
)
=======
winLinuxMenu(app, mainWindow, menuActions, translations)
>>>>>>>
winLinuxMenu(
app,
mainWindow,
menuActions,
translations,
supportRequestData
) |
<<<<<<<
import type { GetEtcAccountBalanceResponse } from './getEtcAccountBalance';
import type { CreateEtcAccountResponse } from './createEtcAccount';
=======
import type { GetEtcAccountBalanceResponse } from './getEtcAccountBalance';
import Wallet from '../../domain/Wallet';
import { toBigNumber } from './lib/utils';
>>>>>>>
import type { GetEtcAccountBalanceResponse } from './getEtcAccountBalance';
import type { CreateEtcAccountResponse } from './createEtcAccount';
import Wallet from '../../domain/Wallet';
import { toBigNumber } from './lib/utils'; |
<<<<<<<
options?: Array<{
value: number | string,
label: string,
isLegacy?: boolean,
}>,
=======
options: Array<{ value: number | string, label: string }>,
>>>>>>>
options: Array<{
value: number | string,
label: string,
isLegacy?: boolean,
}>,
<<<<<<<
onChange={({ value }) => onChange(value)}
options={filteredOptions}
skin={SelectSkin}
themeOverrides={selectStyles}
value={activeItem}
=======
onItemSelected={({ value }) => {
onChange(value);
}}
optionRenderer={o => (
<div className={styles.optionLabel}>{o.label}</div>
)}
items={options}
activeItem={options.find(o => o.value === activeItem)}
noArrow
>>>>>>>
onItemSelected={({ value }) => {
onChange(value);
}}
optionRenderer={o => (
<div className={styles.optionLabel}>{o.label}</div>
)}
items={filteredOptions}
activeItem={options.find(o => o.value === activeItem)}
noArrow |
<<<<<<<
import type { GetSyncProgressResponse, GetWalletRecoveryPhraseResponse } from '../common';
import { isValidMnemonic } from '../../../lib/decrypt';
=======
>>>>>>>
import { isValidMnemonic } from '../../../lib/decrypt';
<<<<<<<
import { getAdaWallets } from './getAdaWallets';
import { changeAdaWalletPassphrase } from './changeAdaWalletPassphrase';
import { deleteAdaWallet } from './deleteAdaWallet';
import { newAdaWallet } from './newAdaWallet';
import { newAdaWalletAddress } from './newAdaWalletAddress';
import { restoreAdaWallet } from './restoreAdaWallet';
import { updateAdaWallet } from './updateAdaWallet';
import { exportAdaBackupJSON } from './exportAdaBackupJSON';
import { importAdaBackupJSON } from './importAdaBackupJSON';
import { importAdaWallet } from './importAdaWallet';
import { getAdaWalletAccounts } from './getAdaWalletAccounts';
import { isValidAdaAddress } from './isValidAdaAddress';
import { adaTxFee } from './adaTxFee';
import { newAdaPayment } from './newAdaPayment';
import { redeemAda } from './redeemAda';
import { redeemAdaPaperVend } from './redeemAdaPaperVend';
import { nextAdaUpdate } from './nextAdaUpdate';
import { postponeAdaUpdate } from './postponeAdaUpdate';
import { applyAdaUpdate } from './applyAdaUpdate';
import { adaTestReset } from './adaTestReset';
import { getAdaHistoryByWallet } from './getAdaHistoryByWallet';
import { getAdaAccountRecoveryPhrase } from './getAdaAccountRecoveryPhrase';
=======
// import { makePayment } from './js-api/makePayment';
import type {
GetSyncProgressResponse,
GetWalletRecoveryPhraseResponse,
GetTransactionsParams,
GetTransactionsResponse,
} from '../common';
>>>>>>>
import { getAdaWallets } from './getAdaWallets';
import { changeAdaWalletPassphrase } from './changeAdaWalletPassphrase';
import { deleteAdaWallet } from './deleteAdaWallet';
import { newAdaWallet } from './newAdaWallet';
import { newAdaWalletAddress } from './newAdaWalletAddress';
import { restoreAdaWallet } from './restoreAdaWallet';
import { updateAdaWallet } from './updateAdaWallet';
import { exportAdaBackupJSON } from './exportAdaBackupJSON';
import { importAdaBackupJSON } from './importAdaBackupJSON';
import { importAdaWallet } from './importAdaWallet';
import { getAdaWalletAccounts } from './getAdaWalletAccounts';
import { isValidAdaAddress } from './isValidAdaAddress';
import { adaTxFee } from './adaTxFee';
import { newAdaPayment } from './newAdaPayment';
import { redeemAda } from './redeemAda';
import { redeemAdaPaperVend } from './redeemAdaPaperVend';
import { nextAdaUpdate } from './nextAdaUpdate';
import { postponeAdaUpdate } from './postponeAdaUpdate';
import { applyAdaUpdate } from './applyAdaUpdate';
import { adaTestReset } from './adaTestReset';
import { getAdaHistoryByWallet } from './getAdaHistoryByWallet';
import { getAdaAccountRecoveryPhrase } from './getAdaAccountRecoveryPhrase';
import type {
GetSyncProgressResponse,
GetWalletRecoveryPhraseResponse,
GetTransactionsParams,
GetTransactionsResponse,
} from '../common';
<<<<<<<
async getTransactions(request: GetTransactionsRequest): Promise<GetTransactionsResponse> {
Logger.debug('AdaApi::searchHistory called: ' + stringifyData(request));
=======
async getTransactions(request: GetTransactionsParams): Promise<GetTransactionsResponse> {
Logger.debug('CardanoClientApi::searchHistory called: ' + stringifyData(request));
>>>>>>>
async getTransactions(request: GetTransactionsParams): Promise<GetTransactionsResponse> {
Logger.debug('AdaApi::searchHistory called: ' + stringifyData(request)); |
<<<<<<<
};
export const formattedDateTime = (
dateTime: Date,
{
currentLocale,
currentDateFormat,
currentTimeFormat,
}: {
currentLocale: Locale,
currentDateFormat: string,
currentTimeFormat: string,
}
) => {
moment.locale(momentLocales[currentLocale]);
const dateTimeMoment = moment(dateTime);
const dateFormatted = dateTimeMoment.format(currentDateFormat);
const timeFormatted = dateTimeMoment.format(currentTimeFormat);
if (currentLocale === LOCALES.english) {
return `${dateFormatted}, ${timeFormatted}`;
}
return `${dateFormatted}${timeFormatted}`;
};
=======
};
export const getMultiplierFromDecimalPlaces = (decimalPlaces: number) =>
'1'.padEnd(decimalPlaces + 1, '0');
>>>>>>>
};
export const formattedDateTime = (
dateTime: Date,
{
currentLocale,
currentDateFormat,
currentTimeFormat,
}: {
currentLocale: Locale,
currentDateFormat: string,
currentTimeFormat: string,
}
) => {
moment.locale(momentLocales[currentLocale]);
const dateTimeMoment = moment(dateTime);
const dateFormatted = dateTimeMoment.format(currentDateFormat);
const timeFormatted = dateTimeMoment.format(currentTimeFormat);
if (currentLocale === LOCALES.english) {
return `${dateFormatted}, ${timeFormatted}`;
}
return `${dateFormatted}${timeFormatted}`;
};
export const getMultiplierFromDecimalPlaces = (decimalPlaces: number) =>
'1'.padEnd(decimalPlaces + 1, '0'); |
<<<<<<<
isConnecting,
isSyncing,
localTimeDifference,
syncPercentage,
isLoadingWallets,
hasBeenConnected,
hasBlockSyncingStarted,
ALLOWED_TIME_DIFFERENCE,
=======
isConnecting, isSyncing, syncPercentage, isLoadingWallets,
hasBeenConnected, hasBlockSyncingStarted,
>>>>>>>
isConnecting, isSyncing, syncPercentage, isLoadingWallets,
hasBeenConnected, hasBlockSyncingStarted, localTimeDifference,
ALLOWED_TIME_DIFFERENCE,
<<<<<<<
const {
hasLoadedCurrentLocale,
hasLoadedCurrentTheme,
currentLocale,
} = stores.app;
=======
const { hasLoadedCurrentLocale, hasLoadedCurrentTheme } = stores.profile;
>>>>>>>
const { hasLoadedCurrentLocale, hasLoadedCurrentTheme, currentLocale } = stores.profile; |
<<<<<<<
import { makeEnvironmentGlobal } from './utils/makeEnvironmentGlobal';
import { getNumberOfEpochsConsolidated } from './utils/getNumberOfEpochsConsolidated';
=======
import { handleDiskSpace } from './utils/handleDiskSpace';
>>>>>>>
import { makeEnvironmentGlobal } from './utils/makeEnvironmentGlobal';
import { getNumberOfEpochsConsolidated } from './utils/getNumberOfEpochsConsolidated';
import { handleDiskSpace } from './utils/handleDiskSpace';
<<<<<<<
import environment from '../common/environment';
import { OPEN_ABOUT_DIALOG_CHANNEL } from '../common/ipc/open-about-dialog';
import { GO_TO_ADA_REDEMPTION_SCREEN_CHANNEL } from '../common/ipc/go-to-ada-redemption-screen';
import { GO_TO_NETWORK_STATUS_SCREEN_CHANNEL } from '../common/ipc/go-to-network-status-screen';
import { GO_TO_BLOCK_CONSOLIDATION_STATUS_CHANNEL } from '../common/ipc/go-to-block-consolidation-status-screen';
import { getSystemStartTimeChannel } from './ipc/getSystemStartTime.ipc';
=======
import { environment } from './environment';
>>>>>>>
import { getSystemStartTimeChannel } from './ipc/getSystemStartTime.ipc';
import { environment } from './environment';
<<<<<<<
const openAbout = () => {
if (mainWindow) mainWindow.webContents.send(OPEN_ABOUT_DIALOG_CHANNEL);
};
const goToAdaRedemption = () => {
if (mainWindow) mainWindow.webContents.send(GO_TO_ADA_REDEMPTION_SCREEN_CHANNEL);
};
const goToNetworkStatus = () => {
if (mainWindow) mainWindow.webContents.send(GO_TO_NETWORK_STATUS_SCREEN_CHANNEL);
};
const goBlockConsolidationStatus = () => {
if (mainWindow) {
mainWindow.webContents.send(
GO_TO_BLOCK_CONSOLIDATION_STATUS_CHANNEL,
launcherConfig.configuration.systemStart
);
}
};
const restartInSafeMode = async () => {
Logger.info('restarting in SafeMode …');
if (cardanoNode) await cardanoNode.stop();
Logger.info('Exiting Daedalus with code 21.');
safeExitWithCode(21);
};
const restartWithoutSafeMode = async () => {
Logger.info('restarting without SafeMode …');
if (cardanoNode) await cardanoNode.stop();
Logger.info('Exiting Daedalus with code 22.');
safeExitWithCode(22);
};
const menuActions = {
openAbout,
goToAdaRedemption,
goToNetworkStatus,
goBlockConsolidationStatus,
restartInSafeMode,
restartWithoutSafeMode,
};
=======
const { isDev, isWatchMode, buildLabel, network } = environment;
>>>>>>>
const { isDev, isWatchMode, buildLabel, network } = environment;
<<<<<<<
getSystemStartTimeChannel.onReceive(() => {
const systemStart = launcherConfig.configuration.systemStart;
getSystemStartTimeChannel.send(parseInt(systemStart, 10), mainWindow.webContents);
});
getNumberOfEpochsConsolidated(mainWindow);
// Build app menus
let menu;
if (process.platform === 'darwin') {
menu = Menu.buildFromTemplate(osxMenu(app, mainWindow, menuActions, isInSafeMode));
Menu.setApplicationMenu(menu);
} else {
menu = Menu.buildFromTemplate(winLinuxMenu(app, mainWindow, menuActions, isInSafeMode));
mainWindow.setMenu(menu);
}
// Hide application window on Cmd+H hotkey (OSX only!)
if (process.platform === 'darwin') {
app.on('activate', () => {
if (!mainWindow.isVisible()) app.show();
});
mainWindow.on('focus', () => {
globalShortcut.register('CommandOrControl+H', app.hide);
});
mainWindow.on('blur', () => {
globalShortcut.unregister('CommandOrControl+H');
});
}
=======
>>>>>>>
getSystemStartTimeChannel.onReceive(() => {
const systemStart = launcherConfig.configuration.systemStart;
getSystemStartTimeChannel.send(parseInt(systemStart, 10), mainWindow.webContents);
});
getNumberOfEpochsConsolidated(mainWindow); |
<<<<<<<
).href = this.GetCodeThemeLink(codeBlockTheme)
this.getWindow().document.getElementById('style').innerHTML = buildStyle({
=======
).href = this.getCodeThemeLink(codeBlockTheme)
this.getWindow().document.getElementById('style').innerHTML = buildStyle(
>>>>>>>
).href = this.getCodeThemeLink(codeBlockTheme)
this.getWindow().document.getElementById('style').innerHTML = buildStyle({ |
<<<<<<<
const { sidebar } = stores;
const activeWallet = stores.ada.wallets.active;
=======
const { nodeUpdate, sidebar, wallets } = stores;
const activeWallet = wallets.active;
>>>>>>>
const { sidebar } = stores;
const wallets = stores.ada.wallets;
const activeWallet = wallets.active;
<<<<<<<
const isNodeUpdateAvailable = this.props.stores.ada.nodeUpdate.isUpdateAvailable;
const isUpdatePostponed = this.props.stores.ada.nodeUpdate.isUpdatePostponed;
=======
const isNodeUpdateAvailable = nodeUpdate.isUpdateAvailable;
const isUpdatePostponed = nodeUpdate.isUpdatePostponed;
const { isImportActive, isRestoreActive } = wallets;
>>>>>>>
const isNodeUpdateAvailable = this.props.stores.ada.nodeUpdate.isUpdateAvailable;
const isUpdatePostponed = this.props.stores.ada.nodeUpdate.isUpdatePostponed;
const { isImportActive, isRestoreActive } = wallets; |
<<<<<<<
cors: true
=======
https: true,
>>>>>>>
cors: true,
https: true |
<<<<<<<
onMouseUp={this.submit.bind(this)}
skin={ButtonSkin}
=======
onClick={this.submit.bind(this)}
skin={<SimpleButtonSkin />}
>>>>>>>
skin={ButtonSkin}
onClick={this.submit.bind(this)} |
<<<<<<<
import type { GetSyncProgressResponse, GetWalletRecoveryPhraseResponse } from '../common';
import { GenericApiError } from '../common';
import { isValidMnemonic } from '../../../lib/decrypt';
=======
import type { GetSyncProgressResponse, GetWalletRecoveryPhraseResponse } from '../common';
import {
GenericApiError, IncorrectWalletPasswordError,
WalletAlreadyRestoredError,
} from '../common';
>>>>>>>
import type { GetSyncProgressResponse, GetWalletRecoveryPhraseResponse } from '../common';
import { isValidMnemonic } from '../../../lib/decrypt';
import {
GenericApiError, IncorrectWalletPasswordError,
WalletAlreadyRestoredError,
} from '../common';
<<<<<<<
=======
>>>>>>> |
<<<<<<<
'--theme-staking-decentralization-progress-stripe-dark-1-background-color':
'#34465e',
'--theme-staking-decentralization-progress-stripe-dark-2-background-color':
'#445b7c',
'--theme-staking-donut-ring-completed-color': '#ea4c5b',
'--theme-staking-donut-ring-remaining-color': '#f8e9eb',
'--theme-staking-wallet-row-border-color': '#dfe4e8',
=======
'--theme-staking-progress-stripe-dark-1-background-color': '#34465e',
'--theme-staking-progress-stripe-dark-2-background-color': '#445b7c',
'--theme-staking-table-body-highlighted-text-color': '#296fd0',
>>>>>>>
'--theme-staking-progress-stripe-dark-1-background-color': '#34465e',
'--theme-staking-progress-stripe-dark-2-background-color': '#445b7c',
'--theme-staking-table-body-highlighted-text-color': '#296fd0',
'--theme-staking-donut-ring-completed-color': '#ea4c5b',
'--theme-staking-donut-ring-remaining-color': '#f8e9eb',
'--theme-staking-wallet-row-border-color': '#dfe4e8', |
<<<<<<<
import type { AssuranceMode, AssuranceModeOption, AssuranceModeOptionV0 } from '../types/transactionAssuranceTypes';
=======
import type { AssuranceMode, AssuranceModeOption, AssuranceModeOptionV1 } from '../types/transactionAssuranceTypes';
>>>>>>>
import type {
AssuranceMode,
AssuranceModeOptionV1,
AssuranceModeOptionV0
} from '../types/transactionAssuranceTypes';
import { assuranceModeOptionsV1, assuranceModes } from '../types/transactionAssuranceTypes';
<<<<<<<
@observable assurance: AssuranceModeOption | AssuranceModeOptionV0;
=======
@observable assurance: AssuranceModeOptionV1 | AssuranceModeOption;
>>>>>>>
@observable assurance: AssuranceModeOptionV1 | AssuranceModeOptionV0;
<<<<<<<
assurance: AssuranceModeOption | AssuranceModeOptionV0,
=======
assurance: AssuranceModeOptionV1 | AssuranceModeOption,
>>>>>>>
assurance: AssuranceModeOptionV1 | AssuranceModeOptionV0, |
<<<<<<<
import { ROUTES } from '../routes-config';
=======
import { Logger } from '../lib/logger';
import { ROUTES } from '../Routes';
>>>>>>>
import { ROUTES } from '../routes-config';
import { Logger } from '../lib/logger'; |
<<<<<<<
import { remote } from 'electron';
import { version } from '../../package.json';
=======
// Only require electron / remote if we are in a node.js environment
let remote;
if (module && module.require) {
remote = module.require('electron').remote;
}
>>>>>>>
import { version } from '../../package.json';
// Only require electron / remote if we are in a node.js environment
let remote;
if (module && module.require) {
remote = module.require('electron').remote;
} |
<<<<<<<
CreateWalletRequest,
GetTransactionsRequest,
CreateTransactionRequest,
RestoreWalletRequest,
UpdateWalletRequest,
RedeemAdaRequest,
ImportKeyRequest,
DeleteWalletRequest
=======
createWalletRequest,
getTransactionsRequest,
createTransactionRequest,
walletRestoreRequest,
walletUpdateRequest,
redeemAdaRequest,
redeemPaperVendedAdaRequest,
importKeyRequest,
deleteWalletRequest,
>>>>>>>
CreateWalletRequest,
GetTransactionsRequest,
CreateTransactionRequest,
RestoreWalletRequest,
UpdateWalletRequest,
RedeemAdaRequest,
ImportKeyRequest,
DeleteWalletRequest,
RedeemPaperVendedAdaRequest,
ChangeWalletPasswordRequest,
ChangeWalletPasswordResponse,
SetWalletPasswordRequest,
SetWalletPasswordResponse,
<<<<<<<
async getTransactions(request: GetTransactionsRequest) {
=======
async getTransactions(request: getTransactionsRequest) {
Log.debug('CardanoClientApi::searchHistory called: ', request);
>>>>>>>
async getTransactions(request: GetTransactionsRequest) {
Log.debug('CardanoClientApi::searchHistory called: ', request);
<<<<<<<
async createTransaction(request: CreateTransactionRequest) {
Log.debug('CardanoClientApi::createTransaction called with', request);
=======
async createTransaction(request: createTransactionRequest) {
Log.debug('CardanoClientApi::createTransaction called: ', request);
>>>>>>>
async createTransaction(request: CreateTransactionRequest) {
Log.debug('CardanoClientApi::createTransaction called: ', request);
<<<<<<<
async restoreWallet(request: RestoreWalletRequest) {
=======
async restoreWallet(request: walletRestoreRequest) {
Log.debug('CardanoClientApi::restoreWallet called');
>>>>>>>
async restoreWallet(request: RestoreWalletRequest) {
Log.debug('CardanoClientApi::restoreWallet called');
<<<<<<<
async importWalletFromKey(request: ImportKeyRequest) {
Log.debug('CardanoClientApi::importWalletFromKey called with', request);
=======
async importWalletFromKey(request: importKeyRequest) {
Log.debug('CardanoClientApi::importWalletFromKey called');
>>>>>>>
async importWalletFromKey(request: ImportKeyRequest) {
Log.debug('CardanoClientApi::importWalletFromKey called');
<<<<<<<
async redeemAda(request: RedeemAdaRequest) {
=======
async redeemAda(request: redeemAdaRequest) {
Log.debug('CardanoClientApi::redeemAda called');
>>>>>>>
async redeemAda(request: RedeemAdaRequest) {
Log.debug('CardanoClientApi::redeemAda called');
<<<<<<<
=======
// PRIVATE
_onNotify = (rawMessage: string) => {
Log.debug('CardanoClientApi::notify message: ', rawMessage);
// TODO: "ConnectionClosed" messages are not JSON parsable … so we need to catch that case here!
let message = rawMessage;
if (message !== 'ConnectionClosed') {
message = JSON.parse(rawMessage);
}
this.notifyCallbacks.forEach(cb => cb.message(message));
};
_onNotifyError = (error: Error) => {
Log.error('CardanoClientApi::notify error: ', error);
this.notifyCallbacks.forEach(cb => cb.error(error));
};
>>>>>>>
// PRIVATE
_onNotify = (rawMessage: string) => {
Log.debug('CardanoClientApi::notify message: ', rawMessage);
// TODO: "ConnectionClosed" messages are not JSON parsable … so we need to catch that case here!
let message = rawMessage;
if (message !== 'ConnectionClosed') {
message = JSON.parse(rawMessage);
}
this.notifyCallbacks.forEach(cb => cb.message(message));
};
_onNotifyError = (error: Error) => {
Log.error('CardanoClientApi::notify error: ', error);
this.notifyCallbacks.forEach(cb => cb.error(error));
};
<<<<<<<
async updateWallet(request: UpdateWalletRequest) {
=======
async updateWallet(request: walletUpdateRequest) {
Log.debug('CardanoClientApi::updateWallet called: ', request);
>>>>>>>
async updateWallet(request: UpdateWalletRequest) {
Log.debug('CardanoClientApi::updateWallet called: ', request); |
<<<<<<<
import psList from 'ps-list';
import { isObject, toInteger } from 'lodash';
import { environment } from '../../common/environment';
=======
import { toInteger } from 'lodash';
import environment from '../../common/environment';
>>>>>>>
import { toInteger } from 'lodash';
import { environment } from '../../common/environment'; |
<<<<<<<
export type ImportWalletFromFileResponse = Wallet;
export type NodeSettings = {
slotDuration: {
quantity: number,
unit?: 'milliseconds'
},
softwareInfo: {
version: number,
applicationName: string
},
projectVersion: string,
gitRevision: string
};
=======
export type ImportWalletFromFileResponse = AdaWalletV0;
>>>>>>>
export type ImportWalletFromFileResponse = AdaWalletV0;
export type NodeSettings = {
slotDuration: {
quantity: number,
unit?: 'milliseconds'
},
softwareInfo: {
version: number,
applicationName: string
},
projectVersion: string,
gitRevision: string
}; |
<<<<<<<
import linkNewWindow from '../../assets/images/link-ic.inline.svg';
import { CardanoNodeStates } from '../../../../common/types/cardanoNode.types';
=======
import { CardanoNodeStates } from '../../../../common/types/cardano-node.types';
>>>>>>>
import linkNewWindow from '../../assets/images/link-ic.inline.svg';
import { CardanoNodeStates } from '../../../../common/types/cardano-node.types'; |
<<<<<<<
};
=======
};
isDisabled = () => this._isCalculatingFee || !this.state.isTransactionFeeCalculated;
>>>>>>>
};
isDisabled = () => this._isCalculatingFee || !this.state.isTransactionFeeCalculated;
<<<<<<<
disabled={this._isCalculatingFee || !isTransactionFeeCalculated}
skin={ButtonSkin}
=======
disabled={this.isDisabled()}
skin={<SimpleButtonSkin />}
>>>>>>>
skin={ButtonSkin}
disabled={this.isDisabled()} |
<<<<<<<
@observable assurance: AssuranceModeOption;
=======
@observable assurance: AssuranceMode;
@observable hasPassword: bool;
@observable passwordUpdateDate: ?Date;
>>>>>>>
@observable assurance: AssuranceModeOption;
@observable hasPassword: bool;
@observable passwordUpdateDate: ?Date;
<<<<<<<
assurance: AssuranceModeOption,
=======
assuranceMode: AssuranceMode,
hasPassword: bool,
passwordUpdateDate: ?Date,
>>>>>>>
assurance: AssuranceModeOption,
hasPassword: bool,
passwordUpdateDate: ?Date, |
<<<<<<<
requestFormData: {
email: string,
subject: string,
problem: string,
logs: Array<string>,
},
environmentData: {
network: string,
version: string,
os: string,
apiVersion: string,
build: string,
installerVersion: string,
reportURL: string,
}
=======
email: string,
subject: string,
problem: string,
compressedLogsFile: string,
>>>>>>>
requestFormData: {
email: string,
subject: string,
problem: string,
compressedLogsFile: string,
},
environmentData: {
network: string,
version: string,
os: string,
apiVersion: string,
build: string,
installerVersion: string,
reportURL: string,
} |
<<<<<<<
this._socket = new WebSocket(this._url, null, this._origin ? {headers:{origin: this._origin}} : {})
=======
this._socket = new WebSocket(this._url, [], {origin: this._origin})
>>>>>>>
this._socket = new WebSocket(this._url, [], this._origin ? {headers:{origin: this._origin}} : {}) |
<<<<<<<
const { data, location, config } = this.props
const { note, editorType, isStacking } = this.state
=======
const { data, dispatch, location, config } = this.props
const { note, editorType } = this.state
>>>>>>>
const { data, dispatch, location, config } = this.props
const { note, editorType, isStacking } = this.state |
<<<<<<<
skin={InputSkin}
=======
skin={<SimpleInputSkin />}
onKeyPress={submitOnEnter.bind(this, this.submit)}
>>>>>>>
skin={InputSkin}
onKeyPress={submitOnEnter.bind(this, this.submit)} |
<<<<<<<
import { compressLogsChannel, downloadLogsChannel, getLogsChannel } from '../ipc/logs.ipc';
import { detectSystemLocaleChannel } from '../ipc/detect-system-locale';
import { LOCALES } from '../../../common/types/locales.types';
=======
import {
compressLogsChannel,
downloadLogsChannel,
getLogsChannel,
} from '../ipc/logs.ipc';
>>>>>>>
import { detectSystemLocaleChannel } from '../ipc/detect-system-locale';
import { LOCALES } from '../../../common/types/locales.types';
import {
compressLogsChannel,
downloadLogsChannel,
getLogsChannel,
} from '../ipc/logs.ipc'; |
<<<<<<<
OPEN_ABOUT_DIALOG_CHANNEL,
GO_TO_ADA_REDEMPTION_SCREEN_CHANNEL,
GO_TO_NETWORK_STATUS_SCREEN_CHANNEL,
GO_TO_BLOCK_CONSOLIDATION_STATUS_CHANNEL
=======
TOGGLE_ABOUT_DIALOG_CHANNEL,
TOGGLE_NETWORK_STATUS_DIALOG_CHANNEL,
GO_TO_ADA_REDEMPTION_SCREEN_CHANNEL
>>>>>>>
TOGGLE_ABOUT_DIALOG_CHANNEL,
TOGGLE_NETWORK_STATUS_DIALOG_CHANNEL,
GO_TO_ADA_REDEMPTION_SCREEN_CHANNEL,
GO_TO_BLOCK_CONSOLIDATION_STATUS_CHANNEL
<<<<<<<
ipcRenderer.on(GO_TO_NETWORK_STATUS_SCREEN_CHANNEL, this._goToNetworkStatusScreen);
ipcRenderer.on(
GO_TO_BLOCK_CONSOLIDATION_STATUS_CHANNEL,
this._goToBlockConsolidationStatusScreen
);
=======
ipcRenderer.on(TOGGLE_NETWORK_STATUS_DIALOG_CHANNEL, this._toggleNetworkStatusDialog);
>>>>>>>
ipcRenderer.on(GO_TO_BLOCK_CONSOLIDATION_STATUS_CHANNEL, this._goToBlockConsolidationStatusScreen);
<<<<<<<
ipcRenderer.removeListener(GO_TO_NETWORK_STATUS_SCREEN_CHANNEL, this._goToNetworkStatusScreen);
ipcRenderer.removeListener(
GO_TO_BLOCK_CONSOLIDATION_STATUS_CHANNEL,
this._goToBlockConsolidationStatusScreen
);
=======
ipcRenderer.removeListener(TOGGLE_NETWORK_STATUS_DIALOG_CHANNEL, this._toggleNetworkStatusDialog);
/* eslint-disable max-len */
>>>>>>>
ipcRenderer.removeListener(GO_TO_BLOCK_CONSOLIDATION_STATUS_CHANNEL, this._goToBlockConsolidationStatusScreen);
/* eslint-disable max-len */
<<<<<<<
@computed get isNetworkStatusPage(): boolean {
return this.currentRoute === ROUTES.NETWORK_STATUS;
}
@computed get isBlockConsolidationStatusPage(): boolean {
return this.currentRoute === ROUTES.BLOCK_CONSOLIDATION_STATUS;
}
@action _goToNetworkStatusScreen = () => {
const route = this.isNetworkStatusPage ? ROUTES.ROOT : ROUTES.NETWORK_STATUS;
this.actions.router.goToRoute.trigger({ route });
};
@action _goToBlockConsolidationStatusScreen = () => {
const route = this.isBlockConsolidationStatusPage
? ROUTES.ROOT
: ROUTES.BLOCK_CONSOLIDATION_STATUS;
this.actions.router.goToRoute.trigger({ route });
};
=======
>>>>>>>
@action _goToBlockConsolidationStatusScreen = () => {
const route = this.isBlockConsolidationStatusPage
? ROUTES.ROOT
: ROUTES.BLOCK_CONSOLIDATION_STATUS;
this.actions.router.goToRoute.trigger({ route });
};
@computed get isBlockConsolidationStatusPage(): boolean {
return this.currentRoute === ROUTES.BLOCK_CONSOLIDATION_STATUS;
}
@computed get isSetupPage(): boolean {
return (
this.currentRoute === ROUTES.PROFILE.LANGUAGE_SELECTION ||
this.currentRoute === ROUTES.PROFILE.TERMS_OF_USE
);
} |
<<<<<<<
defaultMessage: '!!!If you are experiencing a problem, please look for guidance using the list of {faqLink} on the support pages. If you can’t find a solution, please submit a support ticket.',
description: 'Content for the "Help and support" section on the support settings page.',
=======
defaultMessage:
'!!!If you are experiencing issues, for guidance please see the {faqLink} article in the Support Portal.',
description:
'Content for the "Help and support" section on the support settings page.',
>>>>>>>
defaultMessage:
'!!!If you are experiencing a problem, please look for guidance using the list of {faqLink} on the support pages. If you can’t find a solution, please submit a support ticket.',
description:
'Content for the "Help and support" section on the support settings page.',
<<<<<<<
stepsReportProblemDescription: {
id: 'settings.support.steps.reportProblem.description',
defaultMessage: '!!!Please {downloadLogsLink} and attach the downloaded file when submitting a support request to help the support team investigate the issue. Logs do not contain sensitive information.',
description: 'Description of "Download the logs" on the support settings page.',
=======
logsContent: {
id: 'settings.support.logs.content',
defaultMessage:
'!!!Please download your logs here and attach the downloaded file when submitting a support ticket to help the support team investigate the issue. Logs do not contain sensitive information.',
description: 'Content for the "Logs" section on the support settings page.',
>>>>>>>
stepsReportProblemDescription: {
id: 'settings.support.steps.reportProblem.description',
defaultMessage:
'!!!Please {downloadLogsLink} and attach the downloaded file when submitting a support request to help the support team investigate the issue. Logs do not contain sensitive information.',
description:
'Description of "Download the logs" on the support settings page.',
<<<<<<<
{/* Help and Support */}
=======
>>>>>>>
{/* Help and Support */}
<<<<<<<
{/* Steps for creating a support request: */}
<h1>{intl.formatMessage(messages.stepsTitle)}</h1>
<ol>
<li>
<h2>{intl.formatMessage(messages.stepsDownloadLogsTitle)}</h2>
<p>
<FormattedMessage
{...messages.stepsDownloadLogsDescription}
values={{ stepsDownloadLogsLink }}
/>
</p>
</li>
<li>
<h2>{intl.formatMessage(messages.stepsReportProblemTitle)}</h2>
<p>
<FormattedMessage
{...messages.stepsReportProblemDescription}
values={{ reportProblemLink }}
/>
</p>
</li>
</ol>
=======
<h1>{intl.formatMessage(messages.reportProblemTitle)}</h1>
<p>
<FormattedMessage
{...messages.reportProblemContent}
values={{ supportRequestLink }}
/>
</p>
<h1>{intl.formatMessage(messages.logsTitle)}</h1>
<p>
<FormattedMessage
{...messages.logsContent}
values={{ downloadLogsLink }}
/>
</p>
>>>>>>>
{/* Steps for creating a support request: */}
<h1>{intl.formatMessage(messages.stepsTitle)}</h1>
<ol>
<li>
<h2>{intl.formatMessage(messages.stepsDownloadLogsTitle)}</h2>
<p>
<FormattedMessage
{...messages.stepsDownloadLogsDescription}
values={{ stepsDownloadLogsLink }}
/>
</p>
</li>
<li>
<h2>{intl.formatMessage(messages.stepsReportProblemTitle)}</h2>
<p>
<FormattedMessage
{...messages.stepsReportProblemDescription}
values={{ reportProblemLink }}
/>
</p>
</li>
</ol> |
<<<<<<<
import type { AdaV1Wallet } from './types';
import { request } from './lib/v1/request';
=======
import type { AdaWallet, RequestConfig } from './types';
import { request } from './lib/request';
>>>>>>>
import type { AdaV1Wallet, RequestConfig } from './types';
import { request } from './lib/v1/request';
<<<<<<<
{ ca, walletId, oldPassword, newPassword }: ChangeAdaWalletPassphraseParams
): Promise<AdaV1Wallet> => {
const encryptedOldPassphrase = oldPassword ? encryptPassphrase(oldPassword) : '';
const encryptedNewPassphrase = newPassword ? encryptPassphrase(newPassword) : '';
=======
config: RequestConfig,
{ walletId, oldPassword, newPassword }: ChangeAdaWalletPassphraseParams
): Promise<AdaWallet> => {
const encryptedOldPassphrase = oldPassword ? encryptPassphrase(oldPassword) : null;
const encryptedNewPassphrase = newPassword ? encryptPassphrase(newPassword) : null;
>>>>>>>
config: RequestConfig,
{ walletId, oldPassword, newPassword }: ChangeAdaWalletPassphraseParams
): Promise<AdaV1Wallet> => {
const encryptedOldPassphrase = oldPassword ? encryptPassphrase(oldPassword) : '';
const encryptedNewPassphrase = newPassword ? encryptPassphrase(newPassword) : '';
<<<<<<<
method: 'PUT',
path: `/api/v1/wallets/${walletId}/password`,
port: 8090,
ca,
}, {}, { old: encryptedOldPassphrase, new: encryptedNewPassphrase });
=======
method: 'POST',
path: `/api/wallets/password/${walletId}`,
...config,
}, { old: encryptedOldPassphrase, new: encryptedNewPassphrase });
>>>>>>>
method: 'PUT',
path: `/api/v1/wallets/${walletId}/password`,
...config,
}, {}, { old: encryptedOldPassphrase, new: encryptedNewPassphrase }); |
<<<<<<<
import environment from '../../../../common/environment';
=======
import { getAdaSyncProgress } from './getAdaSyncProgress';
>>>>>>>
<<<<<<<
GetWalletRecoveryPhraseFromCertificateResponse,
NodeInfo,
ResponseBaseV1,
AdaV1Assurance
=======
GetWalletRecoveryPhraseFromCertificateResponse, RequestConfig,
>>>>>>>
GetWalletRecoveryPhraseFromCertificateResponse,
RequestConfig,
NodeInfo,
ResponseBaseV1,
AdaV1Assurance,
<<<<<<<
const accounts: AdaAccounts = await getAdaWalletAccounts({ ca, walletId });
Logger.debug('AdaApi::getAddresses success: ' + stringifyData(accounts));
if (!accounts || !accounts.length) {
return new Promise(resolve => resolve({ accountIndex: null, addresses: [] }));
=======
const response: AdaAccounts = await getAdaWalletAccounts(this.config, { walletId });
Logger.debug('AdaApi::getAddresses success: ' + stringifyData(response));
if (!response.length) {
return new Promise((resolve) => resolve({ accountId: null, addresses: [] }));
>>>>>>>
const accounts: AdaAccounts = await getAdaWalletAccounts(this.config, { walletId });
Logger.debug('AdaApi::getAddresses success: ' + stringifyData(accounts));
if (!accounts || !accounts.length) {
return new Promise(resolve => resolve({ accountIndex: null, addresses: [] }));
<<<<<<<
const wallet: AdaWallet = await newAdaWallet({ ca, walletInitData });
=======
const wallet: AdaWallet = await newAdaWallet(this.config, {
password,
walletInitData
});
>>>>>>>
const wallet: AdaWallet = await newAdaWallet(this.config, { walletInitData });
<<<<<<<
const response = await deleteAdaWallet({ ca, walletId });
Logger.debug('AdaApi::deleteWallet success: ' + stringifyData(response));
=======
await deleteAdaWallet(this.config, { walletId });
Logger.debug('AdaApi::deleteWallet success: ' + stringifyData(request));
>>>>>>>
const response = await deleteAdaWallet(this.config, { walletId });
Logger.debug('AdaApi::deleteWallet success: ' + stringifyData(response));
<<<<<<<
const data = {
source: {
accountIndex,
walletId,
},
destinations: [
{
address,
amount,
},
],
groupingPolicy: 'OptimizeForSecurity',
spendingPassword,
};
const response: adaTxFee = await adaTxFee({ ca, data });
=======
// default value. Select (OptimizeForSecurity | OptimizeForSize) will be implemented
const groupingPolicy = 'OptimizeForSecurity';
const response: adaTxFee = await adaTxFee(this.config,
{ sender, receiver, amount, groupingPolicy }
);
>>>>>>>
const data = {
source: {
accountIndex,
walletId,
},
destinations: [
{
address,
amount,
},
],
groupingPolicy: 'OptimizeForSecurity',
spendingPassword,
};
const response: adaTxFee = await adaTxFee(this.config, { data });
<<<<<<<
const wallet: AdaWallet = await restoreAdaWallet({ ca, walletInitData });
=======
const wallet: AdaWallet = await restoreAdaWallet(this.config,
{ walletPassword, walletInitData }
);
>>>>>>>
const wallet: AdaWallet = await restoreAdaWallet(this.config, { walletInitData });
<<<<<<<
const importedWallet: AdaWalletV0 = await importAdaWallet(
{ ca, walletPassword, filePath }
=======
const importedWallet: AdaWallet = await importAdaWallet(this.config,
{ walletPassword, filePath }
>>>>>>>
const importedWallet: AdaWalletV0 = await importAdaWallet(
this.config, { walletPassword, filePath }
<<<<<<<
const importedWallet: AdaWalletV0 = isKeyFile ? (
await importAdaWallet({ ca, walletPassword, filePath })
=======
const importedWallet: AdaWallet = isKeyFile ? (
await importAdaWallet(this.config, { walletPassword, filePath })
>>>>>>>
const importedWallet: AdaWalletV0 = isKeyFile ? (
await importAdaWallet(this.config, { walletPassword, filePath })
<<<<<<<
const response = await nextAdaUpdate({ ca });
const { projectVersion, softwareInfo } = response;
const { version, applicationName } = softwareInfo;
=======
// TODO: add flow type definitions for nextUpdate response
const response: Promise<any> = await nextAdaUpdate(this.config);
>>>>>>>
const response = await nextAdaUpdate(this.config);
const { projectVersion, softwareInfo } = response;
const { version, applicationName } = softwareInfo;
<<<<<<<
const response: NodeInfo = await getNodeInfo({ ca });
=======
const response: AdaSyncProgressResponse = await getAdaSyncProgress(this.config);
>>>>>>>
const response: NodeInfo = await getNodeInfo(this.config);
<<<<<<<
const wallet: AdaV1Wallet = await updateAdaWallet({ ca, walletId, assuranceLevel, name });
=======
const wallet: AdaWallet = await updateAdaWallet(this.config, { walletId, walletMeta });
>>>>>>>
const wallet: AdaV1Wallet = await updateAdaWallet(
this.config, { walletId, assuranceLevel, name }
);
<<<<<<<
const response: NodeInfo = await getNodeInfo({ ca });
=======
const response: AdaLocalTimeDifference = await getAdaLocalTimeDifference(this.config);
>>>>>>>
const response: NodeInfo = await getNodeInfo(this.config); |
<<<<<<<
import NetworkStatusPage from './containers/status/NetworkStatusPage';
import BlockConsolidationStatusPage from './containers/status/BlockConsolidationStatusPage';
=======
>>>>>>>
import BlockConsolidationStatusPage from './containers/status/BlockConsolidationStatusPage';
<<<<<<<
<Route path={ROUTES.NETWORK_STATUS} component={NetworkStatusPage} />
<Route path={ROUTES.BLOCK_CONSOLIDATION_STATUS} component={BlockConsolidationStatusPage} />
=======
>>>>>>>
<Route path={ROUTES.BLOCK_CONSOLIDATION_STATUS} component={BlockConsolidationStatusPage} /> |
<<<<<<<
runInAction('redeem ada', () => (this.walletId = walletId));
=======
runInAction(() => {
this.walletId = walletId;
});
>>>>>>>
runInAction('redeem ada', () => {
this.walletId = walletId;
});
<<<<<<<
runInAction('redeem paper vended ada', () => (this.walletId = walletId));
=======
runInAction(() => {
this.walletId = walletId;
});
>>>>>>>
runInAction('redeem paper vended ada', () => {
this.walletId = walletId;
}); |
<<<<<<<
{ requestFormData, application }: SendAdaBugReportRequestParams
) => {
const { email, subject, problem, compressedLogsFile } = requestFormData;
const { version, os, buildNumber, REPORT_URL } = environment;
=======
{ requestFormData }: SendAdaBugReportRequestParams
): Promise<{}> => {
const { email, subject, problem, compressedLog } = requestFormData;
const { version, os, API_VERSION, NETWORK, build, getInstallerVersion, REPORT_URL } = environment;
>>>>>>>
{ requestFormData }: SendAdaBugReportRequestParams
) => {
const { email, subject, problem, compressedLogsFile } = requestFormData;
const { version, os, API_VERSION, NETWORK, build, getInstallerVersion, REPORT_URL } = environment;
<<<<<<<
path: '/report',
port,
=======
path: '/api/v1/report',
port: reportUrl.port,
>>>>>>>
path: '/api/v1/report',
port, |
<<<<<<<
let NODE_SUBSCRIPTION_STATUS = null;
=======
let SUBSCRIPTION_STATUS = null;
let LOCAL_BLOCK_HEIGHT = null;
let NETWORK_BLOCK_HEIGHT = null;
>>>>>>>
let SUBSCRIPTION_STATUS = null;
<<<<<<<
return {
subscriptionStatus: NODE_SUBSCRIPTION_STATUS || subscriptionStatus,
=======
const response = {
subscriptionStatus: SUBSCRIPTION_STATUS || subscriptionStatus,
>>>>>>>
const response = {
subscriptionStatus: SUBSCRIPTION_STATUS || subscriptionStatus,
<<<<<<<
api.unsubscribeNode = async () => {
NODE_SUBSCRIPTION_STATUS = {};
};
api.getLatestAppVersionInfo = async () => ({
platforms: {
windows: {
version: '0.14.0',
},
darwin: {
version: '0.14.0',
},
linux: {
version: '0.14.0',
},
}
});
=======
api.setSubscriptionStatus = async (subscriptionStatus: Object) => {
SUBSCRIPTION_STATUS = subscriptionStatus;
};
api.setLocalBlockHeight = async (height: number) => {
LOCAL_BLOCK_HEIGHT = height;
};
api.setNetworkBlockHeight = async (height: number) => {
NETWORK_BLOCK_HEIGHT = height;
};
>>>>>>>
api.getLatestAppVersion = async (): Promise<GetLatestAppVersionResponse> => {
Logger.debug('AdaApi::getLatestAppVersion (PATCHED) called');
try {
const latestAppVersionInfo: LatestAppVersionInfoResponse = await getLatestAppVersion();
const latestAppVersionPath = `platforms.${
global.environment.platform
}.version`;
const latestAppVersion = get(
latestAppVersionInfo,
latestAppVersionPath,
null
);
Logger.debug('AdaApi::getLatestAppVersion success', {
latestAppVersion,
latestAppVersionInfo,
});
return { latestAppVersion: LATEST_APP_VERSION || latestAppVersion };
} catch (error) {
Logger.error('AdaApi::getLatestAppVersion (PATCHED) error', { error });
throw new GenericApiError();
}
};
api.setLatestAppVersion = async (latestAppVersion: ?string) => {
LATEST_APP_VERSION = latestAppVersion;
};
api.setSubscriptionStatus = async (subscriptionStatus: ?Object) => {
SUBSCRIPTION_STATUS = subscriptionStatus;
};
api.setLocalBlockHeight = async (height: number) => {
LOCAL_BLOCK_HEIGHT = height;
};
api.setNetworkBlockHeight = async (height: number) => {
NETWORK_BLOCK_HEIGHT = height;
}; |
<<<<<<<
import React, { Component, PropTypes } from 'react';
import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
import { defineMessages, intlShape } from 'react-intl';
import Dropdown from 'react-toolbox/lib/dropdown/Dropdown';
import LocalizableError from '../../i18n/LocalizableError';
=======
import React, { Component, PropTypes } from 'react';
import { observer } from 'mobx-react';
import BorderedBox from '../widgets/BorderedBox';
>>>>>>>
import React, { Component, PropTypes } from 'react';
import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
import { defineMessages, intlShape } from 'react-intl';
import Dropdown from 'react-toolbox/lib/dropdown/Dropdown';
import LocalizableError from '../../i18n/LocalizableError';
import BorderedBox from '../widgets/BorderedBox';
<<<<<<<
static propTypes = {
assuranceLevels: MobxPropTypes.arrayOrObservableArrayOf(PropTypes.shape({
value: PropTypes.string.isRequired,
label: PropTypes.object.isRequired,
})).isRequired,
units: MobxPropTypes.arrayOrObservableArrayOf(PropTypes.shape({
value: PropTypes.number.isRequired,
label: PropTypes.object.isRequired,
})).isRequired,
walletAssurance: PropTypes.string.isRequired,
walletUnit: PropTypes.number.isRequired,
onWalletAssuranceLevelUpdate: PropTypes.func.isRequired,
onWalletUnitUpdate: PropTypes.func.isRequired,
error: PropTypes.instanceOf(LocalizableError),
};
static contextTypes = {
intl: intlShape.isRequired,
};
=======
static propTypes = {
openDialogAction: PropTypes.func.isRequired,
isDialogOpen: PropTypes.func.isRequired,
};
>>>>>>>
static propTypes = {
assuranceLevels: MobxPropTypes.arrayOrObservableArrayOf(PropTypes.shape({
value: PropTypes.string.isRequired,
label: PropTypes.object.isRequired,
})).isRequired,
units: MobxPropTypes.arrayOrObservableArrayOf(PropTypes.shape({
value: PropTypes.number.isRequired,
label: PropTypes.object.isRequired,
})).isRequired,
walletAssurance: PropTypes.string.isRequired,
walletUnit: PropTypes.number.isRequired,
onWalletAssuranceLevelUpdate: PropTypes.func.isRequired,
onWalletUnitUpdate: PropTypes.func.isRequired,
error: PropTypes.instanceOf(LocalizableError),
openDialogAction: PropTypes.func.isRequired,
isDialogOpen: PropTypes.func.isRequired,
};
static contextTypes = {
intl: intlShape.isRequired,
};
<<<<<<<
const { intl } = this.context;
const {
assuranceLevels, units,
walletAssurance, walletUnit,
onWalletAssuranceLevelUpdate,
onWalletUnitUpdate, error,
} = this.props;
const assuranceLevelOptions = assuranceLevels.map(assurance => ({
value: assurance.value,
label: intl.formatMessage(assurance.label),
}));
const unitOptions = units.map(unit => ({
value: unit.value,
label: intl.formatMessage(unit.label),
}));
=======
const { openDialogAction, isDialogOpen } = this.props;
>>>>>>>
const { intl } = this.context;
const {
assuranceLevels, units,
walletAssurance, walletUnit,
onWalletAssuranceLevelUpdate,
onWalletUnitUpdate, error,
openDialogAction, isDialogOpen,
} = this.props;
const assuranceLevelOptions = assuranceLevels.map(assurance => ({
value: assurance.value,
label: intl.formatMessage(assurance.label),
}));
const unitOptions = units.map(unit => ({
value: unit.value,
label: intl.formatMessage(unit.label),
}));
<<<<<<<
<Dropdown
label={intl.formatMessage(messages.unitsLabel)}
source={unitOptions}
value={walletUnit}
onChange={(value) => onWalletUnitUpdate({ unit: value })}
/>
<Dropdown
label={intl.formatMessage(messages.assuranceLevelLabel)}
source={assuranceLevelOptions}
value={walletAssurance}
onChange={(value) => onWalletAssuranceLevelUpdate({ assurance: value })}
/>
{error && <p className={styles.error}>{intl.formatMessage(error)}</p>}
=======
</BorderedBox>
>>>>>>>
</BorderedBox> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.