Merge branch 'master' into development

Author: jatinkatyal13

app/models/hbcontent.js

@@ -0,0 +1,9 @@
+import DS from "ember-data";
+
+export default DS.Model.extend({
+  name: DS.attr(),
+  details: DS.attr(),
+  topSubmission: DS.belongsTo('submission'),
+  "code-challenge": DS.belongsTo('code-challenge'),
+  problem: DS.belongsTo('problem')
+})

app/models/problem.js

@@ -1,24 +1,8 @@
 import DS from "ember-data";
-import { computed } from '@ember/object';
 
 export default DS.Model.extend({
   name: DS.attr(),
   details: DS.attr(),
-  submissions: DS.hasMany('submission'),
   solutionStubs: DS.hasMany('solution-stub'),
-  mostSuccessfullSubmission: computed('submissions', function(){
-    const submissions = this.submissions;
-    return submissions.reduce((acc, curr)=> acc.get("score")>= curr.get("score")? acc: curr, submissions.objectAt(0))
-  }),
-  hasLatestSubmissionPassed: computed('submissions', function(){
-    const topSubmission = this.submissions.reduce((acc, val) => acc = acc.get('submit-at') > val.get('submit-at') ? acc: val, this.submissions.objectAt(0))
-    
-    if(topSubmission.get('isErrored')){
-      return false
-    }else{
-      const failedTestCaseCount = topSubmission.get('judge-result.data.testcases').reduce((acc, val)=> acc = val.result !== 'correct'? ++acc: acc, 0)
-      return !failedTestCaseCount
-    }
-  }),
-  "code-challenge": DS.belongsTo('code-challenge')
+ 
 })

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

@@ -1,5 +1,6 @@
 import Controller from '@ember/controller';
 import { computed } from '@ember/object';
