conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
public error = undefined
@ViewChild(MatPaginator) paginator: MatPaginator
=======
@ViewChild(MatPaginator, { static: true }) paginator: MatPaginator
>>>>>>>
public error = undefined
@ViewChild(MatPaginator, { static: true }) paginator: MatPaginator |
<<<<<<<
import { MatButtonToggleModule } from '@angular/material/button-toggle';
import { SidenavComponent } from './sidenav/sidenav.component'
=======
import { MatButtonToggleModule } from '@angular/material/button-toggle'
import { LayoutModule } from '@angular/cdk/layout'
import { MatGridListModule } from '@angular/material'
import { TwoFactorAuthComponent } from './two-factor-auth/two-factor-auth.component'
import { DataExportComponent } from './data-export/data-export.component'
import { LastLoginIpComponent } from './last-login-ip/last-login-ip.component'
import { PrivacyPolicyComponent } from './privacy-policy/privacy-policy.component'
>>>>>>>
import { SidenavComponent } from './sidenav/sidenav.component'
import { MatButtonToggleModule } from '@angular/material/button-toggle'
import { LayoutModule } from '@angular/cdk/layout'
import { MatGridListModule } from '@angular/material'
import { TwoFactorAuthComponent } from './two-factor-auth/two-factor-auth.component'
import { DataExportComponent } from './data-export/data-export.component'
import { LastLoginIpComponent } from './last-login-ip/last-login-ip.component'
import { PrivacyPolicyComponent } from './privacy-policy/privacy-policy.component'
<<<<<<<
ErrorPageComponent,
SidenavComponent
=======
PrivacySecurityComponent,
ErrorPageComponent,
TwoFactorAuthComponent,
DataExportComponent,
LastLoginIpComponent,
PrivacyPolicyComponent
>>>>>>>
SidenavComponent,
PrivacySecurityComponent,
ErrorPageComponent,
TwoFactorAuthComponent,
DataExportComponent,
LastLoginIpComponent,
PrivacyPolicyComponent |
<<<<<<<
import { AddressCreateComponent } from './address-create/address-create.component'
import { AddressSelectComponent } from './address-select/address-select.component'
=======
import { PaymentService } from './Services/payment.service'
import { PaymentComponent } from './payment/payment.component'
import { PaymentMethodComponent } from './payment-method/payment-method.component'
import { SavedPaymentMethodsComponent } from './saved-payment-methods/saved-payment-methods.component'
>>>>>>>
import { AddressCreateComponent } from './address-create/address-create.component'
import { AddressSelectComponent } from './address-select/address-select.component'
import { PaymentService } from './Services/payment.service'
import { PaymentComponent } from './payment/payment.component'
import { PaymentMethodComponent } from './payment-method/payment-method.component'
import { SavedPaymentMethodsComponent } from './saved-payment-methods/saved-payment-methods.component'
<<<<<<<
AddressCreateComponent,
AddressSelectComponent,
AddressComponent,
SavedAddressComponent,
=======
PaymentComponent,
PaymentMethodComponent,
SavedPaymentMethodsComponent,
>>>>>>>
AddressCreateComponent,
AddressSelectComponent,
AddressComponent,
SavedAddressComponent,
PaymentComponent,
PaymentMethodComponent,
SavedPaymentMethodsComponent,
<<<<<<<
LoginGuard,
=======
ImageCaptchaService,
PaymentService,
AccountingGuard,
>>>>>>>
LoginGuard,
ImageCaptchaService,
PaymentService,
AccountingGuard, |
<<<<<<<
import { OrderSummaryComponent } from './order-summary/order-summary.component'
import { PurchaseBasketComponent } from './purchase-basket/purchase-basket.component'
=======
import { AddressComponent } from './address/address.component'
import { SavedAddressComponent } from './saved-address/saved-address.component'
>>>>>>>
import { OrderSummaryComponent } from './order-summary/order-summary.component'
import { PurchaseBasketComponent } from './purchase-basket/purchase-basket.component'
import { AddressComponent } from './address/address.component'
import { SavedAddressComponent } from './saved-address/saved-address.component' |
<<<<<<<
fixture: '#navbarLoginButton',
position: 'right'
=======
fixture: {
type: 'id',
value: 'navbarLoginButton'
},
position: 'right',
async resolved() {
while (true) {
console.log(window.location.hash)
if (window.location.hash === '#/login') {
break
}
await sleep(100)
}
}
>>>>>>>
fixture: '#navbarLoginButton',
position: 'right',
async resolved () {
while (true) {
console.log(window.location.hash)
if (window.location.hash === '#/login') {
break
}
await sleep(100)
}
}
<<<<<<<
fixture: '#email',
position: 'right'
=======
fixture: {
type: 'id',
value: 'email'
},
position: 'right',
async resolved() {
const email = document.getElementById(
'email'
) as HTMLInputElement
while (true) {
if (email.value === "'") {
break
}
await sleep(100)
}
}
>>>>>>>
fixture: '#email',
position: 'right',
async resolved () {
const email = document.getElementById(
'email'
) as HTMLInputElement
while (true) {
if (email.value === "'") {
break
}
await sleep(100)
}
}
<<<<<<<
fixture: '#loginButton',
position: 'right'
},
{
text: 'Did you spot the SQL query in the error message? If not, take another look again.',
page: 'login',
fixture: '#loginButton',
position: 'right'
},
{
text: "Let's try to manipulate the query a bit more. Try out tryping \"' OR true\โ into the email field.",
page: 'login',
fixture: '#email',
position: 'right'
},
{
text: 'Mhh the query is still failing? Do you see why?',
page: 'login',
fixture: '#loginButton',
position: 'right'
=======
fixture: {
type: 'id',
value: 'loginButton'
},
position: 'right',
async resolved() {
await sleep(5000)
}
>>>>>>>
fixture: '#loginButton',
position: 'right',
async resolved () {
await sleep(5000)
}
},
{
text: 'Did you spot the SQL query in the error message? If not, take a look again.',
page: 'login',
fixture: '#loginButton',
position: 'right',
async resolved () {
await sleep(5000)
}
},
{
text: "Let's try to manipulate the query a bit more. Try out tryping \"' OR true\โ into the email field.",
page: 'login',
fixture: '#email',
position: 'right',
async resolved () {
const email = document.getElementById(
'email'
) as HTMLInputElement
while (true) {
if (email.value === "' OR true") {
break
}
await sleep(100)
}
}
},
{
text: 'Press the log in button',
page: 'login',
fixture: '#loginButton',
position: 'right',
resolved () {
const loginButton = document.getElementById(
'loginButton'
) as HTMLButtonElement
return new Promise((resolve) => {
loginButton.addEventListener('click', () => resolve())
})
}
},
{
text: 'Mhh the query is still failing? Do you see why?',
page: 'login',
fixture: '#loginButton',
position: 'right',
async resolved () {
await sleep(5000)
}
<<<<<<<
fixture: '#loginButton',
position: 'right'
},
{
text: 'You can comment out the rest of the quries using comments in sql. In sqlite you can use "--" for that.',
page: 'login',
fixture: '#email',
position: 'right'
},
{
text: 'So type in "\' OR true --" in the email field.',
page: 'login',
fixture: '#email',
position: 'right'
},
{
text: 'That worked right?! Congratulation on being the new administartor in the shop!',
page: 'login',
fixture: '#searchQuery',
position: 'right'
=======
fixture: {
type: 'id',
value: 'loginButton'
},
position: 'right',
async resolved() {
await sleep(5000)
}
},
{
text: "Let's try to manipulate the query a bit more. Try out tryping \"' OR true\โ into the email field.",
page: 'login',
fixture: {
type: 'id',
value: 'email'
},
position: 'right',
async resolved() {
const email = document.getElementById(
'email'
) as HTMLInputElement
while (true) {
if (email.value === "' OR true") {
break
}
await sleep(100)
}
}
},
{
text: 'Press the log in button',
page: 'login',
fixture: {
type: 'id',
value: 'loginButton'
},
position: 'right',
resolved() {
const loginButton = document.getElementById(
'loginButton'
) as HTMLButtonElement
return new Promise((resolve) => {
loginButton.addEventListener('click', () => resolve())
})
}
},
{
text: 'Mhh the query is still failing? Do you see why?',
page: 'login',
fixture: {
type: 'id',
value: 'loginButton'
},
position: 'right',
async resolved() {
await sleep(5000)
}
},
{
text: 'We need to make sure that the rest of the query after our injection doesnt get executed. Any Ideas?',
page: 'login',
fixture: {
type: 'id',
value: 'loginButton'
},
position: 'right',
async resolved() {
await sleep(5000)
}
},
{
text: 'You can comment out the rest of the quries using comments in sql. In sqlite you can use "--" for that',
page: 'login',
fixture: {
type: 'id',
value: 'loginButton'
},
position: 'right',
async resolved() {
await sleep(5000)
}
},
{
text: 'So type in "\' OR true --" in the email field.',
page: 'login',
fixture: {
type: 'id',
value: 'email'
},
position: 'right',
async resolved() {
const email = document.getElementById(
'email'
) as HTMLInputElement
while (true) {
if (email.value === "' OR true --") {
break
}
await sleep(100)
}
}
},
{
text: 'Press the log in button',
page: 'login',
fixture: {
type: 'id',
value: 'loginButton'
},
position: 'right',
resolved() {
const loginButton = document.getElementById(
'loginButton'
) as HTMLButtonElement
return new Promise((resolve) => {
loginButton.addEventListener('click', () => resolve())
})
}
},
{
text:
'That worked right?! Concratulation on being the new administartor in the shop!.',
page: 'score-board',
fixture: {
type: 'id',
value: 'searchQuery'
},
position: 'right',
async resolved() {
await sleep(5000)
}
>>>>>>>
fixture: '#loginButton',
position: 'right',
async resolved () {
await sleep(5000)
}
},
{
text: 'You can comment out the rest of the quries using comments in sql. In sqlite you can use "--" for that',
page: 'login',
fixture: '#loginButton',
position: 'right',
async resolved () {
await sleep(5000)
}
},
{
text: 'So type in "\' OR true --" in the email field.',
page: 'login',
fixture: '#email',
position: 'right',
async resolved () {
const email = document.getElementById(
'email'
) as HTMLInputElement
while (true) {
if (email.value === "' OR true --") {
break
}
await sleep(100)
}
}
},
{
text: 'Press the log in button',
page: 'login',
fixture: '#loginButton',
position: 'right',
resolved () {
const loginButton = document.getElementById(
'loginButton'
) as HTMLButtonElement
return new Promise((resolve) => {
loginButton.addEventListener('click', () => resolve())
})
}
},
{
text:
'That worked right?! Concratulation on being the new administartor in the shop!.',
page: 'score-board',
fixture: '#searchQuery',
position: 'right',
async resolved () {
await sleep(5000)
} |
<<<<<<<
import { PaymentComponent } from './payment/payment.component'
import { SavedPaymentMethodsComponent } from './saved-payment-methods/saved-payment-methods.component'
=======
import { AccountingComponent } from './accounting/accounting.component'
import { roles } from './roles'
>>>>>>>
import { PaymentComponent } from './payment/payment.component'
import { SavedPaymentMethodsComponent } from './saved-payment-methods/saved-payment-methods.component'
import { AccountingComponent } from './accounting/accounting.component'
import { roles } from './roles' |
<<<<<<<
import { OrderHistoryComponent } from './order-history/order-history.component'
=======
import { DeliveryMethodComponent } from './delivery-method/delivery-method.component'
>>>>>>>
import { OrderHistoryComponent } from './order-history/order-history.component'
import { DeliveryMethodComponent } from './delivery-method/delivery-method.component' |
<<<<<<<
AddressCreateComponent,
AddressListComponent,
AccountingComponent
=======
AccountingComponent,
PrivacyPolicyComponent,
ChallengeStatusBadgeComponent
>>>>>>>
AddressCreateComponent,
AddressListComponent,
AccountingComponent,
PrivacyPolicyComponent,
ChallengeStatusBadgeComponent |
<<<<<<<
import EventStatus from "schema/input_fields/event_status"
import PartnerShowSorts from "schema/sorts/partner_show_sorts"
=======
import cityData from "../city/cityDataSortedByDisplayPreference.json"
import { LOCAL_DISCOVERY_RADIUS_KM } from "../city/constants"
const location_by_city_slug = cityData.reduce((acc, val) => {
acc[val.slug] = val.coordinates
return acc
}, {})
const getValidCitySlugs = () => Object.keys(location_by_city_slug).join(", ")
>>>>>>>
import EventStatus from "schema/input_fields/event_status"
import PartnerShowSorts from "schema/sorts/partner_show_sorts"
import cityData from "../city/cityDataSortedByDisplayPreference.json"
import { LOCAL_DISCOVERY_RADIUS_KM } from "../city/constants"
const location_by_city_slug = cityData.reduce((acc, val) => {
acc[val.slug] = val.coordinates
return acc
}, {})
const getValidCitySlugs = () => Object.keys(location_by_city_slug).join(", ")
<<<<<<<
args: pageable({
status: EventStatus,
sort: PartnerShowSorts,
}),
=======
args: pageable({
city: {
type: GraphQLString,
description: `A string representing one of the supported cities in the City Guide, which are: ${getValidCitySlugs()}`,
},
}),
>>>>>>>
args: pageable({
status: EventStatus,
sort: PartnerShowSorts,
city: {
type: GraphQLString,
description: `A string representing one of the supported cities in the City Guide, which are: ${getValidCitySlugs()}`,
},
}),
<<<<<<<
sort: options.sort,
status: options.status,
=======
...locationArgs,
>>>>>>>
sort: options.sort,
status: options.status,
...locationArgs, |
<<<<<<<
import { QueryDescription } from "../query-builder.ts";
import { Values } from '../data-types.ts';
import { DatabaseDialect } from "../database.ts";
=======
import type { QueryDescription } from "../query-builder.ts";
import type { Values } from "../data-types.ts";
>>>>>>>
import type { QueryDescription } from "../query-builder.ts";
import type { Values } from "../data-types.ts";
import { DatabaseDialect } from "../database.ts"; |
<<<<<<<
data: EventDetail | any;
}
export interface AccountState {
// Account ์ํ๊ฐ False์ผ ๊ฒฝ์ฐ, ๋ชจ๋ ํญ๋ชฉ์ด null์, ๋ง์ฝ true์ผ ๊ฒฝ์ฐ ๋ชจ๋ ํญ๋ชฉ์ด ๋ค ์์ด์ผํจ.
// ๋ง์ฝ ํ์๊ฐ์
์ ํ์ง ์์์ ๊ฐ์ด ๋์ด์ค์ง ์์ผ๋ฉด, ์ด State๋ฅผ ์
๋ฐ์ดํธํ์ง ์์.
isLogin: boolean;
userId: number;
googleId: number;
email: string;
firstName?: string;
lastName?: string;
phoneNumber?: number;
=======
eventData: EventDetail;
>>>>>>>
eventData: EventDetail;
}
export interface AccountState {
// Account ์ํ๊ฐ False์ผ ๊ฒฝ์ฐ, ๋ชจ๋ ํญ๋ชฉ์ด null์, ๋ง์ฝ true์ผ ๊ฒฝ์ฐ ๋ชจ๋ ํญ๋ชฉ์ด ๋ค ์์ด์ผํจ.
// ๋ง์ฝ ํ์๊ฐ์
์ ํ์ง ์์์ ๊ฐ์ด ๋์ด์ค์ง ์์ผ๋ฉด, ์ด State๋ฅผ ์
๋ฐ์ดํธํ์ง ์์.
isLogin: boolean;
userId: number;
googleId: number;
email: string;
firstName?: string;
lastName?: string;
phoneNumber?: number; |
<<<<<<<
router.get('/coordinate', controllers.convertPlaceToCoordinate);
router.get('/:eventId', paramsValidator('eventId'), controllers.getEvent);
router.get(
'/:eventId/tickets',
paramsValidator('eventId'),
controllers.getEventTickets,
);
=======
router.get('/:eventId', controllers.getEvent);
router.get('/:eventId/tickets', controllers.getEventTickets);
>>>>>>>
router.get('/:eventId', paramsValidator('eventId'), controllers.getEvent);
router.get(
'/:eventId/tickets',
paramsValidator('eventId'),
controllers.getEventTickets,
); |
<<<<<<<
export const MY_CREATED_EVENTS = '๋์ ์ฃผ์ตํ ์ด๋ฒคํธ';
export const EVENT_FORM_FORM_IS_PUBLIC = '๊ณต๊ฐ ์ฌ๋ถ';
export const EVENT_FORM_FORM_IS_PUBLIC_LABEL =
'์ด๋ฒคํธ๋ฅผ ๊ณต๊ฐํ์ง ์์ผ๋ฉด ๋งํฌ๋ก๋ ์ด๋ฒคํธ๋ฅผ ์ ์ํ ์ ์์ง๋ง BookUs์ ๋ฉ์ธ ํ์ด์ง์๋ ๋ํ๋์ง ์์ต๋๋ค. ์์ง ๊ณต๊ฐํ ์ค๋น๊ฐ ์ ๋์ด ์๊ฑฐ๋, ๋ฉ์ธ์ ๊ณต๊ฐํ๊ณ ์ถ์ง ์์ผ๋ฉด ์ฒดํฌ๋ฅผ ํด์ ํ์ธ์.';
export const EVENT_FORM_TITLE = '์ด๋ฒคํธ ์ ๋ชฉ';
export const EVENT_FORM_TITLE_LABEL =
'์ฃผ์ ๋ฅผ ์ ๋ํ๋ด๋ ๋ฉ์ง ์ ๋ชฉ์ ์
๋ ฅํด์ฃผ์ธ์.';
export const EVENT_FORM_TITLE_CAPTION = '์ ๋ชฉ์ ์
๋ ฅํ์ธ์.';
export const EVENT_FORM_TITLE_PLACEHOLDER = '๋ถ์คํธ์บ ํ 2019 ๋ฐ๋ชจ๋ฐ์ด';
export const EVENT_FORM_DATE = '์ด๋ฒคํธ ๋ ์ง ๋ฐ ์๊ฐ';
export const EVENT_FORM_DATE_LABEL =
'์ด๋ฒคํธ๊ฐ ์งํ๋๋ ๋ ์ง์ ์๊ฐ์ ์
๋ ฅํด์ฃผ์ธ์.';
export const EVENT_FORM_PLACE = '์ฅ์';
export const EVENT_FORM_PLACE_LABEL = '์ด๋ฒคํธ๋ ์ด๋ค ์ฅ์์์ ์งํ๋๋์?';
export const EVENT_FORM_PLACE_CAPTION = '์ฅ์๋ฅผ ์
๋ ฅํ์ธ์';
export const EVENT_FORM_PLACE_PLACEHOLDER = 'ํจ์คํธํ์ด๋ธ ๊ฐ๋จ 4ํธ์ ';
export const EVENT_FORM_PLACE_DESC = '์ฅ์ ์ค๋ช
';
export const EVENT_FORM_PLACE_DESC_LABEL =
'์ฅ์์ ๋ํด ์๋ด๊ฐ ํ์ํ๋ค๋ฉด ์ ์ด์ฃผ์ธ์.';
export const EVENT_FORM_PLACE_DESC_PLACEHOLDER =
'์ฃผ์ฐจ๋ ์ธ๊ทผ ์ฃผ์ฐจ์ฅ์์ ๊ฐ๋ฅํฉ๋๋ค.';
export const EVENT_FORM_ADDRESS = '์์ธ ์ฃผ์';
export const EVENT_FORM_ADDRESS_LABEL =
'์ฝ๊ฒ ์ฐพ์๊ฐ ์ ์๋๋ก ์ ํํ ์ฃผ์๋ฅผ ์
๋ ฅํด์ฃผ์ธ์.';
export const EVENT_FORM_ADDRESS_CAPTION = '์์ธ ์ฃผ์๋ฅผ ์
๋ ฅํ์ธ์';
export const EVENT_FORM_MAIN_IMG = '๋ํ ์ด๋ฏธ์ง';
export const EVENT_FORM_MAIN_IMG_LABEL =
'์ด๋ฏธ์ง์ ๊ธ์๊ฐ ๋ง์ผ๋ฉด ๋งค๋ ฅ์ ์ด์ง ์์ต๋๋ค.';
export const EVENT_FORM_DESC = '๋ด์ฉ';
export const EVENT_FORM_DESC_LABEL =
'ํ์ฌ์ ์์ธํ ๋ด์ฉ์ ์๋ฆฌ๋ ๊ธ์ ์์ฑํด์ฃผ์ธ์.';
export const EVENT_FORM_DESC_CAPTION = '๋ด์ฉ์ ์
๋ ฅํ์ธ์';
export const TICKET_FORM_NAME = 'ํฐ์ผ ์ด๋ฆ';
export const TICKET_FORM_NAME_LABEL = 'ํ ๋ฒ ์ค์ ํ ์ด๋ฆ์ ์์ ํ ์ ์์ต๋๋ค.';
export const TICKET_FORM_NAME_CAPTION = 'ํฐ์ผ ์ด๋ฆ์ ์
๋ ฅํด์ฃผ์ธ์.';
export const TICKET_FORM_NAME_PLACEHOLDER = '์ผ๋ฐ ์
์ฅ๊ถ';
export const TICKET_FORM_DESC = 'ํฐ์ผ ์ค๋ช
';
export const TICKET_FORM_DESC_LABEL =
'์ด ํฐ์ผ์ ๋ํด ์์ธํ ์ค๋ช
์ด ํ์ํ๋ค๋ฉด ์์ฑํด์ฃผ์ธ์.';
export const TICKET_FORM_DESC_CAPTION = 'ํฐ์ผ ์ค๋ช
์ ์
๋ ฅํด์ฃผ์ธ์.';
export const TICKET_FORM_DESC_PLACEHOLDER = '๋ฌด๋ฃ ์๋ฃ๋ฅผ ์ ๊ณตํฉ๋๋ค.';
export const TICKET_FORM_PRICE = '๊ฐ๊ฒฉ';
export const TICKET_FORM_PRICE_LABEL =
'๊ตฌ๋งค์๊ฐ ์๋ ๊ฒฝ์ฐ ํฐ์ผ ๊ฐ๊ฒฉ์ ์์ ํ ์ ์์ต๋๋ค.';
export const TICKET_FORM_PRICE_CAPTION = '๊ฐ๊ฒฉ์ ์
๋ ฅํด์ฃผ์ธ์.';
export const TICKET_FORM_QUANTITY = 'ํฐ์ผ ์๋';
export const TICKET_FORM_QUANTITY_LABEL =
'ํ๋งคํ๊ณ ์ถ์ ์ต๋ ์๋์ ์ ํด์ฃผ์ธ์.';
export const TICKET_FORM_QUANTITY_CAPTION = 'ํฐ์ผ ์๋์ ์
๋ ฅํด์ฃผ์ธ์.';
export const TICKET_FORM_IS_PUBLIC_LEFT_CNT = 'ํฐ์ผ ์๋ ์จ๊น';
export const TICKET_FORM_IS_PUBLIC_LEFT_CNT_LABEL =
'ํฐ์ผ์ ์ ์ฒด ์๋๊ณผ ๋จ์ ๊ฐ์๋ฅผ ํ์ํ์ง ์์ต๋๋ค. ํ๋งค๋ ๊ฐ์๋ ํญ์ ํ์๋ฉ๋๋ค.';
export const TICKET_FORM_MAX_CNT_PER_PERSON = '1์ธ๋น ๊ตฌ๋งค ๊ฐ๋ฅ ๊ฐ์';
export const TICKET_FORM_MAX_CNT_PER_PERSON_LABEL =
'์ ์ 1๋ช
์ด ๊ตฌ์
ํ ์ ์๋ ์ต๋ ๊ฐ์์
๋๋ค.';
export const TICKET_FORM_MAX_CNT_PER_PERSON_CAPTION =
'1์ธ๋น ๊ตฌ๋งค ๊ฐ๋ฅ ๊ฐ์๋ฅผ ์
๋ ฅํด์ฃผ์ธ์.';
export const TICKET_FORM_SALES_DATE = 'ํ๋งค ๊ธฐ๊ฐ';
export const TICKET_FORM_SALES_DATE_LABEL =
'ํฐ์ผ์ ํ๋งค๊ธฐ๊ฐ์ ์กฐ์ ํ ์ ์์ต๋๋ค.';
export const TICKET_FORM_SALES_DATE_CAPTION = 'ํฐ์ผ์ ํ๋งค๊ธฐ๊ฐ์ ์ ํํด์ฃผ์ธ์.';
export const TICKET_FORM_REFUND_DATE = 'ํ๋ถ ๋ง๊ฐ ๋ ์ง';
export const TICKET_FORM_REFUND_DATE_LABEL =
'ํ๋งค ์ข
๋ฃ์ผ์ ์ค์ ํ๋ฉด ํ๋ถ ๋ง๊ฐ ๋ ์ง๋ ์๋์ผ๋ก ์ด์ ๋์ผํ๊ฒ ์กฐ์ ๋์ง๋ง ํธ์คํธ๊ฐ ์ํ๋ ๋ ์ง๋ก ๋ณ๊ฒฝํ ์๋ ์์ต๋๋ค.';
export const TICKET_FORM_REFUND_DATE_CAPTION = 'ํ๋ถ ๋ง๊ฐ๋ ์ง๋ฅผ ์ ํํด์ฃผ์ธ์.';
=======
export const MY_CREATED_EVENTS = '๋์ ์ฃผ์ตํ ์ด๋ฒคํธ';
export const DATE_PICKER_CAPTION =
'์ข
๋ฃํ๋ ๋ ์ง๋ณด๋ค ์์ํ๋ ๋ ์ง๊ฐ ์์ค ์ ์์ต๋๋ค.';
export const MY_PAGE_LNB_MY_TICKETS = '๋ด ํฐ์ผ';
export const MY_PAGE_CREATED_EVENTS = '์ฃผ์ตํ ์ด๋ฒคํธ';
export const MY_PAGE_LOGOUT = '๋ก๊ทธ์์';
export const MY_PAGE_LOGOUT_ALERT = '๋ก๊ทธ์์ ๋์์ต๋๋ค.';
>>>>>>>
export const MY_CREATED_EVENTS = '๋์ ์ฃผ์ตํ ์ด๋ฒคํธ';
export const EVENT_FORM_FORM_IS_PUBLIC = '๊ณต๊ฐ ์ฌ๋ถ';
export const EVENT_FORM_FORM_IS_PUBLIC_LABEL =
'์ด๋ฒคํธ๋ฅผ ๊ณต๊ฐํ์ง ์์ผ๋ฉด ๋งํฌ๋ก๋ ์ด๋ฒคํธ๋ฅผ ์ ์ํ ์ ์์ง๋ง BookUs์ ๋ฉ์ธ ํ์ด์ง์๋ ๋ํ๋์ง ์์ต๋๋ค. ์์ง ๊ณต๊ฐํ ์ค๋น๊ฐ ์ ๋์ด ์๊ฑฐ๋, ๋ฉ์ธ์ ๊ณต๊ฐํ๊ณ ์ถ์ง ์์ผ๋ฉด ์ฒดํฌ๋ฅผ ํด์ ํ์ธ์.';
export const EVENT_FORM_TITLE = '์ด๋ฒคํธ ์ ๋ชฉ';
export const EVENT_FORM_TITLE_LABEL =
'์ฃผ์ ๋ฅผ ์ ๋ํ๋ด๋ ๋ฉ์ง ์ ๋ชฉ์ ์
๋ ฅํด์ฃผ์ธ์.';
export const EVENT_FORM_TITLE_CAPTION = '์ ๋ชฉ์ ์
๋ ฅํ์ธ์.';
export const EVENT_FORM_TITLE_PLACEHOLDER = '๋ถ์คํธ์บ ํ 2019 ๋ฐ๋ชจ๋ฐ์ด';
export const EVENT_FORM_DATE = '์ด๋ฒคํธ ๋ ์ง ๋ฐ ์๊ฐ';
export const EVENT_FORM_DATE_LABEL =
'์ด๋ฒคํธ๊ฐ ์งํ๋๋ ๋ ์ง์ ์๊ฐ์ ์
๋ ฅํด์ฃผ์ธ์.';
export const EVENT_FORM_PLACE = '์ฅ์';
export const EVENT_FORM_PLACE_LABEL = '์ด๋ฒคํธ๋ ์ด๋ค ์ฅ์์์ ์งํ๋๋์?';
export const EVENT_FORM_PLACE_CAPTION = '์ฅ์๋ฅผ ์
๋ ฅํ์ธ์';
export const EVENT_FORM_PLACE_PLACEHOLDER = 'ํจ์คํธํ์ด๋ธ ๊ฐ๋จ 4ํธ์ ';
export const EVENT_FORM_PLACE_DESC = '์ฅ์ ์ค๋ช
';
export const EVENT_FORM_PLACE_DESC_LABEL =
'์ฅ์์ ๋ํด ์๋ด๊ฐ ํ์ํ๋ค๋ฉด ์ ์ด์ฃผ์ธ์.';
export const EVENT_FORM_PLACE_DESC_PLACEHOLDER =
'์ฃผ์ฐจ๋ ์ธ๊ทผ ์ฃผ์ฐจ์ฅ์์ ๊ฐ๋ฅํฉ๋๋ค.';
export const EVENT_FORM_ADDRESS = '์์ธ ์ฃผ์';
export const EVENT_FORM_ADDRESS_LABEL =
'์ฝ๊ฒ ์ฐพ์๊ฐ ์ ์๋๋ก ์ ํํ ์ฃผ์๋ฅผ ์
๋ ฅํด์ฃผ์ธ์.';
export const EVENT_FORM_ADDRESS_CAPTION = '์์ธ ์ฃผ์๋ฅผ ์
๋ ฅํ์ธ์';
export const EVENT_FORM_MAIN_IMG = '๋ํ ์ด๋ฏธ์ง';
export const EVENT_FORM_MAIN_IMG_LABEL =
'์ด๋ฏธ์ง์ ๊ธ์๊ฐ ๋ง์ผ๋ฉด ๋งค๋ ฅ์ ์ด์ง ์์ต๋๋ค.';
export const EVENT_FORM_DESC = '๋ด์ฉ';
export const EVENT_FORM_DESC_LABEL =
'ํ์ฌ์ ์์ธํ ๋ด์ฉ์ ์๋ฆฌ๋ ๊ธ์ ์์ฑํด์ฃผ์ธ์.';
export const EVENT_FORM_DESC_CAPTION = '๋ด์ฉ์ ์
๋ ฅํ์ธ์';
export const TICKET_FORM_NAME = 'ํฐ์ผ ์ด๋ฆ';
export const TICKET_FORM_NAME_LABEL = 'ํ ๋ฒ ์ค์ ํ ์ด๋ฆ์ ์์ ํ ์ ์์ต๋๋ค.';
export const TICKET_FORM_NAME_CAPTION = 'ํฐ์ผ ์ด๋ฆ์ ์
๋ ฅํด์ฃผ์ธ์.';
export const TICKET_FORM_NAME_PLACEHOLDER = '์ผ๋ฐ ์
์ฅ๊ถ';
export const TICKET_FORM_DESC = 'ํฐ์ผ ์ค๋ช
';
export const TICKET_FORM_DESC_LABEL =
'์ด ํฐ์ผ์ ๋ํด ์์ธํ ์ค๋ช
์ด ํ์ํ๋ค๋ฉด ์์ฑํด์ฃผ์ธ์.';
export const TICKET_FORM_DESC_CAPTION = 'ํฐ์ผ ์ค๋ช
์ ์
๋ ฅํด์ฃผ์ธ์.';
export const TICKET_FORM_DESC_PLACEHOLDER = '๋ฌด๋ฃ ์๋ฃ๋ฅผ ์ ๊ณตํฉ๋๋ค.';
export const TICKET_FORM_PRICE = '๊ฐ๊ฒฉ';
export const TICKET_FORM_PRICE_LABEL =
'๊ตฌ๋งค์๊ฐ ์๋ ๊ฒฝ์ฐ ํฐ์ผ ๊ฐ๊ฒฉ์ ์์ ํ ์ ์์ต๋๋ค.';
export const TICKET_FORM_PRICE_CAPTION = '๊ฐ๊ฒฉ์ ์
๋ ฅํด์ฃผ์ธ์.';
export const TICKET_FORM_QUANTITY = 'ํฐ์ผ ์๋';
export const TICKET_FORM_QUANTITY_LABEL =
'ํ๋งคํ๊ณ ์ถ์ ์ต๋ ์๋์ ์ ํด์ฃผ์ธ์.';
export const TICKET_FORM_QUANTITY_CAPTION = 'ํฐ์ผ ์๋์ ์
๋ ฅํด์ฃผ์ธ์.';
export const TICKET_FORM_IS_PUBLIC_LEFT_CNT = 'ํฐ์ผ ์๋ ์จ๊น';
export const TICKET_FORM_IS_PUBLIC_LEFT_CNT_LABEL =
'ํฐ์ผ์ ์ ์ฒด ์๋๊ณผ ๋จ์ ๊ฐ์๋ฅผ ํ์ํ์ง ์์ต๋๋ค. ํ๋งค๋ ๊ฐ์๋ ํญ์ ํ์๋ฉ๋๋ค.';
export const TICKET_FORM_MAX_CNT_PER_PERSON = '1์ธ๋น ๊ตฌ๋งค ๊ฐ๋ฅ ๊ฐ์';
export const TICKET_FORM_MAX_CNT_PER_PERSON_LABEL =
'์ ์ 1๋ช
์ด ๊ตฌ์
ํ ์ ์๋ ์ต๋ ๊ฐ์์
๋๋ค.';
export const TICKET_FORM_MAX_CNT_PER_PERSON_CAPTION =
'1์ธ๋น ๊ตฌ๋งค ๊ฐ๋ฅ ๊ฐ์๋ฅผ ์
๋ ฅํด์ฃผ์ธ์.';
export const TICKET_FORM_SALES_DATE = 'ํ๋งค ๊ธฐ๊ฐ';
export const TICKET_FORM_SALES_DATE_LABEL =
'ํฐ์ผ์ ํ๋งค๊ธฐ๊ฐ์ ์กฐ์ ํ ์ ์์ต๋๋ค.';
export const TICKET_FORM_SALES_DATE_CAPTION = 'ํฐ์ผ์ ํ๋งค๊ธฐ๊ฐ์ ์ ํํด์ฃผ์ธ์.';
export const TICKET_FORM_REFUND_DATE = 'ํ๋ถ ๋ง๊ฐ ๋ ์ง';
export const TICKET_FORM_REFUND_DATE_LABEL =
'ํ๋งค ์ข
๋ฃ์ผ์ ์ค์ ํ๋ฉด ํ๋ถ ๋ง๊ฐ ๋ ์ง๋ ์๋์ผ๋ก ์ด์ ๋์ผํ๊ฒ ์กฐ์ ๋์ง๋ง ํธ์คํธ๊ฐ ์ํ๋ ๋ ์ง๋ก ๋ณ๊ฒฝํ ์๋ ์์ต๋๋ค.';
export const TICKET_FORM_REFUND_DATE_CAPTION = 'ํ๋ถ ๋ง๊ฐ๋ ์ง๋ฅผ ์ ํํด์ฃผ์ธ์.';
export const DATE_PICKER_CAPTION =
'์ข
๋ฃํ๋ ๋ ์ง๋ณด๋ค ์์ํ๋ ๋ ์ง๊ฐ ์์ค ์ ์์ต๋๋ค.';
export const MY_PAGE_LNB_MY_TICKETS = '๋ด ํฐ์ผ';
export const MY_PAGE_CREATED_EVENTS = '์ฃผ์ตํ ์ด๋ฒคํธ';
export const MY_PAGE_LOGOUT = '๋ก๊ทธ์์';
export const MY_PAGE_LOGOUT_ALERT = '๋ก๊ทธ์์ ๋์์ต๋๋ค.'; |
<<<<<<<
export { default as LNBItem } from './atoms/LNBItem';
=======
export { default as TuiEditor } from './atoms/TuiEditor';
export { default as TuiViewer } from './atoms/TuiViewer';
>>>>>>>
export { default as LNBItem } from './atoms/LNBItem';
export { default as TuiEditor } from './atoms/TuiEditor';
export { default as TuiViewer } from './atoms/TuiViewer'; |
<<<<<<<
export const HISTORY_METHOD_REPLACE = 'REPLACE';
export const REFUND_TICKET_SUCCESS = 'ํ๋ถ์ด ์๋ฃ๋์์ต๋๋ค.';
export const REFUND_TICKET_FAILURE = 'ํ๋ถ์ด ์คํจํ์ต๋๋ค.';
export const NOT_FOUND_BOUGHT_TICKET = '์์ง ๊ตฌ๋งคํ ํฐ์ผ์ด ์๋ค์..๐
';
export const NOT_FOUND_CREATED_EVENT = '์ฃผ์ตํ ์ด๋ฒคํธ๊ฐ ์๋ค์..๐คฃ';
=======
export const HISTORY_METHOD_REPLACE = 'REPLACE';
export const FORM_NAME: any = {
event: {
isPublic: '๊ณต๊ฐ ์ฌ๋ถ',
title: '์ด๋ฒคํธ ์ ๋ชฉ',
date: '์ด๋ฒคํธ ๋ ์ง',
startAt: '์ด๋ฒคํธ ์์ ๋ ์ง',
endAt: '์ด๋ฒคํธ ์ข
๋ฃ ๋ ์ง',
place: '์ด๋ฒคํธ ์ฅ์',
address: '์ด๋ฒคํธ ์์ธ ์ฃผ์',
placeDesc: '์ด๋ฒคํธ ์ค๋ช
',
mainImg: '์ด๋ฒคํธ ๋ํ ์ด๋ฏธ์ง',
desc: '์ด๋ฒคํธ ๋ด์ฉ',
},
ticket: {
name: 'ํฐ์ผ ์ด๋ฆ',
desc: 'ํฐ์ผ ์ค๋ช
',
price: 'ํฐ์ผ ๊ฐ๊ฒฉ',
quantity: 'ํฐ์ผ ์๋',
isPublicLeftCnt: 'ํฐ์ผ ์๋ ์จ๊น',
maxCntPerPerson: '1์ธ๋น ๊ตฌ๋งค ๊ฐ๋ฅ ๊ฐ์',
salesDate: 'ํฐ์ผ ํ๋งค ๋ ์ง',
salesStartAt: 'ํฐ์ผ ํ๋งค ์์ ๋ ์ง',
salesEndAt: 'ํฐ์ผ ํ๋งค ์ข
๋ฃ ๋ ์ง',
refundDate: 'ํฐ์ผ ํ๋ถ ๋ง๊ฐ ๋ ์ง',
refundEndAt: 'ํฐ์ผ ํ๋ถ ๋ง๊ฐ ๋ ์ง',
},
};
>>>>>>>
export const HISTORY_METHOD_REPLACE = 'REPLACE';
export const REFUND_TICKET_SUCCESS = 'ํ๋ถ์ด ์๋ฃ๋์์ต๋๋ค.';
export const REFUND_TICKET_FAILURE = 'ํ๋ถ์ด ์คํจํ์ต๋๋ค.';
export const NOT_FOUND_BOUGHT_TICKET = '์์ง ๊ตฌ๋งคํ ํฐ์ผ์ด ์๋ค์..๐
';
export const NOT_FOUND_CREATED_EVENT = '์ฃผ์ตํ ์ด๋ฒคํธ๊ฐ ์๋ค์..๐คฃ';
export const FORM_NAME: any = {
event: {
isPublic: '๊ณต๊ฐ ์ฌ๋ถ',
title: '์ด๋ฒคํธ ์ ๋ชฉ',
date: '์ด๋ฒคํธ ๋ ์ง',
startAt: '์ด๋ฒคํธ ์์ ๋ ์ง',
endAt: '์ด๋ฒคํธ ์ข
๋ฃ ๋ ์ง',
place: '์ด๋ฒคํธ ์ฅ์',
address: '์ด๋ฒคํธ ์์ธ ์ฃผ์',
placeDesc: '์ด๋ฒคํธ ์ค๋ช
',
mainImg: '์ด๋ฒคํธ ๋ํ ์ด๋ฏธ์ง',
desc: '์ด๋ฒคํธ ๋ด์ฉ',
},
ticket: {
name: 'ํฐ์ผ ์ด๋ฆ',
desc: 'ํฐ์ผ ์ค๋ช
',
price: 'ํฐ์ผ ๊ฐ๊ฒฉ',
quantity: 'ํฐ์ผ ์๋',
isPublicLeftCnt: 'ํฐ์ผ ์๋ ์จ๊น',
maxCntPerPerson: '1์ธ๋น ๊ตฌ๋งค ๊ฐ๋ฅ ๊ฐ์',
salesDate: 'ํฐ์ผ ํ๋งค ๋ ์ง',
salesStartAt: 'ํฐ์ผ ํ๋งค ์์ ๋ ์ง',
salesEndAt: 'ํฐ์ผ ํ๋งค ์ข
๋ฃ ๋ ์ง',
refundDate: 'ํฐ์ผ ํ๋ถ ๋ง๊ฐ ๋ ์ง',
refundEndAt: 'ํฐ์ผ ํ๋ถ ๋ง๊ฐ ๋ ์ง',
},
}; |
<<<<<<<
export const ONLY_IMG_FILE_INFO = '์ด๋ฏธ์ง ํ์ผ๋ง ์
๋ก๋ ๊ฐ๋ฅํฉ๋๋ค.';
export const IMG_UPLOAD_INFO = '16:9 ๋น์จ์ ์ด๋ฏธ์ง๊ฐ ๊ฐ์ฅ ์ ์ด์ธ๋ฆฝ๋๋ค.';
export const FILE_NOT_FOUND_ERROR_INFO = 'ํ์ผ์ ์ฐพ์ ์ ์์ต๋๋ค.';
=======
export const ONLY_IMAGE_FILE_INFO = '์ด๋ฏธ์ง ํ์ผ๋ง ์
๋ก๋ ๊ฐ๋ฅํฉ๋๋ค.';
export const IMAGE_UPLOAD_INFO = '16:9 ๋น์จ์ ์ด๋ฏธ์ง๊ฐ ๊ฐ์ฅ ์ ์ด์ธ๋ฆฝ๋๋ค.';
export const FILE_NOT_FOUND_ERROR_INFO = 'ํ์ผ์ ์ฐพ์ ์ ์์ต๋๋ค.';
export const TICKETBOX_REFUND_BTN = 'ํ๋ถํ๊ธฐ';
export const MY_TICKETS_STEP = 'tickets';
export const CREATED_EVENTS_STEP = 'events';
export const MY_TICKETS_TITLE = '๊ตฌ๋งค ์๋ฃํ ํฐ์ผ';
export const MY_CREATED_EVENTS = '๋์ ์ฃผ์ตํ ์ด๋ฒคํธ';
>>>>>>>
export const ONLY_IMG_FILE_INFO = '์ด๋ฏธ์ง ํ์ผ๋ง ์
๋ก๋ ๊ฐ๋ฅํฉ๋๋ค.';
export const IMG_UPLOAD_INFO = '16:9 ๋น์จ์ ์ด๋ฏธ์ง๊ฐ ๊ฐ์ฅ ์ ์ด์ธ๋ฆฝ๋๋ค.';
export const FILE_NOT_FOUND_ERROR_INFO = 'ํ์ผ์ ์ฐพ์ ์ ์์ต๋๋ค.';
export const TICKETBOX_REFUND_BTN = 'ํ๋ถํ๊ธฐ';
export const MY_TICKETS_STEP = 'tickets';
export const CREATED_EVENTS_STEP = 'events';
export const MY_TICKETS_TITLE = '๊ตฌ๋งค ์๋ฃํ ํฐ์ผ';
export const MY_CREATED_EVENTS = '๋์ ์ฃผ์ตํ ์ด๋ฒคํธ'; |
<<<<<<<
<translation>Banir nome de &utilizador</translation>
=======
<translation>banir &nome de utilizador</translation>
>>>>>>>
<translation>Banir nome de &utilizador</translation>
<<<<<<<
<translation>Banir endereรงo de &IP</translation>
=======
<translation>banir &endereรงo de IP</translation>
>>>>>>>
<translation>Banir endereรงo de &IP</translation>
<<<<<<<
<translation>Tipo de banimento</translation>
=======
<translation>Banir tipo</translation>
>>>>>>>
<translation>Tipo de banimento</translation>
<<<<<<<
<translation>Banimento &permanente</translation>
=======
<translation>banimento &permanente</translation>
>>>>>>>
<translation>Banimento &permanente</translation>
<<<<<<<
<translation>Banimento &temporรกrio</translation>
=======
<translation>banimento &temporรกrio</translation>
>>>>>>>
<translation>Banimento &temporรกrio</translation>
<<<<<<<
<translation>Tem de seleccionar um banimento baseado no nome, no IP ou ambos.</translation>
=======
<translation>Tem de seleccionar um banimento baseado no nome, no Ip ou ambos.</translation>
>>>>>>>
<translation>Tem de seleccionar um banimento baseado no nome, no IP ou ambos.</translation>
<<<<<<<
=======
<location filename="../src/window_deckeditor.cpp" line="118"/>
<source>Hash:</source>
<translation>Hash:</translation>
</message>
<message>
<location filename="../src/window_deckeditor.cpp" line="132"/>
>>>>>>> |
<<<<<<<
import { suite as SelectTests } from './tests/select.test';
import { suite as ShouldAddTest } from './tests/shouldAdd.test';
import { suite as StringValidatorTests } from './tests/stringValidator.test';
=======
import { typeguards as TypeguardsTest } from './tests/typeguards.test';
>>>>>>>
import { suite as SelectTests } from './tests/select.test';
import { suite as ShouldAddTest } from './tests/shouldAdd.test';
import { suite as StringValidatorTests } from './tests/stringValidator.test';
import { suite as TypeguardsTest } from './tests/typeguards.test';
<<<<<<<
describe('BigUser', BigUserTest.bind(this));
=======
describe('Hooks', HookTest.bind(this));
describe('Type guards', TypeguardsTest.bind(this));
it('should create a User with connections', async () => {
const car = await Car.create({
model: 'Tesla',
version: 'ModelS',
price: mongoose.Types.Decimal128.fromString('50123.25')
});
const [trabant, zastava] = await Car.create([{
model: 'Trabant',
price: mongoose.Types.Decimal128.fromString('28189.25')
}, {
model: 'Zastava',
price: mongoose.Types.Decimal128.fromString('1234.25')
}]);
const user = await User.create({
_id: mongoose.Types.ObjectId(),
firstName: 'John',
lastName: 'Doe',
age: 20,
uniqueId: 'john-doe-20',
gender: Genders.MALE,
role: Role.User,
job: {
title: 'Developer',
position: 'Lead',
jobType: {
salery: 5000,
field: 'IT',
},
},
car: car.id,
languages: ['english', 'typescript'],
previousJobs: [{
title: 'Janitor',
}, {
title: 'Manager',
}],
previousCars: [trabant.id, zastava.id],
});
{
const foundUser = await User
.findById(user.id)
.populate('car previousCars')
.exec();
expect(foundUser).to.have.property('nick', 'Nothing');
expect(foundUser).to.have.property('firstName', 'John');
expect(foundUser).to.have.property('lastName', 'Doe');
expect(foundUser).to.have.property('uniqueId', 'john-doe-20');
expect(foundUser).to.have.property('age', 20);
expect(foundUser).to.have.property('gender', Genders.MALE);
expect(foundUser).to.have.property('role', Role.User);
expect(foundUser).to.have.property('roles').to.have.length(1).to.include(Role.Guest);
expect(foundUser).to.have.property('job');
expect(foundUser).to.have.property('car');
expect(foundUser).to.have.property('languages').to.have.length(2).to.include('english').to.include('typescript');
expect(foundUser.job).to.have.property('title', 'Developer');
expect(foundUser.job).to.have.property('position', 'Lead');
expect(foundUser.job).to.have.property('startedAt').to.be.instanceof(Date);
expect(foundUser.job.jobType).to.not.have.property('_id');
expect(foundUser.job.titleInUppercase()).to.eq('Developer'.toUpperCase());
expect(foundUser.job.jobType).to.have.property('salery', 5000);
expect(foundUser.job.jobType).to.have.property('field', 'IT');
expect(foundUser.job.jobType).to.have.property('salery').to.be.a('number');
expect(foundUser.car).to.have.property('model', 'Tesla');
expect(foundUser.car).to.have.property('version', 'models');
expect(foundUser).to.have.property('previousJobs').to.have.length(2);
expect(foundUser).to.have.property('fullName', 'John Doe');
>>>>>>>
describe('BigUser', BigUserTest.bind(this)); |
<<<<<<<
import { Engine } from "../../ecs/classes/Engine";
=======
import _ from "lodash";
import { AssetLoaderState } from "../../assets/components/AssetLoaderState";
import { LifecycleValue } from "../../common/enums/LifecycleValue";
import { isClient } from "../../common/functions/isClient";
import { DomEventBehaviorValue } from "../../common/interfaces/DomEventBehaviorValue";
import { NumericalType } from "../../common/types/NumericalTypes";
import { Engine } from "../../ecs/classes/Engine";
>>>>>>>
import _ from "lodash";
import { AssetLoaderState } from "../../assets/components/AssetLoaderState";
import { LifecycleValue } from "../../common/enums/LifecycleValue";
import { isClient } from "../../common/functions/isClient";
import { DomEventBehaviorValue } from "../../common/interfaces/DomEventBehaviorValue";
import { NumericalType } from "../../common/types/NumericalTypes";
import { Engine } from "../../ecs/classes/Engine";
<<<<<<<
import { XRControllersComponent } from '../components/XRControllersComponent';
import { ListenerBindingData } from "../interfaces/ListenerBindingData";
import { LocalInputReceiver } from "../components/LocalInputReceiver";
=======
import { InputType } from "../enums/InputType";
import { initVR } from '../functions/WebXRFunctions';
>>>>>>>
import { XRControllersComponent } from '../components/XRControllersComponent';
import { InputType } from "../enums/InputType";
import { initVR } from '../functions/WebXRFunctions';
<<<<<<<
import { handleInputPurge } from "../behaviors/handleInputPurge";
import { DomEventBehaviorValue } from "../../common/interfaces/DomEventBehaviorValue";
=======
>>>>>>>
<<<<<<<
constructor () {
=======
constructor({ useWebXR, onVRSupportRequested }) {
>>>>>>>
constructor () {
<<<<<<<
this.mainControllerId = 0;
this.secondControllerId = 1;
this.boundListeners = new Set();
this.entityListeners = new Map();
=======
// Client only
if (isClient) {
console.log("Initing on client")
this.useWebXR = useWebXR;
this.onVRSupportRequested = onVRSupportRequested;
this.mainControllerId = 0;
this.secondControllerId = 1;
this.boundListeners = new Set();
this.entityListeners = new Map();
if (this.useWebXR) {
if (this.onVRSupportRequested) {
initVR(this.onVRSupportRequested);
} else initVR();
}
}
>>>>>>>
// Client only
if (isClient) {
this.mainControllerId = 0;
this.secondControllerId = 1;
this.boundListeners = new Set();
this.entityListeners = new Map();
}
<<<<<<<
public execute(delta: number): void {
=======
/**
*
* @param {Number} delta Time since last frame
*/
public execute = (isClient ? this.clientExecute : this.serverExecute);
public clientExecute(delta: number): void {
>>>>>>>
/**
*
* @param {Number} delta Time since last frame
*/
public execute = (isClient ? this.clientExecute : this.serverExecute);
public clientExecute(delta: number): void {
<<<<<<<
this.queryResults.controllersComponent.added?.forEach(entity => addPhysics(entity));
this.queryResults.controllersComponent.all?.forEach(entity => {
const xRControllers = getComponent(entity, XRControllersComponent)
if(xRControllers.physicsBody1 !== null && xRControllers.physicsBody2 !== null && this.mainControllerId) {
this.mainControllerId = xRControllers.physicsBody1;
this.secondControllerId = xRControllers.physicsBody2;
}
updatePhysics(entity)
});
this.queryResults.controllersComponent.removed?.forEach(entity => removePhysics(entity, { controllerPhysicalBody1: this.mainControllerId, controllerPhysicalBody2: this.secondControllerId });
// Called every frame on all input components
this.queryResults.inputs.all.forEach(entity => {
if (!hasComponent(entity, Input)) {
return;
=======
if (this.queryResults.xrRenderer.all.length > 0) {
console.log("XR RENDERING");
const webXRRenderer = getMutableComponent(this.queryResults.xrRenderer.all[0], WebXRRenderer);
// Called when WebXRSession component is added to entity
this.queryResults.xrSession.added?.forEach(entity => initializeSession(entity, { webXRRenderer }));
// Called every frame on all WebXRSession components
this.queryResults.xrSession.all?.forEach(entity => processSession(entity));
}
// Apply input for local user input onto client
this.queryResults.localClientInput.all?.forEach(entity => {
// Apply input to local client
handleInput(entity, {}, delta);
const networkId = getComponent(entity, NetworkObject)?.networkId;
if(!networkId) return;
// Client sends input and *only* input to the server (for now)
// console.log("Handling input for entity ", entity.id);
const input = getComponent(entity, Input);
// If input is the same as last frame, return
if(_.isEqual(input.data, input.lastData))
return
// Repopulate lastData
input.lastData.clear();
input.data.forEach((value, key) => input.lastData.set(key, value));
let numInputs = 0;
// Create a schema for input to send
const inputs = {
networkId: networkId,
buttons: {},
axes1d: {},
axes2d: {}
};
// Add all values in input component to schema
for (const [key, value] of input.data.entries()) {
switch (value.type) {
case InputType.BUTTON:
inputs.buttons[key] = { input: key, value: value.value, lifecycleState: value.lifecycleState };
numInputs++;
break;
case InputType.ONEDIM:
if (value.lifecycleState !== LifecycleValue.UNCHANGED) {
inputs.axes1d[key] = { input: key, value: value.value, lifecycleState: value.lifecycleState };
numInputs++;
}
break;
case InputType.TWODIM:
if (value.lifecycleState !== LifecycleValue.UNCHANGED) {
inputs.axes2d[key] = { input: key, valueX: value.value[0], valueY: value.value[1], lifecycleState: value.lifecycleState };
numInputs++;
}
break;
default:
console.error("Input type has no network handler (maybe we should add one?)");
}
>>>>>>>
this.queryResults.controllersComponent.added?.forEach(entity => addPhysics(entity));
this.queryResults.controllersComponent.all?.forEach(entity => {
const xRControllers = getComponent(entity, XRControllersComponent)
if(xRControllers.physicsBody1 !== null && xRControllers.physicsBody2 !== null && this.mainControllerId) {
this.mainControllerId = xRControllers.physicsBody1;
this.secondControllerId = xRControllers.physicsBody2;
}
//updatePhysics(entity)
});
this.queryResults.controllersComponent.removed?.forEach(entity => removePhysics(entity, { controllerPhysicalBody1: this.mainControllerId, controllerPhysicalBody2: this.secondControllerId });
// Called every frame on all input components
this.queryResults.inputs.all.forEach(entity => {
if (!hasComponent(entity, Input)) {
return;
}
handleInput(entity, { }, delta);
});
// Apply input for local user input onto client
this.queryResults.localClientInput.all?.forEach(entity => {
// Apply input to local client
handleInput(entity, {}, delta);
const networkId = getComponent(entity, NetworkObject)?.networkId;
if(!networkId) return;
// Client sends input and *only* input to the server (for now)
// console.log("Handling input for entity ", entity.id);
const input = getComponent(entity, Input);
// If input is the same as last frame, return
if(_.isEqual(input.data, input.lastData))
return
// Repopulate lastData
input.lastData.clear();
input.data.forEach((value, key) => input.lastData.set(key, value));
let numInputs = 0;
// Create a schema for input to send
const inputs = {
networkId: networkId,
buttons: {},
axes1d: {},
axes2d: {}
};
// Add all values in input component to schema
for (const [key, value] of input.data.entries()) {
switch (value.type) {
case InputType.BUTTON:
inputs.buttons[key] = { input: key, value: value.value, lifecycleState: value.lifecycleState };
numInputs++;
break;
case InputType.ONEDIM:
if (value.lifecycleState !== LifecycleValue.UNCHANGED) {
inputs.axes1d[key] = { input: key, value: value.value, lifecycleState: value.lifecycleState };
numInputs++;
}
break;
case InputType.TWODIM:
if (value.lifecycleState !== LifecycleValue.UNCHANGED) {
inputs.axes2d[key] = { input: key, valueX: value.value[0], valueY: value.value[1], lifecycleState: value.lifecycleState };
numInputs++;
}
break;
default:
console.error("Input type has no network handler (maybe we should add one?)");
} |
<<<<<<<
import { Prefab } from "@xr3ngine/engine/src/common/interfaces/Prefab";
=======
>>>>>>>
import { FollowCameraComponent } from "@xr3ngine/engine/src/camera/components/FollowCameraComponent";
import { Prefab } from "@xr3ngine/engine/src/common/interfaces/Prefab";
<<<<<<<
=======
import { TransformComponent } from "@xr3ngine/engine/src/transform/components/TransformComponent";
import { FollowCameraComponent } from "@xr3ngine/engine/src/camera/components/FollowCameraComponent";
import { Prefab } from "@xr3ngine/engine/src/common/interfaces/Prefab";
>>>>>>>
<<<<<<<
import { addComponentFromSchema } from "../../../common/behaviors/addComponentFromSchema";
import { LocalInputReceiver } from "../../../input/components/LocalInputReceiver";
=======
import { setCameraPosition } from "../../../camera/behaviors/setCameraPosition";
//import { setCameraFollow } from "../../../camera/behaviors/setCameraFollow";
>>>>>>>
//import { setCameraFollow } from "../../../camera/behaviors/setCameraFollow"; |
<<<<<<<
app.configure(instances)
app.configure(email);
app.configure(authManagement);
=======
app.configure(xrAvatars)
app.configure(xrLocations)
app.configure(xrObjects)
app.configure(xrLocationInstances)
app.configure(xrScenes)
>>>>>>>
app.configure(email);
app.configure(authManagement);
app.configure(xrAvatars)
app.configure(xrLocations)
app.configure(xrObjects)
app.configure(xrLocationInstances)
app.configure(xrScenes) |
<<<<<<<
function getCredentials(projectDir: string, credentialsPath: string) {
const projectConfig = require(path.resolve(projectDir, "dataform.json"));
return utils.readCredentials(projectConfig.warehouse, credentialsPath);
}
function assertPathExists(checkPath: string) {
if (!fs.existsSync(checkPath)) {
throw new Error(`${checkPath} does not exist!`);
=======
function fullyResolvePath(filePath: string) {
filePath = path.resolve(filePath);
if (!fs.existsSync(filePath)) {
throw new Error(`${filePath} does not exist!`);
>>>>>>>
function assertPathExists(checkPath: string) {
if (!fs.existsSync(checkPath)) {
throw new Error(`${checkPath} does not exist!`); |
<<<<<<<
=======
case 'poly': {
const googlePolyMediaInsance = new GooglePolyMedia();
result = await googlePolyMediaInsance.searchGooglePolyMedia(params?.query);
break;
}
case 'asset': {
//TODO Do some stuff here to get user's assets
result = [];
break;
}
>>>>>>>
case 'asset': {
//TODO Do some stuff here to get user's assets
result = [];
break;
} |
<<<<<<<
import { addComponent } from '../../ecs/functions/EntityFunctions';
import { ColliderComponent } from '../components/ColliderComponent';
=======
import { addComponent, removeComponent } from '../../ecs/functions/EntityFunctions';
import { TransformComponent } from "@xr3ngine/engine/src/transform/components/TransformComponent";
>>>>>>>
import { addComponent, removeComponent } from '../../ecs/functions/EntityFunctions';
import { TransformComponent } from "@xr3ngine/engine/src/transform/components/TransformComponent";
import { ColliderComponent } from '../components/ColliderComponent'; |
<<<<<<<
=======
import { Interactable } from "../../../interaction/components/Interactable";
import { onInteraction, onInteractionHover } from "../../interactive/functions/commonInteractive";
>>>>>>>
import { Interactable } from "../../../interaction/components/Interactable";
import { onInteraction, onInteractionHover } from "../../interactive/functions/commonInteractive";
<<<<<<<
{ type: TransformComponent, data: { position: [0.8, 1,-0.8]} },
{ type: ColliderComponent, data: { type: 'box', scale: [0.3, 0.3, 0.3], mass: 10 }},
{ type: RigidBody }
=======
{ type: TransformComponent, data: { position: [-3, 1,-3]} },
{ type: ColliderComponent, data: { type: 'box', scale: [1, 1, 1], mass: 10 }},
{ type: Interactable, data: {
onInteraction: onInteraction,
onInteractionFocused: onInteractionHover,
data: {
action: 'infoBox',
payload: {
name: 'Razer Blade Stealth 13 - 4K Touch 60Hz - GeForce GTX 1650 Ti Max-Q - Black',
url: 'https://www.razer.com/gaming-laptops/Razer-Blade-Stealth-13/RZ09-03102E52-R3U1',
buyUrl: 'https://www.razer.com/product-added/RZ09-03102E52-R3U1',
learnMoreUrl: 'https://www.razer.com/gaming-laptops/razer-blade',
modelUrl: 'models/devices/razer_laptop.glb',
htmlContent: `<h5>Razer Blade Stealth 13 - 4K Touch 60Hz - GeForce GTX 1650 Ti Max-Q - Black</h5>
The Worldโs First Gaming Ultrabookโข<br />
US$1,999.99<br />
<strong>Specifications</strong>
10th Gen Intelยฎ Coreโข i7-1065G7 Quad-Core Processor<br />
Windows 10 Home<br />
13.3" 4K Touch 60Hz w/ 4.9 mm slim side bezel<br />
NVIDIAยฎ GeForce GTX 1650 Ti Max-Q (4GB GDDR5 VRAM)<br />
512GB<br />
16GB dual-channel (fixed)<br />
Single-zone RGB powered by Razer Chromaโข`
},
interactionText: 'View product info'
}
}
}
>>>>>>>
{ type: TransformComponent, data: { position: [0.8, 1,-0.8]} },
{ type: ColliderComponent, data: { type: 'box', scale: [0.3, 0.3, 0.3], mass: 10 }},
{ type: RigidBody },
{ type: Interactable, data: {
onInteraction: onInteraction,
onInteractionFocused: onInteractionHover,
data: {
action: 'infoBox',
payload: {
name: 'Razer Blade Stealth 13 - 4K Touch 60Hz - GeForce GTX 1650 Ti Max-Q - Black',
url: 'https://www.razer.com/gaming-laptops/Razer-Blade-Stealth-13/RZ09-03102E52-R3U1',
buyUrl: 'https://www.razer.com/product-added/RZ09-03102E52-R3U1',
learnMoreUrl: 'https://www.razer.com/gaming-laptops/razer-blade',
modelUrl: 'models/devices/razer_laptop.glb',
htmlContent: `<h5>Razer Blade Stealth 13 - 4K Touch 60Hz - GeForce GTX 1650 Ti Max-Q - Black</h5>
The Worldโs First Gaming Ultrabookโข<br />
US$1,999.99<br />
<strong>Specifications</strong>
10th Gen Intelยฎ Coreโข i7-1065G7 Quad-Core Processor<br />
Windows 10 Home<br />
13.3" 4K Touch 60Hz w/ 4.9 mm slim side bezel<br />
NVIDIAยฎ GeForce GTX 1650 Ti Max-Q (4GB GDDR5 VRAM)<br />
512GB<br />
16GB dual-channel (fixed)<br />
Single-zone RGB powered by Razer Chromaโข`
},
interactionText: 'View product info'
}
}
} |
<<<<<<<
interface AgentOptions {
[key: string]: string;
}
interface Options {
jwksUri: string;
rateLimit?: boolean;
cache?: boolean;
cacheMaxEntries?: number;
cacheMaxAge?: number;
jwksRequestsPerMinute?: number;
strictSsl?: boolean;
requestHeaders?: Headers;
requestAgentOptions?: AgentOptions;
handleSigningKeyError?(err: Error, cb: (err: Error) => void): any;
}
=======
interface RsaSigningKey {
kid: string;
nbf: string;
rsaPublicKey: string;
}
>>>>>>>
interface AgentOptions {
[key: string]: string;
}
interface Options {
jwksUri: string;
rateLimit?: boolean;
cache?: boolean;
cacheMaxEntries?: number;
cacheMaxAge?: number;
jwksRequestsPerMinute?: number;
strictSsl?: boolean;
requestHeaders?: Headers;
requestAgentOptions?: AgentOptions;
handleSigningKeyError?(err: Error, cb: (err: Error) => void): any;
}
interface RsaSigningKey {
kid: string;
nbf: string;
rsaPublicKey: string;
} |
<<<<<<<
var utf8 = options.utf8;
if (utf8) {
request.setUtf8Charset();
}
request.setNotificationConfig(new (<any>net).gotev.uploadservice.UploadNotificationConfig());
=======
var displayNotificationProgress = typeof options.androidDisplayNotificationProgress === "boolean" ? options.androidDisplayNotificationProgress : true;
if (displayNotificationProgress) {
request.setNotificationConfig(new (<any>net).gotev.uploadservice.UploadNotificationConfig());
}
>>>>>>>
var utf8 = options.utf8;
if (utf8) {
request.setUtf8Charset();
}
var displayNotificationProgress = typeof options.androidDisplayNotificationProgress === "boolean" ? options.androidDisplayNotificationProgress : true;
if (displayNotificationProgress) {
request.setNotificationConfig(new (<any>net).gotev.uploadservice.UploadNotificationConfig());
} |
<<<<<<<
this.onResize = this.onResize.bind(this);
=======
console.log("child appended")
console.log('resize binded')
>>>>>>>
<<<<<<<
this.queryResults.renderers.removed?.forEach((entity: Entity) => {
=======
if(this.isInitialized)
this.queryResults.renderers.all.forEach((entity: Entity) => {
if (!hasComponent(entity, RendererComponent)) {
return
}
resize(entity)
getComponent<RendererComponent>(entity, RendererComponent).composer.render(delta);
});
this.queryResults.renderers.removed.forEach((entity: Entity) => {
>>>>>>>
if(this.isInitialized)
this.queryResults.renderers.all.forEach((entity: Entity) => {
if (!hasComponent(entity, RendererComponent)) {
return
}
resize(entity)
getComponent<RendererComponent>(entity, RendererComponent).composer.render(delta);
});
this.queryResults.renderers.removed.forEach((entity: Entity) => {
<<<<<<<
if(this.isInitialized)
this.queryResults.renderers.all.forEach((entity: Entity) => {
resize(entity)
if (getComponent<RendererComponent>(entity, RendererComponent).composer) {
getComponent<RendererComponent>(entity, RendererComponent).composer.render(delta);
}
});
=======
>>>>>>> |
<<<<<<<
import TransformParent from "./transform/components/TransformParent"
import NetworkObject from "./networking/defaults/components/NetworkObject"
=======
>>>>>>>
import TransformParent from "./transform/components/TransformParent"
import NetworkObject from "./networking/defaults/components/NetworkObject"
<<<<<<<
debug: false
=======
debug: false,
>>>>>>>
debug: false
<<<<<<<
.registerComponent(Transform)
.registerComponent(TransformParent)
world
.registerSystem(InputSystem)
.registerSystem(StateSystem)
.registerSystem(SubscriptionSystem)
.registerSystem(TransformSystem)
=======
.registerComponent(TransformComponent)
>>>>>>>
.registerComponent(Transform)
.registerComponent(TransformParent)
world
.registerSystem(InputSystem)
.registerSystem(StateSystem)
.registerSystem(SubscriptionSystem)
.registerSystem(TransformSystem)
<<<<<<<
export function initializeActor(
entity: Entity,
options: {
inputSchema?: InputSchema
stateSchema?: StateSchema
subscriptionSchema?: SubscriptionSchema
}
): Entity {
=======
export function initializeActor(entity: Entity, options: {
inputMap?: InputMap; stateMap?: StateMap, subscriptionMap?: SubscriptionMap,
debug?: boolean}): Entity {
>>>>>>>
export function initializeActor(
entity: Entity,
options: {
inputSchema?: InputSchema
stateSchema?: StateSchema
subscriptionSchema?: SubscriptionSchema
}
): Entity { |
<<<<<<<
export async function createCamVideoProducer(channelType: string, channelId?: string): Promise<void> {
if (MediaStreamSystem.instance.mediaStream !== null && networkTransport.videoEnabled === true) {
const transport = channelType === 'instance' ? networkTransport.instanceSendTransport : networkTransport.channelSendTransport;
MediaStreamSystem.instance.camVideoProducer = await transport.produce({
track: MediaStreamSystem.instance.mediaStream.getVideoTracks()[0],
=======
export async function createCamVideoProducer(relationshipType: string, relationshipId?: string): Promise<void> {
if (MediaStreamSystem.instance.mediaStream !== null && networkTransport.videoEnabled === true) {
const transport = relationshipType === 'instance' ? networkTransport.instanceSendTransport : networkTransport.relSendTransport;
MediaStreamSystem.instance.camVideoProducer = await transport.produce({
track: MediaStreamSystem.instance.mediaStream.getVideoTracks()[0],
>>>>>>>
export async function createCamVideoProducer(channelType: string, channelId?: string): Promise<void> {
if (MediaStreamSystem.instance.mediaStream !== null && networkTransport.videoEnabled === true) {
const transport = channelType === 'instance' ? networkTransport.instanceSendTransport : networkTransport.channelSendTransport;
MediaStreamSystem.instance.camVideoProducer = await transport.produce({
track: MediaStreamSystem.instance.mediaStream.getVideoTracks()[0],
<<<<<<<
export async function createCamAudioProducer(channelType: string, channelId?: string): Promise<void> {
if (MediaStreamSystem.instance.mediaStream !== null) {
=======
export async function createCamAudioProducer(relationshipType: string, relationshipId?: string): Promise<void> {
if (MediaStreamSystem.instance.mediaStream !== null) {
>>>>>>>
export async function createCamAudioProducer(channelType: string, channelId?: string): Promise<void> {
if (MediaStreamSystem.instance.mediaStream !== null) {
<<<<<<<
MediaStreamSystem.instance.camAudioProducer = await transport.produce({
track: MediaStreamSystem.instance.mediaStream.getAudioTracks()[0],
appData: { mediaTag: "cam-audio", channelType: channelType, channelId: channelId }
=======
MediaStreamSystem.instance.camAudioProducer = await transport.produce({
track: MediaStreamSystem.instance.mediaStream.getAudioTracks()[0],
appData: { mediaTag: "cam-audio", relationshipType: relationshipType, relationshipId: relationshipId }
>>>>>>>
MediaStreamSystem.instance.camAudioProducer = await transport.produce({
track: MediaStreamSystem.instance.mediaStream.getAudioTracks()[0],
appData: { mediaTag: "cam-audio", channelType: channelType, channelId: channelId }
<<<<<<<
MediaStreamSystem.instance.consumers?.map(async (c) => {
=======
MediaStreamSystem?.instance?.consumers?.map(async (c) => {
>>>>>>>
MediaStreamSystem?.instance?.consumers?.map(async (c) => {
<<<<<<<
MediaStreamSystem.camVideoProducer = null;
MediaStreamSystem.camAudioProducer = null;
MediaStreamSystem.screenVideoProducer = null;
MediaStreamSystem.screenAudioProducer = null;
MediaStreamSystem.mediaStream = null;
MediaStreamSystem.localScreen = null;
MediaStreamSystem.instance.consumers = [];
=======
MediaStreamSystem.instance.camVideoProducer = null;
MediaStreamSystem.instance.camAudioProducer = null;
MediaStreamSystem.instance.screenVideoProducer = null;
MediaStreamSystem.instance.screenAudioProducer = null;
MediaStreamSystem.instance.mediaStream = null;
MediaStreamSystem.instance.localScreen = null;
MediaStreamSystem.instance?.consumers = [];
>>>>>>>
MediaStreamSystem.instance.camVideoProducer = null;
MediaStreamSystem.instance.camAudioProducer = null;
MediaStreamSystem.instance.screenVideoProducer = null;
MediaStreamSystem.instance.screenAudioProducer = null;
MediaStreamSystem.instance.mediaStream = null;
MediaStreamSystem.instance.localScreen = null;
MediaStreamSystem.instance.consumers = []; |
<<<<<<<
=======
if(worldState.transforms === undefined || worldState.transforms.length < 1)
return;// console.warn("Worldstate transforms is null");
>>>>>>>
if(worldState.transforms === undefined || worldState.transforms.length < 1)
return;// console.warn("Worldstate transforms is null"); |
<<<<<<<
if (query.reactive && query.components.indexOf(Component) !== -1) {
query.eventDispatcher.dispatchEvent(Query.prototype.COMPONENT_CHANGED, entity, component)
=======
if (query.reactive && query.Components.indexOf(Component) !== -1) {
query.eventDispatcher.dispatchEvent(QUERY_COMPONENT_CHANGED, entity, component);
>>>>>>>
if (query.reactive && query.components.indexOf(Component) !== -1) {
query.eventDispatcher.dispatchEvent(QUERY_COMPONENT_CHANGED, entity, component) |
<<<<<<<
import * as THREE from "three"
=======
import { default as vec2, default as vec3, vec4, mat3, mat4 } from 'gl-matrix';
>>>>>>>
import * as THREE from "three"
import { default as vec2, default as vec3, vec4, mat3, mat4 } from 'gl-matrix';
<<<<<<<
export type Vector2 = THREE.Vector2 | [number, number]
export type Vector3 = THREE.Vector3 | [number, number, number]
export type Vector4 = THREE.Vector4 | [number, number, number, number]
=======
export type Vector2 = vec2.vec2
export type Vector3 = vec3.vec3
export type Vector4 = vec4
export type Matrix3 = mat3
export type Matrix4 = mat4
>>>>>>>
export type Vector2 = THREE.Vector2 | [number, number] | vec2.vec2
export type Vector3 = THREE.Vector3 | [number, number, number] | vec3.vec3
export type Vector4 = THREE.Vector4 | [number, number, number, number] | vec4
export type Matrix3 = mat3
export type Matrix4 = mat4 |
<<<<<<<
import * as authentication from '@feathersjs/authentication'
const { authenticate } = authentication.hooks
=======
import collectAnalytics from '../../hooks/collect-analytics'
>>>>>>>
import collectAnalytics from '../../hooks/collect-analytics'
import * as authentication from '@feathersjs/authentication'
const { authenticate } = authentication.hooks
<<<<<<<
all: [authenticate('jwt')],
=======
all: [collectAnalytics()],
>>>>>>>
all: [authenticate('jwt'), collectAnalytics()], |
<<<<<<<
=======
>>>>>>>
<<<<<<<
}
function handleAfterLoginRedirect(authUser, redirectTo?) {
const accessToken = authUser.accessToken
const params = new URLSearchParams(document.location.search)
redirectTo = params.get('redirectTo') || '/'
if (params.get('redirectTo')) {
redirectTo = params.get('redirectTo')
}
Router.push({
pathname: redirectTo,
// TODO: Pass email
query: { bearer: accessToken, email: '' } })
=======
}
function handleAfterLoginRedirect (authUser, redirectTo?): void {
const accessToken = authUser.accessToken
let email = ''
if (authUser?.identityProvider?.type === 'email') {
email = authUser?.identityProvider?.token
}
const params = new URLSearchParams(document.location.search)
redirectTo = params.get('redirectTo') || '/'
if (params.get('redirectTo')) {
redirectTo = params.get('redirectTo')
}
Router.push({
pathname: redirectTo,
query: { bearer: accessToken, email }
})
>>>>>>>
}
function handleAfterLoginRedirect (authUser, redirectTo?): void {
const accessToken = authUser.accessToken
let email = ''
if (authUser?.identityProvider?.type === 'email') {
email = authUser?.identityProvider?.token
}
const params = new URLSearchParams(document.location.search)
redirectTo = params.get('redirectTo') || '/'
if (params.get('redirectTo')) {
redirectTo = params.get('redirectTo')
}
Router.push({
pathname: redirectTo,
// TODO: Pass email
query: { bearer: accessToken, email: '' } }) |
<<<<<<<
import feedFiresReducer from './feedFires/reducers';
=======
import mediastreamReducer from './mediastream/reducers';
>>>>>>>
import feedFiresReducer from './feedFires/reducers';
import mediastreamReducer from './mediastream/reducers';
<<<<<<<
feeds: feedReducer,
feedFires: feedFiresReducer
=======
feeds: feedReducer,
mediastream: mediastreamReducer,
>>>>>>>
feeds: feedReducer,
feedFires: feedFiresReducer,
mediastream: mediastreamReducer, |
<<<<<<<
import { MeshPhysicalMaterial, TorusGeometry } from "three";
=======
import { ProcessModelAsset } from "../functions/ProcessModelAsset";
>>>>>>>
import { MeshPhysicalMaterial, TorusGeometry } from "three";
import { ProcessModelAsset } from "../functions/ProcessModelAsset";
<<<<<<<
execute () {
if(this.queryResults.toLoad.all.length > 0){
const event = new CustomEvent('scene-loaded', { detail:{loaded:false} });
document.dispatchEvent(event);
}
=======
execute(): void {
>>>>>>>
execute () : void{
if(this.queryResults.toLoad.all.length > 0){
const event = new CustomEvent('scene-loaded', { detail:{loaded:false} });
document.dispatchEvent(event);
}
// execute(): void { |
<<<<<<<
const name = component.name.replace(/-\d+/, "").replace(" ", "")
// Override for loading mesh colliders
if (SceneObjectLoadingSchema[name] === undefined)return console.warn("Couldn't load ", name);
const componentSchema = SceneObjectLoadingSchema[name];
=======
let name = component.name.replace(/-\d+/, "").replace(" ", "")
// Override for loading mesh colliders
if (SceneObjectLoadingSchema[name] === undefined)
return console.warn("Couldn't load ", name);
else console.log("Handling ", name)
const componentSchema = SceneObjectLoadingSchema[name];
>>>>>>>
const name = component.name.replace(/-\d+/, "").replace(" ", "")
// Override for loading mesh colliders
if (SceneObjectLoadingSchema[name] === undefined)
return console.warn("Couldn't load ", name);
else console.log("Handling ", name)
const componentSchema = SceneObjectLoadingSchema[name]; |
<<<<<<<
},
[DefaultInput.RIGHT]: {
=======
},
[BinaryValue.OFF]: [
{
behavior: driveSteering,
args: {
direction: 0
}
}
]
},
// [DefaultInput.JUMP]: {
// [BinaryValue.ON]: {
// started: [
// {
// behavior: honk
// }
// ]
// }
// }
[DefaultInput.JUMP]: {
[BinaryValue.ON]: {
>>>>>>>
}
},
[DefaultInput.LEFT]: {
started: [
{
behavior: driveSteering,
args: {
direction: 1
}
}
],
continued: [
{
behavior: driveSteering,
args: {
direction: 1
}
}
],
ended: [
{
behavior: driveSteering,
args: {
direction: 0
}
}
]
},
[DefaultInput.RIGHT]: {
started: [
{
behavior: driveSteering,
args: {
direction: -1
}
}
],
continued: [
{
behavior: driveSteering,
args: {
direction: -1
}
}
],
ended: [
{
behavior: driveSteering,
args: {
direction: 0
}
}
]
},
[DefaultInput.JUMP]: {
<<<<<<<
{
behavior: drive,
args: {
inputType: InputType.TWODIM,
value: [1, 0]
}
}
],
ended: [
=======
{
behavior: driveHandBrake,
args: {
on: true
}
}
]
},
[BinaryValue.OFF]: [
>>>>>>>
{
behavior: driveHandBrake,
args: {
on: true
}
}
],
ended: [ |
<<<<<<<
static vehicles: any;
static physicsFrameRate: number;
=======
static reset():void {
// delete all entities
// TODO: force components deletion and systems processing of their deletion?
// TODO: cleanup
this.nextEntityId = 0
// cleanup/unregister components
// TODO: cleanup
this.nextComponentId = 0
// cleanup systems
this.systems.forEach(system => {
if (system.dispose) system.dispose()
})
this.systems.length = 0
this.systemsToExecute.length = 0
// cleanup events
this.eventDispatcher.reset()
// TODO: delete all what is left from scene
this.scene = null
this.camera = null
this.renderer.dispose()
this.renderer = null
}
>>>>>>>
static vehicles: any;
static physicsFrameRate: number;
static reset():void {
// delete all entities
// TODO: force components deletion and systems processing of their deletion?
// TODO: cleanup
this.nextEntityId = 0
// cleanup/unregister components
// TODO: cleanup
this.nextComponentId = 0
// cleanup systems
this.systems.forEach(system => {
if (system.dispose) system.dispose()
})
this.systems.length = 0
this.systemsToExecute.length = 0
// cleanup events
this.eventDispatcher.reset()
// TODO: delete all what is left from scene
this.scene = null
this.camera = null
this.renderer.dispose()
this.renderer = null
} |
<<<<<<<
import uploads from './uploads/uploads.service';
=======
import email from './email/email.service'
import authManagement from './auth-management/auth-management.service'
>>>>>>>
import uploads from './uploads/uploads.service';
import email from './email/email.service'
import authManagement from './auth-management/auth-management.service' |
<<<<<<<
export { testBlockLocalhost, testBlockNonLocalhost, testWhiteListLocalhost, testRestrictLocalhost } from './lib/rate-limiter-blackwhite-test';
export { testExecEvenly, testNonExecEvenly } from './lib/rate-limiter-exec-evenly-test';
=======
export { testBlockLocalhost, testBlockNonLocalhost, testWhiteListLocalhost, testRestrictLocalhost } from './lib/rate-limiter-blackwhite-test';
export { testGlobalKeyprefix, testUniqueKeyprefix } from './lib/rate-limiter-keyprefix-test';
>>>>>>>
export { testBlockLocalhost, testBlockNonLocalhost, testWhiteListLocalhost, testRestrictLocalhost } from './lib/rate-limiter-blackwhite-test';
export { testExecEvenly, testNonExecEvenly } from './lib/rate-limiter-exec-evenly-test';
export { testGlobalKeyprefix, testUniqueKeyprefix } from './lib/rate-limiter-keyprefix-test'; |
<<<<<<<
import GraphQL from './graphql/graphql.service'
=======
import identityProvider from './identity-provider/identity-provider.service'
>>>>>>>
import GraphQL from './graphql/graphql.service'
import identityProvider from './identity-provider/identity-provider.service'
<<<<<<<
app.configure(GraphQL)
=======
app.configure(identityProvider)
>>>>>>>
app.configure(GraphQL)
app.configure(identityProvider) |
<<<<<<<
=======
const { schema, agonesSDK } = attributes
>>>>>>>
<<<<<<<
// Initialize the server automatically
if (process.env.SERVER_MODE != undefined && process.env.SERVER_MODE !== 'client')
Network.instance.transport.initialize();
// TODO: Move network timestep (30) to config
this.fixedExecute = createFixedTimestep(30, this.onFixedExecute.bind(this))
=======
console.log('TRANSPORT INSTANCE:')
console.log(Network.instance.transport)
console.log(`SERVER_MODE: ${process.env.SERVER_MODE}`)
if (process.env.SERVER_MODE === 'realtime') {
Network.instance.transport.initialize()
}
console.log("NetworkSystem ready, run connectToServer to... connect to the server!")
>>>>>>>
// Initialize the server automatically
if (process.env.SERVER_MODE === 'realtime') {
Network.instance.transport.initialize()
}
console.log("NetworkSystem ready, run connectToServer to... connect to the server!")
// TODO: Move network timestep (30) to config
this.fixedExecute = createFixedTimestep(30, this.onFixedExecute.bind(this)) |
<<<<<<<
testRestrictLocalhost,
testExecEvenly,
testNonExecEvenly
} from '@examples/rate-limiter-points-test';
=======
testRestrictLocalhost,
testGlobalKeyprefix,
testUniqueKeyprefix } from '@examples/rate-limiter-points-test';
>>>>>>>
testRestrictLocalhost,
testExecEvenly,
testNonExecEvenly,
testGlobalKeyprefix,
testUniqueKeyprefix
} from '@examples/rate-limiter-points-test';
<<<<<<<
await wait(5000);
assert( await testNonExecEvenly(BASE_URL));
await wait(5000);
assert( await testExecEvenly(BASE_URL));
=======
assert( await testGlobalKeyprefix(BASE_URL));
assert( await testUniqueKeyprefix(BASE_URL));
>>>>>>>
await wait(5000);
assert( await testNonExecEvenly(BASE_URL));
await wait(5000);
assert( await testExecEvenly(BASE_URL));
assert( await testGlobalKeyprefix(BASE_URL));
assert( await testUniqueKeyprefix(BASE_URL)); |
<<<<<<<
const q = new Quaternion();
const direction = new Vector3();
=======
const q: Vector4 = [0, 0, 0, 0];
const direction: Vector3 = [0, 0, 0];
const maxAngleX = 35.0472
const maxAngleY = 35.0472
>>>>>>>
const q = new Quaternion();
const direction = new Vector3();
const maxAngleX = 35.0472
const maxAngleY = 35.0472
<<<<<<<
}
=======
}
// }
>>>>>>>
} |
<<<<<<<
const instance = sequelizeClient.define('instance', {
url: {
=======
const Instance = sequelizeClient.define('instance', {
id: {
type: DataTypes.UUID,
defaultValue: DataTypes.UUIDV1,
allowNull: false,
primaryKey: true
},
address: {
>>>>>>>
const instance = sequelizeClient.define('instance', {
id: {
type: DataTypes.UUID,
defaultValue: DataTypes.UUIDV1,
allowNull: false,
primaryKey: true
},
address: { |
<<<<<<<
async sendEmail(toEmail: string, token: string): Promise<void> {
const hashLink = getLink('login', token)
=======
async update (id: NullableId, data: Data, params?: Params): Promise<Data> {
return data
}
async patch (id: NullableId, data: Data, params?: Params): Promise<Data> {
return data
}
async remove (id: NullableId, params?: Params): Promise<Data> {
return { id }
}
async sendEmail (toEmail: string, token: string, type: 'connection' | 'login'): Promise<void> {
const hashLink = getLink(type, token)
>>>>>>>
async update(id: NullableId, data: Data, params?: Params): Promise<Data> {
return data
}
async patch(id: NullableId, data: Data, params?: Params): Promise<Data> {
return data
}
async remove(id: NullableId, params?: Params): Promise<Data> {
return { id }
}
async sendEmail(
toEmail: string,
token: string,
type: 'connection' | 'login'
): Promise<void> {
const hashLink = getLink(type, token)
<<<<<<<
async sendSms(mobile: string, token: string): Promise<void> {
const hashLink = getLink('login', token)
=======
async sendSms (mobile: string, token: string, type: 'connection' | 'login'): Promise<void> {
const hashLink = getLink(type, token)
>>>>>>>
async sendSms(
mobile: string,
token: string,
type: 'connection' | 'login'
): Promise<void> {
const hashLink = getLink(type, token)
<<<<<<<
async create(data: any, params?: Params): Promise<Data> {
=======
async create (data: any, params?: Params): Promise<Data> {
console.log('----------------')
>>>>>>>
async create(data: any, params?: Params): Promise<Data> {
console.log('----------------')
<<<<<<<
if (data.type === 'email') {
const identityProviders = ((await identityProviderService.find({
query: {
token: data.email,
identityProviderType: 'email'
}
})) as any).data
if (identityProviders.length === 0) {
identityProvider = await identityProviderService.create(
{
token: data.email,
identityProviderType: 'email'
},
params
)
} else {
identityProvider = identityProviders[0]
=======
const identityProviders = (await identityProviderService.find({
query: {
token: data.email,
type: data.type
>>>>>>>
const identityProviders = ((await identityProviderService.find({
query: {
token: data.email,
type: data.type
<<<<<<<
async update(id: NullableId, data: Data, params?: Params): Promise<Data> {
return data
}
async patch(id: NullableId, data: Data, params?: Params): Promise<Data> {
return data
}
async remove(id: NullableId, params?: Params): Promise<Data> {
return { id }
}
=======
>>>>>>> |
<<<<<<<
const isObject3d =(args.obj3d.type !== undefined)
=======
console.log("Adding object 3d")
console.log(args)
const isObject3d =(typeof args.obj3d === 'object')
>>>>>>>
const isObject3d =(typeof args.obj3d === 'object') |
<<<<<<<
const existingTransports = Network.instance.transports.filter(t => t.appData.peerId === peerId && t.appData.direction === direction && t.appData.partyId === partyId);
=======
const existingTransports = MediaStreamComponent.instance.transports.filter(t => t.appData.peerId === peerId && t.appData.direction === direction && (relationshipType === 'instance' ? t.appData.relationshipType === 'instance' : t.appData.relationshipType === relationshipType && t.appData.relationshipId === relationshipId));
>>>>>>>
const existingTransports = Network.instance.transports.filter(t => t.appData.peerId === peerId && t.appData.direction === direction && (relationshipType === 'instance' ? t.appData.relationshipType === 'instance' : t.appData.relationshipType === relationshipType && t.appData.relationshipId === relationshipId));
<<<<<<<
const { mediaPeerId, mediaTag, rtpCapabilities, partyId } = data;
const producer = MediaStreamSystem.producers.find(
p => p._appData.mediaTag === mediaTag && p._appData.peerId === mediaPeerId && p._appData.partyId === partyId
=======
const { mediaPeerId, mediaTag, rtpCapabilities, relationshipType, relationshipId } = data;
console.log('Receive track for ', relationshipType, relationshipId);
console.log(MediaStreamComponent.instance.producers);
const producer = MediaStreamComponent.instance.producers.find(
p => p._appData.mediaTag === mediaTag && p._appData.peerId === mediaPeerId && (relationshipType === 'instance' ? p._appData.relationshipType === relationshipType : p._appData.relationshipType === relationshipType && p._appData.relationshipId === relationshipId)
>>>>>>>
const { mediaPeerId, mediaTag, rtpCapabilities, relationshipType, relationshipId } = data;
console.log('Receive track for ', relationshipType, relationshipId);
console.log(MediaStreamSystem.producers);
const producer = MediaStreamSystem.producers.find(
p => p._appData.mediaTag === mediaTag && p._appData.peerId === mediaPeerId && (relationshipType === 'instance' ? p._appData.relationshipType === relationshipType : p._appData.relationshipType === relationshipType && p._appData.relationshipId === relationshipId)
<<<<<<<
const transport = Object.values(Network.instance.transports).find(
t => (t as any)._appData.peerId === userId && (t as any)._appData.clientDirection === "recv" && (t as any)._appData.partyId === partyId && t.closed === false
=======
const transport = Object.values(MediaStreamComponent.instance.transports).find(
t => (t as any)._appData.peerId === userId && (t as any)._appData.clientDirection === "recv" && (relationshipType === 'instance' ? (t as any)._appData.relationshipType === relationshipType : (t as any)._appData.relationshipType === relationshipType && (t as any)._appData.relationshipId === relationshipId) && t.closed === false
>>>>>>>
const transport = Object.values(Network.instance.transports).find(
t => (t as any)._appData.peerId === userId && (t as any)._appData.clientDirection === "recv" && (relationshipType === 'instance' ? (t as any)._appData.relationshipType === relationshipType : (t as any)._appData.relationshipType === relationshipType && (t as any)._appData.relationshipId === relationshipId) && t.closed === false |
<<<<<<<
import { jumpStart } from "./behaviors/jumpStart";
import { move } from './behaviors/move';
import { rotateAround } from './behaviors/rotate';
import { cameraPointerLock } from "@xr3ngine/engine/src/camera/behaviors/cameraPointerLock";
import { getInCar } from '@xr3ngine/engine/src/physics/behaviors/getInCarBehavior';
=======
>>>>>>>
import { jumpStart } from "./behaviors/jumpStart";
import { move } from './behaviors/move';
import { rotateAround } from './behaviors/rotate';
import { cameraPointerLock } from "@xr3ngine/engine/src/camera/behaviors/cameraPointerLock";
import { getInCar } from '@xr3ngine/engine/src/physics/behaviors/getInCarBehavior';
<<<<<<<
mouseMovement: DefaultInput.MOUSE_MOVEMENT,
mousePosition: DefaultInput.SCREENXY,
mouseClickDownPosition: DefaultInput.SCREENXY_START,
mouseClickDownTransformRotation: DefaultInput.ROTATION_START
=======
[MouseInput.MousePosition]: DefaultInput.SCREENXY,
[MouseInput.MouseClickDownPosition]: DefaultInput.SCREENXY_START,
[MouseInput.MouseClickDownTransformRotation]: DefaultInput.ROTATION_START
>>>>>>>
[MouseInput.MouseMovement]: DefaultInput.MOUSE_MOVEMENT,
[MouseInput.MousePosition]: DefaultInput.SCREENXY,
[MouseInput.MouseClickDownPosition]: DefaultInput.SCREENXY_START,
[MouseInput.MouseClickDownTransformRotation]: DefaultInput.ROTATION_START |
<<<<<<<
=======
console.log("Joined world");
// return Promise.resolve();
this.socket.emit(MessageTypes.Heartbeat.toString(), 1000);
>>>>>>>
console.log("Joined world");
// return Promise.resolve(); |
<<<<<<<
addState(entity, { state: CharacterStateTypes.WALK_START_BACKWARD })
=======
addState(entity, { state: CharacterStateTypes.WALK_START_BACK_RIGHT });
>>>>>>>
addState(entity, { state: CharacterStateTypes.WALK_START_BACKWARD }); |
<<<<<<<
/** Time of the snapshot. */
snapShotTime: BigInt
=======
snapShotTime: number
>>>>>>>
/** Time of the snapshot. */
snapShotTime: number
<<<<<<<
/** Time of the snapshot. */
snapShotTime: BigInt,
=======
snapShotTime: number,
>>>>>>>
/** Time of the snapshot. */
snapShotTime: number,
<<<<<<<
/** Time of the snapshot. */
time: BigInt,
/** ID of the snapshot. */
=======
time: number,
>>>>>>>
/** Time of the snapshot. */
time: number,
/** ID of the snapshot. */
<<<<<<<
/** Tick of the world. */
tick: BigInt
/** transform of world. */
=======
tick: number
>>>>>>>
/** Tick of the world. */
tick: number
/** transform of world. */ |
<<<<<<<
didCreateMagicLink,
updateSettings
=======
didCreateMagicLink,
loadedUserData
>>>>>>>
didCreateMagicLink,
updateSettings,
loadedUserData
<<<<<<<
import { axiosRequest,apiUrl } from '../service.common'
=======
import { resolveUser } from "interfaces/User"
import { resolveAuthUser } from "interfaces/AuthUser"
import { IdentityProvider } from "interfaces/IdentityProvider"
import getConfig from 'next/config'
import { getStoredState } from "redux/persisted.store"
>>>>>>>
import { axiosRequest,apiUrl } from '../service.common'
import { resolveUser } from "interfaces/User"
import { resolveAuthUser } from "interfaces/AuthUser"
import { IdentityProvider } from "interfaces/IdentityProvider"
import getConfig from 'next/config'
import { getStoredState } from "redux/persisted.store"
<<<<<<<
}
export const updateUserSettings = (id:any,data:any) =>async (dispatch:any) => {
let res = await axiosRequest('PATCH',`${apiUrl}/user-settings/${id}`,data)
dispatch(updateSettings(res.data))
=======
}
export function refreshConnections(userId: string) {
return (dispatch: Dispatch) => {
loadUserData(dispatch, userId)
}
>>>>>>>
}
export const updateUserSettings = (id:any,data:any) =>async (dispatch:any) => {
let res = await axiosRequest('PATCH',`${apiUrl}/user-settings/${id}`,data)
return dispatch(updateSettings(res.data))
}
export function refreshConnections(userId: string) {
return (dispatch: Dispatch) => {
loadUserData(dispatch, userId)
} |
<<<<<<<
import identityProviderType from './identity-provider-type/identity-provider-type.service';
import userSettings from './user-settings/user-settings.service';
=======
import SceneListing from './scene-listing/scene-listing.service'
import UploadMedia from './upload-media/upload-media.service'
>>>>>>>
import identityProviderType from './identity-provider-type/identity-provider-type.service';
import userSettings from './user-settings/user-settings.service';
import SceneListing from './scene-listing/scene-listing.service'
import UploadMedia from './upload-media/upload-media.service'
<<<<<<<
app.configure(Role)
app.configure(AccessControl)
app.configure(AccessControlScope)
app.configure(groupUserRank)
app.configure(groupUser)
=======
app.configure(Asset)
app.configure(OwnedFile)
app.configure(ProjectAsset)
app.configure(SceneListing)
app.configure(MediaSearch)
app.configure(UploadMedia)
app.configure(PublishProject)
>>>>>>>
app.configure(Role)
app.configure(AccessControl)
app.configure(AccessControlScope)
app.configure(groupUserRank)
app.configure(groupUser)
<<<<<<<
app.configure(identityProviderType);
app.configure(userSettings);
=======
>>>>>>>
app.configure(identityProviderType);
app.configure(userSettings);
}
app.configure(Asset)
app.configure(OwnedFile)
app.configure(ProjectAsset)
app.configure(SceneListing)
app.configure(MediaSearch)
app.configure(UploadMedia)
app.configure(PublishProject) |
<<<<<<<
import ActionsRenderer = require('vs/base/parts/tree/browser/actionsRenderer');
import Actions = require('vs/base/common/actions');
import {compareAnything} from 'vs/base/common/comparers';
import ActionBar = require('vs/base/browser/ui/actionbar/actionbar');
import TreeDefaults = require('vs/base/parts/tree/browser/treeDefaults');
import HighlightedLabel = require('vs/base/browser/ui/highlightedlabel/highlightedLabel');
import {OcticonLabel} from 'vs/base/browser/ui/octiconLabel/octiconLabel';
=======
import {IActionProvider} from 'vs/base/parts/tree/browser/actionsRenderer';
import {Action, IAction, IActionRunner} from 'vs/base/common/actions';
import {compareAnything, compareByPrefix} from 'vs/base/common/comparers';
import {ActionBar, IActionItem} from 'vs/base/browser/ui/actionbar/actionbar';
import {LegacyRenderer, ILegacyTemplateData} from 'vs/base/parts/tree/browser/treeDefaults';
import {HighlightedLabel} from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
>>>>>>>
import {IActionProvider} from 'vs/base/parts/tree/browser/actionsRenderer';
import {Action, IAction, IActionRunner} from 'vs/base/common/actions';
import {compareAnything, compareByPrefix} from 'vs/base/common/comparers';
import {ActionBar, IActionItem} from 'vs/base/browser/ui/actionbar/actionbar';
import {LegacyRenderer, ILegacyTemplateData} from 'vs/base/parts/tree/browser/treeDefaults';
import {HighlightedLabel} from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
import {OcticonLabel} from 'vs/base/browser/ui/octiconLabel/octiconLabel';
<<<<<<<
label: HighlightedLabel.HighlightedLabel;
meta: OcticonLabel;
description: HighlightedLabel.HighlightedLabel;
actionBar: ActionBar.ActionBar;
=======
label: HighlightedLabel;
meta: HTMLSpanElement;
description: HighlightedLabel;
actionBar: ActionBar;
>>>>>>>
label: HighlightedLabel;
meta: OcticonLabel;
description: HighlightedLabel;
actionBar: ActionBar; |
<<<<<<<
terminal: {
external: {
linuxExec: string,
windowsExec: string
}
=======
externalTerminal: {
linuxExec: string,
macExec: string,
windowsExec: string
>>>>>>>
terminal: {
external: {
linuxExec: string,
macExec: string,
windowsExec: string
} |
<<<<<<<
private listenerToUnbind: ListenerUnbind[];
=======
private listenerToUnbind: IDisposable[];
private _workingFilesModel: WorkingFilesModel;
>>>>>>>
private listenerToUnbind: IDisposable[]; |
<<<<<<<
this.extensionHostProcessReady = false;
=======
lifecycleService.addBeforeShutdownParticipant(this);
>>>>>>>
this.extensionHostProcessReady = false;
lifecycleService.addBeforeShutdownParticipant(this); |
<<<<<<<
export class WorkbenchStageAction extends BaseStageAction {
static ID = 'workbench.action.git.stage';
static LABEL = nls.localize('workbenchStage', "Stage");
private contextService: IWorkspaceContextService;
constructor(
id = WorkbenchStageAction.ID,
label = WorkbenchStageAction.LABEL,
@IGitService gitService: IGitService,
@IWorkbenchEditorService editorService: IWorkbenchEditorService,
@IWorkspaceContextService contextService: IWorkspaceContextService
) {
super(id, label, '', gitService, editorService);
this.contextService = contextService;
this.onGitServiceChange();
}
protected updateEnablement(): void {
if (this.contextService) {
this.enabled = this.isEnabled();
} else {
this.enabled = super.isEnabled();
}
}
isEnabled():boolean {
if (!super.isEnabled()) {
return false;
}
const editor = this.editorService.getActiveEditor();
if (!editor || !(editor instanceof baseeditor.BaseEditor)) {
return false;
}
return true;
}
run(context?: any): TPromise<void> {
const input = this.editorService.getActiveEditor().input;
let fileStatus: IFileStatus;
if (gitei.isGitEditorInput(input)) {
const gitInput = input as gitei.GitDiffEditorInput;
fileStatus = gitInput.getFileStatus();
} else {
fileStatus = getStatus(this.gitService, this.contextService, input as WorkbenchEditorCommon.IFileEditorInput);
}
if (!fileStatus) {
return TPromise.as<void>(null);
}
return super.run(fileStatus);
}
}
export class WorkbenchUnstageAction extends BaseUnstageAction {
static ID = 'workbench.action.git.unstage';
static LABEL = nls.localize('workbenchUnstage', "Unstage");
private contextService: IWorkspaceContextService;
constructor(
id = WorkbenchUnstageAction.ID,
label = WorkbenchUnstageAction.LABEL,
@IGitService gitService: IGitService,
@IWorkbenchEditorService editorService: IWorkbenchEditorService,
@IWorkspaceContextService contextService: IWorkspaceContextService
) {
super(id, label, '', gitService, editorService);
this.contextService = contextService;
this.onGitServiceChange();
}
protected updateEnablement(): void {
if (this.contextService) {
this.enabled = this.isEnabled();
} else {
this.enabled = super.isEnabled();
}
}
isEnabled():boolean {
if (!super.isEnabled()) {
return false;
}
const editor = this.editorService.getActiveEditor();
if (!editor || !(editor instanceof baseeditor.BaseEditor)) {
return false;
}
return true;
}
run(context?: any): TPromise<void> {
const input = this.editorService.getActiveEditor().input;
let fileStatus: IFileStatus;
if (gitei.isGitEditorInput(input)) {
const gitInput = input as gitei.GitDiffEditorInput;
fileStatus = gitInput.getFileStatus();
} else {
fileStatus = getStatus(this.gitService, this.contextService, input as WorkbenchEditorCommon.IFileEditorInput);
}
if (!fileStatus) {
return TPromise.as<void>(null);
}
return super.run(fileStatus);
}
}
export class StageRangesAction extends baseeditor.EditorInputAction {
=======
export abstract class BaseStageRangesAction extends baseeditor.EditorInputAction {
>>>>>>>
export class WorkbenchStageAction extends BaseStageAction {
static ID = 'workbench.action.git.stage';
static LABEL = nls.localize('workbenchStage', "Stage");
private contextService: IWorkspaceContextService;
constructor(
id = WorkbenchStageAction.ID,
label = WorkbenchStageAction.LABEL,
@IGitService gitService: IGitService,
@IWorkbenchEditorService editorService: IWorkbenchEditorService,
@IWorkspaceContextService contextService: IWorkspaceContextService
) {
super(id, label, '', gitService, editorService);
this.contextService = contextService;
this.onGitServiceChange();
}
protected updateEnablement(): void {
if (this.contextService) {
this.enabled = this.isEnabled();
} else {
this.enabled = super.isEnabled();
}
}
isEnabled():boolean {
if (!super.isEnabled()) {
return false;
}
const editor = this.editorService.getActiveEditor();
if (!editor || !(editor instanceof baseeditor.BaseEditor)) {
return false;
}
return true;
}
run(context?: any): TPromise<void> {
const input = this.editorService.getActiveEditor().input;
let fileStatus: IFileStatus;
if (gitei.isGitEditorInput(input)) {
const gitInput = input as gitei.GitDiffEditorInput;
fileStatus = gitInput.getFileStatus();
} else {
fileStatus = getStatus(this.gitService, this.contextService, input as WorkbenchEditorCommon.IFileEditorInput);
}
if (!fileStatus) {
return TPromise.as<void>(null);
}
return super.run(fileStatus);
}
}
export class WorkbenchUnstageAction extends BaseUnstageAction {
static ID = 'workbench.action.git.unstage';
static LABEL = nls.localize('workbenchUnstage', "Unstage");
private contextService: IWorkspaceContextService;
constructor(
id = WorkbenchUnstageAction.ID,
label = WorkbenchUnstageAction.LABEL,
@IGitService gitService: IGitService,
@IWorkbenchEditorService editorService: IWorkbenchEditorService,
@IWorkspaceContextService contextService: IWorkspaceContextService
) {
super(id, label, '', gitService, editorService);
this.contextService = contextService;
this.onGitServiceChange();
}
protected updateEnablement(): void {
if (this.contextService) {
this.enabled = this.isEnabled();
} else {
this.enabled = super.isEnabled();
}
}
isEnabled():boolean {
if (!super.isEnabled()) {
return false;
}
const editor = this.editorService.getActiveEditor();
if (!editor || !(editor instanceof baseeditor.BaseEditor)) {
return false;
}
return true;
}
run(context?: any): TPromise<void> {
const input = this.editorService.getActiveEditor().input;
let fileStatus: IFileStatus;
if (gitei.isGitEditorInput(input)) {
const gitInput = input as gitei.GitDiffEditorInput;
fileStatus = gitInput.getFileStatus();
} else {
fileStatus = getStatus(this.gitService, this.contextService, input as WorkbenchEditorCommon.IFileEditorInput);
}
if (!fileStatus) {
return TPromise.as<void>(null);
}
return super.run(fileStatus);
}
}
export abstract class BaseStageRangesAction extends baseeditor.EditorInputAction { |
<<<<<<<
nls.localize('debugConsole', "DEBUG CONSOLE"),
'repl'
=======
nls.localize('debugConsole', "Debug Console"),
'repl',
40
>>>>>>>
nls.localize('debugConsole', "Debug Console"),
'repl' |
<<<<<<<
}
export function range(to: number, from = 0): number[] {
const result = [];
for (let i = from; i < to; i++) {
result.push(i);
}
return result;
=======
}
export function fill<T>(num: number, valueFn: () => T, arr: T[] = []): T[] {
for (let i = 0; i < num; i++) {
arr[i] = valueFn();
}
return arr;
>>>>>>>
}
export function range(to: number, from = 0): number[] {
const result = [];
for (let i = from; i < to; i++) {
result.push(i);
}
return result;
}
export function fill<T>(num: number, valueFn: () => T, arr: T[] = []): T[] {
for (let i = 0; i < num; i++) {
arr[i] = valueFn();
}
return arr; |
<<<<<<<
import {IDisposable, disposeAll} from 'vs/base/common/lifecycle';
import {IScrollable, DelegateScrollable} from 'vs/base/common/scrollable';
=======
import {IDisposable, dispose} from 'vs/base/common/lifecycle';
import {IScrollable} from 'vs/base/common/scrollable';
>>>>>>>
import {IDisposable, dispose} from 'vs/base/common/lifecycle';
import {IScrollable, DelegateScrollable} from 'vs/base/common/scrollable'; |
<<<<<<<
if (event.path)
VScroller.current = (event.path as EventTarget[])[0] as Element;
=======
VScroller.current = (event.path as EventPath)[0] as Element;
>>>>>>>
if (event.path)
VScroller.current = (event.path as EventPath)[0] as Element; |
<<<<<<<
return (path.charCodeAt(0) === 47 ? origin : path.startsWith(prefix) ? "" : prefix) + path;
=======
return (path.charCodeAt(0) === KnownKey.slash ? origin : prefix) + path;
>>>>>>>
return (path.charCodeAt(0) === KnownKey.slash ? origin : path.startsWith(prefix) ? "" : prefix) + path; |
<<<<<<<
if (typeof browser !== "undefined" && browser.runtime) {
const i = innerCSS.indexOf(":host"), cls = "vimium-ui-" + ((8 + Math.random()) * 100 | 0),
outerCSS = innerCSS.substring(i + 5, innerCSS.indexOf("}", i) + 1);
(this.box as HTMLElement).className = cls;
(this.box as HTMLElement).appendChild(this.createStyle("." + cls + outerCSS));
}
this.styleIn = this.createStyle(innerCSS);
(this.root as ShadowRoot).appendChild(this.styleIn);
=======
let el: HTMLStyleElement | null = this.styleIn = this.createStyle(innerCSS);
(this.root as ShadowRoot).appendChild(el);
>>>>>>>
if (typeof browser !== "undefined" && browser.runtime) {
const i = innerCSS.indexOf(":host"), cls = "vimium-ui-" + ((8 + Math.random()) * 100 | 0),
outerCSS = innerCSS.substring(i + 5, innerCSS.indexOf("}", i) + 1);
(this.box as HTMLElement).className = cls;
(this.box as HTMLElement).appendChild(this.createStyle("." + cls + outerCSS));
}
let el: HTMLStyleElement | null = this.styleIn = this.createStyle(innerCSS);
(this.root as ShadowRoot).appendChild(el); |
<<<<<<<
import {ValueNameChangedEvent} from '../../meter/value-name-changed-event';
=======
import {MeterReadNameChangedEvent} from '../../meter/meter-read-name-changed-event';
import {ValueType} from './value-type';
import {ReadRegisterType} from './read-register-type';
>>>>>>>
import {ValueNameChangedEvent} from '../../meter/value-name-changed-event';
import {ValueType} from './value-type';
import {ReadRegisterType} from './read-register-type'; |
<<<<<<<
it('endsWith', () => {
const endsWith = FR.endsWith(fromEquals(JSONEqual));
fc.assert(
fc.property(
fc.array(fc.anything()),
fc.array(fc.anything()),
(suffix, as) =>
R.endsWith(suffix, as) === endsWith(suffix, as) && R.endsWith(suffix)(as) === endsWith(suffix)(as)
)
);
});
=======
it('clamp', () => {
fc.assert(
fc.property(fc.integer(), fc.integer(), fc.integer(), (low, hi, value) => {
try {
// R.clamp throws if low > hi
return JSONEqual(R.clamp(low, hi, value), FR.clamp(ordNumber)(low, hi, value));
} catch (_) {
return true;
}
})
);
fc.assert(
fc.property(fc.string(), fc.string(), fc.string(), (low, hi, value) => {
try {
// R.clamp throws if low > hi
return JSONEqual(R.clamp(low, hi, value), FR.clamp(ordString)(low, hi, value));
} catch (_) {
return true;
}
})
);
const dateArb = () => fc.nat().map(time => new Date(time));
fc.assert(
fc.property(dateArb(), dateArb(), dateArb(), (low, hi, value) => {
try {
// R.clamp throws if low > hi
return JSONEqual(R.clamp(low, hi, value), FR.clamp(ordDate)(low, hi, value));
} catch (_) {
return true;
}
})
);
const ordUndefined: Ord<undefined> = {
equals: (a, b) => a === b,
compare: () => 0
};
expect(FR.clamp(ordUndefined)(undefined, undefined, undefined)).toBe(R.clamp(undefined, undefined, undefined));
});
>>>>>>>
it('endsWith', () => {
const endsWith = FR.endsWith(fromEquals(JSONEqual));
fc.assert(
fc.property(
fc.array(fc.anything()),
fc.array(fc.anything()),
(suffix, as) =>
R.endsWith(suffix, as) === endsWith(suffix, as) && R.endsWith(suffix)(as) === endsWith(suffix)(as)
)
);
});
it('clamp', () => {
fc.assert(
fc.property(fc.integer(), fc.integer(), fc.integer(), (low, hi, value) => {
try {
// R.clamp throws if low > hi
return JSONEqual(R.clamp(low, hi, value), FR.clamp(ordNumber)(low, hi, value));
} catch (_) {
return true;
}
})
);
fc.assert(
fc.property(fc.string(), fc.string(), fc.string(), (low, hi, value) => {
try {
// R.clamp throws if low > hi
return JSONEqual(R.clamp(low, hi, value), FR.clamp(ordString)(low, hi, value));
} catch (_) {
return true;
}
})
);
const dateArb = () => fc.nat().map(time => new Date(time));
fc.assert(
fc.property(dateArb(), dateArb(), dateArb(), (low, hi, value) => {
try {
// R.clamp throws if low > hi
return JSONEqual(R.clamp(low, hi, value), FR.clamp(ordDate)(low, hi, value));
} catch (_) {
return true;
}
})
);
const ordUndefined: Ord<undefined> = {
equals: (a, b) => a === b,
compare: () => 0
};
expect(FR.clamp(ordUndefined)(undefined, undefined, undefined)).toBe(R.clamp(undefined, undefined, undefined));
}); |
<<<<<<<
export * from './takeLast';
export * from './endsWith';
=======
export * from './takeLast';
export * from './clamp';
>>>>>>>
export * from './takeLast';
export * from './endsWith';
export * from './clamp'; |
<<<<<<<
import { FoalModule, log, rest, view } from '@foal/core';
=======
import { afterThatLog, FoalModule, log, rest } from '@foal/core';
>>>>>>>
import { afterThatLog, FoalModule, log, rest, view } from '@foal/core'; |
<<<<<<<
=======
import memorize from 'memorize-decorator';
import { isArray } from 'util';
import { ProjectSource, SourceLike, SourceType } from './source';
>>>>>>> |
<<<<<<<
this.autoExtendDescriptions();
=======
this.i18n = new ModelI18n(input.i18n || [], this);
>>>>>>>
this.autoExtendDescriptions();
this.i18n = new ModelI18n(input.i18n || [], this); |
<<<<<<<
ADD_CHILD_ENTITIES_FIELD_PREFIX,
CREATE_ENTITY_FIELD_PREFIX,
DELETE_ENTITY_FIELD_PREFIX,
ENTITY_CREATED_AT,
ENTITY_UPDATED_AT,
ID_FIELD,
=======
ADD_CHILD_ENTITIES_FIELD_PREFIX, CALC_MUTATIONS_OPERATORS,
CREATE_ENTITY_FIELD_PREFIX, DELETE_ENTITY_FIELD_PREFIX, ENTITY_CREATED_AT, ENTITY_UPDATED_AT, ID_FIELD,
>>>>>>>
ADD_CHILD_ENTITIES_FIELD_PREFIX,
CREATE_ENTITY_FIELD_PREFIX,
DELETE_ENTITY_FIELD_PREFIX,
ENTITY_CREATED_AT,
ENTITY_UPDATED_AT,
ID_FIELD,
ADD_CHILD_ENTITIES_FIELD_PREFIX, CALC_MUTATIONS_OPERATORS,
CREATE_ENTITY_FIELD_PREFIX, DELETE_ENTITY_FIELD_PREFIX, ENTITY_CREATED_AT, ENTITY_UPDATED_AT, ID_FIELD,
<<<<<<<
hasDirectiveWithName,
isChildEntityType,
isEntityExtensionType,
isRelationField,
isRootEntityType,
isTypeWithIdentity,
=======
hasDirectiveWithName, isCalcMutationField,
isChildEntityType, isEntityExtensionType, isRelationField, isRootEntityType, isTypeWithIdentity,
>>>>>>>
hasDirectiveWithName,
isChildEntityType,
isEntityExtensionType,
isRelationField,
isRootEntityType,
isTypeWithIdentity,
hasDirectiveWithName, isCalcMutationField,
isChildEntityType, isEntityExtensionType, isRelationField, isRootEntityType, isTypeWithIdentity,
<<<<<<<
return mapValues(preparedInput, (fieldValue, key) => {
let descendantKey = key;
let descendantMutationType = mutationType;
if (!objectType.getFields()[key]) {
// must be an preparedInput field which needs special treatment
if (descendantKey.startsWith(ADD_CHILD_ENTITIES_FIELD_PREFIX)) {
// oh, adding child entities is create, not update!
// btw, once create => always create!
descendantMutationType = MutationType.CREATE;
descendantKey = decapitalize(descendantKey.substring(ADD_CHILD_ENTITIES_FIELD_PREFIX.length, descendantKey.length));
} else if (descendantKey.startsWith(UPDATE_CHILD_ENTITIES_FIELD_PREFIX)) {
descendantKey = decapitalize(descendantKey.substring(UPDATE_CHILD_ENTITIES_FIELD_PREFIX.length, descendantKey.length));
} else if (descendantKey.startsWith(REMOVE_CHILD_ENTITIES_FIELD_PREFIX)) {
// removal does not need further treatment.
return fieldValue;
=======
return mapValues(input, (fieldValue, key) => {
let objFields = objectType.getFields();
if (objFields[key]) {
// input field for plain object fields
return prepareFieldValue(fieldValue, objFields[key].type, mutationType)
} else {
// must be a (gnerated) special input field
const possiblePrefixes: string[] = [
ADD_CHILD_ENTITIES_FIELD_PREFIX,
UPDATE_CHILD_ENTITIES_FIELD_PREFIX,
REMOVE_CHILD_ENTITIES_FIELD_PREFIX,
...CALC_MUTATIONS_OPERATORS.map(op => op.prefix)];
for (const prefix of possiblePrefixes) {
let withoutPrefix = keyWithoutPrefix(key, prefix);
if(withoutPrefix && objFields[withoutPrefix]) {
switch(prefix) {
case ADD_CHILD_ENTITIES_FIELD_PREFIX: {
// oh, adding child entities is create, not update!
// btw, once create => always create!
return prepareFieldValue(fieldValue, objFields[withoutPrefix].type, MutationType.CREATE)
}
case UPDATE_CHILD_ENTITIES_FIELD_PREFIX: {
return prepareFieldValue(fieldValue, objFields[withoutPrefix].type, mutationType)
}
default: {
// the remaining special input fields do not need further treatment.
// e.g. REMOVE_CHILD_ENTITIES_FIELD_PREFIX, CALC_MUTATIONS_OPERATORS
return fieldValue;
}
}
}
>>>>>>>
return mapValues(input, (fieldValue, key) => {
let objFields = objectType.getFields();
if (objFields[key]) {
// input field for plain object fields
return prepareFieldValue(fieldValue, objFields[key].type, mutationType)
} else {
// must be a (gnerated) special input field
const possiblePrefixes: string[] = [
ADD_CHILD_ENTITIES_FIELD_PREFIX,
UPDATE_CHILD_ENTITIES_FIELD_PREFIX,
REMOVE_CHILD_ENTITIES_FIELD_PREFIX,
...CALC_MUTATIONS_OPERATORS.map(op => op.prefix)];
for (const prefix of possiblePrefixes) {
let withoutPrefix = keyWithoutPrefix(key, prefix);
if(withoutPrefix && objFields[withoutPrefix]) {
switch(prefix) {
case ADD_CHILD_ENTITIES_FIELD_PREFIX: {
// oh, adding child entities is create, not update!
// btw, once create => always create!
return prepareFieldValue(fieldValue, objFields[withoutPrefix].type, MutationType.CREATE)
}
case UPDATE_CHILD_ENTITIES_FIELD_PREFIX: {
return prepareFieldValue(fieldValue, objFields[withoutPrefix].type, mutationType)
}
default: {
// the remaining special input fields do not need further treatment.
// e.g. REMOVE_CHILD_ENTITIES_FIELD_PREFIX, CALC_MUTATIONS_OPERATORS
return fieldValue;
}
}
} |
<<<<<<<
const noImplicitAny = collectNoImplicitAny(argv, compilerOptions, rawOptions);
const noImplicitThis = collectNoImplicitThis(argv, compilerOptions, rawOptions);
const { compilerStrictNullChecks, typeStrictNullChecks } = collectStrictNullChecks(argv, compilerOptions, rawOptionTypes);
=======
const noImplicitAny = collectNoImplicitAny(compilerOptions, rawOptions);
const { compilerStrictNullChecks, typeStrictNullChecks } = collectStrictNullChecks(compilerOptions, rawOptionTypes);
>>>>>>>
const noImplicitAny = collectNoImplicitAny(compilerOptions, rawOptions);
const noImplicitThis = collectNoImplicitThis(compilerOptions, rawOptions);
const { compilerStrictNullChecks, typeStrictNullChecks } = collectStrictNullChecks(compilerOptions, rawOptionTypes);
<<<<<<<
noImplicitThis: false,
=======
noInferableTypes: false,
>>>>>>>
noImplicitThis: false,
noInferableTypes: false,
<<<<<<<
if (argv.fixIncompleteTypes !== undefined) {
options.fixes.incompleteTypes = argv.fixIncompleteTypes;
}
if (argv.fixMissingProperties !== undefined) {
options.fixes.missingProperties = argv.fixMissingProperties;
}
if (argv.fixNoImplicitAny !== undefined) {
options.fixes.noImplicitAny = argv.fixNoImplicitAny;
}
if (argv.fixNoImplicitThis !== undefined) {
options.fixes.noImplicitThis = argv.fixNoImplicitThis;
}
if (argv.fixStrictNonNullAssertions !== undefined) {
options.fixes.strictNonNullAssertions = argv.fixStrictNonNullAssertions;
}
return options;
=======
>>>>>>> |
<<<<<<<
testEnv
.validateSpec('gitignore', '.gitignore')
.validateSpec('ormconfig.js')
.validateSpec('package.json')
.validateSpec('tsconfig.json')
.validateSpec('tsconfig.app.json')
.validateSpec('tsconfig.e2e.json')
.validateSpec('tsconfig.json')
.validateSpec('tsconfig.test.json')
.validateSpec('.eslintrc.js');
=======
fs
.cd('test-foo-bar')
.assertEqual('.gitignore', 'app/gitignore')
.assertEqual('ormconfig.js', 'app/ormconfig.js')
.assertEqual('package.json', 'app/package.json')
.assertEqual('tsconfig.json', 'app/tsconfig.json')
.assertEqual('tsconfig.app.json', 'app/tsconfig.app.json')
.assertEqual('tsconfig.e2e.json', 'app/tsconfig.e2e.json')
.assertEqual('tsconfig.json', 'app/tsconfig.json')
.assertEqual('tsconfig.migrations.json', 'app/tsconfig.migrations.json')
.assertEqual('tsconfig.scripts.json', 'app/tsconfig.scripts.json')
.assertEqual('tsconfig.test.json', 'app/tsconfig.test.json')
.assertEqual('.eslintrc.js', 'app/.eslintrc.js');
>>>>>>>
fs
.cd('test-foo-bar')
.assertEqual('.gitignore', 'app/gitignore')
.assertEqual('ormconfig.js', 'app/ormconfig.js')
.assertEqual('package.json', 'app/package.json')
.assertEqual('tsconfig.json', 'app/tsconfig.json')
.assertEqual('tsconfig.app.json', 'app/tsconfig.app.json')
.assertEqual('tsconfig.e2e.json', 'app/tsconfig.e2e.json')
.assertEqual('tsconfig.json', 'app/tsconfig.json')
.assertEqual('tsconfig.test.json', 'app/tsconfig.test.json')
.assertEqual('.eslintrc.js', 'app/.eslintrc.js');
<<<<<<<
testEnv
.validateSpec('gitignore', '.gitignore')
.validateSpec('ormconfig.js')
.validateSpec('package.yaml.json', 'package.json')
.validateSpec('tsconfig.json')
.validateSpec('tsconfig.app.json')
.validateSpec('tsconfig.e2e.json')
.validateSpec('tsconfig.json')
.validateSpec('tsconfig.test.json')
.validateSpec('.eslintrc.js');
=======
fs
.cd('test-foo-bar')
.assertEqual('.gitignore', 'app/gitignore')
.assertEqual('ormconfig.js', 'app/ormconfig.js')
.assertEqual('package.json', 'app/package.yaml.json')
.assertEqual('tsconfig.json', 'app/tsconfig.json')
.assertEqual('tsconfig.app.json', 'app/tsconfig.app.json')
.assertEqual('tsconfig.e2e.json', 'app/tsconfig.e2e.json')
.assertEqual('tsconfig.json', 'app/tsconfig.json')
.assertEqual('tsconfig.migrations.json', 'app/tsconfig.migrations.json')
.assertEqual('tsconfig.scripts.json', 'app/tsconfig.scripts.json')
.assertEqual('tsconfig.test.json', 'app/tsconfig.test.json')
.assertEqual('.eslintrc.js', 'app/.eslintrc.js');
>>>>>>>
fs
.cd('test-foo-bar')
.assertEqual('.gitignore', 'app/gitignore')
.assertEqual('ormconfig.js', 'app/ormconfig.js')
.assertEqual('package.json', 'app/package.yaml.json')
.assertEqual('tsconfig.json', 'app/tsconfig.json')
.assertEqual('tsconfig.app.json', 'app/tsconfig.app.json')
.assertEqual('tsconfig.e2e.json', 'app/tsconfig.e2e.json')
.assertEqual('tsconfig.json', 'app/tsconfig.json')
.assertEqual('tsconfig.test.json', 'app/tsconfig.test.json')
.assertEqual('.eslintrc.js', 'app/.eslintrc.js');
<<<<<<<
testEnv
.validateSpec('gitignore', '.gitignore')
.shouldNotExist('ormconfig.js')
.validateSpec('package.mongodb.json', 'package.json')
.validateSpec('tsconfig.json')
.validateSpec('tsconfig.app.json')
.validateSpec('tsconfig.e2e.json')
.validateSpec('tsconfig.json')
.validateSpec('tsconfig.test.json')
.validateSpec('.eslintrc.js');
=======
fs
.cd('test-foo-bar')
.assertEqual('.gitignore', 'app/gitignore')
.assertNotExists('ormconfig.js')
.assertEqual('package.json', 'app/package.mongodb.json')
.assertEqual('tsconfig.json', 'app/tsconfig.json')
.assertEqual('tsconfig.app.json', 'app/tsconfig.app.json')
.assertEqual('tsconfig.e2e.json', 'app/tsconfig.e2e.json')
.assertEqual('tsconfig.json', 'app/tsconfig.json')
.assertNotExists('tsconfig.migrations.json')
.assertEqual('tsconfig.scripts.json', 'app/tsconfig.scripts.json')
.assertEqual('tsconfig.test.json', 'app/tsconfig.test.json')
.assertEqual('.eslintrc.js', 'app/.eslintrc.js');
>>>>>>>
fs
.cd('test-foo-bar')
.assertEqual('.gitignore', 'app/gitignore')
.assertNotExists('ormconfig.js')
.assertEqual('package.json', 'app/package.mongodb.json')
.assertEqual('tsconfig.json', 'app/tsconfig.json')
.assertEqual('tsconfig.app.json', 'app/tsconfig.app.json')
.assertEqual('tsconfig.e2e.json', 'app/tsconfig.e2e.json')
.assertEqual('tsconfig.json', 'app/tsconfig.json')
.assertEqual('tsconfig.test.json', 'app/tsconfig.test.json')
.assertEqual('.eslintrc.js', 'app/.eslintrc.js');
<<<<<<<
testEnv
.validateSpec('gitignore', '.gitignore')
.shouldNotExist('ormconfig.js')
.validateSpec('package.mongodb.yaml.json', 'package.json')
.validateSpec('tsconfig.json')
.validateSpec('tsconfig.app.json')
.validateSpec('tsconfig.e2e.json')
.validateSpec('tsconfig.json')
.validateSpec('tsconfig.test.json')
.validateSpec('.eslintrc.js');
=======
fs
.cd('test-foo-bar')
.assertEqual('.gitignore', 'app/gitignore')
.assertNotExists('ormconfig.js')
.assertEqual('package.json', 'app/package.mongodb.yaml.json')
.assertEqual('tsconfig.json', 'app/tsconfig.json')
.assertEqual('tsconfig.app.json', 'app/tsconfig.app.json')
.assertEqual('tsconfig.e2e.json', 'app/tsconfig.e2e.json')
.assertEqual('tsconfig.json', 'app/tsconfig.json')
.assertNotExists('tsconfig.migrations.json')
.assertEqual('tsconfig.scripts.json', 'app/tsconfig.scripts.json')
.assertEqual('tsconfig.test.json', 'app/tsconfig.test.json')
.assertEqual('.eslintrc.js', 'app/.eslintrc.js');
>>>>>>>
fs
.cd('test-foo-bar')
.assertEqual('.gitignore', 'app/gitignore')
.assertNotExists('ormconfig.js')
.assertEqual('package.json', 'app/package.mongodb.yaml.json')
.assertEqual('tsconfig.json', 'app/tsconfig.json')
.assertEqual('tsconfig.app.json', 'app/tsconfig.app.json')
.assertEqual('tsconfig.e2e.json', 'app/tsconfig.e2e.json')
.assertEqual('tsconfig.json', 'app/tsconfig.json')
.assertEqual('tsconfig.test.json', 'app/tsconfig.test.json')
.assertEqual('.eslintrc.js', 'app/.eslintrc.js'); |
<<<<<<<
// let faceCount = 1;
=======
if (light.gameObject.scene !== activeScene) {
continue;;
}
let faceCount = 1;
>>>>>>>
// if (light.gameObject.scene !== activeScene) {
// continue;;
// }
// let faceCount = 1; |
<<<<<<<
declare var BASE_URL: string;
declare var RUN_DEMO: boolean;
declare var TARGET_DESKTOP_BUILD: boolean;
declare var TARGET_DESKTOP: boolean;
=======
>>>>>>>
declare var BASE_URL: string;
declare var RUN_DEMO: boolean;
declare var TARGET_DESKTOP_BUILD: boolean;
declare var TARGET_DESKTOP: boolean; |
<<<<<<<
import { AboutModule } from './+about/about.module';
import { HomeModule } from './+home/home.module';
import { ChartsModule } from './+charts/charts.module';
=======
import { AboutModule } from './about/about.module';
import { HomeModule } from './home/home.module';
>>>>>>>
import { AboutModule } from './about/about.module';
import { HomeModule } from './home/home.module';
import { ChartsModule } from './+charts/charts.module'; |
<<<<<<<
=======
import { enableProdMode } from '@angular/core';
// The browser platform with a compiler
>>>>>>>
import { enableProdMode } from '@angular/core';
// The browser platform with a compiler |
<<<<<<<
import { AboutRoutes } from './+about/index';
import { HomeRoutes } from './+home/index';
import { ChartsRoutes } from './+charts/index';
=======
import { AboutRoutes } from './about/index';
import { HomeRoutes } from './home/index';
>>>>>>>
import { AboutRoutes } from './about/index';
import { HomeRoutes } from './home/index';
import { ChartsRoutes } from './+charts/index'; |
<<<<<<<
this.containerLoader.registerAllHook(MidwayHandlerKey.CONFIG, (key) => {
return safelyGet(key, this.config);
=======
this.containerLoader.registerAllHook(MidwayHandlerKey.CONFIG, (key: string) => {
return this.config[key];
>>>>>>>
this.containerLoader.registerAllHook(MidwayHandlerKey.CONFIG, (key: string) => {
return safelyGet(key, this.config); |
<<<<<<<
const assert = require('assert');
=======
import { mm as mock, MockContainer } from '../src/';
>>>>>>>
const assert = require('assert');
import { mm as mock, MockContainer } from '../src/';
<<<<<<<
it('should mm function be ok', async () => {
const service: any = await app.applicationContext.getAsync('baseService');
const ts = Date.now();
mm(service, 'getData', () => {
return 'hello' + ts;
});
assert(service.getData() === 'hello' + ts);
mm.restore();
assert(service.getData() !== 'hello' + ts);
});
=======
it('should use mm.cluster to get app', () => {
const app = mock.app({
baseDir: process.env.MIDWAY_BASE_DIR,
framework: process.env.MIDWAY_FRAMEWORK_PATH,
});
return app.ready();
});
it('should use mm.cluster to get app', () => {
const app = mock.cluster({});
return app.ready();
});
it('should use mm.cluster to get app', () => {
const app = mock.cluster({
baseDir: process.env.MIDWAY_BASE_DIR,
framework: process.env.MIDWAY_FRAMEWORK_PATH,
});
return app.ready();
});
it('should use mm.cluster to get app', async () => {
const app = new MockContainer({
baseDir: process.env.MIDWAY_BASE_DIR,
framework: process.env.MIDWAY_FRAMEWORK_PATH,
});
return app.ready();
});
>>>>>>>
it('should mm function be ok', async () => {
const service: any = await app.applicationContext.getAsync('baseService');
const ts = Date.now();
mm(service, 'getData', () => {
return 'hello' + ts;
});
assert(service.getData() === 'hello' + ts);
mm.restore();
assert(service.getData() !== 'hello' + ts);
});
it('should use mm.cluster to get app', () => {
const app = mock.app({
baseDir: process.env.MIDWAY_BASE_DIR,
framework: process.env.MIDWAY_FRAMEWORK_PATH,
});
return app.ready();
});
it('should use mm.cluster to get app', () => {
const app = mock.cluster({});
return app.ready();
});
it('should use mm.cluster to get app', () => {
const app = mock.cluster({
baseDir: process.env.MIDWAY_BASE_DIR,
framework: process.env.MIDWAY_FRAMEWORK_PATH,
});
return app.ready();
});
it('should use mm.cluster to get app', async () => {
const app = new MockContainer({
baseDir: process.env.MIDWAY_BASE_DIR,
framework: process.env.MIDWAY_FRAMEWORK_PATH,
});
return app.ready();
}); |
<<<<<<<
import { docCopy } from "./es/documentation"
import { indexCopy } from "./en/index"
=======
import { docCopy } from "./en/documentation"
import { indexCopy } from "./es/index"
>>>>>>>
import { docCopy } from "./es/documentation"
import { indexCopy } from "./es/index" |
<<<<<<<
throw new Error('Could not find a path for ' + path + optionalExampleContent)
=======
const localeDesc = lang === "en" ? lang : `either ${lang} or English`
throw new Error('Could not find a path for ' + path + " in " + localeDesc)
>>>>>>>
const localeDesc = lang === "en" ? lang : `either ${lang} or English`
throw new Error('Could not find a path for ' + path + " in " + localeDesc + optionalExampleContent) |
<<<<<<<
{ id: "react-&-webpack", title: "React & Webpack" },
{ id: "babel-with-typescript", title: "Using Babel with TypeScript" },
=======
>>>>>>>
{ id: "babel-with-typescript", title: "Using Babel with TypeScript" }, |
<<<<<<<
import { DBUtils } from './dbUtils';
=======
>>>>>>>
import { DBUtils } from './dbUtils'; |
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
/**
* Dashboard canvas width (default is 1280).
*/
>>>>>>>
/**
* Dashboard canvas width (default is 1280).
*/ |
<<<<<<<
import { DashboardWidget } from './widget';
import { saveDialog } from './dialog';
import { Icons } from './icons';
import { Widgetstore } from './widgetstore';
import { addCellId, addNotebookId } from './utils';
import { openfullscreen } from './fullscreen';
import { DBUtils } from './dbUtils';
export function buildToolbar(
notebookTrakcer: INotebookTracker,
dashboard: Dashboard,
tracker: WidgetTracker<DashboardWidget>,
utils: DBUtils
): void {
dashboard.toolbar.addItem(
'save',
createSaveButton(dashboard, notebookTrakcer)
);
dashboard.toolbar.addItem('undo', createUndoButton(dashboard));
dashboard.toolbar.addItem('redo', createRedoButton(dashboard));
dashboard.toolbar.addItem('cut', createCutButton(dashboard, tracker, utils));
dashboard.toolbar.addItem(
'copy',
createCopyButton(dashboard, tracker, utils)
);
dashboard.toolbar.addItem('paste', createPasteButton(dashboard, utils));
dashboard.toolbar.addItem('run', createRunButton(dashboard, tracker));
dashboard.toolbar.addItem('stop', createStopButton(dashboard, tracker));
dashboard.toolbar.addItem('full screen', createFullScreenButton(dashboard));
}
/**
* Create full screen toolbar item.
*/
export function createFullScreenButton(dashboard: Dashboard): Widget {
const button = new ToolbarButton({
icon: Icons.fullscreenToolbarIcon,
onClick: (): void => {
openfullscreen(dashboard.area.node);
},
tooltip: 'View in full screen',
});
return button;
}
=======
>>>>>>>
import { DashboardWidget } from './widget';
import { saveDialog } from './dialog';
import { Icons } from './icons';
import { Widgetstore } from './widgetstore';
import { addCellId, addNotebookId } from './utils';
import { openfullscreen } from './fullscreen';
import { DBUtils } from './dbUtils';
export function buildToolbar(
notebookTrakcer: INotebookTracker,
dashboard: Dashboard,
tracker: WidgetTracker<DashboardWidget>,
utils: DBUtils
): void {
dashboard.toolbar.addItem(
'save',
createSaveButton(dashboard, notebookTrakcer)
);
dashboard.toolbar.addItem('undo', createUndoButton(dashboard));
dashboard.toolbar.addItem('redo', createRedoButton(dashboard));
dashboard.toolbar.addItem('cut', createCutButton(dashboard, tracker, utils));
dashboard.toolbar.addItem(
'copy',
createCopyButton(dashboard, tracker, utils)
);
dashboard.toolbar.addItem('paste', createPasteButton(dashboard, utils));
dashboard.toolbar.addItem('run', createRunButton(dashboard, tracker));
dashboard.toolbar.addItem('stop', createStopButton(dashboard, tracker));
dashboard.toolbar.addItem('full screen', createFullScreenButton(dashboard));
}
/**
* Create full screen toolbar item.
*/
export function createFullScreenButton(dashboard: Dashboard): Widget {
const button = new ToolbarButton({
icon: Icons.fullscreenToolbarIcon,
onClick: (): void => {
openfullscreen(dashboard.area.node);
},
tooltip: 'View in full screen',
});
return button;
}
<<<<<<<
const filename = `${dashboard.getName()}.dashboard`;
InputDialog.getText({ title: 'Save as', text: filename }).then(
(value) => {
if (value.button.accept) {
dashboard.dirty = false;
const dialog = saveDialog(dashboard);
dialog.launch().then((result) => {
dialog.dispose();
});
}
dashboard.save(notebookTracker, value.value);
}
);
},
tooltip: 'Save Dashboard',
});
return button;
}
/**
* Create undo button toolbar item.
*/
export function createUndoButton(dashboard: Dashboard): Widget {
const button = new ToolbarButton({
icon: undoIcon,
onClick: (): void => {
dashboard.undo();
},
tooltip: 'Undo',
});
return button;
}
/**
* Create redo button toolbar item.
*/
export function createRedoButton(dashboard: Dashboard): Widget {
const button = new ToolbarButton({
icon: Icons.redoToolbarIcon,
onClick: (): void => {
dashboard.redo();
},
tooltip: 'Redo',
});
return button;
}
/**
* Create cut button toolbar item.
*/
export function createCutButton(
dashboard: Dashboard,
outputTracker: WidgetTracker<DashboardWidget>,
utils: DBUtils
): Widget {
const button = new ToolbarButton({
icon: cutIcon,
onClick: (): void => {
utils.clipboard.clear();
const widget = outputTracker.currentWidget;
utils.clipboard.add(widget);
dashboard.deleteWidget(widget);
dashboard.deleteWidgetInfo(widget);
},
tooltip: 'Cut the selected outputs',
});
return button;
}
/**
* Create copy button toolbar item.
*/
export function createCopyButton(
dashboard: Dashboard,
outputTracker: WidgetTracker<DashboardWidget>,
utils: DBUtils
): Widget {
const button = new ToolbarButton({
icon: copyIcon,
onClick: (): void => {
utils.clipboard.clear();
const widget = outputTracker.currentWidget;
utils.clipboard.add(widget);
},
tooltip: 'Copy the selected outputs',
});
return button;
}
function pasteWidget(dashboard: Dashboard, widget: DashboardWidget): void {
const notebookId = addNotebookId(widget.notebook);
const cellId = addCellId(widget.cell);
const notebook = widget.notebook;
const cell = widget.cell;
const newWidget = new DashboardWidget({ notebook, cell, notebookId, cellId });
const info: Widgetstore.WidgetInfo = {
widgetId: DashboardWidget.createDashboardWidgetId(),
notebookId: newWidget.notebookId,
cellId: newWidget.cellId,
left: 0,
top: 0,
width: parseInt(widget.node.style.width, 10),
height: parseInt(widget.node.style.height, 10),
removed: false,
};
dashboard.area.addWidget(newWidget, info);
dashboard.area.updateWidgetInfo(info);
}
/**
* Create paste button toolbar item.
*/
export function createPasteButton(
dashboard: Dashboard,
utils: DBUtils
): Widget {
const button = new ToolbarButton({
icon: pasteIcon,
onClick: (): void => {
utils.clipboard.forEach((widget) => pasteWidget(dashboard, widget));
},
tooltip: 'Paste outputs from the clipboard',
});
return button;
}
/**
* Create run button toolbar item.
*/
export function createRunButton(
dashboard: Dashboard,
tracker: WidgetTracker<DashboardWidget>
): Widget {
const button = new ToolbarButton({
icon: runIcon,
onClick: (): void => {
const cell = tracker.currentWidget.cell as CodeCell;
const sessionContext = tracker.currentWidget.notebook.sessionContext;
CodeCell.execute(cell, sessionContext);
},
tooltip: 'Run the selected outputs',
});
return button;
}
/**
* Create stop button toolbar item.
*/
export function createStopButton(
dashboard: Dashboard,
tracker: WidgetTracker<DashboardWidget>
): Widget {
const button = new ToolbarButton({
icon: stopIcon,
onClick: (): void => {
const sessionContext = tracker.currentWidget.notebook.sessionContext;
void sessionContext.session?.kernel?.interrupt();
},
tooltip: 'Interrupt all kernels',
});
return button;
}
/**
* Create restart button toolbar item.
*/
export function createRestartButton(dashboard: Dashboard): Widget {
const button = new ToolbarButton({
icon: refreshIcon,
onClick: (): void => {
const notebooks = new Set<NotebookPanel>();
const widgets = dashboard.content.children().iter();
let widget = widgets.next() as DashboardWidget;
while (widget) {
notebooks.add(widget.notebook);
widget = widgets.next() as DashboardWidget;
}
notebooks.forEach(
(nb) => void sessionContextDialogs.restart(nb.sessionContext)
);
=======
const filename = `${dashboard.getName()}.dashboard`;
InputDialog.getText({ title: 'Save as', text: filename }).then(
(value) => {
dashboard.save(notebookTracker, value.value);
}
);
>>>>>>>
const filename = `${dashboard.getName()}.dashboard`;
InputDialog.getText({ title: 'Save as', text: filename }).then(
(value) => {
if (value.button.accept) {
dashboard.dirty = false;
const dialog = saveDialog(dashboard);
dialog.launch().then((result) => {
dialog.dispose();
});
}
dashboard.save(notebookTracker, value.value);
}
);
},
tooltip: 'Save Dashboard',
});
return button;
}
/**
* Create undo button toolbar item.
*/
export function createUndoButton(dashboard: Dashboard): Widget {
const button = new ToolbarButton({
icon: undoIcon,
onClick: (): void => {
dashboard.undo();
},
tooltip: 'Undo',
});
return button;
}
/**
* Create redo button toolbar item.
*/
export function createRedoButton(dashboard: Dashboard): Widget {
const button = new ToolbarButton({
icon: Icons.redoToolbarIcon,
onClick: (): void => {
dashboard.redo();
},
tooltip: 'Redo',
});
return button;
}
/**
* Create cut button toolbar item.
*/
export function createCutButton(
dashboard: Dashboard,
outputTracker: WidgetTracker<DashboardWidget>,
utils: DBUtils
): Widget {
const button = new ToolbarButton({
icon: cutIcon,
onClick: (): void => {
utils.clipboard.clear();
const widget = outputTracker.currentWidget;
utils.clipboard.add(widget);
dashboard.deleteWidget(widget);
dashboard.deleteWidgetInfo(widget);
},
tooltip: 'Cut the selected outputs',
});
return button;
}
/**
* Create copy button toolbar item.
*/
export function createCopyButton(
dashboard: Dashboard,
outputTracker: WidgetTracker<DashboardWidget>,
utils: DBUtils
): Widget {
const button = new ToolbarButton({
icon: copyIcon,
onClick: (): void => {
utils.clipboard.clear();
const widget = outputTracker.currentWidget;
utils.clipboard.add(widget);
},
tooltip: 'Copy the selected outputs',
});
return button;
}
function pasteWidget(dashboard: Dashboard, widget: DashboardWidget): void {
const notebookId = addNotebookId(widget.notebook);
const cellId = addCellId(widget.cell);
const notebook = widget.notebook;
const cell = widget.cell;
const newWidget = new DashboardWidget({ notebook, cell, notebookId, cellId });
const info: Widgetstore.WidgetInfo = {
widgetId: DashboardWidget.createDashboardWidgetId(),
notebookId: newWidget.notebookId,
cellId: newWidget.cellId,
left: 0,
top: 0,
width: parseInt(widget.node.style.width, 10),
height: parseInt(widget.node.style.height, 10),
removed: false,
};
dashboard.area.addWidget(newWidget, info);
dashboard.area.updateWidgetInfo(info);
}
/**
* Create paste button toolbar item.
*/
export function createPasteButton(
dashboard: Dashboard,
utils: DBUtils
): Widget {
const button = new ToolbarButton({
icon: pasteIcon,
onClick: (): void => {
utils.clipboard.forEach((widget) => pasteWidget(dashboard, widget));
},
tooltip: 'Paste outputs from the clipboard',
});
return button;
}
/**
* Create run button toolbar item.
*/
export function createRunButton(
dashboard: Dashboard,
tracker: WidgetTracker<DashboardWidget>
): Widget {
const button = new ToolbarButton({
icon: runIcon,
onClick: (): void => {
const cell = tracker.currentWidget.cell as CodeCell;
const sessionContext = tracker.currentWidget.notebook.sessionContext;
CodeCell.execute(cell, sessionContext);
},
tooltip: 'Run the selected outputs',
});
return button;
}
/**
* Create stop button toolbar item.
*/
export function createStopButton(
dashboard: Dashboard,
tracker: WidgetTracker<DashboardWidget>
): Widget {
const button = new ToolbarButton({
icon: stopIcon,
onClick: (): void => {
const sessionContext = tracker.currentWidget.notebook.sessionContext;
void sessionContext.session?.kernel?.interrupt();
},
tooltip: 'Interrupt all kernels',
});
return button;
}
/**
* Create restart button toolbar item.
*/
export function createRestartButton(dashboard: Dashboard): Widget {
const button = new ToolbarButton({
icon: refreshIcon,
onClick: (): void => {
const notebooks = new Set<NotebookPanel>();
const widgets = dashboard.content.children().iter();
let widget = widgets.next() as DashboardWidget;
while (widget) {
notebooks.add(widget.notebook);
widget = widgets.next() as DashboardWidget;
}
notebooks.forEach(
(nb) => void sessionContextDialogs.restart(nb.sessionContext)
);
dashboard.save(notebookTracker, value.value);
}
); |
<<<<<<<
// import { Widgetstore } from './widgetstore';
// import { addCellId, addNotebookId } from './utils';
import { DBUtils } from './dbUtils';
=======
>>>>>>>
import { DBUtils } from './dbUtils';
<<<<<<<
utils: this._utils,
=======
>>>>>>>
utils: this._utils,
<<<<<<<
private _app: JupyterFrontEnd;
private _outputTracker: WidgetTracker<DashboardWidget>;
private _dashboardTracker: WidgetTracker<Dashboard>;
private _tracker: INotebookTracker;
private _utils: DBUtils;
private _shell: ILabShell;
=======
private _app: JupyterFrontEnd;
private _outputTracker: WidgetTracker<DashboardWidget>;
private _dashboardTracker: WidgetTracker<Dashboard>;
private _tracker: INotebookTracker;
>>>>>>>
private _app: JupyterFrontEnd;
private _outputTracker: WidgetTracker<DashboardWidget>;
private _dashboardTracker: WidgetTracker<Dashboard>;
private _tracker: INotebookTracker;
private _utils: DBUtils;
private _shell: ILabShell; |
<<<<<<<
if (options.mode === 'edit') {
this._corner.addClass(EDITABLE_CORNER_CLASS);
}
this._mode = options.mode;
}
public get corner(): Widget {
return this._corner;
=======
if (options.mode === 'edit') {
this._corner.addClass(EDITABLE_CORNER_CLASS);
}
this._mode = options.mode;
>>>>>>>
if (options.mode === 'edit') {
this._corner.addClass(EDITABLE_CORNER_CLASS);
}
this._mode = options.mode;
}
get corner(): Widget {
return this._corner; |
<<<<<<<
// Adds buttons to dashboard toolbar.
buildToolbar(this, panel, outputTracker, clipboard);
// TODO: Figure out if this is worth it. Right now it's disabled to prevent
// double updating, and I figure manually calling this.update() whenever the
// widgetstore is modified isn't so bad.
//
// Attach listener to update on table changes.
// this._store.listenTable(
// { schema: Widgetstore.WIDGET_SCHEMA },
// this.update,
// this
// );
=======
// Adds save button to dashboard toolbar.
this.toolbar.addItem('save', createSaveButton(this, panel));
this._store.listenTable(
{ schema: Widgetstore.WIDGET_SCHEMA },
(change) => (this._dirty = true)
);
>>>>>>>
// Adds buttons to dashboard toolbar.
buildToolbar(this, panel, outputTracker, clipboard);
this._store.listenTable(
{ schema: Widgetstore.WIDGET_SCHEMA },
(change) => (this._dirty = true)
); |
<<<<<<<
import { unsaveDialog } from './dialog';
import { DBUtils } from './dbUtils';
=======
>>>>>>>
import { unsaveDialog } from './dialog';
import { DBUtils } from './dbUtils';
<<<<<<<
this.setName(options.name || 'Unnamed Dashboard');
this._contentsManager = utils.contents;
=======
this.setName(options.name || 'Unnamed Dashboard');
this._contentsManager = contentsManager;
>>>>>>>
this.setName(options.name || 'Unnamed Dashboard');
this._contentsManager = utils.contents;
<<<<<<<
// Adds buttons to dashboard toolbar.
buildToolbar(notebookTracker, this, outputTracker, utils);
this._store.listenTable(
{ schema: Widgetstore.WIDGET_SCHEMA },
(change) => (this._dirty = true)
);
=======
// Adds save button to dashboard toolbar.
this.toolbar.addItem('save', createSaveButton(this, notebookTracker));
>>>>>>>
// Adds buttons to dashboard toolbar.
buildToolbar(notebookTracker, this, outputTracker, utils);
this._store.listenTable(
{ schema: Widgetstore.WIDGET_SCHEMA },
(change) => (this._dirty = true)
);
// Adds save button to dashboard toolbar.
this.toolbar.addItem('save', createSaveButton(this, notebookTracker));
<<<<<<<
utils,
dashboardWidth,
dashboardHeight,
=======
dashboardWidth,
dashboardHeight,
>>>>>>>
utils,
dashboardWidth,
dashboardHeight,
<<<<<<<
private _dirty: boolean;
private _mode: Dashboard.Mode;
=======
private _mode: Dashboard.Mode;
>>>>>>>
private _dirty: boolean;
private _mode: Dashboard.Mode; |
<<<<<<<
// coinbase = accounts[0];
// First account is used as the Safe relayer account
defaultAccountBox[0] = accounts[2];
safeOwnerBox[0] = accounts[3];
=======
defaultAccountBox[0] = accounts[1] || accounts[0];
safeOwnerBox[0] = accounts[2] || defaultAccountBox[0];
>>>>>>>
// First account is used as the Safe relayer account
defaultAccountBox[0] = accounts[2];
safeOwnerBox[0] = accounts[3];
<<<<<<<
it('should not produce SafeRelayTransactionManager instances when url not provided', async () => {
(() => new SafeRelayTransactionManager({} as any)).should.throw('url property missing from options');
});
describe('with CPK transaction manager', () => {
web3Versions.forEach((Web3) => {
shouldWorkWithWeb3({
Web3,
defaultAccountBox,
safeOwnerBox,
gnosisSafeProviderBox
});
});
shouldWorkWithEthers({
ethers: ethersMaj4,
=======
web3Versions.forEach((Web3) => {
shouldWorkWithWeb3({
Web3,
>>>>>>>
it('should not produce SafeRelayTransactionManager instances when url not provided', async () => {
(() => new SafeRelayTransactionManager({} as any)).should.throw('url property missing from options');
});
describe('with CPK transaction manager', () => {
web3Versions.forEach((Web3) => {
shouldWorkWithWeb3({
Web3,
defaultAccountBox,
safeOwnerBox,
gnosisSafeProviderBox
});
});
shouldWorkWithEthers({
ethers: ethersMaj4,
<<<<<<<
describe('with Safe Relay transaction manager', () => {
const transactionManager = new SafeRelayTransactionManager({ url: 'http://localhost:8000' });
web3Versions.forEach((Web3) => {
shouldWorkWithWeb3({
Web3,
defaultAccountBox,
safeOwnerBox,
gnosisSafeProviderBox,
transactionManager
});
});
shouldWorkWithEthers({
ethers: ethersMaj4,
defaultAccountBox,
safeOwnerBox,
gnosisSafeProviderBox,
transactionManager
});
});
=======
shouldWorkWithEthers({
ethers: ethersMaj4,
defaultAccountBox,
safeOwnerBox,
gnosisSafeProviderBox,
});
>>>>>>>
describe('with Safe Relay transaction manager', () => {
const transactionManager = new SafeRelayTransactionManager({ url: 'http://localhost:8000' });
web3Versions.forEach((Web3) => {
shouldWorkWithWeb3({
Web3,
defaultAccountBox,
safeOwnerBox,
gnosisSafeProviderBox,
transactionManager
});
});
shouldWorkWithEthers({
ethers: ethersMaj4,
defaultAccountBox,
safeOwnerBox,
gnosisSafeProviderBox,
transactionManager
});
}); |
<<<<<<<
dependency,
encryptPassword,
=======
>>>>>>>
dependency, |
<<<<<<<
// mock Gnosis Safe provider
return signer.sendTransaction({ gasLimit: gas, ...txObj });
=======
// mock WalletConnected Gnosis Safe provider
return (await signer.sendTransaction({ gasLimit: gas, ...txObj })).hash;
>>>>>>>
// mock Gnosis Safe provider
return (await signer.sendTransaction({ gasLimit: gas, ...txObj })).hash; |
<<<<<<<
import SafeAppsSDK, { SafeInfo, TxServiceModel } from '@gnosis.pm/safe-apps-sdk'
import { SimpleTransactionResult, StandardSafeAppsTransaction } from '../utils/transactions'
interface SafeTransactionParams {
safeTxGas?: number
=======
import initSdk, {
RequestId,
SafeInfo,
SdkInstance,
TxConfirmationEvent,
TxRejectionEvent
} from '@gnosis.pm/safe-apps-sdk'
import { v4 as uuidv4 } from 'uuid'
import { SimpleTransactionResult, StandardTransaction } from '../utils/transactions'
interface TxCallback {
confirm: (txResult: SimpleTransactionResult) => void
reject: (error: Error) => void
>>>>>>>
import SafeAppsSDK, { SafeInfo, TxServiceModel } from '@gnosis.pm/safe-apps-sdk'
import { SimpleTransactionResult, StandardTransaction } from '../utils/transactions'
interface SafeTransactionParams {
safeTxGas?: number
<<<<<<<
/**
* Returns an instance of the Safe Apps SDK used by the CPK.
*
* @returns The Safe Apps SDK instance
*/
get appsSdk() {
return this.#appsSdk
}
/**
* Returns the information of the connected Safe App.
*
* @returns The information of the connected Safe App
*/
getSafeInfo(): Promise<SafeInfo> {
return this.#appsSdk.getSafeInfo()
}
/**
* Returns the transaction response for the given Safe transaction hash.
*
* @param safeTxHash - The desired Safe transaction hash
* @returns The transaction response for the Safe transaction hash
*/
getBySafeTxHash(safeTxHash: string): Promise<TxServiceModel> {
return this.#appsSdk.txs.getBySafeTxHash(safeTxHash)
}
sendTransactions(
transactions: StandardSafeAppsTransaction[],
params: SafeTransactionParams
): Promise<SimpleTransactionResult> {
return this.#appsSdk.txs.send({ txs: transactions, params })
=======
sendTransactions(transactions: StandardTransaction[]): Promise<SimpleTransactionResult> {
const requestId = uuidv4()
return new Promise<SimpleTransactionResult>((confirm, reject) => {
this.txCallbacks.set(requestId, { confirm, reject })
this.appsSdk.sendTransactions(transactions, requestId)
})
>>>>>>>
/**
* Returns an instance of the Safe Apps SDK used by the CPK.
*
* @returns The Safe Apps SDK instance
*/
get appsSdk() {
return this.#appsSdk
}
/**
* Returns the information of the connected Safe App.
*
* @returns The information of the connected Safe App
*/
getSafeInfo(): Promise<SafeInfo> {
return this.#appsSdk.getSafeInfo()
}
/**
* Returns the transaction response for the given Safe transaction hash.
*
* @param safeTxHash - The desired Safe transaction hash
* @returns The transaction response for the Safe transaction hash
*/
getBySafeTxHash(safeTxHash: string): Promise<TxServiceModel> {
return this.#appsSdk.txs.getBySafeTxHash(safeTxHash)
}
sendTransactions(
transactions: StandardTransaction[],
params: SafeTransactionParams
): Promise<SimpleTransactionResult> {
return this.#appsSdk.txs.send({ txs: transactions, params }) |
<<<<<<<
ApiDefineSecurityScheme,
ApiResponse,
ApiSecurityRequirement,
Class,
Config,
Context,
Hook,
HookDecorator,
HttpResponse,
=======
Class,
ClassOrAbstractClass,
Config,
Context,
Hook,
HookDecorator,
HttpResponse,
>>>>>>>
ApiDefineSecurityScheme,
ApiResponse,
ApiSecurityRequirement,
Class,
ClassOrAbstractClass,
Config,
Context,
Hook,
HookDecorator,
HttpResponse,
<<<<<<<
async function hook(ctx: Context, services: ServiceManager) {
const cookieName = Config.get('settings.session.cookie.name', 'string', SESSION_DEFAULT_COOKIE_NAME);
=======
return Hook(async (ctx: Context, services: ServiceManager) => {
const ConcreteSessionStore: ClassOrAbstractClass<SessionStore> = options.store || SessionStore;
const store = services.get(ConcreteSessionStore);
const cookieName = Config.get2('settings.session.cookie.name', 'string', SESSION_DEFAULT_COOKIE_NAME);
>>>>>>>
async function hook(ctx: Context, services: ServiceManager) {
const ConcreteSessionStore: ClassOrAbstractClass<SessionStore> = options.store || SessionStore;
const store = services.get(ConcreteSessionStore);
const cookieName = Config.get('settings.session.cookie.name', 'string', SESSION_DEFAULT_COOKIE_NAME); |
<<<<<<<
import TestFile from './TestFile';
import {CoverageCollection} from './api/CoverageResult';
=======
import {CoverageCollection} from './api/test_runner';
>>>>>>>
import TestFile from './TestFile';
import {CoverageCollection} from './api/test_runner'; |
<<<<<<<
currentTrackMetadata: currentTrackId
? singleMetadataSelector(state, currentTrackId)
: null,
domain: document.location.host,
=======
currentTrackMetadata: meta,
>>>>>>>
currentTrackMetadata: meta,
domain: document.location.host, |
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.