From 32198b47f240f86676fc8e8f9203b49d8f0d340a Mon Sep 17 00:00:00 2001 From: Rahul Karda Date: Tue, 14 Jun 2022 12:31:57 +0530 Subject: [PATCH 01/19] Add Pull Requests badge --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index c6da429..e2238ba 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ [![Contributors][contributors-shield]][contributors-url] [![Forks][forks-shield]][forks-url] [![Stargazers][stars-shield]][stars-url] +[![Pull Requests][pullrequests-shield]][pullrequests-url] [![Issues][issues-shield]][issues-url] [![MIT License][license-shield]][license-url] @@ -148,6 +149,8 @@ Distributed under the MIT License. See {

name: '<%= resources[i].name %>',
url: target="_blank">'<%= resources[i].url %>',
keywords: [<%= resources[i].keywords.map(keyword => `'${keyword}'`).join(", ") %>]
}, + 
{

name: '<%= resources[i].name %>',
url:  target="_blank">'<%= resources[i].url %>',
keywords: [<%= resources[i].keywords.map(keyword => `'${keyword}'`).join(", ") %>]

},
<% } %> From 7f9822b360acbce937ac80c410f5dce4ed420679 Mon Sep 17 00:00:00 2001 From: Jacob Asper Date: Tue, 14 Jun 2022 14:39:36 -0400 Subject: [PATCH 05/19] formatted elements in indent div --- public/css/style.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/public/css/style.css b/public/css/style.css index c2f652f..48143de 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -274,6 +274,13 @@ main { padding-left: 2rem; margin-top: -2rem; line-height: 2; + font-size: 1em; +} + +.indent * { + line-height: 2; + font-size: 1em; + margin: 0; } /* documentation */ From 437bdc512905f6e44bef86e855ae31a3226d8cb9 Mon Sep 17 00:00:00 2001 From: Jacob Asper Date: Tue, 14 Jun 2022 14:55:21 -0400 Subject: [PATCH 06/19] styled everything in indent and bolded a tag --- public/css/style.css | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 48143de..cffb84b 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -272,15 +272,19 @@ main { .indent { padding-left: 2rem; - margin-top: -2rem; - line-height: 2; - font-size: 1em; + margin-top: -.8rem; } + .indent * { - line-height: 2; + line-height: 1; font-size: 1em; margin: 0; + text-align: left; + font-weight: 400; +} +.indent a { + font-weight: 700; } /* documentation */ From fcdf7ee500ab6aa23abcea15d1358e09f8db32d2 Mon Sep 17 00:00:00 2001 From: Jacob Asper Date: Tue, 14 Jun 2022 14:56:01 -0400 Subject: [PATCH 07/19] added semantic html to code blocks --- views/index.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/index.ejs b/views/index.ejs index 63570e9..5a2d51a 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -60,7 +60,7 @@
  • - 
    {

    name: '<%= resources[i].name %>',
    url:  target="_blank">'<%= resources[i].url %>',
    keywords: [<%= resources[i].keywords.map(keyword => `'${keyword}'`).join(", ") %>]

    },
    + 
    {

    name: '<%= resources[i].name %>',

    url:  target="_blank">'<%= resources[i].url %>',

    keywords: [<%= resources[i].keywords.map(keyword => `'${keyword}'`).join(", ") %>]

    },
    • <% } %> From 37142256b44b144af56c1331bfdb28d894fb9b4a Mon Sep 17 00:00:00 2001 From: brianschnee Date: Tue, 14 Jun 2022 15:00:28 -0400 Subject: [PATCH 08/19] makes keywords inside the keyword array lowercase, for our matches search --- public/js/main.js | 2 +- server.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/public/js/main.js b/public/js/main.js index a7d3a3d..a6b3949 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -13,7 +13,7 @@ async function getMatches() { const res = await fetch('/api'); const data = await res.json(); // Filters array from the API for resources with keywords containing user value - const matches = data.filter(resource => resource.keywords.some(str => str.includes(keyword))); + const matches = data.filter(resource => resource.keywords.some(str => str.toLowerCase().includes(keyword))); renderMatches(matches); } catch (err) { console.error(err); diff --git a/server.js b/server.js index 4f85cc3..1aa9712 100644 --- a/server.js +++ b/server.js @@ -2,8 +2,6 @@ const express = require('express'); const app = express(); const cors = require('cors'); const { resources } = require("./resources"); -const { response } = require('express'); -const e = require('express'); const PORT = process.env.PORT || 8000; app.set('view engine', 'ejs') @@ -31,7 +29,7 @@ app.get('/api/:keyword', (req, res) => { const keyword = req.params.keyword.toLowerCase(); // filter resources array, return items that match query; tag. - const matches = resources.filter((obj) => obj.keywords.some(str => str.includes(keyword))); + const matches = resources.filter((obj) => obj.keywords.some(str => str.toLowerCase().includes(keyword))); // if matches were found, respond with matches array in JSON format if (matches.length) { From c585cbb89a785d166307f30a6f74587775309e8a Mon Sep 17 00:00:00 2001 From: Jacob Asper Date: Tue, 14 Jun 2022 15:02:09 -0400 Subject: [PATCH 09/19] moved quotes and comma outside of a tag --- views/index.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/index.ejs b/views/index.ejs index 5a2d51a..6f83d08 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -60,7 +60,7 @@
  • - 
    {

    name: '<%= resources[i].name %>',

    url:  target="_blank">'<%= resources[i].url %>',

    keywords: [<%= resources[i].keywords.map(keyword => `'${keyword}'`).join(", ") %>]

    },
    + 
    {

    name: '<%= resources[i].name %>',

    url: ' target="_blank"><%= resources[i].url %>',

    keywords: [<%= resources[i].keywords.map(keyword => `'${keyword}'`).join(", ") %>]

    },
    • <% } %> From ddc900247ccba55ed46d6334b671fd4b497606b3 Mon Sep 17 00:00:00 2001 From: brianschnee Date: Tue, 14 Jun 2022 15:56:02 -0400 Subject: [PATCH 10/19] altered formatting of 
     and  elements in
 index.ejs and main.js

