conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
updateUserReactionStatus: any;
getUserReactionStatus: any;
getQuestionSuccess: any;
=======
getTopCategories: any;
getTopTags: any;
>>>>>>>
updateUserReactionStatus: any;
getUserReactionStatus: any;
getQuestionSuccess: any;
getTopCategories: any;
getTopTags: any;
<<<<<<<
userFriendInvi... |
<<<<<<<
countries: Countries,
userAnsweredQuestion: UserAnsweredQuestion,
=======
account: Account,
userAnsweredQuestions: UserAnsweredQuestions,
currentQuestion: CurrentQuestion,
>>>>>>>
countries: Countries,
userAnsweredQuestion: UserAnsweredQuestion,
account: Account,
userAnswe... |
<<<<<<<
import { FriendsList } from './friends-list';
=======
import { Question } from './question';
>>>>>>>
import { FriendsList } from './friends-list';
import { Question } from './question';
<<<<<<<
friendsList: FriendsList,
=======
question: Question,
>>>>>>>
friendsList: FriendsList,
quest... |
<<<<<<<
router.post('/question/update/:collectionName', generalController.updateQuestionCollection);
=======
router.post('/blog', generalAuth.adminOnly, generalController.generateBlogsData);
>>>>>>>
router.post('/question/update/:collectionName', generalAuth.adminOnly, generalController.updateQuestionCollection);
ro... |
<<<<<<<
'editorUrl': 'https://rwa-trivia-dev-e57fc.firebaseapp.com/trivia-editor',
'hightlighJsURL': 'https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/highlight.min.js',
'hightlighCSSURL': 'https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/styles/a11y-light.min.css',
'katexCSSURL': 'https://c... |
<<<<<<<
isFriend?: boolean;
=======
totalFriends?: number;
>>>>>>>
isFriend?: boolean;
totalFriends?: number; |
<<<<<<<
import { Component, OnDestroy } from '@angular/core';
import { Observable, Subscription } from 'rxjs';
=======
import { Component, OnDestroy, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core';
import { Observable } from 'rxjs';
>>>>>>>
import { Component, OnDestroy, ChangeDetectionStrategy, C... |
<<<<<<<
import { Component, OnInit } from '@angular/core';
import { Observable } from 'rxjs';
=======
import { Component, OnInit, OnDestroy } from '@angular/core';
import { MatCheckboxChange, MatTabChangeEvent, PageEvent } from '@angular/material';
import { Router } from '@angular/router';
import { select, Store } fr... |
<<<<<<<
router.post('/question/update/:collectionName', generalAuth.adminOnly, generalController.updateQuestionCollection);
router.post('/blog', generalAuth.adminOnly, generalController.generateBlogsData);
=======
router.post('/blog', generalAuth.authTokenOnly, generalController.generateBlogsData);
>>>>>>>
router.po... |
<<<<<<<
import { InviteMailFriendsComponent } from './invite-mail-friends/invite-mail-friends.component';
=======
import { SignupExtraInfoComponent } from './signup-extra-info/signup-extra-info.component';
import { CheckDisplayNameComponent } from './check-display-name/check-display-name.component';
import { InviteMa... |
<<<<<<<
=======
// console.log('getCategories--->', 'getCategories');
>>>>>>> |
<<<<<<<
import { RecentGamesComponent } from './recent-games/recent-games.component';
import { RecentGameCardComponent } from './recent-games/recent-game-card/recent-game-card.component';
=======
>>>>>>>
import { RecentGamesComponent } from './recent-games/recent-games.component';
import { RecentGameCardComponent }... |
<<<<<<<
=======
import { GameMechanics } from './game-mechanics';
>>>>>>>
import { GameMechanics } from './game-mechanics';
<<<<<<<
// console.log(doc.id, '=>', doc.data());
=======
console.log(doc.id, '=>', doc.data());
>>>>>>>
// console.log(doc.id, '=>', doc.data()); |
<<<<<<<
is_draft: boolean;
=======
appeared: number;
correct: number;
wrong: number;
>>>>>>>
is_draft: boolean;
appeared: number;
correct: number;
wrong: number;
<<<<<<<
question.is_draft = db.is_draft ? db.is_draft : false;
=======
question.appeared = db.appeared ? db.appeared : 0;
... |
<<<<<<<
private router: Router,
private utils: Utils) {
=======
private windowRef: WindowRef,
private router: Router) {
>>>>>>>
private windowRef: WindowRef,
private router: Router,
private utils: Utils) { |
<<<<<<<
import { StatsService } from '../services/stats.service';
const katex = require('katex');
=======
>>>>>>>
const katex = require('katex'); |
<<<<<<<
import { Component, OnInit, OnDestroy } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
=======
import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms';
>>>>>>>
import { Component, OnInit, O... |
<<<<<<<
export * from './countryList/countryList.component';
export * from './question-card/question-card.component';
export * from './first-question/first-question.component';
=======
export * from './countryList/countryList.component';
export * from './select-category-tag/select-category-tag.component';
>>>>>>>
ex... |
<<<<<<<
=======
import admin from '../db/firebase.client';
>>>>>>>
<<<<<<<
private static blogFireStoreClient = admin.firestore();
=======
private static blogFireStoreClient = admin.firestore();
>>>>>>>
private static blogFireStoreClient = admin.firestore();
<<<<<<<
const batch = this.blog... |
<<<<<<<
getCityAndCountryName(location) {
const userLocation: string[] = [];
location.results[0].address_components.map(component => {
const cityList = component.types.filter(typeName => typeName === 'administrative_area_level_2');
if (cityList.length > 0) {
... |
<<<<<<<
android_version: number;
ios_version: number;
=======
phone_authentication: boolean;
>>>>>>>
android_version: number;
ios_version: number;
phone_authentication: boolean; |
<<<<<<<
import { Component, OnInit, OnDestroy } from '@angular/core';
=======
import { Component, OnInit, ViewChildren, QueryList, ElementRef } from '@angular/core';
>>>>>>>
import { Component, OnInit, OnDestroy, ViewChildren, QueryList, ElementRef } from '@angular/core';
<<<<<<<
import { Utils } from 'shared-libra... |
<<<<<<<
StatsModule,
BrowserModule.withServerTransition({ appId: 'trivia' })
=======
StatsModule,
ServiceWorkerModule.register('/ngsw-worker.js', { enabled: environment.production })
>>>>>>>
StatsModule,
BrowserModule.withServerTransition({ appId: 'trivia' })
ServiceWorkerModule.register(... |
<<<<<<<
@ViewChild('autocomplete', { static: false }) autocomplete: RadAutoCompleteTextViewComponent;
@ViewChild('friendListView', { static: false }) listViewComponent: RadListViewComponent;
=======
modeAvailable: boolean;
@ViewChild('autocomplete') autocomplete: RadAutoCompleteTextViewComponent;
@ViewChild... |
<<<<<<<
export * from './game-filter.pipe';
export * from './safe-html.pipe';
=======
export * from './game-filter.pipe';
export * from './search-country-filter.pipe';
>>>>>>>
export * from './game-filter.pipe';
export * from './safe-html.pipe';
export * from './search-country-filter.pipe'; |
<<<<<<<
=======
import * as userActions from '../../store/actions';
>>>>>>>
import * as userActions from '../../store/actions';
<<<<<<<
sendFriendRequest() {
const inviteeUserId = this.user.userId;
this.store.dispatch(this.userAction.addUserInvitation(
{ userId: this.loggedInUser.... |
<<<<<<<
import { categories } from './categories.reducer';
import { tags } from './tags.reducer';
import { questionOfTheDay, questionSaveStatus, updateQuestion, firstQuestion } from './questions.reducer';
=======
import { categories, topCategories } from './categories.reducer';
import { tags, topTags } from './tags.r... |
<<<<<<<
import { ChangePasswordComponent } from 'shared-library/shared/mobile/component';
=======
import { BulkUploadRequestComponent } from '../../../../../shared-library/src/lib/shared/mobile/component';
>>>>>>>
import { ChangePasswordComponent } from 'shared-library/shared/mobile/component';
import { BulkUpload... |
<<<<<<<
const generalQuestionService = require('../services/question.service');
=======
>>>>>>>
const generalQuestionService = require('../services/question.service');
<<<<<<<
/**
* changeQuestionCategoryIdType
* return status
*/
exports.changeQuestionCategoryIdType = (req, res) => {
const updatePromises = ... |
<<<<<<<
import {
Parameter, User, FirebaseAnalyticsKeyConstants, FirebaseAnalyticsEventConstants
} from '../../../../../../shared-library/src/lib/shared/model';
=======
import * as geolocation from 'nativescript-geolocation';
import { filter } from 'rxjs/operators';
import { ModalDialogService } from 'nativescript-... |
<<<<<<<
import { PLATFORM_ID, APP_ID, Component, OnInit, Inject, AfterViewInit, ChangeDetectorRef, OnDestroy } from '@angular/core';
=======
import { PLATFORM_ID, APP_ID, Component, OnInit, Inject, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core';
>>>>>>>
import { PLATFORM_ID, APP_ID, Component, OnI... |
<<<<<<<
=======
import { MatSnackBar } from '@angular/material';
import * as firebase from 'firebase';
>>>>>>>
<<<<<<<
=======
profileImage: String;
data: any;
>>>>>>>
<<<<<<<
@ViewChild('cropper') cropper: ImageCropperComponent;
=======
file: File;
croppedFileBlobObject: Blob;
@ViewChild('croppe... |
<<<<<<<
import { Component, OnDestroy, AfterViewInit, ChangeDetectorRef } from '@angular/core';
=======
import { Component, OnDestroy, AfterViewInit, ChangeDetectorRef, ChangeDetectionStrategy} from '@angular/core';
>>>>>>>
import { Component, OnDestroy, AfterViewInit, ChangeDetectorRef, ChangeDetectionStrategy} fro... |
<<<<<<<
constructor(private store: Store<AppState>, private utils: Utils) {
this.subscription.push(store.select(appState.coreState).pipe(select(s => s.account)).subscribe(account => {
=======
constructor(private store: Store<AppState>, private utils: Utils, private cd: ChangeDetectorRef) {
this.subs.push(... |
<<<<<<<
RULES = 'rules',
GET_QUESTION_IMAGE = 'getQuestionImage',
UPLOAD_QUESTION_IMAGE = 'uploadQuestionImage',
=======
RULES = 'rules',
DISPLAY_NAME = 'display-name',
DISPLAY_DASH_NAME = 'displayName'
>>>>>>>
RULES = 'rules',
GET_QUESTION_IMAGE = 'getQuestionImage',
UPLOAD_QUES... |
<<<<<<<
this.subscription.push(this.userDict$.subscribe(userDict => this.userDict = userDict));
this.subscription.push(this.store.select(appState.coreState).pipe(select(s => s.applicationSettings)).subscribe(appSettings => {
=======
this.subs.push(this.userDict$.subscribe(userDict => { this.userDict = use... |
<<<<<<<
router.post('/blog', generalAuth.authTokenOnly, generalController.generateBlogsData);
=======
router.post('/question/update/:collectionName', generalController.updateQuestionCollection);
>>>>>>>
router.post('/blog', generalAuth.authTokenOnly, generalController.generateBlogsData);
router.post('/question/updat... |
<<<<<<<
constructor(private store: Store<AppState>, private renderer: Renderer2, public utils: Utils) {
this.subscription.push(this.store.select(appState.coreState).pipe(take(1)).subscribe(s => this.user = s.user));
=======
constructor(private store: Store<AppState>, private renderer: Renderer2, private utils... |
<<<<<<<
import { SharedModule } from '../shared/shared.module';
import { BlogComponent, NewsletterComponent, SocialPaletteComponent } from './components';
=======
import { StoreModule } from '@ngrx/store';
import { EffectsModule } from '@ngrx/effects';
import { SharedModule } from '../shared/shared.module';
import {... |
<<<<<<<
this.subscription.push(this.store.select(gamePlayState).pipe(select(s => s.saveReportQuestion)).subscribe(state => { }));
this.subscription.push(this.store.select(coreState).pipe(select(s => s.userProfileSaveStatus)).subscribe((status: string) => {
=======
this.subs.push(this.store.select(gamePlay... |
<<<<<<<
const EMAIL_REGEXP = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
@AutoUnsubscribe({ 'arrayName': 'subscriptions' })
export class InviteMailFriends implements OnInit, OnDestroy {
user: User;
... |
<<<<<<<
ActionBarComponent, DrawerComponent, CountryListComponent, QuestionsTableComponent, QuestionCardComponent, FirstQuestionComponent
=======
ActionBarComponent, DrawerComponent, CountryListComponent, QuestionsTableComponent,
SelectCategoryTagComponent
>>>>>>>
ActionBarComponent, DrawerComponent, Country... |
<<<<<<<
'editorUrl': 'https://bitwiser-edu.firebaseapp.com/editor',
'hightlighJsURL': 'https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/highlight.min.js',
'hightlighCSSURL': 'https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/styles/a11y-light.min.css',
'katexCSSURL': 'https://cdn.jsdelivr.net... |
<<<<<<<
import { PLATFORM_ID, APP_ID, Component, OnInit, Inject, AfterViewInit, ChangeDetectorRef, OnDestroy } from '@angular/core';
=======
import { PLATFORM_ID, APP_ID, Component, OnInit, Inject, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core';
>>>>>>>
import { PLATFORM_ID, APP_ID, Component, OnI... |
<<<<<<<
],
"userDict": {
'ssHmHkKq9BPByP9c4CtmEqvO4xp2': {
"userId": "ssHmHkKq9BPByP9c4CtmEqvO4xp2",
"displayName": "trivia",
"email": "trivia@realworldfullstack.io",
"roles": {},
"authState": null
}
}
=======
],
"leaderBo... |
<<<<<<<
/**
* updateBits
* return account
*/
static async updateBits(userId: string): Promise<any> {
try {
const appSetting = await AppSettings.Instance.getAppSettings();
const bits = appSetting.first_question_bits;
const accountData = await AccountServ... |
<<<<<<<
import { user, authInitialized, categories, categoryDictionary, tags,
questionsSearchResults, unpublishedQuestions, questionOfTheDay, questionSaveStatus,
userPublishedQuestions, userUnpublishedQuestions,fileUnpublishedQuestions, filePublishedQuestions,
loginRedirectUrl,
cu... |
<<<<<<<
static LOAD_TOP_TOPICS_SUCCESS = 'LOAD_TOP_TOPICS_SUCCESS';
=======
>>>>>>> |
<<<<<<<
renderWebView: boolean;
=======
display_achievements: boolean;
>>>>>>>
renderWebView: boolean;
display_achievements: boolean; |
<<<<<<<
export const CURR_VER_DEV = '0.913';
export const CURR_VER_PROD = '0.913';
=======
export const CURR_VER_DEV = '0.904';
export const CURR_VER_PROD = '0.915';
>>>>>>>
export const CURR_VER_DEV = '0.913';
export const CURR_VER_PROD = '0.913';
export const CURR_VER_DEV = '0.904';
export const CURR_VER_PROD = '... |
<<<<<<<
import { RSSFeedConstants, Blog } from '../../src/app/model';
=======
import { QuestionBifurcation } from '../utils/question-bifurcation';
>>>>>>>
import { RSSFeedConstants, Blog } from '../../src/app/model';
import { QuestionBifurcation } from '../utils/question-bifurcation';
<<<<<<<
}
/**
* generateBlo... |
<<<<<<<
ngOnDestroy() {
Utils.unsubscribe(this.subs);
}
=======
rejectGameInvitation() {
this.store.dispatch(new gameplayactions.RejectGameInvitation(this.game.gameId));
}
>>>>>>>
rejectGameInvitation() {
this.store.dispatch(new gameplayactions.RejectGameInvitation(this.game.gameId));
}
... |
<<<<<<<
import { QuestionActions, BulkUploadActions } from '../../../core/store/actions';
import { AppStore } from '../../../core/store/app-store';
=======
import { AppState, appState } from '../../../store';
>>>>>>>
import { QuestionActions, BulkUploadActions } from '../../../core/store/actions';
import { AppState... |
<<<<<<<
import { UploadTaskSnapshot } from 'angularfire2/storage/interfaces';
=======
import { of } from 'rxjs';
>>>>>>>
import { UploadTaskSnapshot } from 'angularfire2/storage/interfaces';
import { of } from 'rxjs';
<<<<<<<
switchMap((action: socialActions.LoadSocialScoreShareUrl) =>
this.soci... |
<<<<<<<
private renderer: Renderer2) {
=======
private renderer: Renderer2,
private utils: Utils,
private cd: ChangeDetectorRef) {
>>>>>>>
private renderer: Renderer2,
private cd: ChangeDetectorRef) {
<<<<<<<
this.store.select(appState.coreState).pipe(take(1)).subscribe(s => this.user = ... |
<<<<<<<
this.userDataProvider.addWallet(newWallet, passphrase, password).subscribe((result) => {
this.navCtrl.push('WalletDashboardPage', { address: newWallet.address });
=======
this.userDataProvider.addWallet(newWallet, privateKey.toWIF(), password).subscribe((resul... |
<<<<<<<
getNodeConfiguration(host: string): Observable<PeerApiResponse> {
return Observable.create(observer => {
this.get(`node/configuration`, {}, host).subscribe((response: any) => {
observer.next(response.data);
observer.complete();
}, (error) => observer.error(error));
});
}
... |
<<<<<<<
// Load User Profile By Id
export function user(state: any = null, action: UserActions): User {
switch (action.type) {
case UserActionTypes.LOAD_USER_PROFILE_SUCCESS || UserActionTypes.UPDATE_USER_SUCCESS:
return { ...state, ...action.payload };
default:
return state... |
<<<<<<<
if (changes.game && changes.game.currentValue && this.game.gameOptions.isBadgeWithCategory) {
if (this.user.userId && this.game.stats.badge) {
this.earnedBadges = this.game.stats.badge[this.user.userId].reverse();
}
if (Number(this.game.gameOptions.playerMode) === PlayerMode.Oppone... |
<<<<<<<
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, NgZone, OnDestroy, ViewChild, ElementRef } from '@angular/core';
=======
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, NgZone, OnDestroy, OnInit } from '@angular/core';
>>>>>>>
import { ChangeDetectionStrategy, ChangeDetectorRe... |
<<<<<<<
import { Account, Game } from '../../projects/shared-library/src/lib/shared/model';
=======
import { AppSettings } from './app-settings.service';
import { Utils } from '../utils/utils';
>>>>>>>
import { Account, Game } from '../../projects/shared-library/src/lib/shared/model';
import { AppSettings } from './... |
<<<<<<<
import { Component, ChangeDetectorRef, ChangeDetectionStrategy } from '@angular/core';
import { Store } from '@ngrx/store';
import { Observable } from 'rxjs';
import { Category, User, LeaderBoardUser, LeaderBoardConstants } from './../../../../../../shared-library/src/lib/shared/model';
=======
import { Compo... |
<<<<<<<
import { User, GameOptions, Game, Question, PlayerQnA, GameOperations, GameStatus } from '../../model';
=======
import { User, GameOptions, Game, Question, PlayerQnA, GameOperations, QuestionStatus } from '../../model';
>>>>>>>
import { User, GameOptions, Game, Question, PlayerQnA, GameOperations, GameStatus... |
<<<<<<<
import { User, Question, RouterStateUrl, Friends } from '../../../model';
import { UserActionTypes } from '../actions';
=======
import { User, Question, RouterStateUrl, Game } from '../../../model';
import { UserActions, UserActionTypes } from '../actions';
>>>>>>>
import { User, Question, RouterStateUrl, Fr... |
<<<<<<<
private wordlist;
private suggestLanguageFound = false;
=======
public manualImportFormGroup: FormGroup;
>>>>>>>
public manualImportFormGroup: FormGroup;
private wordlist;
private suggestLanguageFound = false;
<<<<<<<
settingsDataProvider: SettingsDataProvider,
private inAppBrowser... |
<<<<<<<
import { AutoUnsubscribe } from 'ngx-auto-unsubscribe';
=======
import { ListViewEventData } from 'nativescript-ui-listview';
>>>>>>>
import { AutoUnsubscribe } from 'ngx-auto-unsubscribe';
import { ListViewEventData } from 'nativescript-ui-listview';
<<<<<<<
this.subscriptions.push(this.store.select(co... |
<<<<<<<
closeAllPopOver() {
this.questionsArray.map((res) => {
res.openReport = false;
});
}
handlePopOver(row) {
this.questionsArray.map((res) => {
if (res.id === row.id) {
res.openReport = !res.openReport;
} else {
res.openReport = false;
}
});
}
ope... |
<<<<<<<
import admin from '../db/firebase.client';
const accountFireStoreClient = admin.firestore();
=======
const accountFireBaseClient = require('../db/firebase-client');
const accountFireStoreClient = accountFireBaseClient.firestore();
import { Account, Game } from '../../projects/shared-library/src/lib/shared/mod... |
<<<<<<<
constructor(private fb: FormBuilder, private store: Store<AppState>, private userAction: UserActions,
private utils: Utils) {
this.subscription.push(this.store.select(appState.coreState).pipe(select(s => s.user)).subscribe(user => {
=======
constructor(private fb: FormBuilder, private store: Stor... |
<<<<<<<
private calculateItems() {
// sometimes in IE 11 this throw exception even it was run in runOutsideAngular function
if (!this.doNotCheckAngularZone) {
NgZone.assertNotInAngularZone();
}
=======
private calculateItems(forceViewportUpdate: boolean = false) {
NgZone.assertNotInAngularZo... |
<<<<<<<
=======
>>>>>>> |
<<<<<<<
checkDisplayName: boolean;
=======
updateQuestionStatSuccess: any;
>>>>>>>
checkDisplayName: boolean;
updateQuestionStatSuccess: any;
<<<<<<<
getTopTags: topTags,
checkDisplayName: checkDisplayName
=======
getTopTags: topTags,
updateQuestionStatSuccess: updateQuestionStatSuccess
>>>>>>>
... |
<<<<<<<
systemStatPromises.push(statQuestionService.getAllQuestions());
systemStatPromises.push(GameService.getLiveGames());
systemStatPromises.push(GameService.getCompletedGames());
=======
systemStatPromises.push(QuestionService.getAllQuestions());
... |
<<<<<<<
// Save user profile
@Effect()
addUser$ = this.actions$
.pipe(ofType(UserActionTypes.ADD_USER_PROFILE))
.pipe(
switchMap((action: userActions.AddUserProfile) => {
return this.userService.saveUserProfile(action.payload.user).pipe(
map((s... |
<<<<<<<
import { Component, OnInit, Input, OnDestroy } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
=======
import { Component, OnInit, Input, ElementRef, QueryList, ViewChildren } from '@angular/core';
import { FormBuilder, FormGroup, Validators, FormArray, FormControl }... |
<<<<<<<
const generalQuestionService = require('../services/question.service');
=======
>>>>>>>
const generalQuestionService = require('../services/question.service');
<<<<<<<
/**
* changeQuestionCategoryIdType
* return status
*/
exports.changeQuestionCategoryIdType = (req, res) => {
const updatePromises = ... |
<<<<<<<
=======
actionText: string;
>>>>>>>
actionText: string;
<<<<<<<
this.cd.markForCheck();
=======
this.cd.markForCheck();
>>>>>>>
this.cd.markForCheck(); |
<<<<<<<
private static appSettings: AppSettings;
private static FS = GeneralConstants.FORWARD_SLASH;
private static QC = CollectionConstants.QUESTIONS;
=======
>>>>>>>
private static FS = GeneralConstants.FORWARD_SLASH;
private static QC = CollectionConstants.QUESTIONS; |
<<<<<<<
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Store } from '@ngrx/store';
import { RouterExtensions } from 'nativescript-angular/router';
=======
import {
Compone... |
<<<<<<<
import { CONFIG } from '../../environments/environment';
import { User, Answer } from '../../shared/model';
=======
import { CONFIG } from '../../environments/environment'
import { User } from '../../shared/model'
import { isPlatformBrowser, isPlatformServer } from '@angular/common';
>>>>>>>
import { CONFIG ... |
<<<<<<<
social_profile: SocialProfile;
=======
tokens: Tokens;
>>>>>>>
social_profile: SocialProfile;
tokens: Tokens;
<<<<<<<
}
export class SocialProfile {
display: String;
enable: Boolean;
position: Number;
social_name: String;
url: String;
=======
}
export class Tokens {
... |
<<<<<<<
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { select, Store } from '@ngrx/store';
import { RouterExtensions } from 'nativescript-angular/router';
=======
import { C... |
<<<<<<<
import { User, Question, RouterStateUrl, Friends } from '../../../model';
import { UserActionTypes } from '../actions';
=======
import { User, Question, RouterStateUrl, Game } from '../../../model';
import { UserActions, UserActionTypes } from '../actions';
>>>>>>>
import { User, Question, RouterStateUrl, Fr... |
<<<<<<<
import { Account } from './account';
import { UserAnsweredQuestions } from './user-answered-questions';
=======
import { Countries } from './counties';
>>>>>>>
import { Account } from './account';
import { UserAnsweredQuestions } from './user-answered-questions';
import { Countries } from './counties';
<<... |
<<<<<<<
getUsers = async (authUsers: User[], pageToken?: string): Promise<User[]> => {
try {
const listUsersResult = await firebaseAuthService.getAuthUsers(pageToken);
for (const afUser of listUsersResult.users) {
=======
async getUsers(authUsers: User[], pageToken?: string): P... |
<<<<<<<
import * as html2canvas from 'html2canvas';
=======
import { ReportGameComponent } from '../report-game/report-game.component';
import { MatDialog, MatDialogRef } from '@angular/material';
import { Utils } from '../../../core/services';
>>>>>>>
import * as html2canvas from 'html2canvas';
import { ReportGameC... |
<<<<<<<
this.subscription.push(this.store.select(gamePlayState).pipe(select(s => s.saveReportQuestion)).subscribe(state => { }));
this.subscription.push(this.store.select(coreState).pipe(select(s => s.userProfileSaveStatus)).subscribe((status: string) => {
=======
this.subs.push(this.store.select(gamePlay... |
<<<<<<<
ActionBarComponent, DrawerComponent, CountryListComponent, QuestionsTableComponent, QuestionCardComponent, FirstQuestionComponent
=======
ActionBarComponent, DrawerComponent, CountryListComponent, QuestionsTableComponent,
SelectCategoryTagComponent
>>>>>>>
ActionBarComponent, DrawerComponent, Country... |
<<<<<<<
import { Component, OnInit, OnDestroy, ViewContainerRef, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core';
import { Utils, WindowRef } from 'shared-library/core/services';
import { AppState, appState } from '../../../store';
import { UserActions } from 'shared-library/core/store/actions';
impor... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
}
=======
}
>>>>>>>
} |
<<<<<<<
private storage: AngularFireStorage,
private store: Store<AppStore>,
private questionActions: QuestionActions,
private http: HttpClient) {
=======
private store: Store<AppState>,
private questionActions: QuestionActions,
private http: HttpClient) {
>... |
<<<<<<<
app.engine('html', ngExpressEngine({
bootstrap: AppServerModuleNgFactory,
providers: [
provideModuleMap(LAZY_MODULE_MAP)
]
}));
app.set('view engine', 'html');
app.set('views', join(DIST_FOLDER, 'browser'));
// Server static files from /browser
app.get('*.*', express.static(join(DIST_FOLDE... |
<<<<<<<
import { FirstQuestionComponent } from 'shared-library/shared/mobile/component/first-question/first-question.component';
=======
import { SelectCategoryTagComponent } from 'shared-library/shared/mobile/component/select-category-tag/select-category-tag.component'
>>>>>>>
import { FirstQuestionComponent } fro... |
<<<<<<<
super(store, userActions, utils);
this.subscription.push(this.store.select(gamePlayState).pipe(select(s => s.saveReportQuestion)).subscribe(state => {
=======
super(store, userActions, utils, cd);
this.subs.push(this.store.select(gamePlayState).pipe(select(s => s.saveReportQuestion)).subscribe... |
<<<<<<<
Subquery(_) : None()
=======
IfElse(exp1, exp2, exp3): ty2
where exp1 : ty1
and exp2 : ty2
and exp3 : ty3
and (ty1 == BooleanTy() or ty1 == UnknownTy()) else error $[Boolean expected here] on exp1
and not (ty2 == VertexTy() or ty2 == EdgeTy()) else error $[CASE does not allow vertex or e... |
<<<<<<<
StatsModule,
BrowserModule.withServerTransition({ appId: 'trivia' })
=======
StatsModule,
ServiceWorkerModule.register('/ngsw-worker.js', { enabled: environment.production })
>>>>>>>
StatsModule,
BrowserModule.withServerTransition({ appId: 'trivia' })
ServiceWorkerModule.register(... |
<<<<<<<
=======
import { MatSnackBar } from '@angular/material';
import * as firebase from 'firebase';
>>>>>>>
<<<<<<<
=======
profileImage: String;
data: any;
>>>>>>>
<<<<<<<
@ViewChild('cropper') cropper: ImageCropperComponent;
=======
file: File;
croppedFileBlobObject: Blob;
@ViewChild('croppe... |
<<<<<<<
=======
const userService = require('../services/user.service');
>>>>>>>
const userService = require('../services/user.service');
<<<<<<<
=======
// Add lastGamePlayOption when new game create
private updateUser(userId: string, gameOptions: any): Promise<string> {
return userService.getUs... |
<<<<<<<
import { RecentGameCardComponent, RecentGamesComponent, PrivacyPolicyComponent, AchievementsComponent } from './components';
=======
import { RecentGameCardComponent, RecentGamesComponent, PrivacyPolicyComponent } from './components';
import { UserFeedbackComponent } from './components/index.tns';
>>>>>>>
im... |
<<<<<<<
import { Component, OnInit, OnDestroy, ViewContainerRef, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core';
import { Utils, WindowRef } from 'shared-library/core/services';
import { AppState, appState } from '../../../store';
import { UserActions } from 'shared-library/core/store/actions';
impor... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.