try to update ember

Author: abhishek97

app/pods/application/controller.js

@@ -1,7 +1,7 @@
 import Controller from '@ember/controller';
-import { computed } from '@ember-decorators/object';
-import { or, alias } from '@ember-decorators/object/computed';
-import { inject as service } from '@ember-decorators/service';
+import { computed } from '@ember/object';
+import { or, alias } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
 
 export default class ApplicationController extends Controller {
   @service router

app/pods/application/route.js

@@ -21,12 +21,12 @@ export default Route.extend(ApplicationRouteMixin, {
     },
     beforeModel (transition) {
 
-      if (!isNone(transition.queryParams.code)) {
+      if (!isNone(transition.to.queryParams.code)) {
         if (this.get('session.isAuthenticated')) {
           return this.transitionTo({ queryParams: { code: undefined } })
         }
         // we have ?code qp
-        const { code } = transition.queryParams
+        const { code } = transition.to.queryParams
 
         return this.session.authenticate('authenticator:jwt', { identification: code, password: code, code })
           .then(() => this.currentUser.load())

app/pods/classroom/timeline/contents/controller.js

@@ -1,5 +1,5 @@
 import Controller from '@ember/controller';
-import { action } from '@ember-decorators/object'
+import { action } from '@ember/object'
 
 export default class ContentController extends Controller {
     @action

app/pods/classroom/timeline/controller.js

@@ -1,7 +1,7 @@
 import Controller from '@ember/controller';
-import { action } from '@ember-decorators/object';
-import { inject as service } from '@ember-decorators/service';
-import { computed }  from '@ember-decorators/object';
+import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
+import { computed }  from '@ember/object';
 
 export default class TimelineController extends Controller {
     queryParams = ['showFeedback']

app/pods/components/accordion-head/component.js

@@ -1,5 +1,5 @@
 import Component from '@ember/component';
-import { action, computed } from '@ember-decorators/object'
+import { action, computed } from '@ember/object'
 import { isBlank } from '@ember/utils'
 
 export default class AccordionHeadComponent extends Component {

app/pods/components/all-courses/component.js

@@ -1,8 +1,8 @@
 import Component from '@ember/component';
-import { inject as service } from '@ember-decorators/service';
+import { inject as service } from '@ember/service';
 import { restartableTask } from 'ember-concurrency-decorators';
 import { alias }  from '@ember/object/computed';
-import { action, computed } from '@ember-decorators/object';
+import { action, computed } from '@ember/object';
 
 export default class AllCoursesComponent extends Component {
 

app/pods/components/available-run-card/component.js

@@ -1,6 +1,6 @@
 import Component from '@ember/component';
-import { alias, equal, or } from '@ember-decorators/object/computed'
-import { inject as service } from '@ember-decorators/service'
+import { alias, equal, or } from '@ember/object/computed'
+import { inject as service } from '@ember/service'
 
 export default class AvailableRunCardComponent extends Component {
   classNames = ['card-layout', 'col-md-4', 'col-sm-6']

app/pods/components/card-grid/component.js

@@ -1,5 +1,5 @@
 import Component from '@ember/component';
-import { action } from '@ember-decorators/object'
+import { action } from '@ember/object'
 
 export default class CardGridComponent extends Component {
   poppedIndex = -1

app/pods/components/carousel-cards/component.js

@@ -1,7 +1,7 @@
 import Component from '@ember/component';
 import { restartableTask } from 'ember-concurrency-decorators';
-import { inject as service } from '@ember-decorators/service';
-import { action } from '@ember-decorators/object'
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object'
 import $ from 'jquery';
 
 class carouselCard {

app/pods/components/cart-dialog/component.js

@@ -1,6 +1,6 @@
 import Component from '@ember/component';
 import { restartableTask } from 'ember-concurrency-decorators';
-import { inject as service } from '@ember-decorators/service';
+import { inject as service } from '@ember/service';
 import env from 'codingblocks-online/config/environment';
 
 export default class CartDialog extends Component {