forked from DHBW-FN-TIT20/essensfindung
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'DHBW-FN-TIT20:main' into Implementation-Recipe-Frontend
- Loading branch information
Showing
17 changed files
with
138 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| {% extends "shared/layout_singleform.html" %} | ||
|
|
||
| {% block content %} | ||
|
|
||
|
|
||
| <div class="row justify-content-center"> | ||
| <div class="text-center mb-3"> | ||
| {% if success == "True" %} | ||
| <h2>Konto Erfolgreich Erstellt</h2> | ||
| {% elif success == "False" %} | ||
| <h2>Konto Erstellen Fehlgeschlagen</h2> | ||
| {% endif %} | ||
| </div> | ||
| <div class="col-10 limit-width"> | ||
| {% if success == "True" %} | ||
| <img src="/static/img/icons8-checkmark-yes-large.png" alt="" class="mx-auto d-block w-25"> | ||
| <div class="text-center"> | ||
| <p class="mt-4"> | ||
| Melden Sie sich and und finden Sie Essen! | ||
| </p> | ||
| <a href="/signin" class="btn btn-dark">Anmelden</a> | ||
| </div> | ||
| {% elif success == "False" %} | ||
| <img src="/static/img/icons8-macos-close-large.png" alt="" class="mx-auto d-block w-25"> | ||
| <div class="text-center"> | ||
| {% if msg is defined and msg|length > 0 %} | ||
| <p class="mt-4"> | ||
| Fehler: {{ msg }} | ||
| </p> | ||
| {% endif %} | ||
| <a href="/register" class="btn btn-dark mt-3">Erneut Registrieren</a> | ||
| </div> | ||
| {% endif %} | ||
| </div> | ||
| </div> | ||
|
|
||
| {% endblock %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,16 +9,32 @@ <h2>Anmelden</h2> | |
| <div class="col-10 limit-width"> | ||
| <form method="post"> | ||
| <div class="mb-3"> | ||
| <label for="emailInput" class="form-label mb-1 ms-1">Email: ([email protected])</label> | ||
| <input type="email" name="emailInput" id="emailInput" class="form-control" required> | ||
| <label for="emailInput" class="form-label mb-1 ms-1">Email:</label> | ||
| {% if error is defined and error|length > 0 %} | ||
| <input type="email" name="emailInput" id="emailInput" placeholder="[email protected]" class="form-control is-invalid" required> | ||
| <div class="invalid-feedback"> | ||
| {{ error }} | ||
| </div> | ||
| {% else %} | ||
| <input type="email" name="emailInput" id="emailInput" placeholder="[email protected]" class="form-control" required> | ||
| {% endif %} | ||
| </div> | ||
| <div class="mb-3"> | ||
| <label for="passwordInput" class="form-label mb-1 ms-1">Passwort: (password)</label> | ||
| <input type="password" name="passwordInput" id="passwordInput" class="form-control" required> | ||
| <a href="/recover" class="ms-1 mt-2">Passwort Vergessen?</a> | ||
| <label for="passwordInput" class="form-label mb-1 ms-1">Passwort:</label> | ||
|
|
||
| {% if error is defined and error|length > 0 %} | ||
| <input type="password" name="passwordInput" id="passwordInput" placeholder="password" class="form-control is-invalid" required> | ||
| <div class="invalid-feedback"> | ||
| {{ error }} | ||
| </div> | ||
| {% else %} | ||
| <input type="password" name="passwordInput" id="passwordInput" placeholder="password" class="form-control" required> | ||
| {% endif %} | ||
|
|
||
| <a href="/recover" class="ms-1 pt-3">Passwort Vergessen?</a> | ||
| </div> | ||
| <div class="form-actions text-center"> | ||
| <button type="submit" class="btn btn-dark">Anmelden</button> | ||
| <button type="submit" class="btn btn-dark mt-3">Anmelden</button> | ||
| </div> | ||
| </form> | ||
| </div> | ||
|
|
@@ -28,8 +44,4 @@ <h2>Anmelden</h2> | |
| <p>Noch kein Konto? <a href="/register">Hier Registrieren!</a></p> | ||
| </div> | ||
|
|
||
| {% if error is defined and error|length > 0 %} | ||
| <script> alert("{{ error }}"); </script> | ||
| {% endif %} | ||
|
|
||
| {% endblock %} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -154,7 +154,8 @@ def test_search_for_restaurant( | |
| location=LocationBase(lat="1111", lng="345"), | ||
| ) | ||
|
|
||
| user = create_user(db_session, UserCreate(email="[email protected]", password="geheim")) | ||
| user = UserCreate(email="[email protected]", password="geheim") | ||
| create_user(db_session, user) | ||
|
|
||
| return_res = service_res.search_for_restaurant(db_session, user, filter) | ||
| assert return_res == random_res | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters