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

refactor:Add refuge.gif and some edits to readme md file #32

Merged
merged 17 commits into from
Oct 22, 2023
Merged
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
9 changes: 0 additions & 9 deletions .circleci/config.yml

This file was deleted.

72 changes: 21 additions & 51 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div>
<h1 style="color:red; display: inline;">
<!-- Refuge -->
Refuge
<img src="https://github.com/Refugee-Aid-Capstone/refugee-aid-fe/blob/main/src/images/refuge.png" alt="refuge logo" width="105" style="margin-left: 5px; border-radius: 50%; vertical-align: middle;">
</h1>
</div>
Expand All @@ -9,16 +9,17 @@

### <span style="color:#2E8B57;">Description</span>

**Refuge - AidConnect/RefugeeAid** emerges as a platform addressing the challenge of efficiently connecting aid workers and compassionate citizens with refugee camps or organisations. It ensures that assistance meets the refugees, asylees and migrants' current and specific needs in an engaging, real-time feed.

**Refuge - AidConnect/RefugeeAid** emerges as a platform addressing the challenge of efficiently connecting aid workers and compassionate citizens with refugee camps or organizations. It ensures that assistance meets the refugees, asylees, and migrants' current and specific needs in an engaging, real-time feed.
This initiative is a part of the Mod 4, [Capstone Project](https://mod4.turing.edu/projects/capstone/) at Turing School.

<img width="504" alt="image" src="https://github.com/Sulton88Mehron90/showcase-project/assets/119267809/07d2bf4c-0b57-42b3-8254-56e133f377a3">

### <span style="color:#2E8B57;">Live Demo</span>


[Engage with Refuge](https://refugee-aid-fe.vercel.app/).

Upon entering the platform, users are greeted with a dynamic real-time feed showcasing the current needs of each camp. Navigate through the integrated map interface to locate nearby refugee camps swiftly. The platform also offers educational resources, empowering users with insights on effective assistance methods and cultural considerations.

<img width="504" alt="image" src="https://github.com/Sulton88Mehron90/showcase-project/assets/119267809/11311fac-e5a5-4ee8-aa0c-f1008cb1ad03">

### <span style="color:#2E8B57;">Features</span>
Expand All @@ -29,9 +30,8 @@

<img width="504" alt="image" src="https://github.com/Sulton88Mehron90/showcase-project/assets/119267809/ed99f7c3-67db-4b94-b607-0b2856770eb1">


### <span style="color:#2E8B57;">Preview of App</span>
<!-- ![Refuge](https://github.com/Sulton88Mehron90/showcase-project/blob/main/src/Images/avicenna-method-romjon.gif) -->
![Refuge](https://github.com/Refugee-Aid-Capstone/refugee-aid-fe/blob/main/src/images/refuge-2023.gif)

<img width="504" alt="image" src="https://github.com/Sulton88Mehron90/showcase-project/assets/119267809/b3c82159-82b5-4ba6-bae0-f26675c94957">

Expand All @@ -48,33 +48,26 @@
<a href="https://react.dev/" target="_blank"><img style="margin: 10px" src="https://profilinator.rishav.dev/skills-assets/react-original-wordmark.svg" alt="React" height="50" /></a>
<a href="https://docs.cypress.io/guides/overview/why-cypress" target="_blank"><img style="margin: 10px" src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQoXfntUBC8eXPGA7V8dQp74I5Xofeze3tnRua5hKQkd0ofyH0cy5mJm3_Y-zPhHO2ty9k&usqp=CAU" alt="Cypress" height="50" /></a>
<a href="https://graphql.org/" target="_blank"><img style="margin: 10px" src="https://graphql.org/img/logo.svg" alt="GraphQL" height="50" /></a>

<!-- <a href="https://www.apollographql.com/" target="_blank"><img style="margin: 10px" src="https://www.apollographql.com/docs/react/logo-apollo.svg" alt="Apollo Client" height="50" /></a>

<a href="#" target="_blank"><img style="margin: 10px" src="https://cdn.iconscout.com/icon/free/png-256/ci-cd-2957902-2445791.png" alt="CI/CD" height="50" /></a>
</div> -->
<div>
<a href="https://www.apollographql.com/" target="_blank" style="margin: 10px">Apollo Client</a>
<a href="YOUR_CI_CD_URL_HERE" target="_blank" style="margin: 10px">CI/CD</a>
<a href="https://www.apollographql.com/" target="_blank"><img style="margin: 10px" src="https://github.com/Refugee-Aid-Capstone/refugee-aid-fe/blob/main/src/images/apollo-client.png" alt="Apollo Client" height="50" /></a>
<a href="https://circleci.com/" target="_blank"><img style="margin: 10px" src="https://github.com/Refugee-Aid-Capstone/refugee-aid-fe/blob/main/src/images/ci-cd.png" alt="CI/CD" height="50" /></a>
</div>




<img width="504" alt="image" src="https://github.com/Sulton88Mehron90/showcase-project/assets/119267809/7b5f262b-9ed5-4594-acb2-5e71efe3c2ff">

<!-- ### <span style="color:#2E8B57;">Setup & Installation</span> -->
### <span style="color:#2E8B57;">Setup & Installation</span>

<!-- Get **Refuge** running on your machine:
Get **Refuge** running on your machine:

1. Clone the repository: `git clone git@github.com:Sulton88Mehron90/showcase-project.git`
2. Move to the project directory: `cd showcase-project`
1. Clone the repository from: `git clone https://github.com/Refugee-Aid-Capstone/refugee-aid-fe`
2. Move to the project directory: `cd refugee-aid-fe`
3. Grab the dependencies: `npm install`
4. Fire up the app: `npm start` -->
4. Fire up the app: `npm start`

<img width="504" alt="image" src="https://github.com/Sulton88Mehron90/showcase-project/assets/119267809/4d3bd651-f26c-45fc-8994-d1e81f47cee2">

### Feedback & Contributions

We welcome feedback and contributions to **Refuge**. If you have suggestions, bug reports, or wish to contribute to the code, follow these steps:
We welcome feedback and contributions to **Refuge**. If you have suggestions, bug reports, or wish to contribute to the code or just want to, follow these steps:

1. **Fork the Repository**: Start by forking [the main repository](https://github.com/Refugee-Aid-Capstone).
2. **Clone Your Fork**: `git clone [email protected]:YOUR_USERNAME/REPO_NAME.git`
Expand All @@ -90,22 +83,15 @@ For bug reports and feedback, please open an issue on our [GitHub issues page](h
### <span style="color:#2E8B57;">Learning Highlights</span>

- **GraphQL Mastery**: Delved deep into the world of GraphQL, harnessing its power for efficient and flexible data retrieval.
- **Apollo Client**: A comprehensive state management library for JavaScript that enables you to manage both local and remote data with GraphQL.
- **CI/CD Implementation**: Integrated Continuous Integration and Continuous Deployment pipelines, ensuring smooth transitions from development to production.
- **CI/CD Practices**: Continuous Integration and Continuous Deployment/Delivery, a coding practice where team members integrate their work frequently to detect integration bugs as early as possible.
- **React & Router**: Crafted a multi-page application, navigating the complexities of React Router.
- **Cypress**: Delved into Cypress, ensuring a robust frontend testing experience.
- **User-Centric Design**: Prioritized the user, focusing on their needs and feedback to drive the platform's features and design.

<img width="504" alt="image" src="https://github.com/Sulton88Mehron90/showcase-project/assets/119267809/4d3bd651-f26c-45fc-8994-d1e81f47cee2">

<!-- ### <span style="color:#2E8B57;">Contributor</span>

| Name | Role | GitHub | LinkedIn |
|------|------|--------|----------|
| Artemy Gibson | Backend | [GitHub](LINK_TO_GITHUB) | [LinkedIn](LINK_TO_LINKEDIN) |
| Ethan Black | Backend | [GitHub](LINK_TO_GITHUB) | [LinkedIn](LINK_TO_LINKEDIN) |
| Davis Weimer | Backend | [GitHub](LINK_TO_GITHUB) | [LinkedIn](LINK_TO_LINKEDIN) |
| Renee Pinna | Frontend | [GitHub](LINK_TO_GITHUB) | [LinkedIn](LINK_TO_LINKEDIN) |
| Parvin Sattorova | Frontend | [GitHub](LINK_TO_GITHUB) | [LinkedIn](LINK_TO_LINKEDIN) | -->
<img width="504" alt="image" src="https://github.com/Sulton88Mehron90/showcase-project/assets/119267809/4d3bd651-f26c-45fc-8994-d1e81f47cee2">

Meet the developers behind **Refuge**:

Expand Down Expand Up @@ -199,24 +185,8 @@ Meet the developers behind **Refuge**:

- **Custom Map Interface**: Designing an integrated map interface that was intuitive and user-friendly took several iterations and user feedback sessions. The final result was a blend of performance and aesthetics.

- **Responsive Design**: Ensuring the platform was equally effective across devices was challenging, given the variety of interactive elements. We utilized modern CSS frameworks and regular cross-device testing to achieve this.
- **Responsive Design**: Ensuring the platform was equally effective across devices was challenging, given the variety of interactive elements. We utilized SCSS and regular cross-device testing to achieve this.

- **Diverse Technologies**: Integrating a plethora of modern web technologies, from GraphQL to CI/CD pipelines, required a steep learning curve and rigorous testing. Yet, the end product stands as a testament to our commitment and persistence.

<img width="504" alt="image" src="https://github.com/Sulton88Mehron90/showcase-project/assets/119267809/d07cdccf-01dc-4aad-ab97-143def51d789">

<!--
Ethan Black Back-End Developer
https://github.com/ethanrossblack
https://avatars.githubusercontent.com/u/8324716?v=4
https://www.linkedin.com/in/ethanrossblack/

Artemy Gibson
https://github.com/algibson1
https://avatars.githubusercontent.com/u/123849704?v=4
https://www.linkedin.com/in/artemy-gibson/

Davis Weimer
https://github.com/DavisWeimer
https://avatars.githubusercontent.com/u/128326999?v=4
https://www.linkedin.com/in/davis-weimer/ -->
<img width="504" alt="image" src="https://github.com/Sulton88Mehron90/showcase-project/assets/119267809/d07cdccf-01dc-4aad-ab97-143def51d789">
2 changes: 1 addition & 1 deletion cypress/e2e/contactSection.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ describe('ContactSection Component - Sad Path', () => {
cy.visit('http://localhost:3000/contact');
cy.reload();
cy.viewport(1280, 720);
cy.get('img[alt="usa-custom"]').should('be.visible');
cy.get('img[alt="An illustration representing unity and inclusivity in the USA"]').should('be.visible');
});
});
99 changes: 86 additions & 13 deletions src/Components/Contact/Contact.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,95 @@
// import React from 'react';
// import '../Contact/Contact.scss'
// import weAllHuman from '../../images/usa-custom.jpeg';

// const ContactSection = () => {
// return (
// <div className="contact-section">
// <div className="top-section">
// <div className="left-side">
// <div className="weallhuman-container">
// <img src={weAllHuman} alt="usa-custom" className="weallhuman-img" />
// </div>
// </div>
// <div className="right-side">
// <h3 className="resources-header">HELPFUL RESOURCES</h3>
// <ul>
// <li>
// <a href="https://www.wrapsnet.org/documents/FY%202023%20Reception%20&%20Placement%20Fact%20Sheet.pdf" target="_blank" rel="noopener noreferrer">
// FY 2023 Reception & Placement Fact Sheet
// </a>
// </li>
// <li>
// <a href="https://www.wrapsnet.org/afghans-granted-humanitarian-parole/" target="_blank" rel="noopener noreferrer">
// R&P Affiliate Directory as of July 2023
// </a>
// </li>
// <li>
// <a href="https://www.wrapsnet.org/documents/Things%20You%20Need%20to%20Know%20About%20Resettling%20in%20the%20United%20States%20(English).pdf" target="_blank" rel="noopener noreferrer">
// Things You Need to Know About Resettling in the United States (English)
// </a>
// </li>
// <li>
// <a href="https://www.wrapsnet.org/documents/Things%20You%20Need%20to%20Know%20About%20Resettling%20in%20the%20United%20States%20(Dari).pdf" target="_blank" rel="noopener noreferrer">
// Things You Need to Know About Resettling in the United States (Dari/ دری)
// </a>
// </li>
// <li>
// <a href="https://www.wrapsnet.org/documents/Things%20You%20Need%20to%20Know%20About%20Resettling%20in%20the%20United%20States%20(Pashto).pdf" target="_blank" rel="noopener noreferrer">
// Things You Need to Know About Resettling in the United States (Pashto/ پښتو)
// </a>
// </li>
// </ul>
// </div>
// </div>

// <div className="bottom-section">
// <h2>CONTACT US</h2>
// <p className="small-text">Need technical assistance with this website? Send an email to:<a href="mailto:[email protected]">[email protected]</a></p>


// <p className="netflix-red">
// The U.S. Refugee Admissions Program (USRAP) is free of charge.
// Any requests to solicit funds for referral or access to the USRAP
// are illegitimate and not associated with the U.S. government.
// </p>
// <p className="government-links">
// <a href="https://www.state.gov/" target="_blank" rel="noopener noreferrer">U.S. Department of State</a> |
// <a href="https://www.state.gov/bureaus-offices/under-secretary-for-civilian-security-democracy-and-human-rights/bureau-of-population-refugees-and-migration/" target="_blank" rel="noopener noreferrer">Bureau of Population, Refugees, and Migration</a> |
// <a href="https://www.state.gov/refugee-admissions/" target="_blank" rel="noopener noreferrer">Refugee Admissions</a>
// </p>


// <footer>
// <p className="copyright-links">
// Copyright © 2016 Refugee Processing Center
// </p>
// <p className="special-links">
// <a href="https://www.wrapsnet.org/privacy-policy/" target="_blank" rel="noopener noreferrer">Privacy Statement</a> |
// <a href="https://www.wrapsnet.org/terms-of-use/" target="_blank" rel="noopener noreferrer">Terms of Use</a>
// </p>
// </footer>
// </div>
// </div>
// );
// };

// export default ContactSection;

import React from 'react';
import '../Contact/Contact.scss'
import weAllHuman from '../../images/usa-custom.jpeg';

const ContactSection = () => {
return (
<div className="contact-section">
<div className="contact-section" role="main">
<div className="top-section">
<div className="left-side">
<div className="weallhuman-container">
<img src={weAllHuman} alt="usa-custom" className="weallhuman-img" />
</div>
<div className="left-side" aria-label="Image container">
<img src={weAllHuman} alt="An illustration representing unity and inclusivity in the USA" className="weallhuman-img" />
</div>
<div className="right-side">
<h3 className="resources-header">HELPFUL RESOURCES</h3>
<ul>
<ul aria-label="List of helpful resources">
<li>
<a href="https://www.wrapsnet.org/documents/FY%202023%20Reception%20&%20Placement%20Fact%20Sheet.pdf" target="_blank" rel="noopener noreferrer">
FY 2023 Reception & Placement Fact Sheet
Expand Down Expand Up @@ -44,22 +120,18 @@ const ContactSection = () => {
</div>

<div className="bottom-section">
<h2>CONTACT US</h2>
<p className="small-text">Need technical assistance with this website? Send an email to:<a href="mailto:[email protected]">[email protected]</a></p>


<h2 id="contactHeader">CONTACT US</h2>
<p className="small-text" aria-describedby="contactHeader">Need technical assistance with this website? Send an email to:<a href="mailto:[email protected]">[email protected]</a></p>
<p className="netflix-red">
The U.S. Refugee Admissions Program (USRAP) is free of charge.
Any requests to solicit funds for referral or access to the USRAP
are illegitimate and not associated with the U.S. government.
</p>
<p className="government-links">
<a href="https://www.state.gov/" target="_blank" rel="noopener noreferrer">U.S. Department of State</a> |
<a href="https://www.state.gov/" target="_blank" rel="noopener noreferrer" aria-label="Visit U.S. Department of State website">U.S. Department of State</a> |
<a href="https://www.state.gov/bureaus-offices/under-secretary-for-civilian-security-democracy-and-human-rights/bureau-of-population-refugees-and-migration/" target="_blank" rel="noopener noreferrer">Bureau of Population, Refugees, and Migration</a> |
<a href="https://www.state.gov/refugee-admissions/" target="_blank" rel="noopener noreferrer">Refugee Admissions</a>
</p>


<footer>
<p className="copyright-links">
Copyright © 2016 Refugee Processing Center
Expand All @@ -75,3 +147,4 @@ const ContactSection = () => {
};

export default ContactSection;

Loading