Skip to content

Commit

Permalink
update ember 3.16
Browse files Browse the repository at this point in the history
  • Loading branch information
abhishek97 committed Mar 4, 2020
1 parent 999415c commit c6bbc8e
Show file tree
Hide file tree
Showing 10 changed files with 618 additions and 243 deletions.
1 change: 0 additions & 1 deletion .editorconfig
Expand Up @@ -4,7 +4,6 @@

root = true


[*]
end_of_line = lf
charset = utf-8
Expand Down
2 changes: 1 addition & 1 deletion .template-lintrc.js
@@ -1,7 +1,7 @@
'use strict';

module.exports = {
extends: 'recommended',
extends: 'octane',
rules: {
'no-triple-curlies': false
}
Expand Down
2 changes: 1 addition & 1 deletion app/app.js
@@ -1,5 +1,5 @@
import Application from '@ember/application';
import Resolver from './resolver';
import Resolver from 'ember-resolver';
import loadInitializers from 'ember-load-initializers';
import config from './config/environment';
import './models/custom-inflector-rules';
Expand Down
3 changes: 3 additions & 0 deletions app/pods/dashboard/route.js
Expand Up @@ -25,5 +25,8 @@ export default class Dashboard extends Route.extend(AuthenticatedRouteMixin) {
}
setupController(controller, model) {
controller.set('lastAccessedRun', model)
controller.fetchCoursesTask.perform()
controller.fetchWishlistCoursesTask.perform()
controller.fetchAppliedJobsTask.perform()
}
}
11 changes: 1 addition & 10 deletions app/pods/dashboard/template.hbs
Expand Up @@ -83,9 +83,7 @@
<LinkTo @route="classroom" class="orange font-sm font-normal">View All</LinkTo>
</div>
<div class="divider-h my-4"></div>
<WAsync @task={{fetchCoursesTask}} @autoFire="true">
<Dashboard::DashboardCoursesList @runs={{runs}} />
</WAsync>
{{/if}}
</div>
</div>
Expand All @@ -102,11 +100,8 @@
{{else}}
<h4 class="bold">Wishlisted Courses</h4>
<div class="divider-h mt-4"></div>
<WAsync
@task={{fetchWishlistCoursesTask}}
@autoFire="true">

