Merge branch 'release/v0.7.9' into main

.github/workflows/deployment.yml → .github/workflows/ci_deploy.yml

@@ -1,16 +1,19 @@
-name: Deployment
+name: CI Deployment
 
 on:
     workflow_run:
         workflows: ['CI Tests']
-        branches: [master] # generally, only deploy on 'master'
         types:
             - completed
+        branches: [main] # generally, only deploy on 'main'
 
 jobs:
-    build:
+    deploy:
         name: Deploy app (Node v${{ matrix.node-version }}, ${{ matrix.os }})
         runs-on: ${{ matrix.os }}
+        # run only on main
+        if: github.ref == 'refs/heads/main'
+
         strategy:
             matrix:
                 os: [ubuntu-latest]

.github/workflows/ci_tests.yml

@@ -1,19 +1,16 @@
 name: CI Tests
 
 on:
-    workflow_run:
-        workflows: ['CodeQL']
+    push:
         branches:
             - '**'
         tags-ignore:
             - '*'
         paths-ignore:
-            - '**.md' # ignore changes to markdown files
-        types:
-            - completed
+            - '**.md' # ignore changes in markdown files
 
 jobs:
-    test:
+    tests:
         name: Run tests (Node v${{ matrix.node-version }}, ${{ matrix.os }})
         runs-on: ${{ matrix.os }}
         strategy:

.travis.yml

@@ -25,9 +25,6 @@ stages:
     # test stage
     - name: test
       if: tag IS blank # exclude tags from being tested
-    # deploy stage
-    #- name: deploy # generally, only deploy if we are on 'master'
-    #  if: branch = master
 
 jobs:
     include:
