diff --git a/FullstackProsjekt/cypress/screenshots/login.cy.js/Login Component -- should redirect to profile page on successful login (failed).png b/FullstackProsjekt/cypress/screenshots/login.cy.js/Login Component -- should redirect to profile page on successful login (failed).png new file mode 100644 index 0000000000000000000000000000000000000000..2a06cb4a5e08bad62715ddc05da149741315b9e8 Binary files /dev/null and b/FullstackProsjekt/cypress/screenshots/login.cy.js/Login Component -- should redirect to profile page on successful login (failed).png differ diff --git a/FullstackProsjekt/cypress/screenshots/signup.cy.js/Signup Component -- should redirect to login page on successful signup (failed).png b/FullstackProsjekt/cypress/screenshots/signup.cy.js/Signup Component -- should redirect to login page on successful signup (failed).png new file mode 100644 index 0000000000000000000000000000000000000000..e464328c3cfb52c4abd67f13be583d93c7c8544e Binary files /dev/null and b/FullstackProsjekt/cypress/screenshots/signup.cy.js/Signup Component -- should redirect to login page on successful signup (failed).png differ diff --git a/FullstackProsjekt/src/frontend/src/views/LoginView.vue b/FullstackProsjekt/src/frontend/src/views/LoginView.vue index 649cf886614c14c9f9e9c8ebe1d576f9c00372e4..c9ef05553dcfca174c8688d11b01ccb80917b668 100644 --- a/FullstackProsjekt/src/frontend/src/views/LoginView.vue +++ b/FullstackProsjekt/src/frontend/src/views/LoginView.vue @@ -7,8 +7,8 @@ <p> Sign in to your already existing account</p> <div class="loginBox"> - <label>Username</label> <br> - <input type="text" required v-model="username" placeholder="PartyDragon42"/> <br> + <label>Username</label> <br> + <input type="text" required v-model="username" placeholder="PartyDragon42"/> <br> <label>Password</label> <br> <div class="password-input"> @@ -19,8 +19,8 @@ </button> </div> <br> - <label class="error-message">{{errorMsg}}</label><br> - <p> Don't have a account?</p><router-link to="/signup" id="signUpLink">SIGNUP!</router-link> + <label class="error-message">{{errorMsg}}</label><br> + <p> Don't have an account?</p><router-link to="/signup" id="signUpLink">SIGNUP!</router-link> </div> </div> @@ -99,15 +99,20 @@ export default { display: inline-block; min-width: 300px; } + +.password-input input { + padding-right: 40px; +} + .showPasswordIcon { position: absolute; - top: 50%; right: 10px; transform: translateY(-50%); border: none; background: none; cursor: pointer; } + #signUpLink { color: var(--option-color); padding: 10px; diff --git a/FullstackProsjekt/src/frontend/src/views/PlayQuizView.vue b/FullstackProsjekt/src/frontend/src/views/PlayQuizView.vue index b69d951a88c68cb668d8560cb8a0e3bb967d4ca0..ef333d28e5922e9b22e6c006166dbeff3f388976 100644 --- a/FullstackProsjekt/src/frontend/src/views/PlayQuizView.vue +++ b/FullstackProsjekt/src/frontend/src/views/PlayQuizView.vue @@ -155,8 +155,8 @@ export default { <div v-if="showPopup" class="popup"> <p>{{ popupMessage }}</p> </div> - <button v-if="hasAnswered" @click="nextQuestion">{{buttonText}}</button> - <button v-if="!hasAnswered" @click="submitAnswer">Submit</button> + <button class="play-quiz-btn" v-if="hasAnswered" @click="nextQuestion">{{buttonText}}</button> + <button class="play-quiz-btn" v-if="!hasAnswered" @click="submitAnswer">Submit</button> </div> </div> </body> @@ -230,7 +230,7 @@ h1#title { } -button { +.play-quiz-btn { background-color: var(--option-color); color: var(--text-light-color); font-size: 18px; @@ -242,7 +242,7 @@ button { transition: background-color 0.3s ease; } -button:hover { +.play-quiz-btn:hover { background-color: var(--option-hover); }