Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement of Contributing.md #455

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,18 @@ in case you are stuck:
Launch GitHub Desktop and log in to your GitHub account if you haven't already.

2. **Clone the Repository:**
- If you haven't cloned the ResourceHub repository yet, you can do so by clicking on the "File" menu and selecting "Clone Repository."
- Choose the ResourceHub repository from the list of repositories on GitHub and clone it to your local machine.
- If you haven't cloned the e-commerce_website repository yet, you can do so by clicking on the "File" menu and selecting "Clone Repository."
- Choose the e-commerce_website repository from the list of repositories on GitHub and clone it to your local machine.

![image](https://github.com/PradnyaGaitonde/e-commerce_website/assets/116059908/904d0f45-b3d5-4873-8e29-07264ff016d9)

![image](https://github.com/PradnyaGaitonde/e-commerce_website/assets/116059908/7e7d9cbd-d93b-44a6-a470-773f943571c0)

3. **Switch to the Correct Branch:**
- Ensure you are on the branch that you want to submit a pull request for.
- If you need to switch branches, you can do so by clicking on the "Current Branch" dropdown menu and selecting the desired branch.

![image](https://github.com/PradnyaGaitonde/e-commerce_website/assets/116059908/31a68125-bd6b-45f4-bc40-88b4ae4b7146)

4. **Make Changes:**
Make your changes to the code or files in the repository using your preferred code editor(like vs code).
Expand All @@ -52,19 +58,25 @@ in case you are stuck:
- In GitHub Desktop, you'll see a list of the files you've changed. Check the box next to each file you want to include in the commit.
- Enter a summary and description for your changes in the "Summary" and "Description" fields, respectively. Click the "Commit to <branch-name>" button to commit your changes to the local branch.

![image](https://github.com/PradnyaGaitonde/e-commerce_website/assets/116059908/a397bf2c-baa9-4560-af52-b4b59b56a0e8)

6. **Push Changes to GitHub:**
After committing your changes, click the "Push origin" button in the top right corner of GitHub Desktop to push your changes to your forked repository on GitHub.

![image](https://github.com/PradnyaGaitonde/e-commerce_website/assets/116059908/cac3ef5a-d695-4e8c-9a33-485873603393)

7. **Create a Pull Request:**
- Go to the GitHub website and navigate to your fork of the ResourceHub repository.
- Go to the GitHub website and navigate to your fork of the e-commerce_website repository.
- You should see a button to "Compare & pull request" between your fork and the original repository. Click on it.

![image](https://github.com/PradnyaGaitonde/e-commerce_website/assets/116059908/0b869592-4f04-4457-9b52-57cbe0689000)

8. **Review and Submit:**
- On the pull request page, review your changes and add any additional information, such as a title and description, that you want to include with your pull request.
- Once you're satisfied, click the "Create pull request" button to submit your pull request.

9. **Wait for Review:**
Your pull request will now be available for review by the project maintainers. They may provide feedback or ask for changes before merging your pull request into the main branch of the ResourceHub repository.
Your pull request will now be available for review by the project maintainers. They may provide feedback or ask for changes before merging your pull request into the main branch of the e-commerce_website repository.


## **Pull Request Process**
Expand Down
33 changes: 33 additions & 0 deletions src/pages/Contactus/Contactus.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ import emailjs from '@emailjs/browser';
import { Button, Snackbar, TextareaAutosize, Typography } from '@mui/material';
import TextField from '@mui/material/TextField';

import MapIcon from '@mui/icons-material/Map';
import EmailIcon from '@mui/icons-material/Email';
import PhoneIcon from '@mui/icons-material/Phone';
import AccessTimeIcon from '@mui/icons-material/AccessTime';

export default function Contactus() {
let form = useRef();
const [formFields, setFormFields] = useState({
Expand Down Expand Up @@ -207,6 +212,34 @@ export default function Contactus() {
</div>
</React.Fragment>
</div>
<section className="section-p1">
<div className="details">
<span>GET IN TOUCH</span>
<h2>Visit one of our agency locations or contact us today</h2>
<h3>Head Office</h3>
<div>
<li>
<MapIcon />
<p>5171 W Campbell Ave undefined Kent, Utah 53127 United States</p>
</li>
<li>
<EmailIcon />
<p>[email protected]</p>
</li>
<li>
<PhoneIcon />
<p>(+91) - 540-025-124553</p>
</li>
<li>
<AccessTimeIcon />
<p>Monday-Saturday 10:00 am to 6:00 pm</p>
</li>
</div>
</div>
<div className="map">
<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3153898.0090667806!2d-114.18749901456506!3d39.46981386754793!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x874c6bc78f13f9cd%3A0xbddf4aa56cd7463f!2sUtah%2C%20USA!5e0!3m2!1sen!2sin!4v1719849554647!5m2!1sen!2sin" width="600" height="450" style="border:0;" allowfullscreen="" loading="lazy" referrerpolicy="no-referrer-when-downgrade"></iframe>
</div>
</section>
</div>
);
}
49 changes: 49 additions & 0 deletions src/pages/Contactus/contactus.css
Original file line number Diff line number Diff line change
Expand Up @@ -345,3 +345,52 @@ input {
color: gray;
border: none;
}
.section-p1 {
padding: 40px 80px;
}

.details {
display: flex;
align-items: center;
justify-content: space-between;
}

.details {
width: 40%;
}

.details span {
font-size: 12px;
}

.details h2 {
font-size: 26px;
line-height: 35px;
padding: 20px 0;
}

.details li {
list-style: none;
display: flex;
padding: 10px 0;
}

.details li svg {
font-size: 14px;
padding-right: 22px;
}

.details li p {
margin: 0;
font-size: 14px;
}

.map {
width: 55%;
height: 400px;
}

.map iframe {
width: 100%;
height: 100%;
}