Merge remote-tracking branch 'origin/develop' into feature/#688-auto-…

…fix-linting

.github/CONTRIBUTING.md

@@ -1,31 +1,30 @@
 # How to Contribute?
 
 ## Project members
-
 - Create an issue
 - Create a branch for that issue with the naming: 
   `feature/{ticket-no}-{description-separated-by-dashes}`
 - Develop your code
 - Commit and push in regular intervalls
 - Run the tests locally
+- Add a line to the [CHANGELOG.md](https://github.com/h-da/geli/blob/develop/CHANGELOG.md) under the "NEXT" section in the form `- a short text to describe [#123](https://github.com/h-da/geli/issues/123)`
 - Open a Pull-Request
 - If CI/Coverage give their OK we can merge
 - The PR gets merged to `develop`, which will push a new Docker-Image-Version with the tag `develop` and `latest`
 - The staging-system will then be updated to the latest Image from Docker-Hub
 - If we have enough features we will merge the `develop` into the `master` branch, which will add 
-  a new 'stable' image on Docker-Hub. 
+  a new 'stable' image on Docker-Hub. Before we do this, the new version needs to be updated in several `package.json`s and the `CHANGELOG.md`.
   The livesysten then pulls that new image and starts up with the latest stable version
 
-If we have bugfixes we create a `bugfix/{descriptive-name}` and open a PR, issues are not required 
+If we have small bugfixes we create a `bugfix/{descriptive-name}` and open a PR, issues are not required 
 for that. But it's important to have a good description of the bugfix in the PR-Comment.
+If it is not a small bug please create a issue for it so we can decide the importance of it.
 
 
 ## Branching model
-
 We are using a slightly modified [GitFlow](https://datasift.github.io/gitflow/IntroducingGitFlow.html) branching strategy.
 
 
 ## Commit messages
-
 Please adhere to the principles described [here](https://chris.beams.io/posts/git-commit/) for 
 writing commit messages.

.travis.yml

@@ -43,6 +43,7 @@ before_script:
   - sh -e /etc/init.d/xvfb start
   # required for MongoDB to have time to start up
   - sleep 15
+  - npm install -g @angular/cli
 
 install:
   # install api and return back to root for following steps
@@ -62,6 +63,8 @@ install:
   - cd ..
 
 script:
+  # check for change in changelog
+  - .travis/changelog.sh
   # check for versions
   - .travis/check-version.sh
   # run license checker and write license.json / dependencies.ts
@@ -73,9 +76,9 @@ script:
   - cd ..
   # run frontend-tests and return back to root for following steps
   - cd app/webFrontend
-  - npm run lint        # run linter
-  # - npm run test        # run test - does not work properly
-  - npm run e2e         # run end-to-end-tests
+  - ng lint        # run linter
+  # - ng test --single-run true --watch false || true     # run test - many tests are broken
+  - ng e2e         # run end-to-end-tests
   - sed -i 's/$TRAVIS_COMMIT/'$TRAVIS_COMMIT'/' src/app/shared/services/raven-error-handler.service.ts
   - cd ../..
   - travis_wait 30 .travis/build-fe.sh       # build in prod mode

.travis/apidoc.sh

@@ -45,7 +45,7 @@ if [[ "$TRAVIS_BRANCH" == "master" ]] || [[ -n "$TRAVIS_TAG" ]]; then
     git commit -m "Travis build: $TRAVIS_BUILD_NUMBER" &>/dev/null
 
     if [[ -n "$TRAVIS_TAG" ]]; then
-        echo "+ git tag" ; git tag $TRAVIS_TAG
+        echo "+ git tag" ; git tag -a $TRAVIS_TAG -m "Release $TRAVIS_TAG"
     else
         echo -e "${YELLOW}+ skipping: git tag - not tagged build${NC}"
     fi

.travis/changelog.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# Path to this file
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+# Path the script was called from
+IPWD="$(pwd)"
+# Import shared vars
+. ${DIR}/_shared-vars.sh
+
+echo
+echo "+++ Check if changelog was updated +++"
+echo
+
+
+if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_BRANCH" == "develop" ]; then
+  echo "+ detected pull request from ($TRAVIS_PULL_REQUEST_BRANCH) to $TRAVIS_BRANCH"
+  curl --silent https://raw.githubusercontent.com/h-da/geli/$TRAVIS_BRANCH/CHANGELOG.md \
+  | diff CHANGELOG.md - \
+  | grep -P '^< - .{8,}' - -q
+
+  if [[ $? == 0 ]]; then
+    echo -e "${GREEN}+ Update in CHANGELOG.md found, exit${NC}"
+  else
+    echo -e "${RED}+ ERROR: No Update in CHANGELOG.md found!"
+    echo -e "+ Please check if a line was added in the CHANGELOG.md.${NC}"
+    exit 1
+  fi
+elif [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
+  echo "+ detected pull request from ($TRAVIS_PULL_REQUEST_BRANCH) to $TRAVIS_BRANCH"
+  curl --silent https://raw.githubusercontent.com/h-da/geli/$TRAVIS_BRANCH/CHANGELOG.md \
+  | diff CHANGELOG.md - \
+  | grep -P '^< ## \[\d{1,3}\.\d{1,3}\.\d{1,3}\] - \d{4}-\d{2}-\d{2} - .{10,}' - -q
+
+  if [[ $? == 0 ]]; then
+    echo -e "${GREEN}+ Update in CHANGELOG.md found, exit${NC}"
+  else
+    echo -e "${RED}+ ERROR: No Update in CHANGELOG.md found!"
+    echo -e "+ Please check if a new version was added in the CHANGELOG.md."
+    echo -e "+ Or a new section for the next release was added${NC}"
+    exit 1
+  fi
+else
+  echo -e "${YELLOW}+ WARNING: No Pull Request agiainst Develop or Master -> skipping automate changelog checking${NC}";
+fi

.travis/check-version.sh

@@ -10,7 +10,7 @@ IPWD="$(pwd)"
 PATHS_TO_CHECK=("api" "app/webFrontend")
 
 echo
-echo "+++ Check if current version already used"
+echo "+++ Check if current version already used +++"
 echo
 
 # If is PR against master

CHANGELOG.md

@@ -0,0 +1,97 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [NEXT] 
+### Added
+- Added the possibility to sort all courses alphabetically. [#567](https://github.com/h-da/geli/issues/567)
+- Added a box for information on the homescreen. [#216](https://github.com/h-da/geli/issues/216)
+- Added an account activation resend feature. [#601](https://github.com/h-da/geli/issues/601)
+- Added `SnackBarService` as wrapper for `MatSnackBar`. [#574](https://github.com/h-da/geli/issues/574)
+- Added new course & user API unit tests. [#654](https://github.com/h-da/geli/issues/654) [#691](https://github.com/h-da/geli/issues/691)
+- Added details of courseAdmin and teacher to course detail view. on click profiles are shown.[#598] (https://github.com/h-da/geli/issues/598)
+
+### Changed
+- Refactored or slightly altered various course & user related APIs. [#654](https://github.com/h-da/geli/issues/654) [#691](https://github.com/h-da/geli/issues/691)
+
+### Fixed
+- Fixed wasteful course data usage via specialized course model interfaces. [#654](https://github.com/h-da/geli/issues/654)
+- Fixed a broken documentation link. [#583](https://github.com/h-da/geli/issues/583)
+- Limited the first and last name to 64 characters in the registration- and edit page. [#585](https://github.com/h-da/geli/issues/585)
+- Added a correct email validator to the `user-edit` and `register` components. [#564](https://github.com/h-da/geli/issues/564)
+- Upload of profile pictures now prevents files with forbidden extensions. [#581](https://github.com/h-da/geli/issues/581)
+- Fixed empty course downloads. [#659](https://github.com/h-da/geli/issues/659)
+- Videos in the course now get sized equally and can't grow too big in mobile views. [#534](https://github.com/h-da/geli/issues/534)
+- Fixed missing background on the password reset page. [#673](https://github.com/h-da/geli/issues/673)
+- Fixed notification icon spacing in the navbar for students. [#696](https://github.com/h-da/geli/issues/696)
+- Repair Angular CLI code generation. [#701](https://github.com/h-da/geli/pull/701)
+- Fixed `tsconfig.spec.ts` for `ng test`. [#656](https://github.com/h-da/geli/pull/656)
+
+### Security
+- Fixed numerous severe user related security issues. [#691](https://github.com/h-da/geli/issues/691)
+- Fixed multiple severe course related security issues. [#594](https://github.com/h-da/geli/issues/594) [#653](https://github.com/h-da/geli/issues/653) [#691](https://github.com/h-da/geli/issues/691)
+- Updated the dependencies for security. [#661](https://github.com/h-da/geli/issues/661)
+
+## [0.6.0] - 2018-03-31 - Introduces MediaManager and some minor changes
+### Added
+- MediaManager for file management in courses
+
+
+## [0.5.0] - 2018-03-24 - WS 17/18 intermediate Release
+### Added
+- selective download of the course
+- progress dashboard for teacher
+- translateable frontend with i18n
+- notification system added
+- introduces new error message system
+- dark theme option
+- introducing an api documentation
+- courses are ordered by last visit
+- user password edit
+- adds imprint
+
+
+## [0.4.0] - 2017-12-04 - WS 17/18 Second feature release
+### Added
+- Responsivness improved
+- leave course function
+- delete course
+- import/export course function
+- free text mail to students
+- dragging content between lectures
+- consistent save and abort btns in units
+- progress component
+- duplication of lectures
+- randomize tasks after validation
+
+
+## [0.3.1] - 2017-11-05 - Dynamic db name update
+### Added
+- The possibility to use a other database name then 'test'
+
+
+## [0.3.0] - 2017-11-02
+### Added
+- a lot of major bugfixes and optimizations
+
+
+## [0.2.2] - 2017-10-19 - Security improvements
+### Added 
+- security for free courses
+
+
+## [0.2.1] - 2017-10-03 - First Live-Ready release
+### Added
+- first live functionality
+
+
+## [0.2.0] - 2017-06-29 - Almost production ready
+### Added
+- Many new feature for production
+
+
+## [0.1.0] - 2017-05-11 - Basics implemented
+### Added
+- Many basic implementations of ground functionality

api/fixtures/FixtureUtils.ts

@@ -56,6 +56,17 @@ export class FixtureUtils {
     return this.getRandom<IUser>(array, hash);
   }
 
+  public static async getRandomActiveStudent(hash?: string): Promise<IUser> {
+    const array = await User.find({role:  'student', isActive: true});
+    return this.getRandom<IUser>(array, hash);
+  }
+
+
+  public static async getRandomInactiveStudent(hash?: string): Promise<IUser> {
+    const array = await User.find({role:  'student', isActive: false});
+    return this.getRandom<IUser>(array, hash);
+  }
+
   public static async getRandomStudents(min: number, max: number, hash?: string): Promise<IUser[]> {
     const array = await this.getStudents();
     return this.getRandomArray<IUser>(array, min, max, hash);

api/fixtures/courses/Access-key-test.json

@@ -12,7 +12,7 @@
       "description": "Documents the course fixture.",
       "units": [
         {
-          "name": "What is course fixture for?",
+          "name": "What is the purpose of this course fixture?",
           "description": "",
           "markdown": "To test the 'accesskey' enrollType.",
           "__t": "free-text"

api/fixtures/users/studentFixtures.json

@@ -328,5 +328,27 @@
       "lastName": "Mollenhauer"
     },
     "isActive": true
+  },
+  {
+    "uid": "987654",
+    "email": "student31@test.local",
+    "password": "test1234",
+    "role": "student",
+    "profile": {
+      "firstName": "Robert",
+      "lastName": "Kapinski"
+    },
+    "isActive": false
+  },
+  {
+    "uid": "987653",
+    "email": "student32@test.local",
+    "password": "test1234",
+    "role": "student",
+    "profile": {
+      "firstName": "Horst",
+      "lastName": "Mengalo"
+    },
+    "isActive": false
   }
 ]