From 6dd594c9008e6348286d35bdf3732cba7d33b878 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <70952936+thatblindgeye@users.noreply.github.com>
Date: Mon, 14 Feb 2022 15:07:50 -0500
Subject: [PATCH 01/11] Create PULL_REQUEST_TEMPLATE.md
---
.github/PULL_REQUEST_TEMPLATE.md | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 .github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..8879cb7
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,19 @@
+
+
+
+- [ ] I have thoroughly read and understand [The Odin Project Contributing Guide](https://github.com/TheOdinProject/theodinproject/blob/main/CONTRIBUTING.md)
+- [ ] The title of this PR follows the `where the change occurs: brief description of change` format, e.g. `Intro to HTML and CSS lesson: Fix link text`
+
+
+- [ ] If one exists, I have linked a related open issue to this PR in Step 2 below
+- [ ] If changes were requested, I have made them and re-requested a review from the maintainer (top of the right sidebar)
+
+**1. Description of the Changes**
+
+
+
+**2. Related Issue**
+
+Closes #XXXXX
From baa5b0a7610f3a80b6fb63de1030c0d894d8cfe9 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <70952936+thatblindgeye@users.noreply.github.com>
Date: Mon, 14 Feb 2022 15:09:20 -0500
Subject: [PATCH 02/11] Create bug_report.md
---
.github/ISSUE_TEMPLATE/bug_report.md | 38 ++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..e2b4e57
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+name: Bug Report
+about: Create a report to help us improve
+title: ''
+labels: 'Status: Needs Review, Type: Bug'
+assignees: ''
+
+---
+
+
+
+- [ ] I have thoroughly read and understand [The Odin Project Contributing Guide](https://github.com/TheOdinProject/theodinproject/blob/main/CONTRIBUTING.md)
+- [ ] The title of this issue follows the `where the change occurs: brief description of bug` format, e.g. `React section: Knowledge Checks don't link to resource`
+
+
+- [ ] I would like to be assigned this issue to work on it
+
+**1. Description of the Bug**
+
+
+
+**2. How To Reproduce**
+
+
+
+**3. Expected Behavior**
+
+
+
+**4. Desktop/Device:**
+ - Device:
+ - OS:
+ - Browser:
+ - Version:
+
+**5. Additional Information**
+
+
From 417ee0d6e5bd719d9bd75fa526c8148282ca9d85 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <70952936+thatblindgeye@users.noreply.github.com>
Date: Mon, 14 Feb 2022 15:09:44 -0500
Subject: [PATCH 03/11] Create feature_request.md
---
.github/ISSUE_TEMPLATE/feature_request.md | 24 +++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..3dd36af
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,24 @@
+---
+name: Feature Request
+about: Suggest a new feature or enhancement for this project
+title: ''
+labels: 'Status: Needs Review'
+assignees: ''
+
+---
+
+
+
+- [ ] I have thoroughly read and understand [The Odin Project Contributing Guide](https://github.com/TheOdinProject/theodinproject/blob/main/CONTRIBUTING.md)
+- [ ] The title of this issue follows the `where the change occurs: brief description of request` format, e.g. `Global SCSS file: Buttons should have XYZ`
+
+
+- [ ] I would like to be assigned this issue to work on it
+
+**1. Description of the Feature Request**
+
+
+
+**2. Additional Information**
+
+
From f002e3d6d0ff49d01905032e717a26b7bfb6cf7b Mon Sep 17 00:00:00 2001
From: Eric Olkowski <70952936+thatblindgeye@users.noreply.github.com>
Date: Sun, 20 Feb 2022 13:20:37 -0500
Subject: [PATCH 04/11] Update feature_request.md
---
.github/ISSUE_TEMPLATE/feature_request.md | 42 +++++++++++++++--------
1 file changed, 28 insertions(+), 14 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 3dd36af..4814cc2 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,24 +1,38 @@
---
name: Feature Request
-about: Suggest a new feature or enhancement for this project
-title: ''
-labels: 'Status: Needs Review'
-assignees: ''
-
+about: Suggest a new feature or enhancement for this project
+title: ""
+labels: "Status: Needs Review"
+assignees: ""
---
+
-
-- [ ] I have thoroughly read and understand [The Odin Project Contributing Guide](https://github.com/TheOdinProject/theodinproject/blob/main/CONTRIBUTING.md)
-- [ ] The title of this issue follows the `where the change occurs: brief description of request` format, e.g. `Global SCSS file: Buttons should have XYZ`
+Complete the following REQUIRED checkboxes:
+- [ ] I have thoroughly read and understand [The Odin Project Contributing Guide](https://github.com/TheOdinProject/theodinproject/blob/main/CONTRIBUTING.md)
+- [ ] The title of this issue follows the `location for request: brief description of request` format, e.g. `Exercises: Add exercise on XYZ`
-
-- [ ] I would like to be assigned this issue to work on it
+The following checkbox is OPTIONAL:
+
+- [ ] I would like to be assigned this issue to work on it
-**1. Description of the Feature Request**
-
+
+
+**1. Description of the Feature Request:**
+
-**2. Additional Information**
-
+**2. Acceptance Criteria:**
+
+
+
+**3. Additional Information:**
+
From f82c72f76046051857eacac0a79076c48966ae54 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <70952936+thatblindgeye@users.noreply.github.com>
Date: Sun, 20 Feb 2022 13:21:49 -0500
Subject: [PATCH 05/11] Update bug_report.md
---
.github/ISSUE_TEMPLATE/bug_report.md | 56 ++++++++++++++++++----------
1 file changed, 36 insertions(+), 20 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index e2b4e57..4c4571c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,38 +1,54 @@
---
name: Bug Report
-about: Create a report to help us improve
-title: ''
-labels: 'Status: Needs Review, Type: Bug'
-assignees: ''
-
+about: Create a report to help us improve something that is not working correctly
+title: "Bug - :"
+labels: "Status: Needs Review, Type: Bug"
+assignees: ""
---
+
-
-- [ ] I have thoroughly read and understand [The Odin Project Contributing Guide](https://github.com/TheOdinProject/theodinproject/blob/main/CONTRIBUTING.md)
-- [ ] The title of this issue follows the `where the change occurs: brief description of bug` format, e.g. `React section: Knowledge Checks don't link to resource`
+Complete the following REQUIRED checkboxes:
+- [ ] I have thoroughly read and understand [The Odin Project Contributing Guide](https://github.com/TheOdinProject/theodinproject/blob/main/CONTRIBUTING.md)
+- [ ] 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`
-
-- [ ] I would like to be assigned this issue to work on it
+The following checkbox is OPTIONAL:
+
+- [ ] I would like to be assigned this issue to work on it
-**1. Description of the Bug**
+
+
+**1. Description of the Bug:**
-**2. How To Reproduce**
-
+**2. How To Reproduce:**
+
-**3. Expected Behavior**
-
+**3. Expected Behavior:**
+
**4. Desktop/Device:**
- - Device:
- - OS:
- - Browser:
- - Version:
+
+- Device:
+- OS:
+- Browser:
+- Version:
-**5. Additional Information**
+**5. Additional Information:**
From 649f0e3771a8173309aded9f9b573e37572b493b Mon Sep 17 00:00:00 2001
From: Eric Olkowski <70952936+thatblindgeye@users.noreply.github.com>
Date: Sun, 20 Feb 2022 13:25:26 -0500
Subject: [PATCH 06/11] Update PULL_REQUEST_TEMPLATE.md
---
.github/PULL_REQUEST_TEMPLATE.md | 37 +++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 8879cb7..5a8d2e0 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,19 +1,30 @@
-
+
-
-- [ ] I have thoroughly read and understand [The Odin Project Contributing Guide](https://github.com/TheOdinProject/theodinproject/blob/main/CONTRIBUTING.md)
-- [ ] The title of this PR follows the `where the change occurs: brief description of change` format, e.g. `Intro to HTML and CSS lesson: Fix link text`
+Complete the following REQUIRED checkboxes:
+
+- [ ] I have thoroughly read and understand [The Odin Project Contributing Guide](https://github.com/TheOdinProject/theodinproject/blob/main/CONTRIBUTING.md)
+- [ ] The title of this PR follows the `location of change: brief description of change` format, e.g. `01_helloWorld: Update test cases`
-
-- [ ] If one exists, I have linked a related open issue to this PR in Step 2 below
-- [ ] If changes were requested, I have made them and re-requested a review from the maintainer (top of the right sidebar)
+Complete the following checkboxes ONLY IF they are applicable to your PR. You can complete them later if they are not currently applicable:
+- [ ] I have ensured any exercise files included in this PR have passed all of their tests
-**1. Description of the Changes**
-
+
+**1. Because:**
+
+Otherwise, provide a clear and concise reason for your pull request, e.g. what problem it solves or what benefit it provides. If this PR is related to, but does not close, another issue or PR, you can also link it as above without the 'Closes' keyword, e.g. "Related to #2013".
+ -->
Closes #XXXXX
+
+
+**2. This PR:**
+
+
+
+**3. Additional Information:**
+
+
From 0747078d979d7752de6706ffb7227d1d161f0b34 Mon Sep 17 00:00:00 2001
From: Kevin Mulhern
Date: Sun, 27 Mar 2022 13:51:06 +0100
Subject: [PATCH 07/11] Updated Installing Node JS lesson URL
Because:
* We have updated our lesson urls
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index c90ecc6..0d607a9 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ If you have a suggestion to improve an exercise, an idea for a new exercise, or
1. Fork and clone this repository. To learn how to fork a repository, see the GitHub documentation on how to [fork a repo](https://docs.github.com/en/get-started/quickstart/fork-a-repo).
* Copies of repositories on your machine are called clones. If you need help cloning to your local environment you can learn how from the GitHub documentation on [cloning a repository](https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository-from-github/cloning-a-repository).
2. Before you start working on any execises, you should first ensure you have the following installed:
- * **NPM**. You should have installed NPM already in our [Installing Node.js](https://www.theodinproject.com/paths/foundations/courses/foundations/lessons/installing-node-js) lesson. Just in case you need to check, type `npm --version` in your terminal. If you get back `Command 'npm' not found, but can be installed with:`, **do not follow the instructions in the terminal** to install with `apt-get` as this causes permission issues. Instead, go back to the installation lesson and install Node with NVM by following the instructions there.
+ * **NPM**. You should have installed NPM already in our [Installing Node.js](https://www.theodinproject.com/lessons/foundations-installing-node-js) lesson. Just in case you need to check, type `npm --version` in your terminal. If you get back `Command 'npm' not found, but can be installed with:`, **do not follow the instructions in the terminal** to install with `apt-get` as this causes permission issues. Instead, go back to the installation lesson and install Node with NVM by following the instructions there.
* **Jest**. After cloning this repository to your local machine and installing NPM, go into the newly created directory (`cd javascript-exercises`) and run `npm install`. This will install Jest and set up the testing platform based on our preconfigured settings.
3. Each exercise includes 3 files: a markdown file with a description of the task, an empty (or mostly empty) JavaScript file, and a set of tests. To complete an exercise, you'll need to go to the exercise directory with `cd exerciseName` in the terminal and run `npm test exerciseName.spec.js`. This should run the test file and show you the output.
* When you first run a test, it will fail. This is by design! You must open the exercise file and write the code needed to get the test to pass.
From a05d4d60c8376df82edb50da462cdc36df9fa31a Mon Sep 17 00:00:00 2001
From: Rachel Moser <33227096+rlmoser99@users.noreply.github.com>
Date: Fri, 21 Oct 2022 21:43:16 -0500
Subject: [PATCH 08/11] PR Template: Flip order of checklist and details (#289)
* PR Template: Flip order of checklist and details
Because:
If the details are first, they are viewable in Discord's webhook.
This PR:
* Moves the detail sections to the beginning of the template
* Moves the checklist section to the end of the template
* Adds an issue section to link the issue
* Adds the Because, This PR, and Issue sections to checklist
* Reduce wording that is not essential
---
.github/PULL_REQUEST_TEMPLATE.md | 42 +++++++++++++++++---------------
1 file changed, 22 insertions(+), 20 deletions(-)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 5a8d2e0..d3ee065 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,30 +1,32 @@
-
+
-Complete the following REQUIRED checkboxes:
-
-- [ ] I have thoroughly read and understand [The Odin Project Contributing Guide](https://github.com/TheOdinProject/theodinproject/blob/main/CONTRIBUTING.md)
-- [ ] The title of this PR follows the `location of change: brief description of change` format, e.g. `01_helloWorld: Update test cases`
+## Because
+
-Complete the following checkboxes ONLY IF they are applicable to your PR. You can complete them later if they are not currently applicable:
-- [ ] I have ensured any exercise files included in this PR have passed all of their tests
-
+## This PR
+
-**1. Because:**
+
+## Issue
+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
+
+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'.
+-->
Closes #XXXXX
-
-**2. This PR:**
-
+## Additional Information
+
-**3. Additional Information:**
-
-
+## Pull Request Requirements
+
+- [ ] I have thoroughly read and understand [The Odin Project Contributing Guide](https://github.com/TheOdinProject/theodinproject/blob/main/CONTRIBUTING.md)
+- [ ] The title of this PR follows the `location of change: brief description of change` format, e.g. `01_helloWorld: Update test cases`
+- [ ] The `Because` section summarizes the reason for this PR
+- [ ] The `This PR` section has a bullet point list describing the changes in this PR
+- [ ] If this PR addresses an open issue, it is linked in the `Issue` section
+- [ ] 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).
From 374252c3026d7de9765962e29ebf688bdbc9ad49 Mon Sep 17 00:00:00 2001
From: Asartea <76259120+Asartea@users.noreply.github.com>
Date: Sat, 12 Nov 2022 20:49:28 +0100
Subject: [PATCH 09/11] Update tempConversion function's naming
---
07_tempConversion/tempConversion.js | 10 ++++-----
07_tempConversion/tempConversion.spec.js | 28 ++++++++++++------------
2 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/07_tempConversion/tempConversion.js b/07_tempConversion/tempConversion.js
index 6ef3e85..14153e0 100644
--- a/07_tempConversion/tempConversion.js
+++ b/07_tempConversion/tempConversion.js
@@ -1,13 +1,11 @@
-const ftoc = function() {
-
+const convertToCelsius = function() {
};
-const ctof = function() {
-
+const convertToFahrenheit = function() {
};
// Do not edit below this line
module.exports = {
- ftoc,
- ctof
+ convertToCelsius,
+ convertToFahrenheit
};
diff --git a/07_tempConversion/tempConversion.spec.js b/07_tempConversion/tempConversion.spec.js
index 93679cc..7d0cc93 100644
--- a/07_tempConversion/tempConversion.spec.js
+++ b/07_tempConversion/tempConversion.spec.js
@@ -1,25 +1,25 @@
-const {ftoc, ctof} = require('./tempConversion')
+const {convertToCelsius, convertToFahrenheit} = require('./tempConversion')
-describe('ftoc', () => {
+describe('convertToCelsius', () => {
test('works', () => {
- expect(ftoc(32)).toEqual(0);
+ expect(convertToCelsius(32)).toEqual(0);
});
- test.skip('rounds to 1 decimal', () => {
- expect(ftoc(100)).toEqual(37.8);
+ test('rounds to 1 decimal', () => {
+ expect(convertToCelsius(100)).toEqual(37.8);
});
- test.skip('works with negatives', () => {
- expect(ftoc(-100)).toEqual(-73.3);
+ test('works with negatives', () => {
+ expect(convertToCelsius(-100)).toEqual(-73.3);
});
});
-describe('ctof', () => {
- test.skip('works', () => {
- expect(ctof(0)).toEqual(32);
+describe('convertToFahrenheit', () => {
+ test('works', () => {
+ expect(convertToFahrenheit(0)).toEqual(32);
});
- test.skip('rounds to 1 decimal', () => {
- expect(ctof(73.2)).toEqual(163.8);
+ test('rounds to 1 decimal', () => {
+ expect(convertToFahrenheit(73.2)).toEqual(163.8);
});
- test.skip('works with negatives', () => {
- expect(ctof(-10)).toEqual(14);
+ test('works with negatives', () => {
+ expect(convertToFahrenheit(-10)).toEqual(14);
});
});
From 0b218347ff7f3a2934621b0fc8cd2d39c2ec1824 Mon Sep 17 00:00:00 2001
From: Asartea <76259120+Asartea@users.noreply.github.com>
Date: Sat, 12 Nov 2022 20:59:52 +0100
Subject: [PATCH 10/11] Missed README.md
---
07_tempConversion/README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/07_tempConversion/README.md b/07_tempConversion/README.md
index 081a650..77682f6 100644
--- a/07_tempConversion/README.md
+++ b/07_tempConversion/README.md
@@ -2,12 +2,12 @@
Write two functions that convert temperatures from Fahrenheit to Celsius, and vice versa:
```
-ftoc(32) // fahrenheit to celsius, should return 0
+convertToCelsius(32) // fahrenheit to celsius, should return 0
-ctof(0) // celsius to fahrenheit, should return 32
+convertToFahrenheit(0) // celsius to fahrenheit, should return 32
```
-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`.
+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`.
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.
From 9214f20afdc463905111e3d0d4a843b0d80d83c8 Mon Sep 17 00:00:00 2001
From: Asartea <76259120+Asartea@users.noreply.github.com>
Date: Sat, 12 Nov 2022 21:07:47 +0100
Subject: [PATCH 11/11] restore initial test state
---
07_tempConversion/tempConversion.spec.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/07_tempConversion/tempConversion.spec.js b/07_tempConversion/tempConversion.spec.js
index 7d0cc93..c4f9742 100644
--- a/07_tempConversion/tempConversion.spec.js
+++ b/07_tempConversion/tempConversion.spec.js
@@ -4,22 +4,22 @@ describe('convertToCelsius', () => {
test('works', () => {
expect(convertToCelsius(32)).toEqual(0);
});
- test('rounds to 1 decimal', () => {
+ test.skip('rounds to 1 decimal', () => {
expect(convertToCelsius(100)).toEqual(37.8);
});
- test('works with negatives', () => {
+ test.skip('works with negatives', () => {
expect(convertToCelsius(-100)).toEqual(-73.3);
});
});
describe('convertToFahrenheit', () => {
- test('works', () => {
+ test.skip('works', () => {
expect(convertToFahrenheit(0)).toEqual(32);
});
- test('rounds to 1 decimal', () => {
+ test.skip('rounds to 1 decimal', () => {
expect(convertToFahrenheit(73.2)).toEqual(163.8);
});
- test('works with negatives', () => {
+ test.skip('works with negatives', () => {
expect(convertToFahrenheit(-10)).toEqual(14);
});
});