+import { alias } from '@ember/object/computed';
 
 export default class CodeChallenge extends Controller {
   tabs = [
@@ -25,4 +26,7 @@ export default class CodeChallenge extends Controller {
   get relatedPendingDoubt () {
     return this.runAttempt.doubts.find(doubt => doubt.get('content.id') == this.content.get('id') && ['PENDING', 'ACKNOWLEDGED'].includes(doubt.get('status')))
   }
+
+  @alias('hbContent.problem')
+  problem
 }

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

@@ -12,32 +12,31 @@ export default class CodeChallengeRoute extends Route {
     const runAttempt = this.modelFor('attempt')
     this.set("api.headers.hackJwt", this.get("currentUser.user.hackJwt"));
 
-    const problem = this.api.request(`code_challenges/${content.payload.get('id')}/problem`, {
+    const hbContent = this.api.request(`code_challenges/${content.payload.get('id')}/content`, {
       data: {
         contest_id: runAttempt.get("run.contestId")
       }
     }).then(payload => {
       if (!payload) return {}
-      
-      this.store.unloadAll('problem')
+      this.store.unloadAll('hbcontent')
       this.store.pushPayload(payload)
-      return this.store.peekRecord('problem', payload.data.id)
+      return this.store.peekRecord('hbcontent', payload.data.id)
     }).catch(err => {
       console.log(err)
       return {}
     })
 
     return hash({
       content,
-      problem,
+      hbContent,
       runAttempt
     })
   }
 
   setupController(controller, model) {
     controller.set('content', model.content)
     controller.set('codeChallenge', model.content.payload)
-    controller.set('problem', model.problem)
+    controller.set('hbContent', model.hbContent)
     controller.set('runAttempt', model.runAttempt)
   }
 }

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

@@ -31,7 +31,7 @@
       </div>
 
       Contest ID: {{runAttempt.run.contestId}} <br>
-      Problem ID: {{codeChallenge.hbContentId}} <br>
+      Content ID: {{codeChallenge.hbContentId}} <br>
       Run ID: {{runAttempt.run.id}} <br>
       Run Attempt ID: {{runAttempt.id}}
     </div>

app/pods/certificate/template.hbs

@@ -1,3 +1,3 @@
-<iframe src="https://docs.google.com/gview?url={{model.url}}&embedded=true" style="width:100%;min-height: 600px"
+<iframe src={{model.url}} style="width:100%;min-height: 600px"
   frameborder="0">
 </iframe>

app/pods/classroom/timeline/index/template.hbs

@@ -40,7 +40,7 @@
             <progress value="{{progressPercent}}" max="100" class="d-inline-block w-90 progress-orange"></progress>
 
             {{!-- % * 0.9 to compensate for 90% width of progress bar --}}
-            {{#if showGoodieRequest}}  
+            {{#if (and (is-after (unix runAttempt.run.start) '2019-11-29') showGoodieRequest)}}  
               <div class="progress-lock" style="left: {{goodiesLockOffset}}%; bottom: -2px" id="goodies-lock">
                 <div class="bg-light-grey br-25 card-sm font-normal p-2 progress-lock__bubble">Complete {{runAttempt.run.goodiesThreshold}}% to claim goodies</div>
                 {{#if (gte progressPercent runAttempt.run.goodiesThreshold)}}
@@ -131,7 +131,9 @@
       <div class="border-card p-4">
         <ExtensionsWidget 
           @onClose={{action (mut showExtensions) false}} 
-          @run={{runAttempt.run}} />
+          @run={{runAttempt.run}}
+          @expired={{runAttempt.isExpired}}
+        />
       </div>
     {{/if}}
 

app/pods/classroom/timeline/route.js

@@ -35,7 +35,8 @@ export default Route.extend({
       // try to enroll in preview
       try {
         await this.api.request(`runs/${params.runId}/enroll`)
-        transition.retry()
+        return this.transitionTo('classroom.timeline.index', params.courseId, params.runId)
+        // transition.retry()
       } catch (err) {
         if (err.status == 400 && err.payload.err == "TRIAL_WITHOUT_MOBILE") {
           // trial creation denined because user has no mobile number

app/pods/components/code-challenge/code-challenge-code-editor/component.js

@@ -86,7 +86,7 @@ export default class CodeEditor extends Component {
   ])
 
   setCodeStubs() {
-    this.problem.solutionStubs.map(stub => {
+    this.problem.get('solutionStubs').map(stub => {
       const languageSpec = this.languageSpecs.findBy('code', stub.language)
       if (languageSpec.source === '') {
         set(languageSpec, 'source', stub.body)
@@ -162,19 +162,19 @@ export default class CodeEditor extends Component {
       "method": "GET"
     }), submissionStatus => submissionStatus && submissionStatus['judge-result'] !== null);
 
-    this.get('api').request(`code_challenges/${this.codeChallenge.get('id')}/problems`,{
+    this.get('api').request(`code_challenges/${this.codeChallenge.get('id')}/content`,{
       data: {
         contest_id: runAttempt.get("run.contestId")
       },
     }).then(async result=>{
-      this.set("problemJsonApiPayload", result);
+      // this.set("problemJsonApiPayload", result);
       const payload = JSON.parse(JSON.stringify(result))
-      this.get('store').unloadAll('problem')
-      later(async() => {
+      // this.get('store').unloadAll('hbcontent') // kyu ?
+      later(async () => {
         this.get('store').pushPayload(payload)
-        const problem = await this.get('store').peekRecord('problem', result.data.id)
-        if (await problem.get('hasLatestSubmissionPassed') && await problem.get('mostSuccessfullSubmission.score') == 100) {
-          const progress = await this.get('content.progress')
+        const hbContent = await this.get('store').peekRecord('hbcontent', result.data.id)
+        if (await hbContent.get('topSubmission.score') == 100) {
+          const progress = await this.content.get('progress')
           progress.set("status", 'DONE')
           return progress.save();
         }

app/pods/components/code-challenge/code-challenge-explanation/template.hbs

@@ -3,7 +3,7 @@
 </p>
 <div class="extra-bold">Input Format</div>
 <p>
-  {{markdown-to-html problem.details.input-format}}
+  {{markdown-to-html problem.details.input_format}}
 </p>
 <div class="extra-bold">Constraints</div>
 <div class="bg-dark-grey br-5 w-60 px-4 py-2 my-2">
@@ -13,15 +13,15 @@
 </div>
 <div class="extra-bold">Output Format</div>
 <p>
-  {{markdown-to-html problem.details.output-format}}
+  {{markdown-to-html problem.details.output_format}}
 </p>
 <div class="extra-bold">Sample Input</div>
 <div class="bg-dark-grey br-5 w-60 px-4 py-2 my-2">
-  <pre>{{problem.details.sample-input}}</pre>
+  <pre>{{problem.details.sample_input}}</pre>
 </div>
 <div class="extra-bold">Sample Output</div>
 <div class="bg-dark-grey br-5 w-60 px-4 py-2 my-2">
-  <pre>{{problem.details.sample-output}}</pre>
+  <pre>{{problem.details.sample_output}}</pre>
 </div>
 {{#if problem.details.explanation}}
   <div class="extra-bold">Explanation</div>

app/pods/components/extensions-widget/template.hbs

@@ -1,7 +1,9 @@
 <div class="p-4">
   <div class="row">
     <div class="col-8 my-auto font-mds">
-      <div class="bold">Your course has been expired!</div>
+      <div class="bold">Your course 
+        {{if @expired 'has been expired!' 'will expire soon!'}}
+      </div>
       <div>Buy extension for this course</div>
     </div>
     <div class="col-4 t-align-r">

app/pods/components/locked-content/component.js

@@ -10,7 +10,7 @@
   <div class="row justify-content-center">
     <div class="mt-3">
       <a 
-        href="/courses/{{course.slug}}"
+        href="/courses/{{@course.slug}}"
         target="_blank"
         class="button-solid button-orange"> 
         Buy Now 

app/pods/components/locked-content/template.hbs

@@ -32,6 +32,7 @@
     <ExtensionsWidget 
       @run={{run}} 
       @onClose={{action (mut showExtensionsModal) false}}
+      @expired={{runAttempt.isExpired}}
     />
   </ModalDialog>
 {{/if}}

app/pods/components/my-courses-list/expired-courses/content/template.hbs

@@ -7,6 +7,7 @@ export default class TracksDoubtsFormComponent extends Component {
   alreadySent = false
   name = null
   mobile = null
+  email = null
 
   @service api
 
@@ -18,6 +19,7 @@ export default class TracksDoubtsFormComponent extends Component {
           data: {
             name: this.name,
             mobile: this.mobile,
+            email: this.email,
             course: 'Tracks',
           },
           meta: {

app/pods/components/tracks/tracks-doubts-form/component.js

@@ -17,6 +17,9 @@
     </div>
     <div class="mt-4">
       {{input type="text" class="input-search bg-light-grey p-3 w-100" placeholder="Mobile number, For eg. 9999999999" value=mobile}}
+    </div>
+        <div class="mt-4">
+      {{input type="text" class="input-search bg-light-grey p-3 w-100" placeholder="Email" value=email}}
     </div>
     {{#if error}}
       <p class="mt-4 mb-0 red">

app/pods/components/tracks/tracks-doubts-form/template.hbs

@@ -1,6 +1,6 @@
 <div class="row justify-content-center">
   <FaIcon @icon="lock" @size="3" />
 </div>
-<div class="row justify-content-center">
-  <h2 class="white">Your course will start on {{run.startString}}</h2>
+<div class="row justify-content-center my-3">
+  <h2 class="white">Your course will start on {{moment-format (unix @run.start) "Do MMM, YYYY"}}</h2>
 </div>

app/pods/components/unstarted-content/controller.js

@@ -1,4 +1,9 @@
+
 <div class="row">
+<div class="col-md-12">
+    <promotion-banner class="">
+    </promotion-banner>
+</div>
   <div class="col-md-9 col-12">
     {{#if lastAccessedRun}}
       <h4 class="my-4">Continue Learning</h4>
@@ -153,3 +158,6 @@
     <CarouselCards />
   </div>  
 </div>
+
+
+<script src="https://unpkg.com/@coding-blocks/[email protected]/dist/index.js" async></script>