dergeorg/SmartShopper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Login, Register, User bearbeiten Ersteller Name hinschreiben

Browse Source 
Meinen Namen auf den Login und Registrieren  und User Bearbeiten hinzugefügt. Damit jeder weis das das von mir designt wurde!
This commit is contained in:
Georg Reisinger
2019-04-01 09:35:49 +02:00
parent f645aee8e5
commit d6f3269d6c
6 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
express-server/public/javascripts/login.js
View File

@@ -64,7 +64,7 @@ var vue = new Vue({
var email = error.email; var email = error.email;
// The firebase.auth.AuthCredential type that was used. // The firebase.auth.AuthCredential type that was used.
var credential = error.credential; var credential = error.credential;
alert(errorMessage);
}); });
}, },
loginemail() { loginemail() {

2
express-server/public/javascripts/registerEmail.js
View File

@@ -34,7 +34,7 @@ var vue = new Vue({
var errorMessage = error.message; var errorMessage = error.message;
console.error(error.code + '_' + error.message); console.error(error.code + '_' + error.message);
alert(error.code + '_' + error.message); alert(error.message);
}); });
var user = firebase.auth().currentUser; var user = firebase.auth().currentUser;
if (user != null) { if (user != null) {

8
express-server/views/dash.ejs
View File

@@ -9,7 +9,9 @@
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/all.css" <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/all.css"
integrity="sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU" crossorigin="anonymous"> integrity="sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU" crossorigin="anonymous">
<link rel='stylesheet' href='/bootstrap/dist/css/bootstrap.min.css'> <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> </head>
@@ -249,8 +251,8 @@
</div> </div>
<!-- Modal Shoppingliste bearbeiten --> <!-- Modal Shoppingliste bearbeiten -->
<div class="modal fade bd-example-modal-sm editsl" tabindex="-1" id="editsl" role="dialog" <div class="modal fade bd-example-modal-sm editsl" tabindex="-1" id="editsl" role="dialog" aria-labelledby="editsl"
aria-labelledby="editsl" aria-hidden="true"> aria-hidden="true">
<div class="modal-dialog modal-sm"> <div class="modal-dialog modal-sm">
<div class="modal-content editmodal" id=""> <div class="modal-content editmodal" id="">
<div> <div>

12
express-server/views/index.ejs
View File

@@ -30,14 +30,14 @@
<label class="mdl-textfield__label" for="password">Password</label> <label class="mdl-textfield__label" for="password">Password</label>
</div> </div>
<p> <p>
<button id="login-button" v-show="email && password" <button id="login-button" @click="loginemail()" 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 Email Login mit Email
</button> </button>
</p> </p>
<p> <p>
<button id="login-button" @click="login()" v-show="!email && !password" <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 Login mit Google
</button> </button>
</p> </p>
@@ -49,7 +49,11 @@
</div> </div>
</div> </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> </div>
<script defer src="https://code.getmdl.io/1.3.0/material.min.js"></script> <script defer src="https://code.getmdl.io/1.3.0/material.min.js"></script>

8
express-server/views/registrieremail.ejs
View File

@@ -15,7 +15,6 @@
<body> <body>
<div id="vue-app"> <div id="vue-app">
<div class="mdl-layout mdl-js-layout"> <div class="mdl-layout mdl-js-layout">
<div id="login-conatiner" class="mdl-card mdl-shadow--16dp"> <div id="login-conatiner" class="mdl-card mdl-shadow--16dp">
<div class="mdl-card__supporting-text"> <div class="mdl-card__supporting-text">
@@ -38,7 +37,7 @@
<label class="mdl-textfield__label" for="password">Password</label> <label class="mdl-textfield__label" for="password">Password</label>
</div> </div>
<button id="login-button" @click="registerEmail()" v-show="email && password && name" <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 Jetzt Registrieren
</button> </button>
</div> </div>
@@ -48,6 +47,11 @@
</div> </div>
</div> </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> </div>
<script defer src="https://code.getmdl.io/1.3.0/material.min.js"></script> <script defer src="https://code.getmdl.io/1.3.0/material.min.js"></script>
<script src="javascripts/registerEmail.js"></script> <script src="javascripts/registerEmail.js"></script>

5
express-server/views/user.ejs
View File

@@ -56,6 +56,11 @@
</div> </div>
</div> </div>
</center> </center>
<div class="mdl-mega-footer__bottom-section">
<ul class="mdl-mega-footer__link-list">
<li>Created by Georg Reisinger</li>
</ul>
</div>
</div> </div>
<style lang="scss"> <style lang="scss">
.demo-card-square.mdl-card { .demo-card-square.mdl-card {