Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
cards
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Tobias Mierzwa
cards
Commits
e53b6ca2
Commit
e53b6ca2
authored
Nov 23, 2018
by
Curtis Adam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor the client folder
parent
c1819e8e
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
21 additions
and
26 deletions
+21
-26
.gitlab-ci.yml
.gitlab-ci.yml
+2
-2
.gulpfile.js
.gulpfile.js
+2
-1
build.gradle
build.gradle
+1
-1
head.scss
client/head.scss
+6
-6
hammer.js
client/thirdParty/hammer.js
+0
-2
markdeep.min.js
client/thirdParty/markdeep.min.js
+0
-2
LICENSE
client/thirdParty/resizeSensor/LICENSE
+0
-0
ResizeSensor.js
client/thirdParty/resizeSensor/ResizeSensor.js
+0
-2
markdeep.js
imports/api/markdeep.js
+1
-1
card.js
imports/ui/card/card.js
+2
-2
content.js
imports/ui/card/content/content.js
+1
-1
editor.js
imports/ui/card/editor/editor.js
+1
-1
info.js
imports/ui/cardset/info/info.js
+1
-1
displayModeButton.js
imports/ui/filter/navigation/item/displayModeButton.js
+1
-1
progress.js
imports/ui/learn/progress.js
+1
-1
welcome.js
imports/ui/welcome/welcome.js
+1
-1
wordcloud.js
imports/ui/wordcloud/wordcloud.js
+1
-1
No files found.
.gitlab-ci.yml
View file @
e53b6ca2
...
...
@@ -21,7 +21,7 @@ jshint:
script
:
-
echo "{}" > package.json
-
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
:
stage
:
test
...
...
@@ -30,7 +30,7 @@ jscs:
dependencies
:
[]
script
:
-
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
:
stage
:
test
...
...
.gulpfile.js
View file @
e53b6ca2
...
...
@@ -22,7 +22,8 @@ let jscs = require('gulp-jscs');
let
stylish
=
require
(
'jshint-stylish'
);
let
paths
=
[
'./{client,imports,i18n,server,tests}/**/*.js'
'./{imports,i18n,server,tests}/**/*.js'
,
'./client/head.js'
];
gulp
.
task
(
'watch'
,
function
()
{
...
...
build.gradle
View file @
e53b6ca2
...
...
@@ -12,7 +12,7 @@ sonarqube {
property
"sonar.language"
,
"js"
property
"sonar.sources"
,
"./"
// 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/"
}
}
client/head.scss
View file @
e53b6ca2
...
...
@@ -5,22 +5,22 @@
@import
'../imports/ui/wordcloud/wordcloud.scss'
;
@import
'../imports/ui/filter/index/index.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/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/markdeep/editor/content/content'
;
@import
'../imports/ui/markdeep/editor/navigation/navigation'
;
@import
'../imports/ui/markdeep/editor/content/content
.scss
'
;
@import
'../imports/ui/markdeep/editor/navigation/navigation
.scss
'
;
@import
'../imports/ui/filter/navigation/navigation.scss'
;
@import
'../imports/ui/forms/bonusForm.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/progress.scss'
;
@import
'../imports/ui/pomodoroTimer/pomodoroTimer.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/main/sweetAlert2.scss'
;
@import
'../imports/ui/loadingScreen/loadingScreen.scss'
;
...
...
client/hammer.js
→
client/
thirdParty/
hammer.js
View file @
e53b6ca2
// jscs:disable
// jshint ignore: start
/*! Hammer.JS - v2.0.8 - 2016-04-23
* http://hammerjs.github.io/
*
...
...
client/markdeep.min.js
→
client/
thirdParty/
markdeep.min.js
View file @
e53b6ca2
// jscs:disable
// jshint ignore: start
/**See http://casual-effects.com/markdeep for @license and documentation.
markdeep.min.js 1.03 (C) 2018 Morgan McGuire
highlight.min.js 9.12.0 (C) 2017 Ivan Sagalaev https://highlightjs.org/*/
...
...
client/
resize_s
ensor/LICENSE
→
client/
thirdParty/resizeS
ensor/LICENSE
View file @
e53b6ca2
File moved
client/
resize_s
ensor/ResizeSensor.js
→
client/
thirdParty/resizeS
ensor/ResizeSensor.js
View file @
e53b6ca2
// jscs:disable
// jshint ignore: start
'use strict'
;
/**
...
...
imports/api/markdeep.js
View file @
e53b6ca2
...
...
@@ -2,7 +2,7 @@ import {MeteorMathJax} from 'meteor/mrt:mathjax';
import
DOMPurify
from
'dompurify'
;
import
{
DOMPurifyConfig
}
from
"./dompurify"
;
import
{
CardVisuals
}
from
"./cardVisuals"
;
import
"/client/markdeep.min.js"
;
import
"/client/
thirdParty/
markdeep.min.js"
;
let
customMathJaxDefinitions
=
[
"{
\
\n
}{
\\
hat{n}}"
,
...
...
imports/ui/card/card.js
View file @
e53b6ca2
...
...
@@ -5,13 +5,13 @@ import {Template} from "meteor/templating";
import
{
Session
}
from
"meteor/session"
;
import
{
Cardsets
}
from
"../../api/cardsets.js"
;
import
{
CardVisuals
}
from
"../../api/cardVisuals.js"
;
import
ResizeSensor
from
"../../../client/
resize_s
ensor/ResizeSensor.js"
;
import
ResizeSensor
from
"../../../client/
thirdParty/resizeS
ensor/ResizeSensor.js"
;
import
{
CardIndex
}
from
"../../api/cardIndex.js"
;
import
{
Route
}
from
"../../api/route.js"
;
import
{
CardType
}
from
"../../api/cardTypes"
;
import
{
CardNavigation
}
from
"../../api/cardNavigation"
;
import
"./card.html"
;
import
'/client/hammer.js'
;
import
'/client/
thirdParty/
hammer.js'
;
import
'./header/header.js'
;
import
'./content/content.js'
;
import
'./navigation/navigation.js'
;
...
...
imports/ui/card/content/content.js
View file @
e53b6ca2
...
...
@@ -4,7 +4,7 @@ import {Cards} from "../../../api/cards.js";
import
{
CardVisuals
}
from
"../../../api/cardVisuals.js"
;
import
{
CardType
}
from
"../../../api/cardTypes"
;
import
{
Route
}
from
"../../../api/route.js"
;
import
'/client/hammer.js'
;
import
'/client/
thirdParty/
hammer.js'
;
import
"./content.html"
;
import
{
CardNavigation
}
from
"../../../api/cardNavigation"
;
import
{
Dictionary
}
from
"../../../api/dictionary"
;
...
...
imports/ui/card/editor/editor.js
View file @
e53b6ca2
...
...
@@ -4,7 +4,7 @@ import {Template} from "meteor/templating";
import
{
Cardsets
}
from
"../../../api/cardsets"
;
import
{
CardEditor
}
from
"../../../api/cardEditor.js"
;
import
{
CardVisuals
}
from
"../../../api/cardVisuals"
;
import
ResizeSensor
from
"../../../../client/
resize_s
ensor/ResizeSensor"
;
import
ResizeSensor
from
"../../../../client/
thirdParty/resizeS
ensor/ResizeSensor"
;
import
{
Cards
}
from
"../../../api/cards"
;
import
"../card.js"
;
import
"./modal/learningUnit.js"
;
...
...
imports/ui/cardset/info/info.js
View file @
e53b6ca2
...
...
@@ -3,7 +3,7 @@ import {Meteor} from "meteor/meteor";
import
{
Session
}
from
"meteor/session"
;
import
{
Template
}
from
"meteor/templating"
;
import
{
Leitner
,
Wozniak
}
from
"../../../api/learned"
;
import
ResizeSensor
from
"../../../../client/
resize_s
ensor/ResizeSensor"
;
import
ResizeSensor
from
"../../../../client/
thirdParty/resizeS
ensor/ResizeSensor"
;
import
{
CardsetVisuals
}
from
"../../../api/cardsetVisuals"
;
import
{
Bonus
}
from
"../../../api/bonus"
;
import
{
CardNavigation
}
from
"../../../api/cardNavigation"
;
...
...
imports/ui/filter/navigation/item/displayModeButton.js
View file @
e53b6ca2
...
...
@@ -3,7 +3,7 @@ import {Session} from "meteor/session";
import
{
Filter
}
from
"../../../../api/filter"
;
import
{
Route
}
from
"../../../../api/route"
;
import
{
WordcloudCanvas
}
from
"../../../../api/wordcloudCanvas"
;
import
ResizeSensor
from
"../../../../../client/
resize_s
ensor/ResizeSensor"
;
import
ResizeSensor
from
"../../../../../client/
thirdParty/resizeS
ensor/ResizeSensor"
;
Session
.
setDefault
(
'filterDisplayWordcloud'
,
false
);
/*
...
...
imports/ui/learn/progress.js
View file @
e53b6ca2
...
...
@@ -4,7 +4,7 @@ import {Template} from "meteor/templating";
import
{
Meteor
}
from
"meteor/meteor"
;
import
{
Session
}
from
"meteor/session"
;
import
{
getAuthorName
}
from
"../../api/userdata"
;
import
ResizeSensor
from
"../../../client/
resize_s
ensor/ResizeSensor"
;
import
ResizeSensor
from
"../../../client/
thirdParty/resizeS
ensor/ResizeSensor"
;
import
{
LeitnerProgress
}
from
"../../api/leitnerProgress"
;
import
{
Cardsets
}
from
"../../api/cardsets"
;
import
{
CardType
}
from
"../../api/cardTypes"
;
...
...
imports/ui/welcome/welcome.js
View file @
e53b6ca2
...
...
@@ -7,7 +7,7 @@ import {Route} from "../../api/route.js";
import
{
getUserLanguage
}
from
"../../startup/client/i18n"
;
import
{
ReactiveVar
}
from
'meteor/reactive-var'
;
import
"./welcome.html"
;
import
ResizeSensor
from
"../../../client/
resize_s
ensor/ResizeSensor"
;
import
ResizeSensor
from
"../../../client/
thirdParty/resizeS
ensor/ResizeSensor"
;
import
*
as
fakeInventory
from
'../../../public/fakeStatistics/inventory.json'
;
import
{
PomodoroTimer
}
from
"../../api/pomodoroTimer"
;
import
{
CardVisuals
}
from
"../../api/cardVisuals"
;
...
...
imports/ui/wordcloud/wordcloud.js
View file @
e53b6ca2
import
{
WordcloudCanvas
}
from
"../../api/wordcloudCanvas"
;
import
"./wordcloud.html"
;
import
ResizeSensor
from
"../../../client/
resize_s
ensor/ResizeSensor"
;
import
ResizeSensor
from
"../../../client/
thirdParty/resizeS
ensor/ResizeSensor"
;
import
{
Cardsets
}
from
"../../api/cardsets.js"
;
import
{
Session
}
from
"meteor/session"
;
import
{
Template
}
from
"meteor/templating"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment