Commit e53b6ca2 authored by Curtis Adam's avatar Curtis Adam

Refactor the client folder

parent c1819e8e
...@@ -21,7 +21,7 @@ jshint: ...@@ -21,7 +21,7 @@ jshint:
script: script:
- echo "{}" > package.json - echo "{}" > package.json
- npm install jshint@^2.9.0 - npm install jshint@^2.9.0
- node_modules/jshint/bin/jshint --config .jshintrc ./client/ ./server/ ./imports/ ./i18n ./tests - node_modules/jshint/bin/jshint --config .jshintrc ./client/head.js ./server/ ./imports/ ./i18n ./tests
jscs: jscs:
stage: test stage: test
...@@ -30,7 +30,7 @@ jscs: ...@@ -30,7 +30,7 @@ jscs:
dependencies: [] dependencies: []
script: script:
- npm install jscs - npm install jscs
- node_modules/jscs/bin/jscs --config .jscsrc ./{client,imports,i18n,server,tests}/ - node_modules/jscs/bin/jscs --config .jscsrc ./client/head.js ./server/ ./imports/ ./i18n ./tests
sonar: sonar:
stage: test stage: test
......
...@@ -22,7 +22,8 @@ let jscs = require('gulp-jscs'); ...@@ -22,7 +22,8 @@ let jscs = require('gulp-jscs');
let stylish = require('jshint-stylish'); let stylish = require('jshint-stylish');
let paths = [ let paths = [
'./{client,imports,i18n,server,tests}/**/*.js' './{imports,i18n,server,tests}/**/*.js',
'./client/head.js'
]; ];
gulp.task('watch', function () { gulp.task('watch', function () {
......
...@@ -12,7 +12,7 @@ sonarqube { ...@@ -12,7 +12,7 @@ sonarqube {
property "sonar.language", "js" property "sonar.language", "js"
property "sonar.sources", "./" property "sonar.sources", "./"
// See https://github.com/SonarSource/sonar-javascript/issues/552. // See https://github.com/SonarSource/sonar-javascript/issues/552.
property "sonar.exclusions", "**/node_modules/**" property "sonar.exclusions", "**/node_modules/**, client/thirdParty/**"
property "sonar.host.url", "https://scm.thm.de/sonar/" property "sonar.host.url", "https://scm.thm.de/sonar/"
} }
} }
...@@ -5,22 +5,22 @@ ...@@ -5,22 +5,22 @@
@import '../imports/ui/wordcloud/wordcloud.scss'; @import '../imports/ui/wordcloud/wordcloud.scss';
@import '../imports/ui/filter/index/index.scss'; @import '../imports/ui/filter/index/index.scss';
@import '../imports/ui/cardset/cardset.scss'; @import '../imports/ui/cardset/cardset.scss';
@import '../imports/ui/filter/index/item/cardset'; @import '../imports/ui/filter/index/item/cardset.scss';
@import '../imports/ui/card/card.scss'; @import '../imports/ui/card/card.scss';
@import '../imports/ui/card/sidebar/sidebar.scss'; @import '../imports/ui/card/sidebar/sidebar.scss';
@import '../imports/ui/card/sidebar/item/zoomText'; @import '../imports/ui/card/sidebar/item/zoomText.scss';
@import '../imports/ui/card/navigation/navigation.scss'; @import '../imports/ui/card/navigation/navigation.scss';
@import '../imports/ui/markdeep/editor/content/content'; @import '../imports/ui/markdeep/editor/content/content.scss';
@import '../imports/ui/markdeep/editor/navigation/navigation'; @import '../imports/ui/markdeep/editor/navigation/navigation.scss';
@import '../imports/ui/filter/navigation/navigation.scss'; @import '../imports/ui/filter/navigation/navigation.scss';
@import '../imports/ui/forms/bonusForm.scss'; @import '../imports/ui/forms/bonusForm.scss';
@import '../imports/ui/forms/cardsetForm.scss'; @import '../imports/ui/forms/cardsetForm.scss';
@import '../imports/ui/profile/profile'; @import '../imports/ui/profile/profile.scss';
@import '../imports/ui/learn/learn.scss'; @import '../imports/ui/learn/learn.scss';
@import '../imports/ui/learn/progress.scss'; @import '../imports/ui/learn/progress.scss';
@import '../imports/ui/pomodoroTimer/pomodoroTimer.scss'; @import '../imports/ui/pomodoroTimer/pomodoroTimer.scss';
@import '../imports/ui/admin/admin.scss'; @import '../imports/ui/admin/admin.scss';
@import '../imports/ui/accessDenied/accessDenied'; @import '../imports/ui/accessDenied/accessDenied.scss';
@import '../imports/ui/markdeep/content.scss'; @import '../imports/ui/markdeep/content.scss';
@import '../imports/ui/main/sweetAlert2.scss'; @import '../imports/ui/main/sweetAlert2.scss';
@import '../imports/ui/loadingScreen/loadingScreen.scss'; @import '../imports/ui/loadingScreen/loadingScreen.scss';
......
// jscs:disable
// jshint ignore: start
/*! Hammer.JS - v2.0.8 - 2016-04-23 /*! Hammer.JS - v2.0.8 - 2016-04-23
* http://hammerjs.github.io/ * http://hammerjs.github.io/
* *
......
// jscs:disable
// jshint ignore: start
/**See http://casual-effects.com/markdeep for @license and documentation. /**See http://casual-effects.com/markdeep for @license and documentation.
markdeep.min.js 1.03 (C) 2018 Morgan McGuire markdeep.min.js 1.03 (C) 2018 Morgan McGuire
highlight.min.js 9.12.0 (C) 2017 Ivan Sagalaev https://highlightjs.org/*/ highlight.min.js 9.12.0 (C) 2017 Ivan Sagalaev https://highlightjs.org/*/
......
// jscs:disable
// jshint ignore: start
'use strict'; 'use strict';
/** /**
......
...@@ -2,7 +2,7 @@ import {MeteorMathJax} from 'meteor/mrt:mathjax'; ...@@ -2,7 +2,7 @@ import {MeteorMathJax} from 'meteor/mrt:mathjax';
import DOMPurify from 'dompurify'; import DOMPurify from 'dompurify';
import {DOMPurifyConfig} from "./dompurify"; import {DOMPurifyConfig} from "./dompurify";
import {CardVisuals} from "./cardVisuals"; import {CardVisuals} from "./cardVisuals";
import "/client/markdeep.min.js"; import "/client/thirdParty/markdeep.min.js";
let customMathJaxDefinitions = [ let customMathJaxDefinitions = [
"{\\n}{\\hat{n}}", "{\\n}{\\hat{n}}",
......
...@@ -5,13 +5,13 @@ import {Template} from "meteor/templating"; ...@@ -5,13 +5,13 @@ import {Template} from "meteor/templating";
import {Session} from "meteor/session"; import {Session} from "meteor/session";
import {Cardsets} from "../../api/cardsets.js"; import {Cardsets} from "../../api/cardsets.js";
import {CardVisuals} from "../../api/cardVisuals.js"; import {CardVisuals} from "../../api/cardVisuals.js";
import ResizeSensor from "../../../client/resize_sensor/ResizeSensor.js"; import ResizeSensor from "../../../client/thirdParty/resizeSensor/ResizeSensor.js";
import {CardIndex} from "../../api/cardIndex.js"; import {CardIndex} from "../../api/cardIndex.js";
import {Route} from "../../api/route.js"; import {Route} from "../../api/route.js";
import {CardType} from "../../api/cardTypes"; import {CardType} from "../../api/cardTypes";
import {CardNavigation} from "../../api/cardNavigation"; import {CardNavigation} from "../../api/cardNavigation";
import "./card.html"; import "./card.html";
import '/client/hammer.js'; import '/client/thirdParty/hammer.js';
import './header/header.js'; import './header/header.js';
import './content/content.js'; import './content/content.js';
import './navigation/navigation.js'; import './navigation/navigation.js';
......
...@@ -4,7 +4,7 @@ import {Cards} from "../../../api/cards.js"; ...@@ -4,7 +4,7 @@ import {Cards} from "../../../api/cards.js";
import {CardVisuals} from "../../../api/cardVisuals.js"; import {CardVisuals} from "../../../api/cardVisuals.js";
import {CardType} from "../../../api/cardTypes"; import {CardType} from "../../../api/cardTypes";
import {Route} from "../../../api/route.js"; import {Route} from "../../../api/route.js";
import '/client/hammer.js'; import '/client/thirdParty/hammer.js';
import "./content.html"; import "./content.html";
import {CardNavigation} from "../../../api/cardNavigation"; import {CardNavigation} from "../../../api/cardNavigation";
import {Dictionary} from "../../../api/dictionary"; import {Dictionary} from "../../../api/dictionary";
......
...@@ -4,7 +4,7 @@ import {Template} from "meteor/templating"; ...@@ -4,7 +4,7 @@ import {Template} from "meteor/templating";
import {Cardsets} from "../../../api/cardsets"; import {Cardsets} from "../../../api/cardsets";
import {CardEditor} from "../../../api/cardEditor.js"; import {CardEditor} from "../../../api/cardEditor.js";
import {CardVisuals} from "../../../api/cardVisuals"; import {CardVisuals} from "../../../api/cardVisuals";
import ResizeSensor from "../../../../client/resize_sensor/ResizeSensor"; import ResizeSensor from "../../../../client/thirdParty/resizeSensor/ResizeSensor";
import {Cards} from "../../../api/cards"; import {Cards} from "../../../api/cards";
import "../card.js"; import "../card.js";
import "./modal/learningUnit.js"; import "./modal/learningUnit.js";
......
...@@ -3,7 +3,7 @@ import {Meteor} from "meteor/meteor"; ...@@ -3,7 +3,7 @@ import {Meteor} from "meteor/meteor";
import {Session} from "meteor/session"; import {Session} from "meteor/session";
import {Template} from "meteor/templating"; import {Template} from "meteor/templating";
import {Leitner, Wozniak} from "../../../api/learned"; import {Leitner, Wozniak} from "../../../api/learned";
import ResizeSensor from "../../../../client/resize_sensor/ResizeSensor"; import ResizeSensor from "../../../../client/thirdParty/resizeSensor/ResizeSensor";
import {CardsetVisuals} from "../../../api/cardsetVisuals"; import {CardsetVisuals} from "../../../api/cardsetVisuals";
import {Bonus} from "../../../api/bonus"; import {Bonus} from "../../../api/bonus";
import {CardNavigation} from "../../../api/cardNavigation"; import {CardNavigation} from "../../../api/cardNavigation";
......
...@@ -3,7 +3,7 @@ import {Session} from "meteor/session"; ...@@ -3,7 +3,7 @@ import {Session} from "meteor/session";
import {Filter} from "../../../../api/filter"; import {Filter} from "../../../../api/filter";
import {Route} from "../../../../api/route"; import {Route} from "../../../../api/route";
import {WordcloudCanvas} from "../../../../api/wordcloudCanvas"; import {WordcloudCanvas} from "../../../../api/wordcloudCanvas";
import ResizeSensor from "../../../../../client/resize_sensor/ResizeSensor"; import ResizeSensor from "../../../../../client/thirdParty/resizeSensor/ResizeSensor";
Session.setDefault('filterDisplayWordcloud', false); Session.setDefault('filterDisplayWordcloud', false);
/* /*
......
...@@ -4,7 +4,7 @@ import {Template} from "meteor/templating"; ...@@ -4,7 +4,7 @@ import {Template} from "meteor/templating";
import {Meteor} from "meteor/meteor"; import {Meteor} from "meteor/meteor";
import {Session} from "meteor/session"; import {Session} from "meteor/session";
import {getAuthorName} from "../../api/userdata"; import {getAuthorName} from "../../api/userdata";
import ResizeSensor from "../../../client/resize_sensor/ResizeSensor"; import ResizeSensor from "../../../client/thirdParty/resizeSensor/ResizeSensor";
import {LeitnerProgress} from "../../api/leitnerProgress"; import {LeitnerProgress} from "../../api/leitnerProgress";
import {Cardsets} from "../../api/cardsets"; import {Cardsets} from "../../api/cardsets";
import {CardType} from "../../api/cardTypes"; import {CardType} from "../../api/cardTypes";
......
...@@ -7,7 +7,7 @@ import {Route} from "../../api/route.js"; ...@@ -7,7 +7,7 @@ import {Route} from "../../api/route.js";
import {getUserLanguage} from "../../startup/client/i18n"; import {getUserLanguage} from "../../startup/client/i18n";
import {ReactiveVar} from 'meteor/reactive-var'; import {ReactiveVar} from 'meteor/reactive-var';
import "./welcome.html"; import "./welcome.html";
import ResizeSensor from "../../../client/resize_sensor/ResizeSensor"; import ResizeSensor from "../../../client/thirdParty/resizeSensor/ResizeSensor";
import * as fakeInventory from '../../../public/fakeStatistics/inventory.json'; import * as fakeInventory from '../../../public/fakeStatistics/inventory.json';
import {PomodoroTimer} from "../../api/pomodoroTimer"; import {PomodoroTimer} from "../../api/pomodoroTimer";
import {CardVisuals} from "../../api/cardVisuals"; import {CardVisuals} from "../../api/cardVisuals";
......
import {WordcloudCanvas} from "../../api/wordcloudCanvas"; import {WordcloudCanvas} from "../../api/wordcloudCanvas";
import "./wordcloud.html"; import "./wordcloud.html";
import ResizeSensor from "../../../client/resize_sensor/ResizeSensor"; import ResizeSensor from "../../../client/thirdParty/resizeSensor/ResizeSensor";
import {Cardsets} from "../../api/cardsets.js"; import {Cardsets} from "../../api/cardsets.js";
import {Session} from "meteor/session"; import {Session} from "meteor/session";
import {Template} from "meteor/templating"; import {Template} from "meteor/templating";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment