Merge branch 'develop' of github.com:SEPM-2022/CleverBirds into develop

alicevillar · May 27, 2022 · b77049d · b77049d
2 parents 1376138 + ed3b838
commit b77049d
Show file tree

Hide file tree

Showing 32 changed files with 169 additions and 126 deletions.
diff --git a/README.md b/README.md
diff --git a/assets/CONFLUENCE-PDF-NEW.pdf b/assets/CONFLUENCE-PDF-NEW.pdf
diff --git a/assets/GanttChart CB.pdf b/assets/GanttChart CB.pdf
diff --git a/assets/NewProjectCharter.JPG b/assets/NewProjectCharter.JPG
diff --git a/assets/RACI-MATRIX-CB.pdf b/assets/RACI-MATRIX-CB.pdf
diff --git a/assets/Test Report.pdf b/assets/Test Report.pdf
diff --git a/assets/game-test-report.png b/assets/game-test-report.png
diff --git a/controllers/users_controller.py b/controllers/users_controller.py
@@ -1,5 +1,5 @@
 
-from flask import Flask, render_template, request, session, make_response
+from flask import Flask, render_template, request, session, make_response, flash
 from app import app, db
 from flask_sqlalchemy import SQLAlchemy
 from werkzeug.security import generate_password_hash, check_password_hash
@@ -61,6 +61,8 @@ def page_login():
                 return render_template('user-dashboard.html', Name = user_found.U_Name, Username = user_found.U_Username, Avatar=user_found.U_CharacterName, Score=user_found.U_Score )
             else:
                 flash("Wrong username/password.")
+                return render_template('index.html', user_not_found=True)  # using JInja in index.html
+
     if request.method=="GET":
         return render_template('index.html',user_not_found=False)  
 

diff --git a/static/img/charming-tweety.png b/static/img/charming-tweety.png
diff --git a/static/img/chubby-bird-logo.png b/static/img/chubby-bird-logo.png
diff --git a/static/img/cover-option.jpg b/static/img/cover-option.jpg
diff --git a/static/img/flying-cute-tweety.png b/static/img/flying-cute-tweety.png
diff --git a/static/img/flytweety.gif b/static/img/flytweety.gif
diff --git a/static/img/logo-clever-birds.jpg b/static/img/logo-clever-birds.jpg
diff --git a/static/img/mylogo.jpg b/static/img/mylogo.jpg
diff --git a/static/img/tweet-aboutus-page.png b/static/img/tweet-aboutus-page.png
diff --git a/static/img/tweety-bird-cute.gif b/static/img/tweety-bird-cute.gif
diff --git a/static/img/tweety-cloud.jpg b/static/img/tweety-cloud.jpg
diff --git a/static/img/tweety-greeting-heart-big.gif b/static/img/tweety-greeting-heart-big.gif
diff --git a/static/img/tweety-heart.gif b/static/img/tweety-heart.gif
diff --git a/static/img/tweety-lying.jpg b/static/img/tweety-lying.jpg
diff --git a/static/img/tweety-standing.png b/static/img/tweety-standing.png
diff --git a/static/img/tweety-wait.gif b/static/img/tweety-wait.gif
diff --git a/static/img/tweety-wait.png b/static/img/tweety-wait.png
diff --git a/static/img/wink.jfif b/static/img/wink.jfif
diff --git a/templates/about.html b/templates/about.html
@@ -41,7 +41,7 @@ <h4 class="text-right"> Talk to Tweety &#128526</h4>
             <div class="col">
                 <div class="col-md-3 border-right px-3">
                     <div class=" flex-column align-items-center text-center p-3 py-5"><img class="square mt-5"
-                            width="150px" src="../static/img/tweety-wait.gif">
+                            width="150px" src="../static/img/tweety-wait.png">
                     </div>
                 </div>
             </div>

diff --git a/templates/create-account.html b/templates/create-account.html
@@ -161,7 +161,7 @@ <h4 class="text-right">Create your profile &#128526</h4>
                     <div class="col">
                         <div class="col-md-3 border-right px-3">
                             <div class=" flex-column align-items-center text-center p-3 py-5">
-                                <img class="square mt-5" width="150" src="static/img/tweety-wait.gif">
+                                <img class="square mt-5" width="150" src="static/img/tweety-wait.png">
                             </div>
                         </div>
                     </div>

diff --git a/templates/index.html b/templates/index.html
@@ -36,8 +36,8 @@ <h1 class="text-center text-dark mt-5 fonte-jogo"> CLEVER BIRDS</h1>
         <div class="d-flex my-4 py-3 card-login justify-content-between align-items-center"
           style="background-color: #1fb1d6d8;">
           <div class="img-piupiu">
-            <img src="../static/img/tweety-wait.gif" class="img-fluid profile-image-pic img-thumbnail my-3"
-              width="180px" alt="profile">
+            <img src="../static/img/tweety-wait.png" class="img-fluid profile-image-pic img-thumbnail my-3"
+              width="300px" alt="profile">
           </div>
           <form id="form-login" class="px-lg-3 py-lg-5 mt-5" action="\login" method="post">
             <div class="mb-3">

diff --git a/templates/manage-account.html b/templates/manage-account.html
@@ -33,7 +33,7 @@ <h6> {{ Score }} </h6>
           </form>
         </div>
       </div>
-      <img class="square mt-5 ms-3" height="150" src="../static/img/tweety-wait.gif">
+      <img class="square mt-5 ms-3" height="150" src="../static/img/tweety-wait.png">
     </div>
   </div>
   {% include 'footer.html' %}

diff --git a/templates/signup-success.html b/templates/signup-success.html
@@ -46,7 +46,7 @@
     <div class="container rounded mt-5 mb-5">
         <div class="d-flex flex-column align-items-center text-center p-3">
             <div class="d-flex align-items-center text-center">
-                <img class="square" width="220px" src="../static/img/tweety-wait.gif">
+                <img class="square" width="220px" src="../static/img/tweety-wait.png">
                 <div class="balao fonte-jogo">Congrats! Your acount has been successfully created! 
                     <p></p>
                     Please <a

diff --git a/templates/tweety.html b/templates/tweety.html
@@ -11,7 +11,7 @@
     {% include 'header.html' %}
     <div class="container rounded mt-5 mb-5">
         <div class="d-flex justify-content-center">
-            <img id="tweety-img" class="mt-5 me-5" height="350" src="/static/img/tweety-wait.gif">
+            <img id="tweety-img" class="mt-5 me-5" height="350" src="/static/img/tweety-wait.png">
 
 
 

diff --git a/templates/user-dashboard.html b/templates/user-dashboard.html
@@ -47,7 +47,7 @@ <h4 class="text-right mb-5">User Dashboard &#128526</h4>
           <a class="btn btn-primary profile-button"  href="/changeavatar">Change avatar</a>
         </div>
       </div>
-      <img class="square mt-5 ms-3" height="200" src="../static/img/tweety-wait.gif">
+      <img class="square mt-5 ms-3" height="200" src="../static/img/tweety-wait.png">
     </div>
   </div>
   {% include 'footer.html' %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,7 @@ <h6> {{ Score }} </h6> @@
               </form>
             </div>
           </div>
-          <img class="square mt-5 ms-3" height="150" src="../static/img/tweety-wait.gif">
+          <img class="square mt-5 ms-3" height="150" src="../static/img/tweety-wait.png">
         </div>
       </div>
       {% include 'footer.html' %}
@@ Expand Down @@