Skip to content

Commit

Permalink
refactor:Add refactored the UI to components to match the overol thea…
Browse files Browse the repository at this point in the history
…m and colors
  • Loading branch information
Sulton88Mehron90 committed Oct 21, 2023
1 parent a47a858 commit 0eee07a
Show file tree
Hide file tree
Showing 10 changed files with 302 additions and 89 deletions.
2 changes: 1 addition & 1 deletion 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 Down
3 changes: 2 additions & 1 deletion src/Components/DropDown/DropDown.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.suggestion-dropdown {
background-color: white;
// background-color: white;
background-color: #30acf6;
margin-right: 1rem;
flex: 1;
max-width: 300px;
Expand Down
3 changes: 2 additions & 1 deletion src/Components/NavBar/NavBar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ body {

.nav-button {
background-color: #3498db;
color: #ffffff;
// color: #ffffff;
color: #031662;
border: none;
padding: 10px 20px;
border-radius: 5px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
border: none;
cursor: pointer;
transition: background-color 0.3s ease;
margin-top: 1rem;

// Approve button style
&:nth-child(1) {
Expand Down
274 changes: 199 additions & 75 deletions src/Components/ProvideAidPage/ProvideAidPage.scss
Original file line number Diff line number Diff line change
@@ -1,110 +1,234 @@
// .provide-aid-page {
// margin-top: 2rem;
// display: flex;
// flex-direction: column;
// height: 100vh;
// }

// .content-section {
// padding: 2rem;
// display: grid;
// grid-template-columns: 1fr 1fr;
// gap: 2rem;
// }

// .search-section,
// .organization-display {
// padding: 1.5rem;
// background-color: rgb(233, 235, 229);
// box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
// }

// .welcome-image-container {
// display: flex;
// justify-content: center;
// align-items: center;
// width: 100%;
// height: 100%;
// border-radius: 5px;
// }

// .welcome-image {
// max-width: 100%;
// max-height: 100%;
// }

// .search-section {
// input[type='text'] {
// padding: .6rem;
// border: none;
// border-radius: 5px;
// box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
// font-size: 16px;
// transition: box-shadow 0.3s;

// &:focus {
// box-shadow: 0 3px 10px rgba(0, 0, 0, 0.2);
// outline: none;
// }
// }
// }

// .left-section .filter-fields select {
// flex: 1;
// padding: 10px 25px;
// margin-right: 50px;
// border-radius: 5px;
// box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
// font-size: 13px;
// transition: box-shadow 0.3s;
// margin-bottom: 4rem;
// margin-top: -20rem;

// &:focus {
// box-shadow: 0 3px 10px rgba(0, 0, 0, 0.2);
// outline: none;
// }
// }

// .organization-display {
// flex: 2;

// h2 {
// margin-top: 0;
// color: #333;
// }

// p {
// margin-bottom: 10px;
// color: #555;
// }

// .map-placeholder {
// width: 300px;
// height: 300px;
// background-color: #e9ecef;
// margin-top: 20px;
// border: none;
// border-radius: 5px;
// box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
// }
// }

// .some-element {
// width: 300px;
// font-size: 16px;
// }

// @media (max-width: 768px) {
// .some-element {
// width: 200px;
// font-size: 14px;
// }
// }

// @media (max-width: 480px) {
// .some-element {
// width: 100%;
// font-size: 12px;
// }
// }

$primary-color: #37b3fe;
$secondary-color: #3c8bc9;
$netflix-red: #031662;
$default-padding: 10px;
$dark-bg: $secondary-color;
$lighter-bg: #2a6f9e;
$font-stack: 'Arial', sans-serif;

* {
font-family: $font-stack;
transition: all 0.3s;
}

.provide-aid-page {
margin-top: 2rem;
display: flex;
flex-direction: column;
height: 100vh;
background-color: $dark-bg;
margin-top: 2rem;
display: flex;
flex-direction: column;
height: 100vh;
color: #fff;
}

.content-section {
padding: 2rem;
display: grid;
grid-template-columns: 1fr 1fr;
gap: 2rem;
padding: $default-padding * 2;
display: grid;
grid-template-columns: 1fr 1fr;
gap: 3rem;
}

.search-section,
.organization-display {
padding: 1.5rem;
background-color: rgb(233, 235, 229);
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
padding: $default-padding * 1.5;
background-color: $lighter-bg;
border-radius: 5px;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
}

.welcome-image-container {
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
.welcome-image-container {
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
border-radius: 5px;
overflow: hidden;
}

.search-section {
input[type='text'] {
padding: .6rem;
border: none;
border-radius: 5px;
background-color: darken($lighter-bg, 10%);
color: #fff;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
}

.welcome-image {
max-width: 100%;
max-height: 100%;
}

.search-section {
input[type='text'] {
padding: .6rem;

.left-section .filter-fields select {
background-color: darken($lighter-bg, 10%);
color: #fff;
border: none;
padding: $default-padding;
border-radius: 5px;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
font-size: 16px;
transition: box-shadow 0.3s;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
transition: box-shadow 0.3s ease;

&:focus {
box-shadow: 0 3px 10px rgba(0, 0, 0, 0.2);
outline: none;
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
outline: none;
}
}
}

.left-section .filter-fields select {
flex: 1;
padding: 10px 25px;
margin-right: 50px;
border-radius: 5px;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
font-size: 13px;
transition: box-shadow 0.3s;
margin-bottom: 4rem;
margin-top: -20rem;

&:focus {
box-shadow: 0 3px 10px rgba(0, 0, 0, 0.2);
outline: none;
}
}

.organization-display {
flex: 2;
h2 {
color: $netflix-red;
font-size: 1.5em;
margin-bottom: 1rem;
}

h2 {
margin-top: 0;
color: #333;
}
p {
color: #EAEAEA;
margin: 10px;
}

p {
margin-bottom: 10px;
color: #555;
}
.map-placeholder {
background-color: $lighter-bg;
width: 100%;
height: auto;
border-radius: 5px;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
}
}

.map-placeholder {
.some-element {
width: 300px;
height: 300px;
background-color: #e9ecef;
margin-top: 20px;
border: none;
font-size: 16px;
background-color: darken($lighter-bg, 15%);
border-radius: 5px;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
}
}
padding: $default-padding;
color: #fff;
transition: transform 0.3s ease;

.some-element {
width: 300px;
font-size: 16px;
&:hover {
transform: scale(1.05);
}
}


@media (max-width: 768px) {
.some-element {
width: 200px;
font-size: 14px;
}
.some-element {
width: 200px;
font-size: 14px;
}
}

@media (max-width: 480px) {
.some-element {
width: 100%;
font-size: 12px;
}
.some-element {
width: 100%;
font-size: 12px;
}
}
Loading

0 comments on commit 0eee07a

Please sign in to comment.