Skip to content

Commit

Permalink
Add eslint, tslint and sass-list (#65)
Browse files Browse the repository at this point in the history
* Add eslint, tslint and sass-list

* Update app.scss

eslint errors fixed

* Update user-home.hbs

* Update user-home.hbs

* Update user-home.hbs
  • Loading branch information
niranjan94 authored and mariobehling committed Aug 20, 2017
1 parent 902c2f1 commit d446c7e
Show file tree
Hide file tree
Showing 57 changed files with 3,141 additions and 1,078 deletions.
15 changes: 9 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,18 @@ before_install:
- node -v
- npm -v
- npm cache verify
- npm install -g bower
- npm install -g bower ember-cli
- bower --version
- popd


install:
# Frontend stuff
- pushd frontend
- npm run
- npm install
- bower install
- popd
# API server stuff
# API server stuff
- pip install -r requirements.txt
- git clone https://github.com/fossasia/pslab-python.git
- pushd pslab-python
Expand All @@ -61,12 +60,16 @@ before_script:
- export DATABASE_URL=postgres:///psl_db
# - psql -c "CREATE USER psl;" -U postgres

script: nosetests
script:
- nosetests
- pushd frontend
- rm -rf tests/integration/* # Ignore auto-generated tests for now.
- rm -rf tests/unit/* # Ignore auto-generated tests for now.
- ember test

after_success:
- pushd frontend
- bash surge_deploy.sh
- popd

after_failure: cat /home/travis/.npm/_logs/*.log

74 changes: 67 additions & 7 deletions frontend/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,76 @@
module.exports = {
globals: {
server: true,
},
root: true,
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module'
sourceType: "module",
allowImportExportEverywhere: false
},
extends: 'eslint:recommended',
extends: [
'eslint:recommended',
'plugin:ember-suave/recommended'
],
env: {
browser: true
'browser': true
},
rules: {
'no-useless-escape': 'off',
'space-before-blocks': 'error',
'comma-dangle': ['error', 'never'],
'space-in-parens': ['error', 'never'],
'space-before-function-paren': ['error', 'never'],
'comma-spacing': ['error', { 'before': false, 'after': true }],
'semi': ['error', 'always', {'omitLastInOneLineBlock': true}],
'semi-spacing': ['error', {'before': false, 'after': true}],
'keyword-spacing': ['error', { 'before': true, 'after': true }],
'spaced-comment': ['error', 'always'],
'object-shorthand': ['error', 'always'],
'dot-notation': 'error',
'arrow-parens': ['error', 'as-needed'],
'object-curly-spacing': ['error', 'always'],
'space-infix-ops': 'error',
'no-multiple-empty-lines': ['error', { 'max': 2, 'maxEOF': 1 }],
'key-spacing': [
'error', {
'align': {
'beforeColon': true,
'afterColon': true,
'on': 'colon'
}
}
],
'operator-linebreak': ['error', 'before'],
'array-bracket-spacing': ['error', 'never'],
'no-trailing-spaces': 'error',
'brace-style': ['error', '1tbs', { 'allowSingleLine': true }],
'max-statements-per-line': ['error', { 'max': 2 }],
'quotes': ['error', 'single'],
'no-var': 'off',
'indent': [
'error', 2, {
"FunctionExpression": {"parameters": "first"},
"FunctionDeclaration": {"parameters": "first"},
"MemberExpression": 1,
"SwitchCase": 1,
"outerIIFEBody": 0,
"VariableDeclarator": { "var": 2, "let": 2, "const": 3 }
}
],
'max-len': 'off',
'no-console': 'error',
'prefer-template': 'error',
'camelcase': 'off',
'new-cap': 'off',
'eqeqeq': ['error', 'smart'],
'one-var': 'off',
'ember-suave/no-const-outside-module-scope': 'off',
'ember-suave/require-access-in-comments': 'off'
},
globals: {
module : true,
process : true,
wysihtml5 : true,
palette : true,
Uint8Array : true,
require : true
}
};
36 changes: 36 additions & 0 deletions frontend/.sass-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
files:
include: 'app/styles/**/*.scss'

options:
formatter: stylish
merge-default-rules: true

rules:
no-css-comments: 0
property-sort-order: 0
no-important: 0
force-element-nesting: 0
force-pseudo-nesting: 0
force-attribute-nesting: 0
hex-length: 2
no-color-literals: 0
leading-zero: 2
space-after-comma: 2
hex-notation: 2
quotes: 2
empty-line-between-blocks: 2
space-before-brace: 2
no-ids: 2
no-duplicate-properties: 2
shorthand-values: 2
variable-name-format: 2
no-vendor-prefixes: 0
nesting-depth:
- 2
-
max-depth: 4
no-qualifying-elements:
- 1
-
allow-element-with-attribute: true
allow-element-with-class: true
11 changes: 11 additions & 0 deletions frontend/.template-lintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/* jshint node:true */
'use strict';

module.exports = {
extends: 'recommended',
rules: {
'nested-interactive': {
ignoredTags: ['label'] // Allow label tag inside a or any other interactive element
}
}
};
5 changes: 3 additions & 2 deletions frontend/app/adapters/application.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// adapters/application.js
import DS from 'ember-data';

export default DS.JSONAPIAdapter.extend({
});
const { JSONAPIAdapter } = DS;

export default JSONAPIAdapter.extend({
});

8 changes: 5 additions & 3 deletions frontend/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ import Resolver from './resolver';
import loadInitializers from 'ember-load-initializers';
import config from './config/environment';

const App = Ember.Application.extend({
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix,
const { Application } = Ember;

const App = Application.extend({
modulePrefix : config.modulePrefix,
podModulePrefix : config.podModulePrefix,
Resolver
});

Expand Down
Empty file removed frontend/app/components/.gitkeep
Empty file.
4 changes: 3 additions & 1 deletion frontend/app/components/home-menu.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import Ember from 'ember';

export default Ember.Component.extend({
const { Component } = Ember;

export default Component.extend({
});
59 changes: 30 additions & 29 deletions frontend/app/components/jqplot-graph.js
Original file line number Diff line number Diff line change
@@ -1,37 +1,38 @@
import Ember from 'ember';

export default Ember.Component.extend({
didInsertElement () {
Ember.$.jqplot(this.data.name,this.data.data,{
title: this.title,
const { $, Component } = Ember;

axes: {
xaxis: {
tickInterval: 1,
rendererOptions: {
export default Component.extend({
didInsertElement() {
$.jqplot(this.data.name, this.data.data, {
title : this.title,
axes : {
xaxis: {
tickInterval : 1,
rendererOptions : {
minorTicks: 4
}
},
},
highlighter: {
show: true,
showLabel: true,

tooltipAxes: 'xy',
sizeAdjust: 9.5 , tooltipLocation : 'ne'
},
legend: {
show: true,
location: 'e',
rendererOptions: {
numberColumns: 1,
}
},
cursor:{
show: true,
zoom:true,
showTooltip:false
}
}
},
highlighter: {
show : true,
showLabel : true,

tooltipAxes : 'xy',
sizeAdjust : 9.5, tooltipLocation : 'ne'
},
legend: {
show : true,
location : 'e',
rendererOptions : {
numberColumns: 1
}
},
cursor: {
show : true,
zoom : true,
showTooltip : false
}

});
}
Expand Down
Empty file removed frontend/app/controllers/.gitkeep
Empty file.
73 changes: 36 additions & 37 deletions frontend/app/controllers/add-script.js
Original file line number Diff line number Diff line change
@@ -1,65 +1,64 @@
import Ember from 'ember';

export default Ember.Controller.extend({
const { $: { post }, Controller } = Ember;

/*---- Add Script Screen ---*/
theme: 'ace/theme/cobalt',
themes: [
export default Controller.extend({

/* ---- Add Script Screen ---*/
theme : 'ace/theme/cobalt',
themes : [
'ace/theme/cobalt',
'ace/theme/ambiance',
'ace/theme/chaos',
'ace/theme/chaos'
],
inputDescription:"",
submitFailed: false,
failedMessage: "Failed to Login",
isProcessing: false,
isSlowConnection: false,
timeout: null,
inputDescription : '',
submitFailed : false,
failedMessage : 'Failed to Login',
isProcessing : false,
isSlowConnection : false,
timeout : null,

success(response) {
this.reset();
if (response.status==true){
if (response.status) {
this.reset();
this.transitionToRoute('user-home')
this.transitionToRoute('user-home');
} else {
this.set('submitFailed', true);
this.failedMessage = String(response.message);
}
else{
this.set("submitFailed", true);
this.failedMessage= String(response.message);
}
},
error() {
this.reset();
this.set("submitFailed", true);
this.set("failedMessage",'Submission failed. Server down? ');
this.set('submitFailed', true);
this.set('failedMessage', 'Submission failed. Server down? ');
},
failure() {
this.reset();
this.set("submitFailed", true);
this.set("failedMessage",'Submission failed. App Error. ');
this.set('submitFailed', true);
this.set('failedMessage', 'Submission failed. App Error. ');
},
slowConnection() {
this.set("isSlowConnection", true);
this.set('isSlowConnection', true);
},
reset() {
clearTimeout(this.get("timeout"));
clearTimeout(this.get('timeout'));
this.setProperties({
isProcessing: false,
isSlowConnection: false
});
isProcessing : false,
isSlowConnection : false
});
},

actions:{
actions: {
valueUpdated() {
this.setProperties({
submitFailed: false,
failedMessage: "",
isProcessing: true
submitFailed : false,
failedMessage : '',
isProcessing : true
});
this.set("timeout", setTimeout(this.slowConnection.bind(this), 1000));
var request = Ember.$.post("/addScript", this.getProperties("inputTitle","inputDescription"),this,'json');
request.then(this.success.bind(this), this.failure.bind(this), this.error.bind(this));
},

},

this.set('timeout', setTimeout(this.slowConnection.bind(this), 1000));
post('/addScript', this.getProperties('inputTitle', 'inputDescription'), this, 'json')
.then(this.success.bind(this), this.failure.bind(this), this.error.bind(this));
}
}
});
4 changes: 3 additions & 1 deletion frontend/app/controllers/application.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import Ember from 'ember';

export default Ember.Controller.extend({
const { Controller } = Ember;

export default Controller.extend({
});
Loading

0 comments on commit d446c7e

Please sign in to comment.