Commit 7d106aba authored by Klaus-Dieter Quibeldey-Cirkel's avatar Klaus-Dieter Quibeldey-Cirkel 🏀

Merge branch 'staging' into 'master'

Staging

See merge request arsnova/cards!523
parents 7c0322e3 547abf21
......@@ -15,10 +15,10 @@ arsnova🍅cards uses Meteor as application framework. Download and install [Met
2. Make sure that you've added a [SSH key](https://git.thm.de/profile/keys)
3. Clone the remote repository `git clone git@git.thm.de:arsnova/cards.git`
4. Install the npm package dependencies inside the local repository **"cards folder"** `meteor npm install`
5. Set your initial admin user in `settings.json` or `settings_debug.json` (cas account)
### Settings
Change `settings.json` or `settings_debug.json` according to your needs
### Settings (These steps are only required if you want to deploy 🍅cards on a server)
1. Set your initial admin user in `settings.json` (cas account)
2. Change `settings.json` according to your needs
> Warning: Never publish your settings file!
......@@ -44,20 +44,24 @@ A simple update to the latest Meteor version is not always possible. Please do n
1. Restore your backup `mongorestore --drop -h "localhost" --port "3001" -d "meteor" ~/cardsBackup/meteor`
## Starting the app
Use one of the following commands inside the repository (cards folder), to start arsnova🍅cards on localhost:
Use one of the following commands inside the repository (cards folder), to start your 🍅cards installation:
- For development:
- For development (Use this if you're going to run 🍅cards on your local device):
- `meteor --settings settings_debug.json`
- Access the app from your host machine by visiting http://localhost:3000
- Use the Backdoor Login "Erstanmeldung / First Login" from the drop-down list if you're going to export and submit cards to moodle
- For production:
- `meteor --settings settings.json`
You can then access the app from your host machine by visiting http://localhost:3000.
## Loading the Test Database
1. Make sure that you've installed the [MongoDB Community Tools](https://docs.mongodb.com/manual/administration/install-community/)
2. Start the server with the development settings
2. Open a new terminal in the cards folder and load the Test Database with: `./tests/loadTestDatabase.sh`
> Warning: The following step will delete all of your 🍅cards content
3. Open a new terminal in the cards folder and load the Test Database with: `./tests/loadTestDatabase.sh`
## Optional features
......
......@@ -357,7 +357,7 @@
},
"contact": {
"about": "Über 🍅cards",
"demo": "Demo",
"demo": "Einführung",
"home": "Login",
"learning": "Lernen",
"help": "Hilfe",
......@@ -968,7 +968,7 @@
"start": "Starten",
"list": {
"back": "Zurück zur Präsentation",
"backDemo": "Zurück zur Demo-Kartei"
"backDemo": "Zurück zur Einführung"
},
"aspectRatio": {
"53": "5:3-Kartenformat",
......@@ -1184,19 +1184,19 @@
"description": "Beschreibung"
},
"learning-goal": {
"name": "Auf welcher Kompetenzstufe soll geprüft werden?",
"name": "Auf welcher Kompetenzstufe ❶ bis ❻ soll geprüft werden?",
"cardName": "Kompetenzstufe",
"level1": "Verstehen",
"level1": "❶ »Verstehen«",
"level1Placeholder": "Du hast die Kompetenzstufe »Verstehen« gewählt. Formuliere die Frage entsprechend mit einem der folgenden Verben: \n\nabgrenzen, anordnen, beschreiben, bestimmen, charakterisieren, einordnen, erkennen, erklären, gegenüberstellen.",
"level2": "Anwenden",
"level2": "❷ »Anwenden«",
"level2Placeholder": "Du hast die Kompetenzstufe »Anwenden« gewählt. Formuliere die Frage entsprechend mit einem der folgenden Verben: \n\nanwenden, anfertigen, ausführen, abbilden, berechnen, deuten, durchführen, erstellen.",
"level3": "Analysieren",
"level3": "❸ »Analysieren«",
"level3Placeholder": "Du hast die Kompetenzstufe »Analysieren« gewählt. Formuliere die Frage entsprechend mit einem der folgenden Verben: \n\nableiten, analysieren, auswählen, auswerten, Aussagen auf Richtigkeit überprüfen, Bedeutung ermitteln, beweisen, Beziehungen klarlegen, gliedern.",
"level4": "Synthetisieren",
"level4": "❹ »Synthetisieren«",
"level4Placeholder": "Du hast die Kompetenzstufe »Synthetisieren« gewählt. Formuliere die Frage entsprechend mit einem der folgenden Verben: \n\narrangieren, einordnen, ergänzen, integrieren, planen, Thesen bilden, zusammenfügen, zusammensetzen.",
"level5": "Bewerten",
"level5": "❺ »Bewerten«",
"level5Placeholder": "Du hast die Kompetenzstufe »Bewerten« gewählt. Formuliere die Frage entsprechend mit einem der folgenden Verben: \n\nabwägen, begründen, beurteilen, beweisen, diskutieren, einschätzen, entscheiden, evaluieren, gewichten.",
"level6": "Innovieren",
"level6": "❻ »Innovieren«",
"level6Placeholder": "Du hast die Kompetenzstufe »Innovieren« gewählt. Formuliere die Frage entsprechend mit einem der folgenden Verben: \n\nerfinden, entdecken, entwerfen, entwickeln, erzeugen, konstruieren, konzipieren, kreieren."
},
"filter-cards": {
......@@ -1720,7 +1720,7 @@
"difficulty0": "Info",
"difficulty1": "Grundlagen",
"difficulty2": "Fortgeschritten",
"difficulty3": "Experte/Expertin",
"difficulty3": "Expertin/Experte",
"difficultyNotes": "Veranstaltung",
"difficultyNotes0": "Vorlesung",
"difficultyNotes1": "Übung",
......
......@@ -3,7 +3,7 @@
<span class="col-xs-6 col-sm-2 btn-bootstrap-container">
<button id="learningGoalLevel0"
class="learningGoalLevelButton btn btn-block btn-raised {{#if isLearningGoalLevelChecked
0}}btn-primary{{else}}btn-white{{/if}} {{#if
0}}btn-info{{else}}btn-white{{/if}} {{#if
isLearningGoalLevel 0}}active{{/if}}"
data-lvl="0">
{{#if isLearningGoalLevel 0}}
......@@ -17,7 +17,7 @@
<span class="col-xs-6 col-sm-2 btn-bootstrap-container">
<button id="learningGoalLevel1"
class="learningGoalLevelButton btn btn-block btn-raised {{#if isLearningGoalLevelChecked
1}}btn-primary{{else}}btn-white{{/if}} {{#if
1}}btn-info{{else}}btn-white{{/if}} {{#if
isLearningGoalLevel 1}}active{{/if}}"
data-lvl="1">
{{#if isLearningGoalLevel 1}}
......@@ -31,7 +31,7 @@
<span class="col-xs-6 col-sm-2 btn-bootstrap-container">
<button id="learningGoalLevel2"
class="learningGoalLevelButton btn btn-block btn-raised {{#if isLearningGoalLevelChecked
2}}btn-primary{{else}}btn-white{{/if}} {{#if
2}}btn-info{{else}}btn-white{{/if}} {{#if
isLearningGoalLevel 2}}active{{/if}}"
data-lvl="2">
{{#if isLearningGoalLevel 2}}
......@@ -45,7 +45,7 @@
<span class="col-xs-6 col-sm-2 btn-bootstrap-container">
<button id="learningGoalLevel3"
class="learningGoalLevelButton btn btn-block btn-raised {{#if isLearningGoalLevelChecked
3}}btn-primary{{else}}btn-white{{/if}} {{#if
3}}btn-info{{else}}btn-white{{/if}} {{#if
isLearningGoalLevel 3}}active{{/if}}"
data-lvl="3">
{{#if isLearningGoalLevel 3}}
......@@ -59,7 +59,7 @@
<span class="col-xs-6 col-sm-2 btn-bootstrap-container">
<button id="learningGoalLevel4"
class="learningGoalLevelButton btn btn-block btn-raised {{#if isLearningGoalLevelChecked
4}}btn-primary{{else}}btn-white{{/if}} {{#if
4}}btn-info{{else}}btn-white{{/if}} {{#if
isLearningGoalLevel 4}}active{{/if}}"
data-lvl="4">
{{#if isLearningGoalLevel 4}}
......@@ -73,7 +73,7 @@
<span class="col-xs-6 col-sm-2 btn-bootstrap-container">
<button id="learningGoalLevel5"
class="learningGoalLevelButton btn btn-block btn-raised {{#if isLearningGoalLevelChecked
5}}btn-primary{{else}}btn-white{{/if}} {{#if
5}}btn-info{{else}}btn-white{{/if}} {{#if
isLearningGoalLevel 5}}active{{/if}}"
data-lvl="5">
{{#if isLearningGoalLevel 5}}
......
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