conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
var howItWorksGomesaPageFrontmatter = "---"+os.EOL+
"title: Gulf of Mexico Energy Security Act (GOMESA) | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/gomesa/"+os.EOL+
"---"+os.EOL;
=======
var howItWorksCoalExciseTaxPageFrontmatter = "---"+os.EOL+
"title: Onshore Oil & Gas | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/coal-excise-tax/"+os.EOL+
"---"+os.EOL;
>>>>>>>
var howItWorksGomesaPageFrontmatter = "---"+os.EOL+
"title: Gulf of Mexico Energy Security Act (GOMESA) | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/gomesa/"+os.EOL+
"---"+os.EOL;
var howItWorksCoalExciseTaxPageFrontmatter = "---"+os.EOL+
"title: Onshore Oil & Gas | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/coal-excise-tax/"+os.EOL+
"---"+os.EOL;
<<<<<<<
prependFile.sync(__dirname+'/public/how-it-works/gomesa/index.html', howItWorksGomesaPageFrontmatter);
=======
prependFile.sync(__dirname+'/public/how-it-works/coal-excise-tax/index.html', howItWorksCoalExciseTaxPageFrontmatter);
>>>>>>>
prependFile.sync(__dirname+'/public/how-it-works/gomesa/index.html', howItWorksGomesaPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/coal-excise-tax/index.html', howItWorksCoalExciseTaxPageFrontmatter); |
<<<<<<<
const {getHMDType, FakeMesher, FakePlaneTracker} = require('./VR.js');
=======
const {getHMDType, lookupHMDTypeIndex} = require('./VR.js');
>>>>>>>
const {getHMDType, lookupHMDTypeIndex, FakeMesher, FakePlaneTracker} = require('./VR.js');
<<<<<<<
=======
result.hmdType = _makeTypedArray(Uint32Array, 1);
>>>>>>>
result.hmdType = _makeTypedArray(Uint32Array, 1);
<<<<<<<
result.hidden = _makeTypedArray(Uint32Array, 1);
=======
result.msTex = _makeTypedArray(Uint32Array, 1);
result.msDepthTex = _makeTypedArray(Uint32Array, 1);
result.aaEnabled = _makeTypedArray(Uint32Array, 1);
>>>>>>>
result.msTex = _makeTypedArray(Uint32Array, 1);
result.msDepthTex = _makeTypedArray(Uint32Array, 1);
result.aaEnabled = _makeTypedArray(Uint32Array, 1);
result.hidden = _makeTypedArray(Uint32Array, 1); // XXX is this used?
<<<<<<<
result.meshing = _makeTypedArray(Uint32Array, 1);
result.planeTracking = _makeTypedArray(Uint32Array, 1);
result.handTracking = _makeTypedArray(Uint32Array, 1);
result.eyeTracking = _makeTypedArray(Uint32Array, 1);
=======
result.blobId = _makeTypedArray(Uint32Array, 1);
>>>>>>>
result.meshing = _makeTypedArray(Uint32Array, 1);
result.planeTracking = _makeTypedArray(Uint32Array, 1);
result.handTracking = _makeTypedArray(Uint32Array, 1);
result.eyeTracking = _makeTypedArray(Uint32Array, 1);
result.blobId = _makeTypedArray(Uint32Array, 1);
<<<<<<<
const childSyncs = [];
=======
const prevSyncs = [];
>>>>>>>
const prevSyncs = [];
<<<<<<<
=======
_handleRequests();
>>>>>>>
_waitHandleRequests();
<<<<<<<
for (let i = 0; i < childSyncs.length; i++) {
nativeBindings.nativeWindow.deleteSync(childSyncs[i]);
}
childSyncs.length = 0;
// tick animation frames
await Promise.all(windows.map(window => window.runAsync({method: 'tickAnimationFrame'}).then(syncs => {
if (topVrPresentState.windowHandle) {
nativeBindings.nativeWindow.setCurrentWindowContext(topVrPresentState.windowHandle);
for (let i = 0; i < syncs.length; i++) {
const sync = syncs[i];
nativeBindings.nativeWindow.waitSync(sync);
childSyncs.push(sync);
}
}
})));
=======
_clearPrevSyncs();
_clearXrFramebuffer();
await _tickAnimationFrames();
>>>>>>>
_clearPrevSyncs();
_clearXrFramebuffer();
await _tickAnimationFrames(); |
<<<<<<<
var companyList = root.select('#companies');
var getter = eiti.data.getter;
var throttle = eiti.util.throttle;
var grouper;
var formatNumber = eiti.format.commaSeparatedDollars;
var formatPercent = eiti.format.percent;
var dialogWithExtension = document.querySelector('.flowchart-dialog.flowchart-columns_right');
var extension = document.querySelector('.flowchart-stem_bottom_right_extra_long');
var dialogBottom = document.querySelector('.flowchart-dialog_bottom');
function setExtHeight() {
var newHeight = dialogBottom.getBoundingClientRect().bottom -
dialogWithExtension.getBoundingClientRect().bottom;
extension.style.height = newHeight + 'px';
}
// initialize height of extension path
setExtHeight();
window.addEventListener('resize', throttle(setExtHeight, 150, window));
var varianceKey = {
'Royalties': {
threshold: 1,
floor: 100000,
name: 'Royalties'
},
'Rents': {
threshold: 2,
floor: 50000,
name: 'Rents'
},
'Bonus': {
threshold: 2,
floor: 100000,
name: 'Bonuses'
},
'Other Revenue': {
threshold: 3,
floor: 50000,
name: 'Other revenue'
},
'Offshore Inspection Fee': {
threshold: 2,
floor: 20000,
name: 'Offshore inspection fees'
},
'ONRR Civil Penalties': {
threshold: 1,
floor: 1000,
name: 'Civil penalties'
},
'Bonus & 1st Year Rental': {
threshold: 2,
floor: 10000,
name: 'BLM bonus and first year rentals'
},
'Permit Fees': {
threshold: 3,
floor: 10000,
name: 'Permit fees'
},
'Renewables': {
threshold: 'N/A',
floor: 'N/A',
name: 'BLM renewables'
},
'AML Fees': {
threshold: 2,
floor: 100000,
name: 'OSMRE AML fees'
},
'OSMRE Civil Penalties': {
threshold: 3,
floor: 0,
name: 'OSMRE civil penalties'
},
'Corporate Income Tax': {
threshold: 1,
floor: 100000,
name: 'Taxes'
}
};
var state = eiti.explore.stateManager()
.on('change', update);
var hash = eiti.explore.hash()
.on('change', state.merge);
function isException (val) {
if (typeof(val) === 'string') {
val = val.trim();
return (val === 'did not participate' || val === 'did not report' || val === 'N/A');
}
}
function isMaterial (d) {
var varianceVal = Math.abs(d.value - d.company);
var overThreshold = !!(varianceKey[d.name].threshold < d.variance);
if (overThreshold) {
if (varianceVal > varianceKey[d.name].floor) {
return true;
}
}
return false;
}
var model = eiti.explore.model(eiti.data.path + 'reconciliation/revenue.tsv')
.transform(removeRevenueTypePrefix)
.filter('type', function(data, type) {
return data.filter(function(d) {
return d.revenueType === type;
});
});
var filters = root.selectAll('.filters [name]')
.on('change', filterChange);
=======
>>>>>>>
<<<<<<<
.on('clear', filterChange)
.on('change', filterChange);
var initialState = hash.read();
state.init(initialState);
function update(state) {
var query = state.toJS();
hash.write(query);
updateFilterDescription(state);
grouper = d3.nest()
.rollup(function(leaves) {
return leaves.map(function(d){
return {
value: d['Government Reported'],
company: d['Company Reported'],
variance: d['Variance Percent'],
varianceDollars: d['Variance Dollars']
};
});
})
.sortValues(function(a, b) {
return d3.descending(+a['Government Reported'], +b['Government Reported']);
});
grouper.key(getter('revenueType'));
model.load(state, function(error, data) {
if (error) {
// console.error('error:', error);
data = [];
}
filters.each(function() {
this.value = state.get(this.name) || '';
});
search.property('value', state.get('search') || '');
render(data, state);
});
}
function render(data /*, state */) {
updateCompanyList(data);
updateNameSearch();
}
function updateCompanyList(data) {
var companies = d3.nest()
.key(getter('Company'))
.entries(data)
.map(function(data) {
var total = d3.sum(data.values, getter('Government Reported'));
var obj = {
name: data.key,
total: total,
types: grouper.entries(data.values)
.map(function(d) {
var variance = isException(d.values[0].variance)
? d.values[0].variance
: Math.abs(d.values[0].variance);
return {
name: d.key,
value: d.values[0].value,
company: d.values[0].company,
variance: variance
};
})
};
return obj;
});
var items = companyList.selectAll('tbody.company')
.data(companies, getter('name'));
items.exit().remove();
var enter = items.enter().append('tbody')
.attr('class', 'company subgroup')
.append('tr')
.attr('class', 'name');
enter.append('th')
.attr('class', 'subregion-name narrow')
.text(getter('name'));
enter.append('th')
.attr('class', 'subtotal value');
enter.append('th')
.attr('class', 'subtotal-label');
items.sort(function(a, b) {
return d3.descending(Math.abs(a.total), Math.abs(b.total));
=======
.on('change', updateNameSearch);
var companies = root.selectAll('tbody.company')
.datum(function() {
var name = this.getAttribute('data-name');
var lower = name.toLowerCase();
return {
name: name,
lower: lower
};
>>>>>>>
.on('change', updateNameSearch);
var companies = root.selectAll('tbody.company')
.datum(function() {
var name = this.getAttribute('data-name');
var lower = name.toLowerCase();
return {
name: name,
lower: lower
};
<<<<<<<
items.call(renderSubtypes, getter('types'));
}
function renderSubtypes(selection, types) {
var items = selection.selectAll('.subtype')
.data(types, getter('name'));
items.exit().remove();
items.enter().append('tr')
.attr('class', 'subtype')
.call(setupRevenueItem);
items
.call(updateRevenueItem)
.sort(function(a, b) {
return d3.descending(Math.abs(a.value), Math.abs(b.value));
});
}
=======
>>>>>>>
<<<<<<<
.text(getter('name'));
}
}
function setupRevenueItem(selection) {
selection.append('td')
.attr('class', 'name narrow');
selection.append('td')
.attr('class', 'value');
selection.append('td')
.attr('class', 'variance');
}
function updateRevenueItem(selection) {
selection.select('.name')
.text(function(d) {
return varianceKey[d.name].name;
});
selection.select('.value')
.html(function(d) {
var company = isException(d.company)
? d.company
: formatNumber(d.company);
var multiLine = formatNumber(d.value) +
' <span class="reportee">gov</span>' +
'</br>' +
company +
' <span class="reportee">co</span>';
return multiLine;
});
var refNumber = 0;
selection.select('.variance')
.html(function(d) {
var variance = isException(d.variance, 'var')
? d.variance
: formatPercent(d.variance / 100);
function returnFootnote () {
refNumber ++;
return '<strong>' + variance +
'<sup id="fnref:' + refNumber +
'"><a href="#fn:' + refNumber +
'" class="footnote hashoffset">' + refNumber +
'</a></sup></strong>';
}
return isMaterial(d)
? returnFootnote()
: variance;
});
}
function updateFilterDescription(state) {
var desc = root.selectAll('[data-filter-description]');
var data = {
type: state.get('type') || 'All revenue',
government: state.get('government'),
};
desc.selectAll('[data-key]')
.text(function() {
return data[this.getAttribute('data-key')];
});
}
function removeRevenueTypePrefix(row) {
if (!row.revenueType) {
row.revenueType = row['Type'];
=======
.text(function(d) {
return d.name;
});
>>>>>>>
.text(function(d) {
return d.name;
});
<<<<<<<
function filterChange() {
state.set(this.name, this.value, this.company, this.variance);
}
})(this);
=======
})();
>>>>>>>
})(); |
<<<<<<<
var howItWorksAuditsPageFrontmatter = "---"+os.EOL+
"title: Audits and Assurances | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/audits-and-assurances/"+os.EOL+
"---"+os.EOL;
=======
var howItWorksCoalExciseTaxPageFrontmatter = "---"+os.EOL+
"title: Onshore Oil & Gas | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/coal-excise-tax/"+os.EOL+
"---"+os.EOL;
>>>>>>>
var howItWorksAuditsPageFrontmatter = "---"+os.EOL+
"title: Audits and Assurances | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/audits-and-assurances/"+os.EOL+
"---"+os.EOL;
var howItWorksCoalExciseTaxPageFrontmatter = "---"+os.EOL+
"title: Onshore Oil & Gas | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/coal-excise-tax/"+os.EOL+
"---"+os.EOL;
<<<<<<<
prependFile.sync(__dirname+'/public/how-it-works/audits-and-assurances/index.html', howItWorksAuditsPageFrontmatter);
=======
prependFile.sync(__dirname+'/public/how-it-works/coal-excise-tax/index.html', howItWorksCoalExciseTaxPageFrontmatter);
>>>>>>>
prependFile.sync(__dirname+'/public/how-it-works/audits-and-assurances/index.html', howItWorksAuditsPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/coal-excise-tax/index.html', howItWorksCoalExciseTaxPageFrontmatter); |
<<<<<<<
else if(path.includes("/historic-preservation-fund") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-content-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-historic-preservation-fund.json","path":path}]);
}
=======
else if(path.includes("/disbursements") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-content-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-disbursements.json","path":path}]);
}
>>>>>>>
else if(path.includes("/historic-preservation-fund") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-content-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-historic-preservation-fund.json","path":path}]);
}
else if(path.includes("/disbursements") && !lastFourteen.includes("default-page")){
loader.addPagesArray([{"componentChunkName":"component---src-templates-content-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-disbursements.json","path":path}]);
} |
<<<<<<<
var howItWorksAuditsPageFrontmatter = "---"+os.EOL+
"title: Audits and Assurances | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/audits-and-assurances/"+os.EOL+
"---"+os.EOL;
=======
var howItWorksDisbursementsPageFrontmatter = "---"+os.EOL+
"title: Disbursements | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/disbursements/"+os.EOL+
"---"+os.EOL;
var howItWorksRevenuesPageFrontmatter = "---"+os.EOL+
"title: Revenues | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/revenues/"+os.EOL+
"---"+os.EOL;
var howItWorksAmlPageFrontmatter = "---"+os.EOL+
"title: AML Reclamation Program | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/aml-reclamation-program/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2017Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2017) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2017/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2016Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2016) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2016/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2015Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2015) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2015/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2014Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2014) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2014/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2013Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2013) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2013/"+os.EOL+
"---"+os.EOL;
>>>>>>>
var howItWorksAuditsPageFrontmatter = "---"+os.EOL+
"title: Audits and Assurances | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/audits-and-assurances/"+os.EOL+
"---"+os.EOL;
var howItWorksDisbursementsPageFrontmatter = "---"+os.EOL+
"title: Disbursements | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/disbursements/"+os.EOL+
"---"+os.EOL;
var howItWorksRevenuesPageFrontmatter = "---"+os.EOL+
"title: Revenues | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/revenues/"+os.EOL+
"---"+os.EOL;
var howItWorksAmlPageFrontmatter = "---"+os.EOL+
"title: AML Reclamation Program | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/aml-reclamation-program/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2017Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2017) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2017/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2016Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2016) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2016/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2015Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2015) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2015/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2014Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2014) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2014/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2013Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2013) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2013/"+os.EOL+
"---"+os.EOL;
<<<<<<<
prependFile.sync(__dirname+'/public/how-it-works/audits-and-assurances/index.html', howItWorksAuditsPageFrontmatter);
=======
prependFile.sync(__dirname+'/public/downloads/reconciliation/index.html', downloadsReconciliationFrontmatter);
prependFile.sync(__dirname+'/public/downloads/disbursements/index.html', downloadsDisbursementsFrontmatter);
prependFile.sync(__dirname+'/public/downloads/federal-revenue-by-company/index.html', downloadsFederalRevByCompanyPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/federal-revenue-by-month/index.html', downloadsFederalRevByMonthPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/federal-revenue-by-location/index.html', downloadsFederalRevByLocPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/federal-production/index.html', downloadsFederalProdYearPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/federal-production-by-month/index.html', downloadsFederalProdMonthPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/index.html', downloadsPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/reconciliation/2015/index.html', howItWorksReconcile2015PageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/reconciliation/2016/index.html', howItWorksReconcile2016PageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/disbursements/index.html', howItWorksDisbursementsPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/revenues/index.html', howItWorksRevenuesPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/aml-reclamation-program/index.html', howItWorksAmlPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2013/index.html', howItWorksCompanyRevenue2013Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2014/index.html', howItWorksCompanyRevenue2014Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2015/index.html', howItWorksCompanyRevenue2015Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2016/index.html', howItWorksCompanyRevenue2016Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2017/index.html', howItWorksCompanyRevenue2017Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/offshore-renewables/index.html', howItWorksOffshoreRenewablesPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/onshore-renewables/index.html', howItWorksOnshoreRenewablesPageFrontmatter);
>>>>>>>
prependFile.sync(__dirname+'/public/how-it-works/audits-and-assurances/index.html', howItWorksAuditsPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/reconciliation/index.html', downloadsReconciliationFrontmatter);
prependFile.sync(__dirname+'/public/downloads/disbursements/index.html', downloadsDisbursementsFrontmatter);
prependFile.sync(__dirname+'/public/downloads/federal-revenue-by-company/index.html', downloadsFederalRevByCompanyPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/federal-revenue-by-month/index.html', downloadsFederalRevByMonthPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/federal-revenue-by-location/index.html', downloadsFederalRevByLocPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/federal-production/index.html', downloadsFederalProdYearPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/federal-production-by-month/index.html', downloadsFederalProdMonthPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/index.html', downloadsPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/reconciliation/2015/index.html', howItWorksReconcile2015PageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/reconciliation/2016/index.html', howItWorksReconcile2016PageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/disbursements/index.html', howItWorksDisbursementsPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/revenues/index.html', howItWorksRevenuesPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/aml-reclamation-program/index.html', howItWorksAmlPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2013/index.html', howItWorksCompanyRevenue2013Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2014/index.html', howItWorksCompanyRevenue2014Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2015/index.html', howItWorksCompanyRevenue2015Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2016/index.html', howItWorksCompanyRevenue2016Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2017/index.html', howItWorksCompanyRevenue2017Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/offshore-renewables/index.html', howItWorksOffshoreRenewablesPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/onshore-renewables/index.html', howItWorksOnshoreRenewablesPageFrontmatter); |
<<<<<<<
import {UpdateFlag} from '../components/layouts/UpdateFlag'
=======
import {DownloadDataLink} from '../components/layouts/icon-links/DownloadDataLink'
import IconArchive from '-!svg-react-loader!../img/svg/icon-archive.svg';
import {DataArchiveLink} from '../components/layouts/icon-links/DataArchiveLink';
import {ArchiveBanner} from '../components/info/ArchiveBanner'
import CoalIcon from '-!svg-react-loader!../img/svg/icon-coal.svg';
import OilGasIcon from '-!svg-react-loader!../img/svg/icon-oil.svg';
import HardrockIcon from '-!svg-react-loader!../img/svg/icon-hardrock.svg';
import RenewablesIcon from '-!svg-react-loader!../img/svg/icon-renewables.svg';
import ChevronIcon from '-!svg-react-loader!../img/svg/chevron-lt.svg';
import DownloadLink from '../components/layouts/icon-links/DownloadLink';
>>>>>>>
import {UpdateFlag} from '../components/layouts/UpdateFlag'
import {DownloadDataLink} from '../components/layouts/icon-links/DownloadDataLink'
import IconArchive from '-!svg-react-loader!../img/svg/icon-archive.svg';
import {DataArchiveLink} from '../components/layouts/icon-links/DataArchiveLink';
import {ArchiveBanner} from '../components/info/ArchiveBanner'
import CoalIcon from '-!svg-react-loader!../img/svg/icon-coal.svg';
import OilGasIcon from '-!svg-react-loader!../img/svg/icon-oil.svg';
import HardrockIcon from '-!svg-react-loader!../img/svg/icon-hardrock.svg';
import RenewablesIcon from '-!svg-react-loader!../img/svg/icon-renewables.svg';
import ChevronIcon from '-!svg-react-loader!../img/svg/chevron-lt.svg';
import DownloadLink from '../components/layouts/icon-links/DownloadLink';
<<<<<<<
'update-flag': UpdateFlag,
=======
'download-data-link': DownloadDataLink,
'icon-archive': IconArchive,
'data-archive-link': DataArchiveLink,
'archive-banner': ArchiveBanner,
'coal-icon': CoalIcon,
'oil-gas-icon': OilGasIcon,
'hardrock-icon': HardrockIcon,
'renewables-icon': RenewablesIcon,
'chevron-icon': ChevronIcon,
'download-link': DownloadLink,
>>>>>>>
'update-flag': UpdateFlag,
'download-data-link': DownloadDataLink,
'icon-archive': IconArchive,
'data-archive-link': DataArchiveLink,
'archive-banner': ArchiveBanner,
'coal-icon': CoalIcon,
'oil-gas-icon': OilGasIcon,
'hardrock-icon': HardrockIcon,
'renewables-icon': RenewablesIcon,
'chevron-icon': ChevronIcon,
'download-link': DownloadLink, |
<<<<<<<
=======
[CONSTANTS.PRODUCTION_VOLUMES_OIL_KEY]:
this.props.productionVolumesByMonth(CONSTANTS.PRODUCTION_VOLUMES_OIL_KEY, {...FILTER_PRODUCTION_VOLUMES_BY_MONTH, period:dropDownValue }, OPTIONS_PRODUCTION_VOLUMES_BY_MONTH),
[CONSTANTS.PRODUCTION_VOLUMES_GAS_KEY]:
this.props.productionVolumesByMonth(CONSTANTS.PRODUCTION_VOLUMES_GAS_KEY, {...FILTER_PRODUCTION_VOLUMES_BY_MONTH, period:dropDownValue }, OPTIONS_PRODUCTION_VOLUMES_BY_MONTH),
[CONSTANTS.PRODUCTION_VOLUMES_COAL_KEY]:
this.props.productionVolumesByMonth(CONSTANTS.PRODUCTION_VOLUMES_COAL_KEY, {...FILTER_PRODUCTION_VOLUMES_BY_MONTH, period:dropDownValue }, OPTIONS_PRODUCTION_VOLUMES_BY_MONTH),
>>>>>>>
<<<<<<<
=======
[CONSTANTS.REVENUES_ALL_KEY]: this.props.revenuesByYear(CONSTANTS.REVENUES_ALL_KEY, REVENUES_BY_YEAR.filter, REVENUES_BY_YEAR.options),
>>>>>>>
<<<<<<<
=======
[CONSTANTS.REVENUES_ALL_KEY]: this.props.revenuesByMonth(CONSTANTS.REVENUES_ALL_KEY, {...REVENUES_BY_MONTH.filter, period:dropDownValue,}, REVENUES_BY_MONTH.options),
>>>>>>>
<<<<<<<
{this.getStackedBarChartLayout(KEY_STATS_OIL_DATA_ID, CONSTANTS.OIL )}
{this.getStackedBarChartLayout(KEY_STATS_GAS_DATA_ID, CONSTANTS.GAS )}
{this.getStackedBarChartLayout(KEY_STATS_COAL_DATA_ID, CONSTANTS.COAL )}
=======
{this.state[CONSTANTS.PRODUCTION_VOLUMES_OIL_KEY].Data &&
this.getStackedBarChartLayout(CONSTANTS.PRODUCTION_VOLUMES_OIL_KEY, this.getProductionVolumesChartTitle(CONSTANTS.PRODUCTION_VOLUMES_OIL_KEY))}
{this.state[CONSTANTS.PRODUCTION_VOLUMES_GAS_KEY].Data &&
this.getStackedBarChartLayout(CONSTANTS.PRODUCTION_VOLUMES_GAS_KEY, this.getProductionVolumesChartTitle(CONSTANTS.PRODUCTION_VOLUMES_GAS_KEY))}
{this.state[CONSTANTS.PRODUCTION_VOLUMES_COAL_KEY].Data &&
this.getStackedBarChartLayout(CONSTANTS.PRODUCTION_VOLUMES_COAL_KEY, this.getProductionVolumesChartTitle(CONSTANTS.PRODUCTION_VOLUMES_COAL_KEY))}
>>>>>>>
{this.getStackedBarChartLayout(KEY_STATS_OIL_DATA_ID, CONSTANTS.OIL )}
{this.getStackedBarChartLayout(KEY_STATS_GAS_DATA_ID, CONSTANTS.GAS )}
{this.getStackedBarChartLayout(KEY_STATS_COAL_DATA_ID, CONSTANTS.COAL )}
<<<<<<<
{this.getStackedBarChartLayout(KEY_STATS_REVENUES_DATA_ID, CONSTANTS.REVENUE, utils.formatToDollarInt)}
=======
{this.state[CONSTANTS.REVENUES_ALL_KEY].Data &&
this.getStackedBarChartLayout(CONSTANTS.REVENUES_ALL_KEY, CONSTANTS.REVENUE, utils.formatToDollarInt)}
>>>>>>>
{this.getStackedBarChartLayout(KEY_STATS_REVENUES_DATA_ID, CONSTANTS.REVENUE, utils.formatToDollarInt)}
<<<<<<<
{this.getStackedBarChartLayout(KEY_STATS_DISBURSEMENTS_DATA_ID, CONSTANTS.DISBURSEMENTS, utils.formatToDollarInt)}
=======
{this.state[CONSTANTS.DISBURSEMENTS_ALL_KEY].Data &&
this.getStackedBarChartLayout(CONSTANTS.DISBURSEMENTS_ALL_KEY, CONSTANTS.DISBURSEMENTS, utils.formatToDollarInt)}
>>>>>>>
{this.getStackedBarChartLayout(KEY_STATS_DISBURSEMENTS_DATA_ID, CONSTANTS.DISBURSEMENTS, utils.formatToDollarInt)}
<<<<<<<
state => ({
[KEY_STATS_OIL_DATA_ID]: state[CONSTANTS.DATA_SETS_STATE_KEY][KEY_STATS_OIL_DATA_ID],
[KEY_STATS_GAS_DATA_ID]: state[CONSTANTS.DATA_SETS_STATE_KEY][KEY_STATS_GAS_DATA_ID],
[KEY_STATS_COAL_DATA_ID]: state[CONSTANTS.DATA_SETS_STATE_KEY][KEY_STATS_COAL_DATA_ID],
[KEY_STATS_REVENUES_DATA_ID]: state[CONSTANTS.DATA_SETS_STATE_KEY][KEY_STATS_REVENUES_DATA_ID],
[KEY_STATS_DISBURSEMENTS_DATA_ID]: state[CONSTANTS.DATA_SETS_STATE_KEY][KEY_STATS_DISBURSEMENTS_DATA_ID],
[PRODUCTION_VOLUMES_FISCAL_YEAR]: state[CONSTANTS.DATA_SETS_STATE_KEY][CONSTANTS.FISCAL_YEAR_KEY][CONSTANTS.PRODUCTION_VOLUMES_OIL_KEY],
[PRODUCTION_VOLUMES_CALENDAR_YEAR]: state[CONSTANTS.DATA_SETS_STATE_KEY][CONSTANTS.CALENDAR_YEAR_KEY][CONSTANTS.PRODUCTION_VOLUMES_OIL_KEY],
[REVENUES_FISCAL_YEAR]: state[CONSTANTS.DATA_SETS_STATE_KEY][CONSTANTS.FISCAL_YEAR_KEY][CONSTANTS.REVENUES_ALL_KEY],
[REVENUES_CALENDAR_YEAR]: state[CONSTANTS.DATA_SETS_STATE_KEY][CONSTANTS.CALENDAR_YEAR_KEY][CONSTANTS.REVENUES_ALL_KEY],
}),
dispatch => ({
groupDataSetsByMonth: (configs) => dispatch( groupDataSetsByMonthAction(configs) ),
groupDataSetsByYear: (configs) => dispatch( groupDataSetsByYearAction(configs) ),
setDataSelectedById: (configs) => dispatch( setDataSelectedByIdAction(configs) ),
})
=======
state => ({ [CONSTANTS.PRODUCTION_VOLUMES_OIL_KEY]: state[CONSTANTS.PRODUCTION_VOLUMES_KEY][CONSTANTS.PRODUCTION_VOLUMES_OIL_KEY],
[CONSTANTS.PRODUCTION_VOLUMES_GAS_KEY]: state[CONSTANTS.PRODUCTION_VOLUMES_KEY][CONSTANTS.PRODUCTION_VOLUMES_GAS_KEY],
[CONSTANTS.PRODUCTION_VOLUMES_COAL_KEY]: state[CONSTANTS.PRODUCTION_VOLUMES_KEY][CONSTANTS.PRODUCTION_VOLUMES_COAL_KEY],
[CONSTANTS.REVENUES_ALL_KEY]: state[CONSTANTS.REVENUES_KEY][CONSTANTS.REVENUES_ALL_KEY],
[CONSTANTS.DISBURSEMENTS_ALL_KEY]: state[CONSTANTS.DISBURSEMENTS_KEY][CONSTANTS.DISBURSEMENTS_ALL_KEY],
[PRODUCTION_VOLUMES_FISCAL_YEAR]: state[CONSTANTS.PRODUCTION_VOLUMES_KEY][CONSTANTS.FISCAL_YEAR_KEY],
[PRODUCTION_VOLUMES_CALENDAR_YEAR]: state[CONSTANTS.PRODUCTION_VOLUMES_KEY][CONSTANTS.CALENDAR_YEAR_KEY],
[REVENUES_FISCAL_YEAR]: state[CONSTANTS.REVENUES_KEY][CONSTANTS.FISCAL_YEAR_KEY],
[REVENUES_CALENDAR_YEAR]: state[CONSTANTS.REVENUES_KEY][CONSTANTS.CALENDAR_YEAR_KEY],
}),
dispatch => ({ productionVolumesByYear: (key, filter, options) => dispatch(productionVolumesByYearAction(key, filter, options)),
productionVolumesByMonth: (key, filter, options) => dispatch(productionVolumesByMonthAction(key, filter, options)),
revenuesByMonth: (key, filter, options) => dispatch(revenuesByMonthAction(key, filter, options)),
revenuesByYear: (key, filter, options) => dispatch(revenuesByYearAction(key, filter, options)),
disbursementsByYear: (key, filter, options) => dispatch(disbursementsByYearAction(key, filter, options)),
})
>>>>>>>
state => ({
[KEY_STATS_OIL_DATA_ID]: state[CONSTANTS.DATA_SETS_STATE_KEY][KEY_STATS_OIL_DATA_ID],
[KEY_STATS_GAS_DATA_ID]: state[CONSTANTS.DATA_SETS_STATE_KEY][KEY_STATS_GAS_DATA_ID],
[KEY_STATS_COAL_DATA_ID]: state[CONSTANTS.DATA_SETS_STATE_KEY][KEY_STATS_COAL_DATA_ID],
[KEY_STATS_REVENUES_DATA_ID]: state[CONSTANTS.DATA_SETS_STATE_KEY][KEY_STATS_REVENUES_DATA_ID],
[KEY_STATS_DISBURSEMENTS_DATA_ID]: state[CONSTANTS.DATA_SETS_STATE_KEY][KEY_STATS_DISBURSEMENTS_DATA_ID],
[PRODUCTION_VOLUMES_FISCAL_YEAR]: state[CONSTANTS.DATA_SETS_STATE_KEY][CONSTANTS.FISCAL_YEAR_KEY][CONSTANTS.PRODUCTION_VOLUMES_OIL_KEY],
[PRODUCTION_VOLUMES_CALENDAR_YEAR]: state[CONSTANTS.DATA_SETS_STATE_KEY][CONSTANTS.CALENDAR_YEAR_KEY][CONSTANTS.PRODUCTION_VOLUMES_OIL_KEY],
[REVENUES_FISCAL_YEAR]: state[CONSTANTS.DATA_SETS_STATE_KEY][CONSTANTS.FISCAL_YEAR_KEY][CONSTANTS.REVENUES_ALL_KEY],
[REVENUES_CALENDAR_YEAR]: state[CONSTANTS.DATA_SETS_STATE_KEY][CONSTANTS.CALENDAR_YEAR_KEY][CONSTANTS.REVENUES_ALL_KEY],
}),
dispatch => ({
groupDataSetsByMonth: (configs) => dispatch( groupDataSetsByMonthAction(configs) ),
groupDataSetsByYear: (configs) => dispatch( groupDataSetsByYearAction(configs) ),
setDataSelectedById: (configs) => dispatch( setDataSelectedByIdAction(configs) ),
}) |
<<<<<<<
var howItWorksRevenuesPageFrontmatter = "---"+os.EOL+
"title: Revenues | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/revenues/"+os.EOL+
"---"+os.EOL;
var howItWorksAmlPageFrontmatter = "---"+os.EOL+
"title: AML Reclamation Program | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/aml-reclamation-program/"+os.EOL+
"---"+os.EOL;
=======
var howItWorksCoalExciseTaxPageFrontmatter = "---"+os.EOL+
"title: Onshore Oil & Gas | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/coal-excise-tax/"+os.EOL+
"---"+os.EOL;
>>>>>>>
var howItWorksRevenuesPageFrontmatter = "---"+os.EOL+
"title: Revenues | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/revenues/"+os.EOL+
"---"+os.EOL;
var howItWorksAmlPageFrontmatter = "---"+os.EOL+
"title: AML Reclamation Program | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/aml-reclamation-program/"+os.EOL+
"---"+os.EOL;
var howItWorksCoalExciseTaxPageFrontmatter = "---"+os.EOL+
"title: Onshore Oil & Gas | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/coal-excise-tax/"+os.EOL+
"---"+os.EOL;
<<<<<<<
prependFile.sync(__dirname+'/public/how-it-works/revenues/index.html', howItWorksRevenuesPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/aml-reclamation-program/index.html', howItWorksAmlPageFrontmatter);
=======
prependFile.sync(__dirname+'/public/how-it-works/coal-excise-tax/index.html', howItWorksCoalExciseTaxPageFrontmatter);
>>>>>>>
prependFile.sync(__dirname+'/public/how-it-works/revenues/index.html', howItWorksRevenuesPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/aml-reclamation-program/index.html', howItWorksAmlPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/coal-excise-tax/index.html', howItWorksCoalExciseTaxPageFrontmatter); |
<<<<<<<
var howItWorksHpfPageFrontmatter = "---"+os.EOL+
"title: Historic Preservation Fund | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/historic-preservation-fund/"+os.EOL+
"---"+os.EOL;
=======
var howItWorksDisbursementsPageFrontmatter = "---"+os.EOL+
"title: Disbursements | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/disbursements/"+os.EOL+
"---"+os.EOL;
var howItWorksRevenuesPageFrontmatter = "---"+os.EOL+
"title: Revenues | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/revenues/"+os.EOL+
"---"+os.EOL;
var howItWorksAmlPageFrontmatter = "---"+os.EOL+
"title: AML Reclamation Program | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/aml-reclamation-program/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2017Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2017) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2017/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2016Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2016) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2016/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2015Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2015) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2015/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2014Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2014) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2014/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2013Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2013) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2013/"+os.EOL+
"---"+os.EOL;
>>>>>>>
var howItWorksHpfPageFrontmatter = "---"+os.EOL+
"title: Historic Preservation Fund | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/historic-preservation-fund/"+os.EOL+
"---"+os.EOL;
var howItWorksDisbursementsPageFrontmatter = "---"+os.EOL+
"title: Disbursements | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/disbursements/"+os.EOL+
"---"+os.EOL;
var howItWorksRevenuesPageFrontmatter = "---"+os.EOL+
"title: Revenues | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/revenues/"+os.EOL+
"---"+os.EOL;
var howItWorksAmlPageFrontmatter = "---"+os.EOL+
"title: AML Reclamation Program | How It Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/aml-reclamation-program/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2017Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2017) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2017/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2016Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2016) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2016/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2015Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2015) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2015/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2014Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2014) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2014/"+os.EOL+
"---"+os.EOL;
var howItWorksCompanyRevenue2013Frontmatter = "---"+os.EOL+
"title: Federal Revenue By Company (2013) | How it works | Natural Resources Revenue Data"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/federal-revenue-by-company/2013/"+os.EOL+
"---"+os.EOL;
<<<<<<<
prependFile.sync(__dirname+'/public/how-it-works/historic-preservation-fund/index.html', howItWorksHpfPageFrontmatter);
=======
prependFile.sync(__dirname+'/public/downloads/reconciliation/index.html', downloadsReconciliationFrontmatter);
prependFile.sync(__dirname+'/public/downloads/disbursements/index.html', downloadsDisbursementsFrontmatter);
prependFile.sync(__dirname+'/public/downloads/federal-revenue-by-company/index.html', downloadsFederalRevByCompanyPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/federal-revenue-by-month/index.html', downloadsFederalRevByMonthPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/federal-revenue-by-location/index.html', downloadsFederalRevByLocPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/federal-production/index.html', downloadsFederalProdYearPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/federal-production-by-month/index.html', downloadsFederalProdMonthPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/index.html', downloadsPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/reconciliation/2015/index.html', howItWorksReconcile2015PageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/reconciliation/2016/index.html', howItWorksReconcile2016PageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/disbursements/index.html', howItWorksDisbursementsPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/revenues/index.html', howItWorksRevenuesPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/aml-reclamation-program/index.html', howItWorksAmlPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2013/index.html', howItWorksCompanyRevenue2013Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2014/index.html', howItWorksCompanyRevenue2014Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2015/index.html', howItWorksCompanyRevenue2015Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2016/index.html', howItWorksCompanyRevenue2016Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2017/index.html', howItWorksCompanyRevenue2017Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/offshore-renewables/index.html', howItWorksOffshoreRenewablesPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/onshore-renewables/index.html', howItWorksOnshoreRenewablesPageFrontmatter);
>>>>>>>
prependFile.sync(__dirname+'/public/how-it-works/historic-preservation-fund/index.html', howItWorksHpfPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/reconciliation/index.html', downloadsReconciliationFrontmatter);
prependFile.sync(__dirname+'/public/downloads/disbursements/index.html', downloadsDisbursementsFrontmatter);
prependFile.sync(__dirname+'/public/downloads/federal-revenue-by-company/index.html', downloadsFederalRevByCompanyPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/federal-revenue-by-month/index.html', downloadsFederalRevByMonthPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/federal-revenue-by-location/index.html', downloadsFederalRevByLocPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/federal-production/index.html', downloadsFederalProdYearPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/federal-production-by-month/index.html', downloadsFederalProdMonthPageFrontmatter);
prependFile.sync(__dirname+'/public/downloads/index.html', downloadsPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/reconciliation/2015/index.html', howItWorksReconcile2015PageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/reconciliation/2016/index.html', howItWorksReconcile2016PageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/disbursements/index.html', howItWorksDisbursementsPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/revenues/index.html', howItWorksRevenuesPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/aml-reclamation-program/index.html', howItWorksAmlPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2013/index.html', howItWorksCompanyRevenue2013Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2014/index.html', howItWorksCompanyRevenue2014Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2015/index.html', howItWorksCompanyRevenue2015Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2016/index.html', howItWorksCompanyRevenue2016Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/federal-revenue-by-company/2017/index.html', howItWorksCompanyRevenue2017Frontmatter);
prependFile.sync(__dirname+'/public/how-it-works/offshore-renewables/index.html', howItWorksOffshoreRenewablesPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/onshore-renewables/index.html', howItWorksOnshoreRenewablesPageFrontmatter); |
<<<<<<<
var howItWorksNativeProductionPageFrontmatter = "---"+os.EOL+
"title: Native American Lands | Natural Resource Production"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/native-american-production/"+os.EOL+
"redirect_from: /how-it-works/tribal-production/"+os.EOL+
"---"+os.EOL;
var howItWorksOwnershipPageFrontmatter = "---"+os.EOL+
"title: Ownership | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/ownership/"+os.EOL+
"---"+os.EOL;
=======
var howItWorksNativeRevenuePageFrontmatter = "---"+os.EOL+
"title: Native American Lands | Revenue"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/native-american-revenue/"+os.EOL+
"redirect_from: /how-it-works/tribal-revenue/"+os.EOL+
"---"+os.EOL;
var howItWorksNativeImpactPageFrontmatter = "---"+os.EOL+
"title: Native American Lands | Economic Impact"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/native-american-economic-impact/"+os.EOL+
"redirect_from: /how-it-works/tribal-economic-impact/"+os.EOL+
"---"+os.EOL;
>>>>>>>
var howItWorksNativeProductionPageFrontmatter = "---"+os.EOL+
"title: Native American Lands | Natural Resource Production"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/native-american-production/"+os.EOL+
"redirect_from: /how-it-works/tribal-production/"+os.EOL+
"---"+os.EOL;
var howItWorksOwnershipPageFrontmatter = "---"+os.EOL+
"title: Ownership | How it Works"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/ownership/"+os.EOL+
var howItWorksNativeRevenuePageFrontmatter = "---"+os.EOL+
"title: Native American Lands | Revenue"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/native-american-revenue/"+os.EOL+
"redirect_from: /how-it-works/tribal-revenue/"+os.EOL+
"---"+os.EOL;
var howItWorksNativeImpactPageFrontmatter = "---"+os.EOL+
"title: Native American Lands | Economic Impact"+os.EOL+
"layout: none"+os.EOL+
"permalink: /how-it-works/native-american-economic-impact/"+os.EOL+
"redirect_from: /how-it-works/tribal-economic-impact/"+os.EOL+
"---"+os.EOL;
<<<<<<<
prependFile.sync(__dirname+'/public/how-it-works/ownership/index.html', howItWorksOwnershipPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/native-american-production/index.html', howItWorksNativeProductionPageFrontmatter);
=======
prependFile.sync(__dirname+'/public/how-it-works/native-american-economic-impact/index.html', howItWorksNativeImpactPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/native-american-revenue/index.html', howItWorksNativeRevenuePageFrontmatter);
>>>>>>>
prependFile.sync(__dirname+'/public/how-it-works/ownership/index.html', howItWorksOwnershipPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/native-american-production/index.html', howItWorksNativeProductionPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/native-american-economic-impact/index.html', howItWorksNativeImpactPageFrontmatter);
prependFile.sync(__dirname+'/public/how-it-works/native-american-revenue/index.html', howItWorksNativeRevenuePageFrontmatter); |
<<<<<<<
this.activeSourceHandle = handle;
this.activeSource = source;
this.emit('change');
=======
this.pinnedSourceHandle = handle;
this.pinnedSource = source;
>>>>>>>
this.activeSourceHandle = handle;
this.activeSource = source;
<<<<<<<
this.activeSourceHandle = null;
this.activeSource = null;
this.emit('change');
=======
this.pinnedSourceHandle = null;
this.pinnedSource = null;
>>>>>>>
this.activeSourceHandle = null;
this.activeSource = null; |
<<<<<<<
import {PrivilegeUtils} from "../../utils/PrivilegeUtils";
import {privileges} from "../../constants/privileges-types";
=======
import languages from '../../constants/languages'
>>>>>>>
<<<<<<<
<MenuItemGroup title="Heimdall Project">
{PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_DELETE_CACHES]) &&
<Menu.Item key="heimdall:2">Clear Cache</Menu.Item>
}
=======
<MenuItemGroup title={t('heimdall_project')}>
<Menu.Item key="heimdall:2">{t('clear_cache')}</Menu.Item>
>>>>>>>
<MenuItemGroup title={t('heimdall_project')}>
{PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_DELETE_CACHES]) &&
<Menu.Item key="heimdall:2">{t('clear_cache')}</Menu.Item>
} |
<<<<<<<
import React, {Component} from 'react'
import {connect} from 'react-redux'
import {bindActionCreators} from 'redux'
import {clearResources, getAllResourcesByApi, remove, toggleModal} from '../actions/resources'
=======
import React, { Component } from 'react'
import { connect } from 'react-redux'
import { bindActionCreators } from 'redux'
>>>>>>>
import React, {Component} from 'react'
<<<<<<<
import {Button, Col, Modal, notification, Row, Tooltip} from 'antd'
=======
import {Row, Col, Button, Tooltip, Modal, notification} from 'antd'
>>>>>>>
import {connect} from 'react-redux'
import {bindActionCreators} from 'redux'
import {Button, Col, Modal, notification, Row, Tooltip} from 'antd'
<<<<<<<
import ComponentAuthority from "../components/ComponentAuthority";
import {privileges} from '../constants/privileges-types'
import {PrivilegeUtils} from "../utils/PrivilegeUtils";
=======
import ResourceForm from '../components/resources/ResourceForm'
import { getAllResourcesByApi, clearResources, toggleModal, remove } from '../actions/resources'
>>>>>>>
import {PrivilegeUtils} from "../utils/PrivilegeUtils"
import {privileges} from '../constants/privileges-types'
import ResourceForm from '../components/resources/ResourceForm'
import ComponentAuthority from "../components/ComponentAuthority"
import {clearResources, getAllResourcesByApi, remove, toggleModal} from '../actions/resources'
<<<<<<<
<Modal title="Add Resource"
footer={[
<Button id="cancelAddResource" key="back" onClick={this.handleCancel}>Cancel</Button>,
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_UPDATE_RESOURCE]}>
<Button id="saveResource" key="submit" type="primary" loading={loading} onClick={this.handleSave}>
Save
</Button>
</ComponentAuthority>
]}
visible={this.props.visibleModal}
onCancel={this.handleCancel}
destroyOnClose >
=======
<Modal title={i18n.t('add_resource')}
footer={[
<Button id="cancelAddResource" key="back" onClick={this.handleCancel}>{i18n.t('cancel')}</Button>,
<Button id="saveResource" key="submit" type="primary" loading={loading} onClick={this.handleSave}>
{i18n.t('save')}
</Button>
]}
visible={this.props.visibleModal}
onCancel={this.handleCancel}
destroyOnClose >
>>>>>>>
<Modal title={i18n.t('add_resource')}
footer={[
<Button id="cancelAddResource" key="back" onClick={this.handleCancel}>{i18n.t('cancel')}</Button>,
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_UPDATE_RESOURCE]}>
<Button id="saveResource" key="submit" type="primary" loading={loading} onClick={this.handleSave}>
{i18n.t('save')}
</Button>
</ComponentAuthority>
]}
visible={this.props.visibleModal}
onCancel={this.handleCancel}
destroyOnClose >
<<<<<<<
{ PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_CREATE_RESOURCE]) &&
<Col style={{marginTop: 20}}>
You don't have resources in this <b>API</b>, please <Button id="addResourceWhenListIsEmpty" type="dashed" className="add-tour" onClick={this.addResourceModal}>Add Resource</Button>
</Col>
}
{ !PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_CREATE_RESOURCE]) &&
<Col style={{marginTop: 20}}>
You don't have resources in this <b>API</b>
</Col>
}
=======
<Col style={{ marginTop: 20 }}>
{i18n.t('you_do_not_have_resources_in_this')} <b>{i18n.t('api')}</b>! <Button id="addResourceWhenListIsEmpty" type="dashed" className="add-tour" onClick={this.addResourceModal}>{i18n.t('add_resource')}</Button>
</Col>
>>>>>>>
{ PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_CREATE_RESOURCE]) &&
<Col style={{marginTop: 20}}>
{i18n.t('you_do_not_have_resources_in_this')} <b>{i18n.t('api')}</b>! <Button id="addResourceWhenListIsEmpty" type="dashed" className="add-tour" onClick={this.addResourceModal}>{i18n.t('add_resource')}</Button>
</Col>
}
{ !PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_CREATE_RESOURCE]) &&
<Col style={{marginTop: 20}}>
{i18n.t('you_do_not_have_resources_in_this')} <b>{i18n.t('api')}</b>!
</Col>
}
<<<<<<<
<Tooltip title="Update">
<Button type="primary" icon="edit"
onClick={this.updateResourceModal(resource.id)}/>
=======
<Tooltip title={i18n.t('edit')}>
<Button type="primary" icon="edit" onClick={this.updateResourceModal(resource.id)} />
</Tooltip>
<Tooltip title={i18n.t('delete')}>
<Button type="danger" icon="delete" onClick={this.remove(api.id, resource.id)} />
>>>>>>>
<Tooltip title={i18n.t('edit')}>
<Button type="primary" icon="edit" onClick={this.updateResourceModal(resource.id)} />
<<<<<<<
<br/>
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_RESOURCE]}>
<Row type="flex" justify="end">
<Tooltip title="Add Resource">
<Button id="addResource" className="card-button add-tour" type="primary" icon="plus" onClick={this.addResourceModal} size="large" shape="circle" />
</Tooltip>
</Row>
</ComponentAuthority>
=======
<br />
<Row type="flex" justify="end">
<Tooltip title={i18n.t('add_resource')}>
<Button id="addResource" className="card-button add-tour" type="primary" icon="plus" onClick={this.addResourceModal} size="large" shape="circle" />
</Tooltip>
</Row>
>>>>>>>
<br/>
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_RESOURCE]}>
<Row type="flex" justify="end">
<Tooltip title={i18n.t('add_resource')}>
<Button id="addResource" className="card-button add-tour" type="primary" icon="plus" onClick={this.addResourceModal} size="large" shape="circle" />
</Tooltip>
</Row>
</ComponentAuthority> |
<<<<<<<
import session from './Session'
=======
import navbar from './Navbar'
>>>>>>>
import session from './Session'
import navbar from './Navbar'
<<<<<<<
scopes,
session
=======
scopes,
navbar
>>>>>>>
scopes,
session,
navbar |
<<<<<<<
<Button id="cancelInterceptorTypeModal" key="back" onClick={this.handleCancel}>Cancel</Button>,
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_INTERCEPTOR, privileges.PRIVILEGE_UPDATE_INTERCEPTOR]}>
<Button id="saveInterceptorTypeModal" key="submit" type="primary" onClick={this.handleSave}>
Save
</Button>
</ComponentAuthority>
=======
<Button id="cancelInterceptorTypeModal" key="back" onClick={this.handleCancel}>{i18n.t('cancel')}</Button>,
<Button id="saveInterceptorTypeModal" key="submit" type="primary" onClick={this.handleSave}>
{i18n.t('save')}
</Button>
>>>>>>>
<Button id="cancelInterceptorTypeModal" key="back" onClick={this.handleCancel}>{i18n.t('cancel')}</Button>,
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_INTERCEPTOR, privileges.PRIVILEGE_UPDATE_INTERCEPTOR]}>
<Button id="saveInterceptorTypeModal" key="submit" type="primary" onClick={this.handleSave}>
{i18n.t('save')}
</Button>
</ComponentAuthority> |
<<<<<<<
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_USER]}>
<FloatButton history={history} to="/users/new" label="Add new API" />
</ComponentAuthority>
=======
<FloatButton idButton="addUser" history={history} to="/users/new" label="Add new User" />
>>>>>>>
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_USER]}>
<FloatButton idButton="addUser" history={history} to="/users/new" label="Add new User" />
</ComponentAuthority> |
<<<<<<<
import {PrivilegeUtils} from "../../utils/PrivilegeUtils";
import {privileges} from "../../constants/privileges-types";
=======
import { isEmpty } from '../../utils/CommonUtils'
import { toggleModal, resetResource, getResource, save, update } from '../../actions/resources'
>>>>>>>
import { isEmpty } from '../../utils/CommonUtils'
import {PrivilegeUtils} from "../../utils/PrivilegeUtils"
import {privileges} from "../../constants/privileges-types"
import { toggleModal, resetResource, getResource, save, update } from '../../actions/resources'
<<<<<<<
rules: [{ required: true, message: 'Please input your api name!' }]
})(<Input required disabled={!PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_CREATE_RESOURCE, privileges.PRIVILEGE_UPDATE_RESOURCE])}/>)
=======
rules: [{ required: true, message: i18n.t('please_input_api_name') }]
})(<Input required />)
>>>>>>>
rules: [{ required: true, message: i18n.t('please_input_api_name') }]
})(<Input required disabled={!PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_CREATE_RESOURCE, privileges.PRIVILEGE_UPDATE_RESOURCE])}/>) |
<<<<<<<
initialValue: api.basePath,
rules: [{ required: true, message: i18n.t('please_input_your_api_base_path') }]
})(<Input />)
=======
initialValue: api.basePath.replace("/", ""),
rules: [{ required: true, message: 'Please input your api base path!' }]
})(<Input addonBefore={"/"}/>)
>>>>>>>
initialValue: api.basePath.replace("/", ""),
rules: [{ required: true, message: i18n.t('please_input_your_api_base_path') }]
})(<Input addonBefore={"/"}/>) |
<<<<<<<
dispatch(getAllAccessTokens({offset: offset, limit: 10}))
dispatch(sendNotification({ type: 'success', message: 'Access Token removed' }))
=======
dispatch(getAllAccessTokens(offset))
dispatch(sendNotification({ type: 'success', message: i18n.t('access_token_removed') }))
>>>>>>>
dispatch(getAllAccessTokens({offset: offset, limit: 10}))
dispatch(sendNotification({ type: 'success', message: i18n.t('access_token_removed') })) |
<<<<<<<
import Loading from '../ui/Loading';
import ColorUtils from "../../utils/ColorUtils";
import {PrivilegeUtils} from "../../utils/PrivilegeUtils";
import {privileges} from "../../constants/privileges-types";
import ComponentAuthority from "../ComponentAuthority";
=======
import i18n from "../../i18n/i18n"
import Loading from '../ui/Loading'
import ColorUtils from "../../utils/ColorUtils"
>>>>>>>
import i18n from "../../i18n/i18n"
import Loading from '../ui/Loading'
import ColorUtils from "../../utils/ColorUtils"
import ComponentAuthority from "../ComponentAuthority"
import {PrivilegeUtils} from "../../utils/PrivilegeUtils"
import {privileges} from "../../constants/privileges-types"
<<<<<<<
=======
{ !app &&
<Col sm={24} md={24}>
<FormItem label={i18n.t('client_id')}>
{
getFieldDecorator('clientId', {
initialValue: app && app.clientId,
rules: [
{min: 6, message: i18n.t('min_6_characters_to_client_id')}
]
})(<Input/>)
}
</FormItem>
</Col>
>>>>>>>
<<<<<<<
<Table dataSource={accessTokens} pagination={false} rowKey={record => record.id}>
<Column title="Status" id="status" key="status" render={(record) => (
<span>
<Tag color={ColorUtils.getColorActivate(record.status)}>{record.status}</Tag>
=======
<Table dataSource={data} pagination={false} rowKey={record => record.id}>
<Column title={i18n.t('status')} id="status" key="status" render={(record) => (
<span style={{textTransform: 'uppercase'}}>
<Tag color={ColorUtils.getColorActivate(record.status)}>{record.status === 'ACTIVE' ? i18n.t('active') : i18n.t('inactive')}</Tag>
>>>>>>>
<Table dataSource={accessTokens} pagination={false} rowKey={record => record.id}>
<Column title={i18n.t('status')} id="status" key="status" render={(record) => (
<span>
<Tag color={ColorUtils.getColorActivate(record.status)}>{record.status === 'ACTIVE' ? i18n.t('active') : i18n.t('inactive')}</Tag>
<<<<<<<
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_DELETE_APP]}>
<Tooltip title="Delete">
<Button id="deleteApp" className="card-button" type="danger" ghost icon="delete" size="large"
shape="circle"
disabled={!app} onClick={app && this.showDeleteConfirm(app.id)} loading={loading}/>
</Tooltip>
</ComponentAuthority>
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_APP]}>
<Tooltip title="Save">
<Button id="saveApp" className="card-button" type="primary" icon="save" size="large" shape="circle"
onClick={this.onSubmitForm} loading={loading}/>
</Tooltip>
</ComponentAuthority>
=======
<Tooltip title={i18n.t('delete')}>
<Button id="deleteApp" className="card-button" type="danger" ghost icon="delete" size="large" shape="circle"
disabled={!app} onClick={app && this.showDeleteConfirm(app.id)} loading={loading}/>
</Tooltip>
<Tooltip title={i18n.t('save')}>
<Button id="saveApp" className="card-button" type="primary" icon="save" size="large" shape="circle"
onClick={this.onSubmitForm} loading={loading}/>
</Tooltip>
>>>>>>>
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_DELETE_APP]}>
<Tooltip title={i18n.t('delete')}>
<Button id="deleteApp" className="card-button" type="danger" ghost icon="delete" size="large"
shape="circle"
disabled={!app} onClick={app && this.showDeleteConfirm(app.id)} loading={loading}/>
</Tooltip>
</ComponentAuthority>
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_APP]}>
<Tooltip title={i18n.t('save')}>
<Button id="saveApp" className="card-button" type="primary" icon="save" size="large" shape="circle"
onClick={this.onSubmitForm} loading={loading}/>
</Tooltip>
</ComponentAuthority> |
<<<<<<<
import React, {Component} from 'react'
// import FloatMenu from '../ui/FloatMenu'
import {Form, Input, Row, Col, Checkbox, Switch, Tooltip, Button, Modal} from 'antd'
import ComponentAuthority from "../ComponentAuthority";
import { privileges } from '../../constants/privileges-types'
import {PrivilegeUtils} from "../../utils/PrivilegeUtils";
=======
import React, { Component } from 'react'
import { Form, Input, Row, Col, Checkbox, Switch, Tooltip, Button, Modal } from 'antd'
>>>>>>>
import React, {Component} from 'react'
import { Form, Input, Row, Col, Checkbox, Switch, Tooltip, Button, Modal } from 'antd'
import i18n from "../../i18n/i18n"
import ComponentAuthority from "../ComponentAuthority"
import {PrivilegeUtils} from "../../utils/PrivilegeUtils"
import { privileges } from '../../constants/privileges-types'
<<<<<<<
rules: [{required: true, message: 'Please input your api name!'}]
})(<Input disabled={!PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_UPDATE_API])}/>)
=======
rules: [{ required: true, message: i18n.t('please_input_your_api_name') }]
})(<Input />)
>>>>>>>
rules: [{required: true, message: i18n.t('please_input_your_api_name') }]
})(<Input disabled={!PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_UPDATE_API])}/>)
<<<<<<<
rules: [{required: true, message: 'Please input your api version!'}]
})(<Input disabled={!PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_UPDATE_API])}/>)
=======
rules: [{ required: true, message: i18n.t('please_input_your_api_version') }]
})(<Input />)
>>>>>>>
rules: [{required: true, message: i18n.t('please_input_your_api_version') }]
})(<Input disabled={!PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_UPDATE_API])}/>)
<<<<<<<
rules: [{required: true, message: 'Please input your api description!'}]
})(<Input disabled={!PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_UPDATE_API])}/>)
=======
rules: [{ required: true, message: i18n.t('please_input_your_api_description') }]
})(<Input />)
>>>>>>>
rules: [{required: true, message: i18n.t('please_input_your_api_description') }]
})(<Input disabled={!PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_UPDATE_API])}/>)
<<<<<<<
initialValue: api.basePath,
rules: [{required: true, message: 'Please input your api base path!'}]
})(<Input addonBefore={"/"} disabled={!PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_UPDATE_API])}/>)
=======
initialValue: api.basePath.replace("/", ""),
rules: [{ required: true, message: i18n.t('please_input_your_api_base_path') }]
})(<Input addonBefore={"/"}/>)
>>>>>>>
initialValue: api.basePath.replace("/", ""),
rules: [{required: true, message: i18n.t('please_input_your_api_base_path') }]
})(<Input addonBefore={"/"} disabled={!PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_UPDATE_API])}/>)
<<<<<<<
rules: [{required: true, message: 'Please input your api base path!'}]
})(<Switch required disabled={!PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_UPDATE_API])}/>)
=======
rules: [{ required: true, message: i18n.t('please_select_your_api_status') }]
})(<Switch required />)
>>>>>>>
rules: [{required: true, message: i18n.t('please_select_your_api_status') }]
})(<Switch required disabled={!PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_UPDATE_API])}/>)
<<<<<<<
rules: [{required: true, message: 'Please select an environment'}]
})(<Checkbox.Group className='checkbox-conductor' options={options} disabled={!PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_UPDATE_API])}/>)
=======
rules: [{ required: true, message: i18n.t('please_select_an_environment') }]
})(<Checkbox.Group className='checkbox-conductor' options={options} />)
>>>>>>>
rules: [{required: true, message: i18n.t('please_select_an_environment') }]
})(<Checkbox.Group className='checkbox-conductor' options={options} disabled={!PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_UPDATE_API])}/>)
<<<<<<<
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_DELETE_API]}>
<Tooltip title="Delete">
<Button id="deleteApi" className="card-button" type="danger" ghost icon="delete"
onClick={this.showDeleteConfirm} size="large" shape="circle"/>
</Tooltip>
</ComponentAuthority>
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_UPDATE_API]}>
<Tooltip title="Save">
<Button id="saveApi" className="card-button" type="primary" icon="save" onClick={this.onSubmitApi}
size="large" shape="circle"/>
</Tooltip>
</ComponentAuthority>
=======
<Tooltip title={i18n.t('delete')}>
<Button id="deleteApi" className="card-button" type="danger" ghost icon="delete" onClick={this.showDeleteConfirm} size="large" shape="circle" />
</Tooltip>
<Tooltip title={i18n.t('save')}>
<Button id="saveApi" className="card-button" type="primary" icon="save" onClick={this.onSubmitApi} size="large" shape="circle" />
</Tooltip>
>>>>>>>
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_DELETE_API]}>
<Tooltip title={i18n.t('delete')}>
<Button id="deleteApi" className="card-button" type="danger" ghost icon="delete" onClick={this.showDeleteConfirm} size="large" shape="circle" />
</Tooltip>
</ComponentAuthority>
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_UPDATE_API]}>
<Tooltip title={i18n.t('save')}>
<Button id="saveApi" className="card-button" type="primary" icon="save" onClick={this.onSubmitApi} size="large" shape="circle" />
</Tooltip>
</ComponentAuthority> |
<<<<<<<
initialValue: api.basePath,
rules: [{required: true, message: 'Please input your api base path!'}]
})(<Input disabled={!PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_UPDATE_API])}/>)
=======
initialValue: api.basePath.replace("/", ""),
rules: [{ required: true, message: 'Please input your api base path!' }]
})(<Input addonBefore={"/"}/>)
>>>>>>>
initialValue: api.basePath,
rules: [{required: true, message: 'Please input your api base path!'}]
})(<Input addonBefore={"/"} disabled={!PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_UPDATE_API])}/>)
<<<<<<<
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_DELETE_API]}>
<Tooltip title="Delete">
<Button className="card-button" type="danger" ghost icon="delete"
onClick={this.showDeleteConfirm} size="large" shape="circle"/>
</Tooltip>
</ComponentAuthority>
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_UPDATE_API]}>
<Tooltip title="Save">
<Button className="card-button" type="primary" icon="save" onClick={this.onSubmitApi}
size="large" shape="circle"/>
</Tooltip>
</ComponentAuthority>
=======
<Tooltip title="Delete">
<Button id="deleteApi" className="card-button" type="danger" ghost icon="delete" onClick={this.showDeleteConfirm} size="large" shape="circle" />
</Tooltip>
<Tooltip title="Save">
<Button id="saveApi" className="card-button" type="primary" icon="save" onClick={this.onSubmitApi} size="large" shape="circle" />
</Tooltip>
>>>>>>>
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_DELETE_API]}>
<Tooltip title="Delete">
<Button id="deleteApi" className="card-button" type="danger" ghost icon="delete"
onClick={this.showDeleteConfirm} size="large" shape="circle"/>
</Tooltip>
</ComponentAuthority>
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_UPDATE_API]}>
<Tooltip title="Save">
<Button id="saveApi" className="card-button" type="primary" icon="save" onClick={this.onSubmitApi}
size="large" shape="circle"/>
</Tooltip>
</ComponentAuthority> |
<<<<<<<
rules: [{ required: true, message: i18n.t('please_input_operation_path') }]
})(<Input required />)
=======
rules: [{ required: true, message: 'Please input your api path!' }]
})(<Input addonBefore={this.props.apiBasepath + "/"} required />)
>>>>>>>
rules: [{ required: true, message: i18n.t('please_input_operation_path') }]
})(<Input addonBefore={this.props.apiBasepath + "/"} required />) |
<<<<<<<
'default_plan_this_api': 'Plano padrão',
'swagger-editor': 'Editor do Swagger'
=======
'default_plan_this_api': 'Plano padrão',
'failed_to_get_privileges_this_user': 'Falha ao obter os privilégios do usuário!',
'session_expired': 'Sessão expirada',
'change_password': 'Alterar senha',
'current_password': 'Senha atual',
'please_input_current_password': 'Por favor, digite a senha atual!',
'max_16_characters_to_current_password': 'A senha atual permite até 16 caracteres!',
'new_password': 'Nova senha',
'please_input_new_password': 'Por favor, digite a nova senha!',
'max_16_characters_to_new_password': 'Limite de 16 caracteres para a nova senha!',
'confirm_new_password': 'Confirmar senha nova',
'please_input_confirm_new_password': 'Por favor, confirme a senha nova!',
'max_16_characters_to_confirm_new_password': 'Limite de 16 caracteres para a confirmação da nova senha!',
'min_5_characters_to_current_password': 'A senha atual deve conter no mínimo 5 caracteres!',
'min_5_characters_to_new_password': 'A nova senha deve conter no mínimo 5 caracteres!',
'min_5_characters_to_confirm_new_password': 'A confirmação da senha deve conter no mínimo 5 caracteres!'
>>>>>>>
'default_plan_this_api': 'Plano padrão',
'failed_to_get_privileges_this_user': 'Falha ao obter os privilégios do usuário!',
'session_expired': 'Sessão expirada',
'change_password': 'Alterar senha',
'current_password': 'Senha atual',
'please_input_current_password': 'Por favor, digite a senha atual!',
'max_16_characters_to_current_password': 'A senha atual permite até 16 caracteres!',
'new_password': 'Nova senha',
'please_input_new_password': 'Por favor, digite a nova senha!',
'max_16_characters_to_new_password': 'Limite de 16 caracteres para a nova senha!',
'confirm_new_password': 'Confirmar senha nova',
'please_input_confirm_new_password': 'Por favor, confirme a senha nova!',
'max_16_characters_to_confirm_new_password': 'Limite de 16 caracteres para a confirmação da nova senha!',
'min_5_characters_to_current_password': 'A senha atual deve conter no mínimo 5 caracteres!',
'min_5_characters_to_new_password': 'A nova senha deve conter no mínimo 5 caracteres!',
'min_5_characters_to_confirm_new_password': 'A confirmação da senha deve conter no mínimo 5 caracteres!'
'swagger-editor': 'Editor do Swagger' |
<<<<<<<
this.account.addUnknownAssetData();
=======
// Search for user federation
await this.handlers.searchFederation(this.account.accountId());
>>>>>>>
this.account.addUnknownAssetData();
// Search for user federation
await this.handlers.searchFederation(this.account.accountId());
<<<<<<<
// Using buildSignSubmit is the preferred way to go. It handles sequence numbers correctly.
// If you use sign, you have to pay attention to sequence numbers because js-stellar-sdk's .build() updates it magically
// The reason this doesn't take in a TransactionBuilder so we can call build() here is that there
// are cases when we want to paste in a raw transaction and sign that
=======
// Using buildSignSubmit is the preferred way to go. It handles sequence numbers correctly.
// If you use sign, you have to pay attention to sequence numbers because js-stellar-sdk's .build() updates it magically
// The reason this doesn't take in a TransactionBuilder so we can call build() here is that there
// are cases when we want to paste in a raw transaction and sign that
>>>>>>>
// Using buildSignSubmit is the preferred way to go. It handles sequence numbers correctly.
// If you use sign, you have to pay attention to sequence numbers because js-stellar-sdk's .build() updates it magically
// The reason this doesn't take in a TransactionBuilder so we can call build() here is that there
// are cases when we want to paste in a raw transaction and sign that |
<<<<<<<
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_DELETE_PLAN]}>
<Tooltip title="Delete">
<Button id="deletePlan" className="card-button" type="danger" ghost icon="delete" size="large" shape="circle" disabled={!plan} onClick={plan && this.showDeleteConfirm(plan.id)} loading={loading} />
</Tooltip>
</ComponentAuthority>
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_PLAN, privileges.PRIVILEGE_UPDATE_PLAN]}>
<Tooltip title="Save">
<Button className="card-button" type="primary" icon="save" size="large" shape="circle" onClick={this.onSubmitForm} loading={loading} />
</Tooltip>
</ComponentAuthority>
=======
<Tooltip title={i18n.t('delete')}>
<Button id="deletePlan" className="card-button" type="danger" ghost icon="delete" size="large" shape="circle" disabled={!plan} onClick={plan && this.showDeleteConfirm(plan.id)} loading={loading} />
</Tooltip>
<Tooltip title={i18n.t('save')}>
<Button id="savePlan" className="card-button" type="primary" icon="save" size="large" shape="circle" onClick={this.onSubmitForm} loading={loading} />
</Tooltip>
>>>>>>>
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_DELETE_PLAN]}>
<Tooltip title={i18n.t('delete')}>
<Button id="deletePlan" className="card-button" type="danger" ghost icon="delete" size="large" shape="circle" disabled={!plan} onClick={plan && this.showDeleteConfirm(plan.id)} loading={loading} />
</Tooltip>
</ComponentAuthority>
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_PLAN, privileges.PRIVILEGE_UPDATE_PLAN]}>
<Tooltip title={i18n.t('save')}>
<Button className="card-button" type="primary" icon="save" size="large" shape="circle" onClick={this.onSubmitForm} loading={loading} />
</Tooltip>
</ComponentAuthority> |
<<<<<<<
import ComponentAuthority from "../components/ComponentAuthority";
import {privileges} from "../constants/privileges-types";
=======
import ListEnvironments from '../components/environments/ListEnvironments'
import { getAllEnvironments, remove, initLoading } from '../actions/environments'
>>>>>>>
import {privileges} from "../constants/privileges-types"
import ComponentAuthority from "../components/ComponentAuthority"
import ListEnvironments from '../components/environments/ListEnvironments'
import { getAllEnvironments, remove, initLoading } from '../actions/environments'
<<<<<<<
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_ENVIRONMENT]}>
<FloatButton idButton="addEnvironment" history={history} to="/environments/new" label="Add new Environment" />
</ComponentAuthority>
=======
<FloatButton idButton="addEnvironment" history={history} to="/environments/new" label={i18n.t('add_new_environment')} />
>>>>>>>
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_ENVIRONMENT]}>
<FloatButton idButton="addEnvironment" history={history} to="/environments/new" label={i18n.t('add_new_environment')} />
</ComponentAuthority> |
<<<<<<<
let columns = [{
title: 'Key',
=======
const columns = [{
title: i18n.t('key'),
>>>>>>>
let columns = [{
title: i18n.t('key'),
<<<<<<<
}, {
title: 'Value',
=======
},{
title: i18n.t('value'),
>>>>>>>
}, {
title: i18n.t('value'),
<<<<<<<
{getFieldDecorator(elementId, {
initialValue: val,
rules: [{
required: true,
message: 'Please input value!'
}
]
}
)(<Input disabled={!PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_CREATE_ENVIRONMENT, privileges.PRIVILEGE_UPDATE_ENVIRONMENT])}/>)}
=======
{ getFieldDecorator(elementId, {
initialValue: val,
rules: [{
required: true,
message: i18n.t('please_input_value') }
]}
)(<Input />) }
>>>>>>>
{getFieldDecorator(elementId, {
initialValue: val,
rules: [{
required: true,
message: i18n.t('please_input_value')
}]
}
)(<Input disabled={!PrivilegeUtils.verifyPrivileges([privileges.PRIVILEGE_CREATE_ENVIRONMENT, privileges.PRIVILEGE_UPDATE_ENVIRONMENT])}/>)} |
<<<<<<<
this.account.addUnknownAssetData();
// Search for user federation
await this.handlers.searchFederation(this.account.accountId());
=======
>>>>>>>
this.account.addUnknownAssetData(); |
<<<<<<<
<Button key="back" onClick={this.handleCancel}>Cancel</Button>,
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_INTERCEPTOR, privileges.PRIVILEGE_UPDATE_INTERCEPTOR]}>
<Button key="submit" type="primary" onClick={this.handleSave}>
Save
</Button>
</ComponentAuthority>
=======
<Button id="cancelInterceptorTypeModal" key="back" onClick={this.handleCancel}>Cancel</Button>,
<Button id="saveInterceptorTypeModal" key="submit" type="primary" onClick={this.handleSave}>
Save
</Button>
>>>>>>>
<Button id="cancelInterceptorTypeModal" key="back" onClick={this.handleCancel}>Cancel</Button>,
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_INTERCEPTOR, privileges.PRIVILEGE_UPDATE_INTERCEPTOR]}>
<Button id="saveInterceptorTypeModal" key="submit" type="primary" onClick={this.handleSave}>
Save
</Button>
</ComponentAuthority> |
<<<<<<<
dispatch(sendNotification({ type: 'success', message: 'Role removed' }))
dispatch(finishLoading())
=======
dispatch(sendNotification({ type: 'success', message: i18n.t('role_removed') }))
>>>>>>>
dispatch(sendNotification({ type: 'success', message: i18n.t('role_removed') }))
dispatch(finishLoading()) |
<<<<<<<
<Button key="back" onClick={this.handleCancel}>Cancel</Button>,
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_OPERATION, privileges.PRIVILEGE_UPDATE_OPERATION]}>
<Button key="submit" type="primary" loading={loading} onClick={this.handleSave}>Save</Button>
</ComponentAuthority>
=======
<Button id="cancelAddOperation" key="back" onClick={this.handleCancel}>Cancel</Button>,
<Button id="saveOperation" key="submit" type="primary" loading={loading} onClick={this.handleSave}>Save</Button>
>>>>>>>
<Button id="cancelAddOperation" key="back" onClick={this.handleCancel}>Cancel</Button>,
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_OPERATION, privileges.PRIVILEGE_UPDATE_OPERATION]}>
<Button id="saveOperation" key="submit" type="primary" loading={loading} onClick={this.handleSave}>Save</Button>
</ComponentAuthority>
<<<<<<<
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_OPERATION]}>
<Row type="flex" justify="center">
<Tooltip title="Add Operation">
<Button type="dashed" icon="plus" onClick={this.showOperationModal()}>Add Operation</Button>
</Tooltip>
</Row>
</ComponentAuthority>
=======
<Row type="flex" justify="center">
<Tooltip title="Add Operation">
<Button id="addOperation" type="dashed" icon="plus" onClick={this.showOperationModal()}>Add Operation</Button>
</Tooltip>
</Row>
>>>>>>>
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_OPERATION]}>
<Row type="flex" justify="center">
<Tooltip title="Add Operation">
<Button id="addOperation" type="dashed" icon="plus" onClick={this.showOperationModal()}>Add Operation</Button>
</Tooltip>
</Row>
</ComponentAuthority> |
<<<<<<<
import ComponentAuthority from "../components/ComponentAuthority";
import {privileges} from "../constants/privileges-types";
=======
import i18n from "../i18n/i18n"
>>>>>>>
<<<<<<<
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_MIDDLEWARE]}>
<Card
title="Upload middleware"
style={{marginBottom: 20}}
className="inside-shadow"
>
<Row>
<Input placeholder="version" onChange={(event) => this.handleOnChangeVersion(event)}
addonBefore="Version" value={this.state.version}/>
</Row>
<br/>
<Row>
<Dragger id="dragMiddleware" {...propsFileUpload} disabled={this.verifyVersionIsEmpty()}>
<p className="ant-upload-drag-icon">
<Icon type="inbox"/>
</p>
<p className="ant-upload-text">Click or drag middleware to this area to upload</p>
<p className="ant-upload-hint">Support for a single upload. Strictly prohibit from uploading
company data or other band files</p>
</Dragger>
</Row>
</Card>
</ComponentAuthority>
=======
<Card
title={i18n.t('upload_middleware')}
style={{marginBottom: 20}}
className="inside-shadow"
>
<Row>
<Input placeholder={i18n.t('version')} onChange={(event) => this.handleOnChangeVersion(event)}
addonBefore={i18n.t('version')} value={this.state.version}/>
</Row>
<br/>
<Row>
<Dragger id="dragMiddleware" {...propsFileUpload} disabled={this.verifyVersionIsEmpty()}>
<p className="ant-upload-drag-icon">
<Icon type="inbox"/>
</p>
<p className="ant-upload-text">{i18n.t('click_or_drag_middleware_to_this_area_to_upload')}</p>
<p className="ant-upload-hint">{i18n.t('support_for_single_upload_at_time')}</p>
</Dragger>
</Row>
</Card>
>>>>>>>
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_MIDDLEWARE]}>
<Card
title={i18n.t('upload_middleware')}
style={{marginBottom: 20}}
className="inside-shadow"
>
<Row>
<Input placeholder={i18n.t('version')} onChange={(event) => this.handleOnChangeVersion(event)}
addonBefore={i18n.t('version')} value={this.state.version}/>
</Row>
<br/>
<Row>
<Dragger id="dragMiddleware" {...propsFileUpload} disabled={this.verifyVersionIsEmpty()}>
<p className="ant-upload-drag-icon">
<Icon type="inbox"/>
</p>
<p className="ant-upload-text">{i18n.t('click_or_drag_middleware_to_this_area_to_upload')}</p>
<p className="ant-upload-hint">{i18n.t('support_for_single_upload_at_time')}</p>
</Dragger>
</Row>
</Card>
</ComponentAuthority> |
<<<<<<<
import React, {Component} from 'react'
import {connect} from 'react-redux'
=======
import React, { Component } from 'react'
import { connect } from 'react-redux'
//components
import { Row, Form, Card, Input, Col, notification } from 'antd'
>>>>>>>
import React, { Component } from 'react'
import { connect } from 'react-redux'
//components
import {Row, Button, Form, Card, Input, Col, notification} from 'antd'
<<<<<<<
//components
import {Row, Button, Form, Card, Input, Col, notification} from 'antd'
import PageHeader from '../components/ui/PageHeader'
import ListAccessTokens from '../components/access-tokens/ListAccessTokens'
=======
import i18n from "../i18n/i18n"
>>>>>>>
//components
import i18n from "../i18n/i18n"
<<<<<<<
import ComponentAuthority from "../components/ComponentAuthority";
import { privileges } from "../constants/privileges-types";
=======
import ListAccessTokens from '../components/access-tokens/ListAccessTokens'
>>>>>>>
import { privileges } from "../constants/privileges-types"
import ComponentAuthority from "../components/ComponentAuthority"
import ListAccessTokens from '../components/access-tokens/ListAccessTokens'
<<<<<<<
<PageHeader title="Access Tokens" icon="key"/>
=======
<PageHeader title={i18n.t('access_tokens')} icon="key" />
>>>>>>>
<PageHeader title={i18n.t('access_tokens')} icon="key"/>
<<<<<<<
{getFieldDecorator('code')(<Input.Search onSearch={this.onSearchForm}
placeholder="Token"/>)}
=======
{getFieldDecorator('code')(<Input.Search onSearch={this.onSearchForm} placeholder={i18n.t('token')} />)}
>>>>>>>
{getFieldDecorator('code')(<Input.Search onSearch={this.onSearchForm} placeholder={i18n.t('token')} />)}
<<<<<<<
<ListAccessTokens dataSource={accessTokens} handleDelete={this.handleDelete} handlePagination={this.handlePagination} loading={loading}/>
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_ACCESSTOKEN]}>
<FloatButton idButton="addAccessToken" history={history} to="/tokens/new" label="Add new Access Token"/>
</ComponentAuthority>
=======
<ListAccessTokens dataSource={accessTokens} handleDelete={this.handleDelete} handlePagination={this.handlePagination} loading={loading} />
<FloatButton idButton="addAccessToken" history={history} to="/tokens/new" label={i18n.t('add_new_access_token')} />
>>>>>>>
<ListAccessTokens dataSource={accessTokens} handleDelete={this.handleDelete} handlePagination={this.handlePagination} loading={loading}/>
<ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_ACCESSTOKEN]}>
<FloatButton idButton="addAccessToken" history={history} to="/tokens/new" label={i18n.t('add_new_access_token')} />
</ComponentAuthority> |
<<<<<<<
displace = $menu.data('displace'),
=======
onOpen = $menu.data('onOpen'),
onClose = $menu.data('onClose'),
>>>>>>>
displace = $menu.data('displace'),
onOpen = $menu.data('onOpen'),
onClose = $menu.data('onClose'),
<<<<<<<
name : 'sidr', // Name for the 'sidr'
speed : 200, // Accepts standard jQuery effects speeds (i.e. fast, normal or milliseconds)
side : 'left', // Accepts 'left' or 'right'
source : null, // Override the source of the content.
renaming : true, // The ids and classes will be prepended with a prefix when loading existent content
body : 'body', // Page container selector,
displace: true // Displace the body content or not
=======
name : 'sidr', // Name for the 'sidr'
speed : 200, // Accepts standard jQuery effects speeds (i.e. fast, normal or milliseconds)
side : 'left', // Accepts 'left' or 'right'
source : null, // Override the source of the content.
renaming : true, // The ids and classes will be prepended with a prefix when loading existent content
body : 'body', // Page container selector,
onOpen : function() {}, // Callback when sidr opened
onClose : function() {} // Callback when sidr closed
>>>>>>>
name : 'sidr', // Name for the 'sidr'
speed : 200, // Accepts standard jQuery effects speeds (i.e. fast, normal or milliseconds)
side : 'left', // Accepts 'left' or 'right'
source : null, // Override the source of the content.
renaming : true, // The ids and classes will be prepended with a prefix when loading existent content
body : 'body', // Page container selector,
displace: true, // Displace the body content or not
onOpen : function() {}, // Callback when sidr opened
onClose : function() {} // Callback when sidr closed
<<<<<<<
body : settings.body,
displace : settings.displace
=======
body : settings.body,
onOpen : settings.onOpen,
onClose : settings.onClose
>>>>>>>
body : settings.body,
displace : settings.displace,
onOpen : settings.onOpen,
onClose : settings.onClose |
<<<<<<<
import FAQPage from './pages/FAQPage'
=======
import AuthPage from './pages/AuthPage'
>>>>>>>
import FAQPage from './pages/FAQPage'
import AuthPage from './pages/AuthPage'
<<<<<<<
<Route path="/faqs" component={FAQPage} />
=======
<Route path="/auth" component={AuthPage} />
>>>>>>>
<Route path="/faqs" component={FAQPage} />
<Route path="/auth" component={AuthPage} /> |
<<<<<<<
=======
import TopArea from 'components/TopArea';
import AppsGrid from 'components/AppsGrid';
import WhyBS from 'components/WhyBS';
import OurTechnology from 'components/OurTechnology';
import OurCommunity from 'components/OurCommunity';
import FundApp from 'components/FundApp';
import Mission from 'components/Mission';
import Footer from 'components/Footer';
>>>>>>>
import TopArea from 'components/TopArea';
import AppsGrid from 'components/AppsGrid';
import WhyBS from 'components/WhyBS';
import OurTechnology from 'components/OurTechnology';
import OurCommunity from 'components/OurCommunity';
import FundApp from 'components/FundApp';
import Mission from 'components/Mission';
import Footer from 'components/Footer';
<<<<<<<
<Header />
<Hero />
<Footer />
=======
<Header/>
<TopArea/>
<AppsGrid/>
<WhyBS/>
<OurTechnology/>
<OurCommunity/>
<FundApp/>
<Mission/>
<Footer/>
>>>>>>>
<Header/>
<TopArea/>
<AppsGrid/>
<WhyBS/>
<OurTechnology/>
<OurCommunity/>
<FundApp/>
<Mission/>
<Footer/> |
<<<<<<<
<div className="landing-page">
<Header links={bslinks}/>
<TopArea links={bslinks}/>
<AppsGrid links={bslinks}/>
=======
<div>
<TopArea/>
<AppsGrid/>
>>>>>>>
<div>
<TopArea links={data.site.siteMetadata.bslinks} />
<AppsGrid links={data.site.siteMetadata.bslinks} />
<<<<<<<
<Footer links={bslinks} />
=======
>>>>>>> |
<<<<<<<
import React from 'react'
import {Link} from 'react-router'
import DocumentTitle from 'react-document-title'
import YoutubeModal from 'react-youtube-modal'
import Header from '../components/Header'
import MailchimpForm from '../components/MailchimpForm'
const HomePage = () => {
const subscribeURL = '//blockstack.us14.list-manage.com/subscribe/post?u=394a2b5cfee9c4b0f7525b009&id=0e5478ae86'
return (
<DocumentTitle title="Blockstack, building the decentralized internet">
<div>
<Header transparent={true} />
<section className="jumbotron jumbotron-fluid">
<div className="container">
<div className="row">
<div className="col-md-7">
<div className="own-your-data">
<h1 className="page-heading m-b-20 mt-1 mt-md-5">
Own your data
=======
import { Component } from 'react'
import { Link } from 'react-router'
import DocumentTitle from 'react-document-title'
import { bindActionCreators } from 'redux'
import { connect } from 'react-redux'
import { BlogActions } from '../datastore/Blog'
import { StatsActions } from '../datastore/Stats'
import Image from '../components/Image'
import Alert from '../components/Alert'
import Header from '../components/Header'
import EmbedYouTube from '../components/EmbedYouTube'
import MultiVideoPlayer from '../components/MultiVideoPlayer'
import MailchimpForm from '../components/MailchimpForm'
import PostPreview from '../components/PostPreview'
import { featuredApps } from '../config'
function mapStateToProps(state) {
return {
posts: state.blog.posts,
stats: state.stats,
}
}
function mapDispatchToProps(dispatch) {
return bindActionCreators(
Object.assign({}, BlogActions, StatsActions),
dispatch,
)
}
class HomePage extends Component {
constructor(props) {
super(props)
this.state = {
videos: [
{
src: 'https://www.youtube.com/embed/7SmC7AuZNWY',
previewImageUrl: '/images/resources/video-home-1-preview.jpg',
thumbnailImageUrl: '/images/resources/video-home-1-thumbnail.jpg',
},
{
src: 'https://www.youtube.com/embed/qtOIh93Hvuw',
previewImageUrl: '/images/resources/video-home-2-thumbnail.jpg',
thumbnailImageUrl: '/images/resources/video-home-2-thumbnail.jpg',
},
{
src: 'https://www.youtube.com/embed/YzlyEuRfXxo',
previewImageUrl: '/images/resources/video-home-3-thumbnail.jpg',
thumbnailImageUrl: '/images/resources/video-home-3-thumbnail.jpg',
},
],
stats: this.props.stats,
posts: this.props.posts,
}
}
componentWillMount() {
if (this.props.posts.length === 0) {
this.props.fetchPosts()
}
this.props.fetchStats()
}
componentWillReceiveProps(nextProps) {
if (nextProps.stats !== this.props.stats) {
let stats = nextProps.stats
if (stats.domains === 0) {
stats.domains = 72000
}
this.setState({
stats: stats,
})
}
if (nextProps.posts !== this.props.posts) {
this.setState({
posts: nextProps.posts,
})
}
}
render() {
const firstThreePosts = this.state.posts.slice(0, 3)
const content = {
fullStack: [
{
title: 'Identity',
body:
'With Blockstack, users get digital keys that let them own their identity. They sign in to apps locally without remote servers or identity providers.',
},
{
title: 'Storage',
body:
"Blockstack's storage system allows users to bring their own storage providers and control their data. Data is encrypted and easily shared between applications.",
},
{
title: 'Tokens',
body:
'Blockstack uses Bitcoin and other crypto-currencies for simple peer-to-peer payments. Developers can charge for downloads, subscriptions, and more.',
},
],
appPossibilities: [
{
title: 'Decentralized Social Networks',
body:
'Existing social networks lock in users and limit access. Build a decentralized social network that allows users to own their relationships and data and take it with them wherever they go.',
},
{
title: 'Peer-to-peer Marketplaces',
body:
'Existing marketplaces take a massive haircut and limit what can be bought and sold. Build a peer-to-peer marketplace that allows individuals to freely transact at a lower cost.',
},
{
title: 'Collaborative Search Engines',
body:
'The web was built to be open and accessible but today the search indexes we rely upon are proprietary. Build a platform that incentivizes people to contribute to a collaborative index.',
},
],
}
const subscribeURL =
'//blockstack.us14.list-manage.com/subscribe/post?u=394a2b5cfee9c4b0f7525b009&id=0e5478ae86'
return (
<DocumentTitle title="Blockstack, building the decentralized internet">
<div className="body-hero">
<div className="w-100" style={{ overflow: 'hidden' }}>
<div>
{/* <Alert /> */}
<Header transparent={true} />
<div className="container">
<section className="hero text-center">
<h1 className="text-white m-b-20">
A New Internet for Decentralized Apps
>>>>>>>
import React from 'react'
import { Link } from 'react-router'
import DocumentTitle from 'react-document-title'
import YoutubeModal from 'react-youtube-modal'
import Header from '../components/Header'
import MailchimpForm from '../components/MailchimpForm'
const HomePage = () => {
const subscribeURL =
'//blockstack.us14.list-manage.com/subscribe/post?u=394a2b5cfee9c4b0f7525b009&id=0e5478ae86'
return (
<DocumentTitle title="Blockstack, building the decentralized internet">
<div>
<Header transparent={true} />
<section className="jumbotron jumbotron-fluid">
<div className="container">
<div className="row">
<div className="col-md-7">
<div className="own-your-data">
<h1 className="page-heading m-b-20 mt-1 mt-md-5">
Own your data
<<<<<<<
<div className="container-fluid">
<div className="container-fluid">
<p>
Join our mailing list to stay up to date with the Blockstack community. You{'\''}ll hear about product launches, upcoming events, newly released applications and more.
</p>
<MailchimpForm subscribeURL={subscribeURL} submitButtonText='Sign Up' />
=======
<div className="container container-md mx-auto m-b-80 m-t-35">
<div className="row">
<div className="container-fluid">
<h2 className="text-center m-b-45">
Sign Up for Updates
</h2>
<div className="container-fluid">
<p>
Join our mailing list to stay up to date with the
Blockstack community. You'll hear about product
launches, upcoming events, newly released applications
and more.
</p>
<MailchimpForm
subscribeURL={subscribeURL}
submitButtonText="Sign Up"
/>
</div>
</div>
>>>>>>>
<div className="container-fluid">
<div className="container-fluid">
<p>
Join our mailing list to stay up to date with the
Blockstack community. You{"'"}ll hear about product
launches, upcoming events, newly released applications and
more.
</p>
<MailchimpForm
subscribeURL={subscribeURL}
submitButtonText="Sign Up"
/> |
<<<<<<<
{ !specialHeader ?
<div>
<Header />
</div>
: null }
=======
{!specialHeader ? (
<div>
{/* <Alert /> */}
<Header />
</div>
) : null}
>>>>>>>
{!specialHeader ? (
<div>
<Header />
</div>
) : null} |
<<<<<<<
it.skip('generates the correct command string when IO mappings are present', function () {
const fc = new FFmpegCommand(new Map([['y'],]));
let filterInput = new FilterNode('sine', {
filterName: 'sine',
args: [
{ name: 'frequency', value: 620 },
{ name: 'beep_factor', value: 4 },
{ name: 'duration', value: 9999999999 },
{ name: 'sample_rate', value: 48000 }
]
});
let sineInput = new FFmpegInput(filterInput, new Map([
['re', null],
['r', 23.976],
['f', 'lavfi']
]));
fc.addInput(sineInput);
let nodes = [
new FilterNode('life', {
filterName: 'life',
args: [
{ name: 'size', value: '320x240' },
{ name: 'mold', value: 10 },
{ name: 'rate', value: 23.976 },
{ name: 'ratio', value: 0.5 },
{ name: 'death_color', value: '#C83232' },
{ name: 'life_color', value: '#00ff00' },
{ name: 'stitch', value: 0 }
]
}),
new FilterNode('scale', {
filterName: 'scale',
args: [1920, 1080]
})
];
let connections = [[['life', '0'], ['scale', '0']]];
let filterGraphInput = new FilterGraph('my_input_filter', nodes, null, connections);
let lifeInput = new FFmpegInput(filterGraphInput, new Map([
['re', null],
['r', 23.976],
['f', 'lavfi']
]));
fc.addInput(lifeInput);
let output = new FFmpegOutput('gen.mov', new Map([
['c:v', 'prores'],
['c:a', 'pcm_s24le'],
['aspect', '16:9']
]));
fc.addOutput(output, mappings = [[lifeInput, 0], [sineInput, 0], [sineInput, 0]]);
const expected = `${config.ffmpeg_bin} -re -r "23.976" -f "lavfi" -i "life=size=320x240:mold=10:rate=23.976:ratio=0.5:death_color=#C83232:life_color=#00ff00:stitch=0,scale=1920:1080" -re -f "lavfi" -i "sine=frequency=620:beep_factor=4:duration=9999999999:sample_rate=48000" -c:v "prores" -c:a "pcm_s24le" -aspect "16:9" -map "0:0" -map "1:0" -map "1:0" "gen.mov"`;
expect(fc.toString()).to.eql(expected);
});
=======
describe('event emits', function () {
beforeEach(() => {
mockProcess = new events.EventEmitter();
mockProcess.stderr = new stream.Readable();
mockProcess.stderr._read = sinon.spy();
stub = sinon.stub(childProcess, 'spawn').returns(mockProcess);
});
afterEach(() => {
childProcess.spawn.restore();
});
it('sets up proper listeners on the process', function () {
const mock = sinon.mock(mockProcess);
mock.expects('on').withArgs('exit').once();
mock.expects('on').withArgs('error').once();
const fc = new FFmpegCommand();
fc.spawn();
mock.verify();
});
it('emits a success event when the process executes successfully', function (done) {
const fc = new FFmpegCommand();
fc.on('success', (data) => {
expect(data).to.have.ownProperty('exitCode');
expect(data).to.have.ownProperty('progressData');
expect(data.exitCode).to.eql(0);
done();
});
fc.on('error', (err) => {
throw new Error(`Expected success event but error event received: ${err.message}`);
});
fc.on('failure', (data) => {
throw new Error(`Expected success event but received failure event with data ${JSON.stringify(data)}`);
});
fc.spawn();
mockProcess.emit('exit', 0, null);
});
it('emits a failure event when the process spawns but fails to execute successfully', function (done) {
const fc = new FFmpegCommand();
fc.on('success', (data) => {
throw new Error(`Expected failure event but received success event with data ${JSON.stringify(data)}.`);
});
fc.on('error', (err) => {
throw new Error(`Expected failure event but error event received: ${err.message}`);
});
fc.on('failure', (data) => {
expect(data).to.have.ownProperty('exitCode');
expect(data).to.have.ownProperty('progressData');
expect(data.exitCode).to.eql(1);
done();
});
fc.spawn();
mockProcess.emit('exit', 1, null);
});
});
>>>>>>>
it.skip('generates the correct command string when IO mappings are present', function () {
const fc = new FFmpegCommand(new Map([['y'],]));
let filterInput = new FilterNode('sine', {
filterName: 'sine',
args: [
{ name: 'frequency', value: 620 },
{ name: 'beep_factor', value: 4 },
{ name: 'duration', value: 9999999999 },
{ name: 'sample_rate', value: 48000 }
]
});
let sineInput = new FFmpegInput(filterInput, new Map([
['re', null],
['r', 23.976],
['f', 'lavfi']
]));
fc.addInput(sineInput);
let nodes = [
new FilterNode('life', {
filterName: 'life',
args: [
{ name: 'size', value: '320x240' },
{ name: 'mold', value: 10 },
{ name: 'rate', value: 23.976 },
{ name: 'ratio', value: 0.5 },
{ name: 'death_color', value: '#C83232' },
{ name: 'life_color', value: '#00ff00' },
{ name: 'stitch', value: 0 }
]
}),
new FilterNode('scale', {
filterName: 'scale',
args: [1920, 1080]
})
];
let connections = [[['life', '0'], ['scale', '0']]];
let filterGraphInput = new FilterGraph('my_input_filter', nodes, null, connections);
let lifeInput = new FFmpegInput(filterGraphInput, new Map([
['re', null],
['r', 23.976],
['f', 'lavfi']
]));
fc.addInput(lifeInput);
let output = new FFmpegOutput('gen.mov', new Map([
['c:v', 'prores'],
['c:a', 'pcm_s24le'],
['aspect', '16:9']
]));
fc.addOutput(output, mappings = [[lifeInput, 0], [sineInput, 0], [sineInput, 0]]);
const expected = `${config.ffmpeg_bin} -re -r "23.976" -f "lavfi" -i "life=size=320x240:mold=10:rate=23.976:ratio=0.5:death_color=#C83232:life_color=#00ff00:stitch=0,scale=1920:1080" -re -f "lavfi" -i "sine=frequency=620:beep_factor=4:duration=9999999999:sample_rate=48000" -c:v "prores" -c:a "pcm_s24le" -aspect "16:9" -map "0:0" -map "1:0" -map "1:0" "gen.mov"`;
expect(fc.toString()).to.eql(expected);
});
describe('event emits', function () {
beforeEach(() => {
mockProcess = new events.EventEmitter();
mockProcess.stderr = new stream.Readable();
mockProcess.stderr._read = sinon.spy();
stub = sinon.stub(childProcess, 'spawn').returns(mockProcess);
});
afterEach(() => {
childProcess.spawn.restore();
});
it('sets up proper listeners on the process', function () {
const mock = sinon.mock(mockProcess);
mock.expects('on').withArgs('exit').once();
mock.expects('on').withArgs('error').once();
const fc = new FFmpegCommand();
fc.spawn();
mock.verify();
});
it('emits a success event when the process executes successfully', function (done) {
const fc = new FFmpegCommand();
fc.on('success', (data) => {
expect(data).to.have.ownProperty('exitCode');
expect(data).to.have.ownProperty('progressData');
expect(data.exitCode).to.eql(0);
done();
});
fc.on('error', (err) => {
throw new Error(`Expected success event but error event received: ${err.message}`);
});
fc.on('failure', (data) => {
throw new Error(`Expected success event but received failure event with data ${JSON.stringify(data)}`);
});
fc.spawn();
mockProcess.emit('exit', 0, null);
});
it('emits a failure event when the process spawns but fails to execute successfully', function (done) {
const fc = new FFmpegCommand();
fc.on('success', (data) => {
throw new Error(`Expected failure event but received success event with data ${JSON.stringify(data)}.`);
});
fc.on('error', (err) => {
throw new Error(`Expected failure event but error event received: ${err.message}`);
});
fc.on('failure', (data) => {
expect(data).to.have.ownProperty('exitCode');
expect(data).to.have.ownProperty('progressData');
expect(data.exitCode).to.eql(1);
done();
});
fc.spawn();
mockProcess.emit('exit', 1, null);
});
}); |
<<<<<<<
{` Wait participant: `}
<div styleName="loaderHolder">
<InlineLoader />
</div>
=======
<FormattedMessage id="partial291" defaultMessage="Wait participant: " />
<InlineLoader />
>>>>>>>
<FormattedMessage id="partial291" defaultMessage="Wait participant: " />
<div styleName="loaderHolder">
<InlineLoader />
</div> |
<<<<<<<
user: { ethData, btcData, ghostData, tokensData, activeFiat },
=======
user: { ethData, btcData, tokensData, activeFiat, ...rest },
>>>>>>>
user: { ethData, btcData, ghostData, tokensData, activeFiat, ...rest }, |
<<<<<<<
Url = 'default' in Url ? Url['default'] : Url;
Firebase$1 = 'default' in Firebase$1 ? Firebase$1['default'] : Firebase$1;
Please = 'default' in Please ? Please['default'] : Please;
=======
Firebase$1 = Firebase$1 && Firebase$1.hasOwnProperty('default') ? Firebase$1['default'] : Firebase$1;
Url = Url && Url.hasOwnProperty('default') ? Url['default'] : Url;
Please = Please && Please.hasOwnProperty('default') ? Please['default'] : Please;
'use strict';
>>>>>>>
Url = Url && 'default' in Url ? Url['default'] : Url;
Firebase$1 = Firebase$1 && 'default' in Firebase$1 ? Firebase$1['default'] : Firebase$1;
Please = Please && 'default' in Please ? Please['default'] : Please;
<<<<<<<
registerComponentClass('n-gltf', NGLTF);
=======
registerComponentClass('collapse-model', CollapseModel);
registerComponentClass('visible', Visible);
>>>>>>>
registerComponentClass('n-gltf', NGLTF);
registerComponentClass('collapse-model', CollapseModel);
registerComponentClass('visible', Visible);
<<<<<<<
NLayoutBrowser: NLayoutBrowser,
NGLTF: NGLTF
=======
NLayoutBrowser: NLayoutBrowser,
CollapseModel: CollapseModel
>>>>>>>
NLayoutBrowser: NLayoutBrowser,
CollapseModel: CollapseModel,
NGLTF: NGLTF |
<<<<<<<
import NotifyBlock from './components/NotityBlock/NotifyBock'
import NewButton from 'components/controls/NewButton/NewButton'
import security from './components/NotityBlock/images/security.svg'
import mail from './components/NotityBlock/images/mail.svg'
import info from './components/NotityBlock/images/info-solid.svg'
=======
>>>>>>>
<<<<<<<
handleSaveKeys = () => {
actions.modals.open(constants.modals.PrivateKeys)
}
handleShowKeys = () => {
actions.modals.open(constants.modals.DownloadModal)
}
handleImportKeys = () => {
actions.modals.open(constants.modals.ImportKeys, {})
}
=======
>>>>>>>
handleSaveKeys = () => {
actions.modals.open(constants.modals.PrivateKeys)
}
handleShowKeys = () => {
actions.modals.open(constants.modals.DownloadModal)
}
handleImportKeys = () => {
actions.modals.open(constants.modals.ImportKeys, {})
}
<<<<<<<
<Slider {...settings}>
{
!isPrivateKeysSaved && <NotifyBlock
className="notifyBlockSaveKeys"
descr="Before you continue be sure to save your private keys!"
tooltip="We do not store your private keys and will not be able to restore them"
icon={security}
firstBtn="Show my keys"
firstFunc={this.handleShowKeys}
secondBtn="I saved my keys"
secondFunc={this.handleSaveKeys}
/>
}
{
!isSigned && !isClosedNotifyBlockSignUp && <NotifyBlock
className="notifyBlockSignUp"
descr="Sign up and get your free cryptocurrency for test!"
tooltip="You will also be able to receive notifications regarding updates with your account"
icon={mail}
firstBtn="Sign Up"
firstFunc={this.handleSignUp}
secondBtn="I’ll do this later"
secondFunc={() => this.handleNotifyBlockClose('isClosedNotifyBlockSignUp')} />
}
{
!isClosedNotifyBlockBanner && <NotifyBlock
className="notifyBlockBanner"
descr="Updates"
tooltip="Let us notify you that the main domain name for Swap.online exchange service will be changed from swap.online to swaponline.io."
icon={info}
secondBtn="Close"
secondFunc={() => this.handleNotifyBlockClose('isClosedNotifyBlockBanner')} />
}
</Slider>
<ul styleName="walletNav">
{walletNav.map((item, index) => (
=======
<Slider
settings={settings}
isSigned={isSigned}
handleNotifyBlockClose={this.handleNotifyBlockClose}
{...this.state}
/>
{!isMobile && <ul styleName="walletNav">
{walletNav.map(({ key, text }, index) => (
>>>>>>>
<Slider
settings={settings}
isSigned={isSigned}
handleNotifyBlockClose={this.handleNotifyBlockClose}
{...this.state}
/>
<ul styleName="walletNav">
{walletNav.map(({ key, text }, index) => ( |
<<<<<<<
=======
@injectIntl
>>>>>>>
@injectIntl
<<<<<<<
let { swapHistory, txHistory, location, match:{ params: { fullName } } } = this.props
const {
currency,
address,
contractAddress,
decimals,
balance,
isBalanceEmpty,
} = this.state
=======
let { swapHistory, txHistory, location, match:{ params: { fullName } }, intl: { locale } } = this.props
const {
fullName,
currency,
address,
contractAddress,
decimals,
balance,
isBalanceEmpty,
} = this.state
>>>>>>>
let { swapHistory, txHistory, location, match:{ params: { fullName } }, intl: { locale } } = this.props
const {
currency,
address,
contractAddress,
decimals,
balance,
isBalanceEmpty,
} = this.state |
<<<<<<<
openScanCam: '',
address: toAddress ? toAddress : '',
amount: amount ? amount : '',
minus: '',
=======
usedAdminFee,
openScanCam: "",
address: toAddress ? toAddress : "",
amount: amount ? amount : "",
minus: "",
>>>>>>>
usedAdminFee,
openScanCam: '',
address: toAddress ? toAddress : '',
amount: amount ? amount : '',
minus: '',
<<<<<<<
ownTx,
currentActiveAsset,
isAssetsOpen,
} = this.state
=======
ownTx,
usedAdminFee,
} = this.state
>>>>>>>
ownTx,
usedAdminFee,
} = this.state
<<<<<<<
const min = minAmount[currency.toLowerCase()]
const dataCurrency = isEthToken ? 'ETH' : currency.toUpperCase()
=======
let min = isEthToken ? 0 : minAmount[currency.toLowerCase()]
let defaultMin = min
if (usedAdminFee) {
defaultMin = BigNumber(min).plus(usedAdminFee.min).toNumber()
if (amount) {
let feeFromAmount = BigNumber(usedAdminFee.fee).dividedBy(100).multipliedBy(amount)
if (BigNumber(usedAdminFee.min).isGreaterThan(feeFromAmount)) feeFromAmount = BigNumber(usedAdminFee.min)
min = BigNumber(min).plus(feeFromAmount).toNumber() // Admin fee in satoshi
} else {
min = defaultMin
}
}
const dataCurrency = isEthToken ? "ETH" : currency.toUpperCase();
>>>>>>>
let min = isEthToken ? 0 : minAmount[currency.toLowerCase()]
let defaultMin = min
if (usedAdminFee) {
defaultMin = BigNumber(min).plus(usedAdminFee.min).toNumber()
if (amount) {
let feeFromAmount = BigNumber(usedAdminFee.fee)
.dividedBy(100)
.multipliedBy(amount)
if (BigNumber(usedAdminFee.min).isGreaterThan(feeFromAmount))
feeFromAmount = BigNumber(usedAdminFee.min)
min = BigNumber(min).plus(feeFromAmount).toNumber() // Admin fee in satoshi
} else {
min = defaultMin
}
}
const dataCurrency = isEthToken ? 'ETH' : currency.toUpperCase() |
<<<<<<<
// TODO to split data and view this component
const SelectGroup = ({ dynamicFee, isToken, extendedControls, selectedValue, onSelect, dataTut,
currencies, usd, placeholder, label, disabled, className, inputValueLink, tooltip, balance, error,
id, type, idFee, tooltipAboutFee, haveAmount, ...props
}) => (
<div>
<div styleName="groupField" className={className}>
<div>
<span styleName="label">
{label}
</span>
<div styleName="smallTooltip">
<Tooltip id={id}>
{tooltip}
</Tooltip>
</div>
</div>
<Input
styleName="inputRoot"
inputContainerClassName="inputContainer"
valueLink={inputValueLink}
type="number"
placeholder={placeholder}
pattern="0-9\."
errorStyle={error}
disabled={disabled}
onFocus={props.onFocus ? props.onFocus : () => {}}
onBlur={props.onBlur ? props.onBlur : () => {}}
onKeyDown={inputReplaceCommaWithDot}
/>
{
(selectedValue === 'eth' || selectedValue === 'btc') && usd > 0 &&
<p styleName="textUsd" >{`~${usd}`} USD</p>
}
{/* switchBalanceFunc={switchBalanceFunc} */ }
<CurrencySelect
name="All"
label={label}
tooltip={tooltip}
id={id}
styleName="currencySelect"
placeholder="Enter the name of token"
selectedValue={selectedValue}
onSelect={onSelect}
currencies={currencies}
/>
</div>
{label.props.defaultMessage === 'You sell' && !extendedControls &&
(balance > 0 ?
!isToken &&
<span
styleName={
(BigNumber(haveAmount).isLessThanOrEqualTo(balance)
&& BigNumber(balance).isLessThan(BigNumber(haveAmount).plus(dynamicFee))
&& BigNumber(haveAmount).isGreaterThan(0))
? 'red'
: 'balance'
}
>
{<FormattedMessage
id="select75"
defaultMessage="Available for exchange: {availableBalance} {tooltip}"
values={{
availableBalance: `${BigNumber(balance).minus(dynamicFee)} ${selectedValue.toUpperCase()}`,
tooltip: <Tooltip id={idFee}> {tooltipAboutFee}</Tooltip>,
}} />
}
</span> :
<span styleName="textForNull">
<FormattedMessage id="selected53" defaultMessage="You can use an external wallet to perform a swap" />
</span>
)
}
</div>
=======
// TODO to split data and view this component
const SelectGroup = ({ dynamicFee, isToken, extendedControls, selectedValue, onSelect, dataTut,
currencies, usd, placeholder, label, disabled, className, switchBalanceFunc, inputValueLink, tooltip, balance, error,
id, idFee, tooltipAboutFee, haveAmount, ...props
}) => (
<div data-tut={dataTut}>
<FieldLabel inRow>
<strong>
{label}
</strong>
<div styleName="smallTooltip">
<Tooltip id={id}>
{tooltip}
</Tooltip>
</div>
</FieldLabel>
<div styleName="groupField" className={className}>
<Input
styleName="inputRoot"
inputContainerClassName="inputContainer"
valueLink={inputValueLink}
type="number"
placeholder={placeholder}
pattern="0-9\."
errorStyle={error}
disabled={disabled}
onFocus={props.onFocus ? props.onFocus : () => {}}
onBlur={props.onBlur ? props.onBlur : () => {}}
onKeyDown={inputReplaceCommaWithDot}
/>
{
(selectedValue === 'eth' || selectedValue === 'btc') && usd > 0 &&
<p styleName="textUsd" >{`~${usd}`} USD</p>
}
<CurrencySelect
name="All"
label={label}
tooltip={tooltip}
switchBalanceFunc={switchBalanceFunc}
id={id}
styleName="currencySelect"
placeholder="Enter the name of token"
selectedValue={selectedValue}
onSelect={onSelect}
currencies={currencies}
/>
</div>
{label.props.defaultMessage === 'You sell' && !extendedControls &&
(balance > 0 ?
!isToken &&
<span
styleName={
(BigNumber(haveAmount).isLessThanOrEqualTo(balance)
&& BigNumber(balance).isLessThan(BigNumber(haveAmount).plus(dynamicFee))
&& BigNumber(haveAmount).isGreaterThan(0))
? 'red'
: 'balance'
}
>
{<FormattedMessage
id="select75"
defaultMessage="Available for exchange: {availableBalance} {tooltip}"
values={{
availableBalance: `${BigNumber(balance).minus(dynamicFee)} ${selectedValue.toUpperCase()}`,
tooltip: <Tooltip id={idFee}> {tooltipAboutFee}</Tooltip>,
}} />
}
</span> :
<span styleName="textForNull">
<FormattedMessage id="selected53" defaultMessage="You can use an external wallet to perform a swap" />
</span>
)
}
</div>
>>>>>>>
// TODO to split data and view this component
const SelectGroup = ({ dynamicFee, isToken, extendedControls, selectedValue, onSelect, dataTut,
currencies, usd, placeholder, label, disabled, className, inputValueLink, tooltip, balance, error,
id, type, idFee, tooltipAboutFee, haveAmount, ...props
}) => (
<div>
<div styleName="groupField" className={className}>
<div>
<span styleName="label">
{label}
</span>
<div styleName="smallTooltip">
<Tooltip id={id}>
{tooltip}
</Tooltip>
</div>
</div>
<Input
styleName="inputRoot"
inputContainerClassName="inputContainer"
valueLink={inputValueLink}
type="number"
placeholder={placeholder}
pattern="0-9\."
errorStyle={error}
disabled={disabled}
onFocus={props.onFocus ? props.onFocus : () => {}}
onBlur={props.onBlur ? props.onBlur : () => {}}
onKeyDown={inputReplaceCommaWithDot}
/>
{
(selectedValue === 'eth' || selectedValue === 'btc') && usd > 0 &&
<p styleName="textUsd" >{`~${usd}`} USD</p>
}
<CurrencySelect
name="All"
label={label}
tooltip={tooltip}
id={id}
styleName="currencySelect"
placeholder="Enter the name of token"
selectedValue={selectedValue}
onSelect={onSelect}
currencies={currencies}
/>
</div>
{label.props.defaultMessage === 'You sell' && !extendedControls &&
(balance > 0 ?
!isToken &&
<span
styleName={
(BigNumber(haveAmount).isLessThanOrEqualTo(balance)
&& BigNumber(balance).isLessThan(BigNumber(haveAmount).plus(dynamicFee))
&& BigNumber(haveAmount).isGreaterThan(0))
? 'red'
: 'balance'
}
>
{<FormattedMessage
id="select75"
defaultMessage="Available for exchange: {availableBalance} {tooltip}"
values={{
availableBalance: `${BigNumber(balance).minus(dynamicFee)} ${selectedValue.toUpperCase()}`,
tooltip: <Tooltip id={idFee}> {tooltipAboutFee}</Tooltip>,
}} />
}
</span> :
<span styleName="textForNull">
<FormattedMessage id="selected53" defaultMessage="You can use an external wallet to perform a swap" />
</span>
)
}
</div> |
<<<<<<<
user: { ethData, btcData, ltcData },
=======
user: { ethData, btcData, bchData },
>>>>>>>
user: { ethData, btcData },
<<<<<<<
ltcAddress: ltcData.address,
=======
bchAddress: bchData.address,
>>>>>>>
<<<<<<<
const { name, ethAddress, btcAddress, ltcAddress, history } = this.props
=======
const { name, ethAddress, btcAddress, bchAddress, history } = this.props
>>>>>>>
const { name, ethAddress, btcAddress, history } = this.props
<<<<<<<
ltcAddress,
=======
bchAddress,
>>>>>>> |
<<<<<<<
import { btc, ltc, constants, links } from 'helpers'
=======
import { btc, bch, constants, links } from 'helpers'
>>>>>>>
import { btc, constants, links } from 'helpers'
<<<<<<<
ltcKey: '',
=======
bchKey: '',
>>>>>>>
<<<<<<<
isSubmittedLtc: false,
=======
isSubmittedBch: false,
>>>>>>>
<<<<<<<
isImportedLtc: false,
=======
isImportedBch: false,
>>>>>>>
<<<<<<<
handleLtcImportKey = () => {
const { ltcKey } = this.state
try {
bitcoin.ECPair.fromWIF(ltcKey, ltc.network) // eslint-disable-line
} catch (e) {
this.setState({ isSubmittedLtc: true })
return false
}
if (!ltcKey || ltcKey.length < 27) {
this.setState({ isSubmittedLtc: true })
return
}
try {
actions.ltc.login(ltcKey)
this.setState({
isImportedLtc: true,
isDisabled: false,
})
actions.core.markCoinAsVisible('LTC')
this.setState({
onCloseLink: links.LtcWallet
})
} catch (e) {
this.setState({ isSubmittedLtc: true })
}
}
=======
handleBchImportKey = () => {
const { bchKey } = this.state
try {
bitcoin.ECPair.fromWIF(bchKey, bch.network) // eslint-disable-line
} catch (e) {
console.error(e)
this.setState({ isSubmittedBch: true })
return false
}
if (!bchKey || bchKey.length < 27) {
this.setState({ isSubmittedBch: true })
return
}
try {
actions.bch.login(bchKey)
this.setState({
isImportedBch: true,
isDisabled: false,
})
actions.core.markCoinAsVisible('BCH')
this.setState({
onCloseLink: links.BchWallet,
})
} catch (e) {
console.error(e)
this.setState({ isSubmittedBch: true })
}
}
>>>>>>>
<<<<<<<
isSubmittedEth, isSubmittedBtc, isSubmittedLtc, /* isSubmittedXlm, */
isImportedEth, isImportedBtc, isImportedLtc, /* isImportedXlm, */ isDisabled, keySave,
=======
isSubmittedEth, isSubmittedBtc, isSubmittedBch, /* isSubmittedXlm, */
isImportedEth, isImportedBtc, isImportedBch, /* isImportedXlm, */ isDisabled, keySave,
>>>>>>>
isSubmittedEth, isSubmittedBtc, /* isSubmittedXlm, */
isImportedEth, isImportedBtc, /* isImportedXlm, */ isDisabled, keySave,
<<<<<<<
const linked = Link.all(this, 'ethKey', 'btcKey', 'ltcKey' /* , 'xlmKey' */)
=======
const linked = Link.all(this, 'ethKey', 'btcKey', 'bchKey' /* , 'xlmKey' */)
>>>>>>>
const linked = Link.all(this, 'ethKey', 'btcKey')
<<<<<<<
if (isSubmittedLtc) {
linked.ltcKey.check((value) => value !== '', <FormattedMessage id="importkeys200" defaultMessage="Please enter LTC private key" />)
linked.ltcKey.check((value) => value.length > 27, <FormattedMessage id="importkeys201" defaultMessage="Please valid LTC private key" />)
linked.ltcKey.check(() =>
this.handleLtcImportKey(), <FormattedMessage id="importkeys190" defaultMessage="Something went wrong. Check your private key, network of this address and etc." />)
}
=======
if (isSubmittedBch) {
linked.bchKey.check((value) => value !== '', <FormattedMessage id="importkeys239" defaultMessage="Please enter BCH private key" />)
linked.bchKey.check((value) => value.length > 27, <FormattedMessage id="importkeys240" defaultMessage="Please valid BCH private key" />)
linked.bchKey.check(() =>
this.handleBchImportKey(), <FormattedMessage id="importkeys190" defaultMessage="Something went wrong. Check your private key, network of this address and etc." />)
}
>>>>>>>
<<<<<<<
{(!config.opts.curEnabled || config.opts.curEnabled.ltc) && (
<>
<FormattedMessage id="ImportKeys205" defaultMessage="Please enter LTC private key in WIF format">
{message => <FieldLabel positionStatic>{message}</FieldLabel>}
</FormattedMessage>
<Group
inputLink={linked.ltcKey}
placeholder="Key in WIF format"
disabled={isImportedLtc}
onClick={this.handleLtcImportKey}
/>
</>
)}
=======
{(!config.opts.curEnabled || config.opts.curEnabled.bch) && (
<>
<FieldLabel positionStatic>
<FormattedMessage id="ImportKeys280" defaultMessage="Please enter BCH private key in WIF format" />
</FieldLabel>
<Group
inputLink={linked.bchKey}
placeholder="Key in WIF format"
disabled={isImportedBch}
onClick={this.handleBchImportKey}
/>
</>
)}
>>>>>>> |
<<<<<<<
=======
const sellToken = sell || "btc";
const buyToken = buy || (!isWidgetBuild ? "eth" : config.erc20token);
>>>>>>> |
<<<<<<<
test: /\.(js|mjs|jsx|ts|tsx)$/,
exclude: {
test: [
/node_modules/,
],
not: [
/libp2p/,
/ipld/,
/ipfs/,
/pull-mplex/,
/pull-stream-to-async-iterator/,
/ipfs-unixfs-exporter/,
/interface-datastore/,
/multistream-select/,
/p-any/,
/stream-to-it/,
/indent-string/,
/it-buffer/,
/it-protocol-buffers/,
/it-length-prefixed/,
/it-to-stream/,
/it-drain/,
/it-reader/,
/it-handshake/,
/it-all/,
/it-ws/,
/it-length/,
/abortable-iterator/,
/async-iterator-all/,
/async-iterator-last/,
/async-iterator-first/,
/async-iterator-batch/,
/it-parallel-batch/,
/it-last/,
/it-first/,
/it-map/,
/it-batch/,
/aggregate-error/,
/streaming-iterables/,
/datastore-level/,
/datastore-core/,
],
},
use: {
loader: 'babel-loader',
},
=======
test: /\.(js|mjs|jsx)$/,
exclude: /(node_modules|bower_components)/,
use: [
{
loader: 'cache-loader',
},
{
loader: 'babel-loader',
options: {
presets: ['@babel/preset-env'],
plugins: ['@babel/plugin-proposal-object-rest-spread'],
cacheDirectory: true,
}
},
],
>>>>>>>
test: /\.(js|mjs|jsx|ts|tsx)$/,
exclude: /(node_modules|bower_components)/,
use: [
{
loader: 'cache-loader',
},
{
loader: 'babel-loader',
options: {
presets: ['@babel/preset-env'],
plugins: ['@babel/plugin-proposal-object-rest-spread'],
cacheDirectory: true,
}
},
], |
<<<<<<<
const widgetCurrencies = ['BTC', 'BTC (SMS-Protected)', 'BTC (Multisig)', 'ETH']
if (isWidgetBuild) {
if (window.widgetERC20Tokens && Object.keys(window.widgetERC20Tokens).length) {
// Multi token widget build
Object.keys(window.widgetERC20Tokens).forEach(key => {
widgetCurrencies.push(key.toUpperCase())
})
} else {
widgetCurrencies.push(config.erc20token.toUpperCase())
}
}
const [multiplier, setMultiplier] = useState(0)
const getFiats = async () => {
const { fiatsRates } = await actions.user.getFiats()
if (fiatsRates) {
const fiatRate = fiatsRates.find(({ key }) => key === activeFiat)
setMultiplier(fiatRate.value)
}
}
if (currencyBalance) {
currencyBalance.forEach(async item => {
if ((!isWidgetBuild || widgetCurrencies.includes(item.name)) && item.infoAboutCurrency && item.balance !== 0) {
if (item.name === 'BTC') {
changePercent = item.infoAboutCurrency.percent_change_1h
}
btcBalance += item.balance * item.infoAboutCurrency.price_btc
fiatBalance += item.balance * item.infoAboutCurrency.price_usd * multiplier
}
})
}
=======
>>>>>>>
const widgetCurrencies = ['BTC', 'BTC (SMS-Protected)', 'BTC (Multisig)', 'ETH']
if (isWidgetBuild) {
if (window.widgetERC20Tokens && Object.keys(window.widgetERC20Tokens).length) {
// Multi token widget build
Object.keys(window.widgetERC20Tokens).forEach(key => {
widgetCurrencies.push(key.toUpperCase())
})
} else {
widgetCurrencies.push(config.erc20token.toUpperCase())
}
}
const [multiplier, setMultiplier] = useState(0)
const getFiats = async () => {
const { fiatsRates } = await actions.user.getFiats()
if (fiatsRates) {
const fiatRate = fiatsRates.find(({ key }) => key === activeFiat)
setMultiplier(fiatRate.value)
}
}
if (currencyBalance) {
currencyBalance.forEach(async item => {
if ((!isWidgetBuild || widgetCurrencies.includes(item.name)) && item.infoAboutCurrency && item.balance !== 0) {
if (item.name === 'BTC') {
changePercent = item.infoAboutCurrency.percent_change_1h
}
btcBalance += item.balance * item.infoAboutCurrency.price_btc
fiatBalance += item.balance * item.infoAboutCurrency.price_usd * multiplier
}
})
}
<<<<<<<
=======
const getFiats = async () => {
const { activeFiat } = props
const { fiatsRates } = await actions.user.getFiats()
const fiatRate = fiatsRates.find(({ key }) => key === activeFiat)
return fiatRate.value
}
>>>>>>> |
<<<<<<<
getReputation,
getText,
=======
>>>>>>>
getReputation,
getText, |
<<<<<<<
@injectIntl
=======
>>>>>>>
@injectIntl
<<<<<<<
let { swapHistory, txHistory, location, intl: { locale } } = this.props
const { fullName, address, balance, currency, isBalanceEmpty } = this.state
=======
let { swapHistory, txHistory, location, match:{ params: { fullName } } } = this.props
const {
currency,
address,
contractAddress,
decimals,
balance,
isBalanceEmpty,
} = this.state
>>>>>>>
let { swapHistory, txHistory, location, match:{ params: { fullName } }, intl: { locale } } = this.props
const {
fullName,
currency,
address,
contractAddress,
decimals,
balance,
isBalanceEmpty,
} = this.state |
<<<<<<<
user: { ethData, btcData, tokensData, nimData, ltcData /* usdtOmniData */ },
=======
user: { ethData, btcData, bchData, tokensData, nimData /* usdtOmniData */ },
>>>>>>>
user: { ethData, btcData, tokensData, nimData /* usdtOmniData */ },
<<<<<<<
currenciesData: [ethData, btcData, ltcData /* usdtOmniData, nimData */],
=======
currenciesData: [ethData, btcData, bchData /* usdtOmniData, nimData */],
>>>>>>>
currenciesData: [ethData, btcData /* usdtOmniData, nimData */], |
<<<<<<<
migrate().finally(()=> setInterval(ipfsRoom.onload = () => {
=======
setTimeout(() => {
>>>>>>>
migrate().finally(()=> setTimeout(() => {
<<<<<<<
}, 500))
=======
}, 1000)
>>>>>>>
}, 1000) |
<<<<<<<
nim,
noxon: xrp,
=======
>>>>>>>
nim, |
<<<<<<<
user: { ethData, btcData, ltcData, /* xlmData, */ tokensData, nimData /* usdtOmniData */ },
=======
user: { ethData, btcData, /* xlmData, */ bchData, tokensData, nimData /* usdtOmniData */ },
>>>>>>>
user: { ethData, btcData, /* xlmData, */ tokensData, nimData /* usdtOmniData */ },
<<<<<<<
items: [ethData, btcData, /* xlmData, */ ltcData /* usdtOmniData, nimData */],
=======
items: [ethData, btcData, /* xlmData, */ bchData /* usdtOmniData, nimData */],
>>>>>>>
items: [ethData, btcData, /* xlmData, */ /* usdtOmniData, nimData */], |
<<<<<<<
pairFees: false,
balances: false,
}
=======
balanceOnWalletsIsOk: false,
};
constants.coinsWithDynamicFee.forEach(
(item) =>
(this.state.estimatedFeeValues[item] = constants.minAmountOffer[item])
);
this.cacheDynamicFee = {};
>>>>>>>
pairFees: false,
balances: false,
balanceOnWalletsIsOk: false,
}
<<<<<<<
=======
componentDidMount() {
const walletsArray = actions.core.getWallets()
for (let wallet of walletsArray) {
if (wallet.balance > 0) {
this.setState({
balanceOnWalletsIsOk: true
})
break
}
}
}
>>>>>>>
componentDidMount() {
const walletsArray = actions.core.getWallets()
for (let wallet of walletsArray) {
if (wallet.balance > 0) {
this.setState({
balanceOnWalletsIsOk: true
})
break
}
}
}
<<<<<<<
pairFees,
balances,
=======
balanceOnWalletsIsOk,
>>>>>>>
pairFees,
balances,
balanceOnWalletsIsOk, |
<<<<<<<
user: { ethData, btcData, tokensData, nimData, ltcData /* usdtOmniData, nimData */ },
=======
user: { ethData, btcData, bchData, tokensData, nimData /* usdtOmniData, nimData */ },
>>>>>>>
user: { ethData, btcData, tokensData, nimData /* usdtOmniData, nimData */ },
<<<<<<<
items: [ethData, btcData, ltcData /* usdtOmniData, nimData */],
=======
items: [ethData, btcData, bchData /* usdtOmniData, nimData */],
>>>>>>>
items: [ethData, btcData /* usdtOmniData, nimData */], |
<<<<<<<
import { request, constants } from 'helpers'
=======
import { request, constants, api } from 'helpers'
import abi from 'human-standard-token-abi'
>>>>>>>
import { request, constants, api } from 'helpers' |
<<<<<<<
=======
import { Comments } from '../lib/collections/comments';
import { getSetting, addStaticRoute } from './vulcan-lib';
>>>>>>>
import { addStaticRoute } from './vulcan-lib'; |
<<<<<<<
resolver: async (document, args, context: ResolverContext) => {
const { currentUser } = context;
return await Utils.getTableOfContentsData({document, version: null, currentUser, context});
=======
resolver: async (document, args, { currentUser }) => {
try {
return await Utils.getTableOfContentsData({document, version: null, currentUser});
} catch(e) {
Sentry.captureException(e);
return null;
}
>>>>>>>
resolver: async (document, args, context: ResolverContext) => {
const { currentUser } = context;
try {
return await Utils.getTableOfContentsData({document, version: null, currentUser, context});
} catch(e) {
Sentry.captureException(e);
return null;
}
<<<<<<<
resolver: async (document, { version=null }, context: ResolverContext) => {
const { currentUser } = context;
return await Utils.getTableOfContentsData({document, version, currentUser, context});
=======
resolver: async (document, { version=null }, { currentUser }) => {
try {
return await Utils.getTableOfContentsData({document, version, currentUser});
} catch(e) {
Sentry.captureException(e);
return null;
}
>>>>>>>
resolver: async (document, { version=null }, context: ResolverContext) => {
const { currentUser } = context;
try {
return await Utils.getTableOfContentsData({document, version, currentUser, context});
} catch(e) {
Sentry.captureException(e);
return null;
} |
<<<<<<<
const initGraphQL = () => {
runCallbacks({name: 'graphql.init.before'});
const typeDefs = generateTypeDefs();
const executableSchema = makeExecutableSchema({
typeDefs,
resolvers: GraphQLSchema.resolvers,
schemaDirectives: GraphQLSchema.directives,
=======
return {
schema: graphQLSchema,
addedQueries,
addedResolvers,
addedMutations
};
};
export const initGraphQL = () => {
runCallbacks('graphql.init.before');
const { schemaText, addedResolvers } = getTypeDefs();
let allResolvers = deepmerge(
getResolvers(),
{
JSON: GraphQLJSON,
Date: GraphQLDate,
}
);
for (let addedResolverGroup of addedResolvers) {
allResolvers = deepmerge(allResolvers, addedResolverGroup);
}
executableSchema = makeExecutableSchema({
typeDefs: schemaText,
resolvers: allResolvers,
schemaDirectives: getDirectives(),
>>>>>>>
return {
schema: graphQLSchema,
addedQueries,
addedResolvers,
addedMutations
};
};
export const initGraphQL = () => {
runCallbacks({name: 'graphql.init.before'});
const { schemaText, addedResolvers } = getTypeDefs();
let allResolvers = deepmerge(
getResolvers(),
{
JSON: GraphQLJSON,
Date: GraphQLDate,
}
);
for (let addedResolverGroup of addedResolvers) {
allResolvers = deepmerge(allResolvers, addedResolverGroup);
}
executableSchema = makeExecutableSchema({
typeDefs: schemaText,
resolvers: allResolvers,
schemaDirectives: getDirectives(), |
<<<<<<<
async function handleSetShortformPost (newUser: DbUser, oldUser: DbUser) {
=======
// When creating a new account, populate their A/B test group key from their
// client ID, so that their A/B test groups will persist from when they were
// logged out.
async function setABTestKeyOnSignup (user) {
Users.update(user._id, {$set: {abTestKey: user.profile?.clientId}});
}
addCallback('users.new.async', setABTestKeyOnSignup);
async function handleSetShortformPost (newUser, oldUser) {
>>>>>>>
// When creating a new account, populate their A/B test group key from their
// client ID, so that their A/B test groups will persist from when they were
// logged out.
async function setABTestKeyOnSignup (user) {
Users.update(user._id, {$set: {abTestKey: user.profile?.clientId}});
}
addCallback('users.new.async', setABTestKeyOnSignup);
async function handleSetShortformPost (newUser: DbUser, oldUser: DbUser) { |
<<<<<<<
addDefaultView: (view: ViewFunction<N>) => void
addView: (viewName: string, view: ViewFunction<N>) => void
defaultView: ViewFunction<N> //FIXME: This is actually nullable (but should just have a default)
views: Record<string, ViewFunction<N>>
getParameters: (terms: ViewTermsByCollectionName[N], apolloClient?: any, context?: ResolverContext) => MergedViewQueryAndOptions<N,T>
simpleSchema: any
attachSchema: any
addField: any
removeField: any
=======
addDefaultView: any
addView: any
defaultView: (terms: any) => any
views: any
getParameters: any
simpleSchema: ()=>any
helpers: any
>>>>>>>
addDefaultView: (view: ViewFunction<N>) => void
addView: (viewName: string, view: ViewFunction<N>) => void
defaultView: ViewFunction<N> //FIXME: This is actually nullable (but should just have a default)
views: Record<string, ViewFunction<N>>
getParameters: (terms: ViewTermsByCollectionName[N], apolloClient?: any, context?: ResolverContext) => MergedViewQueryAndOptions<N,T>
simpleSchema: ()=>any |
<<<<<<<
const collection = getCollection(vote.collectionName);
const document = await collection.findOne({_id: vote.documentId});
const user = await Users.findOne({_id: vote.userId});
=======
const collection = getCollection(vote.collectionName as VoteableCollectionName);
const document = collection.findOne({_id: vote.documentId});
const user = Users.findOne({_id: vote.userId});
>>>>>>>
const collection = getCollection(vote.collectionName as VoteableCollectionName);
const document = await collection.findOne({_id: vote.documentId});
const user = await Users.findOne({_id: vote.userId}); |
<<<<<<<
import bowser from 'bowser';
=======
import Users, { UserLocation } from "./collection";
import bowser from 'bowser'
import { getSetting, Utils } from '../../vulcan-lib';
import { Votes } from '../votes';
import { Comments } from '../comments'
import { Posts } from '../posts'
>>>>>>>
import bowser from 'bowser';
<<<<<<<
const isPersonalBlogpost = post => {
if (forumTypeSetting.get() === 'EAForum') {
=======
const isPersonalBlogpost = (post: PostsBase|DbPost): boolean => {
if (getSetting('forumType') === 'EAForum') {
>>>>>>>
const isPersonalBlogpost = (post: PostsBase|DbPost): boolean => {
if (forumTypeSetting.get() === 'EAForum') {
<<<<<<<
Users.getPostCount = (user) => {
if (forumTypeSetting.get() === 'AlignmentForum') {
=======
Users.getPostCount = (user: UsersMinimumInfo|DbUser): number => {
if (getSetting('forumType') === 'AlignmentForum') {
>>>>>>>
Users.getPostCount = (user: UsersMinimumInfo|DbUser): number => {
if (forumTypeSetting.get() === 'AlignmentForum') {
<<<<<<<
Users.getCommentCount = (user) => {
if (forumTypeSetting.get() === 'AlignmentForum') {
=======
Users.getCommentCount = (user: UsersMinimumInfo|DbUser): number => {
if (getSetting('forumType') === 'AlignmentForum') {
>>>>>>>
Users.getCommentCount = (user: UsersMinimumInfo|DbUser): number => {
if (forumTypeSetting.get() === 'AlignmentForum') { |
<<<<<<<
const databaseIdObject = DatabaseMetadata.findOne({ name: "databaseId" });
const databaseId = databaseIdObject?.value || null;
=======
const databaseIdObject = await DatabaseMetadata.findOne({ name: "databaseId" });
>>>>>>>
const databaseIdObject = await DatabaseMetadata.findOne({ name: "databaseId" });
const databaseId = databaseIdObject?.value || null; |
<<<<<<<
import { addUniversalFields, getDefaultResolvers, getDefaultMutations, schemaDefaultValue } from '../../collectionUtils'
=======
import { addUniversalFields, getDefaultResolvers, schemaDefaultValue } from '../../collectionUtils'
import { getDefaultMutations, MutationOptions } from '../../vulcan-core/default_mutations';
import type { SchemaType } from '../../utils/schemaUtils'
>>>>>>>
import { addUniversalFields, getDefaultResolvers, schemaDefaultValue } from '../../collectionUtils'
import { getDefaultMutations, MutationOptions } from '../../vulcan-core/default_mutations'; |
<<<<<<<
import './2020-07-23-defaultWikiGrade.ts'
import './2020-09-03-createWikiImportUsers.ts'
=======
import './2020-07-23-defaultWikiGrade.ts'
import './2020-09-03-defaultWikiOnly.ts'
>>>>>>>
import './2020-07-23-defaultWikiGrade.ts'
import './2020-09-03-createWikiImportUsers.ts'
import './2020-09-03-defaultWikiOnly.ts' |
<<<<<<<
if (newDocument.userId !== vote.userId) {
void Users.update({_id: newDocument.userId}, {$inc: {"karma": vote.power}});
=======
if (newDocument.userId !== vote.userId && collectionsThatAffectKarma.includes(vote.collectionName)) {
Users.update({_id: newDocument.userId}, {$inc: {"karma": vote.power}});
>>>>>>>
if (newDocument.userId !== vote.userId && collectionsThatAffectKarma.includes(vote.collectionName)) {
void Users.update({_id: newDocument.userId}, {$inc: {"karma": vote.power}});
<<<<<<<
if (newDocument.userId !== vote.userId) {
void Users.update({_id: newDocument.userId}, {$inc: {"karma": -vote.power}});
=======
if (newDocument.userId !== vote.userId && collectionsThatAffectKarma.includes(vote.collectionName)) {
Users.update({_id: newDocument.userId}, {$inc: {"karma": -vote.power}});
>>>>>>>
if (newDocument.userId !== vote.userId && collectionsThatAffectKarma.includes(vote.collectionName)) {
void Users.update({_id: newDocument.userId}, {$inc: {"karma": -vote.power}}); |
<<<<<<<
importComponent("ReviewVotingPage", () => require('../components/users/ReviewVotingPage.tsx'))
importComponent("PasswordResetPage", () => require('../components/users/PasswordResetPage.tsx'))
=======
>>>>>>>
importComponent("PasswordResetPage", () => require('../components/users/PasswordResetPage.tsx')) |
<<<<<<<
import { ForwardedWhitelist } from './forwarded_whitelist';
import { Accounts } from '../platform/current/lib/meteorAccounts';
import { onServerConnect } from '../platform/current/server/meteorServerSideFns';
import { onStartup } from '../platform/current/lib/executionEnvironment';
=======
import { Meteor } from 'meteor/meteor';
>>>>>>>
import { onServerConnect } from '../platform/current/server/meteorServerSideFns';
import { onStartup } from '../platform/current/lib/executionEnvironment'; |
<<<<<<<
interface TagsDefaultFragment { // fragment on Tags
readonly name: string,
readonly slug: string,
readonly core: boolean,
readonly suggestedAsFilter: boolean,
readonly defaultOrder: number,
readonly postCount: number,
readonly createdAt: Date,
readonly createdBy: string,
readonly adminOnly: boolean,
readonly charsAdded: number,
readonly charsRemoved: number,
readonly deleted: boolean,
}
=======
>>>>>>> |
<<<<<<<
=======
fragment commentWithContextFragment on Comment {
_id
parentCommentId
topLevelCommentId
contents {
...RevisionDisplay
}
postedAt
userId
user {
...UsersMinimumInfo
}
currentUserVotes{
...VoteFragment
}
baseScore
score
}
`);
registerFragment(`
fragment commentInlineFragment on Comment {
_id
contents {
...RevisionDisplay
}
userId
user {
...UsersMinimumInfo
}
}
`);
registerFragment(`
>>>>>>>
<<<<<<<
=======
registerFragment(`
fragment WithVoteComment on Comment {
__typename
_id
currentUserVotes{
_id
voteType
power
}
baseScore
score
afBaseScore
voteCount
}
`);
>>>>>>> |
<<<<<<<
import Users from "../users/collection";
import { Posts } from '../posts/collection';
import { getSetting, Utils } from '../../vulcan-lib';
import { foreignKeyField, addFieldsDict, resolverOnlyField, denormalizedCountOfReferences, arrayOfForeignKeysField, denormalizedField, googleLocationToMongoLocation, accessFilterMultiple } from '../../utils/schemaUtils'
import { makeEditable } from '../../editor/make_editable'
import { addUniversalFields, schemaDefaultValue } from '../../collectionUtils'
import { defaultFilterSettings } from '../../filterSettings';
import { asyncFilter } from '../../utils/asyncUtils';
import SimpleSchema from 'simpl-schema'
=======
import GraphQLJSON from 'graphql-type-json';
import SimpleSchema from 'simpl-schema';
>>>>>>>
import { asyncFilter } from '../../utils/asyncUtils';
import GraphQLJSON from 'graphql-type-json';
import SimpleSchema from 'simpl-schema';
<<<<<<<
resolver: async (user, args, context: ResolverContext) => {
const events: Array<DbLWEvent> = context.LWEvents.find(
{userId: user._id, name: 'login'},
{
fields: context.Users.getViewableFields(context.currentUser, context.LWEvents),
limit: 10,
sort: {createdAt: -1}
}
).fetch()
const filteredEvents = await asyncFilter(events, async (e: DbLWEvent) => await context.LWEvents.checkAccess(context.currentUser, e, context))
const IPs = filteredEvents.map(event => event.properties && event.properties.ip);
=======
resolver: (user, args, context) => {
const events: Array<DbLWEvent> = context.LWEvents.find({userId: user._id, name: 'login'}, {fields: context.Users.getViewableFields(context.currentUser, context.LWEvents), limit: 10, sort: {createdAt: -1}}).fetch()
const filteredEvents: Array<Partial<DbLWEvent>> = _.filter(events, e => context.LWEvents.checkAccess(context.currentUser, e))
const IPs = filteredEvents.map(event => event.properties?.ip);
>>>>>>>
resolver: async (user, args, context: ResolverContext) => {
const events: Array<DbLWEvent> = context.LWEvents.find(
{userId: user._id, name: 'login'},
{
fields: context.Users.getViewableFields(context.currentUser, context.LWEvents),
limit: 10,
sort: {createdAt: -1}
}
).fetch()
const filteredEvents: Array<Partial<DbLWEvent>> = await asyncFilter(events,
async (e: DbLWEvent) => await context.LWEvents.checkAccess(context.currentUser, e, context));
const IPs = filteredEvents.map(event => event.properties?.ip); |
<<<<<<<
const schema: SchemaType<DbVote> = {
=======
const docIsTagRel = (currentUser, document) => {
// TagRel votes are treated as public
return document?.collectionName === "TagRels"
}
const schema = {
>>>>>>>
const docIsTagRel = (currentUser, document) => {
// TagRel votes are treated as public
return document?.collectionName === "TagRels"
}
const schema: SchemaType<DbVote> = {
<<<<<<<
canRead: ['admins'],
resolver: (vote: DbVote, args: void, { TagRels }: ResolverContext) => {
=======
canRead: [docIsTagRel, 'admins'],
resolver: (vote, args, { TagRels }: ResolverContext) => {
>>>>>>>
canRead: [docIsTagRel, 'admins'],
resolver: (vote: DbVote, args: void, { TagRels }: ResolverContext) => { |
<<<<<<<
contents {
_id
htmlHighlight
wordCount
version
}
=======
>>>>>>> |
<<<<<<<
import './2020-04-28-tagDefaultOrder'
import './2020-05-05-addRevisionCollectionName'
=======
import './2020-04-28-tagDefaultOrder'
import './2020-05-22-deletedNotifications'
>>>>>>>
import './2020-04-28-tagDefaultOrder'
import './2020-05-05-addRevisionCollectionName'
import './2020-05-22-deletedNotifications' |
<<<<<<<
import * as React from 'react';
// just a generic object with children specified as props
export interface IGenericProps {
children?: React.ReactNode;
}
=======
import { ISlotProps } from '@uifabricshared/foundation-settings';
export type IUseStyling<TProps extends object, TSlotProps extends ISlotProps = ISlotProps<TProps>> = (props: TProps) => TSlotProps;
>>>>>>>
import * as React from 'react';
import { ISlotProps } from '@uifabricshared/foundation-settings';
export type IUseStyling<TProps extends object, TSlotProps extends ISlotProps = ISlotProps<TProps>> = (props: TProps) => TSlotProps;
<<<<<<<
/**
* the process results, augmented with cthe composable element itself and optional slots,
* ready to render
*/
export type IResolvedSlot<
TProps extends object = IGenericProps,
TSlotProps = ISlotProps,
TAdditional extends object = object
> = IAsResolved<IProcessResult<TProps, TSlotProps, TAdditional>>;
=======
/**
* The slot definitions for this component. If this only has one sub-component this will only have a root entry. Using
* the render helpers to render will automatically include props processed from usePrepareProps
*/
slots: ISlotDefinitions<TSlotProps>;
}
export type IComposableDefinition<TProps extends object, TSlotProps extends ISlotProps = ISlotProps<TProps>, TState = any> = Partial<
IComposable<TProps, TSlotProps, TState>
>;
>>>>>>>
/**
* The slot definitions for this component. If this only has one sub-component this will only have a root entry. Using
* the render helpers to render will automatically include props processed from usePrepareProps
*/
slots: ISlotDefinitions<TSlotProps>;
}
export type IComposableDefinition<TProps extends object, TSlotProps extends ISlotProps = ISlotProps<TProps>, TState = any> = Partial<
IComposable<TProps, TSlotProps, TState>
>; |
<<<<<<<
import { RadioGroupTest } from './RadioGroupTest';
=======
import { PersonaTest } from './Persona/PersonaTest';
>>>>>>>
import { RadioGroupTest } from './RadioGroupTest';
import { PersonaTest } from './Persona/PersonaTest';
<<<<<<<
},
{
name: 'RadioGroup Test',
component: RadioGroupTest
=======
},
{
name: 'Persona Test',
component: PersonaTest
>>>>>>>
},
{
name: 'RadioGroup Test',
component: RadioGroupTest
},
{
name: 'Persona Test',
component: PersonaTest |
<<<<<<<
export * from './Stack/index';
export * from './Text/index';
export * from './RadioGroup/index';
=======
export * from './Stack/index';
>>>>>>>
export * from './Stack/index';
export * from './RadioGroup/index'; |
<<<<<<<
export {
addThemeRegistryListener,
removeThemeRegistryListener,
setTheme,
getTheme,
augmentPlatformTheme,
createNativeThemeRegistry
} from './Global';
export * from './INativeTheme';
=======
export { addThemeRegistryListener, removeThemeRegistryListener, setTheme, getTheme, augmentPlatformTheme } from './Global';
export * from './INativeTheme.types';
>>>>>>>
export {
addThemeRegistryListener,
removeThemeRegistryListener,
setTheme,
getTheme,
augmentPlatformTheme,
createNativeThemeRegistry
} from './Global';
export * from './INativeTheme.types';
<<<<<<<
export * from './platform/index';
export * from './ThemeProvider';
export * from './ThemeProvider.types';
export * from './ThemeContext';
=======
export * from './platform';
export * from './NativeModule';
>>>>>>>
export * from './platform';
export * from './ThemeProvider';
export * from './ThemeProvider.types';
export * from './ThemeContext';
export * from './NativeModule'; |
<<<<<<<
* Allow events to be dragged outside of the calendar
*/
@Input() allowDragOutside: boolean = false;
/**
* An array of day indexes (0 = sunday, 1 = monday etc) that indicate which days are weekends
*/
@Input() weekendDays: number[];
/**
=======
>>>>>>>
* An array of day indexes (0 = sunday, 1 = monday etc) that indicate which days are weekends
*/
@Input() weekendDays: number[];
/** |
<<<<<<<
darkTheme: boolean;
=======
tags: string[];
>>>>>>>
darkTheme: boolean;
tags: string[];
<<<<<<<
label: route.data.label,
darkTheme: route.data.darkTheme
=======
tags: route.data.tags || [],
label: route.data.label
>>>>>>>
label: route.data.label,
darkTheme: route.data.darkTheme,
tags: route.data.tags || [] |
<<<<<<<
snxJS: { SystemSettings, Synthetix },
=======
snxJS: { SynthetixState, Synthetix, Liquidations },
>>>>>>>
snxJS: {
SystemSettings,
Synthetix,
Liquidations,
SynthetixState,
contractSettings: { networkId },
},
<<<<<<<
const [targetCRatio, currentCRatio, transferable, debtBalance] = result.map(bigNumberFormatter);
=======
const [targetCRatio, currentCRatio, transferable, debtBalance, liquidationRatio] = result.map(
bigNumberFormatter
);
>>>>>>>
const [targetCRatio, currentCRatio, transferable, debtBalance, liquidationRatio] = result.map(
bigNumberFormatter
);
<<<<<<<
debtBalanceBN,
=======
liquidationRatio: 100 / liquidationRatio,
liquidationDelay: Number(result[5]),
>>>>>>>
debtBalanceBN,
liquidationRatio: 100 / liquidationRatio,
liquidationDelay: Number(result[5]), |
<<<<<<<
import { AuthenticationHandler, Logger } from '../types'
import { EVENT } from '../constants';
interface HttpAuthenticationHandlerSettings {
// http(s) endpoint that will receive post requests
endpointUrl: string
// an array of http status codes that qualify as permitted
permittedStatusCodes: number[]
// time in milliseconds before the request times out if no reply is received
requestTimeout: number
// fields to copy from authData to header, useful for when endpoints authenticate using middleware
promoteToHeader: string[]
}
=======
import { AuthenticationHandler, Logger } from '../types';
>>>>>>>
import { EVENT } from '../constants';
import { AuthenticationHandler, Logger } from '../types'
interface HttpAuthenticationHandlerSettings {
// http(s) endpoint that will receive post requests
endpointUrl: string
// an array of http status codes that qualify as permitted
permittedStatusCodes: number[]
// time in milliseconds before the request times out if no reply is received
requestTimeout: number
// fields to copy from authData to header, useful for when endpoints authenticate using middleware
promoteToHeader: string[]
} |
<<<<<<<
export type States = 'beforeData' | 'data' | 'tagOpen' | 'endTagOpen' | 'markupDeclaration' | 'commentStart' | 'comment' | 'commentStartDash' | 'commentEnd' | 'commentEndDash' | 'beforeAttributeName' | 'attributeName' | 'afterAttributeName' | 'selfClosingStartTag' | 'attributeValueDoubleQuoted' | 'attributeValueSingleQuoted' |
'attributeValueUnquoted' | 'attributeValueQuoted';
=======
export interface EntityParser {
parse(entity: string): string | undefined;
}
export interface TokenizerDelegate {
reset(): void;
finishData(): void;
tagOpen?(): void;
beginData(): void;
appendToData(char: string): void;
beginStartTag(): void;
appendToTagName(char: string): void;
beginAttribute(): void;
appendToAttributeName(char: string): void;
beginAttributeValue(quoted: boolean): void;
appendToAttributeValue(char: string): void;
finishAttributeValue(): void;
markTagAsSelfClosing(): void;
beginEndTag(): void;
finishTag(): void;
beginComment(): void;
appendToCommentData(char: string): void;
finishComment(): void;
reportSyntaxError(error: string): void;
}
>>>>>>>
export type States = 'beforeData' | 'data' | 'tagOpen' | 'endTagOpen' | 'markupDeclaration' | 'commentStart' | 'comment' | 'commentStartDash' | 'commentEnd' | 'commentEndDash' | 'beforeAttributeName' | 'attributeName' | 'afterAttributeName' | 'selfClosingStartTag' | 'attributeValueDoubleQuoted' | 'attributeValueSingleQuoted' |
'attributeValueUnquoted' | 'attributeValueQuoted';
export interface EntityParser {
parse(entity: string): string | undefined;
}
export interface TokenizerDelegate {
reset(): void;
finishData(): void;
tagOpen?(): void;
beginData(): void;
appendToData(char: string): void;
beginStartTag(): void;
appendToTagName(char: string): void;
beginAttribute(): void;
appendToAttributeName(char: string): void;
beginAttributeValue(quoted: boolean): void;
appendToAttributeValue(char: string): void;
finishAttributeValue(): void;
markTagAsSelfClosing(): void;
beginEndTag(): void;
finishTag(): void;
beginComment(): void;
appendToCommentData(char: string): void;
finishComment(): void;
reportSyntaxError(error: string): void;
}
<<<<<<<
transitionTo(state: States) {
this.state = state;
}
tokenize(input) {
=======
tokenize(input: string) {
>>>>>>>
transitionTo(state: States) {
this.state = state;
}
tokenize(input: string) { |
<<<<<<<
import { Input, Layer, ActivationLayer } from '../ui/shapes/layer';
=======
import { Input, Layer } from '../ui/shapes/layer';
import { text } from 'd3';
>>>>>>>
import { Input, Layer, ActivationLayer } from '../ui/shapes/layer';
import { text } from 'd3';
<<<<<<<
defaults.set("MaxPooling2D", {poolSize: 2, strides: 2})
defaults.set("Conv2D", {kernelSize: 3, filters: 32, activation: 'relu'})
=======
defaults.set("MaxPooling2D", {units: 10, activation: 'relu', poolSize: 2, strides: 2})
defaults.set("Conv2D", {units: 10, activation: 'relu', kernelSize: 3, filters: 20})
>>>>>>>
defaults.set("MaxPooling2D", {poolSize: 2, strides: 2, activation: 'relu'})
defaults.set("Conv2D", {kernelSize: 3, filters: 32, activation: 'relu'})
<<<<<<<
let params = defaults.get(current.layerType)
if ((<ActivationLayer>current).activation != null) {
params.activation = (<ActivationLayer>current).activation.activationType
}
nextLayer = typeToTensor.get(current.layerType)(params).apply(nextLayer)
console.log("test2")
=======
nextLayer = typeToTensor.get(current.layerType)(defaults.get(current.layerType)).apply(nextLayer)
>>>>>>>
let params = defaults.get(current.layerType)
if ((<ActivationLayer>current).activation != null) {
params.activation = (<ActivationLayer>current).activation.activationType
}
nextLayer = typeToTensor.get(current.layerType)(params).apply(nextLayer)
console.log("test2")
<<<<<<<
console.log("hi")
nextLayer = <SymbolicTensor>tf.layers.dense({units: 10, activation: 'softmax'}).apply(nextLayer)
=======
console.log("Building model... ")
>>>>>>>
console.log("Building model... ")
nextLayer = <SymbolicTensor>tf.layers.dense({units: 10, activation: 'softmax'}).apply(nextLayer) |
<<<<<<<
public lineOfPython(): string {
return `Concatenate()`
}
=======
public generateTfjsLayer(){
// Concatenate layers handle fan-in
let parents = []
for (let parent of this.parents) {
parents.push(parent.getTfjsLayer())
}
this.tfjsLayer = <tf.SymbolicTensor> this.tfjsEmptyLayer().apply(parents)
}
>>>>>>>
public lineOfPython(): string {
return `Concatenate()`
}
public generateTfjsLayer(){
// Concatenate layers handle fan-in
let parents = []
for (let parent of this.parents) {
parents.push(parent.getTfjsLayer())
}
this.tfjsLayer = <tf.SymbolicTensor> this.tfjsEmptyLayer().apply(parents)
} |
<<<<<<<
import { loadStateIfPossible, storeNetworkInUrl } from "../model/save_state_url";
=======
import { pythonSkeleton } from "../model/skeleton";
>>>>>>>
import { loadStateIfPossible, storeNetworkInUrl } from "../model/save_state_url";
import { pythonSkeleton } from "../model/skeleton";
<<<<<<<
// graphToJson();
// train(buildNetwork(svgData.input))
console.log("Original svg data", svgData)
let state = graphToJson(svgData)
storeNetworkInUrl(state)
loadStateIfPossible()
=======
>>>>>>>
// graphToJson();
// train(buildNetwork(svgData.input))
console.log("Original svg data", svgData)
let state = graphToJson(svgData)
storeNetworkInUrl(state)
loadStateIfPossible() |
<<<<<<<
paramBox: HTMLElement;
=======
paramBox;
>>>>>>>
paramBox: HTMLElement;
<<<<<<<
let name = line.children[0].getAttribute('data-name');
if (line.children[1].className == "select") {
let selectElement: HTMLSelectElement = <HTMLSelectElement>line.children[1].children[0];
params[name] = selectElement.options[selectElement.selectedIndex].value
} else {
let value = (<HTMLInputElement>line.children[1]).value;
params[name] = parseString(value);
}
=======
let name = line.children[0].getAttribute('data-name');
let value = line.children[1].value;
// Need to not parse as integer for float parameters
if ((defaultParams[name].toString()).indexOf('.') >= 0) {
params[name] = parseFloat(value);
}
else {
params[name] = parseString(value);
}
>>>>>>>
let name = line.children[0].getAttribute('data-name');
if (line.children[1].className == "select") {
let selectElement: HTMLSelectElement = <HTMLSelectElement>line.children[1].children[0];
params[name] = selectElement.options[selectElement.selectedIndex].value
} else {
let value = (<HTMLInputElement>line.children[1]).value;
// Need to not parse as integer for float parameters
if ((defaultParams[name].toString()).indexOf('.') >= 0) {
params[name] = parseFloat(value);
}
else {
params[name] = parseString(value);
}
} |
<<<<<<<
$scope.alert = {
enable:false,
content:'',
type:'',
hide: function(){
this.enable = false;
},
show: function(){
this.enable = true;
}
};
=======
$scope.executionPredicate = 'name';
$scope.executionReverse = false;
$scope.stepPredicate = 'name';
$scope.stepReverse = false;
>>>>>>>
$scope.alert = {
enable:false,
content:'',
type:'',
hide: function(){
this.enable = false;
},
show: function(){
this.enable = true;
}
};
$scope.executionPredicate = 'name';
$scope.executionReverse = false;
$scope.stepPredicate = 'name';
$scope.stepReverse = false;
<<<<<<<
$scope.jobExecutionList = data.jobInstance.jobExecutions;
$scope.jobName = jobName;
=======
$scope.jobExecutionList = jobExecutionList;
>>>>>>>
$scope.jobName = jobName;
$scope.jobExecutionList = jobExecutionList; |
<<<<<<<
$scope.stepExecutionList = data.jobExecution.stepExecutions;
$scope.executionId = executionId;
=======
$scope.stepExecutionList = stepList;
>>>>>>>
$scope.executionId = executionId;
$scope.stepExecutionList = stepList; |
<<<<<<<
it('should connect to s3 because of configuration favorism', async () => {
cluster3.maxLevel2Peers = 1
if (s1._server.conf.ws2p) s1._server.conf.ws2p.privateAccess = true
if (s3._server.conf.ws2p) {
s3._server.conf.ws2p.publicAccess = true
s3._server.conf.ws2p.maxPublic = 1
}
=======
it('should be able to fully disconnect the WS2P network', async () => {
// Preparation for next test of configuration favorism
>>>>>>>
it('should be able to fully disconnect the WS2P network', async () => {
if (s1._server.conf.ws2p) s1._server.conf.ws2p.privateAccess = true
if (s3._server.conf.ws2p) {
s3._server.conf.ws2p.publicAccess = true
s3._server.conf.ws2p.maxPublic = 1
}
<<<<<<<
//await waitForkWS2PDisconnection(s3._server, '2LvDg21dVXvetTD9GdkPLURavLYEqP3whauvPWX4c2qc')
await s1.expect('/network/ws2p/info', (res:any) => {
assert.equal(res.peers.level1, 1) // <- New connection to s3
assert.equal(res.peers.level2, 1)
})
await s2.expect('/network/ws2p/info', (res:any) => {
assert.equal(res.peers.level1, 1)
assert.equal(res.peers.level2, 0)
})
await s3.expect('/network/ws2p/info', (res:any) => {
assert.equal(res.peers.level1, 0)
assert.equal(res.peers.level2, 1) // <- New connection from s1
})
await s4.expect('/network/ws2p/info', (res:any) => {
assert.equal(res.peers.level1, 0)
assert.equal(res.peers.level2, 0)
})
=======
await waitForkWS2PDisconnection(s3._server, '2LvDg21dVXvetTD9GdkPLURavLYEqP3whauvPWX4c2qc') // <-- s2 is kicked! s1 is prefered
await s1.expect('/network/ws2p/info', (res:any) => {
assert.equal(res.peers.level1, 1) // <- New connection to s3
assert.equal(res.peers.level2, 0)
})
await s2.expect('/network/ws2p/info', (res:any) => {
assert.equal(res.peers.level1, 0)
assert.equal(res.peers.level2, 0)
})
await s3.expect('/network/ws2p/info', (res:any) => {
assert.equal(res.peers.level1, 0)
assert.equal(res.peers.level2, 1) // <- New connection from s1
})
await s4.expect('/network/ws2p/info', (res:any) => {
assert.equal(res.peers.level1, 0)
assert.equal(res.peers.level2, 0)
})
>>>>>>>
await waitForkWS2PDisconnection(s3._server, '2LvDg21dVXvetTD9GdkPLURavLYEqP3whauvPWX4c2qc') // <-- s2 is kicked! s1 is prefered
await s1.expect('/network/ws2p/info', (res:any) => {
assert.equal(res.peers.level1, 1) // <- New connection to s3
assert.equal(res.peers.level2, 0)
})
await s2.expect('/network/ws2p/info', (res:any) => {
assert.equal(res.peers.level1, 0)
assert.equal(res.peers.level2, 0)
})
await s3.expect('/network/ws2p/info', (res:any) => {
assert.equal(res.peers.level1, 0)
assert.equal(res.peers.level2, 1) // <- New connection from s1
})
await s4.expect('/network/ws2p/info', (res:any) => {
assert.equal(res.peers.level1, 0)
assert.equal(res.peers.level2, 0)
}) |
<<<<<<<
QueryList,
OnInit
=======
QueryList,
AfterContentInit
>>>>>>>
QueryList,
OnInit,
AfterContentInit
<<<<<<<
export class FormGroupComponent implements OnInit {
=======
export class FormGroupComponent implements AfterContentInit {
>>>>>>>
export class FormGroupComponent implements OnInit, AfterContentInit {
<<<<<<<
public errorMessages: ErrorMessage[];
=======
@ContentChild(MessagesComponent) public messagesBlock: MessagesComponent;
public messages: () => string[];
>>>>>>>
@ContentChild(MessagesComponent) public messagesBlock: MessagesComponent;
private errorMessages: ErrorMessage[];
public messages = () => this.getMessages();
<<<<<<<
get messages(): string[] {
=======
get errorMessages(): ErrorMessage[] {
return [
...this.customErrorMessages,
...this.errorMessageService.errorMessages
];
}
private getMessages(): string[] {
>>>>>>>
private getMessages(): string[] { |
<<<<<<<
import {field, document, onetomany, manytoone, manytomany} from '../../decorators';
import {Strict} from '../../enums';
import {Types} from 'mongoose';
//@document({ name: 'students', strict: Strict.true })
=======
import {Types} from 'mongoose';
>>>>>>>
import {Types} from 'mongoose';
import {Strict} from '../../enums';
import {Types} from 'mongoose';
//@document({ name: 'students', strict: Strict.true }) |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.