---
 public/css/style.css | 17 +++++++++++------
 public/js/main.js    | 12 +++++++++++-
 views/index.ejs      | 12 +++++++++++-
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/public/css/style.css b/public/css/style.css
index cffb84b..f9d35e9 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -265,24 +265,29 @@ main {
 	text-overflow: ellipsis;
 }
 
-.json {
-	display: block;
-	white-space: pre-wrap;
+.json,
+code {
+	white-space: pre-line;
+}
+
+.indent h4,
+.indent h5,
+.indent h6 {
+	padding: 0;
 }
 
 .indent {
 	padding-left: 2rem;
-	margin-top: -.8rem;
 }
 
-
 .indent * {
-	line-height: 1;
+	line-height: 1.5; /* If this value is changed, make sure it is atleast 1 to avoid clipping when text wraps */
 	font-size: 1em;
 	margin: 0;
 	text-align: left;
 	font-weight: 400;
 }
+
 .indent a {
 	font-weight: 700;
 }
diff --git a/public/js/main.js b/public/js/main.js
index 56d876f..d915c2d 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -63,7 +63,17 @@ function renderMatches(matches) {
 
 			// Create an element that looks like a JSON object for every match
 			li.innerHTML = `
-				
    {

    name: '${match.name}',
    url: '${match.url}',
    keywords: [${match.keywords.map(keyword => `'${keyword}'`).join(", ")}]
    },
    
+				
    +					
+						{
+							
    
+								
    name: ${match.name},
    
+								
    url: '${match.url}',
    
+								
    keywords: [${match.keywords.map(keyword => `'${keyword}'`).join(", ")}]
    
+							
    
+						},
+					    
+				
    
 			`;
 
 			list.appendChild(li);
diff --git a/views/index.ejs b/views/index.ejs
index 6f83d08..49d1311 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -60,7 +60,17 @@
 									
  • 
 										
 										
-										
    {

    name: '<%= resources[i].name %>',

    url: ' target="_blank"><%= resources[i].url %>',

    keywords: [<%= resources[i].keywords.map(keyword => `'${keyword}'`).join(", ") %>]

    },
    
+										
    +											
+												{
+													
    
+														
    name: '<%= resources[i].name %>',
    
+														
    url: ' target="_blank"><%= resources[i].url %>',
    
+														
    keywords: [<%= resources[i].keywords.map(keyword => `'${keyword}'`).join(", ") %>]
    
+													
    
+												},
+											    
+										
    
 									
    • 
 								<% } %>
 							

From 67638eb5ba8afe8e893c12298b6c3b3cc9f8c587 Mon Sep 17 00:00:00 2001
From: brianschnee 
Date: Tue, 14 Jun 2022 16:13:35 -0400
Subject: [PATCH 11/19] change how the case is handled when the resources.js
 file is not able to import data into server.js

---
 server.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/server.js b/server.js
index f13c0b2..a8e45ec 100644
--- a/server.js
+++ b/server.js
@@ -10,14 +10,13 @@ app.use(express.static(__dirname + '/public'));
 app.use('/public', express.static(__dirname + '/public'));
 
 app.get('/', (req, res) => {
-	try {
-		if (resources) {
-			res.render('index.ejs', { resources });
-		} else {
-			throw new Error('Resources not found.')
-		}
-	} catch (err) {
-		console.error(err);
+	if (resources) {
+		res.render('index.ejs', { resources });
+	} else {
+		// respond with status 500 if the resources array could not be loaded from resources.js
+		res.status(500).json({
+			error: 'Resources were not able to be loaded from "resources.js."'
+		});
 	}
 });
 

From d0f50575a8d0cc31bdce65efa03fb04b1dc35272 Mon Sep 17 00:00:00 2001
From: Brian Schnee <77141303+brianschnee@users.noreply.github.com>
Date: Tue, 14 Jun 2022 18:51:24 -0400
Subject: [PATCH 12/19] Updated CONTRIBUTING.md guidelines

---
 CONTRIBUTING.md | 87 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 78 insertions(+), 9 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 053c536..0adb945 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,15 +1,84 @@
 
 
-## Contributing
+# Contributing
 
-Contributions are what make the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**.
+Contributions are what make the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**. 
 
-If you have a suggestion to better our API, please fork the repo and create a pull request. Additionally, you can open an issue and offer advice.
-Don't forget to give the project a star! Thanks again!
+Please make sure to follow our guidelines below before making any contributions.
 
-1. Visit our Issues page to check if an issue exists and does not have an assignee.
+
+
+## Understanding Coding-Resources-API branch structure
+### Permanent Branches
+#### Main
+- This branch is reserved for tested versions of our code-base. Do not make a PR directly into this branch, as we require testing before we can confirm any feature.
+
+
+
+#### Test
+- This branch is used to test a collection of newly added features, which will eventually become a future iteration of our application after thoroughly testing for bugs and code/guideline consistency. If you are interesting in creating your own feature, we suggest that you first open an issue here: https://github.com/the-api-administration/coding-resources-api/issues and wait for our team to respond to your message and approve the implementation. If you are interested in taking responsibility for the implementation, please assign yourself to the issue once you submit it, so that our team can note your interest.
+
+
+
+#### Resources
+- This branch is reserved for adding new resources to our resources.js file. When adding a resource, follow these styling guidelines or we will be unable to address your contribution. 
+
+  Resource Addition Guidelines:
+
+  - The resource must strictly pertain to coding. Please do not include resources that represent non-coding-related content.
+  - The resources provided must strictly pertain to specific coding related topics, technologies, and content. We will not accept resources that are too broad and/or do not provide a specific focus.
+
+  Resource Styling:
+
+  - Object values must contain single quotes only.
+  - Keywords array should contain strings only.
+  - Keywords are preferred in lower case.
+  - Keywords must be specific. Do not include broad keywords such as 'guide', 'tutorial', 'information' or we will be unable to process your PR. Please opt for keywords that are specific to the content.
+
+  Resource Format:
+
+  ```
+  {
+    name: 'resource name',
+    url: 'url here',
+    keywords: ['each', 'keyword', 'should', 'be', 'a', 'string']
+  },
+  ```
+  
+  
+  
+### How often should I stage changes?
+
+We require that you stage your changes for each section of code you develop. Do not stage changes with a single large commit, or we will instantly close your pull request. We would like you to make commits for every task you complete in your code and avoid working through multiple files when possible. Your commit message should include a detailed view of the work you are implementing and an issue you are solving if you have assigned yourself to an issue.
+
+
+
+### Where should I make my pull request to?
+
+Never make a pull request into our main branch. If you plan on adding a feature, wait until you have completely finished that feature and then make a pull request into "test" with a clear description of the issue you are solving. If you are planning on adding a resource, please make a pull request to that branch.
+
+
+
+### Creating an Issue
+
+We'd love to hear your advice, feature suggestions and/or read about any bugs you've encountered. Please create an issue here: https://github.com/the-api-administration/coding-resources-api/issues. If you wish to implement a feature on your own, please add yourself as an assignee to the issue you create, so that we can note your interest. When creating an issue, please attempt to outline in detail; the topic of the issue, and a thorough description of what the issue attempts to solve. 
+
+If you have encountered a bug, please provide as much information as you can to help us replicate the issue on our own end. Depending on the issue, it may be useful to communicate your browser, screen width and/or anything that relates to your specific encounter.
+
+
+
+### How to make a PR
+
+If you want to help us improve our API, please fork the repo and follow these steps before creating a pull request.
+
+1. Visit [our Issues](https://github.com/the-api-administration/coding-resources-api/issues) page to check if an issue exists and does not yet have an assignee. Assign yourself to the issue if you find what you are planning to solve.
 2. Fork the Project
-3. Change to your Feature Branch (`git checkout -b feature/AmazingFeature`)
-4. Commit your Changes (`git commit -m 'Add some AmazingFeature'`)
-5. Push to the Branch (`git push origin feature/AmazingFeature`)
-6. Open a Pull Request
+3. Clone your fork on your local device. The link can be found under the code drop-down at the base of your fork (`git clone `)
+4. If you are adding a resource, please skip to step 6.
+5. Create a new branch for your Feature (`git branch AmazingFeature`)
+6. Switch to the branch you are working on (`git checkout AmazingFeature`)
+7. Make your changes, commit after every isolated task.
+8. Add all of your changes (`git add .`)
+9. Commit your changes with a detailed description (`git commit -m 'added a, solved b, etc...'`)
+10. Push to the Branch (`git push origin AmazingFeature`)
+11. Open a Pull Request and follow the rules under "Where should I make my pull request to?"

From 203c78363e8280a8ba315ad6a08d9e169cfd0403 Mon Sep 17 00:00:00 2001
From: Brian Schnee <77141303+brianschnee@users.noreply.github.com>
Date: Tue, 14 Jun 2022 18:52:59 -0400
Subject: [PATCH 13/19] Update README.md

---
 README.md | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/README.md b/README.md
index e2238ba..665778b 100644
--- a/README.md
+++ b/README.md
@@ -104,15 +104,7 @@ See the [open issues](https://github.com/the-api-administration/coding-resources
 
 Contributions are what make the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**.
 
-If you have a suggestion to better our API, please fork the repo and create a pull request. Additionally, you can open an issue and offer advice.
-Don't forget to give the project a star! Thanks again!
-
-1. Visit our Issues page to check if an issue exists and does not have an assignee.
-2. Fork the Project
-3. Change to your Feature Branch (`git checkout -b feature/AmazingFeature`)
-4. Commit your Changes (`git commit -m 'Add some AmazingFeature'`)
-5. Push to the Branch (`git push origin feature/AmazingFeature`)
-6. Open a Pull Request
+Please visit: https://github.com/the-api-administration/coding-resources-api/blob/main/CONTRIBUTING.md before making a contribution to our project. Thank you!
 
 
    (back to top)
    
 

From 40d5eccc6544cd9a8a794e026201613bd5b8ea89 Mon Sep 17 00:00:00 2001
From: Brian Schnee <77141303+brianschnee@users.noreply.github.com>
Date: Tue, 14 Jun 2022 18:56:54 -0400
Subject: [PATCH 14/19] Updated README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 665778b..7cadc5a 100644
--- a/README.md
+++ b/README.md
@@ -104,7 +104,7 @@ See the [open issues](https://github.com/the-api-administration/coding-resources
 
 Contributions are what make the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**.
 
-Please visit: https://github.com/the-api-administration/coding-resources-api/blob/main/CONTRIBUTING.md before making a contribution to our project. Thank you!
+Please visit `CONTRIBUTING.md` to read about our guidelines before making a contribution to our project. Thank you!
 
 
    (back to top)
    
 

From 16c6e08c9c97be2e5167ce9d0e0bc33a9261709d Mon Sep 17 00:00:00 2001
From: Alexis Aguilar <98043211+alexisintech@users.noreply.github.com>
Date: Tue, 14 Jun 2022 19:04:12 -0400
Subject: [PATCH 15/19] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0adb945..1cbf0dc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,18 +9,18 @@ Contributions are what make the open source community such an amazing place to l
 
 
 ## Understanding Coding-Resources-API branch structure
-### Permanent Branches
-#### Main
+## Permanent Branches
+## Main
 - This branch is reserved for tested versions of our code-base. Do not make a PR directly into this branch, as we require testing before we can confirm any feature.
 
 
 
-#### Test
-- This branch is used to test a collection of newly added features, which will eventually become a future iteration of our application after thoroughly testing for bugs and code/guideline consistency. If you are interesting in creating your own feature, we suggest that you first open an issue here: https://github.com/the-api-administration/coding-resources-api/issues and wait for our team to respond to your message and approve the implementation. If you are interested in taking responsibility for the implementation, please assign yourself to the issue once you submit it, so that our team can note your interest.
+## Test
+- This branch is used to test a collection of newly added features, which will eventually become a future iteration of our application after thoroughly testing for bugs and code/guideline consistency. If you are interested in creating your own feature, we suggest that you first open an issue here: https://github.com/the-api-administration/coding-resources-api/issues and wait for our team to respond to your message and approve the implementation. If you are interested in taking responsibility for the implementation, please assign yourself to the issue once you submit it, so that our team can note your interest.
 
 
 
-#### Resources
+## Resources
 - This branch is reserved for adding new resources to our resources.js file. When adding a resource, follow these styling guidelines or we will be unable to address your contribution. 
 
   Resource Addition Guidelines:
@@ -47,27 +47,27 @@ Contributions are what make the open source community such an amazing place to l
   
   
   
-### How often should I stage changes?
+## How often should I stage changes?
 
 We require that you stage your changes for each section of code you develop. Do not stage changes with a single large commit, or we will instantly close your pull request. We would like you to make commits for every task you complete in your code and avoid working through multiple files when possible. Your commit message should include a detailed view of the work you are implementing and an issue you are solving if you have assigned yourself to an issue.
 
 
 
-### Where should I make my pull request to?
+## Where should I make my pull request to?
 
-Never make a pull request into our main branch. If you plan on adding a feature, wait until you have completely finished that feature and then make a pull request into "test" with a clear description of the issue you are solving. If you are planning on adding a resource, please make a pull request to that branch.
+Never make a pull request into our main branch. If you plan on adding a feature, wait until you have completely finished that feature and then make a pull request into "test" with a clear description of the issue you are solving. If you are planning on adding a resource, please make a pull request to the resources branch.
 
 
 
-### Creating an Issue
+## Creating an Issue
 
-We'd love to hear your advice, feature suggestions and/or read about any bugs you've encountered. Please create an issue here: https://github.com/the-api-administration/coding-resources-api/issues. If you wish to implement a feature on your own, please add yourself as an assignee to the issue you create, so that we can note your interest. When creating an issue, please attempt to outline in detail; the topic of the issue, and a thorough description of what the issue attempts to solve. 
+We'd love to hear your advice, feature suggestions and/or read about any bugs you've encountered. Please create an issue here: https://github.com/the-api-administration/coding-resources-api/issues. If you wish to implement a feature on your own, please add yourself as an assignee to the issue you create, so that we can note your interest. When creating an issue, please attempt to outline in detail the topic of the issue, and a thorough description of what the issue attempts to solve. 
 
-If you have encountered a bug, please provide as much information as you can to help us replicate the issue on our own end. Depending on the issue, it may be useful to communicate your browser, screen width and/or anything that relates to your specific encounter.
+If you have encountered a bug, please provide as much information as you can to help us replicate the issue on our own end. Depending on the issue, it may be useful to communicate your browser, screen width, and/or anything that relates to your specific encounter.
 
 
 
-### How to make a PR
+## How to make a PR
 
 If you want to help us improve our API, please fork the repo and follow these steps before creating a pull request.
 

From 0a3fc6f1945c8574f6c1ca1fe4f99a38f6d9e833 Mon Sep 17 00:00:00 2001
From: Alexis Aguilar <98043211+alexisintech@users.noreply.github.com>
Date: Tue, 14 Jun 2022 19:04:35 -0400
Subject: [PATCH 16/19] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1cbf0dc..11206f9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,7 +10,7 @@ Contributions are what make the open source community such an amazing place to l
 
 ## Understanding Coding-Resources-API branch structure
 ## Permanent Branches
-## Main
+### Main
 - This branch is reserved for tested versions of our code-base. Do not make a PR directly into this branch, as we require testing before we can confirm any feature.
 
 

From 27c9a852dbde9dffe30c1d89223f8898f92928e8 Mon Sep 17 00:00:00 2001
From: Alexis Aguilar <98043211+alexisintech@users.noreply.github.com>
Date: Tue, 14 Jun 2022 19:05:12 -0400
Subject: [PATCH 17/19] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 11206f9..1cbf0dc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,7 +10,7 @@ Contributions are what make the open source community such an amazing place to l
 
 ## Understanding Coding-Resources-API branch structure
 ## Permanent Branches
-### Main
+## Main
 - This branch is reserved for tested versions of our code-base. Do not make a PR directly into this branch, as we require testing before we can confirm any feature.
 
 

From bb0ee65eda9d67a71bc3db963a2f0ea869de488a Mon Sep 17 00:00:00 2001
From: Brian Schnee <77141303+brianschnee@users.noreply.github.com>
Date: Tue, 14 Jun 2022 19:06:42 -0400
Subject: [PATCH 18/19] Updated CONTRIBUTING.md

---
 CONTRIBUTING.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1cbf0dc..b453829 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,18 +9,18 @@ Contributions are what make the open source community such an amazing place to l
 
 
 ## Understanding Coding-Resources-API branch structure
-## Permanent Branches
-## Main
+### Permanent Branches
+#### Main
 - This branch is reserved for tested versions of our code-base. Do not make a PR directly into this branch, as we require testing before we can confirm any feature.
 
 
 
-## Test
+#### Test
 - This branch is used to test a collection of newly added features, which will eventually become a future iteration of our application after thoroughly testing for bugs and code/guideline consistency. If you are interested in creating your own feature, we suggest that you first open an issue here: https://github.com/the-api-administration/coding-resources-api/issues and wait for our team to respond to your message and approve the implementation. If you are interested in taking responsibility for the implementation, please assign yourself to the issue once you submit it, so that our team can note your interest.
 
 
 
-## Resources
+#### Resources
 - This branch is reserved for adding new resources to our resources.js file. When adding a resource, follow these styling guidelines or we will be unable to address your contribution. 
 
   Resource Addition Guidelines:

From b872eb5ebf58b804a3914c2d596504e66ab372d1 Mon Sep 17 00:00:00 2001
From: Brian Schnee <77141303+brianschnee@users.noreply.github.com>
Date: Tue, 14 Jun 2022 19:56:23 -0400
Subject: [PATCH 19/19] Update server.js

Fixed json response for 500 status code
---
 server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server.js b/server.js
index 54e93ef..f36fcae 100644
--- a/server.js
+++ b/server.js
@@ -15,7 +15,7 @@ app.get('/', (req, res) => {
 	} else {
 		// respond with status 500 if the resources array could not be loaded from resources.js
 		res.status(500).json({
-			error: 'Resources were not able to be loaded from "resources.js."'
+			error: 'Resources were not able to be loaded from resources.js.'
 		});
 	}
 });