Merge remote-tracking branch 'origin/master' into development

Author: abhishek97

README.md

@@ -21,14 +21,16 @@ You will need the following things properly installed on your computer.
 * [Yarn](https://yarnpkg.com/)
 * [Ember CLI](https://ember-cli.com/)
 * [Google Chrome](https://google.com/chrome/)
+* [CodingBlocks Online Server](https://github.com/coding-blocks/codingblocks.online.server)
 
 ## Installation
 
+* Make sure [CodingBlocks Online Server](https://github.com/coding-blocks/codingblocks.online.server) is installed and running
 * `git clone https://github.com/coding-blocks/codingblocks.online.projectx` this repository
 * `cd codingblocks.online.projectx`
 * `yarn install`
 
-## Running / Development
+## Running for Development
 
 * `export oss=true && ember serve`
 * Visit your app at [http://localhost:4200](http://localhost:4200).
@@ -38,18 +40,13 @@ You will need the following things properly installed on your computer.
 
 Make use of the many generators for code, try `ember help generate` for more details
 
-### Running Tests
-
-* `ember test`
-* `ember test --server`
-
 ### Linting
 
 * `npm run lint:hbs`
 * `npm run lint:js`
 * `npm run lint:js -- --fix`
 
-### Building
+### Building (for production)
 
 * `ember build` (development)
 * `ember build --environment production` (production)

app/index.html

@@ -96,7 +96,7 @@
       .push([f])},catch:function(){return k&&new k()},c:l}};})(window,document,[]);
     </script>
 
-    <script src="https://hack.codingblocks.com/index.js"></script>
+    <script src="https://unpkg.com/@coding-blocks/[email protected]/dist/index.js" async></script>
 
     {{content-for "body-footer"}}
   </body>

app/models/comment.js

@@ -6,7 +6,8 @@ export default DS.Model.extend({
   name: DS.attr(),
   avatarTemplate: DS.attr(),
   username: DS.attr(),
-  updatedAt: DS.attr(),
+  createdAt: DS.attr('date'),
+  updatedAt: DS.attr('date'),
   doubt: DS.belongsTo('doubt'),
   discourseTopicId: DS.attr()
 })

app/models/course.js

@@ -40,6 +40,7 @@ export default DS.Model.extend({
     backgroundImage: DS.attr(),
     rating: DS.attr('number'),
     seoMeta: DS.attr(),
+    code: DS.attr(),
     topRun: computed('activeRuns', 'runs', function () {
         let runs = this.activeRuns
 
@@ -60,10 +61,6 @@ export default DS.Model.extend({
     feedback: computed('feedbacks', function () {
       return this.feedbacks.objectAt(0);
     }),
-    canHazDoubtsLink: and('categoryId', 'doubtSubCategoryId'),
-    doubtsLink: computed('categoryId', 'doubtSubCategoryId', function () {
-      return `${env.discussBaseUrl}/c/${this.categoryId}/${this.doubtSubCategoryId}`;
-    }),
     difficultyName: computed('difficulty', function () {
       switch(+this.difficulty) {
         case 0: return 'beginner' ; break;

app/models/doubt.js

@@ -11,5 +11,6 @@ export default DS.Model.extend({
   firebaseRef: DS.attr(),
   comments: DS.hasMany('comment'),
   feedbacks: DS.hasMany('doubt-feedback'),
-  resolvedById: DS.attr()
+  resolvedById: DS.attr(),
+  createdAt: DS.attr('date')
 })

app/models/run-attempt.js

@@ -9,6 +9,7 @@ export default DS.Model.extend({
   revoked: DS.attr(),
   certificateApproved: DS.attr(),
   rating: DS.attr(),
+  runTier: DS.attr(),
   completedContents: DS.attr('number'),
   approvalRequested: DS.attr('boolean'),
   doubtSupport: DS.attr('date'),

app/models/run.js

@@ -24,13 +24,15 @@ export default DS.Model.extend({
   description: DS.attr(),
   productId: DS.attr(),
   totalContents: DS.attr("number"),
+  tier: DS.attr(),
   course: DS.belongsTo("course", { inverse: "runs" }),
   sections: DS.hasMany("sections"),
   user: DS.belongsTo("user"),
   runAttempts: DS.hasMany("run-attempt"),
   announcements: DS.hasMany("announcement"),
   ta: DS.hasMany("ta"),
   runRequests: DS.hasMany("run-request"),
+  shift: DS.attr(),
   topRunAttempt: computed("runAttempts", function() {
     return this.runAttempts.objectAt(0);
   }),

app/pods/application-loading/route.js

@@ -3,12 +3,14 @@ import ApplicationRouteMixin from "ember-simple-auth/mixins/application-route-mi
 import UtmCookieRouteMixin from "../../mixins/utm-cookie-route"
 import { inject as service } from "@ember/service";
 import { isNone } from "@ember/utils";
+import { get } from '@ember/object';
 
 export default Route.extend(ApplicationRouteMixin, UtmCookieRouteMixin, {
   session: service(),
   currentUser: service(),
   store: service(),
   headData: service(),
+  pageProgress: service(),
   onesignal: service(),
   metrics: service(), // !important: keep this here to init trackers for all routes
   // routeAfterAuthentication: 'dashboard',
@@ -72,5 +74,15 @@ export default Route.extend(ApplicationRouteMixin, UtmCookieRouteMixin, {
   setupController(controller, model) {
     this._super(controller, model);
     controller.set("model", model);
+  },
+  actions: {
+  loading(transition) {
+      const pageProgress = get(this, 'pageProgress');
+       pageProgress.start(transition.targetName);
+       transition.promise.finally(() => {
+         pageProgress.done();
+       });
+      return true
+    }
   }
 });

app/pods/application-loading/template.hbs

@@ -1,3 +1,4 @@
+<PageProgress />
 {{head-layout}}
 {{#if hideNav}}
   {{outlet}}
@@ -10,6 +11,7 @@
     </div>
 
     <div class="offset-md-1 mb-5">
+      <promotion-banner />
       <div id="outside-container" {{did-insert (action "setOutsideContainer")}} ></div>
       <div class="container">
         <div class="row justify-content-center mx-0">
@@ -24,6 +26,7 @@
       <div class="col-12">
         <NavBarPublic class="ml-0 w-100" />
         <cb-navbar topalign="right" />
+        <promotion-banner />
         <div class="">
           {{outlet}}
         </div>

app/pods/application/route.js

@@ -1,8 +1,11 @@
 import Controller from '@ember/controller';
 import { computed } from '@ember/object';
 import { alias } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
 
 export default class CodeChallenge extends Controller {
+  @service player
+
   tabs = [
     {
       name: 'Problem',

app/pods/application/template.hbs

@@ -1,20 +1,36 @@
 {{#if problem.id}}
-  <div class="p-md-5 p-4 mb-5 border-card white border-none bg-grey-darker">
-    <WTabNav
-      @inactiveClass="white"
-      @tabs={{tabs}}
-      @activeTab={{activeTab}}
-      @onTabChange={{action (mut activeTab)}}>
-      <div class="py-4">
-        {{component activeTab.component codeChallenge=codeChallenge problem=problem}}  
-      </div>
-    </WTabNav>
+  <div class="bg-modal-grey-darker py-2 t-align-c" style="border-radius: 15px 15px 0 0;">
+    {{#if player.isFullscreen}}
+      <span>Press Esc to exit fullscreen mode.</span>
+    {{else}}
+      <a class="white pointer hoverable-underline" {{action player.goFullScreen}} >
+        Try Fullscreen mode <i class="fas fa-expand"></i> <sup>Beta</sup> </a>
+    {{/if}}
+  </div>
+  <div class="c-code-challenge">
+    <div class="p-md-5 p-4 white border-none bg-grey-darker mb-5 border-card problem-panel">
+      <WTabNav
+        @inactiveClass="white"
+        @tabs={{tabs}}
+        @activeTab={{activeTab}}
+        @onTabChange={{action (mut activeTab)}}>
+        <div class="py-4">
+          {{component activeTab.component codeChallenge=codeChallenge problem=problem}}  
+        </div>
+      </WTabNav>
+    </div>
+    
+    {{#if player.isFullscreen}}
+      <div class="splitter"></div>
+    {{/if}}
+
+    <CodeChallenge::CodeChallengeCodeEditor
+      class="flex-1"
+      @ref={{relatedPendingDoubt.firebaseRef}}
+      @content={{content}}
+      @codeChallenge={{codeChallenge}}
+      @problem={{problem}} />
   </div>
-  <CodeChallenge::CodeChallengeCodeEditor
-    @ref={{relatedPendingDoubt.firebaseRef}}
-    @content={{content}}
-    @codeChallenge={{codeChallenge}}
-    @problem={{problem}} />
 {{else}}
   <div class="p-md-5 p-4 mb-5 border-card white border-none bg-grey-darker">
     <div class="t-align-c">
@@ -36,4 +52,6 @@
       Run Attempt ID: {{runAttempt.id}}
     </div>
   </div>
-{{/if}}
+{{/if}}
+
+<div id="fullscreen-code-challenge-result"></div>

app/pods/attempt/content/code-challenge/controller.js

@@ -1,6 +1,22 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
+import { computed } from '@ember/object';
+import { alias } from '@ember/object/computed';
 
 export default class AttemptController extends Controller {
   @service currentUser
+
+  @alias('currentUser.user') user
+
+  @computed('user.{verifiedemail,verifiedmobile}')
+  get isMobileOrEmailVerified() {
+    const { verifiedemail, verifiedmobile } = this.user
+    return verifiedemail || verifiedmobile
+  }
+
+  @computed('user.{firstname,lastname}')
+  get hasEmptyName() {
+    const { firstname, lastname } = this.user
+    return !(firstname || lastname)
+  }
 }

app/pods/attempt/content/code-challenge/template.hbs

@@ -1,17 +1,21 @@
-{{#if (not (or currentUser.user.verifiedemail currentUser.user.verifiedmobile))}}
-  <VerifyEmail />
-{{else if model.payload}}
-  {{!-- render content outlet and doubts and notes --}}
-  <div>
+<div id="player-content-fullscreen-container" class="col-lg-9 timeline__main-area__video-area no-scrollbar order-lg-12 order-1">
+  {{#if (not isMobileOrEmailVerified)}}
+    <Blockers::VerifyEmail />
+  {{else if hasEmptyName}}
+    <Blockers::FillupName />
+  {{else if model.payload}}
+    {{!-- render content outlet and doubts and notes --}}
     <div>
-      {{outlet}}
+      <div>
+        {{outlet}}
+      </div>
+      <div class="d-lg-block d-none">
+        <Player::PlayerTabs />
+      </div>
     </div>
-    <div class="d-lg-block d-none">
-      <Player::PlayerTabs />
-    </div>
-  </div>
-{{else if (not run.isStarted)}}
-  <UnstartedContent @run={{run}} />
-{{else}}
-  <LockedContent @course={{run.course}} />
-{{/if}}
+  {{else if (not run.isStarted)}}
+    <UnstartedContent @run={{run}} />
+  {{else}}
+    <LockedContent @course={{run.course}} />
+  {{/if}}
+</div>

app/pods/attempt/content/controller.js

@@ -39,9 +39,7 @@
         </div>
       </div>
 
-      <div class="col-lg-9 timeline__main-area__video-area no-scrollbar order-lg-12 order-1">
         {{outlet}}
-      </div>
     </div>
     <div class="d-lg-none d-block px-4">
       {{#if player.isActive}}

app/pods/attempt/content/template.hbs

@@ -13,11 +13,13 @@
     @loaderComponent={{component 'my-courses-list/placeholder-row'}}
     as |result|>
     {{#if result.length}}
-      {{#if (eq activeTab.name 'Wishlisted')}}
-        {{component activeTab.component wishlist=result class="border-bottom-list"}}
-      {{else}}
-        {{component activeTab.component runs=result class="border-bottom-list"}}
-      {{/if}}
+      <div class="border-bottom-list">
+        {{#if (eq activeTab.name 'Wishlisted')}}
+          {{component activeTab.component wishlist=result}}
+        {{else}}
+          {{component activeTab.component runs=result}}
+        {{/if}}
+      </div>
     {{else}}
       <div class="t-align-c my-5">
         <img src="/app/images/camera-orange.svg" alt="Courses">

app/pods/attempt/template.hbs

@@ -17,9 +17,15 @@ export default class Overview extends Controller {
   discussBaseUrl = config.discussBaseUrl
   visible = true
 
+  @computed('runAttempt.{end,premium}', 'runAttempt.run.price')
+  get showCertificateRequest() {
+    return this.runAttempt.premium && this.runAttempt.get('run.certificateTemplate')
+  }
+
   @computed('runAttempt.{end,premium}', 'runAttempt.run.price')
   get showGoodieRequest() {
-    return this.runAttempt.premium && this.runAttempt.get('run.price')
+    const {premium, runTier} = this.runAttempt
+    return premium && this.runAttempt.get('run.price') && runTier != 'LITE'
   }
 
   @computed('runAttempt.{isExpired,end,premium}')
@@ -44,6 +50,17 @@ export default class Overview extends Controller {
     return 0.84 * this.runAttempt.get('run.goodiesThreshold')
   }
 
+  @computed('course.topRun')
+  get totalContents() {
+    return this.course.get('topRun').totalContents
+  }
+
+  @computed('course.topRun')
+  get doneContents() {
+    return this.runAttempt.completedContents
+  }
+
+
   @alias('runAttempt.progressPercent')
   progressPercent
 

app/pods/classroom/index/template.hbs

@@ -13,6 +13,7 @@ export default Route.extend({
   setupController (controller, model) {
     controller.set('course', model.get('run.course'))
     controller.set('runAttempt', model)
+    controller.set('run', model.get('run'))
     controller.set('userRating', model.get('rating'))
   },
   async afterModel(model) {