@@ -39,8 +36,3 @@ jobs:
           after_success:
               # run code coverage only after successful tests
               - bash <(curl -s https://codecov.io/bash)
-        #- stage: deploy
-        #  name: 'Deploy to gh-pages'
-        #  script:
-        #      # run deploy script (only on master, see stages)
-        #      - yarn run deploy:ci

CONTRIBUTING.md

@@ -27,11 +27,11 @@ Please note that this project is released with a [Code of Conduct](CODE_OF_CONDU
 
 This project uses the [Gitflow Workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) which defines a strict branching model designed around the project releases. Therefore the following branch structure is used
 
--   `master` (stores the official release history; all commits are tagged with a version number)
+-   `main` (stores the official release history; all commits are tagged with a version number)
 -   `develop` (serves as an integration branch for features; gets released into `release/xxx`)
--   `feature/XXX` (main branch for developing new features; gets branched from and merged into `develop`, never interacts with `master`)
--   `release/xxx` (used to prepare a release with latest features from `develop`; gets merged into `master`)
--   `hotfix/xxx` (used to quickly patch production releases; forked from and merged directly into `master`)
+-   `feature/XXX` (main branch for developing new features; gets branched from and merged into `develop`, never interacts with `main`)
+-   `release/xxx` (used to prepare a release with latest features from `develop`; gets merged into `main`)
+-   `hotfix/xxx` (used to quickly patch production releases; forked from and merged directly into `main`)
 
 To initialize the GitFlow workflow execute `git flow init` inside your local copy of the repository.
 
@@ -43,7 +43,7 @@ For more information about pull requests go check out the GitHub Help [About pul
 
 This project follows the [Conventional Commits Specification](https://conventionalcommits.org) using [commitlint](https://conventional-changelog.github.io/commitlint/#/) based on the [Angular configuration](https://github.com/conventional-changelog/commitlint/tree/master/@commitlint/config-angular) (further explanation can be found in the [Angular commit-message-guidelines](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#-commit-message-guidelines)).
 
-Using these conventions leads to more readable messages that are easy to follow when looking through the project history. But also, we use the git commit messages to autogenerate the [CHANGELOG](https://github.com/webern-unibas-ch/awg-app/blob/master/LICENSE.md) and automate versions by means of [standard-version](https://github.com/conventional-changelog/standard-version) (see "Release Versioning Convention" section below).
+Using these conventions leads to more readable messages that are easy to follow when looking through the project history. But also, we use the git commit messages to autogenerate the [CHANGELOG](https://github.com/webern-unibas-ch/awg-app/blob/main/LICENSE.md) and automate versions by means of [standard-version](https://github.com/conventional-changelog/standard-version) (see "Release Versioning Convention" section below).
 
 When writing commit messages, we stick to this schema:
 
@@ -90,7 +90,7 @@ feat(edition): add route for resource creation
 
 ### Release Versioning Convention
 
-We use the git commit messages to autogenerate the [CHANGELOG](https://github.com/webern-unibas-ch/awg-app/blob/master/CHANGELOG.md) and automate versions by means of [standard-version](https://github.com/conventional-changelog/standard-version).
+We use the git commit messages to autogenerate the [CHANGELOG](https://github.com/webern-unibas-ch/awg-app/blob/main/CHANGELOG.md) and automate versions by means of [standard-version](https://github.com/conventional-changelog/standard-version).
 
 ## Angular quick start guide
 

README.md

@@ -3,8 +3,8 @@
 ![GitHub package.json version](https://img.shields.io/github/package-json/v/webern-unibas-ch/awg-app.svg)
 ![Deployment](https://github.com/webern-unibas-ch/awg-app/workflows/Deployment/badge.svg)
 ![CI tests](https://github.com/webern-unibas-ch/awg-app/workflows/CI%20Tests/badge.svg)
-[![Build Status](https://travis-ci.org/webern-unibas-ch/awg-app.svg?branch=master)](https://travis-ci.org/webern-unibas-ch/awg-app)
-[![codecov](https://codecov.io/gh/webern-unibas-ch/awg-app/branch/master/graph/badge.svg)](https://codecov.io/gh/webern-unibas-ch/awg-app)
+[![Build Status](https://travis-ci.org/webern-unibas-ch/awg-app.svg?branch=main)](https://travis-ci.org/webern-unibas-ch/awg-app)
+[![codecov](https://codecov.io/gh/webern-unibas-ch/awg-app/branch/main/graph/badge.svg)](https://codecov.io/gh/webern-unibas-ch/awg-app)
 [![compodoc](https://edition.anton-webern.ch/compodoc/images/coverage-badge-documentation.svg)](https://edition.anton-webern.ch/compodoc/index.html)
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
 [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v1.4%20adopted-ff69b4.svg)](code-of-conduct.md)
@@ -17,6 +17,6 @@ Please read our [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md) and [CONTRIBUTING.md](C
 
 ## License
 
-The software code of this project is released under [MIT](https://opensource.org/licenses/MIT) license, see [LICENSE.md](https://github.com/webern-unibas-ch/awg-app/blob/master/LICENSE.md).
+The software code of this project is released under [MIT](https://opensource.org/licenses/MIT) license, see [LICENSE.md](https://github.com/webern-unibas-ch/awg-app/blob/main/LICENSE.md).
 
 The contents of the webpage are released under [Creative Commons Attribution-ShareAlike 4.0 International License (CC BY-SA 4.0)](https://creativecommons.org/licenses/by-sa/4.0/), see [Disclaimer](http://edition.anton-webern.ch/contact#awg-disclaimer).

angular.json

@@ -24,7 +24,6 @@
                             "@ctrl/ngx-codemirror",
                             "lodash",
                             "codemirror/mode/sparql/sparql",
-                            "codemirror/mode/go/go",
                             "codemirror/mode/turtle/turtle",
                             "json2typescript",
                             "readable-stream"
@@ -42,7 +41,6 @@
                             "node_modules/codemirror/lib/codemirror.js",
                             "node_modules/codemirror/mode/turtle/turtle.js",
                             "node_modules/codemirror/mode/sparql/sparql.js",
-                            "node_modules/codemirror/mode/go/go.js",
                             "src/plugins/dateConverter.js",
                             "src/plugins/htmlConverter.js"
                         ]
@@ -111,11 +109,11 @@
                             "src/styles.css"
                         ],
                         "scripts": [
+                            "node_modules/snapsvg/dist/snap.svg-min.js",
                             "node_modules/rdfstore/dist/rdfstore_min.js",
                             "node_modules/codemirror/lib/codemirror.js",
                             "node_modules/codemirror/mode/turtle/turtle.js",
                             "node_modules/codemirror/mode/sparql/sparql.js",
-                            "node_modules/codemirror/mode/go/go.js",
                             "src/plugins/dateConverter.js",
                             "src/plugins/htmlConverter.js"
                         ],

package.json

@@ -1,6 +1,6 @@
 {
     "name": "awg-app",
-    "version": "0.7.8",
+    "version": "0.7.9",
     "license": "MIT",
     "author": {
         "name": "Stefan Münnich",
@@ -56,6 +56,55 @@
         "scripts": {
             "postbump": "yarn update-appversion"
         },
+        "types": [
+            {
+                "type": "feat",
+                "section": "Features"
+            },
+            {
+                "type": "fix",
+                "section": "Bug Fixes"
+            },
+            {
+                "type": "perf",
+                "section": "Performance Improvements"
+            },
+            {
+                "type": "revert",
+                "section": "Reverts"
+            },
+            {
+                "type": "test",
+                "section": "Tests"
+            },
+            {
+                "type": "docs",
+                "section": "Documentation"
+            },
+            {
+                "type": "build",
+                "section": "Build System"
+            },
+            {
+                "type": "ci",
+                "section": "Continuous Integration"
+            },
+            {
+                "type": "style",
+                "section": "Styles",
+                "hidden": true
+            },
+            {
+                "type": "chore",
+                "section": "Miscellaneous Chores",
+                "hidden": true
+            },
+            {
+                "type": "refactor",
+                "section": "Code Refactoring",
+                "hidden": true
+            }
+        ],
         "skip": {
             "tag": true
         }
@@ -83,16 +132,16 @@
         "useTabs": false
     },
     "dependencies": {
-        "@angular/animations": "~10.0.4",
-        "@angular/common": "~10.0.4",
-        "@angular/compiler": "~10.0.4",
-        "@angular/core": "~10.0.4",
-        "@angular/forms": "~10.0.4",
-        "@angular/localize": "10.0.4",
-        "@angular/platform-browser": "~10.0.4",
-        "@angular/platform-browser-dynamic": "~10.0.4",
-        "@angular/platform-server": "~10.0.4",
-        "@angular/router": "~10.0.4",
+        "@angular/animations": "~10.2.0",
+        "@angular/common": "~10.2.0",
+        "@angular/compiler": "~10.2.0",
+        "@angular/core": "~10.2.0",
+        "@angular/forms": "~10.2.0",
+        "@angular/localize": "10.2.0",
+        "@angular/platform-browser": "~10.2.0",
+        "@angular/platform-browser-dynamic": "~10.2.0",
+        "@angular/platform-server": "~10.2.0",
+        "@angular/router": "~10.2.0",
         "@ctrl/ngx-codemirror": "^4.0.1",
         "@fortawesome/angular-fontawesome": "^0.7.0",
         "@fortawesome/fontawesome-svg-core": "^1.2.32",
@@ -103,8 +152,8 @@
         "codemirror": "^5.58.1",
         "core-js": "^3.6.5",
         "d3-drag": "^2.0.0",
-        "d3-force": "^2.0.1",
-        "d3-selection": "^1.4.2",
+        "d3-force": "^2.1.1",
+        "d3-selection": "^2.0.0",
         "d3-zoom": "^2.0.0",
         "font-awesome": "^4.7.0",
         "json2typescript": "^1.4.1",
@@ -117,13 +166,13 @@
         "zone.js": "~0.10.2"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "~0.1000.3",
-        "@angular/cli": "~10.0.3",
-        "@angular/compiler-cli": "~10.0.4",
+        "@angular-devkit/build-angular": "~0.1002.0",
+        "@angular/cli": "~10.2.0",
+        "@angular/compiler-cli": "~10.2.0",
         "@commitlint/cli": "^11.0.0",
         "@commitlint/config-angular": "^11.0.0",
         "@compodoc/compodoc": "^1.1.11",
-        "@types/d3": "^5.16.3",
+        "@types/d3": "^6.1.0",
         "@types/jasmine": "~3.5.0",
         "@types/jasminewd2": "~2.0.3",
         "@types/node": "^14.11.5",