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
+    }
   }
 });