Merge branch 'Sprint/2020-12' into 'master'

Sprint/2020 12

See merge request coscine/app/login!32

src/LoginApp.vue

@@ -46,7 +46,6 @@
                         :loggedInWithShibboleth="this.loggedInWithShibboleth"
                         :mergeReturnUrl="mergeReturnUrl"
                         @back="loginBack"
-                        @clickGetLoginForm="getLoginForm"
                         @clickGetORCiDForm="getORCiDForm"
                         @changeLogoutState="changeLogoutState"
                       />
@@ -81,7 +80,6 @@
 <script lang="ts">
 import Vue from 'vue';
 import LoginMain from './components/LoginMain.vue';
-import LoginForm from './components/LoginForm.vue';
 import LogoutMain from './components/LogoutMain.vue';
 import TOS from './components/TOS.vue';
 import RWTHHeader from './components/RWTHHeader.vue';
@@ -165,10 +163,9 @@ function getLoggedInWithShibboleth() {
 }
 
 export default Vue.extend({
-  name: 'app',
+  name: 'loginapp',
   components: {
     LoginMain,
-    LoginForm,
     LogoutMain,
     TOS,
     RWTHHeader,
@@ -207,9 +204,6 @@ export default Vue.extend({
     loginBack() {
       this.currentInputCard = 'LoginMain';
     },
-    getLoginForm() {
-      this.currentInputCard = 'LoginForm';
-    },
     getORCiDForm() {
       window.location.href = this.orcidUrl;
     },

src/components/LoginForm.vue

-<template>
-  <div>
-    <form :action="returnUrl" method="post">
-      <h5 class="card-title">{{ $t('login_form_headline') }}</h5>
-      <div class="row">
-        <input data-val="true" data-val-required="$t('login_form_id_required')" id="userId" placeholder="User ID" name="UserId" type="text" value="" class="form-control" />
-      </div>
-      <div style="height: 5.5px;">
-      </div>
-      <div class="row">
-        <input type="Submit" :value="$t('login_form_submit')" class="submit btn btn-primary w-100" />
-      </div>
-      <div class="row">
-        <button class="btn btn-secondary w-100" name="back" @click.prevent="clickBack">{{ $t('back') }}</button>
-      </div>
-      <input type="hidden" name="wa" value="wsignin1.0" />
-    </form>
-  </div>
-</template>
-
-<script lang='ts'>
-import Vue from 'vue';
-
-export default Vue.extend({
-  name: 'LoginForm',
-  data() {
-    return {
-      form: {
-      },
-    };
-  },
-  props: {
-    returnUrl: String,
-  },
-  methods: {
-    clickBack() {
-      this.$emit('back');
-    },
-  },
-});
-</script>
-
-<style scoped>
-  .form-control {
-      margin: 0em 0.35em;
-  }
-</style>
\ No newline at end of file

src/components/LoginMain.vue

@@ -9,20 +9,12 @@
         <span>  {{ $t('login_button_orcid') }}</span>
       </button>
     </div>
-    <div class="row">
-      <button class="btn btn-primary w-100" name="getLoginForm" @click.prevent="clickGetLoginForm">
-        {{ $t('login_button_form') }}
-      </button>
-    </div>
     <form class="w-100" :action="shibbolethReturnUrl" method="post">
       <div class="row">
           <input class="btn btn-primary w-100" type="Submit" :value="$t('login_shibboleth')" />
           <input type="hidden" name="wa" value="wsignin1.0" />
       </div>
     </form>
-    <div class="row">
-      <button class="btn btn-secondary w-100" disabled>{{ $t('login_button_without_account') }}</button>
-    </div>
   </div>
 </template>
 
@@ -36,9 +28,6 @@ export default Vue.extend({
     shibbolethReturnUrl: String,
   },
   methods: {
-    clickGetLoginForm() {
-      this.$emit('clickGetLoginForm');
-    },
     clickGetORCiDForm() {
       this.$emit('clickGetORCiDForm');
     },