Merge branch 'Topic/860-addButton' into 'Product/504-mergeWorkflow'

New: Add UserProfile keys and remove unnecessary vue dependency

See merge request coscine/app/i18n!8

package-lock.json

 {
   "name": "@coscine/i18n",
-  "version": "0.0.1",
+  "version": "1.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -6862,12 +6862,6 @@
       "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
       "dev": true
     },
-    "de-indent": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-      "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=",
-      "dev": true
-    },
     "debug": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -19712,11 +19706,6 @@
       "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
       "dev": true
     },
-    "vue": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz",
-      "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
-    },
     "vue-hot-reload-api": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
@@ -19744,11 +19733,6 @@
         }
       }
     },
-    "vue-runtime-helpers": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vue-runtime-helpers/-/vue-runtime-helpers-1.1.2.tgz",
-      "integrity": "sha512-pZfGp+PW/IXEOyETE09xQHR1CKkR9HfHZdnMD/FVLUNI+HxYTa82evx5WrF6Kz4s82qtqHvMZ8MZpbk2zT2E1Q=="
-    },
     "vue-style-loader": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
@@ -19767,16 +19751,6 @@
         }
       }
     },
-    "vue-template-compiler": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz",
-      "integrity": "sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==",
-      "dev": true,
-      "requires": {
-        "de-indent": "^1.0.2",
-        "he": "^1.1.0"
-      }
-    },
     "vue-template-es2015-compiler": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",

package.json

@@ -11,10 +11,6 @@
     "lint": "vue-cli-service lint",
     "test:unit": "vue-cli-service test:unit"
   },
