From de5251eccd310a0e39f6045893efd0101560e113 Mon Sep 17 00:00:00 2001 From: Soumava Das Date: Wed, 27 Mar 2024 00:11:22 +0000 Subject: [PATCH 01/15] fix: made by the community banner on mobile not full width (WEB-37) #76 --- src/app/components/bannerSection/bannerSection.module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/bannerSection/bannerSection.module.css b/src/app/components/bannerSection/bannerSection.module.css index 694f670..fbe6c4d 100644 --- a/src/app/components/bannerSection/bannerSection.module.css +++ b/src/app/components/bannerSection/bannerSection.module.css @@ -1,6 +1,6 @@ .bannerSection { background-color: #0f1038; - width: 100%; + width: 102%; display: flex; align-items: center; justify-content: center; From 1fe1d7a4f97bdd34861151efa75e22bef25b73ca Mon Sep 17 00:00:00 2001 From: Soumava Das Date: Thu, 28 Mar 2024 13:55:12 +0000 Subject: [PATCH 02/15] fix: made by the community banner on mobile not full width (WEB-37) #76 --- src/app/components/heroSection/heroSection.module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/heroSection/heroSection.module.css b/src/app/components/heroSection/heroSection.module.css index 9f2df2e..5f8855c 100644 --- a/src/app/components/heroSection/heroSection.module.css +++ b/src/app/components/heroSection/heroSection.module.css @@ -66,7 +66,7 @@ .heroSection { flex-direction: row; padding: 0 1rem 0 0; - margin: 4rem -10px 15px 15px; + margin: 4rem 15px 15px; background-image: url('/assets/dsdMobileHeroBg.png'); background-size: 65%; } From 684c9a22c72b95400324a837da06115a328f85c6 Mon Sep 17 00:00:00 2001 From: Climax Mba Date: Mon, 25 Mar 2024 06:54:54 +0100 Subject: [PATCH 03/15] chore: add details on how someone can update their fork (WEB-31) --- CONTRIBUTING.md | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 50e3bd6..4ebe062 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -73,3 +73,39 @@ After a pull request is approved, the branch should be deleted once merged. 6. Verify tests have passed CONGRATULATIONS! You have successfully contributed to the Dallas Software Developers website! Now just wait and see if your pull request is approved. + +## When your Pull Request is merged + +That's Great, your work is well appreciated! If you would like to keep contributing, you should update your fork and update your local repository. + +## When your branch goes out of date + +This often happens and is mostly encountered after a pull request opened by another individual is merged to the `main` branch and you may sometimes run into merge conflicts. Here are steps to follow if this happens: + +> You may choose to merge them the `main` branch on GitHub to your working branch which may be faster, but these steps are encouraged for a more linear-looking git history + +### Update your Fork + +1. Syncronize your Fork by going to your forked repository and ensure that you are on the `main` branch. You will see a message like "This branch is 1 commit ahead of, 9 commits behind dallassoftwaredevelopers/DSDsite:main." +2. Click **Sync fork** and click **Update branch** on the prompt that appears. + +### Update your local repository + +1. Open a terminal in the directory of your local repository and run `git checkout main` to ensure you are on the `main` branch. +2. Run this command to update your local repository, you can read more about `git pull` at [https://git-scm.com/docs/git-pull](https://git-scm.com/docs/git-pull). + +```bash +git pull --rebase +``` + +3. Now checkout your working branch with `git checkout [branch_name]` and run: + +```bash +git rebase main +``` + +4. You may run into a merge conflict. If you do, [here's how to resolve them](), you have to do that before preceeding. + +### Force-push your changes + +Run `git push --force` to update your remote branch and eventually, your pull request. From 68e987fd07e97d754e0279e4660d0c3e1bd927b0 Mon Sep 17 00:00:00 2001 From: Climax Mba <106796090+climaxmba@users.noreply.github.com> Date: Fri, 29 Mar 2024 17:33:32 +0100 Subject: [PATCH 04/15] chore: add images & links (WEB-31) --- CONTRIBUTING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4ebe062..d3d3ba6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -88,6 +88,7 @@ This often happens and is mostly encountered after a pull request opened by anot 1. Syncronize your Fork by going to your forked repository and ensure that you are on the `main` branch. You will see a message like "This branch is 1 commit ahead of, 9 commits behind dallassoftwaredevelopers/DSDsite:main." 2. Click **Sync fork** and click **Update branch** on the prompt that appears. +> ![image](https://github.com/climaxmba/DSDsite/assets/106796090/d72ef411-c707-4d70-8c45-48e607450c04) ### Update your local repository @@ -104,7 +105,7 @@ git pull --rebase git rebase main ``` -4. You may run into a merge conflict. If you do, [here's how to resolve them](), you have to do that before preceeding. +4. You may run into a merge conflict. If you do, [here's how to resolve them](https://www.freecodecamp.org/news/resolve-merge-conflicts-in-git-a-practical-guide/), you have to do that before preceeding. ### Force-push your changes From e7154c6dfb954428c0502bdecd969fb7b2ee2806 Mon Sep 17 00:00:00 2001 From: Climax Mba <106796090+climaxmba@users.noreply.github.com> Date: Fri, 29 Mar 2024 16:36:25 +0000 Subject: [PATCH 05/15] chore: format markdown for readability (WEB-31) --- CONTRIBUTING.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d3d3ba6..074fd38 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,6 @@ -Steps to contribute. -NEVER COMMIT TO MAIN. NEVER COMMIT TO MAIN. It should always be on your own branch and that branch name should match the issue. +# Steps to contribute. + +**NEVER COMMIT TO MAIN. NEVER COMMIT TO MAIN.** It should always be on your own branch and that branch name should match the issue. Ensure that you are addressing the correct issue. Each issue will be listed as something like a chore, fix, bug, etc. Your commit message MUST start with one of these tags that correspond with your issue. Followed by your commit message and your commit message must end with the branch name, example (WEB-1) @@ -11,7 +12,7 @@ Commit messages should not be written in an action or present tense. It also sho After a pull request is approved, the branch should be deleted once merged. -**First Time Contribution Guide** +## First Time Contribution Guide 1. Fork the DSDsite repository @@ -88,7 +89,7 @@ This often happens and is mostly encountered after a pull request opened by anot 1. Syncronize your Fork by going to your forked repository and ensure that you are on the `main` branch. You will see a message like "This branch is 1 commit ahead of, 9 commits behind dallassoftwaredevelopers/DSDsite:main." 2. Click **Sync fork** and click **Update branch** on the prompt that appears. -> ![image](https://github.com/climaxmba/DSDsite/assets/106796090/d72ef411-c707-4d70-8c45-48e607450c04) + > ![image](https://github.com/climaxmba/DSDsite/assets/106796090/d72ef411-c707-4d70-8c45-48e607450c04) ### Update your local repository From a0094062436334c593985fda9163cbc768c8c73a Mon Sep 17 00:00:00 2001 From: Soumava-221B <77767745+Soumava-221B@users.noreply.github.com> Date: Sun, 31 Mar 2024 23:04:24 +0530 Subject: [PATCH 06/15] fix: made by the community banner on mobile not full width (WEB-37) #76 --- src/app/components/bannerSection/bannerSection.module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/bannerSection/bannerSection.module.css b/src/app/components/bannerSection/bannerSection.module.css index fbe6c4d..694f670 100644 --- a/src/app/components/bannerSection/bannerSection.module.css +++ b/src/app/components/bannerSection/bannerSection.module.css @@ -1,6 +1,6 @@ .bannerSection { background-color: #0f1038; - width: 102%; + width: 100%; display: flex; align-items: center; justify-content: center; From dbed466da039a7776afe476c68c759f0d5e1927c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 31 Mar 2024 21:50:03 +0000 Subject: [PATCH 07/15] docs(contributor): contrib-readme-action has updated readme --- README.md | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index a4f9933..79c6329 100644 --- a/README.md +++ b/README.md @@ -97,17 +97,24 @@ To Contribute, Read the Contribution Guidelines. [Contribution guidelines for th - - abhiramrp + + Soumava-221B
- Abhiram Rishi Prattipati + Null - - Dthompsondevtestaccount + + SamuelHe2024
- Null + SamuelHe + + + + + PrashanthVamanan +
+ Prashanth Vamanan Srinivasan @@ -118,27 +125,27 @@ To Contribute, Read the Contribution Guidelines. [Contribution guidelines for th - - PrashanthVamanan + + Dthompsondevtestaccount
- Prashanth Vamanan Srinivasan + Null - - SamuelHe2024 + + abhiramrp
- SamuelHe + Abhiram Rishi Prattipati - + + braydoncoyer
Braydon Coyer - - + GetBlackBoxSolutions From fa7abef3e907f115c8227a06365444a5b6d367fa Mon Sep 17 00:00:00 2001 From: Climax Mba Date: Mon, 25 Mar 2024 06:54:54 +0100 Subject: [PATCH 08/15] chore: rebase with main (WEB-31) --- CONTRIBUTING.md | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 074fd38..a1a1d62 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Steps to contribute. -**NEVER COMMIT TO MAIN. NEVER COMMIT TO MAIN.** It should always be on your own branch and that branch name should match the issue. +_NEVER COMMIT TO MAIN. NEVER COMMIT TO MAIN._ It should always be on your own branch and that branch name should match the issue. Ensure that you are addressing the correct issue. Each issue will be listed as something like a chore, fix, bug, etc. Your commit message MUST start with one of these tags that correspond with your issue. Followed by your commit message and your commit message must end with the branch name, example (WEB-1) @@ -16,28 +16,28 @@ After a pull request is approved, the branch should be deleted once merged. 1. Fork the DSDsite repository - 1. From the home page of the DSDsite repo, click the **Fork** button. This will redirect you to a new page - 2. Click **Create Fork** in the bottom right. I like to change the name from "DSDsite" to "DSDsite-fork" to avoid any confusion about which repo I'm in + 1. From the home page of the DSDsite repo, click the _Fork_ button. This will redirect you to a new page + 2. Click _Create Fork_ in the bottom right. I like to change the name from "DSDsite" to "DSDsite-fork" to avoid any confusion about which repo I'm in 3. Once the forked repo is created, you will be redirected to the new repo![parent_repo](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/98725291-a209-4c52-a077-e220d192849a) 2. Clone the forked repo to a local repository - 1. From your newly created repository (the forked version), click on the green **Code** button + 1. From your newly created repository (the forked version), click on the green _Code_ button 2. From the HTTPS tab of the opened Code button, copy the URL ![Code_button_open](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/46c03816-b793-4574-9706-c80656e195f7) 3. Open a Bash terminal in the location where you want to store the project. In this example, I’m copying straight to my desktop - 4. In your Bash terminal, run the command `git clone https://github.com/YOUR-USERNAME/DSDsite-Fork.git` + 4. In your Bash terminal, run the command git clone https://github.com/YOUR-USERNAME/DSDsite-Fork.git 5. If successful, you will now have a copy of the project on your local machine ![bash_clone_cmd](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/551d3ea0-5448-45c7-ab33-2dddbc0247e3) 3. Install dependencies 1. From a text editor, open a Bash terminal in the project's root folder. In the example, the root folder is "DSDsite-Fork" - 2. In the Bash terminal, run the command `npm install`. This will install all the dependencies from the package.json file![npm_install](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/cdad748f-4569-4a04-8dc6-e40c8fae5cac) + 2. In the Bash terminal, run the command npm install. This will install all the dependencies from the package.json file![npm_install](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/cdad748f-4569-4a04-8dc6-e40c8fae5cac) - 3. Run the command `npm run dev`. Once you see the green check in the terminal, navigate to localhost:3000. Ensure the page compiles correctly before moving on. It may take a moment for the page to load![run_dev](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/a2421871-1a3f-41d1-b056-dc2736baa994) + 3. Run the command npm run dev. Once you see the green check in the terminal, navigate to localhost:3000. Ensure the page compiles correctly before moving on. It may take a moment for the page to load![run_dev](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/a2421871-1a3f-41d1-b056-dc2736baa994) 4. Select an issue to resolve @@ -49,24 +49,24 @@ After a pull request is approved, the branch should be deleted once merged. 5. Create a new branch 1. From a text editor, open a Bash terminal in the project's root folder. Ensure the main git branch is currently selected - 2. In the Bash terminal, run the command `git branch BRANCH-NAME` to create the working branch. Replace BRANCH-NAME with a name that matches the issue - 3. Run the command `git checkout BRANCH-NAME` to switch to the new branch - 4. Ensure you are in the newly created branch, **NOT** the main branch![new_branch](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/fbe4c6bd-fd66-4c74-915a-26452aa98041) + 2. In the Bash terminal, run the command git branch BRANCH-NAME to create the working branch. Replace BRANCH-NAME with a name that matches the issue + 3. Run the command git checkout BRANCH-NAME to switch to the new branch + 4. Ensure you are in the newly created branch, _NOT_ the main branch![new_branch](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/fbe4c6bd-fd66-4c74-915a-26452aa98041) 6. Make updates to the codebase and save the changes 1. Ensure that only code related to the issue is changed - 2. From the Bash terminal, run the command `npm run dev` and navigate to localhost:3000 + 2. From the Bash terminal, run the command npm run dev and navigate to localhost:3000 3. Make changes to the code and view the changes in the browser - 4. When the issue has been resolved and there is nothing left to do, run the command `npx prettier . –write`. This may reformat files that were not altered, don’t de alarmed - 5. Run the command `git add .` to add all changed files to staging - 6. Run the command `git commit -m “YOUR-MESSAGE”`. The commit message **MUST** start with a tag (chore, fix, bug, etc.) that corresponds with your issue, followed by your commit message. Your commit message must end with the branch name, for example (WEB-1). An example commit message would look like this: chore: create contributing guidelines (WEB-8). Commit messages should not be written in an action or present tense. It also should not mention tasks unrelated to the issue "Creating Contributing Guidelines and will work on next task" is not what we would want to see as a commit message - 7. Run the command `git push –set-upstream origin BRANCH-NAME` to create the upstream branch on Github and push the local changes to it. Use the same name as the local branch + 4. When the issue has been resolved and there is nothing left to do, run the command npx prettier . –write. This may reformat files that were not altered, don’t de alarmed + 5. Run the command git add . to add all changed files to staging + 6. Run the command git commit -m “YOUR-MESSAGE”. The commit message _MUST_ start with a tag (chore, fix, bug, etc.) that corresponds with your issue, followed by your commit message. Your commit message must end with the branch name, for example (WEB-1). An example commit message would look like this: chore: create contributing guidelines (WEB-8). Commit messages should not be written in an action or present tense. It also should not mention tasks unrelated to the issue "Creating Contributing Guidelines and will work on next task" is not what we would want to see as a commit message + 7. Run the command git push –set-upstream origin BRANCH-NAME to create the upstream branch on Github and push the local changes to it. Use the same name as the local branch 7. Create a pull request 1. Head back to the new forked repo on Github - 2. Find the banner that says your branch is ahead of the DSDsite:main. Click **Contribute** then **Open a pull request**![branch_ahead_of_main2](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/4cb45655-b501-4e2c-8c1b-9ff44560705b) + 2. Find the banner that says your branch is ahead of the DSDsite:main. Click _Contribute_ then _Open a pull request_![branch_ahead_of_main2](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/4cb45655-b501-4e2c-8c1b-9ff44560705b) 3. Make the title of the pull request match the issue 4. In the description, say what work has been done, provide a screenshot of the working update, or some other useful information @@ -83,18 +83,18 @@ That's Great, your work is well appreciated! If you would like to keep contribut This often happens and is mostly encountered after a pull request opened by another individual is merged to the `main` branch and you may sometimes run into merge conflicts. Here are steps to follow if this happens: -> You may choose to merge them the `main` branch on GitHub to your working branch which may be faster, but these steps are encouraged for a more linear-looking git history +> You may choose to merge them the main branch on GitHub to your working branch which may be faster, but these steps are encouraged for a more linear-looking git history ### Update your Fork -1. Syncronize your Fork by going to your forked repository and ensure that you are on the `main` branch. You will see a message like "This branch is 1 commit ahead of, 9 commits behind dallassoftwaredevelopers/DSDsite:main." +1. Syncronize your Fork by going to your forked repository and ensure that you are on the main branch. You will see a message like "This branch is 1 commit ahead of, 9 commits behind dallassoftwaredevelopers/DSDsite:main." 2. Click **Sync fork** and click **Update branch** on the prompt that appears. > ![image](https://github.com/climaxmba/DSDsite/assets/106796090/d72ef411-c707-4d70-8c45-48e607450c04) ### Update your local repository -1. Open a terminal in the directory of your local repository and run `git checkout main` to ensure you are on the `main` branch. -2. Run this command to update your local repository, you can read more about `git pull` at [https://git-scm.com/docs/git-pull](https://git-scm.com/docs/git-pull). +1. Open a terminal in the directory of your local repository and run git checkout main to ensure you are on the main branch. +2. Run this command to update your local repository, you can read more about git pull at [https://git-scm.com/docs/git-pull](https://git-scm.com/docs/git-pull). ```bash git pull --rebase From bf26ffa35bda0a7c23b6fd82ad1fb9d1baf02a58 Mon Sep 17 00:00:00 2001 From: Climax Mba Date: Mon, 25 Mar 2024 06:54:54 +0100 Subject: [PATCH 09/15] chore: rebase with main (WEB-31) --- CONTRIBUTING.md | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a1a1d62..074fd38 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Steps to contribute. -_NEVER COMMIT TO MAIN. NEVER COMMIT TO MAIN._ It should always be on your own branch and that branch name should match the issue. +**NEVER COMMIT TO MAIN. NEVER COMMIT TO MAIN.** It should always be on your own branch and that branch name should match the issue. Ensure that you are addressing the correct issue. Each issue will be listed as something like a chore, fix, bug, etc. Your commit message MUST start with one of these tags that correspond with your issue. Followed by your commit message and your commit message must end with the branch name, example (WEB-1) @@ -16,28 +16,28 @@ After a pull request is approved, the branch should be deleted once merged. 1. Fork the DSDsite repository - 1. From the home page of the DSDsite repo, click the _Fork_ button. This will redirect you to a new page - 2. Click _Create Fork_ in the bottom right. I like to change the name from "DSDsite" to "DSDsite-fork" to avoid any confusion about which repo I'm in + 1. From the home page of the DSDsite repo, click the **Fork** button. This will redirect you to a new page + 2. Click **Create Fork** in the bottom right. I like to change the name from "DSDsite" to "DSDsite-fork" to avoid any confusion about which repo I'm in 3. Once the forked repo is created, you will be redirected to the new repo![parent_repo](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/98725291-a209-4c52-a077-e220d192849a) 2. Clone the forked repo to a local repository - 1. From your newly created repository (the forked version), click on the green _Code_ button + 1. From your newly created repository (the forked version), click on the green **Code** button 2. From the HTTPS tab of the opened Code button, copy the URL ![Code_button_open](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/46c03816-b793-4574-9706-c80656e195f7) 3. Open a Bash terminal in the location where you want to store the project. In this example, I’m copying straight to my desktop - 4. In your Bash terminal, run the command git clone https://github.com/YOUR-USERNAME/DSDsite-Fork.git + 4. In your Bash terminal, run the command `git clone https://github.com/YOUR-USERNAME/DSDsite-Fork.git` 5. If successful, you will now have a copy of the project on your local machine ![bash_clone_cmd](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/551d3ea0-5448-45c7-ab33-2dddbc0247e3) 3. Install dependencies 1. From a text editor, open a Bash terminal in the project's root folder. In the example, the root folder is "DSDsite-Fork" - 2. In the Bash terminal, run the command npm install. This will install all the dependencies from the package.json file![npm_install](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/cdad748f-4569-4a04-8dc6-e40c8fae5cac) + 2. In the Bash terminal, run the command `npm install`. This will install all the dependencies from the package.json file![npm_install](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/cdad748f-4569-4a04-8dc6-e40c8fae5cac) - 3. Run the command npm run dev. Once you see the green check in the terminal, navigate to localhost:3000. Ensure the page compiles correctly before moving on. It may take a moment for the page to load![run_dev](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/a2421871-1a3f-41d1-b056-dc2736baa994) + 3. Run the command `npm run dev`. Once you see the green check in the terminal, navigate to localhost:3000. Ensure the page compiles correctly before moving on. It may take a moment for the page to load![run_dev](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/a2421871-1a3f-41d1-b056-dc2736baa994) 4. Select an issue to resolve @@ -49,24 +49,24 @@ After a pull request is approved, the branch should be deleted once merged. 5. Create a new branch 1. From a text editor, open a Bash terminal in the project's root folder. Ensure the main git branch is currently selected - 2. In the Bash terminal, run the command git branch BRANCH-NAME to create the working branch. Replace BRANCH-NAME with a name that matches the issue - 3. Run the command git checkout BRANCH-NAME to switch to the new branch - 4. Ensure you are in the newly created branch, _NOT_ the main branch![new_branch](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/fbe4c6bd-fd66-4c74-915a-26452aa98041) + 2. In the Bash terminal, run the command `git branch BRANCH-NAME` to create the working branch. Replace BRANCH-NAME with a name that matches the issue + 3. Run the command `git checkout BRANCH-NAME` to switch to the new branch + 4. Ensure you are in the newly created branch, **NOT** the main branch![new_branch](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/fbe4c6bd-fd66-4c74-915a-26452aa98041) 6. Make updates to the codebase and save the changes 1. Ensure that only code related to the issue is changed - 2. From the Bash terminal, run the command npm run dev and navigate to localhost:3000 + 2. From the Bash terminal, run the command `npm run dev` and navigate to localhost:3000 3. Make changes to the code and view the changes in the browser - 4. When the issue has been resolved and there is nothing left to do, run the command npx prettier . –write. This may reformat files that were not altered, don’t de alarmed - 5. Run the command git add . to add all changed files to staging - 6. Run the command git commit -m “YOUR-MESSAGE”. The commit message _MUST_ start with a tag (chore, fix, bug, etc.) that corresponds with your issue, followed by your commit message. Your commit message must end with the branch name, for example (WEB-1). An example commit message would look like this: chore: create contributing guidelines (WEB-8). Commit messages should not be written in an action or present tense. It also should not mention tasks unrelated to the issue "Creating Contributing Guidelines and will work on next task" is not what we would want to see as a commit message - 7. Run the command git push –set-upstream origin BRANCH-NAME to create the upstream branch on Github and push the local changes to it. Use the same name as the local branch + 4. When the issue has been resolved and there is nothing left to do, run the command `npx prettier . –write`. This may reformat files that were not altered, don’t de alarmed + 5. Run the command `git add .` to add all changed files to staging + 6. Run the command `git commit -m “YOUR-MESSAGE”`. The commit message **MUST** start with a tag (chore, fix, bug, etc.) that corresponds with your issue, followed by your commit message. Your commit message must end with the branch name, for example (WEB-1). An example commit message would look like this: chore: create contributing guidelines (WEB-8). Commit messages should not be written in an action or present tense. It also should not mention tasks unrelated to the issue "Creating Contributing Guidelines and will work on next task" is not what we would want to see as a commit message + 7. Run the command `git push –set-upstream origin BRANCH-NAME` to create the upstream branch on Github and push the local changes to it. Use the same name as the local branch 7. Create a pull request 1. Head back to the new forked repo on Github - 2. Find the banner that says your branch is ahead of the DSDsite:main. Click _Contribute_ then _Open a pull request_![branch_ahead_of_main2](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/4cb45655-b501-4e2c-8c1b-9ff44560705b) + 2. Find the banner that says your branch is ahead of the DSDsite:main. Click **Contribute** then **Open a pull request**![branch_ahead_of_main2](https://github.com/David-Ogden-III/DSDsite-Fork/assets/71677972/4cb45655-b501-4e2c-8c1b-9ff44560705b) 3. Make the title of the pull request match the issue 4. In the description, say what work has been done, provide a screenshot of the working update, or some other useful information @@ -83,18 +83,18 @@ That's Great, your work is well appreciated! If you would like to keep contribut This often happens and is mostly encountered after a pull request opened by another individual is merged to the `main` branch and you may sometimes run into merge conflicts. Here are steps to follow if this happens: -> You may choose to merge them the main branch on GitHub to your working branch which may be faster, but these steps are encouraged for a more linear-looking git history +> You may choose to merge them the `main` branch on GitHub to your working branch which may be faster, but these steps are encouraged for a more linear-looking git history ### Update your Fork -1. Syncronize your Fork by going to your forked repository and ensure that you are on the main branch. You will see a message like "This branch is 1 commit ahead of, 9 commits behind dallassoftwaredevelopers/DSDsite:main." +1. Syncronize your Fork by going to your forked repository and ensure that you are on the `main` branch. You will see a message like "This branch is 1 commit ahead of, 9 commits behind dallassoftwaredevelopers/DSDsite:main." 2. Click **Sync fork** and click **Update branch** on the prompt that appears. > ![image](https://github.com/climaxmba/DSDsite/assets/106796090/d72ef411-c707-4d70-8c45-48e607450c04) ### Update your local repository -1. Open a terminal in the directory of your local repository and run git checkout main to ensure you are on the main branch. -2. Run this command to update your local repository, you can read more about git pull at [https://git-scm.com/docs/git-pull](https://git-scm.com/docs/git-pull). +1. Open a terminal in the directory of your local repository and run `git checkout main` to ensure you are on the `main` branch. +2. Run this command to update your local repository, you can read more about `git pull` at [https://git-scm.com/docs/git-pull](https://git-scm.com/docs/git-pull). ```bash git pull --rebase From 68275d9583499d03826b459ce1b65f3f1a1f5668 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 01:27:57 +0000 Subject: [PATCH 10/15] docs(contributor): contrib-readme-action has updated readme --- README.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 79c6329..3447ea8 100644 --- a/README.md +++ b/README.md @@ -68,17 +68,17 @@ To Contribute, Read the Contribution Guidelines. [Contribution guidelines for th - - UsmanCanCode + + climaxmba
- Usman Raja + Climax Mba - - climaxmba + + UsmanCanCode
- Climax Mba + Usman Raja @@ -132,25 +132,25 @@ To Contribute, Read the Contribution Guidelines. [Contribution guidelines for th - - abhiramrp + + GetBlackBoxSolutions
- Abhiram Rishi Prattipati + Dennis Garcia - - braydoncoyer + + abhiramrp
- Braydon Coyer + Abhiram Rishi Prattipati - - GetBlackBoxSolutions + + braydoncoyer
- Dennis Garcia + Braydon Coyer From 573729f990ec58b24df7c1f55bc39d7a88e0d024 Mon Sep 17 00:00:00 2001 From: Claire Carden Date: Sat, 20 Apr 2024 13:37:29 -0500 Subject: [PATCH 11/15] #73 - add group photo img to main page --- .../groupPhotoSection.module.css | 17 ++++++++++++++ .../groupPhotoSection.test.js | 14 ++++++++++++ .../groupPhotoSection/groupPhotoSection.tsx | 22 +++++++++++++++++++ src/app/page.tsx | 2 ++ 4 files changed, 55 insertions(+) create mode 100644 src/app/components/groupPhotoSection/groupPhotoSection.module.css create mode 100644 src/app/components/groupPhotoSection/groupPhotoSection.test.js create mode 100644 src/app/components/groupPhotoSection/groupPhotoSection.tsx diff --git a/src/app/components/groupPhotoSection/groupPhotoSection.module.css b/src/app/components/groupPhotoSection/groupPhotoSection.module.css new file mode 100644 index 0000000..70de4dd --- /dev/null +++ b/src/app/components/groupPhotoSection/groupPhotoSection.module.css @@ -0,0 +1,17 @@ +@import url('https://fonts.googleapis.com/css2?family=Raleway:wght@800&display=swap'); + +.groupPhotoSection { + background-color: #3c3db9; + display: flex; + align-items: center; + justify-content: center; + padding: 2em; +} + +.groupPhotoImg { + border: #eeeeee 5px solid; + width: 100%; + height: auto; + justify-content: center; + align-items: center; +} \ No newline at end of file diff --git a/src/app/components/groupPhotoSection/groupPhotoSection.test.js b/src/app/components/groupPhotoSection/groupPhotoSection.test.js new file mode 100644 index 0000000..f8afefe --- /dev/null +++ b/src/app/components/groupPhotoSection/groupPhotoSection.test.js @@ -0,0 +1,14 @@ +import React from 'react'; // Import React +import { render, screen } from '@testing-library/react'; +import GroupPhotoSection from './heroSection'; + +describe('GroupPhotoSection component', () => { + const labelMap = { + lblHero: "You don't have to code alone.", + }; + test('renders the component', () => { + render(); + const groupPhotoElement = screen.getByTestId('hero'); + expect(groupPhotoElement).toBeInTheDocument(); + }); +}); \ No newline at end of file diff --git a/src/app/components/groupPhotoSection/groupPhotoSection.tsx b/src/app/components/groupPhotoSection/groupPhotoSection.tsx new file mode 100644 index 0000000..3aa2891 --- /dev/null +++ b/src/app/components/groupPhotoSection/groupPhotoSection.tsx @@ -0,0 +1,22 @@ +'use client'; + +import React from 'react'; +import styles from './groupPhotoSection.module.css'; +import Image from 'next/image'; +import { detectContentType } from 'next/dist/server/image-optimizer'; + +export default function GroupPhotoSection({ label }: { label: string }) { + return ( +
+
+ Meetup Group Shot image +
+
+ ); +} diff --git a/src/app/page.tsx b/src/app/page.tsx index 6883dde..69ce067 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -3,6 +3,7 @@ import BannerSection from './components/bannerSection/bannerSection'; import HeroSection from './components/heroSection/heroSection'; import Navbar from './components/navbar/navbar'; import styles from './page.module.css'; +import GroupPhotoSection from './components/groupPhotoSection/groupPhotoSection'; export default function Home() { const labelMap = { @@ -41,6 +42,7 @@ export default function Home() { + ); } From 4d35b4837bcc258af8c3d45ad4ef12bdbc819af0 Mon Sep 17 00:00:00 2001 From: Claire Carden Date: Sat, 20 Apr 2024 16:57:28 -0500 Subject: [PATCH 12/15] #73_groupPhoto finish ticket. --- src/app/components/groupPhotoSection/groupPhotoSection.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/components/groupPhotoSection/groupPhotoSection.tsx b/src/app/components/groupPhotoSection/groupPhotoSection.tsx index 3aa2891..1af426a 100644 --- a/src/app/components/groupPhotoSection/groupPhotoSection.tsx +++ b/src/app/components/groupPhotoSection/groupPhotoSection.tsx @@ -8,7 +8,6 @@ import { detectContentType } from 'next/dist/server/image-optimizer'; export default function GroupPhotoSection({ label }: { label: string }) { return (
-
-
); } From d2497fc5a846b9f95419549911569f387e717f91 Mon Sep 17 00:00:00 2001 From: Claire Carden Date: Sat, 20 Apr 2024 20:19:27 -0500 Subject: [PATCH 13/15] #73_groupPhoto prettier? --- .../groupPhotoSection/groupPhotoSection.module.css | 2 +- .../groupPhotoSection/groupPhotoSection.test.js | 2 +- .../groupPhotoSection/groupPhotoSection.tsx | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/components/groupPhotoSection/groupPhotoSection.module.css b/src/app/components/groupPhotoSection/groupPhotoSection.module.css index 70de4dd..6d51307 100644 --- a/src/app/components/groupPhotoSection/groupPhotoSection.module.css +++ b/src/app/components/groupPhotoSection/groupPhotoSection.module.css @@ -14,4 +14,4 @@ height: auto; justify-content: center; align-items: center; -} \ No newline at end of file +} diff --git a/src/app/components/groupPhotoSection/groupPhotoSection.test.js b/src/app/components/groupPhotoSection/groupPhotoSection.test.js index f8afefe..2c4733c 100644 --- a/src/app/components/groupPhotoSection/groupPhotoSection.test.js +++ b/src/app/components/groupPhotoSection/groupPhotoSection.test.js @@ -11,4 +11,4 @@ describe('GroupPhotoSection component', () => { const groupPhotoElement = screen.getByTestId('hero'); expect(groupPhotoElement).toBeInTheDocument(); }); -}); \ No newline at end of file +}); diff --git a/src/app/components/groupPhotoSection/groupPhotoSection.tsx b/src/app/components/groupPhotoSection/groupPhotoSection.tsx index 1af426a..cb43b00 100644 --- a/src/app/components/groupPhotoSection/groupPhotoSection.tsx +++ b/src/app/components/groupPhotoSection/groupPhotoSection.tsx @@ -8,13 +8,13 @@ import { detectContentType } from 'next/dist/server/image-optimizer'; export default function GroupPhotoSection({ label }: { label: string }) { return (
- Meetup Group Shot image + Meetup Group Shot image
); } From 68628762a6931d9beb3bd50992f0c889fc4fe0a5 Mon Sep 17 00:00:00 2001 From: Claire Carden Date: Sat, 20 Apr 2024 20:40:19 -0500 Subject: [PATCH 14/15] #73_groupPhoto didnt notice the border radius until now. --- .../components/groupPhotoSection/groupPhotoSection.module.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/components/groupPhotoSection/groupPhotoSection.module.css b/src/app/components/groupPhotoSection/groupPhotoSection.module.css index 6d51307..09f2272 100644 --- a/src/app/components/groupPhotoSection/groupPhotoSection.module.css +++ b/src/app/components/groupPhotoSection/groupPhotoSection.module.css @@ -5,7 +5,7 @@ display: flex; align-items: center; justify-content: center; - padding: 2em; + padding: 2em 1.5em; } .groupPhotoImg { @@ -14,4 +14,5 @@ height: auto; justify-content: center; align-items: center; + border-radius: 10px; } From 489f93059b03da671bae5928281931d032e9d34f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 21 Apr 2024 15:50:35 +0000 Subject: [PATCH 15/15] docs(contributor): contrib-readme-action has updated readme --- README.md | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 3447ea8..f23e7f3 100644 --- a/README.md +++ b/README.md @@ -81,21 +81,35 @@ To Contribute, Read the Contribution Guidelines. [Contribution guidelines for th Usman Raja + + + smclairecarden +
+ Claire Carden + + David-Ogden-III
David Ogden - + + JVPH
JVPH - - + + + + GetBlackBoxSolutions +
+ Dennis Garcia + + Soumava-221B @@ -123,7 +137,8 @@ To Contribute, Read the Contribution Guidelines. [Contribution guidelines for th
Richard - + + Dthompsondevtestaccount @@ -131,14 +146,6 @@ To Contribute, Read the Contribution Guidelines. [Contribution guidelines for th Null - - - GetBlackBoxSolutions -
- Dennis Garcia - - - abhiramrp @@ -173,7 +180,8 @@ To Contribute, Read the Contribution Guidelines. [Contribution guidelines for th
Ryan Monaghan - + + Brayheart