Merge pull request #3833 from jsaalfeld/travis-linting

Travis linting and some minor changes

.gitignore

@@ -6,7 +6,7 @@
 *~
 
 # Virtual Environment
-.virtualenv/*
+.virtualenv*/*
 .venv/*
 
 # Javascript tools and libraries
@@ -60,10 +60,6 @@ client/node_modules
 
 # IDE - VSCode
 .vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
 
 # misc
 Compodoc
@@ -75,6 +71,7 @@ client/npm-debug.log
 client/yarn-error.log
 client/testem.log
 client/typings
+client/yarn.lock
 
 # System Files
 client/.DS_Store

.travis.yml

@@ -17,13 +17,10 @@ install:
   - pip install --upgrade setuptools pip
   - pip install --upgrade --requirement requirements.txt
   - pip freeze
-  - yarn
+  - cd client && npm install && cd ..
-  - node_modules/.bin/gulp --production
 script:
   - flake8 openslides tests
   - isort --check-only --diff --recursive openslides tests
   - python -m mypy openslides/
-  - node_modules/.bin/gulp jshint
-  - node_modules/.bin/karma start --browsers PhantomJS tests/karma/karma.conf.js
-
   - pytest --cov --cov-fail-under=70
+  - cd client && npm run-script lint && cd ..

client/package.json

@@ -50,7 +50,7 @@
         "husky": "^0.14.3",
         "jasmine-core": "~2.99.1",
         "jasmine-spec-reporter": "~4.2.1",
-        "karma": "^2.0.4",
+        "karma": "^3.0.0",
         "karma-chrome-launcher": "~2.2.0",
         "karma-coverage-istanbul-reporter": "~2.0.0",
         "karma-jasmine": "~1.1.1",
@@ -58,7 +58,7 @@
         "npm-run-all": "^4.1.3",
         "prettier": "^1.13.6",
         "pretty-quick": "^1.6.0",
-        "protractor": "~5.3.0",
+        "protractor": "^5.4.0",
         "ts-node": "~5.0.1",
         "tslint": "~5.9.1",
         "typescript": "~2.7.2"

client/src/app/app.component.html

@@ -1 +1,3 @@
-<router-outlet></router-outlet>
+<div class="content">
+    <router-outlet></router-outlet>
+</div>

client/src/app/app.component.scss

@@ -0,0 +1,3 @@
+.content {
+    flex: 1;
+}

client/src/app/app.component.ts

@@ -9,7 +9,7 @@ import { NotifyService } from './core/services/notify.service';
 @Component({
     selector: 'app-root',
     templateUrl: './app.component.html',
-    styleUrls: ['./app.component.css']
+    styleUrls: ['./app.component.scss']
 })
 export class AppComponent {
     /**

client/src/app/openslides.component.ts

@@ -30,17 +30,16 @@ export abstract class OpenSlidesComponent {
      */
     get DS(): DataStoreService {
         if (OpenSlidesComponent._DS == null) {
-            // tslint:disable-next-line
+            const injector = Injector.create({
-            const injector = Injector.create(
+                providers: [
-                [
                     {
                         provide: DataStoreService,
                         useClass: DataStoreService,
                         deps: [CacheService]
                     }
                 ],
-                RootInjector.injector
+                parent: RootInjector.injector
-            );
+            });
             OpenSlidesComponent._DS = injector.get(DataStoreService);
         }
         return OpenSlidesComponent._DS;