+ ${{ job['employer_name'] }}
+
+ ${{ job['salary'] }}
+
+ ${{ job['description'] }}
+
+
` tag with a class of `card_header_title`.
-- Add an `` tag with an `href` of `{{ url_for('job', job_id=job['id']) }}`.
-- The content should be `{{ job['title'] }}`.
+- Add an `` tag with an `href` of `{{ url_for('job', job_id=job['id']) }}`.
+- The content should be `{{ job['title'] }}`.
-### 4.5 - Show Job Macro Body
+## 4.5 - Show Job Macro Body
-@pytest.mark.show_job_macro_body Next find the ` ` tag.
+@pytest.mark.show_job_macro_body Next find the ` ` tag.
In ` ` tag add the following:
-- `` tag with an `href` of `{{ url_for('employer', employer_id=job['employer_id']) }}`. The content should be `{{ job['employer_name'] }}`.
+- `` tag with an `href` of `{{ url_for('employer', employer_id=job['employer_id']) }}`. The content should be `{{ job['employer_name'] }}`.
- Line break
-- ${{ job['salary'] }}
+- ${{ job['salary'] }}
- Line break
- {{ job['description'] }}
-### 4.6 - Show Jobs Macro Definition
+## 4.6 - Show Jobs Macro Definition
@pytest.mark.show_jobs_macro_definition In `_macros.html` create a template macro using the `macro` tag call it `show_jobs`. `show_jobs` should take one parameter called `jobs`. Don't forgot to end the macro.
-### 4.7 - Show Jobs Macro For Loop
+## 4.7 - Show Jobs Macro For Loop
@pytest.mark.show_jobs_macro_for_loop Still in `_macros.html` and in the body of the `show_jobs` macro add the following HTML:
- Add a ` ` with the content {{ employer['description'] }}
-### 6.3 - Employer Template All Jobs
+## 6.3 - Employer Template All Jobs
@pytest.mark.employer_template_all_jobs Below the `` with a class of `content` in the `show_job` macro and add a `` with a class of `content` in the `show_job` macro and add a `` with two classes `columns` and `is-multiline`.
- In this `` add a `for in` loop that loops through all jobs. **Note: Use the `{% %}` template syntax, don’t forget about ending the `for` loop.**
-### 4.8 - Show Jobs Macro For Loop Body
+## 4.8 - Show Jobs Macro For Loop Body
@pytest.mark.show_jobs_macro_for_loop_body In the body of the `for` loop add a `` with two classes `column` and `is_half`.
- In this `column` `` add a call to the `show_job` macro passing in an individual `job` from the `for` loop.
-### 4.9 - Import Macros
+## 4.9 - Import Macros
-@pytest.mark.import_macros In `templates/layouts.html` import the `show_job`, and `show_jobs` macros using the following code:
+@pytest.mark.import_macros In `templates/layout.html` import the `show_job`, and `show_jobs` macros using the following code:
-``` python
+```
{% from '_macros.html' import show_job, show_jobs with context %}
```
-**Notes: Because each template extends `layouts.html` all of them will have access to these two new macros.**
+**Notes: Because each template extends `layout.html` all of them will have access to these two new macros.**
-### 4.10 - Index Template
+## 4.10 - Index Template
@pytest.mark.index_template Copy the HTML structure of the `index.html` file from `templates.html`. Replace the `` with the copied HTML structure.
-### 4.11 - Display All Jobs
+## 4.11 - Display All Jobs
@pytest.mark.display_all_jobs In the `index.html` template above the `{% endblock %}` add a call to the `show_jobs` macro passing in the argument `jobs`.
-### 4.12 - Gather All Jobs
+## 4.12 - Gather All Jobs
-@pytest.mark.app_jobs_route_jobs In `app.py` locate the `jobs` function.
+@pytest.mark.app_jobs_route_jobs In `app.py` locate the `jobs` function.
Above the `render_template` function, call the `execute_sql` function:
-- Pass in the SQL statement: `'SELECT job.id, job.title, job.description, job.salary, employer.id as employer_id, employer.name as employer_name FROM job JOIN employer ON employer.id = job.employer_id'`.
-- Assign the results of the call to a variable called `jobs`.
+- Pass in the SQL statement: `'SELECT job.id, job.title, job.description, job.salary, employer.id as employer_id, employer.name as employer_name FROM job JOIN employer ON employer.id = job.employer_id'`.
+- Assign the results of the call to a variable called `jobs`.
- In the `render_template` function, pass a keyword argument of `jobs=jobs`.
-### Preview Module 4
+**Preview**
At this point you can see all jobs on the homepage:
- Open a terminal at the root of the project
-- Run the command `flask run`.
-- Open a browser and navigate to the URL: `http://localhost:5000`.
+- Run the command `flask run`.
+- Open a browser and navigate to the URL: `http://localhost:5000`.
**Note: Appending `/jobs` should display the same page.**
-## Module 05 - Display Individual Jobs
+# Module 05 - Display Individual Jobs
-### 5.1 - Job Template
+## 5.1 - Job Template
-@pytest.mark.app_job_template We need a template to display an individual job. Create a new file called `job.html` in the `template` folder.
+@pytest.mark.app_job_template We need a template to display an individual job. Create a new file called `job.html` in the `template` folder.
-In the file use an `extends` template tag to inherit `layout.html`.
+In the file use an `extends` template tag to inherit `layout.html`.
After the `extends` tag add a template `block` called `content`. In the block call the `show_job` macro passing in `job`. **Note: Use the `{{}}` for the macro call.**
-### 5.2 - Job Route Function
+## 5.2 - Job Route Function
@pytest.mark.app_job_route In `app.py` create a function called `job`. In the body return a call to the `render_template` function passing in the newly created `job.html` template.
-### 5.3 - Job Route Decorator
+## 5.3 - Job Route Decorator
-@pytest.mark.app_job_route_decorator We only need one job from the database, we will use the `execute_sql` function passing in a query with a where clause. In the where clause we will need a `job_id`. We are going to get this from the URL.
+@pytest.mark.app_job_route_decorator We only need one job from the database, we will use the `execute_sql` function passing in a query with a where clause. In the where clause we will need a `job_id`. We are going to get this from the URL.
-Still in `app.py`, add a route decorator with the URL path `/job/
` add a `` with a class of `description`
- Nested in the description `` add a`` Jobs header in `employer.html` add a call to the `show_jobs` macro passing in `jobs`.
-### 6.4 - Employer Template Reviews
+## 6.4 - Employer Template Reviews
-@pytest.mark.employer_template_reviews Still in `employer.html` find the review `
`, remove the comment surrounding the empty `{% %}` template tag. To this tag add a `for in` loop to loop through all `reviews`. Add the `endfor` directive to the second empty `{% %}` template tag, don't forget to the remove the comment.
+@pytest.mark.employer_template_reviews Still in `employer.html` find the review `
`, remove the comment surrounding the empty `{% %}` template tag. To this tag add a `for in` loop to loop through all `reviews`. Add the `endfor` directive to the second empty `{% %}` template tag, don't forget to the remove the comment.
-### 6.5 - Employer Template Review Stars
+## 6.5 - Employer Template Review Stars
@pytest.mark.employer_template_review_stars Still `employer.html` in the `
` with a class of `media_left` add this for loop:
-``` python
+```
{% for _ in range(1, review['rating']): %}
{% endfor %}
```
-### 6.6 - Employer Template Review Details
+## 6.6 - Employer Template Review Details
@pytest.mark.employer_template_review_details Still in `employer.html` in the `content ` add a paragraph tag. In the paragraph display the details of a review:
@@ -385,17 +384,17 @@ To the top of the file inherit from the `layout.html` template by using an `exte
- `date` (Recommend Style: ``)
- `review`
-### 6.7 - Employer Route
+## 6.7 - Employer Route
-@pytest.mark.app_employer_route The template we have just built needs access to employer, job, and review data. Let's create a new function in `app.py` called `employer`.
+@pytest.mark.app_employer_route The template we have just built needs access to employer, job, and review data. Let's create a new function in `app.py` called `employer`.
Add a route decorator with a URL pattern of `/employer/` with classes of `columns` and `is-multiline` been added to the `show_jobs` macro?'
@@ -51,6 +50,7 @@ def test_show_jobs_macro_for_loop_module4():
@pytest.mark.test_show_jobs_macro_for_loop_body_module4
def test_show_jobs_macro_for_loop_body_module4():
assert template_exists('_macros'), 'The `_macros.html` template does not exist in the `templates` folder.'
+ assert 'show_jobs:jobs' in template_macros('_macros'), 'Have you created the `show_jobs` macro and added the correct parameter?'
html = template_macro_soup('_macros', 'show_jobs')
div = html.select('div.column.is-half')
assert len(div) == 1, 'Has a `` with classes of `column` and `is-half` been added to the `show_jobs` macro `for` loop body?'
@@ -59,7 +59,7 @@ def test_show_jobs_macro_for_loop_body_module4():
@pytest.mark.test_import_macros_module4
def test_import_macros_module4():
assert template_exists('_macros'), 'The `_macros.html` template does not exist in the `templates` folder.'
- assert '_macros.html:show_job:show_jobs:True' == template_import('layout'), 'Have you imported `_macros.html` in `layouts.html`?'
+ assert '_macros.html:show_job:show_jobs:True' == template_import('layout'), 'Have you imported `_macros.html` in `layout.html`?'
@pytest.mark.test_index_template_module4
def test_index_template_module4():
diff --git a/tests/test_module5.py b/tests/test_module5.py
index 945c033fc..3153d64c4 100644
--- a/tests/test_module5.py
+++ b/tests/test_module5.py
@@ -16,15 +16,18 @@ def test_app_job_route_module5():
assert 'job' in dir(app), 'Have you created the `job` function?'
result = [item for item in get_functions(app.job) if item.startswith('render_template:job.html')]
assert len(result) == 1, 'Have you called the `render_template` function.'
+ return_values = get_functions_returns(app.job)[0]
+ assert return_values['value/args/s'] == 'job.html' and return_values['value/func/id'] == 'render_template', 'Did you return the `render_template` call?'
@pytest.mark.test_app_job_route_decorator_module5
def test_app_job_route_decorator_module5():
assert 'job' in dir(app), 'Have you created the `job` function?'
- assert 'route:/job/