conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
var crypto= require("crypto");
=======
var dns = require('dns');
>>>>>>>
var crypto= require("crypto");
var dns = require('dns');
<<<<<<<
if (this.forceClose) this.forceClose(e);
=======
self.destroy(e);
>>>>>>>
if (this.forceClose) this.forceClose(e);
self.destroy(e);
<<<<<<<
if (self.secure && bytesRead == 0 && secureBytesRead > 0){
// Deal with SSL handshake
if (self.server) {
self._checkForSecureHandshake();
} else {
if (self.secureEstablised) {
self.flush();
} else {
self._checkForSecureHandshake();
}
}
} else if (bytesRead === 0) {
=======
if (bytesRead === 0) {
// EOF
>>>>>>>
if (self.secure && bytesRead == 0 && secureBytesRead > 0){
// Deal with SSL handshake
if (self.server) {
self._checkForSecureHandshake();
} else {
if (self.secureEstablised) {
self.flush();
} else {
self._checkForSecureHandshake();
}
}
} else if (bytesRead === 0) {
<<<<<<<
if (!this.writable) {
if (this.secure) return false;
else throw new Error('Stream is not writable');
}
=======
if (!this.writable) throw new Error('Stream is not writable');
if (data.length == 0) return true;
>>>>>>>
if (!this.writable) {
if (this.secure) return false;
else throw new Error('Stream is not writable');
}
if (data.length == 0) return true; |
<<<<<<<
const [format, setFormat] = useState('json');
=======
const [showCombinatorsBetweenRules, setShowCombinatorsBetweenRules] = useState(false);
>>>>>>>
const [format, setFormat] = useState('json');
const [showCombinatorsBetweenRules, setShowCombinatorsBetweenRules] = useState(false); |
<<<<<<<
import hyperid from 'hyperid'
import { enableCORS, serveIndex } from './util'
=======
import { enableCORS, serveIndex, getRealIp } from './util'
>>>>>>>
import hyperid from 'hyperid'
import { enableCORS, serveIndex, getRealIp } from './util'
<<<<<<<
level: process.env.NODE_ENV === 'production' ? 'info' : 'debug'
},
genReqId: hyperid()
=======
level: process.env.NODE_ENV === 'production' ? 'info' : 'debug',
serializers: {
// From https://github.com/fastify/fastify/blob/2.x/lib/logger.js#L54
req: (req) => ({
method: req.method,
url: req.url,
version: req.headers['accept-version'],
hostname: req.hostname,
remoteAddress: getRealIp(req),
remotePort: req.connection.remotePort
})
}
}
>>>>>>>
level: process.env.NODE_ENV === 'production' ? 'info' : 'debug',
serializers: {
// From https://github.com/fastify/fastify/blob/2.x/lib/logger.js#L54
req: (req) => ({
method: req.method,
url: req.url,
version: req.headers['accept-version'],
hostname: req.hostname,
remoteAddress: getRealIp(req),
remotePort: req.connection.remotePort
})
},
genReqId: hyperid()
} |
<<<<<<<
<div class='row u-center'>
<Form class={`${classes.root} col-6`} onSubmit={this.handleSubmit} disabled={disabledButton} errors={errors} buttonText='Register'>
<input
autofocus
required
autocomplete='username'
autocorrect='off'
icon={<UserCircle />}
name='name'
maxLength='64'
minLength='2'
placeholder='Team Name'
type='text'
value={name}
onChange={this.linkState('name')}
/>
<input
required
autocomplete='email'
autocorrect='off'
icon={<EnvelopeOpen />}
name='email'
placeholder='Email'
type='text'
value={email}
onChange={this.linkState('email')}
/>
</Form>
<AuthOr />
<CtftimeButton class='col-6' onCtftimeDone={this.handleCtftimeDone} />
=======
<div>
<div class='row u-center'>
<p style='margin: 0'>Please register one account per team</p>
</div>
<div class='row u-center'>
<Form class={`${classes.root} col-6`} onSubmit={this.handleSubmit} disabled={disabledButton} errors={errors} buttonText='Register'>
<input autofocus required icon={<UserCircle />} name='name' maxLength='64' minLength='2' placeholder='Team Name' type='text' value={name} onChange={this.linkState('name')} />
<input required icon={<EnvelopeOpen />} name='email' placeholder='Email' type='text' value={email} onChange={this.linkState('email')} />
</Form>
<AuthOr />
<CtftimeButton class='col-6' onCtftimeDone={this.handleCtftimeDone} />
</div>
>>>>>>>
<div>
<div class='row u-center'>
<p style='margin: 0'>Please register one account per team</p>
</div>
<div class='row u-center'>
<Form class={`${classes.root} col-6`} onSubmit={this.handleSubmit} disabled={disabledButton} errors={errors} buttonText='Register'>
<input
autofocus
required
autocomplete='username'
autocorrect='off'
icon={<UserCircle />}
name='name'
maxLength='64'
minLength='2'
placeholder='Team Name'
type='text'
value={name}
onChange={this.linkState('name')}
/>
<input
required
autocomplete='email'
autocorrect='off'
icon={<EnvelopeOpen />}
name='email'
placeholder='Email'
type='text'
value={email}
onChange={this.linkState('email')}
/>
</Form>
<AuthOr />
<CtftimeButton class='col-6' onCtftimeDone={this.handleCtftimeDone} />
</div> |
<<<<<<<
import { getOwner } from '@ember/application';
import { assign } from '@ember/polyfills';
=======
>>>>>>>
import { assign } from '@ember/polyfills';
<<<<<<<
const POPPER_DEFAULT_MODIFIERS = {
flip: {
enabled: true,
},
preventOverflow: {
escapeWithReference: true
}
};
=======
const { environment } = config;
>>>>>>>
const POPPER_DEFAULT_MODIFIERS = {
flip: {
enabled: true,
},
preventOverflow: {
escapeWithReference: true
}
}; |
<<<<<<<
// borders look really bad, if someone wants it they can put it on their div target
img.style.borderStyle = "none";
=======
// borders look really bad, if someone wants it they can put it on their div target
img.style.borderStyle = "none";
>>>>>>>
// borders look really bad, if someone wants it they can put it on their div target
img.style.borderStyle = "none";
<<<<<<<
var fontHeight = ( img.height / 12 ) + "px",
divText = document.createElement( "div" );
=======
// add the widget's div to the target div
document.getElementById( options.target ) && document.getElementById( options.target ).appendChild( options.link );
var fontHeight = ( img.height / 12 ) + "px";
var divText = document.createElement( 'div' );
divTextStyle = {
position: "relative",
width: img.width + "px",
textAlign: "center",
fontSize: fontHeight,
color: "black",
fontWeight : "bold",
zIndex: "10"
};
for ( var st in divTextStyle ) {
divText.style[ st ] = divTextStyle[ st ];
}
>>>>>>>
var fontHeight = ( img.height / 12 ) + "px",
divText = document.createElement( "div" );
// add the widget's div to the target div
document.getElementById( options.target ) && document.getElementById( options.target ).appendChild( options.link ); |
<<<<<<<
Vue.prototype.$host = 'http://192.168.31.34:8080';
//Vue.prototype.$host = 'http://m1.baobaofarm.com';
=======
>>>>>>> |
<<<<<<<
var assert = require('assert');
var step = require('step');
var cors = require('../middleware/cors');
var userMiddleware = require('../middleware/user');
var allowQueryParams = require('../middleware/allow-query-params');
var vectorError = require('../middleware/vector-error');
const rateLimit = require('../middleware/rate-limit');
const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
var DataviewBackend = require('../backends/dataview');
var AnalysisStatusBackend = require('../backends/analysis-status');
var MapStoreMapConfigProvider = require('../models/mapconfig/provider/map-store-provider');
var QueryTables = require('cartodb-query-tables');
=======
const cors = require('../middleware/cors');
const userMiddleware = require('../middleware/user');
const allowQueryParams = require('../middleware/allow-query-params');
const vectorError = require('../middleware/vector-error');
const DataviewBackend = require('../backends/dataview');
const AnalysisStatusBackend = require('../backends/analysis-status');
const MapStoreMapConfigProvider = require('../models/mapconfig/provider/map-store-provider');
const QueryTables = require('cartodb-query-tables');
const SUPPORTED_FORMATS = {
grid_json: true,
json_torque: true,
torque_json: true,
png: true,
png32: true,
mvt: true
};
>>>>>>>
const cors = require('../middleware/cors');
const userMiddleware = require('../middleware/user');
const allowQueryParams = require('../middleware/allow-query-params');
const vectorError = require('../middleware/vector-error');
const rateLimit = require('../middleware/rate-limit');
const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
const DataviewBackend = require('../backends/dataview');
const AnalysisStatusBackend = require('../backends/analysis-status');
const MapStoreMapConfigProvider = require('../models/mapconfig/provider/map-store-provider');
const QueryTables = require('cartodb-query-tables');
const SUPPORTED_FORMATS = {
grid_json: true,
json_torque: true,
torque_json: true,
png: true,
png32: true,
mvt: true
};
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.TILE),
=======
userMiddleware(),
>>>>>>>
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.TILE),
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.TILE),
=======
userMiddleware(),
>>>>>>>
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.TILE),
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.TILE),
validateLayerRouteMiddleware,
=======
userMiddleware(),
>>>>>>>
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.TILE),
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.ATTRIBUTES),
=======
userMiddleware(),
>>>>>>>
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.ATTRIBUTES),
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.STATIC),
=======
userMiddleware(),
>>>>>>>
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.STATIC),
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.STATIC),
=======
userMiddleware(),
>>>>>>>
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.STATIC),
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.DATAVIEW),
=======
userMiddleware(),
>>>>>>>
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.DATAVIEW),
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.DATAVIEW),
=======
userMiddleware(),
>>>>>>>
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.DATAVIEW),
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.DATAVIEW_SEARCH),
=======
userMiddleware(),
>>>>>>>
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.DATAVIEW_SEARCH),
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.DATAVIEW_SEARCH),
=======
userMiddleware(),
>>>>>>>
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.DATAVIEW_SEARCH),
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.ANALYSIS),
=======
userMiddleware(),
>>>>>>>
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.ANALYSIS), |
<<<<<<<
var overrideParams = _.reduce(_.pick(params, 'start', 'end', 'bins', 'timezone'),
function castNumbers(overrides, val, k) {
if (!Number.isFinite(+val)) {
throw new Error('Invalid number format for parameter \'' + k + '\'');
}
overrides[k] = +val;
return overrides;
},
{ownFilter: ownFilter}
);
if (params.aggregation && DATE_AGGREGATIONS.indexOf(params.aggregation) !== -1) {
overrideParams.aggregation = params.aggregation;
}
=======
>>>>>>> |
<<<<<<<
const user = require('../middleware/user');
const locals = require('../middleware/locals');
const credentials = require('../middleware/credentials');
=======
const userMiddleware = require('../middleware/user');
const rateLimit = require('../middleware/rate-limit');
const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
const localsMiddleware = require('../middleware/context/locals');
const credentialsMiddleware = require('../middleware/context/credentials');
>>>>>>>
const user = require('../middleware/user');
const locals = require('../middleware/locals');
const credentials = require('../middleware/credentials');
const userMiddleware = require('../middleware/user');
const rateLimit = require('../middleware/rate-limit');
const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
<<<<<<<
locals(),
user(),
credentials(),
=======
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_CREATE),
localsMiddleware(),
credentialsMiddleware(),
>>>>>>>
locals(),
user(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_CREATE),
credentials(),
<<<<<<<
locals(),
user(),
credentials(),
=======
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_UPDATE),
localsMiddleware(),
credentialsMiddleware(),
>>>>>>>
locals(),
user(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_UPDATE),
credentials(),
<<<<<<<
locals(),
user(),
credentials(),
=======
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_GET),
localsMiddleware(),
credentialsMiddleware(),
>>>>>>>
locals(),
user(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_GET),
credentials(),
<<<<<<<
locals(),
user(),
credentials(),
=======
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_DELETE),
localsMiddleware(),
credentialsMiddleware(),
>>>>>>>
locals(),
user(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_DELETE),
credentials(),
<<<<<<<
locals(),
user(),
credentials(),
=======
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_LIST),
localsMiddleware(),
credentialsMiddleware(),
>>>>>>>
locals(),
user(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_LIST),
credentials(), |
<<<<<<<
module.exports = PreviewTemplateController;
PreviewTemplateController.prototype.register = function (mapRouter) {
mapRouter.get(
`/static/named/:template_id/:width/:height.:format`,
credentials(),
authorize(this.authBackend),
dbConnSetup(this.pgConnection),
rateLimit(this.userLimitsBackend, RATE_LIMIT_ENDPOINTS_GROUPS.STATIC_NAMED),
cleanUpQueryParams(['layer', 'zoom', 'lon', 'lat', 'bbox']),
checkStaticImageFormat(),
namedMapProvider({
namedMapProviderCache: this.namedMapProviderCache,
label: 'STATIC_VIZ_MAP', forcedFormat: 'png'
}),
getTemplate({ label: 'STATIC_VIZ_MAP' }),
prepareLayerFilterFromPreviewLayers({
namedMapProviderCache: this.namedMapProviderCache,
label: 'STATIC_VIZ_MAP'
}),
getStaticImageOptions({ tablesExtentBackend: this.tablesExtentBackend }),
getImage({ previewBackend: this.previewBackend, label: 'STATIC_VIZ_MAP' }),
setContentTypeHeader(),
incrementMapViews({ metadataBackend: this.metadataBackend }),
cacheControlHeader(),
cacheChannelHeader(),
surrogateKeyHeader({ surrogateKeysCache: this.surrogateKeysCache }),
lastModifiedHeader()
);
=======
register (mapRouter) {
mapRouter.get('/static/named/:template_id/:width/:height.:format', this.middlewares());
}
middlewares () {
return [
credentials(),
authorize(this.authBackend),
dbConnSetup(this.pgConnection),
rateLimit(this.userLimitsBackend, RATE_LIMIT_ENDPOINTS_GROUPS.STATIC_NAMED),
cleanUpQueryParams(['layer', 'zoom', 'lon', 'lat', 'bbox']),
namedMapProvider({
namedMapProviderCache: this.namedMapProviderCache,
label: 'STATIC_VIZ_MAP', forcedFormat: 'png'
}),
getTemplate({ label: 'STATIC_VIZ_MAP' }),
prepareLayerFilterFromPreviewLayers({
namedMapProviderCache: this.namedMapProviderCache,
label: 'STATIC_VIZ_MAP'
}),
getStaticImageOptions({ tablesExtentBackend: this.tablesExtentBackend }),
getImage({ previewBackend: this.previewBackend, label: 'STATIC_VIZ_MAP' }),
setContentTypeHeader(),
incrementMapViews({ metadataBackend: this.metadataBackend }),
cacheControlHeader(),
cacheChannelHeader(),
surrogateKeyHeader({ surrogateKeysCache: this.surrogateKeysCache }),
lastModifiedHeader()
];
}
>>>>>>>
register (mapRouter) {
mapRouter.get('/static/named/:template_id/:width/:height.:format', this.middlewares());
}
middlewares () {
return [
credentials(),
authorize(this.authBackend),
dbConnSetup(this.pgConnection),
rateLimit(this.userLimitsBackend, RATE_LIMIT_ENDPOINTS_GROUPS.STATIC_NAMED),
cleanUpQueryParams(['layer', 'zoom', 'lon', 'lat', 'bbox']),
checkStaticImageFormat(),
namedMapProvider({
namedMapProviderCache: this.namedMapProviderCache,
label: 'STATIC_VIZ_MAP', forcedFormat: 'png'
}),
getTemplate({ label: 'STATIC_VIZ_MAP' }),
prepareLayerFilterFromPreviewLayers({
namedMapProviderCache: this.namedMapProviderCache,
label: 'STATIC_VIZ_MAP'
}),
getStaticImageOptions({ tablesExtentBackend: this.tablesExtentBackend }),
getImage({ previewBackend: this.previewBackend, label: 'STATIC_VIZ_MAP' }),
setContentTypeHeader(),
incrementMapViews({ metadataBackend: this.metadataBackend }),
cacheControlHeader(),
cacheChannelHeader(),
surrogateKeyHeader({ surrogateKeysCache: this.surrogateKeysCache }),
lastModifiedHeader()
];
} |
<<<<<<<
const rateLimit = require('../middleware/rate-limit');
const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
var MapConfig = windshaft.model.MapConfig;
var Datasource = windshaft.model.Datasource;
var NamedMapsCacheEntry = require('../cache/model/named_maps_entry');
var NamedMapMapConfigProvider = require('../models/mapconfig/provider/named-map-provider');
var CreateLayergroupMapConfigProvider = require('../models/mapconfig/provider/create-layergroup-provider');
=======
const NamedMapsCacheEntry = require('../cache/model/named_maps_entry');
const NamedMapMapConfigProvider = require('../models/mapconfig/provider/named-map-provider');
const CreateLayergroupMapConfigProvider = require('../models/mapconfig/provider/create-layergroup-provider');
const LayergroupMetadata = require('../utils/layergroup-metadata');
>>>>>>>
const NamedMapsCacheEntry = require('../cache/model/named_maps_entry');
const NamedMapMapConfigProvider = require('../models/mapconfig/provider/named-map-provider');
const CreateLayergroupMapConfigProvider = require('../models/mapconfig/provider/create-layergroup-provider');
const LayergroupMetadata = require('../utils/layergroup-metadata');
const rateLimit = require('../middleware/rate-limit');
const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, endpointGroup),
=======
userMiddleware(),
>>>>>>>
userMiddleware(),
rateLimit(this.userLimitsApi, endpointGroup), |
<<<<<<<
var req = {headers: { host:'localhost' }, query: {} };
var res = {};
=======
var req = {headers: { host:'localhost' }, query: {}, locals: {} };
var res = { set: function () {} };
>>>>>>>
var req = {headers: { host:'localhost' }, query: {} };
var res = { set: function () {} };
<<<<<<<
var req = { headers: { host: 'localhost' }, query: { map_key: '1234' }};
var res = {};
=======
var req = { headers: { host: 'localhost' }, query: { map_key: '1234' }, locals: {} };
var res = { set: function () {} };
>>>>>>>
var req = { headers: { host: 'localhost' }, query: { map_key: '1234' }};
var res = { set: function () {} }; |
<<<<<<<
const locals = require('../middleware/locals');
const cleanUpQueryParams = require('../middleware/clean-up-query-params');
const layergroupToken = require('../middleware/layergroup-token');
const credentials = require('../middleware/credentials');
const dbConnSetup = require('../middleware/db-conn-setup');
const authorize = require('../middleware/authorize');
=======
const rateLimit = require('../middleware/rate-limit');
const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
>>>>>>>
const locals = require('../middleware/locals');
const cleanUpQueryParams = require('../middleware/clean-up-query-params');
const layergroupToken = require('../middleware/layergroup-token');
const credentials = require('../middleware/credentials');
const dbConnSetup = require('../middleware/db-conn-setup');
const authorize = require('../middleware/authorize');
const rateLimit = require('../middleware/rate-limit');
const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit;
<<<<<<<
function LayergroupController(pgConnection, mapStore, tileBackend, previewBackend, attributesBackend,
surrogateKeysCache, userLimitsApi, layergroupAffectedTables, analysisBackend, authApi) {
=======
function LayergroupController(
prepareContext,
pgConnection,
mapStore,
tileBackend,
previewBackend,
attributesBackend,
surrogateKeysCache,
userLimitsApi,
layergroupAffectedTables,
analysisBackend
) {
>>>>>>>
function LayergroupController(
pgConnection,
mapStore,
tileBackend,
previewBackend,
attributesBackend,
surrogateKeysCache,
userLimitsApi,
layergroupAffectedTables,
analysisBackend,
authApi
) {
<<<<<<<
cleanUpQueryParams(),
locals(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
=======
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.TILE),
this.prepareContext,
>>>>>>>
cleanUpQueryParams(),
locals(),
user(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.TILE),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
<<<<<<<
cleanUpQueryParams(),
locals(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
=======
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.TILE),
this.prepareContext,
>>>>>>>
cleanUpQueryParams(),
locals(),
user(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.TILE),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
<<<<<<<
cleanUpQueryParams(),
locals(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
=======
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.TILE),
this.prepareContext,
>>>>>>>
cleanUpQueryParams(),
locals(),
user(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.TILE),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
<<<<<<<
cleanUpQueryParams(),
locals(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
=======
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.ATTRIBUTES),
this.prepareContext,
>>>>>>>
cleanUpQueryParams(),
locals(),
user(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.ATTRIBUTES),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
<<<<<<<
cleanUpQueryParams(['layer']),
locals(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
=======
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.STATIC),
allowQueryParams(['layer']),
this.prepareContext,
>>>>>>>
cleanUpQueryParams(['layer']),
locals(),
user(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.STATIC),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
<<<<<<<
cleanUpQueryParams(['layer']),
locals(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
=======
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.STATIC),
allowQueryParams(['layer']),
this.prepareContext,
>>>>>>>
cleanUpQueryParams(['layer']),
locals(),
user(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.STATIC),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
<<<<<<<
cleanUpQueryParams(allowedDataviewQueryParams),
locals(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
=======
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.DATAVIEW),
allowQueryParams(allowedDataviewQueryParams),
this.prepareContext,
>>>>>>>
cleanUpQueryParams(allowedDataviewQueryParams),
locals(),
user(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.DATAVIEW),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
<<<<<<<
cleanUpQueryParams(allowedDataviewQueryParams),
locals(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
=======
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.DATAVIEW),
allowQueryParams(allowedDataviewQueryParams),
this.prepareContext,
>>>>>>>
cleanUpQueryParams(allowedDataviewQueryParams),
locals(),
user(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.DATAVIEW),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
<<<<<<<
cleanUpQueryParams(allowedDataviewQueryParams),
locals(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
=======
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.DATAVIEW_SEARCH),
allowQueryParams(allowedDataviewQueryParams),
this.prepareContext,
>>>>>>>
cleanUpQueryParams(allowedDataviewQueryParams),
locals(),
user(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.DATAVIEW_SEARCH),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
<<<<<<<
cleanUpQueryParams(allowedDataviewQueryParams),
locals(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
=======
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.DATAVIEW_SEARCH),
allowQueryParams(allowedDataviewQueryParams),
this.prepareContext,
>>>>>>>
cleanUpQueryParams(allowedDataviewQueryParams),
locals(),
user(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.DATAVIEW_SEARCH),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
<<<<<<<
cleanUpQueryParams(),
locals(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
=======
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.ANALYSIS),
this.prepareContext,
>>>>>>>
cleanUpQueryParams(),
locals(),
user(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.ANALYSIS),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection), |
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_CREATE),
apikeyMiddleware,
=======
userMiddleware(),
localsMiddleware(),
credentialsMiddleware(),
>>>>>>>
userMiddleware(),
localsMiddleware(),
credentialsMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_CREATE),
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_UPDATE),
apikeyMiddleware,
=======
userMiddleware(),
localsMiddleware(),
credentialsMiddleware(),
>>>>>>>
userMiddleware(),
localsMiddleware(),
credentialsMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_UPDATE),
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_GET),
apikeyMiddleware,
=======
userMiddleware(),
localsMiddleware(),
credentialsMiddleware(),
>>>>>>>
userMiddleware(),
localsMiddleware(),
credentialsMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_GET),
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_DELETE),
apikeyMiddleware,
=======
userMiddleware(),
localsMiddleware(),
credentialsMiddleware(),
>>>>>>>
userMiddleware(),
localsMiddleware(),
credentialsMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_DELETE),
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_LIST),
apikeyMiddleware,
=======
userMiddleware(),
localsMiddleware(),
credentialsMiddleware(),
>>>>>>>
userMiddleware(),
localsMiddleware(),
credentialsMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_LIST), |
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_TILES),
=======
userMiddleware(),
>>>>>>>
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_TILES),
<<<<<<<
userMiddleware,
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.STATIC_NAMED),
=======
userMiddleware(),
>>>>>>>
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.STATIC_NAMED), |
<<<<<<<
app.get(
app.base_url_mapconfig + '/static/named/:template_id/:width/:height.:format',
cors(),
userMiddleware,
allowQueryParams(['layer']),
this.prepareContext,
this.staticMap.bind(this)
);
=======
app.get(app.base_url_mapconfig +
'/static/named/:template_id/:width/:height.:format', cors(), userMiddleware,
allowQueryParams(['layer', 'zoom', 'lon', 'lat', 'bbox']),
this.staticMap.bind(this));
>>>>>>>
app.get(
app.base_url_mapconfig + '/static/named/:template_id/:width/:height.:format',
cors(),
userMiddleware,
allowQueryParams(['layer', 'zoom', 'lon', 'lat', 'bbox']),
this.prepareContext,
this.staticMap.bind(this)
); |
<<<<<<<
function NamedMapsController(namedMapProviderCache, tileBackend, previewBackend,
surrogateKeysCache, tablesExtentApi, metadataBackend, pgConnection, authApi) {
=======
function NamedMapsController(
prepareContext,
namedMapProviderCache,
tileBackend,
previewBackend,
surrogateKeysCache,
tablesExtentApi,
metadataBackend,
userLimitsApi
) {
>>>>>>>
function NamedMapsController (
namedMapProviderCache,
tileBackend,
previewBackend,
surrogateKeysCache,
tablesExtentApi,
metadataBackend,
pgConnection,
authApi,
userLimitsApi
) {
<<<<<<<
this.pgConnection = pgConnection;
this.authApi = authApi;
=======
this.userLimitsApi = userLimitsApi;
this.prepareContext = prepareContext;
>>>>>>>
this.pgConnection = pgConnection;
this.authApi = authApi;
this.userLimitsApi = userLimitsApi;
<<<<<<<
cleanUpQueryParams(),
locals(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
=======
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_TILES),
this.prepareContext,
>>>>>>>
cleanUpQueryParams(),
locals(),
user(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.NAMED_TILES),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
<<<<<<<
cleanUpQueryParams(['layer', 'zoom', 'lon', 'lat', 'bbox']),
locals(),
user(),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection),
=======
userMiddleware(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.STATIC_NAMED),
allowQueryParams(['layer', 'zoom', 'lon', 'lat', 'bbox']),
this.prepareContext,
>>>>>>>
cleanUpQueryParams(['layer', 'zoom', 'lon', 'lat', 'bbox']),
locals(),
user(),
rateLimit(this.userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.STATIC_NAMED),
layergroupToken(),
credentials(),
authorize(this.authApi),
dbConnSetup(this.pgConnection), |
<<<<<<<
=======
if(serverOptions.cache_enabled) {
console.log("cache invalidation enabled, varnish on ", serverOptions.varnish_host, ' ',
serverOptions.varnish_port);
Cache.init(serverOptions.varnish_host, serverOptions.varnish_port, serverOptions.varnish_secret);
serverOptions.afterStateChange = function(req, data, callback) {
Cache.invalidate_db(req.params.dbname, req.params.table);
callback(null, data);
};
}
serverOptions.beforeStateChange = function(req, callback) {
var err = null;
if ( ! req.params.hasOwnProperty('_authorizedByApiKey') ) {
err = new Error("map state cannot be changed by unauthenticated request!");
}
callback(err, req);
};
>>>>>>>
<<<<<<<
=======
/**
* Helper to allow access to the layer to be used in the maps infowindow popup.
*/
ws.get(serverOptions.base_url + '/infowindow', function(req, res){
ws.doCORS(res);
step(
function(){
serverOptions.getInfowindow(req, this);
},
function(err, data){
if (err){
ws.sendError(res, {error: err.message}, 500, 'GET INFOWINDOW', err);
//ws.sendResponse(res, [{error: err.message}, 500]);
} else {
ws.sendResponse(res, [{infowindow: data}, 200]);
}
}
);
});
/**
* Helper to allow access to metadata to be used in embedded maps.
*/
ws.get(serverOptions.base_url + '/map_metadata', function(req, res){
ws.doCORS(res);
step(
function(){
serverOptions.getMapMetadata(req, this);
},
function(err, data){
if (err){
ws.sendError(res, {error: err.message}, 500, 'GET MAP_METADATA', err);
//ws.sendResponse(res, [err.message, 500]);
} else {
ws.sendResponse(res, [{map_metadata: data}, 200]);
}
}
);
});
/**
* Helper API to allow per table tile cache (and sql cache) to be invalidated remotely.
* Keep endpoint for backwards compatibility
*/
ws.del(serverOptions.base_url + '/flush_cache', function(req, res){
ws.doCORS(res);
ws.sendResponse(res, [{status: 'ok'}, 200]);
});
>>>>>>> |
<<<<<<<
// TODO: 测试: 有 extract.all.[*].css
=======
// TODO: 测试: inject 的函数用法
// TODO: 测试: extend connect 的 Array 用法
>>>>>>>
// TODO: 测试: 有 extract.all.[*].css
// TODO: 测试: inject 的函数用法
// TODO: 测试: extend connect 的 Array 用法 |
<<<<<<<
const port = await waitForPort(
child,
/ started on.*http:.*:([0-9]+)/
);
child.stderr.on('data', err => {
=======
const port = await waitForPort(child, / on.*http:.*:([0-9]+)/);
child.stderr.on('data', (err) => {
>>>>>>>
const port = await waitForPort(
child,
/ started on.*http:.*:([0-9]+)/
);
child.stderr.on('data', (err) => { |
<<<<<<<
const port = require(path.resolve(dir, 'koot.config.spa.js'))
.port;
const origin = isNaN(port) ? port : `http://127.0.0.1:${port}`;
const errors = [];
=======
const origin = isNaN(port) ? port : `http://127.0.0.1:${port}`;
const page = await context.newPage();
const failedResponse = [];
require('../../libs/puppeteer/page-event-response-failed-response')(
page,
failedResponse
);
>>>>>>>
const origin = isNaN(port) ? port : `http://127.0.0.1:${port}`;
const context = await browser.createIncognitoBrowserContext();
const page = await context.newPage();
const failedResponse = [];
require('../../libs/puppeteer/page-event-response-failed-response')(
page,
failedResponse
);
<<<<<<<
const context = await browser.createIncognitoBrowserContext();
const testSpaServer = async cwd => {
// console.log({
// command: `node ${fileServerJS}`,
// cwd
// });
const child = execSync(`node ${fileServerJS}`, {
cwd
});
const errors = [];
child.stderr.on('data', err => {
errors.push(err);
});
await waitForPort(child);
const page = await context.newPage();
const failedResponse = [];
require('../../libs/puppeteer/page-event-response-failed-response')(
page,
failedResponse
=======
const html = await res.text();
// 测试: 没有失败的请求
if (failedResponse.length) {
console.log(
'failedResponse',
failedResponse.map(res => ({
status: res.status(),
url: res.url()
}))
>>>>>>>
const html = await res.text();
// 测试: 没有失败的请求
if (failedResponse.length) {
console.log(
'failedResponse',
failedResponse.map(res => ({
status: res.status(),
url: res.url()
}))
<<<<<<<
const res = await page.goto(origin, {
waitUntil: 'networkidle0'
});
const html = await res.text();
// 测试: 没有失败的请求
if (failedResponse.length) {
console.log(
'failedResponse',
failedResponse.map(res => ({
status: res.status(),
url: res.url()
}))
);
}
expect(failedResponse.length).toBe(0);
expect(errors.length).toBe(0);
await testHtmlRenderedByKoot(html);
await testRequestHidden404(origin, browser);
await testAssetsGzip(origin, dist, browser);
// 结束测试
await page.close();
await terminate(child.pid);
};
await testSpaServer(dir).catch(e => {
errors.push(e);
});
await testSpaServer(dist).catch(e => {
errors.push(e);
});
=======
await testHtmlRenderedByKoot(html);
await testRequestHidden404(origin, browser);
>>>>>>>
await testHtmlRenderedByKoot(html);
await testRequestHidden404(origin, browser);
await testAssetsGzip(origin, dist, browser); |
<<<<<<<
const path = require('path')
// Note: always use `path.join()` to make sure delimiters work cross-platform
// Some platform-specific logic may be needed here, ex using geth.exe on Windows,
// for this you can use electron-util: https://github.com/sindresorhus/electron-util/blob/master/index.js#L17-L19
const dataDir = path.join(app.getPath('userData'), 'data')
const pwdPath = path.join(dataDir, 'pwd')
const keystorePath = path.join(dataDir, 'keystore')
const logPath = path.join(dataDir, 'node.log')
const setupGeth = async () => {
console.log("setupGeth() called")
const gethPath = path.join(process.resourcesPath, 'bin', 'geth')
try {
mkdirSync(dataDir)
} catch (err) {
// Likely directory already exists, better check though
// See https://nodejs.org/api/fs.html#fs_fs_mkdir_path_mode_callback
}
// Could be made async, shouldn't be an issue though
writeFileSync(pwdPath, 'secret')
// Create the account - other commands should work the same way
const res = await execa(gethPath, [
'--datadir', dataDir,
'--password', pwdPath,
'account', 'new',
])
console.log(res)
}
const setupSwarm = async () => {
console.log("setupSwarm() called")
const swarmPath = path.join(process.resourcesPath, 'bin', 'swarm')
const keystoreFiles = readdirSync(keystorePath)
const keyFileName = keystoreFiles[0]
const keyFilePath = path.join(keystorePath, keyFileName)
const keystore = JSON.parse(readFileSync(keyFilePath, 'utf8'))
return await new Promise((resolve, reject) => {
const proc = execa(swarmPath, [
'--datadir', dataDir,
'--password', pwdPath,
'--bzzaccount', keystore.address,
'--pss',
'--verbosity', '4',
'--bzznetworkid', '922',
'--bootnodes', 'enode://e834e83b4ed693b98d1a31d47b54f75043734c6c77d81137830e657e8b005a8f13b4833efddbd534f2c06636574d1305773648f1f39dd16c5145d18402c6bca3@52.51.239.180:30399',
'--ws',
'--wsorigins', '*',
])
proc.once('error', (error) => {
console.log('Failed to start node', error)
reject(error)
})
proc.stderr.pipe(createWriteStream(logPath, { flags: 'a' }))
proc.stdout.on('data', (data) => {
const dataStr = data.toString().toLowerCase()
if (dataStr.indexOf('fatal:') >= 0) {
const error = new Error(`swarm error: ${data.toString()}`)
console.log(error)
reject(error)
}
})
proc.stderr.on('data', (data) => {
const dataStr = data.toString().toLowerCase()
if (dataStr.indexOf('websocket endpoint opened') >= 0) {
console.log('Node started')
resolve({ swarmProc: proc })
}
})
})
}
=======
const url = require('url')
>>>>>>>
const url = require('url')
const path = require('path')
// Note: always use `path.join()` to make sure delimiters work cross-platform
// Some platform-specific logic may be needed here, ex using geth.exe on Windows,
// for this you can use electron-util: https://github.com/sindresorhus/electron-util/blob/master/index.js#L17-L19
const dataDir = path.join(app.getPath('userData'), 'data')
const pwdPath = path.join(dataDir, 'pwd')
const keystorePath = path.join(dataDir, 'keystore')
const logPath = path.join(dataDir, 'node.log')
const setupGeth = async () => {
console.log("setupGeth() called")
const gethPath = path.join(process.resourcesPath, 'bin', 'geth')
try {
mkdirSync(dataDir)
} catch (err) {
// Likely directory already exists, better check though
// See https://nodejs.org/api/fs.html#fs_fs_mkdir_path_mode_callback
}
// Could be made async, shouldn't be an issue though
writeFileSync(pwdPath, 'secret')
// Create the account - other commands should work the same way
const res = await execa(gethPath, [
'--datadir', dataDir,
'--password', pwdPath,
'account', 'new',
])
console.log(res)
}
const setupSwarm = async () => {
console.log("setupSwarm() called")
const swarmPath = path.join(process.resourcesPath, 'bin', 'swarm')
const keystoreFiles = readdirSync(keystorePath)
const keyFileName = keystoreFiles[0]
const keyFilePath = path.join(keystorePath, keyFileName)
const keystore = JSON.parse(readFileSync(keyFilePath, 'utf8'))
return await new Promise((resolve, reject) => {
const proc = execa(swarmPath, [
'--datadir', dataDir,
'--password', pwdPath,
'--bzzaccount', keystore.address,
'--pss',
'--verbosity', '4',
'--bzznetworkid', '922',
'--bootnodes', 'enode://e834e83b4ed693b98d1a31d47b54f75043734c6c77d81137830e657e8b005a8f13b4833efddbd534f2c06636574d1305773648f1f39dd16c5145d18402c6bca3@52.51.239.180:30399',
'--ws',
'--wsorigins', '*',
])
proc.once('error', (error) => {
console.log('Failed to start node', error)
reject(error)
})
proc.stderr.pipe(createWriteStream(logPath, { flags: 'a' }))
proc.stdout.on('data', (data) => {
const dataStr = data.toString().toLowerCase()
if (dataStr.indexOf('fatal:') >= 0) {
const error = new Error(`swarm error: ${data.toString()}`)
console.log(error)
reject(error)
}
})
proc.stderr.on('data', (data) => {
const dataStr = data.toString().toLowerCase()
if (dataStr.indexOf('websocket endpoint opened') >= 0) {
console.log('Node started')
resolve({ swarmProc: proc })
}
})
})
}
<<<<<<<
console.log("\n start() called")
if (!existsSync(keystorePath)) {
await setupGeth()
}
const { swarmProc } = await setupSwarm()
console.log('Starting GraphQL server')
const appPort = isDev ? 3000 : await startAppServer()
const serverPort = await startOnyxServer(appPort)
const url = `http://localhost:${appPort}/?port=${serverPort}`
=======
let appPort
if (is.development) {
appPort = 3000
} else {
if (appServer == null) {
appServer = await startAppServer()
}
appPort = appServer.port
}
let appUrl = `http://localhost:${appPort}`
const storedWsUrl = store.get('wsUrl')
if (storedWsUrl) {
if (storedWsUrl === 'local') {
// Setup a local Graphql server
try {
const serverPort = await startLocalOnyxServer(appPort)
const wsUrl = `ws://localhost:${serverPort}/graphql`
const httpUrl = `http://localhost:${serverPort}`
appUrl = appUrl + `/?wsUrl=${wsUrl}&httpUrl=${httpUrl}`
} catch (err) {
console.warn('err: ', err)
const errorMsg = 'There was an issue starting local GraphQL server, you may want to check you have a swarm node running on default port 8546, or that you specified the correct port if not using default'
appUrl = appUrl + `/?wsUrl=${storedWsUrl}&connectionError=${errorMsg}`
if (appServer != null) {
appServer.stop()
}
}
} else {
// Use stored remote server url
let domain
if (storedWsUrl.indexOf('://') > -1) {
domain = storedWsUrl.split('/')[2]
} else if (storedWsUrl.indexOf('/') !== -1) {
domain = storedWsUrl.split('/')[0]
}
if (!domain) {
const errorMsg = 'Invalid ws url'
appUrl = appUrl + `/?wsUrl=${storedWsUrl}&connectionError=${errorMsg}`
} else {
const httpUrl = `http://${domain}`
appUrl = appUrl + `/?wsUrl=${storedWsUrl}&httpUrl=${httpUrl}`
}
}
}
>>>>>>>
let appPort
if (is.development) {
appPort = 3000
} else {
if (appServer == null) {
appServer = await startAppServer()
}
appPort = appServer.port
}
let appUrl = `http://localhost:${appPort}`
const storedWsUrl = store.get('wsUrl')
if (storedWsUrl) {
if (storedWsUrl === 'local') {
// Setup a local Graphql server
try {
if (!existsSync(keystorePath)) {
await setupGeth()
}
const { swarmProc } = await setupSwarm()
const serverPort = await startLocalOnyxServer(appPort)
const wsUrl = `ws://localhost:${serverPort}/graphql`
const httpUrl = `http://localhost:${serverPort}`
appUrl = appUrl + `/?wsUrl=${wsUrl}&httpUrl=${httpUrl}`
} catch (err) {
console.warn('err: ', err)
const errorMsg = 'There was an issue starting local GraphQL server, you may want to check you have a swarm node running on default port 8546, or that you specified the correct port if not using default'
appUrl = appUrl + `/?wsUrl=${storedWsUrl}&connectionError=${errorMsg}`
if (appServer != null) {
appServer.stop()
}
}
} else {
// Use stored remote server url
let domain
if (storedWsUrl.indexOf('://') > -1) {
domain = storedWsUrl.split('/')[2]
} else if (storedWsUrl.indexOf('/') !== -1) {
domain = storedWsUrl.split('/')[0]
}
if (!domain) {
const errorMsg = 'Invalid ws url'
appUrl = appUrl + `/?wsUrl=${storedWsUrl}&connectionError=${errorMsg}`
} else {
const httpUrl = `http://${domain}`
appUrl = appUrl + `/?wsUrl=${storedWsUrl}&httpUrl=${httpUrl}`
}
}
}
<<<<<<<
// TODO: remove this
process.on('unhandledRejection', (reason, p) => {
console.log('\n Unhandled Rejection at: Promise', p, 'reason:', reason)
// application specific logging, throwing an error, or other logic here
})
=======
const clearEventListeners = () => {
if (mainWindow) {
mainWindow.removeListener('ready-to-show', showFunc)
mainWindow.removeListener('closed', closedFunc)
}
}
ipcMain.on('onSetWsUrl', (e, url) => {
store.set('wsUrl', url)
start()
})
>>>>>>>
const clearEventListeners = () => {
if (mainWindow) {
mainWindow.removeListener('ready-to-show', showFunc)
mainWindow.removeListener('closed', closedFunc)
}
}
ipcMain.on('onSetWsUrl', (e, url) => {
store.set('wsUrl', url)
start()
}) |
<<<<<<<
type DB = {
=======
type State = {
actions: { [ID]: Action },
>>>>>>>
type State = {
<<<<<<<
const db: DB = {
address: '',
contactRequests: new Map(),
contacts: new Map(),
convos: new Map(),
profile: undefined,
typings: new Map(),
=======
const store = new Store()
const resetState = () => {
store.set('state', {
actions: {},
address: '',
contactRequests: {},
contacts: {},
convos: {},
// TODO: store profiles mock as [address]: PeerProfile
// get own profile based on address
profile: undefined,
})
>>>>>>>
const store = new Store()
const resetState = () => {
store.set('state', {
address: '',
contactRequests: {},
contacts: {},
convos: {},
profile: undefined,
})
<<<<<<<
=======
export const getAction = (id: ID): ?Action => store.get(`state.actions.${id}`)
export const setAction = (convoID: ID, data: ActionData): Action => {
const action = { convoID, data }
store.set(`state.actions.${data.id}`, action)
return action
}
>>>>>>>
<<<<<<<
=======
const messages =
convo.messages && convo.messages.length
? convo.messages.map(msg => {
msg.blocks = msg.blocks.map(b => {
if (b.action != null && typeof b.action.id === 'string') {
const action = store.get(`state.actions.${b.action.id}`)
if (action != null) {
// $FlowIgnore
b.action = action.data
}
}
return b
})
return msg
})
: []
>>>>>>> |
<<<<<<<
exports.addMessage = exports.upsertContact = exports.updateConversationPointer = exports.setConversation = exports.setContact = exports.getViewer = exports.getChannels = exports.getConversations = exports.getContacts = exports.getContact = exports.getConversation = exports.setContactRequest = exports.getContactRequest = exports.deleteContactRequest = exports.getProfile = exports.setProfile = exports.getAddress = exports.setAddress = exports.setTyping = undefined;
=======
exports.addMessage = exports.upsertContact = exports.updateConversationPointer = exports.setConversation = exports.hasConversation = exports.setContact = exports.getViewer = exports.getChannels = exports.getConversations = exports.getContacts = exports.getContact = exports.getConversation = exports.setAction = exports.getAction = exports.setContactRequest = exports.getContactRequest = exports.deleteContactRequest = exports.getProfile = exports.setProfile = exports.getAddress = exports.setAddress = exports.setTyping = undefined;
>>>>>>>
exports.addMessage = exports.upsertContact = exports.updateConversationPointer = exports.setConversation = exports.hasConversation = exports.setContact = exports.getViewer = exports.getChannels = exports.getConversations = exports.getContacts = exports.getContact = exports.getConversation = exports.setContactRequest = exports.getContactRequest = exports.deleteContactRequest = exports.getProfile = exports.setProfile = exports.getAddress = exports.setAddress = exports.setTyping = undefined;
<<<<<<<
const db = {
address: '',
contactRequests: new Map(),
contacts: new Map(),
convos: new Map(),
profile: undefined,
typings: new Map()
=======
const store = new _electronStore2.default();
const resetState = () => {
store.set('state', {
actions: {},
address: '',
contactRequests: {},
contacts: {},
convos: {},
// TODO: store profiles mock as [address]: PeerProfile
// get own profile based on address
profile: undefined
});
>>>>>>>
const store = new _electronStore2.default();
const resetState = () => {
store.set('state', {
address: '',
contactRequests: {},
contacts: {},
convos: {},
profile: undefined
});
<<<<<<<
=======
const getAction = exports.getAction = id => store.get(`state.actions.${id}`);
const setAction = exports.setAction = (convoID, data) => {
const action = { convoID, data };
store.set(`state.actions.${data.id}`, action);
return action;
};
>>>>>>>
<<<<<<<
=======
const messages = convo.messages && convo.messages.length ? convo.messages.map(msg => {
msg.blocks = msg.blocks.map(b => {
if (b.action != null && typeof b.action.id === 'string') {
const action = store.get(`state.actions.${b.action.id}`);
if (action != null) {
// $FlowIgnore
b.action = action.data;
}
}
return b;
});
return msg;
}) : [];
>>>>>>> |
<<<<<<<
exports.setupContactTopic = exports.requestContact = exports.addContactRequest = exports.createChannel = exports.joinChannel = exports.acceptContact = exports.setTyping = exports.sendMessage = exports.joinDirectTopic = exports.joinChannelTopic = exports.createRandomTopic = exports.createContactTopic = exports.setupPss = exports.setPeerPublicKey = undefined;
=======
exports.setupContactTopic = exports.requestContact = exports.addContactRequest = exports.createChannel = exports.joinChannel = exports.acceptContact = exports.setTyping = exports.setActionDone = exports.sendMessage = exports.joinDirectTopic = exports.joinChannelTopic = exports.createRandomTopic = exports.createContactTopic = exports.subscribeToStoredConvos = exports.setupPss = exports.setPeerPublicKey = undefined;
>>>>>>>
exports.setupContactTopic = exports.requestContact = exports.addContactRequest = exports.createChannel = exports.joinChannel = exports.acceptContact = exports.setTyping = exports.sendMessage = exports.joinDirectTopic = exports.joinChannelTopic = exports.createRandomTopic = exports.createContactTopic = exports.subscribeToStoredConvos = exports.setupPss = exports.setPeerPublicKey = undefined; |
<<<<<<<
/**
* Gravity in the world. This is applied on all bodies in the beginning of each step().
* @member {vec2}
* @memberof p2.World
*/
this.gravity = options.gravity || V.create(0, -9.78);
/**
* Whether to do timing measurements during the step() or not.
* @member {bool}
* @memberof p2.World
*/
this.doProfiling = true;
/**
* How many millisecconds the last step() took. This is updated each step if .doProfiling is set to true.
* @member {number}
* @memberof p2.World
*/
=======
this.gravity = options.gravity || V.create();
this.doProfiling = options.doProfiling || false;
>>>>>>>
/**
* Gravity in the world. This is applied on all bodies in the beginning of each step().
* @member {vec2}
* @memberof p2.World
*/
this.gravity = options.gravity || V.create(0, -9.78);
/**
* Whether to do timing measurements during the step() or not.
* @member {bool}
* @memberof p2.World
*/
this.doProfiling = options.doProfiling || false;
/**
* How many millisecconds the last step() took. This is updated each step if .doProfiling is set to true.
* @member {number}
* @memberof p2.World
*/ |
<<<<<<<
import getSchema from './getSchema'
import getWriter from './getWriter'
import getFilepathsFromGlob from './getFilepathsFromGlob'
import { getRelayCompilerPluginHooks } from './hooks'
import type { GraphQLSchema } from 'graphql'
import type { Compiler, Compilation } from 'webpack'
import type { WriterConfig } from './getWriter'
import type { PluginHooks } from './hooks'
=======
import type { WriterConfig } from './getWriter';
import type { WebpackLogger } from './WebpackLogger';
import createRaiseErrorsReporter from './createRaiseErrorsReporter';
>>>>>>>
import getSchema from './getSchema'
import getWriter from './getWriter'
import getFilepathsFromGlob from './getFilepathsFromGlob'
import { getRelayCompilerPluginHooks } from './hooks'
import type { GraphQLSchema } from 'graphql'
import type { Compiler, Compilation } from 'webpack'
import type { WriterConfig } from './getWriter'
import type { PluginHooks } from './hooks'
import type { WebpackLogger } from './WebpackLogger';
import createRaiseErrorsReporter from './createRaiseErrorsReporter';
<<<<<<<
static getHooks = getRelayCompilerPluginHooks
constructor (options: RelayCompilerWebpackPluginOptions) {
=======
constructor(options: RelayCompilerWebpackPluginOptions) {
>>>>>>>
static getHooks = getRelayCompilerPluginHooks
constructor (options: RelayCompilerWebpackPluginOptions) {
<<<<<<<
async compile (issuer: string, request: string, hooks: PluginHooks) {
const errors = []
try {
// Can this be set up in constructor and use same instance every time?
const runner = new Runner({
parserConfigs: this.parserConfigs,
writerConfigs: this.writerConfigs,
reporter: new RaiseErrorsReporter(),
onlyValidate: false,
skipPersist: true
})
return hooks.beforeWrite.promise()
.then(() => runner.compile(this.languagePlugin.outputExtension))
.then(compileResult => hooks.afterWrite.promise(compileResult))
} catch (error) {
errors.push(error)
}
=======
async compile(issuer: string, request: string, compilation: Compilation) {
let logger;
>>>>>>>
async compile (issuer: string, request: string, hooks: PluginHooks) {
let logger;
<<<<<<<
if (!result) result = this.compile(issuer, request, hooks)
return result
}
=======
if (!result) result = this.compile(issuer, request, compilation);
return result;
};
>>>>>>>
if (!result) result = this.compile(issuer, request, hooks)
return result
}
<<<<<<<
(compilation: Compilation, params) => {
const compile = this.cachedCompiler(compilation)
=======
(compilation, params) => {
const compile = this.cachedCompiler(compilation);
>>>>>>>
(compilation: Compilation, params) => {
const compile = this.cachedCompiler(compilation)
<<<<<<<
compiler.plugin('compilation', (compilation: Compilation, params) => {
const compile = this.cachedCompiler(compilation)
=======
compiler.plugin('compilation', (compilation, params) => {
const compile = this.cachedCompiler(compilation);
>>>>>>>
compiler.plugin('compilation', (compilation: Compilation, params) => {
const compile = this.cachedCompiler(compilation) |
<<<<<<<
const chai = require('chai')
const expect = chai.expect
const sinon = require('sinon')
const sinonChai = require('sinon-chai')
const utils = require('../utils.js')
chai.use(sinonChai)
=======
const utils = require('../utils.js')
>>>>>>>
const utils = require('../utils.js')
<<<<<<<
expect(notification.user.toString()).to.be.equal(userId2.toString())
expect(notification.targetModel).to.be.equal('Page')
expect(notification.target.toString()).to.be.equal(targetId.toString())
expect(notification.action).to.be.equal('COMMENT')
expect(notification.status).to.be.equal(Notification.STATUS_UNREAD)
expect(notification.activities).to.be.length(1)
=======
expect(notification.user.toString()).toBe(userId1.toString())
expect(notification.targetModel).toBe('Page')
expect(notification.target.toString()).toBe(targetId.toString())
expect(notification.action).toBe('COMMENT')
expect(notification.status).toBe(Notification.STATUS_UNREAD)
expect(notification.activities).toHaveLength(3)
>>>>>>>
expect(notification.user.toString()).toBe(userId2.toString())
expect(notification.targetModel).toBe('Page')
expect(notification.target.toString()).toBe(targetId.toString())
expect(notification.action).toBe('COMMENT')
expect(notification.status).toBe(Notification.STATUS_UNREAD)
expect(notification.activities).toHaveLength(1)
<<<<<<<
context('after created', () => {
before(async () => {
const activity = { _id: ObjectId(), user: ObjectId(), targetModel: 'Page', target: ObjectId(), action: 'COMMENT' }
await Notification.upsertByActivity(user, activity)
=======
describe('after created', () => {
beforeAll(async () => {
const target = ObjectId()
const sameActivityUsers = [ObjectId(), ObjectId()]
const activity = { user, targetModel: 'Page', target, action: 'COMMENT' }
await Notification.upsertByActivity(user, sameActivityUsers, activity)
>>>>>>>
describe('after created', () => {
beforeAll(async () => {
const activity = { _id: ObjectId(), user: ObjectId(), targetModel: 'Page', target: ObjectId(), action: 'COMMENT' }
await Notification.upsertByActivity(user, activity) |
<<<<<<<
import { Card } from 'reactstrap'
=======
import { translate } from 'react-i18next'
import queryString from 'query-string'
import Icon from 'components/Common/Icon'
>>>>>>>
import { Card } from 'reactstrap'
import { translate } from 'react-i18next'
import queryString from 'query-string'
import Icon from 'components/Common/Icon'
<<<<<<<
export default class SearchSuggest extends React.Component {
renderBody() {
const { searching, searchError, searchedPages, searchingKeyword } = this.props
if (searching) {
=======
class SearchSuggest extends React.Component {
constructor(props) {
super(props)
this.buildSearchUrl = this.buildSearchUrl.bind(this)
this.renderList = this.renderList.bind(this)
}
buildSearchUrl(type) {
const q = this.props.searchingKeyword
const query = queryString.stringify({ q, type })
return `/_search?${query}`
}
renderList(title, icon, type, pages) {
const { t } = this.props
return (
pages.length > 0 && (
<div className="grouped-page-list">
<h5>
<Icon name={icon} regular />
<span className="title">{title}</span>
<a className="more text-muted" href={this.buildSearchUrl(type)}>
{t('search.suggest.more')}
<Icon name="caret-right" />
</a>
</h5>
<ListView pages={pages} />
</div>
)
)
}
render() {
if (!this.props.focused) {
return <div />
}
if (this.props.searching) {
>>>>>>>
class SearchSuggest extends React.Component {
constructor(props) {
super(props)
this.buildSearchUrl = this.buildSearchUrl.bind(this)
this.renderList = this.renderList.bind(this)
}
buildSearchUrl(type) {
const q = this.props.searchingKeyword
const query = queryString.stringify({ q, type })
return `/_search?${query}`
}
getNumberOfResults() {
const { searchedPages } = this.props
const groupedPages = Object.values(searchedPages)
const sum = array => array.reduce((p, c) => p + c, 0)
return sum(groupedPages.map((r = []) => r.length))
}
renderList(title, icon, type, pages) {
const { t } = this.props
return (
pages.length > 0 && (
<div className="grouped-page-list">
<h6>
<Icon name={icon} regular />
<span className="title">{title}</span>
<a className="more text-muted" href={this.buildSearchUrl(type)}>
{t('search.suggest.more')}
<Icon name="caret-right" />
</a>
</h6>
<ListView pages={pages} />
</div>
)
)
}
renderBody() {
const { t, searching, searchError, searchedPages, searchingKeyword } = this.props
const numberOfResults = this.getNumberOfResults()
const { portalPages, publicPages, userPages } = searchedPages
if (searching) { |
<<<<<<<
Share: require('./share'),
};
=======
}
>>>>>>>
Share: require('./share'),
} |
<<<<<<<
test('convert markdown', () => {
const markdown = '# ほげほげ\n\n* aaa\n* bbb\n* ccc\n\n## ほげほげほげ\n\n[Yahoo! Japan](http://www.yahoo.co.jp/) is here\n**Bold** and *Italic*'
const markdownConverted = '\n*ほげほげ*\n\n• aaa\n• bbb\n• ccc\n\n\n*ほげほげほげ*\n\n<http://www.yahoo.co.jp/|Yahoo! Japan> is here\n**Bold** and *Italic*'
expect(slack.convertMarkdownToMrkdwn(markdown)).toBe(markdownConverted)
=======
// FIXME: Mock. Should be changed to use a real Crowi object.
crowi.config = {
data: {},
set(config) {
this.data = config
},
get() {
return this.data
},
}
it('convert markdown', function() {
var markdown = '# ほげほげ\n\n* aaa\n* bbb\n* ccc\n\n## ほげほげほげ\n\n[Yahoo! Japan](http://www.yahoo.co.jp/) is here\n**Bold** and *Italic*'
var markdownConverted = '\n*ほげほげ*\n\n• aaa\n• bbb\n• ccc\n\n\n*ほげほげほげ*\n\n<http://www.yahoo.co.jp/|Yahoo! Japan> is here\n**Bold** and *Italic*'
expect(slack.convertMarkdownToMrkdwn(markdown)).to.be.equal(markdownConverted)
>>>>>>>
test('convert markdown', () => {
// FIXME: Mock. Should be changed to use a real Crowi object.
crowi.config = {
data: {},
set(config) {
this.data = config
},
get() {
return this.data
},
}
const markdown = '# ほげほげ\n\n* aaa\n* bbb\n* ccc\n\n## ほげほげほげ\n\n[Yahoo! Japan](http://www.yahoo.co.jp/) is here\n**Bold** and *Italic*'
const markdownConverted = '\n*ほげほげ*\n\n• aaa\n• bbb\n• ccc\n\n\n*ほげほげほげ*\n\n<http://www.yahoo.co.jp/|Yahoo! Japan> is here\n**Bold** and *Italic*'
expect(slack.convertMarkdownToMrkdwn(markdown)).toBe(markdownConverted) |
<<<<<<<
import NotificationPage from './components/NotificationPage';
import HeaderNotification from './components/HeaderNotification';
=======
import PageAttachment from './components/PageAttachment';
>>>>>>>
import NotificationPage from './components/NotificationPage';
import HeaderNotification from './components/HeaderNotification';
import PageAttachment from './components/PageAttachment';
<<<<<<<
'search-top': <HeaderSearchBox />,
'search-page': <SearchPage />,
'page-list-search': <PageListSearch />,
'notification-page': <NotificationPage crowi={crowi} />,
=======
'search-top': <HeaderSearchBox crowi={crowi} />,
'search-page': <SearchPage crowi={crowi} />,
'page-list-search': <PageListSearch crowi={crowi} />,
'page-attachment': <PageAttachment pageId={pageId} pageContent={pageContent} crowi={crowi} />,
>>>>>>>
'search-top': <HeaderSearchBox crowi={crowi} />,
'search-page': <SearchPage crowi={crowi} />,
'page-list-search': <PageListSearch crowi={crowi} />,
'header-notification': <HeaderNotification me={me} crowi={crowi} />,
'notification-page': <NotificationPage crowi={crowi} />,
'page-attachment': <PageAttachment pageId={pageId} pageContent={pageContent} crowi={crowi} />,
<<<<<<<
'seen-user-list': <SeenUserList />,
'header-notification': <HeaderNotification me={me} crowi={crowi} />,
=======
'seen-user-list': <SeenUserList pageId={pageId} crowi={crowi} />,
'bookmark-button': <BookmarkButton pageId={pageId} crowi={crowi} />,
>>>>>>>
'seen-user-list': <SeenUserList pageId={pageId} crowi={crowi} />,
'bookmark-button': <BookmarkButton pageId={pageId} crowi={crowi} />, |
<<<<<<<
import SearchPage from './components/SearchPage';
import PageListSearch from './components/PageListSearch';
import NotificationPage from './components/NotificationPage';
import HeaderNotification from './components/HeaderNotification';
import SeenUserList from './components/SeenUserList';
=======
import SearchPage from './components/SearchPage';
import PageListSearch from './components/PageListSearch';
import PageHistory from './components/PageHistory';
import SeenUserList from './components/SeenUserList';
//import PageComment from './components/PageComment';
>>>>>>>
import SearchPage from './components/SearchPage';
import PageListSearch from './components/PageListSearch';
import PageHistory from './components/PageHistory';
import NotificationPage from './components/NotificationPage';
import HeaderNotification from './components/HeaderNotification';
import SeenUserList from './components/SeenUserList';
//import PageComment from './components/PageComment';
<<<<<<<
'notification-page': <NotificationPage />,
=======
//'revision-history': <PageHistory pageId={pageId} />,
>>>>>>>
'notification-page': <NotificationPage />,
//'revision-history': <PageHistory pageId={pageId} />, |
<<<<<<<
async apiGet(path, params) {
return await this.apiRequest('get', path, {params: params});
=======
apiGet(path, params) {
return this.apiRequest('get', path, { params: params })
>>>>>>>
async apiGet(path, params) {
return await this.apiRequest('get', path, { params: params }) |
<<<<<<<
const { encodeSpace } = require('../util/path')
=======
const { parseAccessToken } = require('./accessTokenParser')
>>>>>>>
const { encodeSpace } = require('../util/path')
const { parseAccessToken } = require('./accessTokenParser')
<<<<<<<
/**
* Extract Bearer token from Authorization header.
*
* @param {object} headers HTTP request headers
* @param {string} headers.authorization Authorization header value.
* @return {?string} found access_token or null.
*/
const extractBearerToken = headers => {
const v = headers.authorization
if (!v) {
return null
}
const parts = v
.trim()
.replace(/( )+/g, ' ')
.split(' ')
if (parts.length !== 2 || parts[0] !== 'Bearer') {
return null
}
return parts[1]
}
=======
>>>>>>> |
<<<<<<<
const shareData = await self
.findOne(query)
.populate([
...optionalDocs,
{ path: 'page' },
{
path: 'creator',
select: User.USER_PUBLIC_FIELDS,
},
])
.exec()
=======
const shareData = await this.findOne(query)
.populate([...optionalDocs, { path: 'page' }, { path: 'creator' }])
.exec((err, shareData) => {
if (err) {
throw err
}
return shareData
})
>>>>>>>
const shareData = await this.findOne(query)
.findOne(query)
.populate([...optionalDocs, { path: 'page' }, { path: 'creator' }])
.exec() |
<<<<<<<
Share: require('./share'),
Tracking: require('./tracking'),
ShareAccess: require('./shareAccess'),
}
=======
Activity: require('./activity'),
Notification: require('./notification'),
NotificationStatus: require('./notificationStatus'),
};
>>>>>>>
Share: require('./share'),
Tracking: require('./tracking'),
ShareAccess: require('./shareAccess'),
Activity: require('./activity'),
Notification: require('./notification'),
NotificationStatus: require('./notificationStatus'),
} |
<<<<<<<
bundled: ['jquery', 'bootstrap-sass', 'inline-attachment/src/inline-attachment.js', 'jquery.cookie', 'jquery.selection.js', '@babel/polyfill'],
=======
bundled: [
'jquery',
'bootstrap/dist/js/bootstrap.bundle.min.js',
'inline-attachment/src/inline-attachment.js',
'jquery.cookie',
'jquery.selection.js',
'babel-polyfill',
],
>>>>>>>
bundled: ['jquery', 'bootstrap/dist/js/bootstrap.bundle.min.js', 'inline-attachment/src/inline-attachment.js', 'jquery.cookie', 'jquery.selection.js', '@babel/polyfill'], |
<<<<<<<
var multer = require('multer')
var uploads = multer({ dest: crowi.tmpDir + 'uploads' })
var form = require('../form')
var page = require('./page')(crowi, app)
var login = require('./login')(crowi, app)
var logout = require('./logout')(crowi, app)
var me = require('./me')(crowi, app)
var admin = require('./admin')(crowi, app)
var installer = require('./installer')(crowi, app)
var user = require('./user')(crowi, app)
var attachment = require('./attachment')(crowi, app)
var comment = require('./comment')(crowi, app)
var bookmark = require('./bookmark')(crowi, app)
var revision = require('./revision')(crowi, app)
var search = require('./search')(crowi, app)
var share = require('./share')(crowi, app)
var shareAccess = require('./shareAccess')(crowi, app)
var backlink = require('./backlink')(crowi, app)
var loginRequired = middleware.loginRequired
var fileAccessRightOrLoginRequired = middleware.fileAccessRightOrLoginRequired(crowi, app)
var accessTokenParser = middleware.accessTokenParser(crowi, app)
var csrf = middleware.csrfVerify(crowi, app)
app.get('/', loginRequired(crowi, app), page.pageListShow)
app.get('/installer', middleware.applicationNotInstalled(), installer.index)
app.post('/installer/createAdmin', middleware.applicationNotInstalled(), form.register, csrf, installer.createAdmin)
// app.post('/installer/user' , middleware.applicationNotInstalled() , installer.createFirstUser);
app.get('/login/error/:reason', login.error)
app.get('/login', middleware.applicationInstalled(), login.login)
app.get('/login/invited', login.invited)
app.post('/login/activateInvited', form.invited, csrf, login.invited)
app.post('/login', form.login, csrf, login.login)
app.post('/register', form.register, csrf, login.register)
app.get('/register', middleware.applicationInstalled(), login.register)
app.get('/register/google', login.registerGoogle)
app.post('/register/google', login.registerGoogle)
app.get('/register/github', login.registerGitHub)
app.post('/register/github', login.registerGitHub)
app.get('/google/callback', login.googleCallback)
app.get('/github/callback', login.githubCallback)
app.get('/login/google', login.loginGoogle)
app.get('/login/github', login.loginGitHub)
app.get('/logout', logout.logout)
app.get('/admin', loginRequired(crowi, app), middleware.adminRequired(), admin.index)
app.get('/admin/app', loginRequired(crowi, app), middleware.adminRequired(), admin.app.index)
app.post('/_api/admin/settings/app', loginRequired(crowi, app), middleware.adminRequired(), csrf, form.admin.app, admin.api.appSetting)
app.post('/_api/admin/settings/sec', loginRequired(crowi, app), middleware.adminRequired(), form.admin.sec, admin.api.appSetting)
app.post('/_api/admin/settings/mail', loginRequired(crowi, app), middleware.adminRequired(), csrf, form.admin.mail, admin.api.appSetting)
app.post('/_api/admin/settings/aws', loginRequired(crowi, app), middleware.adminRequired(), csrf, form.admin.aws, admin.api.appSetting)
app.post('/_api/admin/settings/google', loginRequired(crowi, app), middleware.adminRequired(), csrf, form.admin.google, admin.api.appSetting)
app.post('/_api/admin/settings/github', loginRequired(crowi, app), middleware.adminRequired(), csrf, form.admin.github, admin.api.appSetting)
app.post('/_api/admin/settings/share', loginRequired(crowi, app), middleware.adminRequired(), csrf, form.admin.share, admin.api.appSetting)
=======
, multer = require('multer')
, uploads = multer({dest: crowi.tmpDir + 'uploads'})
, form = require('../form')
, page = require('./page')(crowi, app)
, login = require('./login')(crowi, app)
, logout = require('./logout')(crowi, app)
, me = require('./me')(crowi, app)
, admin = require('./admin')(crowi, app)
, installer = require('./installer')(crowi, app)
, user = require('./user')(crowi, app)
, attachment= require('./attachment')(crowi, app)
, comment = require('./comment')(crowi, app)
, bookmark = require('./bookmark')(crowi, app)
, revision = require('./revision')(crowi, app)
, search = require('./search')(crowi, app)
, notification = require('./notification')(crowi, app)
, loginRequired = middleware.loginRequired
, accessTokenParser = middleware.accessTokenParser(crowi, app)
, csrf = middleware.csrfVerify(crowi, app)
;
app.get('/' , loginRequired(crowi, app) , page.pageListShow);
app.get('/installer' , middleware.applicationNotInstalled() , installer.index);
app.post('/installer/createAdmin' , middleware.applicationNotInstalled() , form.register , csrf, installer.createAdmin);
//app.post('/installer/user' , middleware.applicationNotInstalled() , installer.createFirstUser);
app.get('/login/error/:reason' , login.error);
app.get('/login' , middleware.applicationInstalled() , login.login);
app.get('/login/invited' , login.invited);
app.post('/login/activateInvited' , form.invited , csrf, login.invited);
app.post('/login' , form.login , csrf, login.login);
app.post('/register' , form.register , csrf, login.register);
app.get('/register' , middleware.applicationInstalled() , login.register);
app.post('/register/google' , login.registerGoogle);
app.get('/google/callback' , login.googleCallback);
app.get('/login/google' , login.loginGoogle);
app.get('/logout' , logout.logout);
app.get('/admin' , loginRequired(crowi, app) , middleware.adminRequired() , admin.index);
app.get('/admin/app' , loginRequired(crowi, app) , middleware.adminRequired() , admin.app.index);
app.post('/_api/admin/settings/app' , loginRequired(crowi, app) , middleware.adminRequired() , csrf, form.admin.app, admin.api.appSetting);
app.post('/_api/admin/settings/sec' , loginRequired(crowi, app) , middleware.adminRequired() , form.admin.sec, admin.api.appSetting);
app.post('/_api/admin/settings/mail' , loginRequired(crowi, app) , middleware.adminRequired() , csrf, form.admin.mail, admin.api.appSetting);
app.post('/_api/admin/settings/aws' , loginRequired(crowi, app) , middleware.adminRequired() , csrf, form.admin.aws, admin.api.appSetting);
app.post('/_api/admin/settings/google', loginRequired(crowi, app) , middleware.adminRequired() , csrf, form.admin.google, admin.api.appSetting);
>>>>>>>
var multer = require('multer')
var uploads = multer({ dest: crowi.tmpDir + 'uploads' })
var form = require('../form')
var page = require('./page')(crowi, app)
var login = require('./login')(crowi, app)
var logout = require('./logout')(crowi, app)
var me = require('./me')(crowi, app)
var admin = require('./admin')(crowi, app)
var installer = require('./installer')(crowi, app)
var user = require('./user')(crowi, app)
var attachment = require('./attachment')(crowi, app)
var comment = require('./comment')(crowi, app)
var bookmark = require('./bookmark')(crowi, app)
var revision = require('./revision')(crowi, app)
var search = require('./search')(crowi, app)
var share = require('./share')(crowi, app)
var shareAccess = require('./shareAccess')(crowi, app)
var notification = require('./notification')(crowi, app)
var backlink = require('./backlink')(crowi, app)
var loginRequired = middleware.loginRequired
var fileAccessRightOrLoginRequired = middleware.fileAccessRightOrLoginRequired(crowi, app)
var accessTokenParser = middleware.accessTokenParser(crowi, app)
var csrf = middleware.csrfVerify(crowi, app)
app.get('/', loginRequired(crowi, app), page.pageListShow)
app.get('/installer', middleware.applicationNotInstalled(), installer.index)
app.post('/installer/createAdmin', middleware.applicationNotInstalled(), form.register, csrf, installer.createAdmin)
// app.post('/installer/user' , middleware.applicationNotInstalled() , installer.createFirstUser);
app.get('/login/error/:reason', login.error)
app.get('/login', middleware.applicationInstalled(), login.login)
app.get('/login/invited', login.invited)
app.post('/login/activateInvited', form.invited, csrf, login.invited)
app.post('/login', form.login, csrf, login.login)
app.post('/register', form.register, csrf, login.register)
app.get('/register', middleware.applicationInstalled(), login.register)
app.get('/register/google', login.registerGoogle)
app.post('/register/google', login.registerGoogle)
app.get('/register/github', login.registerGitHub)
app.post('/register/github', login.registerGitHub)
app.get('/google/callback', login.googleCallback)
app.get('/github/callback', login.githubCallback)
app.get('/login/google', login.loginGoogle)
app.get('/login/github', login.loginGitHub)
app.get('/logout', logout.logout)
app.get('/admin', loginRequired(crowi, app), middleware.adminRequired(), admin.index)
app.get('/admin/app', loginRequired(crowi, app), middleware.adminRequired(), admin.app.index)
app.post('/_api/admin/settings/app', loginRequired(crowi, app), middleware.adminRequired(), csrf, form.admin.app, admin.api.appSetting)
app.post('/_api/admin/settings/sec', loginRequired(crowi, app), middleware.adminRequired(), form.admin.sec, admin.api.appSetting)
app.post('/_api/admin/settings/mail', loginRequired(crowi, app), middleware.adminRequired(), csrf, form.admin.mail, admin.api.appSetting)
app.post('/_api/admin/settings/aws', loginRequired(crowi, app), middleware.adminRequired(), csrf, form.admin.aws, admin.api.appSetting)
app.post('/_api/admin/settings/google', loginRequired(crowi, app), middleware.adminRequired(), csrf, form.admin.google, admin.api.appSetting)
app.post('/_api/admin/settings/github', loginRequired(crowi, app), middleware.adminRequired(), csrf, form.admin.github, admin.api.appSetting)
app.post('/_api/admin/settings/share', loginRequired(crowi, app), middleware.adminRequired(), csrf, form.admin.share, admin.api.appSetting)
<<<<<<<
app.get('/admin/share', loginRequired(crowi, app), middleware.adminRequired(), admin.share.index)
=======
app.get('/me' , loginRequired(crowi, app) , me.index);
app.get('/me/password' , loginRequired(crowi, app) , me.password);
app.get('/me/apiToken' , loginRequired(crowi, app) , me.apiToken);
app.get('/me/notifications' , loginRequired(crowi, app) , me.notifications);
app.post('/me' , form.me.user , loginRequired(crowi, app) , me.index);
app.post('/me/password' , form.me.password , loginRequired(crowi, app) , me.password);
app.post('/me/apiToken' , form.me.apiToken , loginRequired(crowi, app) , me.apiToken);
app.post('/me/picture/delete' , loginRequired(crowi, app) , me.deletePicture);
app.post('/me/auth/google' , loginRequired(crowi, app) , me.authGoogle);
app.get( '/me/auth/google/callback' , loginRequired(crowi, app) , me.authGoogleCallback);
>>>>>>>
app.get('/admin/share', loginRequired(crowi, app), middleware.adminRequired(), admin.share.index)
<<<<<<<
app.get('/:id([0-9a-z]{24})', loginRequired(crowi, app), page.api.redirector)
app.get('/_r/:id([0-9a-z]{24})', loginRequired(crowi, app), page.api.redirector) // alias
app.get('/files/:id([0-9a-z]{24})', fileAccessRightOrLoginRequired, attachment.api.redirector)
=======
app.get( '/_notifications' , accessTokenParser, loginRequired(crowi, app) , notification.notificationPage);
app.get( '/_api/notification.list' , accessTokenParser , loginRequired(crowi, app) , notification.api.list);
app.post('/_api/notification.read' , accessTokenParser , loginRequired(crowi, app) , notification.api.read);
app.get( '/_api/notification.status', accessTokenParser , loginRequired(crowi, app) , notification.api.status);
app.post('/_api/notification.status_read', accessTokenParser , loginRequired(crowi, app) , notification.api.statusRead);
app.get( '/_api/check_username' , user.api.checkUsername);
app.post('/_api/me/picture/upload' , loginRequired(crowi, app) , uploads.single('userPicture'), me.api.uploadPicture);
app.get( '/_api/user/bookmarks' , loginRequired(crowi, app) , user.api.bookmarks);
>>>>>>>
app.get('/:id([0-9a-z]{24})', loginRequired(crowi, app), page.api.redirector)
app.get('/_r/:id([0-9a-z]{24})', loginRequired(crowi, app), page.api.redirector) // alias
app.get('/files/:id([0-9a-z]{24})', fileAccessRightOrLoginRequired, attachment.api.redirector)
app.get('/_notifications', accessTokenParser, loginRequired(crowi, app), notification.notificationPage)
app.get('/_api/notification.list', accessTokenParser, loginRequired(crowi, app), notification.api.list)
app.post('/_api/notification.read', accessTokenParser, loginRequired(crowi, app), notification.api.read)
app.get('/_api/notification.status', accessTokenParser, loginRequired(crowi, app), notification.api.status)
app.post('/_api/notification.status_read', accessTokenParser, loginRequired(crowi, app), notification.api.statusRead) |
<<<<<<<
/**
* Bulk get (for internal only)
*/
pageSchema.statics.getStreamOfFindAll = function(options) {
var Page = this
, options = options || {}
, publicOnly = options.publicOnly || true
, criteria = {redirectTo: null,}
;
if (publicOnly) {
criteria.grant = GRANT_PUBLIC;
}
return this.find(criteria)
.populate([
{path: 'creator', model: 'User'},
{path: 'revision', model: 'Revision'},
])
.sort({updatedAt: -1})
.stream();
};
=======
/**
* findListByStartWith
*
* If `path` has `/` at the end, returns '{path}/*' and '{path}' self.
* If `path` doesn't have `/` at the end, returns '{path}*'
* e.g.
*/
>>>>>>>
/**
* Bulk get (for internal only)
*/
pageSchema.statics.getStreamOfFindAll = function(options) {
var Page = this
, options = options || {}
, publicOnly = options.publicOnly || true
, criteria = {redirectTo: null,}
;
if (publicOnly) {
criteria.grant = GRANT_PUBLIC;
}
return this.find(criteria)
.populate([
{path: 'creator', model: 'User'},
{path: 'revision', model: 'Revision'},
])
.sort({updatedAt: -1})
.stream();
};
/**
* findListByStartWith
*
* If `path` has `/` at the end, returns '{path}/*' and '{path}' self.
* If `path` doesn't have `/` at the end, returns '{path}*'
* e.g.
*/ |
<<<<<<<
const DEFAULT_THEME = 'substrate';
=======
const ENV = process.env.NODE_ENV || 'development';
>>>>>>>
const DEFAULT_THEME = 'substrate';
const ENV = process.env.NODE_ENV || 'development'; |
<<<<<<<
this.collectStatsStartTime = Date.now();
call.gatherStats(call.pc1, this.analyzeStats_.bind(this), this.encoderSetupTime_.bind(this), 100);
setTimeoutWithProgressBar(function() {
=======
call.gatherStats(call.pc1, this.analyzeStats_.bind(this), 1000);
setTimeoutWithProgressBar(function() {
>>>>>>>
this.collectStatsStartTime = Date.now();
call.gatherStats(call.pc1, this.analyzeStats_.bind(this), 1000);
setTimeoutWithProgressBar(function() { |
<<<<<<<
var endTime = null;
var webSocket;
=======
var signalingReady = false;
var socket;
var started = false;
>>>>>>>
var webSocket;
<<<<<<<
=======
var prevStats;
var turnDone = false;
var xmlhttp;
>>>>>>>
var prevStats; |
<<<<<<<
}
// Start shims for fullscreen
document.cancelFullScreen = document.webkitCancelFullScreen ||
document.mozCancelFullScreen || document.cancelFullScreen;
document.body.requestFullScreen = document.body.webkitRequestFullScreen ||
document.body.mozRequestFullScreen || document.body.requestFullScreen;
document.onfullscreenchange = document.onwebkitfullscreenchange = document.onmozfullscreenchange;
function isFullScreen(){
return !!(document.webkitIsFullScreen || document.mozFullScreen ||
document.isFullScreen); // if any defined and true
}
function fullScreenElement(){
return document.webkitFullScreenElement || document.webkitCurrentFullScreenElement ||
document.mozFullScreenElement || document.fullScreenElement;
}
// End shims for fullscreen
=======
}
// Return a random numerical string.
function randomString(strLength) {
var result = [];
strLength = strLength || 5;
var charSet = '0123456789';
while (strLength--) {
result.push(charSet.charAt(Math.floor(Math.random() * charSet.length)));
}
return result.join('');
}
>>>>>>>
}
// Start shims for fullscreen
document.cancelFullScreen = document.webkitCancelFullScreen ||
document.mozCancelFullScreen || document.cancelFullScreen;
document.body.requestFullScreen = document.body.webkitRequestFullScreen ||
document.body.mozRequestFullScreen || document.body.requestFullScreen;
document.onfullscreenchange = document.onwebkitfullscreenchange = document.onmozfullscreenchange;
function isFullScreen(){
return !!(document.webkitIsFullScreen || document.mozFullScreen ||
document.isFullScreen); // if any defined and true
}
function fullScreenElement(){
return document.webkitFullScreenElement || document.webkitCurrentFullScreenElement ||
document.mozFullScreenElement || document.fullScreenElement;
}
// End shims for fullscreen
// Return a random numerical string.
function randomString(strLength) {
var result = [];
strLength = strLength || 5;
var charSet = '0123456789';
while (strLength--) {
result.push(charSet.charAt(Math.floor(Math.random() * charSet.length)));
}
return result.join('');
} |
<<<<<<<
const {direction, width, height, wrapAfter} = options
=======
const {direction, width, height, scale = 1} = options
>>>>>>>
const {direction, width, height, wrapAfter, scale = 1} = options
<<<<<<<
let row, col
if (typeof wrapAfter === 'undefined') {
row = isHorizontal ? 0 : frame
col = isHorizontal ? frame : 0
} else {
row = isHorizontal ? Math.floor(frame / wrapAfter) : frame % wrapAfter
col = isHorizontal ? frame % wrapAfter : Math.floor(frame / wrapAfter)
}
const _width = -width * col
const _height = -height * row
return `${_width}px ${_height}px`
=======
const _width = (isHorizontal ? width * frame : 0) / scale
const _height = (!isHorizontal ? height * frame : 0) / scale
return `${!_width ? _width : `-${_width}`}px ${!_height ? _height : `-${_height}`}px`
>>>>>>>
let row, col
if (typeof wrapAfter === 'undefined') {
row = isHorizontal ? 0 : frame
col = isHorizontal ? frame : 0
} else {
row = isHorizontal ? Math.floor(frame / wrapAfter) : frame % wrapAfter
col = isHorizontal ? frame % wrapAfter : Math.floor(frame / wrapAfter)
}
const _width = -width * col / scale
const _height = -height * row / scale
return `${_width}px ${_height}px` |
<<<<<<<
/*
* Copyright (c) 2017 American Express Travel Related Services Company, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
=======
const merge = require('lodash/merge');
const chalk = require('chalk');
>>>>>>>
/*
* Copyright (c) 2017 American Express Travel Related Services Company, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
const merge = require('lodash/merge');
const chalk = require('chalk'); |
<<<<<<<
$('#pixel-viewer-interactive-show-pixel-fill').change(function() {
scroller.finishPullToRefresh();
});
=======
// Caches data about the image
function init_cache(width, height){
piccache = Array()
ctx = source_canvas.getContext('2d');
for (var col = 0; col<width; col++){
next_col = Array(height)
piccache.push(next_col)
}
}
function get_pixel_data(col, row){
if (piccache.length <= col || piccache[col].length <= row){
// If we're looking outside the range of the size of picture just make it white
return [255,255,255]
}
if (piccache[col][row] == null){
// Otherwise if we haven't already cached this then cache it
piccache[col][row] = source_canvas.getContext('2d').getImageData(col, row, 1, 1).data;
}
// Return the value from the cache
return piccache[col][row];
}
>>>>>>>
$('#pixel-viewer-interactive-show-pixel-fill').change(function() {
scroller.finishPullToRefresh();
});
// Caches data about the image
function init_cache(width, height){
piccache = Array()
ctx = source_canvas.getContext('2d');
for (var col = 0; col<width; col++){
next_col = Array(height)
piccache.push(next_col)
}
}
function get_pixel_data(col, row){
if (piccache.length <= col || piccache[col].length <= row){
// If we're looking outside the range of the size of picture just make it white
return [255,255,255]
}
if (piccache[col][row] == null){
// Otherwise if we haven't already cached this then cache it
piccache[col][row] = source_canvas.getContext('2d').getImageData(col, row, 1, 1).data;
}
// Return the value from the cache
return piccache[col][row];
}
<<<<<<<
locking: false,
=======
animating: false,
locking: true,
>>>>>>>
locking: false,
animating: false,
<<<<<<<
var show_pixel_fill = document.getElementById('pixel-viewer-interactive-show-pixel-fill').checked;
var pixelData = source_canvas.getContext('2d').getImageData(col, row, 1, 1).data;
if (show_pixel_fill) {
context.fillStyle = 'rgb('+pixelData[0]+','+pixelData[1]+','+pixelData[2]+')';
context.fillRect(Math.round(left), Math.round(top), Math.round(width)+1, Math.round(height)+1);
} else {
context.strokeRect(Math.round(left), Math.round(top), Math.round(width)+1, Math.round(height)+1);
}
=======
var pixelData;
if (null != filter){
pixelData = filter(col, row);
}
else {
pixelData = get_pixel_data(col, row);
}
context.fillStyle = 'rgb('+pixelData[0]+','+pixelData[1]+','+pixelData[2]+')';
context.fillRect(Math.round(left), Math.round(top), Math.round(width)+1, Math.round(height)+1);
>>>>>>>
var show_pixel_fill = document.getElementById('pixel-viewer-interactive-show-pixel-fill').checked;
var pixelData;
if (filter != null){
pixelData = filter(col, row);
}
else {
pixelData = get_pixel_data(col, row);
}
if (show_pixel_fill) {
context.fillStyle = 'rgb('+pixelData[0]+','+pixelData[1]+','+pixelData[2]+')';
context.fillRect(Math.round(left), Math.round(top), Math.round(width)+1, Math.round(height)+1);
} else {
context.strokeRect(Math.round(left), Math.round(top), Math.round(width)+1, Math.round(height)+1);
} |
<<<<<<<
import { GL, WEBGL_INFO } from "./constants";
import { Query } from "./query";
=======
import { GL } from "./constants.js";
import { Query } from "./query.js";
>>>>>>>
import { GL, WEBGL_INFO } from "./constants.js";
import { Query } from "./query.js"; |
<<<<<<<
import { GL, WEBGL_INFO } from "./constants";
import { Shader } from "./shader";
import {
=======
import { GL } from "./constants.js";
import { Shader } from "./shader.js";
import {
>>>>>>>
import { GL, WEBGL_INFO } from "./constants.js";
import { Shader } from "./shader.js";
import { |
<<<<<<<
const allTags = [...totalAgg.archs, ...db.archetypes.map(arch => arch.name)];
=======
const totalAgg = getLocalState().totalAgg;
const allTags = [
...totalAgg.archs.filter(arch => arch !== NO_ARCH && arch !== DEFAULT_ARCH),
...db.archetypes.map(arch => arch.name)
];
>>>>>>>
const allTags = [
...totalAgg.archs.filter(arch => arch !== NO_ARCH && arch !== DEFAULT_ARCH),
...db.archetypes.map(arch => arch.name)
]; |
<<<<<<<
import Aggregator from "./aggregator";
import FilterPanel from "./FilterPanel";
=======
import Aggregator, { dateMaxValid } from "./aggregator";
import FilterPanel from "./filter-panel";
>>>>>>>
import Aggregator, { dateMaxValid } from "./aggregator";
import FilterPanel from "./FilterPanel"; |
<<<<<<<
function changePriority(previous, current, time) {
globals.currentMatch.priorityTimers[previous] +=
time - globals.currentMatch.lastPriorityChangeTime;
globals.currentMatch.lastPriorityChangeTime = time;
globals.currentMatch.priorityTimers[0] =
globals.currentMatch.lastPriorityChangeTime;
globals.currentMatch.currentPriority = current;
//console.log(priorityTimers);
//console.log("since match begin:", time - matchBeginTime);
ipc_send(
"set_priority_timer",
globals.currentMatch.priorityTimers,
IPC_OVERLAY
);
}
const actionLogGenerateLink = function(grpId) {
var card = db.card(grpId);
return '<log-card id="' + grpId + '">' + card.name + "</log-card>";
};
const actionLogGenerateAbilityLink = function(abId) {
return `<log-ability id="${abId}">ability</log-ability>`;
};
=======
const cardTypes = [
//"CardType_None",
"CardType_Artifact",
"CardType_Creature",
"CardType_Enchantment",
"CardType_Instant",
"CardType_Land",
//"CardType_Phenomenon",
//"CardType_Plane",
"CardType_Planeswalker",
//"CardType_Scheme",
"CardType_Sorcery"
//"CardType_Tribal",
//"CardType_Vanguard",
];
>>>>>>>
function changePriority(previous, current, time) {
globals.currentMatch.priorityTimers[previous] +=
time - globals.currentMatch.lastPriorityChangeTime;
globals.currentMatch.lastPriorityChangeTime = time;
globals.currentMatch.priorityTimers[0] =
globals.currentMatch.lastPriorityChangeTime;
globals.currentMatch.currentPriority = current;
//console.log(priorityTimers);
//console.log("since match begin:", time - matchBeginTime);
ipc_send(
"set_priority_timer",
globals.currentMatch.priorityTimers,
IPC_OVERLAY
);
}
const actionLogGenerateLink = function(grpId) {
var card = db.card(grpId);
return '<log-card id="' + grpId + '">' + card.name + "</log-card>";
};
const actionLogGenerateAbilityLink = function(abId) {
return `<log-ability id="${abId}">ability</log-ability>`;
};
const cardTypes = [
//"CardType_None",
"CardType_Artifact",
"CardType_Creature",
"CardType_Enchantment",
"CardType_Instant",
"CardType_Land",
//"CardType_Phenomenon",
//"CardType_Plane",
"CardType_Planeswalker",
//"CardType_Scheme",
"CardType_Sorcery"
//"CardType_Tribal",
//"CardType_Vanguard",
];
<<<<<<<
globals.currentMatch.playerCardsUsed = getPlayerUsedCards();
globals.currentMatch.oppCardsUsed = getOppUsedCards();
=======
currentMatch.cardTypesByZone = getCardsTypeZone();
currentMatch.playerCardsUsed = getPlayerUsedCards();
currentMatch.oppCardsUsed = getOppUsedCards();
>>>>>>>
globals.currentMatch.cardTypesByZone = getCardsTypeZone();
globals.currentMatch.playerCardsUsed = getPlayerUsedCards();
globals.currentMatch.oppCardsUsed = getOppUsedCards();
<<<<<<<
globals.currentMatch.playerCardsUsed = getPlayerUsedCards();
globals.currentMatch.oppCardsUsed = globals.currentMatch.opponent.cards.concat(
=======
currentMatch.cardTypesByZone = getCardsTypeZone();
currentMatch.playerCardsUsed = getPlayerUsedCards();
currentMatch.oppCardsUsed = currentMatch.opponent.cards.concat(
>>>>>>>
globals.currentMatch.playerCardsUsed = getPlayerUsedCards();
globals.currentMatch.cardTypesByZone = getCardsTypeZone();
globals.currentMatch.oppCardsUsed = globals.currentMatch.opponent.cards.concat(
<<<<<<<
globals.currentMatch.playerCardsUsed = getPlayerUsedCards();
globals.currentMatch.oppCardsUsed = globals.currentMatch.opponent.cards.concat(
=======
currentMatch.cardTypesByZone = getCardsTypeZone();
currentMatch.playerCardsUsed = getPlayerUsedCards();
currentMatch.oppCardsUsed = currentMatch.opponent.cards.concat(
>>>>>>>
globals.currentMatch.cardTypesByZone = getCardsTypeZone();
globals.currentMatch.playerCardsUsed = getPlayerUsedCards();
globals.currentMatch.oppCardsUsed = currentMatch.opponent.cards.concat(
<<<<<<<
globals.currentMatch.gameStage = "GameStage_Start";
globals.currentMatch.opponent.cards = globals.currentMatch.oppCardsUsed;
globals.currentMatch.processedAnnotations = [];
globals.currentMatch.timers = {};
globals.currentMatch.zones = {};
globals.currentMatch.players = {};
globals.currentMatch.annotations = [];
globals.currentMatch.gameObjs = {};
globals.currentMatch.gameInfo = {};
globals.currentMatch.turnInfo = {};
globals.currentMatch.playerCardsUsed = [];
globals.currentMatch.oppCardsUsed = [];
globals.initialLibraryInstanceIds = [];
globals.idChanges = {};
globals.instanceToCardIdMap = {};
=======
currentMatch.gameStage = "GameStage_Start";
currentMatch.opponent.cards = currentMatch.oppCardsUsed;
currentMatch.processedAnnotations = [];
currentMatch.timers = {};
currentMatch.zones = {};
currentMatch.players = {};
currentMatch.annotations = [];
currentMatch.gameObjs = {};
currentMatch.gameInfo = {};
currentMatch.turnInfo = {};
currentMatch.playerCardsUsed = [];
currentMatch.oppCardsUsed = [];
currentMatch.cardTypesByZone = [];
initialLibraryInstanceIds = [];
idChanges = {};
instanceToCardIdMap = {};
>>>>>>>
globals.currentMatch.gameStage = "GameStage_Start";
globals.currentMatch.opponent.cards = globals.currentMatch.oppCardsUsed;
globals.currentMatch.processedAnnotations = [];
globals.currentMatch.timers = {};
globals.currentMatch.zones = {};
globals.currentMatch.players = {};
globals.currentMatch.annotations = [];
globals.currentMatch.gameObjs = {};
globals.currentMatch.gameInfo = {};
globals.currentMatch.turnInfo = {};
globals.currentMatch.playerCardsUsed = [];
globals.currentMatch.oppCardsUsed = [];
globals.initialLibraryInstanceIds = [];
globals.idChanges = {};
globals.instanceToCardIdMap = {}; |
<<<<<<<
ipc.on("player_data_updated", () => {
if (sidebarActive !== MAIN_LOGIN) {
updateTopBar();
}
});
//
=======
>>>>>>> |
<<<<<<<
=======
div.appendTo(wrap_r);
$("#ux_0").append(wrap_l);
$("#ux_0").append(wrap_r);
$(".ss" + openSection).show();
$(".sn" + openSection).addClass("nav_selected");
$(".resetOverlayPos").click(function() {
ipcSend("reset_overlay_pos", true);
});
$(".top_logo_about").click(function() {
shell.openExternal("https://mtgatool.com");
});
$(".twitter_link").click(function() {
shell.openExternal("https://twitter.com/MEtchegaray7");
});
$(".discord_link").click(function() {
shell.openExternal("https://discord.gg/K9bPkJy");
});
$(".git_link").click(function() {
shell.openExternal("https://github.com/Manuel-777/MTG-Arena-Tool");
});
$(".release_notes_link").click(function() {
shell.openExternal("https://mtgatool.com/release-notes/");
});
$(".donate_link").click(function() {
shell.openExternal("https://www.paypal.me/ManuelEtchegaray/10");
});
$(".login_link_about").click(function() {
const clearAppSettings = {
remember_me: false,
auto_login: false,
launch_to_tray: false
};
ipcSend("save_app_settings", clearAppSettings);
remote.app.relaunch();
remote.app.exit(0);
});
$(".update_link_about").click(function() {
ipcSend("updates_check", true);
});
$(".settings_nav").click(function() {
if (!$(this).hasClass("nav_selected")) {
$(".settings_nav").each(function() {
$(this).removeClass("nav_selected");
});
$(".settings_section").each(function() {
$(this).hide();
});
$(this).addClass("nav_selected");
if ($(this).hasClass("sn1")) {
lastSettingsSection = 1;
$(".ss1").show();
}
if ($(this).hasClass("sn2")) {
lastSettingsSection = 2;
$(".ss2").show();
}
if ($(this).hasClass("sn3")) {
lastSettingsSection = 3;
$(".ss3").show();
}
if ($(this).hasClass("sn4")) {
lastSettingsSection = 4;
$(".ss4").show();
}
if ($(this).hasClass("sn5")) {
lastSettingsSection = 5;
$(".ss5").show();
}
if ($(this).hasClass("sn6")) {
lastSettingsSection = 6;
$(".ss6").show();
}
}
});
url_input.on("keyup", function(e) {
if (e.keyCode === 13) {
updateUserSettings();
}
});
url_input.on("focusout", function() {
updateUserSettings();
});
export_input.on("keyup", function(e) {
if (e.keyCode === 13) {
updateUserSettings();
}
});
export_input.on("focusout", function() {
updateUserSettings();
});
$(".sliderA").off();
$(".sliderA").on("click mousemove", function() {
const cardSize = 100 + Math.round(parseInt(this.value)) * 10;
sliderlabel.html("Cards size: " + cardSize + "px");
$(".inventory_card_settings").css("width", "");
let styles = $(".inventory_card_settings").attr("style");
styles += "width: " + cardSize + "px !important;";
$(".inventory_card_settings").attr("style", styles);
$(".inventory_card_settings_img").css("width", "");
styles = $(".inventory_card_settings_img").attr("style");
styles += "width: " + cardSize + "px !important;";
$(".inventory_card_settings_img").attr("style", styles);
});
$(".sliderA").on("click mouseup", function() {
updateUserSettingsBlend({ cards_size: Math.round(parseInt(this.value)) });
});
$(".sliderB").off();
$(".sliderB").on("click mousemove", function() {
const overlayAlpha = alphaFromTransparency(parseInt(this.value));
sliderOpacityLabel.html(
"Elements transparency: " + transparencyFromAlpha(overlayAlpha) + "%"
);
});
$(".sliderB").on("click mouseup", function() {
updateUserSettingsBlend({
overlay_alpha: alphaFromTransparency(parseInt(this.value))
});
});
$(".sliderC").off();
$(".sliderC").on("click mousemove", function() {
const overlayAlphaBack = alphaFromTransparency(parseInt(this.value));
sliderOpacityBackLabel.html(
"Background transparency: " +
transparencyFromAlpha(overlayAlphaBack) +
"%"
);
});
$(".sliderC").on("click mouseup", function() {
updateUserSettingsBlend({
overlay_alpha_back: alphaFromTransparency(parseInt(this.value))
});
});
$(".sliderD").off();
$(".sliderD").on("click mousemove", function() {
sliderScaleLabel.html("Scale: " + parseInt(this.value) + "%");
});
$(".sliderD").on("click mouseup", function() {
updateUserSettingsBlend({
overlay_scale: parseInt(this.value)
});
});
$(".sliderSoundVolume").off();
$(".sliderSoundVolume").on("click mousemove", function() {
const volume = Math.round(this.value * 100);
sliderSoundVolumeLabel.html("Volume: " + volume + "%");
});
$(".sliderSoundVolume").on("click mouseup", function() {
let { Howl, Howler } = require("howler");
let sound = new Howl({ src: ["../sounds/blip.mp3"] });
Howler.volume(this.value);
sound.play();
updateUserSettingsBlend({
sound_priority_volume: this.value
});
});
>>>>>>> |
<<<<<<<
=======
const DATE_LAST_30 = "Last 30 Days";
const DATE_SEASON = "Current Season";
const DATE_ALL_TIME = "All Time";
const NO_ARCH = "No Archetype";
>>>>>>>
const NO_ARCH = "No Archetype";
<<<<<<<
=======
Aggregator.DATE_LAST_30 = DATE_LAST_30;
Aggregator.DATE_SEASON = DATE_SEASON;
Aggregator.DATE_ALL_TIME = DATE_ALL_TIME;
Aggregator.NO_ARCH = NO_ARCH;
>>>>>>>
Aggregator.NO_ARCH = NO_ARCH; |
<<<<<<<
it('should update styling', function() {
expect(this.typeaheadView.$node).toHaveCss({ direction: 'rtl' });
expect(this.dropdownView.setLanguageDirection)
.toHaveBeenCalledWith('rtl');
=======
it('should update language class name', function() {
expect(this.typeaheadView.$node).toHaveClass('tt-rtl');
expect(this.typeaheadView.$node).not.toHaveClass('tt-ltr');
>>>>>>>
it('should update styling', function() {
expect(this.typeaheadView.$node).toHaveCss({ direction: 'rtl' });
expect(this.dropdownView.setLanguageDirection)
.toHaveBeenCalledWith('rtl');
<<<<<<<
it('should update styling', function() {
expect(this.typeaheadView.$node).toHaveCss({ direction: 'rtl' });
expect(this.dropdownView.setLanguageDirection)
.toHaveBeenCalledWith('rtl');
=======
it('should update language class name', function() {
expect(this.typeaheadView.$node).toHaveClass('tt-rtl');
expect(this.typeaheadView.$node).not.toHaveClass('tt-ltr');
>>>>>>>
it('should update styling', function() {
expect(this.typeaheadView.$node).toHaveCss({ direction: 'rtl' });
expect(this.dropdownView.setLanguageDirection)
.toHaveBeenCalledWith('rtl');
<<<<<<<
this.inputView.trigger(eventType + 'Keyed');
=======
this.$e = $.extend($.Event('keydown'), { keyCode: 38, shiftKey: true });
spyOn(this.$e, 'preventDefault');
this.inputView.trigger('up', this.$e);
});
it('should show the dropdown menu', function() {
expect(this.dropdownView.show).toHaveBeenCalled();
});
it('should not prevent default browser behavior', function() {
expect(this.$e.preventDefault).not.toHaveBeenCalled();
});
it('should not move cursor up', function() {
expect(this.dropdownView.moveCursorUp).not.toHaveBeenCalled();
});
});
describe('if modifier key was not pressed', function() {
beforeEach(function() {
this.$e = $.extend($.Event('keydown'), { keyCode: 38 });
spyOn(this.$e, 'preventDefault');
this.inputView.trigger('up', this.$e);
});
it('should show the dropdown menu', function() {
expect(this.dropdownView.show).toHaveBeenCalled();
});
it('should prevent default browser behavior', function() {
expect(this.$e.preventDefault).toHaveBeenCalled();
});
it('should move cursor up', function() {
expect(this.dropdownView.moveCursorUp).toHaveBeenCalled();
});
});
});
describe('when inputView triggers down', function() {
describe('if modifier key was pressed', function() {
beforeEach(function() {
this.$e = $.extend($.Event('keydown'), { keyCode: 40, shiftKey: true });
spyOn(this.$e, 'preventDefault');
this.inputView.trigger('down', this.$e);
>>>>>>>
this.$e = $.extend($.Event('keydown'), { keyCode: 40, shiftKey: true });
spyOn(this.$e, 'preventDefault');
this.inputView.trigger('downKeyed', this.$e);
<<<<<<<
describe('when inputView triggers tabKeyed', function() {
=======
describe('when inputView triggers tab', function() {
beforeEach(function() {
this.$e = $.extend($.Event('keydown'), { keyCode: 9 });
spyOn(this.$e, 'preventDefault');
});
>>>>>>>
describe('when inputView triggers tabKeyed', function() {
beforeEach(function() {
this.$e = $.extend($.Event('keydown'), { keyCode: 9 });
spyOn(this.$e, 'preventDefault');
});
<<<<<<<
this.inputView.trigger('tabKeyed');
=======
this.inputView.trigger('tab', this.$e);
>>>>>>>
this.inputView.trigger('tabKeyed', this.$e);
<<<<<<<
this.inputView.trigger('tabKeyed');
=======
this.inputView.trigger('tab', this.$e);
>>>>>>>
this.inputView.trigger('tabKeyed', this.$e);
<<<<<<<
describe('if dropdown menu is not visible', function() {
=======
describe('if input\'s value is overflowing', function() {
it('should clear hint', function() {
this.inputView.isOverflow.andReturn(true);
this.inputView.getInputValue.andReturn('bl');
this.dropdownView.getFirstSuggestion.andReturn({ value: 'blah' });
this[view].trigger(eventType);
expect(this.inputView.setHintValue).not.toHaveBeenCalled();
});
});
describe('if dropdown menu is closed', function() {
>>>>>>>
describe('if input\'s value is overflowing', function() {
it('should clear hint', function() {
this.inputView.isOverflow.andReturn(true);
this.inputView.getInputValue.andReturn('bl');
this.dropdownView.getFirstSuggestion.andReturn({ value: 'blah' });
this[view].trigger(eventType);
expect(this.inputView.setHintValue).not.toHaveBeenCalled();
});
});
describe('if dropdown menu is not visible', function() { |
<<<<<<<
// release tasks
// 1. grunt build
// 2. grunt bump
// 3. grunt component
// 4. grunt publish_assets
var jsFiles = [
'src/version.js',
'src/utils.js',
'src/event_target.js',
'src/persistent_storage.js',
'src/request_cache.js',
'src/transport.js',
'src/dataset.js',
'src/input_view.js',
'src/dropdown_view.js',
'src/typeahead_view.js',
'src/typeahead.js'
=======
var semver = require('semver'),
f = require('util').format,
jsFiles = [
'src/js/version.js',
'src/js/utils.js',
'src/js/event_target.js',
'src/js/persistent_storage.js',
'src/js/request_cache.js',
'src/js/transport.js',
'src/js/dataset.js',
'src/js/input_view.js',
'src/js/dropdown_view.js',
'src/js/typeahead_view.js',
'src/js/typeahead.js'
>>>>>>>
var semver = require('semver'),
f = require('util').format,
jsFiles = [
'src/version.js',
'src/utils.js',
'src/event_target.js',
'src/persistent_storage.js',
'src/request_cache.js',
'src/transport.js',
'src/dataset.js',
'src/input_view.js',
'src/dropdown_view.js',
'src/typeahead_view.js',
'src/typeahead.js' |
<<<<<<<
describe('#destroy', function() {
beforeEach(function() {
this.dropdownView.destroy();
});
it('should remove event listeners', function() {
expect($._data(this.$menu, 'events')).toBeUndefined();
});
it('should drop references to DOM elements', function() {
expect(this.dropdownView.$menu).toBeNull();
});
});
describe('#hide', function() {
var spy;
beforeEach(function() {
this.dropdownView.on('hide', spy = jasmine.createSpy());
});
describe('if menu has tt-is-open class', function() {
=======
describe('#close', function() {
describe('if open', function() {
>>>>>>>
describe('#destroy', function() {
beforeEach(function() {
this.dropdownView.destroy();
});
it('should remove event listeners', function() {
expect($._data(this.$menu, 'events')).toBeUndefined();
});
it('should drop references to DOM elements', function() {
expect(this.dropdownView.$menu).toBeNull();
});
});
describe('#close', function() {
describe('if open', function() {
<<<<<<<
this.dropdownView
.on('suggestionsRender', this.spy = jasmine.createSpy());
=======
this.dropdownView.on('suggestionsRendered', spy = jasmine.createSpy());
>>>>>>>
this.dropdownView.
on('suggestionsRendered', this.spy = jasmine.createSpy());
<<<<<<<
it('should trigger suggestionsRender', function() {
expect(this.spy).toHaveBeenCalled();
=======
it('should trigger suggestionsRendered', function() {
expect(spy).toHaveBeenCalled();
>>>>>>>
it('should trigger suggestionsRendered', function() {
expect(this.spy).toHaveBeenCalled();
<<<<<<<
this.dropdownView
.on('suggestionsRender', this.spy = jasmine.createSpy());
=======
this.dropdownView
.on('suggestionsRendered', this.spy = jasmine.createSpy());
>>>>>>>
this.dropdownView
.on('suggestionsRendered', this.spy = jasmine.createSpy());
<<<<<<<
it('should trigger suggestionsRender', function() {
expect(this.spy).toHaveBeenCalled();
=======
it('should trigger suggestionsRendered', function() {
expect(this.spy).toHaveBeenCalled();
>>>>>>>
it('should trigger suggestionsRendered', function() {
expect(this.spy).toHaveBeenCalled(); |
<<<<<<<
deviceMockingHooks.sendMetadata(this._mediaPlayer, 0, { start: 0, end: 100 });
assertTrue(stubCreateElementResults.video.play.called);
=======
deviceMockingHooks.sendMetadata(this.mediaPlayer, 0, { start: 0, end: 100 });
assert(stubCreateElementResults.video.play.called);
>>>>>>>
deviceMockingHooks.sendMetadata(this._mediaPlayer, 0, { start: 0, end: 100 });
assert(stubCreateElementResults.video.play.called);
<<<<<<<
deviceMockingHooks.sendMetadata(this._mediaPlayer, 0, { start: 0, end: 100 });
assertTrue(stubCreateElementResults.video.pause.called);
=======
deviceMockingHooks.sendMetadata(this.mediaPlayer, 0, { start: 0, end: 100 });
assert(stubCreateElementResults.video.pause.called);
>>>>>>>
deviceMockingHooks.sendMetadata(this._mediaPlayer, 0, { start: 0, end: 100 });
assert(stubCreateElementResults.video.pause.called); |
<<<<<<<
grunt.loadNpmTasks('grunt-contrib-jasmine');
grunt.registerTask("hint", ["jshint"]);
grunt.registerTask("test", ["jasmine"]);
grunt.registerTask("full", ["jshint", "jasmine"]);
grunt.registerTask("spec", ["jasmine:src:build", "openspec"]);
grunt.registerTask("openspec", "Open the generated Jasmine spec file", function() {
var childProcess = require('child_process');
var outfile = grunt.config("jasmine.options.outfile");
grunt.log.writeln('Opening ' + outfile + '...');
childProcess.exec("open " + outfile);
});
// Default task(s).
grunt.registerTask('default', 'test');
=======
grunt.loadNpmTasks('grunt-complexity');
grunt.registerTask('default', 'complexity');
>>>>>>>
grunt.loadNpmTasks('grunt-contrib-jasmine');
grunt.loadNpmTasks('grunt-complexity');
grunt.registerTask("hint", ["jshint"]);
grunt.registerTask("test", ["jasmine"]);
grunt.registerTask("full", ["jshint", "jasmine"]);
grunt.registerTask("spec", ["jasmine:src:build", "openspec"]);
grunt.registerTask("openspec", "Open the generated Jasmine spec file", function() {
var childProcess = require('child_process');
var outfile = grunt.config("jasmine.options.outfile");
grunt.log.writeln('Opening ' + outfile + '...');
childProcess.exec("open " + outfile);
});
// Default task(s).
grunt.registerTask('default', 'test'); |
<<<<<<<
mixins.testSeekableIsNotUsedUntilMetadataIsSet = function(queue) {
expectAsserts(2);
var self = this;
runMediaPlayerTest(this, queue, function (MediaPlayer) {
self._mediaPlayer.setSource(MediaPlayer.TYPE.VIDEO, 'http://testurl/', 'video/mp4');
self._mediaPlayer.playFrom(0);
stubCreateElementResults.video.seekable.start.returns(0);
stubCreateElementResults.video.seekable.end.returns(100);
assertUndefined(self._mediaPlayer.getRange());
deviceMockingHooks.sendMetadata(self._mediaPlayer, 0, { start: 0, end: 100 });
assertEquals({ start: 0, end: 100 }, self._mediaPlayer.getRange());
});
};
mixins.testGetRangeGetsEndTimeFromDurationWhenNoSeekableProperty = function(queue) {
=======
mixins.testGetSeekableRangeGetsEndTimeFromDurationWhenNoSeekableProperty = function(queue) {
>>>>>>>
mixins.testSeekableIsNotUsedUntilMetadataIsSet = function(queue) {
expectAsserts(2);
var self = this;
runMediaPlayerTest(this, queue, function (MediaPlayer) {
self._mediaPlayer.setSource(MediaPlayer.TYPE.VIDEO, 'http://testurl/', 'video/mp4');
self._mediaPlayer.playFrom(0);
stubCreateElementResults.video.seekable.start.returns(0);
stubCreateElementResults.video.seekable.end.returns(100);
assertUndefined(self._mediaPlayer.getRange());
deviceMockingHooks.sendMetadata(self._mediaPlayer, 0, { start: 0, end: 100 });
assertEquals({ start: 0, end: 100 }, self._mediaPlayer.getRange());
});
};
mixins.testGetSeekableRangeGetsEndTimeFromDurationWhenNoSeekableProperty = function(queue) { |
<<<<<<<
=======
this._sentinelLimits.pause.currentAttemptCount = 0;
>>>>>>> |
<<<<<<<
=======
// change selected webserver on "webserver" tab change
$('.webserver-configuration a[data-toggle="tab"]').on('shown', function (e) {
var selectedWebserver = e.target.getAttribute('rel');
$('input[name="webserver"]').attr('value', selectedWebserver);
});
// change selected database on "database" tab change
$('.database-configuration a[data-toggle="tab"]').on('shown', function (e) {
var selectedWebserver = e.target.getAttribute('rel');
$('input[name="database"]').attr('value', selectedWebserver);
});
>>>>>>> |
<<<<<<<
async: zk.ie //conservative, though it shall be (!zk.safari || zk.ff >= 4)
}, zAu.ajaxSettings), null, true/*fixed IE memory issue for jQuery 1.6.x*/);
=======
async: !!zk.ie // (!!) coerce to boolean, undefined will be wrong for safari and chrome.
// conservative, though it shall be (!zk.safari || zk.ff >= 4)
}, zAu.ajaxSettings), true/*fixed IE memory issue for jQuery 1.4.x*/);
>>>>>>>
async: !!zk.ie // (!!) coerce to boolean, undefined will be wrong for safari and chrome.
// conservative, though it shall be (!zk.safari || zk.ff >= 4)
}, zAu.ajaxSettings), null, true/*fixed IE memory issue for jQuery 1.6.x*/); |
<<<<<<<
_initDefault = _portrait[window.orientation], //default orientation
_aftAuResp = []; //store callbacks to be triggered when au is back
=======
_initDefault = _portrait[window.orientation]; //default orientation
_aftAuResp = []; //store callbacks to be triggered when au is back
>>>>>>>
_initDefault = _portrait[window.orientation], //default orientation
_aftAuResp = []; //store callbacks to be triggered when au is back
<<<<<<<
zk.ausending = false;
zk.doAfterAuResponse();
=======
zk.ausending = false;
zk.doAfterAuResponse();
>>>>>>>
zk.ausending = false;
zk.doAfterAuResponse();
<<<<<<<
this.__delay__ = setTimeout(function () {
var w = Widget.$(id);
if (w) w.scrollIntoView();
else zk(id).scrollIntoView();
this.__delay__ = false;
}, 50);
},
/**
* Loads a JavaScript file and execute it.
* @param String url the JavaScript file path
* @param String callback the function to execute after the JavaScript file loaded.
* @param boolean once true means the JavaScript file will be cached.
* @since 8.0.0
*/
loadScript: function (url, callback, once) {
jq.ajax({
dataType: 'script',
cache: once,
url: url
}).done(function () {
if (jq.isFunction(callback)) {
callback();
} else
jq.globalEval(callback);
});
},
/** Loads a CSS file.
* @param String href the URL of the CSS file.
* @param String id the identifier. Ignored if not specified.
* @param String media the media attribute. Ignored if not specified.
* @since 8.0.0
*/
loadCSS: zk.loadCSS
=======
if (!id) return;
var w = Widget.$(id);
if (w) {
zk.delayFunction(w.uuid, function () {
w.scrollIntoView();
});
} else {
var zkjq = zk(id);
if (zkjq.$()) {
zk.delayFunction(zkjq.$().uuid, function () {
zkjq.scrollIntoView();
});
}
}
}
>>>>>>>
if (!id) return;
var w = Widget.$(id);
if (w) {
zk.delayFunction(w.uuid, function () {
w.scrollIntoView();
});
} else {
var zkjq = zk(id);
if (zkjq.$()) {
zk.delayFunction(zkjq.$().uuid, function () {
zkjq.scrollIntoView();
});
}
}
},
/**
* Loads a JavaScript file and execute it.
* @param String url the JavaScript file path
* @param String callback the function to execute after the JavaScript file loaded.
* @param boolean once true means the JavaScript file will be cached.
* @since 8.0.0
*/
loadScript: function (url, callback, once) {
jq.ajax({
dataType: 'script',
cache: once,
url: url
}).done(function () {
if (jq.isFunction(callback)) {
callback();
} else
jq.globalEval(callback);
});
},
/** Loads a CSS file.
* @param String href the URL of the CSS file.
* @param String id the identifier. Ignored if not specified.
* @param String media the media attribute. Ignored if not specified.
* @since 8.0.0
*/
loadCSS: zk.loadCSS
<<<<<<<
/** @partial zk
*/
//@{
/** Adds a function that will be executed after onResponse events are done.
* That means, after au responses, the function added in the afterAuResponse() will be invoked
* @param Function fn the function to execute after au responses
* @since 8.0.0
*/
//afterAuResponse: function () {}
//@};
zk.afterAuResponse = function (fn) {
if (fn)
_aftAuResp.push(fn);
};
zk.doAfterAuResponse = function () {
for (var fn; fn = _aftAuResp.shift();) {
fn();
}
};
=======
/** @partial zk
*/
//@{
/** Adds a function that will be executed after onResponse events are done.
* That means, after au responses, the function added in the afterAuResponse() will be invoked
* @param Function fn the function to execute after au responses
* @since 7.0.6
*/
//afterAuResponse: function () {}
//@};
zk.afterAuResponse = function (fn) {
if (fn)
_aftAuResp.push(fn);
};
zk.doAfterAuResponse = function () {
for (var fn; fn = _aftAuResp.shift();) {
fn();
}
};
>>>>>>>
/** @partial zk
*/
//@{
/** Adds a function that will be executed after onResponse events are done.
* That means, after au responses, the function added in the afterAuResponse() will be invoked
* @param Function fn the function to execute after au responses
* @since 7.0.6
*/
//afterAuResponse: function () {}
//@};
zk.afterAuResponse = function (fn) {
if (fn)
_aftAuResp.push(fn);
};
zk.doAfterAuResponse = function () {
for (var fn; fn = _aftAuResp.shift();) {
fn();
}
}; |
<<<<<<<
_onVisibilityChange: function () { //Called by mount.js when page visibility changed
if (zk.visibilitychange) zAu.cmd0.visibilityChange();
},
=======
//Bug ZK-1596: native will be transfer to stub in EE, store the widget for used in mount.js
_storeStub: function (wgt) {
if (wgt)
_detached.push(wgt);
},
>>>>>>>
_onVisibilityChange: function () { //Called by mount.js when page visibility changed
if (zk.visibilitychange) zAu.cmd0.visibilityChange();
},
//Bug ZK-1596: native will be transfer to stub in EE, store the widget for used in mount.js
_storeStub: function (wgt) {
if (wgt)
_detached.push(wgt);
}, |
<<<<<<<
.replace(/EmmanuelMacron/gi, 'Manu')
=======
.replace(/M\. Macron/gi, 'Manu')
.replace(/Président Macron/gi, 'Manu')
.replace(/Emmanuel et Brigitte Macron/gi, 'Manu et Brigitte')
>>>>>>>
.replace(/EmmanuelMacron/gi, 'Manu')
.replace(/M\. Macron/gi, 'Manu')
.replace(/Président Macron/gi, 'Manu')
.replace(/Emmanuel et Brigitte Macron/gi, 'Manu et Brigitte') |
<<<<<<<
getIconClass_: function () {
return 'z-icon-caret-down';
},
=======
onChildAdded_: function (child) {
this.$supers('onChildAdded_', arguments);
this._shallSyncPopupPosition = true; // Bug ZK-2409
},
>>>>>>>
getIconClass_: function () {
return 'z-icon-caret-down';
},
onChildAdded_: function (child) {
this.$supers('onChildAdded_', arguments);
this._shallSyncPopupPosition = true; // Bug ZK-2409
}, |
<<<<<<<
var msg = _exmsg(e);
errCode = "[Receive] " + msg;
//if (e.fileName) errCode += ", "+e.fileName;
//if (e.lineNumber) errCode += ", "+e.lineNumber;
=======
var msg = e.message;
_errCode = "[Receive] " + msg;
//if (e.fileName) _errCode += ", "+e.fileName;
//if (e.lineNumber) _errCode += ", "+e.lineNumber;
>>>>>>>
var msg = _exmsg(e);
_errCode = "[Receive] " + msg;
//if (e.fileName) _errCode += ", "+e.fileName;
//if (e.lineNumber) _errCode += ", "+e.lineNumber;
<<<<<<<
var msg = _exmsg(e);
errCode = "[Send] " + msg;
=======
var msg = e.message;
_errCode = "[Send] " + msg;
>>>>>>>
var msg = _exmsg(e);
_errCode = "[Send] " + msg; |
<<<<<<<
var NEWFOLDER = '%s/createItem/?name=%s&mode=%s&Submit=OK';
var DELETE = '%s/job/%s/doDelete';
var BUILD = '%s/job/%s/build' + API;
var STOP_BUILD = '%s/job/%s/%s/stop' + API;
var BUILD_INFO = '%s/job/%s/%s' + API;
var DISABLE = '%s/job/%s/disable';
var ENABLE = '%s/job/%s/enable';
var BUILDWITHPARAMS = '%s/job/%s/buildWithParameters';
var CONFIG = '%s/job/%s/config.xml';
var JOBINFO = '%s/job/%s' + API;
=======
var DELETE = '%s/job/%s/doDelete%s';
var DELETE_BUILD = '%s/job/%s/%s/doDelete%s';
var BUILD = '%s/job/%s/build' + API + '%s';
var STOP_BUILD = '%s/job/%s/%s/stop' + API + '%s';
var BUILD_INFO = '%s/job/%s/%s' + API + '%s';
var DISABLE = '%s/job/%s/disable%s';
var ENABLE = '%s/job/%s/enable%s';
var BUILDWITHPARAMS = '%s/job/%s/buildWithParameters%s';
var CONFIG = '%s/job/%s/config.xml%s';
var JOBINFO = '%s/job/%s' + API + '%s';
>>>>>>>
var NEWFOLDER = '%s/createItem/?name=%s&mode=%s&Submit=OK%s';
var DELETE = '%s/job/%s/doDelete%s';
var DELETE_BUILD = '%s/job/%s/%s/doDelete%s';
var BUILD = '%s/job/%s/build' + API + '%s';
var STOP_BUILD = '%s/job/%s/%s/stop' + API + '%s';
var BUILD_INFO = '%s/job/%s/%s' + API + '%s';
var DISABLE = '%s/job/%s/disable%s';
var ENABLE = '%s/job/%s/enable%s';
var BUILDWITHPARAMS = '%s/job/%s/buildWithParameters%s';
var CONFIG = '%s/job/%s/config.xml%s';
var JOBINFO = '%s/job/%s' + API + '%s';
<<<<<<<
var LAST_SUCCESS = '%s/job/%s/lastSuccessfulBuild' + API;
var TEST_REPORT = '%s/job/%s/%s/testReport' + API;
var LAST_BUILD = '%s/job/%s/lastBuild' + API;
var LAST_COMPLETED_BUILD = '%s/job/%s/lastCompletedBuild' + API;
var LAST_REPORT = '%s/job/%s/lastBuild' + API;
=======
var LAST_SUCCESS = '%s/job/%s/lastSuccessfulBuild' + API + '%s';
var TEST_REPORT = '%s/job/%s/lastSuccessfulBuild/testReport' + API + '%s';
var LAST_BUILD = '%s/job/%s/lastBuild' + API + '%s';
var LAST_COMPLETED_BUILD = '%s/job/%s/lastCompletedBuild' + API + '%s';
var LAST_REPORT = '%s/job/%s/lastBuild' + API + '%s';
>>>>>>>
var LAST_SUCCESS = '%s/job/%s/lastSuccessfulBuild' + API + '%s';
var TEST_REPORT = '%s/job/%s/lastSuccessfulBuild/testReport' + API + '%s';
var LAST_BUILD = '%s/job/%s/lastBuild' + API + '%s';
var LAST_COMPLETED_BUILD = '%s/job/%s/lastCompletedBuild' + API + '%s';
var LAST_REPORT = '%s/job/%s/lastBuild' + API + '%s';
<<<<<<<
var JOB_OUTPUT = '%s/job/%s/consoleText' + API;
var UPDATEJOB = '%s/job/%s/config.xml' + API;
var NEW_VIEW = '%s/createView';
var CONFIG_VIEW = '%s/view/%s/configSubmit';
var DELETE_VIEW = '%s/view/%s/doDelete';
=======
var JOB_OUTPUT = '%s/job/%s/consoleText' + API + '%s';
>>>>>>>
var LAST_SUCCESS = '%s/job/%s/lastSuccessfulBuild' + API + '%s';
var TEST_REPORT = '%s/job/%s/lastSuccessfulBuild/testReport' + API + '%s';
var LAST_BUILD = '%s/job/%s/lastBuild' + API + '%s';
var LAST_COMPLETED_BUILD = '%s/job/%s/lastCompletedBuild' + API + '%s';
var LAST_REPORT = '%s/job/%s/lastBuild' + API + '%s';
var QUEUE = '%s/queue' + API; // TODO add build_params
var QUEUE_ITEM = '%s/queue/item/%s' + API; // TODO add build_params
var COMPUTERS = '%s/computer' + API; // TODO add build_params
var UPDATEJOB = '%s/job/%s/config.xml' + API; // TODO add build_params
var NEW_VIEW = '%s/createView'; // TODO add build_params
var CONFIG_VIEW = '%s/view/%s/configSubmit'; // TODO add build_params
var DELETE_VIEW = '%s/view/%s/doDelete'; // TODO add build_params
var JOB_OUTPUT = '%s/job/%s/consoleText' + API + '%s';
<<<<<<<
=======
var build_params = function(custom_params, token) {
/*
Build REST params to allow jenkins to specify additional configuration options
*/
var params_url = '', params_length = Object.keys(custom_params).length;
if (0 < params_length) {
for(var param in custom_params) {
if (custom_params.hasOwnProperty(param)) {
params_url += '&' + param + '=' + custom_params[param];
}
}
if (token) {
params_url = ('?token=' + token) + params_url;
} else {
params_url = '?' + params_url.substr(1);
}
} else {
if (token) {
params_url += ('token=' + token);
params_url = '?' + params_url;
}
}
return params_url;
};
>>>>>>>
var build_params = function(custom_params, token) {
/*
Build REST params to allow jenkins to specify additional configuration options
*/
var params_url = '',
params_length = (custom_params ? Object.keys(custom_params).length : 0);
if (0 < params_length) {
for(var param in custom_params) {
if (custom_params.hasOwnProperty(param)) {
params_url += '&' + param + '=' + custom_params[param];
}
}
if (token) {
params_url = ('?token=' + token) + params_url;
} else {
params_url = '?' + params_url.substr(1);
}
} else {
if (token) {
params_url += ('token=' + token);
params_url = '?' + params_url;
}
}
return params_url;
};
<<<<<<<
if (typeof params === 'function' || !params) {
buildurl = build_url(BUILD, jobname);
=======
if (typeof params === 'function') {
buildurl = build_url(BUILD, jobname, buildparams);
>>>>>>>
if (typeof params === 'function' || !params) {
buildurl = build_url(BUILD, jobname, buildparams);
<<<<<<<
all_views: function(callback) {
/*
Return a list of all the views on the Jenkins server
*/
request({method: 'GET', url: build_url(LIST)}, function (error, response, body) {
if ( error || response.statusCode !== 200 ) {
callback(error || true, response);
return;
}
tryParseJson(body, function(err, data) {
if(err) {
callback(err);
return;
}
callback(null, data.views);
});
})
},
job_info: function(jobname, callback) {
=======
job_info: function(jobname, custom_params, callback) {
var buildparams = build_params(custom_params, token);
//custom_params are optional
callback = callback || custom_params;
>>>>>>>
all_views: function(custom_params, callback) {
var buildparams = build_params(custom_params);
//custom_params are optional
callback = callback || custom_params;
/*
Return a list of all the views on the Jenkins server
*/
request({method: 'GET', url: build_url(LIST, buildparams)}, function (error, response, body) {
if ( error || response.statusCode !== 200 ) {
callback(error || true, response);
return;
}
tryParseJson(body, function(err, data) {
if(err) {
callback(err);
return;
}
callback(null, data.views);
});
})
},
job_info: function(jobname, custom_params, callback) {
var buildparams = build_params(custom_params, token);
//custom_params are optional
callback = callback || custom_params;
<<<<<<<
{method: 'POST'
,url: build_url(NEWJOB, jobname)
=======
{method: 'POST'
,url: build_url(NEWJOB, jobname, buildparams)
>>>>>>>
{method: 'POST'
,url: build_url(NEWJOB, jobname, buildparams)
<<<<<<<
delete_job: function(jobname, callback) {
if (typeof callback !== 'function') {
callback = function(){};
}
=======
delete_job: function(jobname, custom_params, callback) {
var buildparams = build_params(custom_params, token);
//custom_params are optional
callback = callback || custom_params;
>>>>>>>
delete_job: function(jobname, custom_params, callback) {
var buildparams = build_params(custom_params, token);
//custom_params are optional
callback = callback || custom_params;
if (typeof callback !== 'function') {
callback = function(){};
}
<<<<<<<
request({method: 'GET', url: build_url(last_result_url + API, jobname)}, function(error, response, body) {
if ( error || response.statusCode !== 200 ) {
=======
request({method: 'GET', url: build_url(last_result_url + API, jobname, buildparams)}, function(error, response, body) {
if ( error || response.statusCode !== 200 ) {
>>>>>>>
request({method: 'GET', url: build_url(last_result_url + API, jobname, buildparams)}, function(error, response, body) {
if ( error || response.statusCode !== 200 ) {
<<<<<<<
request({method: 'POST', url: build_url(JOB_OUTPUT, jobname + '/' + buildname)}, function(error, response, body) {
if ( error || response.statusCode !== 200 ) {
=======
request({method: 'POST', url: build_url(JOB_OUTPUT, jobname + '/' + buildname, buildparams)}, function(error, response, body) {
if (response.statusCode !== 200 || error) {
>>>>>>>
request({method: 'POST', url: build_url(JOB_OUTPUT, jobname + '/' + buildname, buildparams)}, function(error, response, body) {
if ( error || response.statusCode !== 200 ) { |
<<<<<<<
if (!zk.mobile)
zk(cb.getInputNode()).focus();
=======
if (!zk.ios) // prevent ios native keyboard showed
zk(cb.getInputNode()).focus();
>>>>>>>
if (!zk.mobile) // prevent ios native keyboard showed
zk(cb.getInputNode()).focus(); |
<<<<<<<
},
getCollapseOpenIconClass_: function () {
return 'z-icon-caret-up';
},
getCollapseCloseIconClass_: function () {
return 'z-icon-caret-down';
},
getClosableIconClass_: function () {
return 'z-icon-times';
},
getMaximizableIconClass_: function () {
return 'z-icon-resize-full';
},
getMaximizedIconClass_: function () {
return 'z-icon-resize-small';
},
getMinimizableIconClass_: function () {
return 'z-icon-minus';
=======
},
isExcludedHflex_: function () {
if (zk.isLoaded('zkmax.layout') && this.parent.$instanceof(zkmax.layout.Portalchildren)) {
var p = this.parent;
if (p.parent)
return p.parent.isVertical();
}
},
isExcludedVflex_: function () {
if (zk.isLoaded('zkmax.layout') && this.parent.$instanceof(zkmax.layout.Portalchildren)) {
var p = this.parent;
if (p.parent)
return !(p.parent.isVertical());
}
>>>>>>>
},
isExcludedHflex_: function () {
if (zk.isLoaded('zkmax.layout') && this.parent.$instanceof(zkmax.layout.Portalchildren)) {
var p = this.parent;
if (p.parent)
return p.parent.isVertical();
}
},
isExcludedVflex_: function () {
if (zk.isLoaded('zkmax.layout') && this.parent.$instanceof(zkmax.layout.Portalchildren)) {
var p = this.parent;
if (p.parent)
return !(p.parent.isVertical());
}
},
getCollapseOpenIconClass_: function () {
return 'z-icon-caret-up';
},
getCollapseCloseIconClass_: function () {
return 'z-icon-caret-down';
},
getClosableIconClass_: function () {
return 'z-icon-times';
},
getMaximizableIconClass_: function () {
return 'z-icon-resize-full';
},
getMaximizedIconClass_: function () {
return 'z-icon-resize-small';
},
getMinimizableIconClass_: function () {
return 'z-icon-minus'; |
<<<<<<<
if (zkie || zk.edge || zk.safari) {
// ZK_3789: refine ZK-3695, fire down onRestore after the wrapper was removed
zWatch.fireDown('onRestore', wgt);
if (zkie == 10) zk(self.jq[0]).redoCSS();
}
=======
// ZK_3789: refine ZK-3695, fire down onRestore after the wrapper was removed
zWatch.fireDown('onRestore', wgt);
if (zkie == 8 || zkie == 10) zk(self.jq[0]).redoCSS();
>>>>>>>
// ZK_3789: refine ZK-3695, fire down onRestore after the wrapper was removed
zWatch.fireDown('onRestore', wgt);
if (zkie == 10) zk(self.jq[0]).redoCSS(); |
<<<<<<<
QUEUE = '%s/queue' + API;
COMPUTERS = '%s/computer' + API;
=======
JOB_OUTPUT = '%s/job/%s/consoleText' + API;
>>>>>>>
QUEUE = '%s/queue' + API;
COMPUTERS = '%s/computer' + API;
JOB_OUTPUT = '%s/job/%s/consoleText' + API;
<<<<<<<
queue: function(callback) {
/*
Get all queued items
*/
request({method: 'GET', url: build_url(QUEUE)}, function(error, response, body) {
if ( error || response.statusCode !== 200 ) {
callback(error || true, response);
return;
}
data = JSON.parse(body.toString());
callback(null, data);
});
},
computers: function(callback) {
/*
Get details about all jenkins workers including currently executing jobs
*/
request({method: 'GET', url: build_url(COMPUTERS + '?depth=1')}, function(error, response, body) {
if ( error || response.statusCode !== 200 ) {
callback(error || true, response);
return;
}
data = JSON.parse(body.toString());
callback(null, data);
});
}
=======
job_output: function(jobname, buildname, callback) {
/*
Get the output for a job's build
*/
request({method: 'POST', url: build_url(JOB_OUTPUT, jobname + '/' + buildname)}, function(error, response, body) {
if (response.statusCode != 200 || error) {
callback(error || true, response);
return;
}
data = JSON.stringify({"output": body});
data = JSON.parse(data);
callback(null, data);
});
}
>>>>>>>
queue: function(callback) {
/*
Get all queued items
*/
request({method: 'GET', url: build_url(QUEUE)}, function(error, response, body) {
if ( error || response.statusCode !== 200 ) {
callback(error || true, response);
return;
}
data = JSON.parse(body.toString());
callback(null, data);
});
},
computers: function(callback) {
/*
Get details about all jenkins workers including currently executing jobs
*/
request({method: 'GET', url: build_url(COMPUTERS + '?depth=1')}, function(error, response, body) {
if ( error || response.statusCode !== 200 ) {
callback(error || true, response);
return;
}
data = JSON.parse(body.toString());
callback(null, data);
});
},
job_output: function(jobname, buildname, callback) {
/*
Get the output for a job's build
*/
request({method: 'POST', url: build_url(JOB_OUTPUT, jobname + '/' + buildname)}, function(error, response, body) {
if (response.statusCode != 200 || error) {
callback(error || true, response);
return;
}
data = JSON.stringify({"output": body});
data = JSON.parse(data);
callback(null, data);
});
} |
<<<<<<<
_doScroll: function (n) {
var p = this.parent, num;
if (p._nativebar)
num = Math.ceil(this.$n('scrollX').scrollLeft / 50);
else
num = Math.ceil(n);
=======
bind_: function () {
this.$supers(zul.mesh.Frozen, 'bind_', arguments);
zWatch.listen({onSize: this, beforeSize: this});
var scroll = this.$n('scrollX'),
p = this.parent,
gbody = p.$n('body'),
ghead = p.$n('head');
this.$n().style.height = this.$n('cave').style.height = scroll.style.height
= scroll.firstChild.style.height = jq.px0(jq.scrollbarWidth());
p.listen({onScroll: this.proxy(this._onScroll)}, -1000);
this.domListen_(scroll, 'onScroll');
if (ghead)
this.domListen_(ghead, 'onScroll', '_doHeadScroll');
if (gbody) {
jq(gbody).addClass('z-word-nowrap').css('overflow-x', 'hidden');
p._currentLeft = 0;
}
},
unbind_: function () {
zWatch.unlisten({onSize: this, beforeSize: this});
var p, body, head, fakerflex, scroll = this.$n('scrollX');
if (p = this.parent) {
p.unlisten({onScroll: this.proxy(this._onScroll)});
if (body = p.$n('body'))
jq(body).removeClass('z-word-nowrap').css('overflow-x', '');
if (p.head && (fakerflex = p.head.$n('hdfakerflex')))
fakerflex.style.width = '';
if (head = p.$n('head'))
this.domUnlisten_(head, 'onScroll', '_doHeadScroll');
}
this.domUnlisten_(scroll, 'onScroll');
if ((p = this.parent) && (p = p.$n('body')))
jq(p).removeClass('z-word-nowrap').css('overflow-x', '');
this.$supers(zul.mesh.Frozen, 'unbind_', arguments);
},
beforeParentChanged_: function (p) {
//bug B50-ZK-238
if (this._lastScale) //if large then 0
this._doScrollNow(0);
this.$supers("beforeParentChanged_", arguments);
},
_doHeadScroll: function (evt) {
var head = evt.domTarget,
num = Math.ceil(head.scrollLeft / 50);
// ignore scrollLeft is 0
if (!head.scrollLeft || this._lastScale == num)
return;
evt.data = head.scrollLeft;
this._onScroll(evt);
},
_doScroll: function (evt) {
var scroll = this.$n('scrollX'),
num = Math.ceil(scroll.scrollLeft / 50);
>>>>>>>
_doHeadScroll: function (evt) {
var head = evt.domTarget,
num = Math.ceil(head.scrollLeft / 50);
// ignore scrollLeft is 0
if (!head.scrollLeft || this._lastScale == num)
return;
evt.data = head.scrollLeft;
this._onScroll(evt);
},
_doScroll: function (n) {
var p = this.parent, num;
if (p._nativebar)
num = Math.ceil(this.$n('scrollX').scrollLeft / 50);
else
num = Math.ceil(n); |
<<<<<<<
var LAST_SUCCESS = '%s/job/%s/lastSuccessfulBuild' + API + '%s';
var TEST_REPORT = '%s/job/%s/lastSuccessfulBuild/testReport' + API + '%s';
var LAST_BUILD = '%s/job/%s/lastBuild' + API + '%s';
var LAST_COMPLETED_BUILD = '%s/job/%s/lastCompletedBuild' + API + '%s';
var LAST_REPORT = '%s/job/%s/lastBuild' + API + '%s';
var QUEUE = '%s/queue' + API; // TODO add build_params
var QUEUE_ITEM = '%s/queue/item/%s' + API; // TODO add build_params
var COMPUTERS = '%s/computer' + API; // TODO add build_params
var UPDATEJOB = '%s/job/%s/config.xml' + API; // TODO add build_params
var NEW_VIEW = '%s/createView'; // TODO add build_params
var CONFIG_VIEW = '%s/view/%s/configSubmit'; // TODO add build_params
var DELETE_VIEW = '%s/view/%s/doDelete'; // TODO add build_params
var JOB_OUTPUT = '%s/job/%s/consoleText' + API + '%s';
=======
var LAST_SUCCESS = '%s/job/%s/lastSuccessfulBuild' + API;
var TEST_REPORT = '%s/job/%s/lastSuccessfulBuild/testReport' + API;
var LAST_BUILD = '%s/job/%s/lastBuild' + API;
var LAST_COMPLETED_BUILD = '%s/job/%s/lastCompletedBuild' + API;
var LAST_REPORT = '%s/job/%s/lastBuild' + API;
var QUEUE = '%s/queue' + API;
var COMPUTERS = '%s/computer' + API;
var JOB_OUTPUT = '%s/job/%s/consoleText' + API;
var PLUGINS = '%s/pluginManager' + API;
var INSTALL_PLUGIN='%s/pluginManager/installNecessaryPlugins' + API;
>>>>>>>
var LAST_SUCCESS = '%s/job/%s/lastSuccessfulBuild' + API + '%s';
var TEST_REPORT = '%s/job/%s/lastSuccessfulBuild/testReport' + API + '%s';
var LAST_BUILD = '%s/job/%s/lastBuild' + API + '%s';
var LAST_COMPLETED_BUILD = '%s/job/%s/lastCompletedBuild' + API + '%s';
var LAST_REPORT = '%s/job/%s/lastBuild' + API + '%s';
var QUEUE = '%s/queue' + API; // TODO add build_params
var QUEUE_ITEM = '%s/queue/item/%s' + API; // TODO add build_params
var COMPUTERS = '%s/computer' + API; // TODO add build_params
var UPDATEJOB = '%s/job/%s/config.xml' + API; // TODO add build_params
var NEW_VIEW = '%s/createView'; // TODO add build_params
var CONFIG_VIEW = '%s/view/%s/configSubmit'; // TODO add build_params
var DELETE_VIEW = '%s/view/%s/doDelete'; // TODO add build_params
var JOB_OUTPUT = '%s/job/%s/consoleText' + API + '%s';
var PLUGINS = '%s/pluginManager' + API;
var INSTALL_PLUGIN='%s/pluginManager/installNecessaryPlugins' + API;
<<<<<<<
},
create_folder: function(foldername, callback) {
/*
Create a new folder
Needs Folder plugin in Jenkins: https://wiki.jenkins-ci.org/display/JENKINS/CloudBees+Folders+Plugin
curl -XPOST 'http://jenkins/createItem?name=FolderName&mode=com.cloudbees.hudson.plugins.folder.Folder&from=&json=%7B%22name%22%3A%22FolderName%22%2C%22mode%22%3A%22com.cloudbees.hudson.plugins.folder.Folder%22%2C%22from%22%3A%22%22%2C%22Submit%22%3A%22OK%22%7D&Submit=OK' --user user.name:YourAPIToken -H "Content-Type:application/x-www-form-urlencoded"
https://gist.github.com/stuart-warren/7786892
*/
var buildparams = build_params(custom_params);
//custom_params are optional
callback = callback || custom_params;
var mode = 'com.cloudbees.hudson.plugins.folder.Folder';
request(
{method: 'POST'
,url: build_url(NEWFOLDER, foldername, mode, buildparams)
,headers: { "content-type": "application/x-www-form-urlencoded"}
},
function(error, response, body) {
if ( error || response.statusCode !== 200 ) {
callback(error || true, response);
return;
}
var data = body;
callback(null, data);
}
);
},
update_config: function(jobname, modifyfunction, callback) {
/* Update a job config and allows you to pass in a function to modify the configuration
of the job you would like to update */
var self = this;
self.get_config_xml(jobname, function(error, data) {
if (error) {
callback(error, data);
return;
}
self.update_job(jobname, modifyfunction(data), function(error, data) {
if (error) {
callback(error, data);
return;
}
callback(null, data);
});
});
},
update_job: function(jobname, job_config, callback) {
/* Update a existing job based on a job_config string */
request(
{ method: 'POST'
,url: build_url(UPDATEJOB, jobname)
,body: job_config
,strictSSL:false
,headers: { "content-type": "application/xml"}
},
function(error, response, body) {
if ( error || response.statusCode !== 200 ) {
callback(error || true, response);
return;
}
var data = body;
callback(null, data);
}
);
},
create_view: function(viewName, mode, callback) {
if (callback === undefined){
callback = mode;
mode = null;
}
var formData = {name: viewName, mode: mode || 'hudson.model.ListView'};
formData.json = JSON.stringify(formData);
request({
method : 'POST', url: build_url(NEW_VIEW),
form : formData,
followRedirect: false
},
function (error, response, body) {
if (error || response.statusCode !== 302) {
callback(error || new Error(body || 'Unable to create view'));
return;
}
var data = {name: viewName, location: response.headers["Location"] || response.headers["location"]};
callback(null, data);
}
);
},
update_view: function(viewName, view_config, callback) {
/*
Update a view based on a view_config object
*/
view_config.json = JSON.stringify(view_config);
request(
{method: 'POST'
,url: build_url(CONFIG_VIEW, viewName)
,form: view_config
,headers: { "content-type": "application/x-www-form-urlencoded"}
},
function(error, response, body) {
if ( error ) {
callback(error || true, response);
return;
}
var data = body;
callback(null, data);
}
);
},
delete_view: function(viewName, callback) {
if (typeof callback !== 'function') {
callback = function(){};
}
request({
method : 'POST', url: build_url(DELETE_VIEW, viewName),
form : {json: {}},
followRedirect: false
},
function (error, response, body) {
if (error || response.statusCode !== 302) {
callback(error || new Error(body || 'Unable to delete view'));
return;
}
var data = {name: viewName, location: response.headers["Location"] || response.headers["location"]};
callback(null, data);
}
);
},
=======
},
all_installed_plugins: function(callback) {
/*
Get all installed plugins
*/
request({method: 'GET', url: build_url(PLUGINS + '?depth=1')}, function(error, response, body) {
if (response.statusCode !== 200 || error) {
callback(error || true, response);
return;
}
var data = JSON.parse(body.toString()).plugins;
callback(null, data);
});
},
install_plugin: function(plugin, callback) {
/*
Install a plugin
*/
var body = '<jenkins><install plugin="' + plugin +'" /></jenkins>';
request({method: 'POST',
url: build_url(INSTALL_PLUGIN),
'content-type': 'text/xml',
body: body},
function(error, response, body) {
if (response.statusCode !== 200 || error) {
callback(error || true, response);
return;
}
callback(null, body);
});
}
>>>>>>>
},
create_folder: function(foldername, callback) {
/*
Create a new folder
Needs Folder plugin in Jenkins: https://wiki.jenkins-ci.org/display/JENKINS/CloudBees+Folders+Plugin
curl -XPOST 'http://jenkins/createItem?name=FolderName&mode=com.cloudbees.hudson.plugins.folder.Folder&from=&json=%7B%22name%22%3A%22FolderName%22%2C%22mode%22%3A%22com.cloudbees.hudson.plugins.folder.Folder%22%2C%22from%22%3A%22%22%2C%22Submit%22%3A%22OK%22%7D&Submit=OK' --user user.name:YourAPIToken -H "Content-Type:application/x-www-form-urlencoded"
https://gist.github.com/stuart-warren/7786892
*/
var buildparams = build_params(custom_params);
//custom_params are optional
callback = callback || custom_params;
var mode = 'com.cloudbees.hudson.plugins.folder.Folder';
request(
{method: 'POST'
,url: build_url(NEWFOLDER, foldername, mode, buildparams)
,headers: { "content-type": "application/x-www-form-urlencoded"}
},
function(error, response, body) {
if ( error || response.statusCode !== 200 ) {
callback(error || true, response);
return;
}
var data = body;
callback(null, data);
}
);
},
update_config: function(jobname, modifyfunction, callback) {
/* Update a job config and allows you to pass in a function to modify the configuration
of the job you would like to update */
var self = this;
self.get_config_xml(jobname, function(error, data) {
if (error) {
callback(error, data);
return;
}
self.update_job(jobname, modifyfunction(data), function(error, data) {
if (error) {
callback(error, data);
return;
}
callback(null, data);
});
});
},
update_job: function(jobname, job_config, callback) {
/* Update a existing job based on a job_config string */
request(
{ method: 'POST'
,url: build_url(UPDATEJOB, jobname)
,body: job_config
,strictSSL:false
,headers: { "content-type": "application/xml"}
},
function(error, response, body) {
if ( error || response.statusCode !== 200 ) {
callback(error || true, response);
return;
}
var data = body;
callback(null, data);
}
);
},
create_view: function(viewName, mode, callback) {
if (callback === undefined){
callback = mode;
mode = null;
}
var formData = {name: viewName, mode: mode || 'hudson.model.ListView'};
formData.json = JSON.stringify(formData);
request({
method : 'POST', url: build_url(NEW_VIEW),
form : formData,
followRedirect: false
},
function (error, response, body) {
if (error || response.statusCode !== 302) {
callback(error || new Error(body || 'Unable to create view'));
return;
}
var data = {name: viewName, location: response.headers["Location"] || response.headers["location"]};
callback(null, data);
}
);
},
update_view: function(viewName, view_config, callback) {
/*
Update a view based on a view_config object
*/
view_config.json = JSON.stringify(view_config);
request(
{method: 'POST'
,url: build_url(CONFIG_VIEW, viewName)
,form: view_config
,headers: { "content-type": "application/x-www-form-urlencoded"}
},
function(error, response, body) {
if ( error ) {
callback(error || true, response);
return;
}
var data = body;
callback(null, data);
}
);
},
delete_view: function(viewName, callback) {
if (typeof callback !== 'function') {
callback = function(){};
}
request({
method : 'POST', url: build_url(DELETE_VIEW, viewName),
form : {json: {}},
followRedirect: false
},
function (error, response, body) {
if (error || response.statusCode !== 302) {
callback(error || new Error(body || 'Unable to delete view'));
return;
}
var data = {name: viewName, location: response.headers["Location"] || response.headers["location"]};
callback(null, data);
}
);
},
all_installed_plugins: function(callback) {
/*
Get all installed plugins
*/
request({method: 'GET', url: build_url(PLUGINS + '?depth=1')}, function(error, response, body) {
if (response.statusCode !== 200 || error) {
callback(error || true, response);
return;
}
tryParseJson(body, function(err, data) {
if(err) {
callback(err);
return;
}
callback(null, data.plugins);
});
});
},
install_plugin: function(plugin, callback) {
/*
Install a plugin
*/
var body = '<jenkins><install plugin="' + plugin +'" /></jenkins>';
request({method: 'POST',
url: build_url(INSTALL_PLUGIN),
'content-type': 'text/xml',
body: body},
function(error, response, body) {
if (response.statusCode !== 200 || error) {
callback(error || true, response);
return;
}
callback(null, body);
});
} |
<<<<<<<
node.style.width = pn.clientWidth + 'px'; //all wd the same
=======
//Note: when the browser resizes, it might adjust splitter's wd/hgh
//Note: the real wd/hgh might be bigger than 8px (since the width
//of total content is smaller than pn's width)
//We 'cheat' by align to top or bottom depending on z.colps
if (bfcolps) {
pn.vAlign = "top";
pn.style.backgroundPosition = "top left";
} else {
pn.vAlign = "bottom";
pn.style.backgroundPosition = "bottom left";
}
node.style.width = ""; // clean width
node.style.width = "100%"; // Sandbox-Splitter: the width should be same as parent
>>>>>>>
node.style.width = "100%"; // Sandbox-Splitter: the width should be same as parent |
<<<<<<<
hdcol = hdfaker.firstChild,
var ftcol = ftfaker ? ftfaker.firstChild : null,
=======
hdcol = hdfaker.firstChild;
var ftcol = ftfaker ? ftfaker.firstChild : null,
>>>>>>>
var ftcol = ftfaker ? ftfaker.firstChild : null, |
<<<<<<<
else if (!zk.mobile)
zk(db.getInputNode()).focus();
=======
else
if (!zk.ios) // prevent ios native keyboard showed
zk(db.getInputNode()).focus();
>>>>>>>
else if (!zk.mobile) // prevent ios native keyboard showed
zk(db.getInputNode()).focus(); |
<<<<<<<
if (this._shadow) this._shadow.hide();
pp.style.display = 'none';
pp.className = db.$s('popup');
=======
if (this._shadow) {
// B65-ZK-1904: Make shadow behavior the same as ComboWidget
this._shadow.destroy();
this._shadow = null;
}
var zcls = db.getZclass();
pp.style.display = "none";
pp.className = zcls + "-pp";
>>>>>>>
if (this._shadow) {
// B65-ZK-1904: Make shadow behavior the same as ComboWidget
this._shadow.destroy();
this._shadow = null;
}
pp.style.display = 'none';
pp.className = db.$s('popup'); |
<<<<<<<
)))
.add('Warning', withInfo()(() => (
<Snackbar status='warning' onDismiss={action('Dismissed')}>Yer suspended</Snackbar>
=======
)))
.add('Large', withInfo()(() => (
<Snackbar maxWidth={700}>This one is large enough to get into some bacon ipsum dolor amet pork loin tri-tip turkey capicola. Rump doner short ribs biltong burgdoggen meatloaf. Prosciutto pork loin bacon, biltong landjaeger salami ham spare ribs flank cupim porchetta leberkas.</Snackbar>
>>>>>>>
)))
.add('Warning', withInfo()(() => (
<Snackbar status='warning' onDismiss={action('Dismissed')}>Yer suspended</Snackbar>
)))
.add('Large', withInfo()(() => (
<Snackbar maxWidth={700}>This one is large enough to get into some bacon ipsum dolor amet pork loin tri-tip turkey capicola. Rump doner short ribs biltong burgdoggen meatloaf. Prosciutto pork loin bacon, biltong landjaeger salami ham spare ribs flank cupim porchetta leberkas.</Snackbar> |
<<<<<<<
=======
<div className="links">
<a
href="https://github.com/zeit/use-swr"
target="_blank"
rel="noopener noreferrer"
>
<GitHub />
</a>
</div>
>>>>>>>
<div className="links">
<a
href="https://github.com/zeit/swr"
target="_blank"
rel="noopener noreferrer"
>
<GitHub />
</a>
</div>
<<<<<<<
<pre>
<code>{`import useSWR from '@zeit/swr'
=======
</div>
<div className="explanation">
<h3>Example</h3>
<pre>
<code>{`import useSWR from 'use-swr'
>>>>>>>
</div>
<div className="explanation">
<h3>Example</h3>
<pre>
<code>{`import useSWR from '@zeit/swr'
<<<<<<<
<p>
In this example, the React Hook <code>useSWR</code> accepts a{' '}
<code>key</code> and a <code>fetch</code> function.
<br />
<code>key</code> is a unique identifier of the data, normally the URL
of the API. Then <code>key</code> will be passed to <code>fetch</code>
, which returns the data asynchronously.
</p>
=======
<p>
In this example, the React Hook <code>useSWR</code> accepts a{' '}
<code>key</code> and a <code>fetch</code> function. <code>key</code>{' '}
is a unique identifier of the data, normally the URL of the API. Then{' '}
<code>key</code> will be passed to <code>fetch</code>, which returns
the data asynchronously.
</p>
>>>>>>>
<p>
In this example, the React Hook <code>useSWR</code> accepts a{' '}
<code>key</code> and a <code>fetch</code> function. <code>key</code>{' '}
is a unique identifier of the data, normally the URL of the API. Then{' '}
<code>key</code> will be passed to <code>fetch</code>, which returns
the data asynchronously.
</p>
<<<<<<<
<Heading>Fast Navigation</Heading>
<p>
When navigating through pages or sections inside a system (e.g.: in
Next.js), or when pressing the back button, it’s often desirable to
load a cached version of the data.
</p>
<p>
To achieve eventual consistency, SWR will automatically revalidate the
data from the origin as soon as data is rendered from the cache.
</p>
<div className="video">
<video controls style={{ maxHeight: 600 }}>
<source
src="https://assets.zeit.co/video/upload/q_auto/v1572278352/swr/example-videos/fast-navigation.mp4"
type="video/mp4"
/>
</video>
<figure>
SWR will make cached pages render much faster, then update the cache
with the latest data.
</figure>
</div>
</div>
<div className="explanation">
<Heading>Refetch on Interval</Heading>
=======
<h3>Refetch on Interval</h3>
>>>>>>>
<Heading>Fast Navigation</Heading>
<p>
When navigating through pages or sections inside a system (e.g.: in
Next.js), or when pressing the back button, it’s often desirable to
load a cached version of the data.
</p>
<p>
To achieve eventual consistency, SWR will automatically revalidate the
data from the origin as soon as data is rendered from the cache.
</p>
<div className="video">
<video controls style={{ maxHeight: 600 }}>
<source
src="https://assets.zeit.co/video/upload/q_auto/v1572278352/swr/example-videos/fast-navigation.mp4"
type="video/mp4"
/>
</video>
<figure>
SWR will make cached pages render much faster, then update the cache
with the latest data.
</figure>
</div>
</div>
<div className="explanation">
<Heading>Refetch on Interval</Heading> |
<<<<<<<
=======
template.pageTransitioningOut = true;
template.fullscreenVideoActive = false;
>>>>>>>
template.fullscreenVideoActive = false; |
<<<<<<<
resizeRipple(ripple);
=======
>>>>>>>
resizeRipple(ripple);
<<<<<<<
var footer = document.querySelector('footer');
var i18n = document.createElement('io-i18n');
i18n.msgid = 'home';
=======
var i18n = document.createElement('i18n-msg');
>>>>>>>
var footer = document.querySelector('footer');
var i18n = document.createElement('io-i18n'); |
<<<<<<<
"issue342.svg": "Issue #342: text gradient",
=======
"issue620.svg": "Issue #620: em font size",
"issue320.svg": "Issue #320: rem font size",
>>>>>>>
"issue342.svg": "Issue #342: text gradient",
"issue620.svg": "Issue #620: em font size",
"issue320.svg": "Issue #320: rem font size", |
<<<<<<<
if (typeof(CanvasRenderingContext2D) != 'undefined') {
CanvasRenderingContext2D.prototype.drawSvg = function(s, dx, dy, dw, dh, opts) {
var cOpts = {
=======
if (typeof CanvasRenderingContext2D != 'undefined') {
CanvasRenderingContext2D.prototype.drawSvg = function(s, dx, dy, dw, dh) {
canvg(this.canvas, s, {
>>>>>>>
if (typeof CanvasRenderingContext2D != 'undefined') {
CanvasRenderingContext2D.prototype.drawSvg = function(s, dx, dy, dw, dh, opts) {
var cOpts = { |
<<<<<<<
import week13 from './race-times/week13';
import special from './race-times/special';
=======
// import week13 from './race-times/week13';
>>>>>>>
// import week13 from './race-times/week13';
import special from './race-times/special';
<<<<<<<
...week13,
...special,
=======
// ...week13,
>>>>>>>
// ...week13,
...special, |
<<<<<<<
// whether to use fullscreen flag dropdown for mobile useragents
useMobileFullscreenDropdown: true,
=======
autoComplete: 'off',
>>>>>>>
// whether to use fullscreen flag dropdown for mobile useragents
useMobileFullscreenDropdown: true,
autoComplete: 'off', |
<<<<<<<
=======
$(".ia-single--screenshots").addClass("hide");
$(".ia-single--left").removeClass("ia-single--left").addClass("ia-single--left--wide");
$(".dev_milestone-container__body").removeClass("hide");
// Set the panels height to the tallest one's height
page.setMaxHeight($(".milestone-panel"));
>>>>>>>
<<<<<<<
$(".ia-single--right").append(templates.screens);
=======
$(".ia-single--right").append(templates.live.screens);
} else {
$(".button.js-expand").hide();
>>>>>>>
$(".ia-single--right").append(templates.screens);
$(".ia-single--right").append(templates.live.screens);
} else {
$(".button.js-expand").hide(); |
<<<<<<<
},
{
name: 'Data Structures',
instructor: 'freeCodeCamp',
url: 'https://www.youtube.com/watch?v=RBSGKlAvoiM&ab_channel=freeCodeCamp.org',
description: 'Data Structures Easy to Advanced Course. This course teaches data structures to beginners using high quality animations to represent the data structures visually.',
image: '',
tags: ['data structures', 'Java']
}
=======
},
{
name: "The Cherno C++ Playlist",
instructor: "Yan Chernikov",
url: "https://www.youtube.com/playlist?list=PLlrATfBNZ98dudnM48yfGUldqGD0S4FFb",
description: "Everything you need to know about C++, this series focuses on various fundamentals and working of C++",
image: "cpp_playlist.jpg",
tags: ["C++", "Technology", "C", "Cpp"],
},
>>>>>>>
},
{
name: "The Cherno C++ Playlist",
instructor: "Yan Chernikov",
url: "https://www.youtube.com/playlist?list=PLlrATfBNZ98dudnM48yfGUldqGD0S4FFb",
description: "Everything you need to know about C++, this series focuses on various fundamentals and working of C++",
image: "cpp_playlist.jpg",
tags: ["C++", "Technology", "C", "Cpp"],
},
{
name: 'Data Structures',
instructor: 'freeCodeCamp',
url: 'https://www.youtube.com/watch?v=RBSGKlAvoiM&ab_channel=freeCodeCamp.org',
description: 'Data Structures Easy to Advanced Course. This course teaches data structures to beginners using high quality animations to represent the data structures visually.',
image: '',
tags: ['data structures', 'Java']
} |
<<<<<<<
{
name:"Learn C++",
instructor: "Alex",
url:"https://www.learncpp.com/",
description:"LearnCpp.com is a free website devoted to teaching you how to program in C++.",
image: "",
tags:["C++"]
},
=======
{
name: "Flutter Tutorial",
instructor: "MTECHVIRAL",
url: "https://www.youtube.com/watch?v=qWL1lGchpRA&list=PLR2qQy0Zxs_UdqAcaipPR3CG1Ly57UlhV",
description: "Learn Flutter from basic to advance with some awesome projects to make",
image: "",
tags: ["Flutter","Dart","App devlopment"],
}
>>>>>>>
{
name:"Learn C++",
instructor: "Alex",
url:"https://www.learncpp.com/",
description:"LearnCpp.com is a free website devoted to teaching you how to program in C++.",
image: "",
tags:["C++"]
},
{
name: "Flutter Tutorial",
instructor: "MTECHVIRAL",
url: "https://www.youtube.com/watch?v=qWL1lGchpRA&list=PLR2qQy0Zxs_UdqAcaipPR3CG1Ly57UlhV",
description: "Learn Flutter from basic to advance with some awesome projects to make",
image: "",
tags: ["Flutter","Dart","App devlopment"],
} |
<<<<<<<
},
{
name:'Ethical Hacking using Python',
instructor: 'Alexis Ahmed',
url:'https://www.mindsmapped.com/courses/python-for-ethical-hacking-beginners-to-advanced-level/',
description:'Ethical Hacking is the process of identifying potential threats and vulnerabilities on a computer or network through advanced tools and techniques. This course explains how to use Python to create ethical hacking tools and scripts.',
image: '',
tags:['Python', 'Hacking','Scripting','Beginner to Advanced']
},
{
name:'Introduction to JavaScript',
instructor: 'freeCodeCamp',
url:'https://www.freecodecamp.org/learn/javascript-algorithms-and-data-structures/basic-javascript/',
description:`javascript algorithms and data structures certification`,
image: '',
tags:[ 'javascript', 'web']
},
{
name: "Angular Crash Course for Beginners",
instructor: "Hitesh Choudhary",
url: "https://www.youtube.com/watch?v=T_Fe4IaG0KU",
description: "In the first part of the video, we will talk about details of Angular and some common questions about it.In the second part of Angular crash course video, we will create a basic project to get hands-on with Angular.",
image: "",
tags: ["Angular", "typescript", "javascript"],
},
{
name:'Data Structure and Algorithms',
instructor: 'Rahul Garg',
url:'https://www.youtube.com/watch?v=L0POiNCx9eY&list=PLqCERDVVgUd4ItS-racj9c6jCjw0cxAhP&index=1',
description:'Intro to DS and Algo',
image: '',
tags:['Data Structures', 'Java']
},
{
name:'Data Structure and Algorithms',
instructor: 'Vaibhav Goel',
url:'https://dev.to/dsc_ciet/simple-app-state-management-ehi',
description:'Simple App State-Management in Flutter',
image: 'goelvaibhav009.png',
tags:['flutter', 'dart', 'dev']
},
{
name: "React Native Crash Course 2020",
instructor: "Brad Traversy",
url:"https://www.youtube.com/watch?v=Hf4MJH0jDb4",
description: "In this course we will talk about what React Native is and get setup, look at some of the built in components and build a small shopping list app",
image: "",
tags: ["Javascript", "react", "react native" ],
},{
name:'Flutter Tutorial for Beginners',
instructor: 'Net ninja',
url:'https://www.youtube.com/playlist?list=PL4cUxeGkcC9jLYyp2Aoh6hcWuxFDX6PBJ',
description:'In this Flutter tutorial for Beginners series, I will show you how to use Flutter (and Dart) to create Android and iOS apps from scratch. We will learn all about widgets, packages, assets & asynchronous code to create a World Time app, as well as 2 other mini apps to put your Flutter skills to good use!',
image: '',
tags:['flutter', 'App development']
},
{
name:'Clustering Data in Google Maps and React',
instructor: 'Leigh Halliday',
url:'https://www.youtube.com/watch?v=-NI5e_GTIko&t=1734s',
description:'Loading remote data from an API,clustering it, and zooming in to expand a cluster.',
image: '',
tags:['React', 'Javascript','Google Maps API']
},
{
name:'Deep Learning with tensorflow',
instructor: 'IBM - DL0120EN',
url:'Intro to tensorflow, CNN, RNN,Autoencoders,Scaling',
description:'Learn to use tensorflow and more details of CNN and RNN networks',
image: 'https://www.edx.org/course/deep-learning-with-tensorflow',
tags:['CNN','Tensorflow','RNN']
=======
},
{
name: 'Ethical Hacking using Python',
instructor: 'Alexis Ahmed',
url: 'https://www.mindsmapped.com/courses/python-for-ethical-hacking-beginners-to-advanced-level/',
description: 'Ethical Hacking is the process of identifying potential threats and vulnerabilities on a computer or network through advanced tools and techniques. This course explains how to use Python to create ethical hacking tools and scripts.',
image: '',
tags: ['Python', 'Hacking', 'Scripting', 'Beginner to Advanced']
},
{
name: 'Introduction to JavaScript',
instructor: 'freeCodeCamp',
url: 'https://www.freecodecamp.org/learn/javascript-algorithms-and-data-structures/basic-javascript/',
description: `javascript algorithms and data structures certification`,
image: '',
tags: ['javascript', 'web']
},
{
name: "Angular Crash Course for Beginners",
instructor: "Hitesh Choudhary",
url: "https://www.youtube.com/watch?v=T_Fe4IaG0KU",
description: "In the first part of the video, we will talk about details of Angular and some common questions about it.In the second part of Angular crash course video, we will create a basic project to get hands-on with Angular.",
image: "",
tags: ["Angular", "typescript", "javascript"],
},
{
name: 'Data Structure and Algorithms',
instructor: 'Rahul Garg',
url: 'https://www.youtube.com/watch?v=L0POiNCx9eY&list=PLqCERDVVgUd4ItS-racj9c6jCjw0cxAhP&index=1',
description: 'Intro to DS and Algo',
image: '',
tags: ['Data Structures', 'Java']
},
{
name: 'Data Structure and Algorithms',
instructor: 'Vaibhav Goel',
url: 'https://dev.to/dsc_ciet/simple-app-state-management-ehi',
description: 'Simple App State-Management in Flutter',
image: 'goelvaibhav009.png',
tags: ['flutter', 'dart', 'dev']
},
{
name: "React Native Crash Course 2020",
instructor: "Brad Traversy",
url: "https://www.youtube.com/watch?v=Hf4MJH0jDb4",
description: "In this course we will talk about what React Native is and get setup, look at some of the built in components and build a small shopping list app",
image: "",
tags: ["Javascript", "react", "react native"],
}, {
name: 'Flutter Tutorial for Beginners',
instructor: 'Net ninja',
url: 'https://www.youtube.com/playlist?list=PL4cUxeGkcC9jLYyp2Aoh6hcWuxFDX6PBJ',
description: 'In this Flutter tutorial for Beginners series, I will show you how to use Flutter (and Dart) to create Android and iOS apps from scratch. We will learn all about widgets, packages, assets & asynchronous code to create a World Time app, as well as 2 other mini apps to put your Flutter skills to good use!',
image: '',
tags: ['flutter', 'App development']
},
{
name: 'Clustering Data in Google Maps and React',
instructor: 'Leigh Halliday',
url: 'https://www.youtube.com/watch?v=-NI5e_GTIko&t=1734s',
description: 'Loading remote data from an API,clustering it, and zooming in to expand a cluster.',
image: '',
tags: ['React', 'Javascript', 'Google Maps API']
},
{
name: 'CSS Animation Tutorial',
instructor: 'Net Ninja',
url: 'https://www.youtube.com/playlist?list=PL4cUxeGkcC9iGYgmEd2dm3zAKzyCGDtM5',
description: 'Starting with the basics, including keyframes, transforms, and the animation property',
image: 'artworknetninja.jpg',
tags: ['CSS', 'CSS3', 'Animations', 'Front-end']
}
>>>>>>>
},
{
name:'Ethical Hacking using Python',
instructor: 'Alexis Ahmed',
url:'https://www.mindsmapped.com/courses/python-for-ethical-hacking-beginners-to-advanced-level/',
description:'Ethical Hacking is the process of identifying potential threats and vulnerabilities on a computer or network through advanced tools and techniques. This course explains how to use Python to create ethical hacking tools and scripts.',
image: '',
tags:['Python', 'Hacking','Scripting','Beginner to Advanced']
},
{
name:'Introduction to JavaScript',
instructor: 'freeCodeCamp',
url:'https://www.freecodecamp.org/learn/javascript-algorithms-and-data-structures/basic-javascript/',
description:`javascript algorithms and data structures certification`,
image: '',
tags:[ 'javascript', 'web']
},
{
name: "Angular Crash Course for Beginners",
instructor: "Hitesh Choudhary",
url: "https://www.youtube.com/watch?v=T_Fe4IaG0KU",
description: "In the first part of the video, we will talk about details of Angular and some common questions about it.In the second part of Angular crash course video, we will create a basic project to get hands-on with Angular.",
image: "",
tags: ["Angular", "typescript", "javascript"],
},
{
name:'Data Structure and Algorithms',
instructor: 'Rahul Garg',
url:'https://www.youtube.com/watch?v=L0POiNCx9eY&list=PLqCERDVVgUd4ItS-racj9c6jCjw0cxAhP&index=1',
description:'Intro to DS and Algo',
image: '',
tags:['Data Structures', 'Java']
},
{
name:'Data Structure and Algorithms',
instructor: 'Vaibhav Goel',
url:'https://dev.to/dsc_ciet/simple-app-state-management-ehi',
description:'Simple App State-Management in Flutter',
image: 'goelvaibhav009.png',
tags:['flutter', 'dart', 'dev']
},
{
name: "React Native Crash Course 2020",
instructor: "Brad Traversy",
url:"https://www.youtube.com/watch?v=Hf4MJH0jDb4",
description: "In this course we will talk about what React Native is and get setup, look at some of the built in components and build a small shopping list app",
image: "",
tags: ["Javascript", "react", "react native" ],
},{
name:'Flutter Tutorial for Beginners',
instructor: 'Net ninja',
url:'https://www.youtube.com/playlist?list=PL4cUxeGkcC9jLYyp2Aoh6hcWuxFDX6PBJ',
description:'In this Flutter tutorial for Beginners series, I will show you how to use Flutter (and Dart) to create Android and iOS apps from scratch. We will learn all about widgets, packages, assets & asynchronous code to create a World Time app, as well as 2 other mini apps to put your Flutter skills to good use!',
image: '',
tags:['flutter', 'App development']
},
{
name:'Clustering Data in Google Maps and React',
instructor: 'Leigh Halliday',
url:'https://www.youtube.com/watch?v=-NI5e_GTIko&t=1734s',
description:'Loading remote data from an API,clustering it, and zooming in to expand a cluster.',
image: '',
tags:['React', 'Javascript','Google Maps API']
},
{
name:'Deep Learning with tensorflow',
instructor: 'IBM - DL0120EN',
url:'Intro to tensorflow, CNN, RNN,Autoencoders,Scaling',
description:'Learn to use tensorflow and more details of CNN and RNN networks',
image: 'https://www.edx.org/course/deep-learning-with-tensorflow',
tags:['CNN','Tensorflow','RNN']
},
{
name: 'Ethical Hacking using Python',
instructor: 'Alexis Ahmed',
url: 'https://www.mindsmapped.com/courses/python-for-ethical-hacking-beginners-to-advanced-level/',
description: 'Ethical Hacking is the process of identifying potential threats and vulnerabilities on a computer or network through advanced tools and techniques. This course explains how to use Python to create ethical hacking tools and scripts.',
image: '',
tags: ['Python', 'Hacking', 'Scripting', 'Beginner to Advanced']
},
{
name: 'Introduction to JavaScript',
instructor: 'freeCodeCamp',
url: 'https://www.freecodecamp.org/learn/javascript-algorithms-and-data-structures/basic-javascript/',
description: `javascript algorithms and data structures certification`,
image: '',
tags: ['javascript', 'web']
},
{
name: "Angular Crash Course for Beginners",
instructor: "Hitesh Choudhary",
url: "https://www.youtube.com/watch?v=T_Fe4IaG0KU",
description: "In the first part of the video, we will talk about details of Angular and some common questions about it.In the second part of Angular crash course video, we will create a basic project to get hands-on with Angular.",
image: "",
tags: ["Angular", "typescript", "javascript"],
},
{
name: 'Data Structure and Algorithms',
instructor: 'Rahul Garg',
url: 'https://www.youtube.com/watch?v=L0POiNCx9eY&list=PLqCERDVVgUd4ItS-racj9c6jCjw0cxAhP&index=1',
description: 'Intro to DS and Algo',
image: '',
tags: ['Data Structures', 'Java']
},
{
name: 'Data Structure and Algorithms',
instructor: 'Vaibhav Goel',
url: 'https://dev.to/dsc_ciet/simple-app-state-management-ehi',
description: 'Simple App State-Management in Flutter',
image: 'goelvaibhav009.png',
tags: ['flutter', 'dart', 'dev']
},
{
name: "React Native Crash Course 2020",
instructor: "Brad Traversy",
url: "https://www.youtube.com/watch?v=Hf4MJH0jDb4",
description: "In this course we will talk about what React Native is and get setup, look at some of the built in components and build a small shopping list app",
image: "",
tags: ["Javascript", "react", "react native"],
}, {
name: 'Flutter Tutorial for Beginners',
instructor: 'Net ninja',
url: 'https://www.youtube.com/playlist?list=PL4cUxeGkcC9jLYyp2Aoh6hcWuxFDX6PBJ',
description: 'In this Flutter tutorial for Beginners series, I will show you how to use Flutter (and Dart) to create Android and iOS apps from scratch. We will learn all about widgets, packages, assets & asynchronous code to create a World Time app, as well as 2 other mini apps to put your Flutter skills to good use!',
image: '',
tags: ['flutter', 'App development']
},
{
name: 'Clustering Data in Google Maps and React',
instructor: 'Leigh Halliday',
url: 'https://www.youtube.com/watch?v=-NI5e_GTIko&t=1734s',
description: 'Loading remote data from an API,clustering it, and zooming in to expand a cluster.',
image: '',
tags: ['React', 'Javascript', 'Google Maps API']
},
{
name: 'CSS Animation Tutorial',
instructor: 'Net Ninja',
url: 'https://www.youtube.com/playlist?list=PL4cUxeGkcC9iGYgmEd2dm3zAKzyCGDtM5',
description: 'Starting with the basics, including keyframes, transforms, and the animation property',
image: 'artworknetninja.jpg',
tags: ['CSS', 'CSS3', 'Animations', 'Front-end']
} |
<<<<<<<
{
name: "Python Tutorial for Beginners",
instructor: "Codewithharry",
url:
"https://www.youtube.com/playlist?list=PLu0W_9lII9ajLcqRcj4PoEihkukF_OTzA",
description:
"This is python tutorial for beginners in hindi",
image: "",
tags: ["Python", "Hindi"],
},
=======
{
name: "Fullstack React GraphQL TypeScript Tutorial",
instructor: "Ben Awad",
url: "https://www.youtube.com/watch?v=I6ypD7qv3Z8",
description: "A fullstack project course from scratch using React, Next.js, TypeScript, GraphQL, NodeJs, ORM, PostgreSQL.",
image: "",
tags: ["react", "graphql", "typescript", "javascript"],
},
{
name: "Data Structures (in Python)",
instructor: "LucidProgramming",
url: "https://goo.gl/TdJpMi",
description:
"get familiar with common data structures that are frequently tested on in coding interviews.",
image: "",
tags: ["python", "data structures"],
},
{
name: "Svelte Tutorial for Beginners",
instructor: "NetNinja",
url:
"https://www.youtube.com/playlist?list=PL4cUxeGkcC9hlbrVO_2QFVqVPhlZmz7tO",
description:
"in this Svelte tutorial for beginners I'll explain what Svelte is, what we'll be making & what you'll already need to know before starting",
image: "svelte-beginner.jpg",
tags: ["Technology", "Framework", "javascript", "web", "svelte"],
},
{
name:'Introduction To Python Programming',
instructor: 'Avinash Jain, TheCodex',
url:'https://www.udemy.com/course/pythonforbeginnersintro/',
description:'A Quick and Easy Intro into Python Programming',
image: '',
tags:['python', 'oops']
},
{
name: "Flutter Firebase - The Full Coursee",
instructor: "Jeff Delaney",
url: "https://fireship.io/courses/flutter-firebase/",
description: "This is a project-based course that will teach you how to build a multiple choice quiz app, inspired by apps like Duolingo and QuizUp. The app implements user authentication (Sign in with Google or Apple), tracks quiz progress in Firestore, runs animations, and shares data between screens.",
image: "",
tags: ["flutter", "firebase", "app"],
},
{
name: "Mini-curso de TypeScript",
instructor: "Willian Justen",
url: "https://www.youtube.com/watch?v=mRixno_uE2o&list=PLlAbYrWSYTiPanrzauGa7vMuve7_vnXG_",
description: "This is a course for beginners about typescript",
image: "",
tags: ["javascript", "typescript", "web", "Portuguese"],
},
{
name:'Flutter Tutorials for Beginners',
instructor: 'The Growing Developer',
url:'https://www.youtube.com/watch?v=yTFr11wABHw&list=PLJftqVZ-OFLi3NjZk0AG5T2U59xuerhsj',
description:'The series flutter tutorial for beginners will keep on continuing from beginner level to advance and we will see how to use flutter in android studio as well as vscode.',
image: '',
tags:['Flutter', 'Firebase','App development']
}
>>>>>>>
{
name: "Python Tutorial for Beginners",
instructor: "Codewithharry",
url:
"https://www.youtube.com/playlist?list=PLu0W_9lII9ajLcqRcj4PoEihkukF_OTzA",
description:
"This is python tutorial for beginners in hindi",
image: "",
tags: ["Python", "Hindi"],
},
{
name: "Fullstack React GraphQL TypeScript Tutorial",
instructor: "Ben Awad",
url: "https://www.youtube.com/watch?v=I6ypD7qv3Z8",
description: "A fullstack project course from scratch using React, Next.js, TypeScript, GraphQL, NodeJs, ORM, PostgreSQL.",
image: "",
tags: ["react", "graphql", "typescript", "javascript"],
},
{
name: "Data Structures (in Python)",
instructor: "LucidProgramming",
url: "https://goo.gl/TdJpMi",
description:
"get familiar with common data structures that are frequently tested on in coding interviews.",
image: "",
tags: ["python", "data structures"],
},
{
name: "Svelte Tutorial for Beginners",
instructor: "NetNinja",
url:
"https://www.youtube.com/playlist?list=PL4cUxeGkcC9hlbrVO_2QFVqVPhlZmz7tO",
description:
"in this Svelte tutorial for beginners I'll explain what Svelte is, what we'll be making & what you'll already need to know before starting",
image: "svelte-beginner.jpg",
tags: ["Technology", "Framework", "javascript", "web", "svelte"],
},
{
name:'Introduction To Python Programming',
instructor: 'Avinash Jain, TheCodex',
url:'https://www.udemy.com/course/pythonforbeginnersintro/',
description:'A Quick and Easy Intro into Python Programming',
image: '',
tags:['python', 'oops']
},
{
name: "Flutter Firebase - The Full Coursee",
instructor: "Jeff Delaney",
url: "https://fireship.io/courses/flutter-firebase/",
description: "This is a project-based course that will teach you how to build a multiple choice quiz app, inspired by apps like Duolingo and QuizUp. The app implements user authentication (Sign in with Google or Apple), tracks quiz progress in Firestore, runs animations, and shares data between screens.",
image: "",
tags: ["flutter", "firebase", "app"],
},
{
name: "Mini-curso de TypeScript",
instructor: "Willian Justen",
url: "https://www.youtube.com/watch?v=mRixno_uE2o&list=PLlAbYrWSYTiPanrzauGa7vMuve7_vnXG_",
description: "This is a course for beginners about typescript",
image: "",
tags: ["javascript", "typescript", "web", "Portuguese"],
},
{
name:'Flutter Tutorials for Beginners',
instructor: 'The Growing Developer',
url:'https://www.youtube.com/watch?v=yTFr11wABHw&list=PLJftqVZ-OFLi3NjZk0AG5T2U59xuerhsj',
description:'The series flutter tutorial for beginners will keep on continuing from beginner level to advance and we will see how to use flutter in android studio as well as vscode.',
image: '',
tags:['Flutter', 'Firebase','App development']
} |
<<<<<<<
name: "Laravel PHP Framework Tutorial - Full Course 6.5 Hours (2020)",
instructor: "Sarthak",
url:
"https://www.youtube.com/watch?v=BXiHvgrJfkg",
description:
"Learn Laravel PHP framework from very basics to advanced using Laravel Livewire by creating advanced todo list project in this full course in 6.5 hours",
image: "",
tags: ["Laravel"],
},
name:'JavaScript: Understanding the Weird Parts',
=======
name: "Deep Learning Intuitions",
instructor: "3Blue1Brown",
url:
"https://www.youtube.com/watch?v=aircAruvnKk&list=PLZHQObOWTQDNU6R1_67000Dx_ZCJB-3pi",
description:
"Beginner friendly Deep Learning Intuition and then adding in a deep dive towards how Neural Networks work",
image: "artworknetninja.jpg",
tags: ["Deep Learning", "Visualization", "Animations", "Neural Networks"],
},
{
name: 'Java For Beginners',
instructor: 'Anuj Kumar Sharma',
url: 'https://www.youtube.com/watch?v=aQatrXw0njs&t=205s',
description: 'Crash Course Of Java for beginners',
image: '',
tags: ['Programming','Java','Hindi']
},
{ name:'JavaScript: Understanding the Weird Parts',
>>>>>>>
name: "Laravel PHP Framework Tutorial - Full Course 6.5 Hours (2020)",
instructor: "Sarthak",
url:
"https://www.youtube.com/watch?v=BXiHvgrJfkg",
description:
"Learn Laravel PHP framework from very basics to advanced using Laravel Livewire by creating advanced todo list project in this full course in 6.5 hours",
image: "",
tags: ["Laravel"],
},
{
name: "Deep Learning Intuitions",
instructor: "3Blue1Brown",
url:
"https://www.youtube.com/watch?v=aircAruvnKk&list=PLZHQObOWTQDNU6R1_67000Dx_ZCJB-3pi",
description:
"Beginner friendly Deep Learning Intuition and then adding in a deep dive towards how Neural Networks work",
image: "artworknetninja.jpg",
tags: ["Deep Learning", "Visualization", "Animations", "Neural Networks"],
},
{
name: 'Java For Beginners',
instructor: 'Anuj Kumar Sharma',
url: 'https://www.youtube.com/watch?v=aQatrXw0njs&t=205s',
description: 'Crash Course Of Java for beginners',
image: '',
tags: ['Programming','Java','Hindi']
},
{ name:'JavaScript: Understanding the Weird Parts', |
<<<<<<<
return Promise.resolve();
})
.then(function() {
return Page.checkIfTemplatesExist(originalPath);
})
.then(function(templateInfo) {
renderVars.localTemplateExists = templateInfo.localTemplateExists;
renderVars.globalTemplateExists = templateInfo.globalTemplateExists;
})
.then(function() {
=======
})
.then(() => {
return PageGroupRelation.findByPage(renderVars.page);
})
.then((pageGroupRelation) => {
if (pageGroupRelation != null) {
renderVars.pageRelatedGroup = pageGroupRelation.relatedGroup;
}
})
.then(function() {
>>>>>>>
return Promise.resolve();
})
.then(function() {
return Page.checkIfTemplatesExist(originalPath);
})
.then(function(templateInfo) {
renderVars.localTemplateExists = templateInfo.localTemplateExists;
renderVars.globalTemplateExists = templateInfo.globalTemplateExists;
})
.then(() => {
return PageGroupRelation.findByPage(renderVars.page);
})
.then((pageGroupRelation) => {
if (pageGroupRelation != null) {
renderVars.pageRelatedGroup = pageGroupRelation.relatedGroup;
}
})
.then(function() {
<<<<<<<
var userRelatedGroups
UserGroupRelation.findAllRelationForUser(req.user)
.then((groupRelations) => {
userRelatedGroups = groupRelations.map(relation => relation.relatedGroup);
return Promise.resolve();
}).then(() => {
return Page.findTemplate(getPathFromRequest(req));
}).then((template) => {
debug('not found page user group resolver : ', userRelatedGroups);
return res.render('customlayout-selector/not_found', {
author: {},
page: false,
userRelatedGroups: userRelatedGroups,
template: template,
});
});
=======
return res.render('customlayout-selector/not_found', {
author: {},
page: false,
});
>>>>>>>
var userRelatedGroups
UserGroupRelation.findAllRelationForUser(req.user)
.then((groupRelations) => {
userRelatedGroups = groupRelations.map(relation => relation.relatedGroup);
return Promise.resolve();
}).then(() => {
return Page.findTemplate(getPathFromRequest(req));
}).then((template) => {
debug('not found page user group resolver : ', userRelatedGroups);
return res.render('customlayout-selector/not_found', {
author: {},
page: false,
userRelatedGroups: userRelatedGroups,
template: template,
});
});
return res.render('customlayout-selector/not_found', {
author: {},
page: false,
}); |
<<<<<<<
const ErrorV3 = require('../../models/vo/error-apiv3');
=======
const { body } = require('express-validator/check');
>>>>>>>
const ErrorV3 = require('../../models/vo/error-apiv3');
const { body } = require('express-validator/check'); |
<<<<<<<
import md5 from 'md5';
=======
import PropTypes from 'prop-types';
>>>>>>>
import md5 from 'md5';
import PropTypes from 'prop-types'; |
<<<<<<<
const currentUserElem = document.getElementById('growi-current-user');
if (currentUserElem != null) {
this.currentUser = JSON.parse(currentUserElem.textContent);
}
const isSharedPageElem = document.getElementById('is-shared-page');
this.isSharedUser = (isSharedPageElem != null);
=======
>>>>>>>
const isSharedPageElem = document.getElementById('is-shared-page');
this.isSharedUser = (isSharedPageElem != null); |
<<<<<<<
/**
* Change restrictGuestMode
*/
changeRestrictGuestMode(restrictGuestModeLabel) {
this.setState({ currentRestrictGuestMode: restrictGuestModeLabel });
}
/**
* Change pageCompleteDeletionAuthority
*/
changePageCompleteDeletionAuthority(pageCompleteDeletionAuthorityLabel) {
this.setState({ currentpageCompleteDeletionAuthority: pageCompleteDeletionAuthorityLabel });
}
/**
* Switch hideRestrictedByOwner
*/
switchIsHideRestrictedByOwner() {
this.setState({ isHideRestrictedByOwner: !this.state.isHideRestrictedByOwner });
}
/**
* Switch hideRestrictedByGroup
*/
switchIsHideRestrictedByGroup() {
this.setState({ isHideRestrictedByGroup: !this.state.isHideRestrictedByGroup });
}
/**
* Update restrictGuestMode
* @memberOf AdminSecuritySettingContainer
* @return {string} Appearance
*/
async updateRestrictGuestMode() {
const response = await this.appContainer.apiv3.put('/security-setting/guest-mode', {
restrictGuestMode: this.state.currentRestrictGuestMode,
});
const { securitySettingParams } = response.data;
return securitySettingParams;
}
/**
* Update pageDeletion
* @memberOf AdminSecuritySettingContainer
* @return {string} pageDeletion
*/
async updatePageCompleteDeletionAuthority() {
const response = await this.appContainer.apiv3.put('/security-setting/page-deletion', {
pageCompleteDeletionAuthority: this.state.currentPageCompleteDeletionAuthority,
});
const { securitySettingParams } = response.data;
return securitySettingParams;
}
/**
* Update function
* @memberOf AdminSecucitySettingContainer
* @return {string} Functions
*/
async updateSecurityFunction() {
const response = await this.appContainer.apiv3.put('/security-setting/function', {
hideRestrictedByGroup: this.state.hideRestrictedByGroup,
hideRestrictedByOwner: this.state.hideRestrictedByOwner,
});
const { securitySettingParams } = response.data;
return securitySettingParams;
}
=======
/**
* Switch Oidc enabled
*/
switchIsOidcEnabled() {
this.setState({ isOidcEnabled: !this.state.isOidcEnabled });
}
>>>>>>>
/**
* Switch Oidc enabled
*/
switchIsOidcEnabled() {
this.setState({ isOidcEnabled: !this.state.isOidcEnabled });
}
* Change restrictGuestMode
*/
changeRestrictGuestMode(restrictGuestModeLabel) {
this.setState({ currentRestrictGuestMode: restrictGuestModeLabel });
}
/**
* Change pageCompleteDeletionAuthority
*/
changePageCompleteDeletionAuthority(pageCompleteDeletionAuthorityLabel) {
this.setState({ currentpageCompleteDeletionAuthority: pageCompleteDeletionAuthorityLabel });
}
/**
* Switch hideRestrictedByOwner
*/
switchIsHideRestrictedByOwner() {
this.setState({ isHideRestrictedByOwner: !this.state.isHideRestrictedByOwner });
}
/**
* Switch hideRestrictedByGroup
*/
switchIsHideRestrictedByGroup() {
this.setState({ isHideRestrictedByGroup: !this.state.isHideRestrictedByGroup });
}
/**
* Update restrictGuestMode
* @memberOf AdminSecuritySettingContainer
* @return {string} Appearance
*/
async updateRestrictGuestMode() {
const response = await this.appContainer.apiv3.put('/security-setting/guest-mode', {
restrictGuestMode: this.state.currentRestrictGuestMode,
});
const { securitySettingParams } = response.data;
return securitySettingParams;
}
/**
* Update pageDeletion
* @memberOf AdminSecuritySettingContainer
* @return {string} pageDeletion
*/
async updatePageCompleteDeletionAuthority() {
const response = await this.appContainer.apiv3.put('/security-setting/page-deletion', {
pageCompleteDeletionAuthority: this.state.currentPageCompleteDeletionAuthority,
});
const { securitySettingParams } = response.data;
return securitySettingParams;
}
/**
* Update function
* @memberOf AdminSecucitySettingContainer
* @return {string} Functions
*/
async updateSecurityFunction() {
const response = await this.appContainer.apiv3.put('/security-setting/function', {
hideRestrictedByGroup: this.state.hideRestrictedByGroup,
hideRestrictedByOwner: this.state.hideRestrictedByOwner,
});
const { securitySettingParams } = response.data;
return securitySettingParams;
} |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.