<Dashboard::DashboardWishList @wishlist={{wishlist}} />
</WAsync>
{{#if (gt wishlist.length 2)}}
<div class="t-align-c">
<button class="button-solid button-orange mt-4">View All</button>
Expand All @@ -126,11 +121,7 @@
{{else}}
<h4 class="bold">Applied Jobs</h4>
<div class="divider-h mt-4"></div>
<WAsync
@task={{fetchAppliedJobsTask}}
@autoFire="true">
<Dashboard::DashboardAppliedJobs @jobs={{appliedJobs}} />
</WAsync>
{{#if (gt wishlist.length 2)}}
<div class="t-align-c">
<button class="button-solid button-orange my-5">View All</button>
Expand Down
3 changes: 0 additions & 3 deletions app/resolver.js

This file was deleted.

5 changes: 4 additions & 1 deletion config/optional-features.json
@@ -1,3 +1,6 @@
{
"jquery-integration": true
"application-template-wrapper": false,
"default-async-observers": true,
"jquery-integration": true,
"template-only-glimmer-components": true
}
43 changes: 24 additions & 19 deletions package.json
Expand Up @@ -11,7 +11,7 @@
"test": "tests"
},
"scripts": {
"build": "ember build",
"build": "ember build --environment=production",
"lint:hbs": "ember-template-lint .",
"lint:js": "eslint .",
"start": "ember serve",
Expand All @@ -20,23 +20,25 @@
"devDependencies": {
"@babel/core": "^7.3.4",
"@ember/jquery": "^1.1.0",
"@ember/optional-features": "^1.0.0",
"@ember/optional-features": "^1.3.0",
"@ember/render-modifiers": "^1.0.2",
"@firebase/app": "^0.3.13",
"@firebase/database": "^0.3.16",
"@glimmer/component": "^1.0.0",
"@glimmer/tracking": "^1.0.0",
"babel-eslint": "^10.0.3",
"broccoli-asset-rev": "^3.0.0",
"ember-ajax": "^5.0.0",
"ember-auto-import": "^1.5.2",
"ember-cli": "~3.14.0",
"ember-auto-import": "^1.5.3",
"ember-cli": "~3.16.0",
"ember-cli-app-version": "^3.2.0",
"ember-cli-babel": "^7.11.1",
"ember-cli-babel": "^7.17.2",
"ember-cli-chart": "^3.5.0",
"ember-cli-dependency-checker": "^3.1.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-eslint": "^5.1.0",
"ember-cli-head": "^0.4.1",
"ember-cli-htmlbars": "^4.0.5",
"ember-cli-inject-live-reload": "^2.0.1",
"ember-cli-htmlbars": "^4.2.2",
"ember-cli-inject-live-reload": "^2.0.2",
"ember-cli-moment-shim": "^3.7.1",
"ember-cli-sass": "^7.1.7",
"ember-cli-showdown": "^4.4.2",
Expand All @@ -48,45 +50,48 @@
"ember-concurrency-decorators": "^1.0.0",
"ember-content-placeholders": "^1.0.0",
"ember-crumbly": "^3.0.1",
"ember-data": "~3.14.0",
"ember-data": "~3.16.0",
"ember-decorators": "^6.0.0",
"ember-engines": "^0.8.2",
"ember-event-helpers": "^0.1.0",
"ember-export-application-global": "^2.0.0",
"ember-fetch": "^6.7.0",
"ember-export-application-global": "^2.0.1",
"ember-fetch": "^7.0.0",
"ember-form-for": "^2.0.1",
"ember-in-element-polyfill": "^0.2.1",
"ember-keyboard-shortcuts": "^1.0.6",
"ember-link-action": "^1.0.0",
"ember-load-initializers": "^2.1.0",
"ember-load-initializers": "^2.1.1",
"ember-local-storage": "^1.4.1",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-metrics": "^0.13.0",
"ember-modal-dialog": "^3.0.0-beta.0",
"ember-moment": "^7.7.0",
"ember-monaco": "^1.1.0",
"ember-power-select": "^4.0.0-beta.4",
"ember-qunit": "^4.5.1",
"ember-resolver": "^5.3.0",
"ember-qunit": "^4.6.0",
"ember-resolver": "^7.0.0",
"ember-shepherd": "^10.0.1",
"ember-simple-auth": "^1.4.2",
"ember-simple-auth-token": "git+https://github.com/abhishek97/ember-simple-auth-token.git",
"ember-source": "~3.14.1",
"ember-source": "~3.16.0",
"ember-timer": "^1.1.0",
"ember-toggle": "^5.3.2",
"ember-tooltips": "^3.4.2",
"ember-truth-helpers": "^2.0.0",
"ember-uploader": "^2.0.0",
"ember-welcome-page": "^4.0.0",
"eslint-plugin-ember": "^7.1.0",
"eslint-plugin-node": "^10.0.0",
"eslint-plugin-ember": "^7.7.2",
"eslint-plugin-node": "^11.0.0",
"firepad": "^1.5.3",
"liquid-fire": "^0.31.0",
"loader.js": "^4.7.0",
"qunit-dom": "^0.9.0"
"qunit-dom": "^1.0.0"
},
"engines": {
"node": "8.* || >= 10.*"
"node": "10.* || >= 12"
},
"ember": {
"edition": "octane"
},
"dependencies": {
"@coding-blocks/motley": "0.7.3",
Expand Down
1 change: 1 addition & 0 deletions testem.js
Expand Up @@ -7,6 +7,7 @@ module.exports = {
launch_in_dev: [
'Chrome'
],
browser_start_timeout: 120,
browser_args: {
Chrome: {
ci: [
Expand Down

0 comments on commit c6bbc8e

Please sign in to comment.