conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
// afterCartUpdateCalculateDiscount 2 times.
assert.equal(updateSpy.callCount, 2, "update should be called two times");
Meteor._sleepForMs(1000);
=======
// afterCartUpdateCalculateDiscount 4 times.
assert.equal(updateSpy.callCount, 4, "update should be called four times");
>>>>>>>
// afterCartUpdateCalculateDiscount 2 times.
assert.equal(updateSpy.callCount, 2, "update should be called two times"); |
<<<<<<<
=======
import Logger from "@reactioncommerce/logger";
import { $ } from "meteor/jquery";
>>>>>>>
import Logger from "@reactioncommerce/logger";
<<<<<<<
document.querySelector("#cart-drawer-container").classList.add("opened");
if (!swiper) {
swiper = new Swiper(".cart-drawer-swiper-container", {
direction: "horizontal",
setWrapperSize: true,
loop: false,
grabCursor: true,
slidesPerView: "auto",
wrapperClass: "cart-drawer-swiper-wrapper",
slideClass: "cart-drawer-swiper-slide",
slideActiveClass: "cart-drawer-swiper-slide-active",
pagination: ".cart-drawer-pagination",
paginationClickable: true
});
}
=======
$("#cart-drawer-container").fadeIn(() => {
if (!swiper) {
import("swiper")
.then((module) => {
const Swiper = module.default;
swiper = new Swiper(".cart-drawer-swiper-container", {
direction: "horizontal",
setWrapperSize: true,
loop: false,
grabCursor: true,
slidesPerView: "auto",
wrapperClass: "cart-drawer-swiper-wrapper",
slideClass: "cart-drawer-swiper-slide",
slideActiveClass: "cart-drawer-swiper-slide-active",
pagination: ".cart-drawer-pagination",
paginationClickable: true
});
return swiper;
})
.catch((error) => {
Logger.error(error.message, "Unable to load Swiper module");
});
}
});
>>>>>>>
document.querySelector("#cart-drawer-container").classList.add("opened");
if (!swiper) {
import("swiper")
.then((module) => {
const Swiper = module.default;
swiper = new Swiper(".cart-drawer-swiper-container", {
direction: "horizontal",
setWrapperSize: true,
loop: false,
grabCursor: true,
slidesPerView: "auto",
wrapperClass: "cart-drawer-swiper-wrapper",
slideClass: "cart-drawer-swiper-slide",
slideActiveClass: "cart-drawer-swiper-slide-active",
pagination: ".cart-drawer-pagination",
paginationClickable: true
});
return swiper;
})
.catch((error) => {
Logger.error(error.message, "Unable to load Swiper module");
});
} |
<<<<<<<
const shopBilling = order.billing && order.billing.find((billing) => billing && billing.shopId === Reaction.getShopId()) || {};
=======
const shopBilling = (order.billing && order.billing.find(billing => billing && billing.shopId === Reaction.getShopId())) || {};
>>>>>>>
const shopBilling = (order.billing && order.billing.find((billing) => billing && billing.shopId === Reaction.getShopId())) || {}; |
<<<<<<<
import { Hooks, Reaction } from "/server/api";
=======
>>>>>>>
import { Hooks, Reaction } from "/server/api";
<<<<<<<
}, { selector: { type: "variant" } });
Hooks.Events.run("afterUpdateCatalogProduct", variant);
=======
}, { selector: { type: "variant" }, publish: true });
>>>>>>>
}, { selector: { type: "variant" }, publish: true });
Hooks.Events.run("afterUpdateCatalogProduct", variant); |
<<<<<<<
import Tab from "@material-ui/core/Tab";
import Tabs from "@material-ui/core/Tabs";
import { Blocks } from "@reactioncommerce/reaction-components";
import { i18next } from "/client/api";
=======
import { i18next } from "/client/api";
import DetailDrawer from "/imports/client/ui/components/DetailDrawer";
>>>>>>>
import Tab from "@material-ui/core/Tab";
import Tabs from "@material-ui/core/Tabs";
import { Blocks } from "@reactioncommerce/reaction-components";
import { i18next } from "/client/api";
import DetailDrawer from "/imports/client/ui/components/DetailDrawer";
<<<<<<<
=======
import OrderCardCustomerDetails from "./OrderCardCustomerDetails";
import OrderCardSummary from "./orderCardSummary";
>>>>>>> |
<<<<<<<
const { product } = this.props;
const handle = product.__published && product.__published.handle || product.handle;
=======
const product = this.props.product;
const handle = (product.__published && product.__published.handle) || product.handle;
>>>>>>>
const { product } = this.props;
const handle = (product.__published && product.__published.handle) || product.handle; |
<<<<<<<
const { collections, user: userFromContext, userHasPermission } = context;
const { Accounts, AccountInvites, Groups, Shops, users } = collections;
=======
const { checkPermissions, collections, user: userFromContext } = context;
const { Accounts, Groups, Shops, users } = collections;
>>>>>>>
const { checkPermissions, collections, user: userFromContext } = context;
const { Accounts, AccountInvites, Groups, Shops, users } = collections; |
<<<<<<<
placeOrder,
updateOrder
=======
cancelOrderItem,
placeOrder
>>>>>>>
cancelOrderItem,
placeOrder,
updateOrder |
<<<<<<<
function uniqObjects(methods) {
const jsonBlobs = methods.map((method) => {
return JSON.stringify(method);
});
const uniqueBlobs = _.uniq(jsonBlobs);
return uniqueBlobs.map((blob) => {
return EJSON.parse(blob);
});
}
// cartShippingQuotes
// returns multiple methods
=======
/**
* cartShippingQuotes - returns a list of all the shipping costs/quotations
* of each available shipping carrier like UPS, Fedex etc.
* @param {Object} currentCart - The current cart that's about
* to be checked out.
* @returns {Array} - an array of the quotations of multiple shipping
* carriers.
*/
>>>>>>>
function uniqObjects(methods) {
const jsonBlobs = methods.map((method) => {
return JSON.stringify(method);
});
const uniqueBlobs = _.uniq(jsonBlobs);
return uniqueBlobs.map((blob) => {
return EJSON.parse(blob);
});
}
// cartShippingQuotes
// returns multiple methods
/**
* cartShippingQuotes - returns a list of all the shipping costs/quotations
* of each available shipping carrier like UPS, Fedex etc.
* @param {Object} currentCart - The current cart that's about
* to be checked out.
* @returns {Array} - an array of the quotations of multiple shipping
* carriers.
*/
<<<<<<<
shipmentQuotes.push(quote);
=======
if (shipping.shopId === primaryShopId) {
if (quote.carrier === "Flat Rate" || quote.requestStatus !== "error") {
shipmentQuotes.push(quote);
}
}
>>>>>>>
shipmentQuotes.push(quote);
if (quote.carrier === "Flat Rate" || quote.requestStatus !== "error") {
shipmentQuotes.push(quote);
}
<<<<<<<
return uniqObjects(shipmentQuotes);
=======
return shipmentQuotes;
>>>>>>>
return uniqObjects(shipmentQuotes); |
<<<<<<<
/**
* Functions used by the GraphQL server configuration
* @namespace GraphQL
*/
const collections = {};
=======
const collections = { Media: NoMeteorMedia };
>>>>>>>
/**
* Functions used by the GraphQL server configuration
* @namespace GraphQL
*/
const collections = { Media: NoMeteorMedia }; |
<<<<<<<
if (!context.isInternalCall) {
await context.validatePermissions(`reaction:legacy:accounts:${account._id}`, "update:currency", {
shopId: account.shopId,
owner: account.userId,
legacyRoles: ["reaction-accounts"]
});
}
=======
await context.validatePermissions(`reaction:accounts:${account._id}`, "update:currency", {
shopId: account.shopId,
owner: account.userId,
legacyRoles: ["reaction-accounts"]
});
>>>>>>>
await context.validatePermissions(`reaction:legacy:accounts:${account._id}`, "update:currency", {
shopId: account.shopId,
owner: account.userId,
legacyRoles: ["reaction-accounts"]
}); |
<<<<<<<
export default async function tag(context, slugOrId, { shouldIncludeInvisible = false } = {}) {
const { collections } = context;
=======
export default async function tag(context, input) {
const { collections, userHasPermission } = context;
>>>>>>>
export default async function tag(context, input) {
const { collections } = context;
<<<<<<<
const shopId = await context.queries.primaryShopId(context);
// Check to make sure user has `read` permissions for this tag
await context.validatePermissionsLegacy(["admin", "owner", "tags"], null, { shopId });
await context.validatePermissions(`reaction:tags:${slugOrId}`, "read", { shopId });
// Check to see if user has `read` permissions for hidden / deleted tags
// TODO(pod-auth): revisit using `inactive` in resource, and revisit the word `inactive`
const hasInactivePermissions = context.userHasPermissionLegacy(["admin", "owner", "tags"], shopId) &&
await context.userHasPermissions(`reaction:tags:${slugOrId}:inactive`, "read", { shopId });
=======
const { slugOrId, shopId, shouldIncludeInvisible = false } = input;
>>>>>>>
const { slugOrId, shopId, shouldIncludeInvisible = false } = input;
// Check to make sure user has `read` permissions for this tag
await context.validatePermissionsLegacy(["admin", "owner", "tags"], null, { shopId });
await context.validatePermissions(`reaction:tags:${slugOrId}`, "read", { shopId });
// Check to see if user has `read` permissions for hidden / deleted tags
// TODO(pod-auth): revisit using `inactive` in resource, and revisit the word `inactive`
const hasInactivePermissions = context.userHasPermissionLegacy(["admin", "owner", "tags"], shopId) &&
await context.userHasPermissions(`reaction:tags:${slugOrId}:inactive`, "read", { shopId });
<<<<<<<
if (hasInactivePermissions && shouldIncludeInvisible === true) {
query = {
$or: [{ _id: slugOrId }, { slug: slugOrId }]
};
}
const foundTag = await Tags.findOne(query);
if (!foundTag) {
throw new ReactionError("not-found", "Tag not found");
=======
if (shouldIncludeInvisible === true) {
if (userHasPermission(["owner", "admin"], shopId)) {
query = { $or: [{ _id: slugOrId }, { slug: slugOrId }] };
}
>>>>>>>
if (hasInactivePermissions && shouldIncludeInvisible === true) {
query = {
$or: [{ _id: slugOrId }, { slug: slugOrId }]
};
}
const foundTag = await Tags.findOne(query);
if (!foundTag) {
throw new ReactionError("not-found", "Tag not found"); |
<<<<<<<
// Allow split if the account has "orders" permission. When called internally by another
// plugin, context.isInternalCall can be set to `true` to disable this check.
if (!isInternalCall) {
await context.validatePermissions(
`reaction:legacy:orders:${order._id}`,
"move:item",
{ shopId: order.shopId, legacyRoles: ["orders", "order/fulfillment"] }
);
}
=======
// Allow split if the account has "orders" permission
await context.validatePermissions(`reaction:orders:${order._id}`, "move:item", { shopId: order.shopId, legacyRoles: ["orders", "order/fulfillment"] });
>>>>>>>
// Allow split if the account has "orders" permission
await context.validatePermissions(
`reaction:legacy:orders:${order._id}`,
"move:item",
{ shopId: order.shopId, legacyRoles: ["orders", "order/fulfillment"] }
); |
<<<<<<<
import registerProductAdminPlugin from "./plugins/product-admin/index.js";
=======
import registerNotificationsPlugin from "./plugins/notifications/index.js";
>>>>>>>
import registerNotificationsPlugin from "./plugins/notifications/index.js";
import registerProductAdminPlugin from "./plugins/product-admin/index.js"; |
<<<<<<<
export default async function updateNavigationTree(context, _id, navigationTree) {
const { collections } = context;
=======
export default async function updateNavigationTree(context, input) {
const { checkPermissions, collections } = context;
>>>>>>>
export default async function updateNavigationTree(context, input) {
const { collections } = context; |
<<<<<<<
"can_be_unlocked_now": "can be unlocked",
=======
"totle_transactions_per_day":"Total Daily Transactions",
"tron_total_transactions_chart":"TRON Total Transactions Chart",
>>>>>>>
"totle_transactions_per_day":"Total Daily Transactions",
"tron_total_transactions_chart":"TRON Total Transactions Chart",
"can_be_unlocked_now": "can be unlocked", |
<<<<<<<
const description = shop.name + " Ref: " + cartId;
const { currency } = shop;
=======
const description = `${shop.name} Ref: ${cartId}`;
const currency = shop.currency;
>>>>>>>
const description = `${shop.name} Ref: ${cartId}`;
const { currency } = shop; |
<<<<<<<
// 03-26 tag
account_tags_list:'Список вкладок',
account_tags_add:'Добавить',
account_tags_desc:'Функция тегов: вы можете прикрепить личные теги к аккаунтам, чтобы их было легче идентифицировать',
account_tags_number:'{total} всего аккаунтов',
account_tags_table_1:'тег',
account_tags_table_2:'Заметка',
account_tags_add_title:'Добавить тег',
account_tags_edit_title:'edit tag',
account_tags_add_success:'The tag has been successfully added',
account_tags_edit_success:'The tag has been successfully edited',
account_tags_number_rec:'{number} accounts mark',
account_tags_tip:'Приватный тег. Виден только мне',
account_tags_edit: "edit",
account_tags_delete: "remove",
account_tags_delete_is: "Вы уверены, что хотите удалить тег?",
account_tags_delete_succss: "Тег был удален.",
account_address_name_tag:'(Верефицированый тег)',
account_tags_address_placehold:'请输入正确的地址',
account_tags_tag_placehold:'Пожалуйста, введите тег (не более 20 символов).',
account_tags_note_placehold:'Необязательно, не более 100 символов.',
account_tags_tag_valid:'Only Chinese, English or Arabic numbers can be entered',
account_tags_rec:"Рекомендуемый тег",
account_tags_my_tag:'Мои теги',
account_tags_my_tag_update:'Обновления',
account_tags_my_tag_login_show:'Содержание будет отображаться после входа.',
account_tags_my_tag_not_available:'Not Available',
=======
fill_a_valid_ledger_note:'Please confirm that the Transactions Data option in the ledger settings is allowed, otherwise you cannot send notes',
enter_up_to_50_characters:'Enter up to 50 characters',
>>>>>>>
// 03-26 tag
account_tags_list:'Список вкладок',
account_tags_add:'Добавить',
account_tags_desc:'Функция тегов: вы можете прикрепить личные теги к аккаунтам, чтобы их было легче идентифицировать',
account_tags_number:'{total} всего аккаунтов',
account_tags_table_1:'тег',
account_tags_table_2:'Заметка',
account_tags_add_title:'Добавить тег',
account_tags_edit_title:'edit tag',
account_tags_add_success:'The tag has been successfully added',
account_tags_edit_success:'The tag has been successfully edited',
account_tags_number_rec:'{number} accounts mark',
account_tags_tip:'Приватный тег. Виден только мне',
account_tags_edit: "edit",
account_tags_delete: "remove",
account_tags_delete_is: "Вы уверены, что хотите удалить тег?",
account_tags_delete_succss: "Тег был удален.",
account_address_name_tag:'(Верефицированый тег)',
account_tags_address_placehold:'请输入正确的地址',
account_tags_tag_placehold:'Пожалуйста, введите тег (не более 20 символов).',
account_tags_note_placehold:'Необязательно, не более 100 символов.',
account_tags_tag_valid:'Only Chinese, English or Arabic numbers can be entered',
account_tags_rec:"Рекомендуемый тег",
account_tags_my_tag:'Мои теги',
account_tags_my_tag_update:'Обновления',
account_tags_my_tag_login_show:'Содержание будет отображаться после входа.',
account_tags_my_tag_not_available:'Not Available',
fill_a_valid_ledger_note:'Please confirm that the Transactions Data option in the ledger settings is allowed, otherwise you cannot send notes',
enter_up_to_50_characters:'Enter up to 50 characters', |
<<<<<<<
<div>
<OrderTable
orders={this.props.orders}
orderCount={this.props.orderCount}
query={this.state.query}
selectedItems={this.props.selectedItems}
handleSelect={this.props.handleSelect}
handleClick={this.props.handleClick}
multipleSelect={this.props.multipleSelect}
selectAllOrders={this.props.selectAllOrders}
displayMedia={this.props.displayMedia}
isOpen={this.state.openList}
shipping={this.props.shipping}
setShippingStatus={this.props.setShippingStatus}
isLoading={this.props.isLoading}
renderFlowList={this.props.renderFlowList}
toggleShippingFlowList={this.props.toggleShippingFlowList}
handleBulkPaymentCapture={this.props.handleBulkPaymentCapture}
/>
</div>
=======
<OrderTable
orders={this.props.orders}
query={this.state.query}
selectedItems={this.props.selectedItems}
handleSelect={this.props.handleSelect}
handleClick={this.props.handleClick}
multipleSelect={this.props.multipleSelect}
selectAllOrders={this.props.selectAllOrders}
displayMedia={this.props.displayMedia}
isOpen={this.state.openList}
shipping={this.props.shipping}
setShippingStatus={this.props.setShippingStatus}
isLoading={this.props.isLoading}
renderFlowList={this.props.renderFlowList}
toggleShippingFlowList={this.props.toggleShippingFlowList}
handleBulkPaymentCapture={this.props.handleBulkPaymentCapture}
/>
>>>>>>>
<OrderTable
orders={this.props.orders}
orderCount={this.props.orderCount}
query={this.state.query}
selectedItems={this.props.selectedItems}
handleSelect={this.props.handleSelect}
handleClick={this.props.handleClick}
multipleSelect={this.props.multipleSelect}
selectAllOrders={this.props.selectAllOrders}
displayMedia={this.props.displayMedia}
isOpen={this.state.openList}
shipping={this.props.shipping}
setShippingStatus={this.props.setShippingStatus}
isLoading={this.props.isLoading}
renderFlowList={this.props.renderFlowList}
toggleShippingFlowList={this.props.toggleShippingFlowList}
handleBulkPaymentCapture={this.props.handleBulkPaymentCapture}
/> |
<<<<<<<
import { Reaction } from "/lib/api";
import { Logger } from "/server/api";
import { Products, Revisions } from "/lib/collections";
=======
import { Media, Products, Revisions } from "/lib/collections";
import { Logger, Reaction } from "/server/api";
>>>>>>>
import { Reaction } from "/lib/api";
import { Logger } from "/server/api";
import { Media, Products, Revisions } from "/lib/collections";
<<<<<<<
// Everyone else gets the standard, visible products and variants
return Products.find(selector);
=======
// Everyone else gets the standard, visibile products and variants
const productCursor = Products.find(selector);
const productIds = productCursor.map(p => p._id);
const mediaCursor = findProductMedia(this, productIds);
return [
productCursor,
mediaCursor
];
>>>>>>>
// Everyone else gets the standard, visbile products and variants
const productCursor = Products.find(selector);
const productIds = productCursor.map(p => p._id);
const mediaCursor = findProductMedia(this, productIds);
return [
productCursor,
mediaCursor
]; |
<<<<<<<
// const sub = this;
// let variantsHandle = [];
let _id;
const shop = ReactionCore.getCurrentShop(this);
const Products = ReactionCore.Collections.Products;
=======
let shop = ReactionCore.getCurrentShop();
if (typeof shop !== "object") {
return this.ready();
}
let Products = ReactionCore.Collections.Products;
>>>>>>>
let _id;
let shop = ReactionCore.getCurrentShop();
if (typeof shop !== "object") {
return this.ready();
}
let Products = ReactionCore.Collections.Products; |
<<<<<<<
payflowAccountOptions: function () {
const { settings } = Packages.findOne({
=======
payflowAccountOptions() {
const settings = Packages.findOne({
>>>>>>>
payflowAccountOptions() {
const { settings } = Packages.findOne({ |
<<<<<<<
import { Reaction, Logger } from "/server/api";
import { ValidCardNumber, ValidExpireMonth, ValidExpireYear, ValidCVV } from "/lib/api";
=======
import { Logger } from "/server/api";
>>>>>>>
import { Logger } from "/server/api";
import { ValidCardNumber, ValidExpireMonth, ValidExpireYear, ValidCVV } from "/lib/api"; |
<<<<<<<
import "./methods/catalog";
import "./methods/publishProduct";
=======
import "./methods/catalog";
/**
* Query functions that do not import or use any Meteor packages or globals. These can be used both
* by Meteor methods or publications, and by GraphQL resolvers.
* @namespace Catalog/NoMeteorQueries
*/
>>>>>>>
import "./methods/catalog";
import "./methods/publishProduct";
/**
* Query functions that do not import or use any Meteor packages or globals. These can be used both
* by Meteor methods or publications, and by GraphQL resolvers.
* @namespace Catalog/NoMeteorQueries
*/ |
<<<<<<<
{ shopId: shopId },
{
$or: [
{
_id: {
$regex: `^${regexSafeSearchTerm}`,
$options: "i"
}
},
{
userEmails: {
$regex: regexSafeSearchTerm,
$options: "i"
}
},
{
shippingName: {
$regex: regexSafeSearchTerm,
$options: "i"
}
},
{
billingName: {
$regex: regexSafeSearchTerm,
$options: "i"
}
},
{
billingCard: {
$regex: regexSafeSearchTerm,
$options: "i"
}
},
{
billingPhone: {
$regex: regexSafeSearchTerm,
$options: "i"
}
},
{
shippingPhone: {
$regex: regexSafeSearchTerm,
$options: "i"
}
},
{
"product.title": {
$regex: regexSafeSearchTerm,
$options: "i"
}
},
{
"variants.title": {
$regex: regexSafeSearchTerm,
$options: "i"
}
},
{
"variants.optionTitle": {
$regex: regexSafeSearchTerm,
$options: "i"
}
}
]
}
=======
{ shopId },
{ $or: [
{ _id: {
$regex: `^${regexSafeSearchTerm}`,
$options: "i"
} },
{ userEmails: {
$regex: regexSafeSearchTerm,
$options: "i"
} },
{ shippingName: {
$regex: regexSafeSearchTerm,
$options: "i"
} },
{ billingName: {
$regex: regexSafeSearchTerm,
$options: "i"
} },
{ billingCard: {
$regex: regexSafeSearchTerm,
$options: "i"
} },
{ billingPhone: {
$regex: regexSafeSearchTerm,
$options: "i"
} },
{ shippingPhone: {
$regex: regexSafeSearchTerm,
$options: "i"
} },
{ "product.title": {
$regex: regexSafeSearchTerm,
$options: "i"
} },
{ "variants.title": {
$regex: regexSafeSearchTerm,
$options: "i"
} },
{ "variants.optionTitle": {
$regex: regexSafeSearchTerm,
$options: "i"
} }
] }
>>>>>>>
{ shopId },
{
$or: [
{
_id: {
$regex: `^${regexSafeSearchTerm}`,
$options: "i"
}
},
{
userEmails: {
$regex: regexSafeSearchTerm,
$options: "i"
}
},
{
shippingName: {
$regex: regexSafeSearchTerm,
$options: "i"
}
},
{
billingName: {
$regex: regexSafeSearchTerm,
$options: "i"
}
},
{
billingCard: {
$regex: regexSafeSearchTerm,
$options: "i"
}
},
{
billingPhone: {
$regex: regexSafeSearchTerm,
$options: "i"
}
},
{
shippingPhone: {
$regex: regexSafeSearchTerm,
$options: "i"
}
},
{
"product.title": {
$regex: regexSafeSearchTerm,
$options: "i"
}
},
{
"variants.title": {
$regex: regexSafeSearchTerm,
$options: "i"
}
},
{
"variants.optionTitle": {
$regex: regexSafeSearchTerm,
$options: "i"
}
}
]
}
<<<<<<<
{ shopId: shopId },
{
$or: [
{
emails: {
$regex: searchTerm,
$options: "i"
}
},
{
"profile.firstName": {
$regex: `^${searchTerm}$`,
$options: "i"
}
},
{
"profile.lastName": {
$regex: `^${searchTerm}$`,
$options: "i"
}
},
{
"profile.phone": {
$regex: `^${searchPhone}$`,
$options: "i"
}
}
]
}
=======
{ shopId },
{ $or: [
{ emails: {
$regex: searchTerm,
$options: "i"
} },
{ "profile.firstName": {
$regex: "^" + searchTerm + "$",
$options: "i"
} },
{ "profile.lastName": {
$regex: "^" + searchTerm + "$",
$options: "i"
} },
{ "profile.phone": {
$regex: "^" + searchPhone + "$",
$options: "i"
} }
] }
>>>>>>>
{ shopId },
{
$or: [
{
emails: {
$regex: searchTerm,
$options: "i"
}
},
{
"profile.firstName": {
$regex: `^${searchTerm}$`,
$options: "i"
}
},
{
"profile.lastName": {
$regex: `^${searchTerm}$`,
$options: "i"
}
},
{
"profile.phone": {
$regex: `^${searchPhone}$`,
$options: "i"
}
}
]
} |
<<<<<<<
for (let i = 0; i < variants.length; i++) {
expect(cloneVariants.some((clonedVariant) => clonedVariant.title === variants[i].title)).to.be.ok;
=======
for (let i = 0; i < variants.length; i += 1) {
expect(cloneVariants.some(clonedVariant => {
return clonedVariant.title === variants[i].title;
})).to.be.ok;
>>>>>>>
for (let i = 0; i < variants.length; i += 1) {
expect(cloneVariants.some((clonedVariant) => clonedVariant.title === variants[i].title)).to.be.ok; |
<<<<<<<
"signature_list":"لیست امضاها",
=======
// 2019-12-25 xyy
"transaction_hash":"Hash",
"transaction_status_tip":'معاملات تأیید شده توسط بیش از 19 SRs "تأیید شده" علامت گذاری می شوند. ',
"transaction_type": "انواع معاملات",
"transaction_owner_address":"آدرس مالک",
"transaction_receiver_address":"آدرس دریافت کننده منابع.",
"transaction_freeze_num":"مقدار فریز",
"transaction_get_resourse":"منابع دریافت شده",
"transaction_recycling_address":"منابع بازیافت آدرس.",
"transaction_unfreeze_num":"مقدار آنفریز",
"transaction_fee":"هزینه",
"transaction_consumed_bandwidth_cap_per":"حداکثر پهنای باند مصرف شخصی .",
"transaction_consumed_bandwidth_cap_all":"حداکثر مصرف پهنای باند کلی.",
"transaction_frozen_day":"تعداد روزهای قفل کردن.",
"transaction_frozen_number":"مقدار قفل.",
"transaction_unfreeze_time":"زمان باز کردن توکن از حالت فریز",
"transaction_consumed_bandwidth_cap_per_tip":"هنگامی که یک انتقال TRC10 رخ می دهد ، یک کاربر واحد محدوده پهنای باند یک دارنده توکن را مصرف می کند.",
"transaction_consumed_bandwidth_cap_all_tip":"هنگامی که انتقال TRC10 رخ می دهد ، همه کاربران محدوده پهنای باند دارنده توکن را مصرف می کنند.",
"transaction_activate_account":"آدرس فعال شده",
"transaction_TRANSFERCONTRACT":"انتقال TRX",
"transaction_FREEZEBALANCECONTRACT":"فریز TRX.",
"transaction_UNFREEZEBALANCECONTRACT":"باز کردن از حالت فریز TRX.",
"transaction_TRANSFERASSETCONTRACT":"انتقال TRC10",
"transaction_ASSETISSUECONTRACT":"صدور توکن TRC10.",
"transaction_PARTICIPATEASSETISSUECONTRACT":"خرید توکن TRC10.",
"transaction_UNFREEZEASSETCONTRACT":"برداشت توکن TRC10 را باز کنید.",
"transaction_UPDATEASSETCONTRACT":"به روز رسانی توکن TRC10 را به روز کنید.",
"transaction_ACCOUNTCREATECONTRACT":"حساب را فعال کنید",
"transaction_WITHDRAWBALANCECONTRACT":"دریافت پاداش",
"transaction_TRIGGERSMARTCONTRACT":"قراردادهای هوشمند Trigger.",
"transaction_VOTEWITNESSCONTRACT":"رای",
"transaction_WITNESSCREATECONTRACT":"تبدیل به کاندیدای SR شوید.",
"transaction_WITNESSUPDATECONTRACT":"اطلاعات نامزد SR را به روز رسانی کنید.",
"transaction_ACCOUNTUPDATECONTRACT":"نام حساب را به روز کنید.",
"transaction_PROPOSALCREATECONTRACT":"پیشنهاد را شروع کنید.",
"transaction_PROPOSALAPPROVECONTRACT":"به این پیشنهاد رای دهید.",
"transaction_PROPOSALDELETECONTRACT":"پیشنهاد را پس بگیرید.",
"transaction_SETACCOUNTIDCONTRACT":"شناسه حساب را تنظیم کنید.",
"transaction_CREATESMARTCONTRACT":"قراردادهای هوشمند ایجاد کنید.",
"transaction_UPDATESETTINGCONTRACT":"پارامترهای قرارداد را به روز رسانی کنید.",
"transaction_EXCHANGECREATECONTRACT":"معاملات بانكور را ایجاد كنید.",
"transaction_EXCHANGEINJECTCONTRACT":"معاملات صندوق بانکور .",
"transaction_EXCHANGEWITHDRAWCONTRACT":"معاملات بانکور را واگذار کنید.",
"transaction_EXCHANGETRANSACTIONCONTRACT":"معاملات بانكور را انجام دهید.",
"transaction_ACCOUNTPERMISSIONUPDATECONTRACT":"مجوز حساب را به روز رسانی کنید.",
"transaction_UPDATEENERGYLIMITCONTRACT":"قرارداد را به روز رسانی کنید.",
"transaction_UPDATEBROKERAGECONTRACT":"نسبت کمیسیون SR را به روز رسانی کنید.",
"transaction_CLEARABICONTRACT":"قرارداد ABI را پاک کنید.",
"transaction_token_holder_address":"آدرس دارنده توکن",
"transaction_issue_address":"آدرس صادر کننده"
>>>>>>>
"signature_list":"لیست امضاها",
// 2019-12-25 xyy
"transaction_hash":"Hash",
"transaction_status_tip":'معاملات تأیید شده توسط بیش از 19 SRs "تأیید شده" علامت گذاری می شوند. ',
"transaction_type": "انواع معاملات",
"transaction_owner_address":"آدرس مالک",
"transaction_receiver_address":"آدرس دریافت کننده منابع.",
"transaction_freeze_num":"مقدار فریز",
"transaction_get_resourse":"منابع دریافت شده",
"transaction_recycling_address":"منابع بازیافت آدرس.",
"transaction_unfreeze_num":"مقدار آنفریز",
"transaction_fee":"هزینه",
"transaction_consumed_bandwidth_cap_per":"حداکثر پهنای باند مصرف شخصی .",
"transaction_consumed_bandwidth_cap_all":"حداکثر مصرف پهنای باند کلی.",
"transaction_frozen_day":"تعداد روزهای قفل کردن.",
"transaction_frozen_number":"مقدار قفل.",
"transaction_unfreeze_time":"زمان باز کردن توکن از حالت فریز",
"transaction_consumed_bandwidth_cap_per_tip":"هنگامی که یک انتقال TRC10 رخ می دهد ، یک کاربر واحد محدوده پهنای باند یک دارنده توکن را مصرف می کند.",
"transaction_consumed_bandwidth_cap_all_tip":"هنگامی که انتقال TRC10 رخ می دهد ، همه کاربران محدوده پهنای باند دارنده توکن را مصرف می کنند.",
"transaction_activate_account":"آدرس فعال شده",
"transaction_TRANSFERCONTRACT":"انتقال TRX",
"transaction_FREEZEBALANCECONTRACT":"فریز TRX.",
"transaction_UNFREEZEBALANCECONTRACT":"باز کردن از حالت فریز TRX.",
"transaction_TRANSFERASSETCONTRACT":"انتقال TRC10",
"transaction_ASSETISSUECONTRACT":"صدور توکن TRC10.",
"transaction_PARTICIPATEASSETISSUECONTRACT":"خرید توکن TRC10.",
"transaction_UNFREEZEASSETCONTRACT":"برداشت توکن TRC10 را باز کنید.",
"transaction_UPDATEASSETCONTRACT":"به روز رسانی توکن TRC10 را به روز کنید.",
"transaction_ACCOUNTCREATECONTRACT":"حساب را فعال کنید",
"transaction_WITHDRAWBALANCECONTRACT":"دریافت پاداش",
"transaction_TRIGGERSMARTCONTRACT":"قراردادهای هوشمند Trigger.",
"transaction_VOTEWITNESSCONTRACT":"رای",
"transaction_WITNESSCREATECONTRACT":"تبدیل به کاندیدای SR شوید.",
"transaction_WITNESSUPDATECONTRACT":"اطلاعات نامزد SR را به روز رسانی کنید.",
"transaction_ACCOUNTUPDATECONTRACT":"نام حساب را به روز کنید.",
"transaction_PROPOSALCREATECONTRACT":"پیشنهاد را شروع کنید.",
"transaction_PROPOSALAPPROVECONTRACT":"به این پیشنهاد رای دهید.",
"transaction_PROPOSALDELETECONTRACT":"پیشنهاد را پس بگیرید.",
"transaction_SETACCOUNTIDCONTRACT":"شناسه حساب را تنظیم کنید.",
"transaction_CREATESMARTCONTRACT":"قراردادهای هوشمند ایجاد کنید.",
"transaction_UPDATESETTINGCONTRACT":"پارامترهای قرارداد را به روز رسانی کنید.",
"transaction_EXCHANGECREATECONTRACT":"معاملات بانكور را ایجاد كنید.",
"transaction_EXCHANGEINJECTCONTRACT":"معاملات صندوق بانکور .",
"transaction_EXCHANGEWITHDRAWCONTRACT":"معاملات بانکور را واگذار کنید.",
"transaction_EXCHANGETRANSACTIONCONTRACT":"معاملات بانكور را انجام دهید.",
"transaction_ACCOUNTPERMISSIONUPDATECONTRACT":"مجوز حساب را به روز رسانی کنید.",
"transaction_UPDATEENERGYLIMITCONTRACT":"قرارداد را به روز رسانی کنید.",
"transaction_UPDATEBROKERAGECONTRACT":"نسبت کمیسیون SR را به روز رسانی کنید.",
"transaction_CLEARABICONTRACT":"قرارداد ABI را پاک کنید.",
"transaction_token_holder_address":"آدرس دارنده توکن",
"transaction_issue_address":"آدرس صادر کننده" |
<<<<<<<
import ReactionError from "@reactioncommerce/reaction-error";
=======
import Logger from "@reactioncommerce/logger";
import { Meteor } from "meteor/meteor";
>>>>>>>
import Logger from "@reactioncommerce/logger";
import ReactionError from "@reactioncommerce/reaction-error";
<<<<<<<
if (!accountId) throw new ReactionError("access-denied", "Access Denied");
if (!anonymousCartId) throw new ReactionError("invalid-param", "anonymousCartId is required");
if (!anonymousCartToken) throw new ReactionError("invalid-param", "anonymousCartToken is required");
if (!shopId) throw new ReactionError("invalid-param", "shopId is required");
=======
if (!accountId) throw new Meteor.Error("access-denied", "Access Denied");
if (!anonymousCartId) throw new Meteor.Error("invalid-param", "anonymousCartId is required");
if (!anonymousCartToken) throw new Meteor.Error("invalid-param", "anonymousCartToken is required");
>>>>>>>
if (!accountId) throw new ReactionError("access-denied", "Access Denied");
if (!anonymousCartId) throw new ReactionError("invalid-param", "anonymousCartId is required");
if (!anonymousCartToken) throw new ReactionError("invalid-param", "anonymousCartToken is required"); |
<<<<<<<
const existingUsers = Meteor.users.find({}, { limit: limit }).fetch();
for (let i = 0; i < limit; i += 1) {
=======
const existingUsers = Meteor.users.find({}, { limit }).fetch();
for (let i = 0; i < limit; i = i + 1) {
>>>>>>>
const existingUsers = Meteor.users.find({}, { limit }).fetch();
for (let i = 0; i < limit; i += 1) { |
<<<<<<<
Promise.await(loadCoreTranslations());
// Flush all the bulk Assets upserts created by calls to loadTranslations
Promise.await(flushTranslationLoad());
// Then loop through those I18N assets and import them
Assets.find({ type: "i18n" }).forEach((t) => {
Logger.debug(`Importing ${t.name} translation for ${t.ns}`);
if (t.content) {
Reaction.Importer.process(t.content, ["i18n"], Reaction.Importer.translation);
} else {
Logger.debug(`No translation content found for ${t.name} - ${t.ns} asset`);
}
});
Reaction.Importer.flush();
=======
// Get count of all i18n assets
const i18nAssetCount = Assets.find({ type: "i18n" }).count();
// If we have no assets, then this is either a fresh start or
// the i18n assets were cleared. In either case, allow i18n translations
// to be loaded into Assets collection and subsequently into the Translation collection
if (i18nAssetCount === 0) {
// Import core translations
Promise.await(loadCoreTranslations());
// Flush all the bulk Assets upserts created by calls to loadTranslations
Promise.await(flushTranslationLoad());
Logger.debug("All translation assets updated");
// Then loop through those I18N assets and import them
Assets.find({ type: "i18n" }).forEach((t) => {
Logger.debug(`Importing ${t.name} translation for "${t.ns}"`);
if (t.content) {
Reaction.Import.process(t.content, ["i18n"], Reaction.Import.translation);
} else {
Logger.debug(`No translation content found for ${t.name} - ${t.ns} asset`);
}
});
Reaction.Import.flush();
Logger.debug("All translation imported into translations collection from Assets.");
} else {
bulkAssetOp = null;
Logger.debug("Cancel translation update. Translations have a already been imported.");
}
>>>>>>>
// Get count of all i18n assets
const i18nAssetCount = Assets.find({ type: "i18n" }).count();
// If we have no assets, then this is either a fresh start or
// the i18n assets were cleared. In either case, allow i18n translations
// to be loaded into Assets collection and subsequently into the Translation collection
if (i18nAssetCount === 0) {
// Import core translations
Promise.await(loadCoreTranslations());
// Flush all the bulk Assets upserts created by calls to loadTranslations
Promise.await(flushTranslationLoad());
Logger.debug("All translation assets updated");
// Then loop through those I18N assets and import them
Assets.find({ type: "i18n" }).forEach((t) => {
Logger.debug(`Importing ${t.name} translation for "${t.ns}"`);
if (t.content) {
Reaction.Importer.process(t.content, ["i18n"], Reaction.Import.translation);
} else {
Logger.debug(`No translation content found for ${t.name} - ${t.ns} asset`);
}
});
Reaction.Importer.flush();
Logger.debug("All translation imported into translations collection from Assets.");
} else {
bulkAssetOp = null;
Logger.debug("Cancel translation update. Translations have a already been imported.");
} |
<<<<<<<
=======
if (!ReactionCore.hasAdminAccess()) {
throw new Meteor.Error(403, "Access denied");
}
this.unblock();
>>>>>>>
if (!ReactionCore.hasAdminAccess()) {
throw new Meteor.Error(403, "Access denied");
}
<<<<<<<
=======
if (!ReactionCore.hasAdminAccess()) {
throw new Meteor.Error(403, "Access denied");
}
this.unblock();
>>>>>>>
if (!ReactionCore.hasAdminAccess()) {
throw new Meteor.Error(403, "Access denied");
}
<<<<<<<
=======
if (!ReactionCore.hasAdminAccess()) {
throw new Meteor.Error(403, "Access denied");
}
this.unblock();
>>>>>>>
if (!ReactionCore.hasAdminAccess()) {
throw new Meteor.Error(403, "Access denied");
} |
<<<<<<<
import React from "react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faUniversity } from "@fortawesome/free-solid-svg-icons";
import { registerOperatorRoute } from "/imports/client/ui";
import "./settings/custom.html";
import "./settings/custom.js";
=======
import "../lib/extendCoreSchemas";
>>>>>>>
import React from "react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faUniversity } from "@fortawesome/free-solid-svg-icons";
import { registerOperatorRoute } from "/imports/client/ui";
import "../lib/extendCoreSchemas"; |
<<<<<<<
toDelete.forEach((product) => {
Hooks.Events.run("afterRemoveCatalogProduct", Meteor.userId(), product);
});
// after variant were removed from product, we need to recalculate all
// denormalized fields
const productId = toDelete[0].ancestors[0];
toDenormalize.forEach((field) => denormalize(productId, field));
=======
// after variant were removed from product, we need to recalculate all
// denormalized fields
const productId = toDelete[0].ancestors[0];
toDenormalize.forEach((field) => denormalize(productId, field));
}
Logger.debug(`shouldRemoveCatalogProduct hook returned falsy, not updating catalog product`);
>>>>>>>
toDelete.forEach((product) => {
Hooks.Events.run("afterRemoveCatalogProduct", Meteor.userId(), product);
});
// after variant were removed from product, we need to recalculate all
// denormalized fields
const productId = toDelete[0].ancestors[0];
toDenormalize.forEach((field) => denormalize(productId, field));
} |
<<<<<<<
import SimpleSchema from "simpl-schema";
import { check } from "meteor/check";
import { Tracker } from "meteor/tracker";
import { createdAtAutoValue, schemaIdAutoValue } from "./helpers";
=======
import { SimpleSchema } from "meteor/aldeed:simple-schema";
import { registerSchema } from "@reactioncommerce/reaction-collections";
import { schemaIdAutoValue } from "./helpers";
>>>>>>>
import SimpleSchema from "simpl-schema";
import { check } from "meteor/check";
import { Tracker } from "meteor/tracker";
import { registerSchema } from "@reactioncommerce/reaction-collections";
import { createdAtAutoValue, schemaIdAutoValue } from "./helpers";
<<<<<<<
autoValue: createdAtAutoValue
},
"updatedAt": {
=======
autoValue() {
if (this.isInsert) {
return new Date();
} else if (this.isUpsert) {
return {
$setOnInsert: new Date()
};
}
}
},
updatedAt: {
>>>>>>>
autoValue: createdAtAutoValue
},
"updatedAt": {
<<<<<<<
type: Currency,
optional: true,
defaultValue: {}
=======
type: CurrencyExchangeRate,
optional: true
>>>>>>>
type: CurrencyExchangeRate,
optional: true,
defaultValue: {} |
<<<<<<<
import { getBillingInfo } from "../../lib/helpers/orderHelpers";
=======
import { getOrderRiskBadge, getOrderRiskStatus } from "../helpers";
>>>>>>>
import { getOrderRiskBadge, getOrderRiskStatus, getBillingInfo } from "../helpers";
<<<<<<<
const invoice = getBillingInfo(this.props.row.original).invoice;
=======
const orderRisk = getOrderRiskStatus(this.props.row.original);
>>>>>>>
const invoice = getBillingInfo(this.props.row.original).invoice;
const orderRisk = getOrderRiskStatus(this.props.row.original); |
<<<<<<<
address:'TN4fJGCqurpmoWS4d6BXDiqZxGPvhacmVR'
},
{
address:'TAv8VH5cnC5Vi5U4v5RMa9CU6pdbu7oGfu'
},
{
address:'TYRcL4wx2K5NCaHQwNsgoXabkUiNkce3QH'
=======
address:'TN4fJGCqurpmoWS4d6BXDiqZxGPvhacmVR',
balance: 47301714286684
>>>>>>>
address:'TN4fJGCqurpmoWS4d6BXDiqZxGPvhacmVR',
balance: 47301714286684
},
{
address:'TAv8VH5cnC5Vi5U4v5RMa9CU6pdbu7oGfu'
},
{
address:'TYRcL4wx2K5NCaHQwNsgoXabkUiNkce3QH' |
<<<<<<<
if (typeof startIdentityEmailVerification !== "function") {
throw new ReactionError("not-supported", "Password reset not supported");
}
const { email, token } = await startIdentityEmailVerification(context, { userId });
=======
const user = await users.findOne({ _id: userId });
if (!user) throw new ReactionError("not-found", `User ${userId} not found`);
>>>>>>>
if (typeof startIdentityEmailVerification !== "function") {
throw new ReactionError("not-supported", "Password reset not supported");
}
const { email, token } = await startIdentityEmailVerification(context, { userId });
<<<<<<<
const { shopId } = account;
// Fall back to primary shop if account has no shop linked
let shop;
if (shopId) {
shop = await Shops.findOne({ _id: shopId });
} else {
shop = await Shops.findOne({ shopType: "primary" });
}
=======
const { address } = _.find(user.emails || [], (item) => !item.verified) || {};
if (!address) {
// No unverified email addresses found
return null;
}
const tokenObj = generateVerificationTokenObject({ address });
await users.updateOne({ _id: userId }, {
$push: {
"services.email.verificationTokens": tokenObj
}
});
// Account emails are always sent from the primary shop email and using primary shop
// email templates.
const shop = await Shops.findOne({ shopType: "primary" });
>>>>>>>
// Account emails are always sent from the primary shop email and using primary shop
// email templates.
const shop = await Shops.findOne({ shopType: "primary" }); |
<<<<<<<
let group;
group = checkGroup || Roles.GLOBAL_GROUP;
=======
let group;
// default group to the shop or global if shop isn't defined for some reason.
if (checkGroup !== undefined && typeof checkGroup === "string") {
group = checkGroup;
} else {
group = this.getSellerShopId() || Roles.GLOBAL_GROUP;
}
>>>>>>>
let group;
group = checkGroup || Roles.GLOBAL_GROUP;
<<<<<<<
=======
// global roles check
/*const sellerShopPermissions = Roles.getGroupsForUser(userId, "admin");
// we're looking for seller permissions.
if (sellerShopPermissions) {
// loop through shops roles and check permissions
for (const key in sellerShopPermissions) {
if (key) {
const shop = sellerShopPermissions[key];
if (Roles.userIsInRole(userId, permissions, shop)) {
return true;
}
}
}
}*/
>>>>>>>
<<<<<<<
const shopId = this.getShopId();
const query = {
name
};
if (shopId) {
query.shopId = shopId;
}
return Packages.findOne(query);
},
/**
* Add default roles for new visitors
* @param {String|Array} roles - A string or array of roles and routes
*/
addDefaultRolesToVisitors(roles) {
Logger.info(`Adding defaultRoles & defaultVisitorRole permissions for ${roles}`);
const shop = Shops.findOne(this.getShopId());
if (Match.test(roles, [String])) {
Shops.update(shop._id, {
$addToSet: { defaultVisitorRole: { $each: roles } }
});
Shops.update(shop._id, {
$addToSet: { defaultRoles: { $each: roles } }
});
} else if (Match.test(roles, String)) {
Shops.update(shop._id, {
$addToSet: { defaultVisitorRole: roles }
});
Shops.update(shop._id, {
$addToSet: { defaultRoles: roles }
});
} else {
throw new Meteor.Error(`Failed to add default roles ${roles}`);
}
},
/**
* Add default roles for new sellers
* @param {String|Array} roles A string or array of roles and routes
*/
addDefaultRolesToSellers(roles) {
Logger.info(`Adding defaultSellerRoles permissions for ${roles}`);
const shop = Shops.findOne(this.getShopId());
if (Match.test(roles, [String])) {
Shops.update(shop._id, {
$addToSet: { defaultSellerRole: { $each: roles } }
});
} else if (Match.test(roles, String)) {
Shops.update(shop._id, {
$addToSet: { defaultSellerRole: roles }
});
} else {
throw new Meteor.Error(`Failed to add default seller roles ${roles}`);
}
=======
const shopId = this.getShopId();
const query = {
name
};
if (shopId) {
query.shopId = shopId;
}
return Packages.findOne(query);
},
/**
* Add default roles for new visitors
* @param {String|Array} roles - A string or array of roles and routes
*/
addDefaultRolesToVisitors(roles) {
Logger.info(`Adding defaultRoles & defaultVisitorRole permissions for ${roles}`);
const shop = Shops.findOne(this.getShopId());
if (Match.test(roles, [String])) {
Shops.update(shop._id, {
$addToSet: { defaultVisitorRole: { $each: roles } }
});
Shops.update(shop._id, {
$addToSet: { defaultRoles: { $each: roles } }
});
} else if (Match.test(roles, String)) {
Shops.update(shop._id, {
$addToSet: { defaultVisitorRole: roles }
});
Shops.update(shop._id, {
$addToSet: { defaultRoles: roles }
});
} else {
throw new Meteor.Error(`Failed to add default roles ${roles}`);
}
},
/**
* Add default roles for new sellers
* @param {String|Array} roles A string or array of roles and routes
*/
addDefaultRolesToSellers(roles) {
Logger.info(`Adding defaultSellerRoles permissions for ${roles}`);
const shop = Shops.findOne(this.getShopId());
if (Match.test(roles, [String])) {
Shops.update(shop._id, {
$addToSet: { defaultSellerRole: { $each: roles } }
});
} else if (Match.test(roles, String)) {
Shops.update(shop._id, {
$addToSet: { defaultSellerRole: roles }
});
} else {
throw new Meteor.Error(`Failed to add default seller roles ${roles}`);
}
},
getAppVersion() {
return Shops.findOne().appVersion;
>>>>>>>
const shopId = this.getShopId();
const query = {
name
};
if (shopId) {
query.shopId = shopId;
}
return Packages.findOne(query);
},
/**
* Add default roles for new visitors
* @param {String|Array} roles - A string or array of roles and routes
*/
addDefaultRolesToVisitors(roles) {
Logger.info(`Adding defaultRoles & defaultVisitorRole permissions for ${roles}`);
const shop = Shops.findOne(this.getShopId());
if (Match.test(roles, [String])) {
Shops.update(shop._id, {
$addToSet: { defaultVisitorRole: { $each: roles } }
});
Shops.update(shop._id, {
$addToSet: { defaultRoles: { $each: roles } }
});
} else if (Match.test(roles, String)) {
Shops.update(shop._id, {
$addToSet: { defaultVisitorRole: roles }
});
Shops.update(shop._id, {
$addToSet: { defaultRoles: roles }
});
} else {
throw new Meteor.Error(`Failed to add default roles ${roles}`);
}
},
/**
* Add default roles for new sellers
* @param {String|Array} roles A string or array of roles and routes
*/
addDefaultRolesToSellers(roles) {
Logger.info(`Adding defaultSellerRoles permissions for ${roles}`);
const shop = Shops.findOne(this.getShopId());
if (Match.test(roles, [String])) {
Shops.update(shop._id, {
$addToSet: { defaultSellerRole: { $each: roles } }
});
} else if (Match.test(roles, String)) {
Shops.update(shop._id, {
$addToSet: { defaultSellerRole: roles }
});
} else {
throw new Meteor.Error(`Failed to add default seller roles ${roles}`);
}
},
getAppVersion() {
return Shops.findOne().appVersion; |
<<<<<<<
import getVariantInventoryNotAvailableToSellQuantity from "/imports/plugins/core/inventory/server/no-meteor/utils/getVariantInventoryNotAvailableToSellQuantity";
import updateParentVariantsInventoryAvailableToSellQuantity from "/imports/plugins/core/inventory/server/no-meteor/utils/updateParentVariantsInventoryAvailableToSellQuantity";
import updateParentVariantsInventoryInStockQuantity from "/imports/plugins/core/inventory/server/no-meteor/utils/updateParentVariantsInventoryInStockQuantity";
import hashProduct, { createProductHash } from "../no-meteor/mutations/hashProduct";
=======
import hashProduct from "../no-meteor/mutations/hashProduct";
>>>>>>>
import getVariantInventoryNotAvailableToSellQuantity from "/imports/plugins/core/inventory/server/no-meteor/utils/getVariantInventoryNotAvailableToSellQuantity";
import updateParentVariantsInventoryAvailableToSellQuantity from "/imports/plugins/core/inventory/server/no-meteor/utils/updateParentVariantsInventoryAvailableToSellQuantity";
import updateParentVariantsInventoryInStockQuantity from "/imports/plugins/core/inventory/server/no-meteor/utils/updateParentVariantsInventoryInStockQuantity";
import hashProduct from "../no-meteor/mutations/hashProduct"; |
<<<<<<<
import registerNavigationPlugin from "@reactioncommerce/plugin-navigation";
=======
import registerExamplePaymentsPlugin from "@reactioncommerce/plugin-payments-example";
>>>>>>>
import registerNavigationPlugin from "@reactioncommerce/plugin-navigation";
import registerExamplePaymentsPlugin from "@reactioncommerce/plugin-payments-example"; |
<<<<<<<
// code-analysis engine for javascript panel
tern: function (req) {
return alpha(req);
},
=======
togetherjs: function (req) {
return alpha(req);
},
>>>>>>>
// code-analysis engine for javascript panel
tern: function (req) {
return alpha(req);
},
togetherjs: function (req) {
return alpha(req);
}, |
<<<<<<<
return alpha(req) || undefsafe(req, 'session.user.pro');
=======
return undefsafe(req, 'session.user.pro');
>>>>>>>
return alpha(req) || undefsafe(req, 'session.user.pro');
<<<<<<<
return alpha(req); // return !pro(req);
}
=======
return team(req); // return !pro(req);
},
// top introduction view with help and features of JS Bin
welcomePanel: function (req) {
return alpha(req);
},
>>>>>>>
return alpha(req); // return !pro(req);
},
// top introduction view with help and features of JS Bin
welcomePanel: function (req) {
return alpha(req);
}, |
<<<<<<<
// FIXME !! This logic should be moved into bin model!!!!
getLatestBin: function (id, n, username, fn) {
var timer = metrics.createTimer(metric_prefix + 'getLatestBin');
=======
updateSettings: function (id, settings, fn) {
this.store.updateUserSettings(id, settings, fn);
},
getLatestBin: function (id, n, fn) {
var timer = metrics.createTimer(metricPrefix + 'getLatestBin');
>>>>>>>
updateSettings: function (id, settings, fn) {
this.store.updateUserSettings(id, settings, fn);
},
// FIXME !! This logic should be moved into bin model!!!!
getLatestBin: function (id, n, username, fn) {
var timer = metrics.createTimer(metricPrefix + 'getLatestBin'); |
<<<<<<<
getVisibility: function(bin, fn) {
this.store.getVisibility(bin, fn);
},
=======
>>>>>>>
<<<<<<<
setBinVisibility: function(bin, value, fn) {
this.store.setBinVisibility(bin, value, fn);
}
};
// hook up timers
Object.keys(model).forEach(function (key) {
var method = model[key];
// check the signature of the function
if (!method.toString().match(/function.*fn\)/)) {
return;
=======
setBinVisibility: function(bin, name, value, fn) {
this.store.setBinVisibility(bin, name, value, fn);
>>>>>>>
setBinVisibility: function(bin, name, value, fn) {
this.store.setBinVisibility(bin, name, value, fn);
}
};
// hook up timers
Object.keys(model).forEach(function (key) {
var method = model[key];
// check the signature of the function
if (!method.toString().match(/function.*fn\)/)) {
return; |
<<<<<<<
bin.latest = true;
=======
if (blacklist.validate(bin) === false) {
return fn(410);
}
>>>>>>>
bin.latest = true;
if (blacklist.validate(bin) === false) {
return fn(410);
} |
<<<<<<<
if (req.headers.accept && req.headers.accept.indexOf('text/event-stream') !== -1) {
// ignore event-stream requests
return next();
}
=======
// apply x-frame-options, but pass a dummy `next`
noframes(req, res, function () {});
>>>>>>>
if (req.headers.accept && req.headers.accept.indexOf('text/event-stream') !== -1) {
// ignore event-stream requests
return next();
}
// apply x-frame-options, but pass a dummy `next`
noframes(req, res, function () {}); |
<<<<<<<
jsbin.getURL = function (options) {
if (!options) { options = {}; }
var withoutRoot = options.withoutRoot;
var url = withoutRoot ? '' : jsbin.root;
var state = jsbin.state;
=======
jsbin.owner = function () {
return jsbin.user && jsbin.user.name && jsbin.state.metadata && jsbin.state.metadata.name === jsbin.user.name;
};
jsbin.getURL = function (withoutRoot, share) {
var url = withoutRoot ? '' : (share ? jsbin.shareRoot : jsbin.root),
state = jsbin.state;
>>>>>>>
jsbin.owner = function () {
return jsbin.user && jsbin.user.name && jsbin.state.metadata && jsbin.state.metadata.name === jsbin.user.name;
};
jsbin.getURL = function (options) {
if (!options) { options = {}; }
var withoutRoot = options.withoutRoot;
var url = withoutRoot ? '' : jsbin.root;
var state = jsbin.state; |
<<<<<<<
if (split) {
return;
}
=======
'use strict';
>>>>>>>
'use strict';
if (split) {
return;
}
<<<<<<<
$form.attr('action', data.url + '/save');
=======
var $binGroup,
edit;
>>>>>>>
<<<<<<<
jsbin.state.latest = true; // this is never not true...end of conversation!
=======
jsbin.state.metadata = { name: jsbin.user.name };
$form.attr('action', jsbin.getURL() + '/save');
>>>>>>>
jsbin.state.latest = true; // this is never not true...end of conversation!
jsbin.state.metadata = { name: jsbin.user.name };
$form.attr('action', jsbin.getURL() + '/save'); |
<<<<<<<
var nodemailer = require('nodemailer'),
express = require('express'),
flatten = require('flatten.js').flatten,
path = require('path'),
app = express(),
hogan = require('./hogan'),
options = require('./config'),
spike = require('./spike'),
store = require('./store')(options.store),
models = require('./models'),
routes = require('./routes'),
handlers = require('./handlers'),
middleware = require('./middleware'),
metrics = require('./metrics'),
url = require('url'),
github = require('./github')(options), // if used, contains github.id
stripeRoutes = require('./stripe')(options),
=======
var nodemailer = require('nodemailer'),
express = require('express'),
flatten = require('flatten.js').flatten,
path = require('path'),
app = express(),
hbs = require('./hbs'),
options = require('./config'),
store = require('./store')(options.store),
versionTest = require('./session-version'),
undefsafe = require('undefsafe'),
models = require('./models').createModels(store),
routes = require('./routes'),
handlers = require('./handlers'),
middleware = require('./middleware'),
metrics = require('./metrics'),
url = require('url'),
github = require('./github')(options), // if used, contains github.id
_ = require('underscore'),
crypto = require('crypto'),
>>>>>>>
var nodemailer = require('nodemailer'),
express = require('express'),
flatten = require('flatten.js').flatten,
path = require('path'),
app = express(),
hbs = require('./hbs'),
options = require('./config'),
store = require('./store')(options.store),
versionTest = require('./session-version'),
undefsafe = require('undefsafe'),
models = require('./models').createModels(store),
routes = require('./routes'),
handlers = require('./handlers'),
middleware = require('./middleware'),
metrics = require('./metrics'),
url = require('url'),
github = require('./github')(options), // if used, contains github.id
_ = require('underscore'),
crypto = require('crypto'),
stripeRoutes = require('./stripe')(options), |
<<<<<<<
getBinCount: function (id, fn) {
this.store.getUserBinCount(id, fn);
},
=======
updateGithubToken: function (id, token, fn) {
this.store.updateUserGithubToken(id, token, fn);
},
>>>>>>>
getBinCount: function (id, fn) {
this.store.getUserBinCount(id, fn);
},
updateGithubToken: function (id, token, fn) {
this.store.updateUserGithubToken(id, token, fn);
}, |
<<<<<<<
var done = function () {
res.render('index', {
tips: '{}',
revision: bin.revision || 1,
home: user.name || null,
bincount: user.bincount || 0,
email: user.email || null,
flash_info: req.flash(req.flash.INFO),
gravatar: user.avatar,
jsbin: JSON.stringify(jsbin),
json_template: JSON.stringify(template).replace(/<\/script>/gi, '<\\/script>').replace(/<!--/g, '<\\!--'),
version: jsbin.version,
analytics: analytics,
token: req.session._csrf,
custom_css: config && config.css,
scripts: helpers.production ? false : scripts,
is_production: helpers.production,
root: root,
static: helpers.urlForStatic(),
url: url,
live: req.live,
embed: req.embed,
code_id: bin.url,
code_id_path: url,
code_id_domain: helpers.urlForBin(bin, true).replace(/^https?:\/\//, '')
});
}
if (user) {
_this.models.user.getBinCount(user.name, function (err, result) {
user.bincount = result.total;
done();
});
} else {
done();
}
=======
// Sort out the tip
var info = req.flash(req.flash.INFO),
error = req.flash(req.flash.ERROR),
notification = req.flash(req.flash.NOTIFICATION);
var tip = error || notification || info,
tip_type;
if (info) tip_type = 'info';
if (notification) tip_type = 'notification';
if (error) tip_type = 'error';
res.render('index', {
tips: '{}',
revision: bin.revision || 1,
home: user.name || null,
email: user.email || null,
user: user || null,
flash_tip: tip,
flash_tip_type: tip_type,
gravatar: user.avatar,
jsbin: JSON.stringify(jsbin),
json_template: JSON.stringify(template).replace(/<\/script>/gi, '<\\/script>').replace(/<!--/g, '<\\!--'),
version: jsbin.version,
analytics: analytics,
token: req.session._csrf,
custom_css: config && config.css,
scripts: helpers.production ? false : scripts.app,
is_production: helpers.production,
root: root,
static: helpers.urlForStatic(),
url: url,
live: req.live,
embed: req.embed,
code_id: bin.url,
code_id_path: url,
code_id_domain: helpers.urlForBin(bin, true).replace(/^https?:\/\//, '')
});
>>>>>>>
var done = function () {
// Sort out the tip
var info = req.flash(req.flash.INFO),
error = req.flash(req.flash.ERROR),
notification = req.flash(req.flash.NOTIFICATION);
var tip = error || notification || info,
tip_type;
if (info) tip_type = 'info';
if (notification) tip_type = 'notification';
if (error) tip_type = 'error';
res.render('index', {
tips: '{}',
revision: bin.revision || 1,
home: user.name || null,
email: user.email || null,
user: user || null,
flash_tip: tip,
flash_tip_type: tip_type,
gravatar: user.avatar,
jsbin: JSON.stringify(jsbin),
json_template: JSON.stringify(template).replace(/<\/script>/gi, '<\\/script>').replace(/<!--/g, '<\\!--'),
version: jsbin.version,
analytics: analytics,
token: req.session._csrf,
custom_css: config && config.css,
scripts: helpers.production ? false : scripts.app,
is_production: helpers.production,
root: root,
static: helpers.urlForStatic(),
url: url,
live: req.live,
embed: req.embed,
code_id: bin.url,
code_id_path: url,
code_id_domain: helpers.urlForBin(bin, true).replace(/^https?:\/\//, '')
});
}
if (user) {
_this.models.user.getBinCount(user.name, function (err, result) {
user.bincount = result.total;
done();
});
} else {
done();
} |
<<<<<<<
Promise = require('rsvp').Promise,
processors = require('./processors'),
=======
undefsafe = require('undefsafe'),
Promise = require('rsvp').Promise, // jshint ignore:line
config = require('./config'),
>>>>>>>
Promise = require('rsvp').Promise, // jshint ignore:line
processors = require('./processors'),
undefsafe = require('undefsafe'),
config = require('./config'),
<<<<<<<
'static': sandbox.helpers.urlForStatic()
});
});
app.post('/processor', features.route('processors'), function (req, res) {
processors.run(req.body.language, req.body).then(function (data) {
res.send(data);
}).catch(function (error) {
res.send(500, error);
=======
static: statik
>>>>>>>
'static': statik
});
});
app.post('/processor', features.route('processors'), function (req, res) {
processors.run(req.body.language, req.body).then(function (data) {
res.send(data);
}).catch(function (error) {
res.send(500, error);
<<<<<<<
'static': statik,
=======
static: statik,
>>>>>>>
'static': statik,
<<<<<<<
'static': statik,
=======
static: statik,
>>>>>>>
'static': statik,
<<<<<<<
app.get('/:bin/:rev?/source', time('request.source'), binHandler.getBinSource);
app.get('/:bin/:rev?.:format(' + Object.keys(processors.mime).join('|') + ')', time('request.source'), binHandler.getBinSourceFile);
app.get('/:bin/:rev?/:format(js)', function (req, res) {
=======
app.get('/:bin/:rev?/source', secureOutput, time('request.source'), binHandler.getBinSource);
app.get('/:bin/:rev?.:format(js|json|css|html|md|markdown|stylus|less|coffee|jade|svg)', secureOutput, time('request.source'), binHandler.getBinSourceFile);
app.get('/:bin/:rev?/:format(js)', secureOutput, function (req, res) {
>>>>>>>
app.get('/:bin/:rev?/source', secureOutput, time('request.source'), binHandler.getBinSource);
app.get('/:bin/:rev?.:format(' + Object.keys(processors.mime).join('|') + ')', secureOutput, time('request.source'), binHandler.getBinSourceFile);
app.get('/:bin/:rev?/:format(js)', secureOutput, function (req, res) { |
<<<<<<<
{
'url': '//static.opentok.com/webrtc/v2.2/js/opentok.min.js',
'label': 'OpenTok 2.2'
},
=======
{
'url': [
'//code.ionicframework.com/1.0.0-beta.13/js/ionic.bundle.min.js',
'//code.ionicframework.com/1.0.0-beta.13/css/ionic.min.css'
],
'label': 'Ionic 1.0.0-beta-13'
},
>>>>>>>
{
'url': [
'//code.ionicframework.com/1.0.0-beta.13/js/ionic.bundle.min.js',
'//code.ionicframework.com/1.0.0-beta.13/css/ionic.min.css'
],
'label': 'Ionic 1.0.0-beta-13'
},
{
'url': '//static.opentok.com/webrtc/v2.2/js/opentok.min.js',
'label': 'OpenTok 2.2'
}, |
<<<<<<<
formatResults: function (e, data, isNewData) {
=======
formatResults: function (data, isNewData) {
data.displayName = data.Text || data.Name || data.Title || data.Code || data[Object.keys(data)[0]];
>>>>>>>
formatResults: function (e, data, isNewData) {
data.displayName = data.Text || data.Name || data.Title || data.Code || data[Object.keys(data)[0]]; |
<<<<<<<
/*!
* freezeframe.js v3.0.8
* MIT License
*/
=======
// make generic private trigger and release functions
//
// add class to image css to support image ready / active
// hide gif when canvas is active
//
// write function to test for features needed, write failure to console
// if unsupported, attach simple image replacement
// fallback image needed
//
// test compatibility with browserstack using feature test function
//
// make warn method public
//
// pass references around in a cleaner way
>>>>>>>
/*!
* freezeframe.js v3.0.8
* MIT License
*/
// make generic private trigger and release functions
//
// add class to image css to support image ready / active
// hide gif when canvas is active
//
// write function to test for features needed, write failure to console
// if unsupported, attach simple image replacement
// fallback image needed
//
// test compatibility with browserstack using feature test function
//
// make warn method public
//
// pass references around in a cleaner way
<<<<<<<
})
}
=======
// remove the loading icon style from the container
$_image.parent().removeClass('ff-loading-icon');
})
}
>>>>>>>
// remove the loading icon style from the container
$_image.parent().removeClass('ff-loading-icon');
});
}
<<<<<<<
warn("no selector passed to capture function or set in options");
=======
warn('no selector passed to capture function or set in options')
>>>>>>>
warn('no selector passed to capture function or set in options') |
<<<<<<<
import { distance } from 'utils'
=======
import flag from 'static/flag.svg'
import { distance, trackClick } from 'utils'
>>>>>>>
import { distance, trackClick } from 'utils'
<<<<<<<
const HideOnMobile = Box.extend`
=======
const Link = props => <StyledLink {...props} onClick={trackClick(props)} />
const HideOnMobile = styled.div`
>>>>>>>
const Link = props => <StyledLink {...props} onClick={trackClick(props)} />
const HideOnMobile = Box.extend` |
<<<<<<<
=======
const moment = require('moment');
moment.locale('en');
>>>>>>>
const moment = require('moment');
moment.locale('en');
<<<<<<<
sails.log.info('Source metrics import finished');
}
async function importUserContracts(email = 'all') {
const reqOptions = {
uri: sails.config.scientilla.userImport.endpoint,
qs: {
rep: 'PROD',
trans: '/public/scheda_persona_flat',
output: 'json',
email: email
},
headers: {
username: sails.config.scientilla.userImport.username,
password: sails.config.scientilla.userImport.password
},
json: true
};
const info = {
invalidEmails:0,
updatedRecords: 0,
newRecords: 0,
upToDateRecords: 0
};
try {
const res = await request(reqOptions);
const contracts = res._.scheda;
//sails.log(contracts);
for (const contract of contracts) {
if (contract.contratto_secondario === 'X') {
continue;
}
if (!/\S+@\S+\.\S+/.test(contract.email)) {
info.invalidEmails++;
continue;
}
let user = await User.findOne({username: contract.email});
// TMP
if (!user) {
sails.log.debug(contract.email + ' not found!');
continue;
}
let researchEntityData = await ResearchEntityData.findOne({
researchEntity: user.researchEntity
});
//sails.log.debug(researchEntityData);
if (researchEntityData) {
if (!_.isEqual(researchEntityData.imported_data, contract)) {
await ResearchEntityData.update(
{ id: researchEntityData.id },
{ imported_data: JSON.stringify(contract) }
);
info.updatedRecords++;
sails.log.debug(researchEntityData.imported_data, contract);
} else {
info.upToDateRecords++;
}
} else {
await ResearchEntityData.create({
researchEntity: user.researchEntity,
imported_data: JSON.stringify(contract)
});
info.newRecords++;
}
}
sails.log.debug(info.invalidEmails + ' invalid emails');
sails.log.debug(info.updatedRecords + ' updatedRecords');
sails.log.debug(info.newRecords + ' newRecords');
sails.log.debug(info.upToDateRecords + ' upToDateRecords');
} catch (e) {
sails.log.debug('importUserContracts');
sails.log.debug(e);
}
=======
>>>>>>>
}
async function importUserContracts(email = 'all') {
const reqOptions = {
uri: sails.config.scientilla.userImport.endpoint,
qs: {
rep: 'PROD',
trans: '/public/scheda_persona_flat',
output: 'json',
email: email
},
headers: {
username: sails.config.scientilla.userImport.username,
password: sails.config.scientilla.userImport.password
},
json: true
};
const info = {
invalidEmails:0,
updatedRecords: 0,
newRecords: 0,
upToDateRecords: 0
};
try {
const res = await request(reqOptions);
const contracts = res._.scheda;
//sails.log(contracts);
for (const contract of contracts) {
if (contract.contratto_secondario === 'X') {
continue;
}
if (!/\S+@\S+\.\S+/.test(contract.email)) {
info.invalidEmails++;
continue;
}
let user = await User.findOne({username: contract.email});
// TMP
if (!user) {
sails.log.debug(contract.email + ' not found!');
continue;
}
let researchEntityData = await ResearchEntityData.findOne({
researchEntity: user.researchEntity
});
//sails.log.debug(researchEntityData);
if (researchEntityData) {
if (!_.isEqual(researchEntityData.imported_data, contract)) {
await ResearchEntityData.update(
{ id: researchEntityData.id },
{ imported_data: JSON.stringify(contract) }
);
info.updatedRecords++;
sails.log.debug(researchEntityData.imported_data, contract);
} else {
info.upToDateRecords++;
}
} else {
await ResearchEntityData.create({
researchEntity: user.researchEntity,
imported_data: JSON.stringify(contract)
});
info.newRecords++;
}
}
sails.log.debug(info.invalidEmails + ' invalid emails');
sails.log.debug(info.updatedRecords + ' updatedRecords');
sails.log.debug(info.newRecords + ' newRecords');
sails.log.debug(info.upToDateRecords + ' upToDateRecords');
} catch (e) {
sails.log.debug('importUserContracts');
sails.log.debug(e);
} |
<<<<<<<
'expired': Importer.removeExpiredUsers,
'projects': Importer.importProjects,
=======
'expired': Importer.removeExpiredUsers,
'directorates': Importer.importDirectorates,
>>>>>>>
'expired': Importer.removeExpiredUsers,
'projects': Importer.importProjects,
'directorates': Importer.importDirectorates, |
<<<<<<<
angular.module("components").factory("researchEntityService",
[function () {
var service = {};
service.verify = function (researchEntity, reference) {
return researchEntity.one('drafts', reference.id).customPUT({}, 'verified');
};
=======
>>>>>>> |
<<<<<<<
},
'users': Importer.importUserContracts,
=======
'metadata': ExternalImporter.updateMetadata
}
>>>>>>>
'metadata': ExternalImporter.updateMetadata
},
'users': Importer.importUserContracts, |
<<<<<<<
'documentListSections'
=======
'documentSearchForm',
'documentListSections',
'documentCategories'
>>>>>>>
'documentListSections',
'documentCategories'
<<<<<<<
documentListSections) {
=======
documentSearchForm,
documentListSections,
documentCategories) {
>>>>>>>
documentListSections,
documentCategories) { |
<<<<<<<
['get ' + apiPrfx + '/users/username/:username/accomplishments']: 'User.getAccomplishments',
['get ' + apiPrfx + '/groups/slug/:slug/publications']: 'Group.getPublications',
['get ' + apiPrfx + '/groups/slug/:slug/high-impact-publications']: 'Group.getHighImpactPublications',
['get ' + apiPrfx + '/groups/slug/:slug/documents']: 'Group.getPublicDocuments',
['get ' + apiPrfx + '/groups/slug/:slug/dissemination-talks']: 'Group.getDisseminationTalks',
['get ' + apiPrfx + '/groups/slug/:slug/scientific-talks']: 'Group.getScientificTalks',
['get ' + apiPrfx + '/groups/slug/:slug/favorite-publications']: 'Group.getFavoritePublications',
['get ' + apiPrfx + '/groups/slug/:slug/accomplishments']: 'Group.getAccomplishments',
['get ' + apiPrfx + '/groups/code/:code/publications']: 'Group.getPublications',
['get ' + apiPrfx + '/groups/code/:code/high-impact-publications']: 'Group.getHighImpactPublications',
['get ' + apiPrfx + '/groups/code/:code/documents']: 'Group.getPublicDocuments',
['get ' + apiPrfx + '/groups/code/:code/dissemination-talks']: 'Group.getDisseminationTalks',
['get ' + apiPrfx + '/groups/code/:code/scientific-talks']: 'Group.getScientificTalks',
['get ' + apiPrfx + '/groups/code/:code/favorite-publications']: 'Group.getFavoritePublications',
['get ' + apiPrfx + '/groups/code/:code/accomplishments']: 'Group.getAccomplishments',
=======
['get ' + apiPrfx + '/users/username/:username/profile']: 'User.getPublicProfile',
['get ' + apiPrfx + '/users/username/:username/profile-image']: 'userData.getProfileImage',
>>>>>>>
['get ' + apiPrfx + '/users/username/:username/accomplishments']: 'User.getAccomplishments',
['get ' + apiPrfx + '/users/username/:username/profile']: 'User.getPublicProfile',
['get ' + apiPrfx + '/users/username/:username/profile-image']: 'userData.getProfileImage',
['get ' + apiPrfx + '/groups/slug/:slug/publications']: 'Group.getPublications',
['get ' + apiPrfx + '/groups/slug/:slug/high-impact-publications']: 'Group.getHighImpactPublications',
['get ' + apiPrfx + '/groups/slug/:slug/documents']: 'Group.getPublicDocuments',
['get ' + apiPrfx + '/groups/slug/:slug/dissemination-talks']: 'Group.getDisseminationTalks',
['get ' + apiPrfx + '/groups/slug/:slug/scientific-talks']: 'Group.getScientificTalks',
['get ' + apiPrfx + '/groups/slug/:slug/favorite-publications']: 'Group.getFavoritePublications',
['get ' + apiPrfx + '/groups/slug/:slug/accomplishments']: 'Group.getAccomplishments',
['get ' + apiPrfx + '/groups/code/:code/publications']: 'Group.getPublications',
['get ' + apiPrfx + '/groups/code/:code/high-impact-publications']: 'Group.getHighImpactPublications',
['get ' + apiPrfx + '/groups/code/:code/documents']: 'Group.getPublicDocuments',
['get ' + apiPrfx + '/groups/code/:code/dissemination-talks']: 'Group.getDisseminationTalks',
['get ' + apiPrfx + '/groups/code/:code/scientific-talks']: 'Group.getScientificTalks',
['get ' + apiPrfx + '/groups/code/:code/favorite-publications']: 'Group.getFavoritePublications',
['get ' + apiPrfx + '/groups/code/:code/accomplishments']: 'Group.getAccomplishments', |
<<<<<<<
if (!externalDoc) {
sails.log.debug('Document with id ' + doc.id + " has no corresponding external document");
continue;
}
=======
const docData = Document.selectData(doc);
>>>>>>>
if (!externalDoc) {
sails.log.debug('Document with id ' + doc.id + " has no corresponding external document");
continue;
}
const docData = Document.selectData(doc); |
<<<<<<<
service.deleteDraft = deleteDraft;
service.deleteDrafts = deleteDrafts;
=======
service.getExternalDrafts = getExternalDrafts;
>>>>>>>
service.getExternalDrafts = getExternalDrafts;
service.deleteDraft = deleteDraft;
service.deleteDrafts = deleteDrafts; |
<<<<<<<
profile.hidden = (contract.no_people === 'NO PEOPLE' ? true : false);
=======
if (!profile) {
return;
}
profile.hidden = (contract.no_people === 'NO PEOPLE' ? true: false);
>>>>>>>
if (!profile) {
return;
}
profile.hidden = (contract.no_people === 'NO PEOPLE' ? true : false);
<<<<<<<
const offices = lines.filter(line => line.code === code).map(line => line.office).filter(o => o);
=======
const offices = lines.filter(line => line.code === code).map(line => line.office);
>>>>>>>
const offices = lines.filter(line => line.code === code).map(line => line.office).filter(o => o); |
<<<<<<<
function attachProperties(tag, prop, z, accessor, attr, setter){
var key = z.split(':'), type = key[0];
if (type == 'get') {
key[0] = prop;
tag.prototype[prop].get = xtag.applyPseudos(key.join(':'), accessor[z], tag.pseudos);
}
else if (type == 'set') {
key[0] = prop;
tag.prototype[prop].set = xtag.applyPseudos(key.join(':'), attr ? function(value){
setter.call(this, value);
accessor[z].call(this, value);
} : accessor[z], tag.pseudos);
}
else tag.prototype[prop][z] = accessor[z];
}
=======
>>>>>>>
function attachProperties(tag, prop, z, accessor, attr, setter){
var key = z.split(':'), type = key[0];
if (type == 'get') {
key[0] = prop;
tag.prototype[prop].get = xtag.applyPseudos(key.join(':'), accessor[z], tag.pseudos);
}
else if (type == 'set') {
key[0] = prop;
tag.prototype[prop].set = xtag.applyPseudos(key.join(':'), attr ? function(value){
setter.call(this, value);
accessor[z].call(this, value);
} : accessor[z], tag.pseudos);
}
else tag.prototype[prop][z] = accessor[z];
}
<<<<<<<
for (var z in accessor) attachProperties(tag, prop, z, accessor, attr, setter);
=======
var attachAccessor = function(z){
var key = z.split(':'), type = key[0];
if (type == 'get') {
key[0] = prop;
tag.prototype[prop].get = xtag.applyPseudos(key.join(':'), accessor[z], tag.pseudos);
}
else if (type == 'set') {
key[0] = prop;
tag.prototype[prop].set = xtag.applyPseudos(key.join(':'), attr ? function(value){
setter.call(this, value);
accessor[z].call(this, value);
} : accessor[z], tag.pseudos);
}
else tag.prototype[prop][z] = accessor[z];
};
for (var z in accessor) {
attachAccessor(z);
}
>>>>>>>
for (var z in accessor) attachProperties(tag, prop, z, accessor, attr, setter); |
<<<<<<<
/*
##################################################################################
# #
# notice 2018-12-10 #
# #
##################################################################################
*/
"OthersArticle":"Articles in this group",
=======
"TRC20_exchange_online":"TRC20 exchange is online now",
"Trade_on_TRXMarket":"Trade on TRXMarket",
>>>>>>>
"TRC20_exchange_online":"TRC20 exchange is online now",
"Trade_on_TRXMarket":"Trade on TRXMarket",
/*
##################################################################################
# #
# notice 2018-12-10 #
# #
##################################################################################
*/
"OthersArticle":"Articles in this group", |
<<<<<<<
render () {
return (
<div className='container'>
<div className='spinner transition500' />
<div className='error transition500' />
<div className='row first'>
<div className='fixed-area'>
<div className='col-sm-2 contentcontainer'>
<div className='logo'>
<img src='/cat-eating-bird-circle.png' alt='cat eating bird' />
<Link to='/' id='handle'>{this.props.handle}</Link>
=======
render() {
const { appProperties, handle, modalIsOpen } = this.props
// if an agent handle already exists, there is no need to query for a handle
return modalIsOpen && !appProperties.Agent_Handle ? (
<div>
<Modal show={modalIsOpen}>
<SettingsContainer />
</Modal>
</div>
) : (
<div className="container">
<div className="spinner transition500" />
<div className="error transition500" />
<div className="row">
<div className="col-sm-2">
<div className="logo">
<img src="/cat-eating-bird-circle.png" alt="cat eating bird" />
>>>>>>>
render() {
const { appProperties, handle, modalIsOpen } = this.props
// if an agent handle already exists, there is no need to query for a handle
return modalIsOpen && !appProperties.Agent_Handle ? (
<div>
<Modal show={modalIsOpen}>
<SettingsContainer />
</Modal>
</div>
) : (
<div className='container'>
<div className='spinner transition500' />
<div className='error transition500' />
<div className='row first'>
<div className='fixed-area'>
<div className='col-sm-2 contentcontainer'>
<div className='logo'>
<img src='/cat-eating-bird-circle.png' alt='cat eating bird' />
<Link to='/' id='handle'>{this.props.handle}</Link> |
<<<<<<<
'bugReporterMetrics',
=======
'backendLogBootstrapper',
'mysteriumProcessLogCache',
>>>>>>>
'backendLogBootstrapper',
'mysteriumProcessLogCache',
'bugReporterMetrics',
<<<<<<<
bugReporterMetrics,
=======
backendLogBootstrapper,
mysteriumProcessLogCache,
>>>>>>>
backendLogBootstrapper,
mysteriumProcessLogCache,
bugReporterMetrics,
<<<<<<<
bugReporter: bugReporter,
bugReporterMetrics: bugReporterMetrics,
=======
backendLogBootstrapper,
mysteriumProcessLogCache,
bugReporter,
>>>>>>>
bugReporter: bugReporter,
bugReporterMetrics: bugReporterMetrics,
backendLogBootstrapper,
mysteriumProcessLogCache, |
<<<<<<<
import {app, session as browserSession} from 'electron'
import {
logLevel as processLogLevel
} from '../libraries/mysterium-client/index'
import {install as installFeedbackForm} from './bugReporting/feedback-form'
=======
import trayFactory from '../main/tray/factory'
import {logLevel as processLogLevel} from '../libraries/mysterium-client/index'
import bugReporter from './bugReporting/bug-reporting'
>>>>>>>
import trayFactory from '../main/tray/factory'
import {logLevel as processLogLevel} from '../libraries/mysterium-client/index' |
<<<<<<<
import bugReporterBootstrap from './modules/bugReporter'
import tequilapiBootstrap from '../../dependencies/tequilapi'
=======
>>>>>>>
<<<<<<<
bugReporterBootstrap(container)
tequilapiBootstrap(container)
proposalFetcherBootstrap(container)
=======
>>>>>>> |
<<<<<<<
const healthCheckPath = '/healthcheck'
=======
const healthcheckPath = '/healthcheck'
const stopPath = '/stop'
>>>>>>>
const healthCheckPath = '/healthcheck'
const stopPath = '/stop'
<<<<<<<
healthCheck: async (timeout) => axioAdapter.get(healthCheckPath, {timeout}),
=======
async healthcheck () {
axioAdapter.get(healthcheckPath)
},
stop: async () => axioAdapter.post(stopPath),
>>>>>>>
healthCheck: async (timeout) => axioAdapter.get(healthCheckPath, {timeout}),
stop: async () => axioAdapter.post(stopPath), |
<<<<<<<
return this._sudoExec(`${escapePath(this._path)} --do=install && ${escapePath(this._path)} --do=start`)
}
async reinstall (): Promise<string> {
let command =
`${escapePath(this._path)} --do=uninstall & ${escapePath(this._path)} --do=install && ${escapePath(this._path)} --do=start`
const state = this.getServiceState()
if (state === SERVICE_STATE.RUNNING) {
command = `${escapePath(this._path)} --do=stop & ` + command
}
return this._sudoExec(command)
=======
return this._execCommands('install', 'start')
>>>>>>>
return this._execCommands('install', 'start')
}
async reinstall (): Promise<string> {
let command =
`${escapePath(this._path)} --do=uninstall & ${escapePath(this._path)} --do=install && ${escapePath(this._path)} --do=start`
const state = this.getServiceState()
if (state === SERVICE_STATE.RUNNING) {
command = `${escapePath(this._path)} --do=stop & ` + command
}
return this._sudoExec(command)
<<<<<<<
async _execAndGetState (commandName: string, reinstallOnError: boolean = false): Promise<ServiceState> {
let state = SERVICE_STATE.START_PENDING
try {
const result = await this._sudoExec(`${escapePath(this._path)} --do=${commandName}`)
state = parseServiceState(result)
} catch (e) {
if (reinstallOnError && needReinstall(e)) {
await this.reinstall()
} else {
throw e
}
}
return state
=======
async _execCommands (...commandNames: string[]): Promise<string> {
return this._sudoExec(...commandNames.map(c => this._createCommand(c)))
}
async _execAndGetState (commandName: string): Promise<ServiceState> {
const result = await this._execCommands(commandName)
return parseServiceState(result)
>>>>>>>
async _execCommands (...commandNames: string[]): Promise<string> {
return this._sudoExec(...commandNames.map(c => this._createCommand(c)))
}
async _execAndGetState (commandName: string, reinstallOnError: boolean = false): Promise<ServiceState> {
let state = SERVICE_STATE.START_PENDING
try {
const result = await this._execCommands(commandName)
state = parseServiceState(result)
} catch (e) {
if (reinstallOnError && needReinstall(e)) {
await this.reinstall()
} else {
throw e
}
}
return state
<<<<<<<
logger.info('Execute sudo', command)
return await this._system.sudoExec(command)
=======
return await this._system.sudoExec(...commands)
>>>>>>>
logger.info('Execute sudo', command)
return await this._system.sudoExec(...commands) |
<<<<<<<
import connectionStatus from '../connectionStatus'
// TODO tequilAPI should be passed via DI
=======
import config from '../../config'
>>>>>>>
import connectionStatus from '../connectionStatus' |
<<<<<<<
import types from '@/store/types'
=======
import DIContainer from '../../../../src/app/di/vue-container'
>>>>>>>
import types from '@/store/types'
import DIContainer from '../../../../src/app/di/vue-container' |
<<<<<<<
import { createLocalVue, mount } from '@vue/test-utils'
=======
// @flow
import {createLocalVue, mount} from '@vue/test-utils'
>>>>>>>
// @flow
import { createLocalVue, mount } from '@vue/test-utils'
<<<<<<<
=======
import Vue from 'vue'
import type from '@/store/types'
import translations from '@/../app/messages'
import { beforeEach, describe, expect, it } from '../../../helpers/dependencies'
import BugReporterMock from '../../../helpers/bug-reporter-mock'
Vue.use(Vuex)
>>>>>>>
import { beforeEach, describe, expect, it } from '../../../helpers/dependencies'
import BugReporterMock from '../../../helpers/bug-reporter-mock'
<<<<<<<
const bugReporterMock = {
captureErrorException: () => {
}
}
function mountWith (rendererCommunication, store) {
=======
function mountWith (rendererCommunication, bugReporterMock, store) {
>>>>>>>
function mountWith (countryList, rendererCommunication, bugReporterMock) {
<<<<<<<
=======
describe('errors', () => {
let store
beforeEach(() => {
store = new Store({
mutations: {
[type.SHOW_ERROR] (state, error) {
state.errorMessage = error.message
}
}
})
const bugReporterMock = new BugReporterMock()
wrapper = mountWith(new RendererCommunication(fakeMessageBus), bugReporterMock, store)
fakeMessageBus.clean()
})
it(`commits ${translations.countryListIsEmpty} when empty proposal list is received`, async () => {
fakeMessageBus.triggerOn(messages.PROPOSALS_UPDATE, [])
wrapper.vm.fetchCountries()
await wrapper.vm.$nextTick()
expect(wrapper.vm.$store.state.errorMessage).to.eql(translations.countryListIsEmpty)
})
})
describe('.imagePath', () => {
let bugReporterMock
beforeEach(async () => {
bugReporterMock = new BugReporterMock()
wrapper = mountWith(new RendererCommunication(fakeMessageBus), bugReporterMock)
})
it('reports bug for unresolved country code', async () => {
expect(bugReporterMock.infoMessages).to.have.lengthOf(0)
wrapper.vm.imagePath('unknown')
expect(bugReporterMock.infoMessages).to.have.lengthOf(1)
expect(bugReporterMock.infoMessages[0].message).to.be.eql('Country not found, code: unknown')
})
it('does not send message to bug reporter on second try', async () => {
expect(bugReporterMock.infoMessages).to.have.lengthOf(0)
wrapper.vm.imagePath('unknown')
wrapper.vm.imagePath('unknown')
expect(bugReporterMock.infoMessages).to.have.lengthOf(1)
expect(bugReporterMock.infoMessages[0].message).to.be.eql('Country not found, code: unknown')
})
it('does not send message to bug reporter known country code', async () => {
expect(bugReporterMock.infoMessages).to.have.lengthOf(0)
wrapper.vm.imagePath('lt')
wrapper.vm.imagePath('gb')
expect(bugReporterMock.infoMessages).to.have.lengthOf(0)
})
})
>>>>>>>
describe('.imagePath', () => {
let bugReporterMock
beforeEach(async () => {
bugReporterMock = new BugReporterMock()
})
it('reports bug for unresolved country code', async () => {
wrapper = mountWith([countryList[4]], new RendererCommunication(fakeMessageBus), bugReporterMock)
expect(bugReporterMock.infoMessages).to.have.lengthOf(1)
expect(bugReporterMock.infoMessages[0].message).to.eql('Country not found, code: undefined')
})
it('does not send message to bug reporter on second try', async () => {
wrapper = mountWith([countryList[2], countryList[3]], new RendererCommunication(fakeMessageBus), bugReporterMock)
expect(bugReporterMock.infoMessages).to.have.lengthOf(1)
expect(bugReporterMock.infoMessages[0].message).to.eql('Country not found, code: unknown')
})
it('does not send message to bug reporter known country code', async () => {
wrapper = mountWith([countryList[0], countryList[1]], new RendererCommunication(fakeMessageBus), bugReporterMock)
expect(bugReporterMock.infoMessages).to.have.lengthOf(0)
})
})
<<<<<<<
// wrapper.find('.multiselect__option').trigger('click') // TODO: do this instead of vm.onChange() when the issue is resolved https://github.com/vuejs/vue-test-utils/issues/754
wrapper.vm.onChange(countryExpected)
=======
// initiate the click and check whether it opened the dropdown
fakeMessageBus.send(messages.PROPOSALS_UPDATE)
wrapper.find('.multiselect__option').trigger('click')
>>>>>>>
// wrapper.find('.multiselect__option').trigger('click') // TODO: do this instead of vm.onChange() when the issue is resolved https://github.com/vuejs/vue-test-utils/issues/754
wrapper.vm.onChange(countryExpected) |
<<<<<<<
import TequilapiClient from '../../../../src/libraries/mysterium-tequilapi/client'
import types from '@/store/types'
=======
import type { TequilapiClient } from '../../../../src/libraries/mysterium-tequilapi/client'
>>>>>>>
import types from '@/store/types'
import type { TequilapiClient } from '../../../../src/libraries/mysterium-tequilapi/client' |
<<<<<<<
import ConnectionStatusEnum from '../../../src/libraries/mysterium-tequilapi/dto/connection-status-enum'
=======
import IdentityRegistrationDTO from '../../../src/libraries/mysterium-tequilapi/dto/identity-registration'
>>>>>>>
import ConnectionStatusEnum from '../../../src/libraries/mysterium-tequilapi/dto/connection-status-enum'
import IdentityRegistrationDTO from '../../../src/libraries/mysterium-tequilapi/dto/identity-registration' |
<<<<<<<
var habitrpg = angular.module('habitrpg', ['ionic', 'userServices', 'groupServices', 'challengeServices', 'memberServices', 'sharedServices', 'notificationServices', 'storeServices', 'ngResource', 'ngCordova'])
=======
var habitrpg = angular.module('habitrpg', ['ionic', 'ngResource'])
>>>>>>>
var habitrpg = angular.module('habitrpg', ['ionic', 'ngResource', 'ngCordova']) |
<<<<<<<
=======
function setAuthHeaders(uid, apiToken){
$http.defaults.headers.common['x-api-user'] = uid;
$http.defaults.headers.common['x-api-key'] = apiToken;
authenticated = true;
}
//TODO change this once we have auth built
setAuthHeaders('ec1d6529-248c-4b42-85b6-b993daeef3f9', '4e5e73be-35f8-4cb6-b75d-aabc32ffd74a');
>>>>>>> |
<<<<<<<
// Backbone - account - mapping
"main_account_mapping_title":"الخريطة إلى DAppChain",
"main_account_mapping_text":"DAppChain هي عبارة عن شبكة سلسلة جانبية تم تطويرها استنادًا إلى سلسلة ترون الرئيسية ، وهي حل للتحجيم لشبكة TRON MainNet.",
"main_account_mapping_text_1":"1.مقدار أعلى من tps بالمقابل الحصول على استهلاك أقل للطاقة",
"main_account_mapping_text_2":"2.استكمال عملية رسم التعيين",
"main_account_mapping_btn":"جاري التعيين",
"main_account_mapping_success_btn":"تم استكمال التعيين",
"main_account_mapping_desc1": "عند تعيين الرمز المميز على السلسلة الجانبية ، سيتم إنشاء رمز مميز يحمل نفس الاسم في السلسلة الجانبية",
"main_account_mapping_desc2": "بعد اكتمال التعيين ، يمكن للمستخدمين إيداع الرمز المميز في السلسلة الجانبية.",
// sidechain - contract - mapping
"sidechain_contract_left":"التعيين من عقد MainNet",
"sidechain_contract_right":" ",
// Sidechain - account - pledge
"sidechain_account_pledge_btn":"الوديعة",
"sidechain_account_sign_btn":"السحب",
"pledge_currency":"الرمز",
"pledge_sidechain":"Sidechain",
"pledge_num":"الكمية",
'pledge_num_error':"لا يمكن أن يتجاوز العدد الحد الأقصى للرصيد المتاح",
"pledge_text":"سوف تستهلك الودائع كمية معينة من الطاقة",
"pledge_mapping_text":"لم يتم تعيين الأصول الخاصة بك إلى DAppChain ، وبالتالي لا يمكن إيداعها.",
// success
"pledge_success": "Deposit Success",
"sign_success": "Withdraw Success",
"mapping_success": "Mapping Success",
// error
"pledge_error": "Deposit Error",
"sign_error": "Withdraw Error",
"mapping_error": "Mapping Error",
=======
"price_per_1000_WIN": "PRICE PER 1000 WIN",
"WIN_distribution_overview": "WIN DISTRIBUTION OVERVIEW",
"total_WIN_supply": "Total WIN Supply",
"WIN_supply": "WIN Supply",
"WIN_Token_Release_Schedule": "WIN Token Release Schedule",
"source_WIN_team": "Source: WIN Management Team",
>>>>>>>
// Backbone - account - mapping
"main_account_mapping_title":"الخريطة إلى DAppChain",
"main_account_mapping_text":"DAppChain هي عبارة عن شبكة سلسلة جانبية تم تطويرها استنادًا إلى سلسلة ترون الرئيسية ، وهي حل للتحجيم لشبكة TRON MainNet.",
"main_account_mapping_text_1":"1.مقدار أعلى من tps بالمقابل الحصول على استهلاك أقل للطاقة",
"main_account_mapping_text_2":"2.استكمال عملية رسم التعيين",
"main_account_mapping_btn":"جاري التعيين",
"main_account_mapping_success_btn":"تم استكمال التعيين",
"main_account_mapping_desc1": "عند تعيين الرمز المميز على السلسلة الجانبية ، سيتم إنشاء رمز مميز يحمل نفس الاسم في السلسلة الجانبية",
"main_account_mapping_desc2": "بعد اكتمال التعيين ، يمكن للمستخدمين إيداع الرمز المميز في السلسلة الجانبية.",
// sidechain - contract - mapping
"sidechain_contract_left":"التعيين من عقد MainNet",
"sidechain_contract_right":" ",
// Sidechain - account - pledge
"sidechain_account_pledge_btn":"الوديعة",
"sidechain_account_sign_btn":"السحب",
"pledge_currency":"الرمز",
"pledge_sidechain":"Sidechain",
"pledge_num":"الكمية",
'pledge_num_error':"لا يمكن أن يتجاوز العدد الحد الأقصى للرصيد المتاح",
"pledge_text":"سوف تستهلك الودائع كمية معينة من الطاقة",
"pledge_mapping_text":"لم يتم تعيين الأصول الخاصة بك إلى DAppChain ، وبالتالي لا يمكن إيداعها.",
// success
"pledge_success": "Deposit Success",
"sign_success": "Withdraw Success",
"mapping_success": "Mapping Success",
// error
"pledge_error": "Deposit Error",
"sign_error": "Withdraw Error",
"mapping_error": "Mapping Error",
"price_per_1000_WIN": "PRICE PER 1000 WIN",
"WIN_distribution_overview": "WIN DISTRIBUTION OVERVIEW",
"total_WIN_supply": "Total WIN Supply",
"WIN_supply": "WIN Supply",
"WIN_Token_Release_Schedule": "WIN Token Release Schedule",
"source_WIN_team": "Source: WIN Management Team", |
<<<<<<<
var desktopTapHandler = function desktopTapHandler(socket, callback) {
socket.on('tap', function (data) {
if (callback) callback(data);
=======
var desktopTapHandler = function desktopTapHandler(callback) {
imperio.callbacks.tap = callback;
imperio.socket.on('tap', function () {
if (callback) callback();
>>>>>>>
var desktopTapHandler = function desktopTapHandler(callback) {
imperio.callbacks.tap = callback;
imperio.socket.on('tap', function (data) {
if (callback) callback(data);
<<<<<<<
// Accepts 3 arguments:
// 1. The socket you would like to connect to as the first parameter.
// 2. Accepts a room name that will inform the server which room to emit the tap event to.
// 3. A callback function that will be run every time the tap event is triggered.
var mobileTapShare = function mobileTapShare(socket, room, callback, data) {
socket.emit('tap', room, data);
if (callback) callback(data);
=======
// Accepts 1 argument:
// 1. A callback function that will be run every time the tap event is triggered.
var mobileTapShare = function mobileTapShare(callback) {
if (imperio.connectionType === 'webRTC') {
imperio.dataChannel.send('tap');
} else {
imperio.socket.emit('tap', imperio.room);
}
if (callback) callback();
>>>>>>>
// Accepts 1 argument:
// 1. A callback function that will be run every time the tap event is triggered.
var mobileTapShare = function mobileTapShare(callback, data) {
if (imperio.connectionType === 'webRTC') {
imperio.dataChannel.send('tap');
} else {
imperio.socket.emit('tap', imperio.room, data);
}
if (callback) callback(data); |
<<<<<<<
// modified gyro share to detect time of emission
=======
>>>>>>>
// modified gyro share to detect time of emission
<<<<<<<
// modified gyrohandler to detect time between emit and receive
=======
>>>>>>>
// modified gyrohandler to detect time between emit and receive |
<<<<<<<
const desktopTapHandler = (socket, callback) => {
socket.on('tap', data => {
if (callback) callback(data);
=======
const desktopTapHandler = callback => {
imperio.callbacks.tap = callback;
imperio.socket.on('tap', () => {
if (callback) callback();
>>>>>>>
const desktopTapHandler = callback => {
imperio.callbacks.tap = callback;
imperio.socket.on('tap', data => {
if (callback) callback(data); |
<<<<<<<
app.use(cookieParser());
=======
app.set('view engine', 'ejs');
>>>>>>>
app.use(cookieParser());
app.set('view engine', 'ejs'); |
<<<<<<<
=======
// Zoom in/out the game grid
var zoomIn = function () {
// Using the minimum of height and width accounts for mobile devices
var sideLen = Math.min(document.body.clientHeight, document.body.clientWidth);
var gridHeight = document.getElementById('game-grid').offsetWidth;
// zoom = how much do we multiply gridHeight by to get sidelen?
var zoom = sideLen / gridHeight;
document.getElementById('game-grid').style.zoom = zoom;
}
var zoomOut = function () {
document.getElementById('game-grid').style.zoom = 1;
}
document.getElementById('fullscreen-button').addEventListener('click', function() {
document.getElementById('main-toolbar').style.display = 'none';
document.getElementById('unfullscreen-button').style.visibility = 'visible';
zoomIn();
});
document.getElementById('unfullscreen-button').addEventListener('click', function() {
document.getElementById('main-toolbar').style.display = '';
document.getElementById('unfullscreen-button').style.visibility = 'hidden';
zoomOut();
});
>>>>>>>
// Zoom in/out the game grid
var zoomIn = function () {
// Using the minimum of height and width accounts for mobile devices
var sideLen = Math.min(document.body.clientHeight, document.body.clientWidth);
var gridHeight = document.getElementById('game-grid').offsetWidth;
// zoom = how much do we multiply gridHeight by to get sidelen?
var zoom = sideLen / gridHeight;
document.getElementById('game-grid').style.zoom = zoom;
}
var zoomOut = function () {
document.getElementById('game-grid').style.zoom = 1;
}
document.getElementById('fullscreen-button').addEventListener('click', function() {
document.getElementById('main-toolbar').style.display = 'none';
document.getElementById('unfullscreen-button').style.visibility = 'visible';
zoomIn();
});
document.getElementById('unfullscreen-button').addEventListener('click', function() {
document.getElementById('main-toolbar').style.display = '';
document.getElementById('unfullscreen-button').style.visibility = 'hidden';
zoomOut();
}); |
<<<<<<<
import updateQueryBuilderCache from './updateQueryBuilderCache';
=======
import {
reasignPersonaStatements
} from 'lib/services/persona';
>>>>>>>
import updateQueryBuilderCache from './updateQueryBuilderCache';
import {
reasignPersonaStatements
} from 'lib/services/persona'; |
<<<<<<<
import { routeNodeSelector } from 'redux-router5';
=======
import VisualisationTypeIcon from './VisualisationTypeIcon';
>>>>>>>
import VisualisationTypeIcon from './VisualisationTypeIcon';
<<<<<<<
render = () =>
(
<div>
<header id="topbar">
<div className="heading heading-light">
<span className="pull-right open_panel_btn">
<button
className="btn btn-primary btn-sm"
ref={(ref) => { this.addButton = ref; }}
onClick={this.onClickAdd}>
<i className="ion ion-plus" /> Add new
</button>
</span>
<span className="pull-right open_panel_btn" style={{ width: '25%' }}>
<SearchBox schema={schema} />
</span>
Visualise
</div>
</header>
<div className="row">
<div className="col-md-12">
<VisualisationList
id={this.props.visualisationId}
filter={queryStringToQuery(this.props.searchString, schema)}
ModelForm={VisualiseForm}
buttons={[PrivacyToggleButton, DeleteButton]}
getDescription={model => model.get('description') || '~ Unnamed Visualisation'} />
</div>
=======
render = () => (
<div>
<header id="topbar">
<div className="heading heading-light">
<span className="pull-right open_panel_btn">
<button
className="btn btn-primary btn-sm"
ref={(ref) => { this.addButton = ref; }}
onClick={this.onClickAdd}>
<i className="ion ion-plus" /> Add new
</button>
</span>
<span className="pull-right open_panel_btn" style={{ width: '25%' }}>
<SearchBox schema={schema} />
</span>
Visualise
</div>
</header>
<div className="row">
<div className="col-md-12">
<VisualisationList
filter={queryStringToQuery(this.props.searchString, schema)}
ModelForm={VisualiseForm}
buttons={[PrivacyToggleButton, DeleteButton]}
getDescription={model => (
<span>
<span style={{ paddingRight: 5 }}>
<VisualisationTypeIcon id={model.get('_id')} />
</span>
{ model.get('description') || '~ Unnamed Visualisation'}
</span>
)} />
>>>>>>>
render = () => (
<div>
<header id="topbar">
<div className="heading heading-light">
<span className="pull-right open_panel_btn">
<button
className="btn btn-primary btn-sm"
ref={(ref) => { this.addButton = ref; }}
onClick={this.onClickAdd}>
<i className="ion ion-plus" /> Add new
</button>
</span>
<span className="pull-right open_panel_btn" style={{ width: '25%' }}>
<SearchBox schema={schema} />
</span>
Visualise
</div>
</header>
<div className="row">
<div className="col-md-12">
<VisualisationList
id={this.props.visualisationId}
filter={queryStringToQuery(this.props.searchString, schema)}
ModelForm={VisualiseForm}
buttons={[PrivacyToggleButton, DeleteButton]}
getDescription={model => (
<span>
<span style={{ paddingRight: 5 }}>
<VisualisationTypeIcon id={model.get('_id')} />
</span>
{ model.get('description') || '~ Unnamed Visualisation'}
</span>
)} /> |
<<<<<<<
import { sagas as personasSagas } from './persona';
=======
import { sagas as alertsSagas } from './alerts';
>>>>>>>
import { sagas as personasSagas } from './persona';
import { sagas as alertsSagas } from './alerts';
<<<<<<<
...map(personasSagas, runSaga)
=======
...map(alertsSagas, runSaga),
>>>>>>>
...map(alertsSagas, runSaga),
...map(personasSagas, runSaga), |
<<<<<<<
uploadPersonas: recycleState(uploadPersona, [LOGOUT, ORG_LOGOUT]),
=======
alerts: recycleState(alerts, [LOGOUT, ORG_LOGOUT]),
>>>>>>>
uploadPersonas: recycleState(uploadPersona, [LOGOUT, ORG_LOGOUT]),
alerts: recycleState(alerts, [LOGOUT, ORG_LOGOUT]), |
<<<<<<<
return res.status(200).send(replaceId(identifier));
=======
// assign persona and personaIdentifier to statements
asignIdentifierToStatements({ organisation, identifier });
return res.status(200).send(identifier);
>>>>>>>
// assign persona and personaIdentifier to statements
asignIdentifierToStatements({ organisation, identifier });
return res.status(200).send(replaceId(identifier));
<<<<<<<
return res.status(200).send(replaceId(identifier));
=======
// assign persona and personaIdentifier to statements
asignIdentifierToStatements({ organisation, identifier });
return res.status(200).send(identifier);
>>>>>>>
// assign persona and personaIdentifier to statements
asignIdentifierToStatements({ organisation, identifier });
return res.status(200).send(replaceId(identifier));
<<<<<<<
return res.status(200).send(replaceId(identifier));
=======
// assign persona and personaIdentifier to statements
asignIdentifierToStatements({ organisation, identifier });
return res.status(200).send(identifier);
>>>>>>>
// assign persona and personaIdentifier to statements
asignIdentifierToStatements({ organisation, identifier });
return res.status(200).send(replaceId(identifier)); |
<<<<<<<
MANAGE_ALL_ORGANISATIONS,
];
export default scopes;
=======
// MANAGE_ALL_ORGANISATIONS,
];
>>>>>>>
// MANAGE_ALL_ORGANISATIONS,
];
export default scopes; |
<<<<<<<
=======
$scope.setInflationLumenaut = function() {
$scope.inflation = 'GCCD6AJOYZCUAQLX32ZJF2MKFFAUJ53PVCFQI3RHWKL3V47QYE2BNAUT';
$scope.setInflation();
}
>>>>>>>
$scope.setInflationLumenaut = function() {
$scope.inflation = 'GCCD6AJOYZCUAQLX32ZJF2MKFFAUJ53PVCFQI3RHWKL3V47QYE2BNAUT';
$scope.setInflation();
} |
<<<<<<<
"current_MaxTPS":"Current/Max TPS",
=======
/*
##################################################################################
# #
# exchange #
# #
##################################################################################
*/
"apply_for_the_currency":"Apply for the currency",
"apply_for_process":"Apply for the currency process",
"apply_content":"If you want to add coins, please fill out the application form to provide information about the currency. After submitting the information, we will review the data as soon as possible. Please wait patiently before replying to the audit results.",
"operate_txn_pair_message": "Please enter an integer",
"withdraw_all":"Not fully divested",
"creat_valid":"Cannot exceed account balance",
"my_trading_pairs":"My Trading Pairs",
"create_trading_pairs":"Create Trading Pairs",
"pairs": "Pairs",
"no_pairs":"No Pairs",
"capital_injection":"Capital Injection",
"capital_withdrawal":"Capital Withdrawal",
"pair_has_been_created":"Pair has been created",
"successfully_created_pair":"Successfully created a deal pair",
"pair_creation_failed":"pair creation failed",
"successful_injection":"Successful Injection",
"sorry_injection_failed":"Sorry, injection failed",
"successful_withdrawal":"Successful Withdrawal",
"sorry_withdrawal_failed":"Sorry, withdrawal failed",
"select_the_name_of_the_Token":"Please select the name of the Token",
"enter_the_amount":"Enter the Amount",
"choose_a_Token_for_capital_injection":"Choose a Token for Capital Injection:",
"choose_a_Token_for_capital_withdrawal":"Choose a Token for Capital Withdrawal:",
"injection_amount":"Injection Amount:",
"withdrawal_amount":"Withdrawal Amount:",
"last_price": "Last price",
"pairs_change": "Change",
"H": "H",
"L": "L",
"O": "O",
"C": "C",
"24H_VOL": "24H VOL",
"token_application_instructions_title":"Token Application Instructions",
"token_application_instructions_1":"If you would like to list your token, please fill in the application with information of the token.",
"token_application_instructions_2":"After receiving your application, we will conclude the review of your application in 3 - 5 business days. ",
"click_here_to_apply":"Click here to apply",
"TxTime":"Transaction Time",
"TxAmount":"Transaction Amount",
"TxRecord":"Transaction Record",
"TxAvailable":"Available",
"TxBuy":"Expected to buy",
"TxSell":"Amount want to sell",
"my_transaction":"My Transaction",
"enter_the_trading_amount":"Enter the Trading Amount",
"BUY": "BUY",
"SELL": "SELL",
"estimated_cost":"Estimated Cost",
"estimated_revenue":"Estimated Revenue",
"slightly_cost":"Slightly increase the estimated cost, and the turnover rate will be higher.",
"slightly_revenue":"Slightly lower the estimated revenue, and the turnover rate will be higher.",
>>>>>>>
"current_MaxTPS":"Current/Max TPS",
/*
##################################################################################
# #
# exchange #
# #
##################################################################################
*/
"apply_for_the_currency":"Apply for the currency",
"apply_for_process":"Apply for the currency process",
"apply_content":"If you want to add coins, please fill out the application form to provide information about the currency. After submitting the information, we will review the data as soon as possible. Please wait patiently before replying to the audit results.",
"operate_txn_pair_message": "Please enter an integer",
"withdraw_all":"Not fully divested",
"creat_valid":"Cannot exceed account balance",
"my_trading_pairs":"My Trading Pairs",
"create_trading_pairs":"Create Trading Pairs",
"pairs": "Pairs",
"no_pairs":"No Pairs",
"capital_injection":"Capital Injection",
"capital_withdrawal":"Capital Withdrawal",
"pair_has_been_created":"Pair has been created",
"successfully_created_pair":"Successfully created a deal pair",
"pair_creation_failed":"pair creation failed",
"successful_injection":"Successful Injection",
"sorry_injection_failed":"Sorry, injection failed",
"successful_withdrawal":"Successful Withdrawal",
"sorry_withdrawal_failed":"Sorry, withdrawal failed",
"select_the_name_of_the_Token":"Please select the name of the Token",
"enter_the_amount":"Enter the Amount",
"choose_a_Token_for_capital_injection":"Choose a Token for Capital Injection:",
"choose_a_Token_for_capital_withdrawal":"Choose a Token for Capital Withdrawal:",
"injection_amount":"Injection Amount:",
"withdrawal_amount":"Withdrawal Amount:",
"last_price": "Last price",
"pairs_change": "Change",
"H": "H",
"L": "L",
"O": "O",
"C": "C",
"24H_VOL": "24H VOL",
"token_application_instructions_title":"Token Application Instructions",
"token_application_instructions_1":"If you would like to list your token, please fill in the application with information of the token.",
"token_application_instructions_2":"After receiving your application, we will conclude the review of your application in 3 - 5 business days. ",
"click_here_to_apply":"Click here to apply",
"TxTime":"Transaction Time",
"TxAmount":"Transaction Amount",
"TxRecord":"Transaction Record",
"TxAvailable":"Available",
"TxBuy":"Expected to buy",
"TxSell":"Amount want to sell",
"my_transaction":"My Transaction",
"enter_the_trading_amount":"Enter the Trading Amount",
"BUY": "BUY",
"SELL": "SELL",
"estimated_cost":"Estimated Cost",
"estimated_revenue":"Estimated Revenue",
"slightly_cost":"Slightly increase the estimated cost, and the turnover rate will be higher.",
"slightly_revenue":"Slightly lower the estimated revenue, and the turnover rate will be higher.", |
<<<<<<<
const { translate, translateUrl } = require('./providers/google-translate')
=======
const { debounce } = require('sdk/lang/functional')
const { translate, translateUrl, translatePageUrl } = require('./providers/google-translate')
const { getMostRecentBrowserWindow } = require('sdk/window/utils')
>>>>>>>
const { translate, translateUrl, translatePageUrl } = require('./providers/google-translate')
const { getMostRecentBrowserWindow } = require('sdk/window/utils')
<<<<<<<
translateMenu.setAttribute('label', format(LABEL_TRANSLATE,
selection.length > 15 ? selection.substr(0, 15) + '…' : selection
))
=======
if (selection) {
translateMenu.setAttribute('label', format(LABEL_TRANSLATE,
selection.length > 15? selection.substr(0, 15) + '…' : selection
))
updateResult(null)
}
>>>>>>>
if (selection) {
translateMenu.setAttribute('label', format(LABEL_TRANSLATE,
selection.length > 15 ? selection.substr(0, 15) + '…' : selection
))
updateResult(null)
} |
<<<<<<<
updateResult(res.translation)
if (sp.prefs.langFrom === 'auto') {
=======
// TODO create preferences
if(res.alternatives) {
updateResult(res.translation, res.alternatives)
} else if(res.dictionary) {
updateResult(res.translation, res.dictionary)
} else {
updateResult(res.translation, res.synonyms)
}
if (sp.prefs.lang_from === 'auto') {
>>>>>>>
// TODO create preferences
if(res.alternatives) {
updateResult(res.translation, res.alternatives)
} else if(res.dictionary) {
updateResult(res.translation, res.dictionary)
} else {
updateResult(res.translation, res.synonyms)
}
if (sp.prefs.langFrom === 'auto') { |
<<<<<<<
=======
isString = extd.isString,
isHash = extd.isHash,
format = extd.format,
>>>>>>> |
<<<<<<<
Object.defineProperty(TelegramContext.prototype, `${method}To`, {
enumerable: false,
configurable: true,
writable: true,
value(id, ...rest) {
return this._client[method](id, ...rest);
},
});
=======
>>>>>>> |
<<<<<<<
/**
* Signature Validation
*
* https://devdocs.line.me/en/#webhooks
*/
isValidSignature = (rawBody, signature: string): boolean =>
=======
isValidSignature = (rawBody: string, signature: string): boolean =>
>>>>>>>
/**
* Signature Validation
*
* https://devdocs.line.me/en/#webhooks
*/
isValidSignature = (rawBody: string, signature: string): boolean => |
<<<<<<<
=======
import DelayableJobQueue from './DelayableJobQueue';
import type { PlatformContext } from './PlatformContext';
>>>>>>>
import type { PlatformContext } from './PlatformContext';
<<<<<<<
_messageDelay: number = 1000;
=======
_jobQueue: DelayableJobQueue;
>>>>>>>
_messageDelay: number = 1000;
<<<<<<<
this._client = client;
this._event = event;
this._session = session;
=======
super({ client, event, session });
this._jobQueue = new DelayableJobQueue();
this._jobQueue.beforeEach(({ delay }) => sleep(delay));
this.setMessageDelay(1000);
>>>>>>>
super({ client, event, session });
this.setMessageDelay(1000); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.