Merge branch 'develop' into 'master'

Merge for Release 2022.1.0

See merge request !13

.gitignore

 /target/
-/.settings/
+/node_modules/
 .classpath
+/.settings/
 /bin/

.project

@@ -34,4 +34,15 @@
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1641984908456</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

.vscode/launch.json

+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "firefox",
+            "request": "launch",
+            "name": "vuejs: firefox",
+            "url": "http://localhost:8080",
+            "webRoot": "${workspaceFolder}/src",
+            "pathMappings": [{ "url": "webpack:///src/", "path": "${webRoot}/" }]
+          }
+    ]
+}
\ No newline at end of file

.vscode/settings.json

+{
+    "git.alwaysShowStagedChangesResourceGroup": true,
+    "git.scanRepositories": [
+        "C:\\Users\\deregena\\git\\"
+    ]
+}
\ No newline at end of file

babel.config.js

+module.exports = {
+  presets: [
+    '@vue/app'
+  ]
+}

doi-online-gui Build.launch

@@ -6,18 +6,21 @@
     <booleanAttribute key="M2_OFFLINE" value="false"/>
     <stringAttribute key="M2_PROFILES" value=""/>
     <listAttribute key="M2_PROPERTIES"/>
-    <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+    <stringAttribute key="M2_RUNTIME" value="apache-maven-3.3.9"/>
     <booleanAttribute key="M2_SKIP_TESTS" value="true"/>
     <intAttribute key="M2_THREADS" value="1"/>
     <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
     <stringAttribute key="M2_USER_SETTINGS" value=""/>
     <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
     <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/doi-online-gui&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
-    <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="false"/>
+    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
+        <mapEntry key="GIT_SSL_NO_VERIFY" value="true"/>
+    </mapAttribute>
     <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
         <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
     </listAttribute>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dmaven.buildNumber.doCheck=false"/>
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/doi-online-gui}"/>

doi-online-gui Setup.launch

@@ -6,7 +6,7 @@
     <booleanAttribute key="M2_OFFLINE" value="false"/>
     <stringAttribute key="M2_PROFILES" value=""/>
     <listAttribute key="M2_PROPERTIES"/>
-    <stringAttribute key="M2_RUNTIME" value="maven"/>
+    <stringAttribute key="M2_RUNTIME" value="apache-maven-3.3.9"/>
     <booleanAttribute key="M2_SKIP_TESTS" value="true"/>
     <intAttribute key="M2_THREADS" value="1"/>
     <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
@@ -18,6 +18,7 @@
         <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
     </listAttribute>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/doi-online-gui}"/>
 </launchConfiguration>

doi-online-gui.code-workspace

+{
+	"folders": [
+		{
+			"path": "."
+		}
+	],
+	"settings": {
+		"maven.terminal.useJavaHome": true
+	}
+}
\ No newline at end of file

jsconfig.json

+{
+    "include": [
+      "./src/**/*"
+    ]
+}
\ No newline at end of file

package.json

+{
+	"name": "DOIOnlineGUI",
+	"version": "0.0.0",
+	"private": true,
+	"scripts": {
+		"serve": "vue-cli-service serve",
+		"build": "vue-cli-service build",
+		"lint": "vue-cli-service lint",
+		"stop": "taskkill /f /im node.exe",
+		"sync-i18n": "vue-i18n-extract report -v \"./src/**/*.?(js|vue)\" -l \"./src/locales/*.json\""
+	},
+	"dependencies": {
+		"vue": "^3.2.31",
+		"vuex": "^4.0.2",
+		"vue-router": "^4.0.14",
+		"@vuelidate/core": "^2.0.0-alpha.38",
+		"@vuelidate/validators": "^2.0.0-alpha.28",
+		"vue-i18n": "^9.2.0-beta.33",
+		"floating-vue": "^2.0.0-beta.11",
+		"vue-loading-overlay": "^5.0.3",
+		"@duetds/date-picker": "^1.4.0",
+		"axios": "^0.26.1",
+		"moment": "^2.29.1",
+		"js-logger": "^1.6.1",
+		"diff": "^5.0.0",
+		"vkbeautify": "^0.99.3",
+		"@braintree/sanitize-url": "^6.0.0"
+	},
+	"devDependencies": {
+		"@vue/cli-plugin-babel": "^4.5.17",
+		"@vue/cli-plugin-eslint": "^4.5.17",
+		"@vue/cli-service": "^4.5.17",
+		"@vue/compiler-sfc": "^3.2.31",
+		"eslint": "^6.8.0",
+		"babel-eslint": "^10.1.0",
+		"eslint-plugin-vue": "^7.9.0",
+		"node-sass": "^5.0.0",
+		"sass-loader": "^10.2.1",
+		"vue-i18n-extract": "^2.0.4"
+	},
+	"eslintConfig": {
+		"root": true,
+		"env": {
+			"node": true
+		},
+		"extends": [
+			"plugin:vue/vue3-essential",
+			"eslint:recommended"
+		],
+		"parserOptions": {
+			"parser": "babel-eslint"
+		},
+		"rules": {
+			"no-console": "off",
+			"no-unused-vars": "warn"
+		}
+	},
+	"postcss": {
+		"plugins": {
+			"autoprefixer": {}
+		}
+	},
+	"browserslist": [
+		"> 1%",
+		"last 2 versions",
+		"not ie <= 8"
+	]
+}

pom.xml

@@ -6,9 +6,14 @@
   	<groupId>ch.ethz.id.sws.doi</groupId>
   	<artifactId>doi-online-gui</artifactId>
   	<packaging>war</packaging>
-  	<version>2022.1.0-SNAPSHOT</version>
+  	<version>2022.1.0</version>
   	<name>DOI Online GUI</name>
-  	
+
+	<scm>
+		<connection>scm:git:https://gitlab.ethz.ch/doi/doi-online-gui.git</connection>
+	    <url>https://gitlab.ethz.ch/doi/doi-online-gui</url>
+	</scm>
+	  	
   	<distributionManagement>
 		<repository>
 			<id>eth.public.nexus</id>
@@ -39,6 +44,7 @@
 						<targetDir>${project.build.finalName}</targetDir>
 						<version>${project.version}</version>
 						<buildNumber>${buildNumber}</buildNumber>
+						<scmBranch>${scmBranch}</scmBranch>
 						<testStage></testStage>
 					</environmentVariables>
 				</configuration>

public/app/css/application.css

-/******************************************/
-/*  Enter below your specific app styles  */
-/******************************************/
-/*
-body.overflow-hidden {
-	overflow: hidden;
-}
-*/
-
-.multiselect--above {
-	z-index: 100
-}
-
-.form-end {
-	margin-top: 1.6rem;
-}
-
-.form-end-content-main {
-	padding: 0;
-	margin-top: 1.6rem;
-}
-
-.form-end-content-next {
-	margin-top: 1.6rem;
-}
-
-

public/app/css/applicationPrint.css

-/*  Enter below your specific app styles  */

public/app/css/basePrint.css

-/* new styles pending */
\ No newline at end of file