Merge branch 'main' into pr/choir27/82

dallassoftwaredevelopers · Apr 21, 2024 · 0242b7c · 0242b7c
2 parents 5f49d28 + 489f930
commit 0242b7c
Show file tree

Hide file tree

Showing 7 changed files with 137 additions and 30 deletions.
diff --git 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
 
@@ -73,3 +74,40 @@ 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.
+ > ![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).
+
+```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](https://www.freecodecamp.org/news/resolve-merge-conflicts-in-git-a-practical-guide/), 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.
diff --git a/README.md b/README.md
@@ -67,6 +67,13 @@ To Contribute, Read the Contribution Guidelines. [Contribution guidelines for th
   <sub><b>Josh</b></sub>
   </a>
  </td>
+ <td align="center">
+  <a href="https://github.com/climaxmba">
+  <img src="https://avatars.githubusercontent.com/u/106796090?v=4" width="100;" alt="climaxmba"/>
+  <br />
+  <sub><b>Climax Mba</b></sub>
+  </a>
+ </td>
  <td align="center">
   <a href="https://github.com/UsmanCanCode">
   <img src="https://avatars.githubusercontent.com/u/86849038?v=4" width="100;" alt="UsmanCanCode"/>
@@ -75,10 +82,10 @@ To Contribute, Read the Contribution Guidelines. [Contribution guidelines for th
   </a>
  </td>
  <td align="center">
-  <a href="https://github.com/climaxmba">
-  <img src="https://avatars.githubusercontent.com/u/106796090?v=4" width="100;" alt="climaxmba"/>
+  <a href="https://github.com/smclairecarden">
+  <img src="https://avatars.githubusercontent.com/u/96350691?v=4" width="100;" alt="smclairecarden"/>
   <br />
-  <sub><b>Climax Mba</b></sub>
+  <sub><b>Claire Carden</b></sub>
   </a>
  </td>
  <td align="center">
@@ -87,34 +94,34 @@ To Contribute, Read the Contribution Guidelines. [Contribution guidelines for th
   <br />
   <sub><b>David Ogden</b></sub>
   </a>
- </td>
+ </td></tr>
+<tr>
  <td align="center">
   <a href="https://github.com/JVPH">
   <img src="https://avatars.githubusercontent.com/u/83098530?v=4" width="100;" alt="JVPH"/>
   <br />
   <sub><b>JVPH</b></sub>
   </a>
- </td></tr>
-<tr>
+ </td>
  <td align="center">
-  <a href="https://github.com/abhiramrp">
-  <img src="https://avatars.githubusercontent.com/u/64505707?v=4" width="100;" alt="abhiramrp"/>
+  <a href="https://github.com/GetBlackBoxSolutions">
+  <img src="https://avatars.githubusercontent.com/u/110210295?v=4" width="100;" alt="GetBlackBoxSolutions"/>
   <br />
-  <sub><b>Abhiram Rishi Prattipati</b></sub>
+  <sub><b>Dennis Garcia</b></sub>
   </a>
  </td>
  <td align="center">
-  <a href="https://github.com/Dthompsondevtestaccount">
-  <img src="https://avatars.githubusercontent.com/u/162359894?v=4" width="100;" alt="Dthompsondevtestaccount"/>
+  <a href="https://github.com/Soumava-221B">
+  <img src="https://avatars.githubusercontent.com/u/77767745?v=4" width="100;" alt="Soumava-221B"/>
   <br />
   <sub><b>Null</b></sub>
   </a>
  </td>
  <td align="center">
-  <a href="https://github.com/choir27">
-  <img src="https://avatars.githubusercontent.com/u/66279068?v=4" width="100;" alt="choir27"/>
+  <a href="https://github.com/SamuelHe2024">
+  <img src="https://avatars.githubusercontent.com/u/39107451?v=4" width="100;" alt="SamuelHe2024"/>
   <br />
-  <sub><b>Richard</b></sub>
+  <sub><b>SamuelHe</b></sub>
   </a>
  </td>
  <td align="center">
@@ -125,25 +132,32 @@ To Contribute, Read the Contribution Guidelines. [Contribution guidelines for th
   </a>
  </td>
  <td align="center">
-  <a href="https://github.com/SamuelHe2024">
-  <img src="https://avatars.githubusercontent.com/u/39107451?v=4" width="100;" alt="SamuelHe2024"/>
+  <a href="https://github.com/choir27">
+  <img src="https://avatars.githubusercontent.com/u/66279068?v=4" width="100;" alt="choir27"/>
   <br />
-  <sub><b>SamuelHe</b></sub>
+  <sub><b>Richard</b></sub>
+  </a>
+ </td></tr>
+<tr>
+ <td align="center">
+  <a href="https://github.com/Dthompsondevtestaccount">
+  <img src="https://avatars.githubusercontent.com/u/162359894?v=4" width="100;" alt="Dthompsondevtestaccount"/>
+  <br />
+  <sub><b>Null</b></sub>
   </a>
  </td>
  <td align="center">
-  <a href="https://github.com/braydoncoyer">
-  <img src="https://avatars.githubusercontent.com/u/38799309?v=4" width="100;" alt="braydoncoyer"/>
+  <a href="https://github.com/abhiramrp">
+  <img src="https://avatars.githubusercontent.com/u/64505707?v=4" width="100;" alt="abhiramrp"/>
   <br />
-  <sub><b>Braydon Coyer</b></sub>
+  <sub><b>Abhiram Rishi Prattipati</b></sub>
   </a>
- </td></tr>
-<tr>
+ </td>
  <td align="center">
-  <a href="https://github.com/GetBlackBoxSolutions">
-  <img src="https://avatars.githubusercontent.com/u/110210295?v=4" width="100;" alt="GetBlackBoxSolutions"/>
+  <a href="https://github.com/braydoncoyer">
+  <img src="https://avatars.githubusercontent.com/u/38799309?v=4" width="100;" alt="braydoncoyer"/>
   <br />
-  <sub><b>Dennis Garcia</b></sub>
+  <sub><b>Braydon Coyer</b></sub>
   </a>
  </td>
  <td align="center">
@@ -166,7 +180,8 @@ To Contribute, Read the Contribution Guidelines. [Contribution guidelines for th
   <br />
   <sub><b>Ryan Monaghan</b></sub>
   </a>
- </td>
+ </td></tr>
+<tr>
  <td align="center">
   <a href="https://github.com/Brayheart">
   <img src="https://avatars.githubusercontent.com/u/30908449?v=4" width="100;" alt="Brayheart"/>

diff --git a/src/app/components/groupPhotoSection/groupPhotoSection.module.css b/src/app/components/groupPhotoSection/groupPhotoSection.module.css
@@ -0,0 +1,18 @@
+@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 1.5em;
+}
+
+.groupPhotoImg {
+ border: #eeeeee 5px solid;
+ width: 100%;
+ height: auto;
+ justify-content: center;
+ align-items: center;
+ border-radius: 10px;
+}
diff --git a/src/app/components/groupPhotoSection/groupPhotoSection.test.js 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(<GroupPhotoSection label={labelMap.lblHero} />);
+ const groupPhotoElement = screen.getByTestId('hero');
+ expect(groupPhotoElement).toBeInTheDocument();
+ });
+});
diff --git a/src/app/components/groupPhotoSection/groupPhotoSection.tsx b/src/app/components/groupPhotoSection/groupPhotoSection.tsx
@@ -0,0 +1,20 @@
+'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 (
+ <div className={styles.groupPhotoSection} data-testid='groupPhoto'>
+ <Image
+ className={styles.groupPhotoImg}
+ src='/assets/meetupGroupShot5.png'
+ alt='Meetup Group Shot image'
+ width={1450}
+ height={500}
+ />
+ </div>
+ );
+}
diff --git 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%;
  }

diff --git 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';
 import BentoSection from './components/bentoSection/bentoSection';
 
 export default function Home() {
@@ -43,6 +44,7 @@ export default function Home() {
  <BannerSection label={labelMap} />
  <CardsSection label={labelMap} />
  <BentoSection />
+ <GroupPhotoSection label='' />
  </main>
  );
 }