-  "dependencies": {
-    "vue": "^2.6.11",
-    "vue-runtime-helpers": "^1.1.2"
-  },
   "devDependencies": {
     "@babel/preset-env": "^7.10.2",
     "@hutson/semantic-delivery-gitlab": "^9.1.0",
@@ -32,8 +28,7 @@
     "@vue/test-utils": "1.0.3",
     "chai": "^4.2.0",
     "semantic-release": "^17.0.8",
-    "typescript": "^3.9.5",
-    "vue-template-compiler": "^2.6.11"
+    "typescript": "^3.9.5"
   },
   "repository": {
     "type": "git",

src/I18nApp.vue

-<script lang="ts">
-import Vue from 'vue';
-
-import Default from './apps/default';
-import FormGenerator from './apps/form-generator';
-import Project from './apps/project';
-import ProjectCreation from './apps/project-creation';
-import ProjectCreate from './apps/projectcreate';
-import ProjectEdit from './apps/projectedit';
-import ProjectView from './apps/projectview';
-import ResourceContentView from './apps/resourcecontentview';
-import ResourceCreation from './apps/resourcecreation';
-import Resources from './apps/resources';
-import RWTHMaster from './apps/rwthmaster';
-import Search from './apps/search';
-import SidebarMenu from './apps/sidebarmenu';
-import ToastMessage from './apps/toastmessage';
-import UserList from './apps/userlist';
-import UserManagement from './apps/usermanagement';
-import UserProfile from './apps/userprofile';
-
-window.coscine = {
-  i18n: {
-    'default': Default,
-    'form-generator': FormGenerator.languageStrings,
-    'project': Project.languageStrings,
-    'project-creation': ProjectCreation.languageStrings,
-    'projectcreate': ProjectCreate.languageStrings,
-    'projectedit': ProjectEdit.languageStrings,
-    'projectview': ProjectView.languageStrings,
-    'resourcecontentview': ResourceContentView.languageStrings,
-    'resourcecreation': ResourceCreation.languageStrings,
-    'resources': Resources.languageStrings,
-    'rwthmaster': RWTHMaster.languageStrings,
-    'search': Search.languageStrings,
-    'sidebarmenu': SidebarMenu.languageStrings,
-    'toastmessage': ToastMessage.languageStrings,
-    'userlist': UserList.languageStrings,
-    'usermanagement': UserManagement.languageStrings,
-    'userprofile': UserProfile.languageStrings,
-  },
-};
-
-export default Vue.extend({
-  name: 'i18n',
-});
-</script>

src/apps/userprofile.ts

@@ -13,6 +13,7 @@ const appLanguageStrings = {
     institute: 'Institute',
     discipline: 'Select Discipline(s)',
     userpreferences: 'User Preferences',
+    connectedaccounts: 'Connected Accounts',
 
     titleLabel: 'Title:',
     givennameLabel: 'First Name:',
@@ -22,6 +23,10 @@ const appLanguageStrings = {
     instituteLabel: 'Institute:',
     disciplineLabel: 'Discipline:',
     languageLabel: 'Language:',
+    orcidLabel: 'ORCID:',
+    shibbolethLabel: 'Single-Sign On:',
+    connect: 'connect',
+    connected: 'connected',
     save: 'save',
 
     MultiselectPlaceholderTitle: 'Please select a title.',
@@ -43,6 +48,7 @@ const appLanguageStrings = {
     institute: 'Institut',
     discipline: 'Disziplin',
     userpreferences: 'Benutzer Voreinstellungen',
+    connectedaccounts: 'Verbundene Accounts',
 
     titleLabel: 'Titel:',
     givennameLabel: 'Vorname:',
@@ -52,6 +58,10 @@ const appLanguageStrings = {
     instituteLabel: 'Institut:',
     disciplineLabel: 'Disziplin:',
     languageLabel: 'Sprache:',
+    orcidLabel: 'ORCID:',
+    shibbolethLabel: 'Single-Sign On:',
+    connect: 'verbinden',
+    connected: 'verbunden',
     save: 'save',
 
     MultiselectPlaceholderTitle: 'Bitte wählen Sie einen Titel.',

src/main.ts

-import Vue from 'vue';
-import I18nApp from './I18nApp.vue';
+import Default from './apps/default';
+import FormGenerator from './apps/form-generator';
+import Project from './apps/project';
+import ProjectCreation from './apps/project-creation';
+import ProjectCreate from './apps/projectcreate';
+import ProjectEdit from './apps/projectedit';
+import ProjectView from './apps/projectview';
+import ResourceContentView from './apps/resourcecontentview';
+import ResourceCreation from './apps/resourcecreation';
+import Resources from './apps/resources';
+import RWTHMaster from './apps/rwthmaster';
+import Search from './apps/search';
+import SidebarMenu from './apps/sidebarmenu';
+import ToastMessage from './apps/toastmessage';
+import UserList from './apps/userlist';
+import UserManagement from './apps/usermanagement';
+import UserProfile from './apps/userprofile';
 
-Vue.config.productionTip = false;
-
-new Vue({
-  render: (h) => h(I18nApp),
-});
+window.coscine = {
+  i18n: {
+    'default': Default,
+    'form-generator': FormGenerator.languageStrings,
+    'project': Project.languageStrings,
+    'project-creation': ProjectCreation.languageStrings,
+    'projectcreate': ProjectCreate.languageStrings,
+    'projectedit': ProjectEdit.languageStrings,
+    'projectview': ProjectView.languageStrings,
+    'resourcecontentview': ResourceContentView.languageStrings,
+    'resourcecreation': ResourceCreation.languageStrings,
+    'resources': Resources.languageStrings,
+    'rwthmaster': RWTHMaster.languageStrings,
+    'search': Search.languageStrings,
+    'sidebarmenu': SidebarMenu.languageStrings,
+    'toastmessage': ToastMessage.languageStrings,
+    'userlist': UserList.languageStrings,
+    'usermanagement': UserManagement.languageStrings,
+    'userprofile': UserProfile.languageStrings,
+  },
+};

src/shims-tsx.d.ts

-import Vue, { VNode } from 'vue';
-
-declare global {
-  namespace JSX {
-    // tslint:disable no-empty-interface
-    interface Element extends VNode {}
-    // tslint:disable no-empty-interface
-    interface ElementClass extends Vue {}
-    interface IntrinsicElements {
-      [elem: string]: any;
-    }
-  }
-}

src/shims-vue.d.ts

-declare module '*.vue' {
-  import Vue from 'vue';
-  export default Vue;
-}
-
-declare module "*.png" {
-  const value: any;
-  export default value;
-}
\ No newline at end of file