Skip to content

Commit

Permalink
master #comment fix font icons and right align author in game play qu…
Browse files Browse the repository at this point in the history
…estion card
  • Loading branch information
piya99 committed Aug 30, 2019
1 parent 0e6561e commit 8c46e07
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .firebaserc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"trivia-production": "rwa-trivia",
"bitwiser-edu-dev": "bitwiser-edu",
"bitwiser-edu-staging": "bitwiser-edu",
"bitwiser-edu-production": "bitwiser-edu"
"bitwiser-edu-production": "bitwiser-edu",
"default": "rwa-trivia-dev-e57fc"
}
}
3 changes: 1 addition & 2 deletions cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ const buildApps = `ng build trivia --configuration=productVariant-env &&
ng run trivia:server`;
const compileFunctions = `npx rimraf functions/server && npx tsc --project functions`;
const buildSSRServer = `npx webpack --config webpack.server.config.js`;
const deployFunctionsCommand = ` ${buildApps} &&
${compileFunctions} &&
const deployFunctionsCommand = `${compileFunctions} &&
${buildSSRServer} &&
setConfig
npx rimraf functions/index.js &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ export class ProfileSettings {
this.categories = values[1] || [];
this.categoryDict = values[2] || {};

this.userCopyForReset = cloneDeep(this.user);
this.userCopyForReset = this.user; // cloneDeep(this.user);
this.createForm(this.user);

if (this.user.profilePictureUrl) {
Expand Down Expand Up @@ -313,7 +313,7 @@ export class ProfileSettings {
}

resetUserProfile() {
this.user = cloneDeep(this.userCopyForReset);
this.user = this.userCopyForReset; // cloneDeep(this.userCopyForReset);
this.createForm(this.user);
this.filteredTags$ = this.userForm.get('tags').valueChanges
.pipe(map(val => val.length > 0 ? this.filter(val) : []));
Expand Down
5 changes: 3 additions & 2 deletions projects/trivia/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { enableProdMode } from '@angular/core';
import { environment } from 'shared-library/environments/environment';
import { AppModule } from './app/app.module';
import './icons';

if (environment.production) {
enableProdMode();
}
document.addEventListener('DOMContentLoaded', () => {
platformBrowserDynamic().bootstrapModule(AppModule)
})
platformBrowserDynamic().bootstrapModule(AppModule);
});

// platformBrowserDynamic().bootstrapModule(AppModule)
// .catch(err => console.log(err));
4 changes: 4 additions & 0 deletions projects/trivia/src/styles/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -775,3 +775,7 @@ pre.ql-syntax {
.gameplay .wrong p, .gameplay .right p {
color: #fff !important;
}

game-question .auther{
justify-content: flex-end;
}

0 comments on commit 8c46e07

Please sign in to comment.