From d064810ae05e6e462d06a4cd606624337429d5d6 Mon Sep 17 00:00:00 2001 From: cody knight Date: Mon, 2 Dec 2024 15:52:13 -0600 Subject: [PATCH 1/3] initiate-gitignore --- .gitignore | 1 + README.md | 126 ++++++++++++++++++++++++++--------------------------- 2 files changed, 64 insertions(+), 63 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e6905a2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.env* \ No newline at end of file diff --git a/README.md b/README.md index 038f43f..95038cb 100644 --- a/README.md +++ b/README.md @@ -1,63 +1,63 @@ -# Git 102 Assignment - -## 📣 Getting Started - -1. Clone the repository: `https://github.com/devslopes/devslopes-git-pr-assignment` -2. Create a remote repository for this project on Github -3. Push this repository from the command line to Github. - **NOTE:**: When adding this repository to Github, you will need to replace the word `origin` with `destination` (or any other word you wish to use). This is because the remote repository you cloned is already using the name, `origin` - - -## 🛠 Requirements - -1. Your commits and Pull Request **MUST EXCLUDE** OS generated files/folders and files with sensitive data. (i.e: OS-specific and editor specific settings, debug logs, build tools, etc). -2. Your commit message should have a subject line and body. It should follow the 7 commit message convention guidelines - -## 📝 Instructions -1. Create a new branch off your local `main` branch called, `feature/bug-tracking` -2. Create a `.gitignore` file -3. Create a `.env.local` file and copy/paste the following into it: - -``` -**DUMMY DATA** - -CONVERTKIT_API_URL=https://api.convertkit.com/v3/ -CONVERTKIT_API_KEY=D4SkateFzVBORyLK98DIE4321 -CONVERTKIT_API_SECRET_KEY=123lY2sshhh-456NoXOne7fvH6i2-knowesJ0 - -FORM_ID=1234567 - -CONTENTFUL_SPACE_ID=d3-space-crocodiles -CONTENTFUL_ACCESS_TOKEN=givejkW9NU_xGGTZxME-xUXTHE-XMgg711codesj4pN -``` - -4. Update the `.gitignore` file to ignore OS generated files/folders and files with sensitive data -5. As you make changes to this project, be mindful of the requirements **(Requirements state the Pulll Request MUST EXCLUDE files with sensitive data)**. -6. It's a good practice to check the changes in your project before adding them to the staging area. You want to make sure you are only tracking the files you intend to. -7. Add and commit your changes locally -8. Create a new file, `.env.production.local` -9. Copy/paste the following sensitive data into, `.env.production.local`: - `SENTRY_DSN=https://1eb0a2142.ingest.sentry.io/711007` -10. Create a new file, `app.js` -11. Add the following to `app.js`: - -``` -var loveToCode = true; -var BUG_TRACKING_DNS = process.env.production.local; -``` - -12. Add and commit your changes locally -13. Add the following to `styles.css`: - -``` -h2 { color: blue; } -``` - -14. Add and commit your changes locally -15. Push this branch to your remote repository. (This will create a new remote branch). Remember, when you push your code, don't use "origin". Use `destination` (or the whatever word you chose to use when you set up the remote repo) -16. Create a Pull Request for this branch to be merged into `main` -17. To submit your assignment, put the URL of your GitHub repository in a `.txt` file, zip the file and then upload it through your student portal so we can verify the commit history is correct. DO NOT MERGE YOUR PR UNTIL IT HAS BEEN APPROVED. A Devslopes mentor will review your PR (Pull Request), comment as necessary and reject or approve your PR - - -## Notes: -1. If you realize your PR includes files that are not supposed to be tracked, you can delete your local and remote repository and start over. +# Git 102 Assignment + +## 📣 Getting Started + +1. Clone the repository: `https://github.com/devslopes/devslopes-git-pr-assignment` +2. Create a remote repository for this project on Github +3. Push this repository from the command line to Github. + **NOTE:**: When adding this repository to Github, you will need to replace the word `origin` with `destination` (or any other word you wish to use). This is because the remote repository you cloned is already using the name, `origin` + + +## 🛠 Requirements + +1. Your commits and Pull Request **MUST EXCLUDE** OS generated files/folders and files with sensitive data. (i.e: OS-specific and editor specific settings, debug logs, build tools, etc). +2. Your commit message should have a subject line and body. It should follow the 7 commit message convention guidelines + +## 📝 Instructions +1. Create a new branch off your local `main` branch called, `feature/bug-tracking` +2. Create a `.gitignore` file +3. Create a `.env.local` file and copy/paste the following into it: + +``` +**DUMMY DATA** + +CONVERTKIT_API_URL=https://api.convertkit.com/v3/ +CONVERTKIT_API_KEY=D4SkateFzVBORyLK98DIE4321 +CONVERTKIT_API_SECRET_KEY=123lY2sshhh-456NoXOne7fvH6i2-knowesJ0 + +FORM_ID=1234567 + +CONTENTFUL_SPACE_ID=d3-space-crocodiles +CONTENTFUL_ACCESS_TOKEN=givejkW9NU_xGGTZxME-xUXTHE-XMgg711codesj4pN +``` + +4. Update the `.gitignore` file to ignore OS generated files/folders and files with sensitive data +5. As you make changes to this project, be mindful of the requirements **(Requirements state the Pulll Request MUST EXCLUDE files with sensitive data)**. +6. It's a good practice to check the changes in your project before adding them to the staging area. You want to make sure you are only tracking the files you intend to. +7. Add and commit your changes locally +8. Create a new file, `.env.production.local` +9. Copy/paste the following sensitive data into, `.env.production.local`: + `SENTRY_DSN=https://1eb0a2142.ingest.sentry.io/711007` +10. Create a new file, `app.js` +11. Add the following to `app.js`: + +``` +var loveToCode = true; +var BUG_TRACKING_DNS = process.env.production.local; +``` + +12. Add and commit your changes locally +13. Add the following to `styles.css`: + +``` +h2 { color: blue; } +``` + +14. Add and commit your changes locally +15. Push this branch to your remote repository. (This will create a new remote branch). Remember, when you push your code, don't use "origin". Use `destination` (or the whatever word you chose to use when you set up the remote repo) +16. Create a Pull Request for this branch to be merged into `main` +17. To submit your assignment, put the URL of your GitHub repository in a `.txt` file, zip the file and then upload it through your student portal so we can verify the commit history is correct. DO NOT MERGE YOUR PR UNTIL IT HAS BEEN APPROVED. A Devslopes mentor will review your PR (Pull Request), comment as necessary and reject or approve your PR + + +## Notes: +1. If you realize your PR includes files that are not supposed to be tracked, you can delete your local and remote repository and start over. From 4006afdae43616ae7ac4a5fb7b8651bff712a13e Mon Sep 17 00:00:00 2001 From: cody knight Date: Mon, 2 Dec 2024 15:56:10 -0600 Subject: [PATCH 2/3] add-app.js --- app.js | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 app.js diff --git a/app.js b/app.js new file mode 100644 index 0000000..27a406e --- /dev/null +++ b/app.js @@ -0,0 +1,2 @@ +var loveToCode = true; +var BUG_TRACKING_DNS = process.env.production.local; \ No newline at end of file From d434c95f4c2002c4439054bb9e32842809586c29 Mon Sep 17 00:00:00 2001 From: cody knight Date: Mon, 2 Dec 2024 15:56:57 -0600 Subject: [PATCH 3/3] changes-to-css --- styles.css | 1 + 1 file changed, 1 insertion(+) diff --git a/styles.css b/styles.css index e69de29..a02764d 100644 --- a/styles.css +++ b/styles.css @@ -0,0 +1 @@ +h2 { color: blue; } \ No newline at end of file