From d6f3269d6c047279a1339e53e61e0d93a0aa2310 Mon Sep 17 00:00:00 2001
From: Georg Reisinger <43533139+GeorgReisinger@users.noreply.github.com>
Date: Mon, 1 Apr 2019 09:35:49 +0200
Subject: [PATCH] Login, Register, User bearbeiten Ersteller Name hinschreiben
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Meinen Namen auf den Login und Registrieren  und User Bearbeiten hinzugefügt. Damit jeder weis das das von mir designt wurde!
---
 express-server/public/javascripts/login.js         |  2 +-
 express-server/public/javascripts/registerEmail.js |  2 +-
 express-server/views/dash.ejs                      | 12 +++++++-----
 express-server/views/index.ejs                     | 12 ++++++++----
 express-server/views/registrieremail.ejs           |  8 ++++++--
 express-server/views/user.ejs                      |  5 +++++
 6 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/express-server/public/javascripts/login.js b/express-server/public/javascripts/login.js
index a847db50..b8cabe56 100644
--- a/express-server/public/javascripts/login.js
+++ b/express-server/public/javascripts/login.js
@@ -64,7 +64,7 @@ var vue = new Vue({
         var email = error.email;
         // The firebase.auth.AuthCredential type that was used.
         var credential = error.credential;
-
+        alert(errorMessage);
       });
     },
     loginemail() {
diff --git a/express-server/public/javascripts/registerEmail.js b/express-server/public/javascripts/registerEmail.js
index 9dca31cd..e38db937 100644
--- a/express-server/public/javascripts/registerEmail.js
+++ b/express-server/public/javascripts/registerEmail.js
@@ -34,7 +34,7 @@ var vue = new Vue({
                     var errorMessage = error.message;
 
                     console.error(error.code + '_' + error.message);
-                    alert(error.code + '_' + error.message);
+                    alert(error.message);
                 });
             var user = firebase.auth().currentUser;
             if (user != null) {
diff --git a/express-server/views/dash.ejs b/express-server/views/dash.ejs
index b4caefd9..7fc3bf63 100644
--- a/express-server/views/dash.ejs
+++ b/express-server/views/dash.ejs
@@ -9,7 +9,9 @@
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/all.css"
         integrity="sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU" crossorigin="anonymous">
     <link rel='stylesheet' href='/bootstrap/dist/css/bootstrap.min.css'>
-    <script src="https://www.gstatic.com/firebasejs/5.7.0/firebase.js"></script>
+    <script src="https://www.gstatic.com/firebasejs/5.7.0/firebase-app.js"></script>
+    <script src="https://www.gstatic.com/firebasejs/5.7.0/firebase-auth.js"></script>
+    <script src="https://www.gstatic.com/firebasejs/5.7.0/firebase-messaging.js"></script>
 
 </head>
 
@@ -58,10 +60,10 @@
 
     <!-- shares cards -->
     <div class="row justify-content-center ">
-            <div class="container shared-cards"></div>
+        <div class="container shared-cards"></div>
     </div>
 
-    
+
 
     <!-- detail card -->
     <div class="row justify-content-center ">
@@ -249,8 +251,8 @@
     </div>
 
     <!-- Modal Shoppingliste bearbeiten -->
-    <div class="modal fade bd-example-modal-sm editsl" tabindex="-1" id="editsl" role="dialog"
-        aria-labelledby="editsl" aria-hidden="true">
+    <div class="modal fade bd-example-modal-sm editsl" tabindex="-1" id="editsl" role="dialog" aria-labelledby="editsl"
+        aria-hidden="true">
         <div class="modal-dialog modal-sm">
             <div class="modal-content editmodal" id="">
                 <div>
diff --git a/express-server/views/index.ejs b/express-server/views/index.ejs
index 95520c3b..573ece52 100644
--- a/express-server/views/index.ejs
+++ b/express-server/views/index.ejs
@@ -30,14 +30,14 @@
             <label class="mdl-textfield__label" for="password">Password</label>
           </div>
           <p>
-            <button id="login-button" v-show="email && password"
-              class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--colored mdl-color-text--white">
+            <button id="login-button" @click="loginemail()" v-show="email && password"
+              class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored mdl-js-ripple-effect mdl-color-text--white">
               Login mit Email
             </button>
           </p>
           <p>
             <button id="login-button" @click="login()" v-show="!email && !password"
-              class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--colored mdl-color-text--white">
+              class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored mdl-js-ripple-effect mdl-color-text--white">
               Login mit Google
             </button>
           </p>
@@ -49,7 +49,11 @@
         </div>
       </div>
     </div>
-
+    <div class="mdl-mega-footer__bottom-section">
+      <ul class="mdl-mega-footer__link-list">
+        <li>Created by Georg Reisinger</li>
+      </ul>
+    </div>
 
   </div>
   <script defer src="https://code.getmdl.io/1.3.0/material.min.js"></script>
diff --git a/express-server/views/registrieremail.ejs b/express-server/views/registrieremail.ejs
index f95be510..35a8afaa 100644
--- a/express-server/views/registrieremail.ejs
+++ b/express-server/views/registrieremail.ejs
@@ -15,7 +15,6 @@
 
 <body>
     <div id="vue-app">
-
         <div class="mdl-layout mdl-js-layout">
             <div id="login-conatiner" class="mdl-card mdl-shadow--16dp">
                 <div class="mdl-card__supporting-text">
@@ -38,7 +37,7 @@
                         <label class="mdl-textfield__label" for="password">Password</label>
                     </div>
                     <button id="login-button" @click="registerEmail()" v-show="email && password && name"
-                        class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--colored mdl-color-text--white">
+                        class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored mdl-js-ripple-effect mdl-color-text--white">
                         Jetzt Registrieren
                     </button>
                 </div>
@@ -48,6 +47,11 @@
                 </div>
             </div>
         </div>
+        <div class="mdl-mega-footer__bottom-section">
+            <ul class="mdl-mega-footer__link-list">
+                <li>Created by Georg Reisinger</li>
+            </ul>
+        </div>
     </div>
     <script defer src="https://code.getmdl.io/1.3.0/material.min.js"></script>
     <script src="javascripts/registerEmail.js"></script>
diff --git a/express-server/views/user.ejs b/express-server/views/user.ejs
index 6f9b130a..53744f3b 100644
--- a/express-server/views/user.ejs
+++ b/express-server/views/user.ejs
@@ -56,6 +56,11 @@
         </div>
       </div>
     </center>
+    <div class="mdl-mega-footer__bottom-section">
+      <ul class="mdl-mega-footer__link-list">
+        <li>Created by Georg Reisinger</li>
+      </ul>
+    </div>
   </div>
   <style lang="scss">
     .demo-card-square.mdl-card {