Skip to content

Commit a092bf0

Browse files
Merge branch 'main' into update_solutions
2 parents 4a11236 + 8746ce0 commit a092bf0

File tree

6 files changed

+140
-18
lines changed

6 files changed

+140
-18
lines changed

Diff for: .github/ISSUE_TEMPLATE/bug_report.md

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
---
2+
name: Bug Report
3+
about: Create a report to help us improve something that is not working correctly
4+
title: "Bug - :"
5+
labels: "Status: Needs Review, Type: Bug"
6+
assignees: ""
7+
---
8+
9+
<!-- Thank you for taking the time to submit a bug report to The Odin Project. In order to get issues closed in a reasonable amount of time, you must include a baseline of information about the bug in question. Please read this template in its entirety before filling it out to ensure that it is filled out correctly. -->
10+
11+
Complete the following REQUIRED checkboxes:
12+
- [ ] I have thoroughly read and understand [The Odin Project Contributing Guide](https://github.com/TheOdinProject/theodinproject/blob/main/CONTRIBUTING.md)
13+
- [ ] The title of this issue follows the `Bug - location of bug: brief description of bug` format, e.g. `Bug - Exercises: File type incorrect for all test files`
14+
15+
The following checkbox is OPTIONAL:
16+
<!-- Completing this checkbox does not guarantee you will be assigned this issue, but rather lets us know you are interested in working on it. -->
17+
- [ ] I would like to be assigned this issue to work on it
18+
19+
<hr>
20+
21+
**1. Description of the Bug:**
22+
<!-- A clear and concise description of what the bug is. Include any screenshots that may help show the bug in action. -->
23+
24+
25+
**2. How To Reproduce:**
26+
<!--
27+
What steps one might need to take in order to reproduce this bug, e.g.:
28+
1. Log in
29+
2. Visit a lesson page
30+
3. Click the complete button
31+
4. The complete button does not update
32+
-->
33+
34+
35+
**3. Expected Behavior:**
36+
<!--
37+
A brief description of what you expected to happen, e.g.:
38+
1. Log in
39+
2. Visit a lesson page
40+
3. Click the complete button
41+
4. The complete button updates correctly
42+
-->
43+
44+
45+
**4. Desktop/Device:**
46+
<!-- The more information you are able to provide, the better. -->
47+
- Device: <!-- [e.g. iPhone6] -->
48+
- OS: <!-- [e.g. iOS] -->
49+
- Browser: <!-- [e.g. chrome, safari] -->
50+
- Version: <!-- [e.g. 22] -->
51+
52+
**5. Additional Information:**
53+
<!-- Any additional information about the bug. -->
54+

Diff for: .github/ISSUE_TEMPLATE/feature_request.md

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
name: Feature Request
3+
about: Suggest a new feature or enhancement for this project
4+
title: ""
5+
labels: "Status: Needs Review"
6+
assignees: ""
7+
---
8+
9+
<!-- Thank you for taking the time to submit a new feature request to The Odin Project. In order to get issues closed in a reasonable amount of time, you must include a baseline of information about the feature/enhancement you are proposing. Please read this template in its entirety before filling it out to ensure that it is filled out correctly. -->
10+
11+
Complete the following REQUIRED checkboxes:
12+
- [ ] I have thoroughly read and understand [The Odin Project Contributing Guide](https://github.com/TheOdinProject/theodinproject/blob/main/CONTRIBUTING.md)
13+
- [ ] The title of this issue follows the `location for request: brief description of request` format, e.g. `Exercises: Add exercise on XYZ`
14+
15+
The following checkbox is OPTIONAL:
16+
<!-- Completing this checkbox does not guarantee you will be assigned this issue, but rather lets us know you are interested in working on it. -->
17+
- [ ] I would like to be assigned this issue to work on it
18+
19+
<hr>
20+
21+
**1. Description of the Feature Request:**
22+
<!--
23+
A clear and concise description of what the feature or enhancement is, including how it would be useful/beneficial or what problem(s) it would solve.
24+
-->
25+
26+
27+
**2. Acceptance Criteria:**
28+
<!--
29+
A list of checkbox items that explain the requirements needed to be met to resolve this request, e.g.:
30+
- [ ] A theme toggle is present on the dashboard
31+
- [ ] Clicking the theme toggle changes between light and dark
32+
- [ ] A user's theme choice persists after leaving the website
33+
-->
34+
35+
36+
**3. Additional Information:**
37+
<!-- Any additional information about the feature request, such as a link to a Discord discussion, screenshots, etc. -->
38+

Diff for: .github/PULL_REQUEST_TEMPLATE.md

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<!-- Thank you for taking the time to contribute to The Odin Project. In order to get this pull request (PR) merged in a reasonable amount of time, you must complete this entire template. -->
2+
3+
## Because
4+
<!-- Summarize the purpose or reasons for this PR, e.g. what problem it solves or what benefit it provides. -->
5+
6+
7+
## This PR
8+
<!-- A bullet point list of one or more items describing the specific changes. -->
9+
10+
11+
## Issue
12+
<!--
13+
If this PR closes an open issue in this repo, replace the XXXXX below with the issue number, e.g. Closes #2013.
14+
15+
If this PR closes an open issue in another TOP repo, replace the #XXXXX with the URL of the issue, e.g. Closes https://github.com/TheOdinProject/curriculum/issues/XXXXX
16+
17+
If this PR does not close, but is related to another issue or PR, you can link it as above without the 'Closes' keyword, e.g. 'Related to #2013'.
18+
-->
19+
Closes #XXXXX
20+
21+
## Additional Information
22+
<!-- Any other information about this PR, such as a link to a Discord discussion. -->
23+
24+
25+
## Pull Request Requirements
26+
<!-- Replace the whitespace between the square brackets with an 'x', e.g. [x]. After you create the PR, they will become checkboxes that you can click on. -->
27+
- [ ] I have thoroughly read and understand [The Odin Project Contributing Guide](https://github.com/TheOdinProject/theodinproject/blob/main/CONTRIBUTING.md)
28+
- [ ] The title of this PR follows the `location of change: brief description of change` format, e.g. `01_helloWorld: Update test cases`
29+
- [ ] The `Because` section summarizes the reason for this PR
30+
- [ ] The `This PR` section has a bullet point list describing the changes in this PR
31+
- [ ] If this PR addresses an open issue, it is linked in the `Issue` section
32+
- [ ] If this PR includes changes that needs to be updated on the `solutions` branch, I have created another PR (and linked it to this PR).

Diff for: 07_tempConversion/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
Write two functions that convert temperatures from Fahrenheit to Celsius, and vice versa:
44
```
5-
ftoc(32) // fahrenheit to celsius, should return 0
5+
convertToCelsius(32) // fahrenheit to celsius, should return 0
66
7-
ctof(0) // celsius to fahrenheit, should return 32
7+
convertToFahrenheit(0) // celsius to fahrenheit, should return 32
88
```
99

10-
Because we are human, we want the result temperature to be rounded to one decimal place: i.e., `ftoc(100)` should return `37.8` and not `37.77777777777778`.
10+
Because we are human, we want the result temperature to be rounded to one decimal place: i.e., `convertToCelsius(100)` should return `37.8` and not `37.77777777777778`.
1111

1212
This exercise asks you to create more than one function so the `module.exports` section of the spec file looks a little different this time. Nothing to worry about, we're just packaging both functions into a single object to be exported.
1313

Diff for: 07_tempConversion/tempConversion.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
const ftoc = function() {
2-
1+
const convertToCelsius = function() {
32
};
43

5-
const ctof = function() {
6-
4+
const convertToFahrenheit = function() {
75
};
86

97
// Do not edit below this line
108
module.exports = {
11-
ftoc,
12-
ctof
9+
convertToCelsius,
10+
convertToFahrenheit
1311
};

Diff for: 07_tempConversion/tempConversion.spec.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
const {ftoc, ctof} = require('./tempConversion')
1+
const {convertToCelsius, convertToFahrenheit} = require('./tempConversion')
22

3-
describe('ftoc', () => {
3+
describe('convertToCelsius', () => {
44
test('works', () => {
5-
expect(ftoc(32)).toEqual(0);
5+
expect(convertToCelsius(32)).toEqual(0);
66
});
77
test.skip('rounds to 1 decimal', () => {
8-
expect(ftoc(100)).toEqual(37.8);
8+
expect(convertToCelsius(100)).toEqual(37.8);
99
});
1010
test.skip('works with negatives', () => {
11-
expect(ftoc(-100)).toEqual(-73.3);
11+
expect(convertToCelsius(-100)).toEqual(-73.3);
1212
});
1313
});
1414

15-
describe('ctof', () => {
15+
describe('convertToFahrenheit', () => {
1616
test.skip('works', () => {
17-
expect(ctof(0)).toEqual(32);
17+
expect(convertToFahrenheit(0)).toEqual(32);
1818
});
1919
test.skip('rounds to 1 decimal', () => {
20-
expect(ctof(73.2)).toEqual(163.8);
20+
expect(convertToFahrenheit(73.2)).toEqual(163.8);
2121
});
2222
test.skip('works with negatives', () => {
23-
expect(ctof(-10)).toEqual(14);
23+
expect(convertToFahrenheit(-10)).toEqual(14);
2424
});
2525
});

0 commit comments

Comments
 (0)