Upgrade Ember and deps to 3.18/Octane

.editorconfig

@@ -4,7 +4,6 @@
 
 root = true
 
-
 [*]
 end_of_line = lf
 charset = utf-8

.eslintrc.js

@@ -1,8 +1,14 @@
+'use strict';
+
 module.exports = {
   root: true,
+  parser: 'babel-eslint',
   parserOptions: {
     ecmaVersion: 2018,
-    sourceType: 'module'
+    sourceType: 'module',
+    ecmaFeatures: {
+      legacyDecorators: true
+    }
   },
   globals: {
     console: true
@@ -19,7 +25,10 @@ module.exports = {
   },
   rules: {
     'ember/avoid-leaking-state-in-ember-objects': 'warn',
-    'no-console': 'off'
+    'no-console': 'off',
+    'ember/no-jquery': 'error',
+    'ember/require-computed-property-dependencies': 'warn',
+    'ember/no-observers': 'warn'
   },
   overrides: [
     // node files
@@ -35,8 +44,7 @@ module.exports = {
         'server/**/*.js'
       ],
       parserOptions: {
-        sourceType: 'script',
-        ecmaVersion: 2015
+        sourceType: 'script'
       },
       env: {
         browser: false,

.template-lintrc.js

@@ -1,10 +1,93 @@
 'use strict';
 
 module.exports = {
-  extends: 'recommended',
+  extends: 'octane',
 
   rules: {
     'simple-unless': false,
     'no-nested-interactive': false
-  }
+  },
+
+  ignore: [
+    'kredits-web/templates/components/**',
+    'app/templates/components/**'
+  ],
+
+	pending: [
+		{
+			"moduleId": "app/templates/dashboard",
+			"only": [
+				"no-action"
+			]
+		},
+		{
+			"moduleId": "app/components/add-contribution/template",
+			"only": [
+				"no-action",
+				"no-curly-component-invocation"
+			]
+		},
+		{
+			"moduleId": "app/components/add-contributor/template",
+			"only": [
+				"no-action",
+				"no-curly-component-invocation"
+			]
+		},
+		{
+			"moduleId": "app/components/contribution-list/template",
+			"only": [
+				"no-action",
+				"no-curly-component-invocation"
+			]
+		},
+		{
+			"moduleId": "app/components/contributor-list/template",
+			"only": [
+				"no-action"
+			]
+		},
+		{
+			"moduleId": "app/components/topbar-account-panel/template",
+			"only": [
+				"no-action"
+			]
+		},
+		{
+			"moduleId": "app/templates/contributions/new",
+			"only": [
+				"no-action"
+			]
+		},
+		{
+			"moduleId": "app/templates/contributions/resubmit",
+			"only": [
+				"no-action"
+			]
+		},
+		{
+			"moduleId": "app/templates/contributors/edit",
+			"only": [
+				"no-action"
+			]
+		},
+		{
+			"moduleId": "app/templates/contributors/new",
+			"only": [
+				"no-action"
+			]
+		},
+		{
+			"moduleId": "app/templates/signup/eth-account",
+			"only": [
+				"no-action"
+			]
+		},
+		{
+			"moduleId": "app/templates/signup/index",
+			"only": [
+				"no-action"
+			]
+		}
+	]
 };

.travis.yml

@@ -23,7 +23,9 @@ env:
     # See https://git.io/vdao3 for details.
     - JOBS=1
 
+branches:
+  only:
+    - master
+
 script:
-  - npm run lint:hbs
-  - npm run lint:js
   - npm test

app/app.js

@@ -1,14 +1,12 @@
 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';
 
-const App = Application.extend({
-  modulePrefix: config.modulePrefix,
-  podModulePrefix: config.podModulePrefix,
-  Resolver
-});
+export default class App extends Application {
+  modulePrefix = config.modulePrefix;
+  podModulePrefix = config.podModulePrefix;
+  Resolver = Resolver;
+}
 
 loadInitializers(App, config.modulePrefix);
-
-export default App;

app/components/add-contribution/component.js

@@ -45,7 +45,9 @@ export default Component.extend({
 
   actions: {
 
-    submit () {
+    submit (evt) {
+      evt.preventDefault();
+
       if (!this.isValid) {
         alert('Invalid data. Please review and try again.');
         return;

app/components/add-contribution/template.hbs

@@ -1,39 +1,39 @@
-<form {{action "submit" on="submit"}}>
+<form onsubmit={{action "submit"}}>
   <label>
     <p class="label">Contributor:</p>
     <p>
-      <select required onchange={{action (mut contributorId) value="target.value"}}>
+      <select required onchange={{action (mut this.contributorId) value="target.value"}}>
         <option value="" selected disabled hidden></option>
-        {{#each contributors as |contributor|}}
-          <option value={{contributor.id}} selected={{eq contributorId contributor.id}}>{{contributor.name}}</option>
+        {{#each @contributors as |contributor|}}
+          <option value={{contributor.id}} selected={{eq this.contributorId contributor.id}}>{{contributor.name}}</option>
         {{/each}}
       </select>
     </p>
   </label>
   <label>
     <p class="label">Kind:</p>
     <p>
-      <select required onchange={{action (mut kind) value="target.value"}}>
+      <select required onchange={{action (mut this.kind) value="target.value"}}>
         <option value="" selected disabled hidden></option>
-        <option value="community" selected={{eq kind "community"}}>Community</option>
-        <option value="design" selected={{eq kind "design"}}>Design</option>
-        <option value="dev" selected={{eq kind "dev"}}>Development</option>
-        <option value="docs" selected={{eq kind "docs"}}>Documentation</option>
-        <option value="ops" selected={{eq kind "ops"}}>IT Operations</option>
-        <option value="special" selected={{eq kind "special"}}>Special</option>
+        <option value="community" selected={{eq this.kind "community"}}>Community</option>
+        <option value="design" selected={{eq this.kind "design"}}>Design</option>
+        <option value="dev" selected={{eq this.kind "dev"}}>Development</option>
+        <option value="docs" selected={{eq this.kind "docs"}}>Documentation</option>
+        <option value="ops" selected={{eq this.kind "ops"}}>IT Operations</option>
+        <option value="special" selected={{eq this.kind "special"}}>Special</option>
       </select>
     </p>
   </label>
   <label>
     <p class="label">Date:</p>
     <p>
       {{ember-flatpickr
-        date=date
-        defaultDate=defaultDate
-        maxDate=defaultDate
+        date=this.date
+        defaultDate=this.defaultDate
+        maxDate=this.defaultDate
         enableTime=true
         time_24hr=true
-        onChange=(action (mut date))
+        onChange=(action (mut this.date))
       }}
     </p>
   </label>
@@ -42,42 +42,42 @@
     <p>
       {{input type="text"
               placeholder="500"
-              value=amount
-              class=(if isValidAmount "valid" "")}}
+              value=this.amount
+              class=(if this.isValidAmount "valid" "")}}
     </p>
   </label>
   <label>
     <p class="label">Description:</p>
     <p>
       {{input type="text"
-              value=description
-              class=(if isValidDescription "valid" "")}}
+              value=this.description
+              class=(if this.isValidDescription "valid" "")}}
     </p>
   </label>
   <label>
     <p class="label">URL (optional):</p>
     <p>
       {{input type="text"
-              value=url
-              class=(if isValidUrl "valid" "")}}
+              value=this.url
+              class=(if this.isValidUrl "valid" "")}}
     </p>
   </label>
 
-  {{#if details}}
+  {{#if this.details}}
     <label>
       <p class="label">Details:</p>
       <p>
         <pre>
-          {{details}}
+          {{this.details}}
         </pre>
       </p>
     </label>
   {{/if}}
 
   <p class="actions">
     {{input type="submit"
-            disabled=inProgress
-            value=(if inProgress "Processing" "Save")}}
+            disabled=this.inProgress
+            value=(if this.inProgress "Processing" "Save")}}
   </p>
 </form>
 

app/components/add-contributor/component.js

@@ -7,8 +7,8 @@ import { isAddress } from 'web3-utils';
 
 export default Component.extend({
 
-  kredits: service(),
   router: service(),
+  kredits: service(),
 
   attributes: null,
 
@@ -60,9 +60,15 @@ export default Component.extend({
 
   actions: {
 
-    submit () {
+    submit (evt) {
+      evt.preventDefault();
+
+      if (!this.kredits.currentUserIsCore) {
+        window.alert('Only core team members can edit profiles. Please ask someone to set you up.');
+        return;
+      }
       if (!this.isValid) {
-        alert('Invalid data. Please review and try again.');
+        window.alert('Invalid data. Please review and try again.');
         return;
       }