merge error?

CodeWithAloha · Sep 20, 2023 · de83836 · de83836
2 parents 7359539 + 83d0c21
commit de83836
Show file tree

Hide file tree

Showing 38 changed files with 10 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ An intuitive section that welcomes potential volunteers. Here, they'll find dire
 To run this project locally:
 
 1. Clone the repository: `git clone https://github.com/CodeWithAloha/CWAWebsite.git`
-2. Navigate to the project directory: `cd code-with-aloha`
+2. Navigate to the project directory: `cd CWAWebsite`
 3. Install the dependencies: `npm install`
 4. Start the development server: `npm run dev`
 

diff --git a/public/assets/KurtMalley.jpeg b/public/assets/KurtMalley.jpeg
diff --git a/public/assets/MikeAvendano.jpeg b/public/assets/MikeAvendano.jpeg
diff --git a/public/assets/TreyGordner.jpeg b/public/assets/TreyGordner.jpeg
diff --git a/public/assets/TylerChong.jpeg b/public/assets/TylerChong.jpeg
diff --git a/public/chicken.png b/public/chicken.png
diff --git a/public/deliveredProjects.png b/public/deliveredProjects.png
diff --git a/public/experience.png b/public/experience.png
diff --git a/public/experience.svg b/public/experience.svg
diff --git a/public/meet.png b/public/meet.png
diff --git a/public/meet.svg b/public/meet.svg
diff --git a/public/one.png b/public/one.png
diff --git a/public/palm.png b/public/palm.png
diff --git a/public/progress.png b/public/progress.png
diff --git a/public/progress.svg b/public/progress.svg
diff --git a/public/projects.png b/public/projects.png
diff --git a/public/projectsAssets/HIERR.png b/public/projectsAssets/HIERR.png
diff --git a/public/projectsAssets/HawaiiZoningAtlas.png b/public/projectsAssets/HawaiiZoningAtlas.png
diff --git a/public/projectsAssets/client1.png b/public/projectsAssets/client1.png
diff --git a/public/projectsAssets/client2.png b/public/projectsAssets/client2.png
diff --git a/public/projectsAssets/deliveredProjects.png b/public/projectsAssets/deliveredProjects.png
diff --git a/public/projectsAssets/foodoasis.jpg b/public/projectsAssets/foodoasis.jpg
diff --git a/public/projectsAssets/habitat-full.jpg b/public/projectsAssets/habitat-full.jpg
diff --git a/public/projectsAssets/historicalprojects.png b/public/projectsAssets/historicalprojects.png
diff --git a/public/projectsAssets/projects.png b/public/projectsAssets/projects.png
diff --git a/public/projectsAssets/uipa.jpg b/public/projectsAssets/uipa.jpg
diff --git a/public/three.png b/public/three.png
diff --git a/public/timeline-1.jpg b/public/timeline-1.jpg
diff --git a/public/timeline-2.jpg b/public/timeline-2.jpg
diff --git a/public/timeline-3.jpg b/public/timeline-3.jpg
diff --git a/public/timeline-4.jpg b/public/timeline-4.jpg
diff --git a/public/timeline-5.jpg b/public/timeline-5.jpg
diff --git a/public/timeline-6.png b/public/timeline-6.png
diff --git a/public/timeline-7.png b/public/timeline-7.png
diff --git a/public/two.png b/public/two.png
diff --git a/src/components/OurFocus.js b/src/components/OurFocus.js
@@ -34,8 +34,9 @@ const OurFocus = () => {
           width='500'
           height='283'
           title="Meet new people"
-          text="Meet supportive people like you who care. If you are passionate
-              about helping others, Code With Aloha is perfect to support you."
+          text="Build with, not for. We are a community of people who are passionate
+          about helping others. We are here to support each other and
+          build together."
         />
 
         <TextBlock
@@ -44,8 +45,8 @@ const OurFocus = () => {
           width='500'
           height='266'
           title="Make a Difference"
-          text="Make a difference contributing to Hawaiian social impact projects.
-              Leverage technology to help organizations solve problems."
+          text="Nobody is coming to save us. It's up to us to impact our community and drive change.
+          We are the ones we've been waiting for. We are the change that we seek."
           className="xl:flex-row-reverse"
         />
 

diff --git a/src/components/Team.js b/src/components/Team.js
@@ -37,14 +37,6 @@ const Team = () => {
         <h2 className='pl-2 text-md xl:text-xl'>Email:</h2>{" "}
       </div>
       <h2 className='text-md xl:text-xl px-2'>codewithaloha@gmail.com</h2>{" "}
-      <div className='container flex flex-col items-center justify-center  mx-auto pt-10 pb-20'>
-        <div className='flex flex-row flex-wrap justify-center '>
-          <TeamMember width='450' height='450' src='./assets/TreyGordner.jpeg/' name='Trey Gordner' />
-          <TeamMember width='460' height='460' src='./assets/TylerChong.jpeg/' name='Tyler Chong' />
-          <TeamMember width='517' height='517' src='./assets/MikeAvendano.jpeg/' name='Mike Avendano' />
-          <TeamMember width='200' height='200' src='./assets/KurtMalley.jpeg/' name='Kurt Malley' />
-        </div>
-      </div>
     </>
   );
 };

diff --git a/src/components/Timeline.js b/src/components/Timeline.js
@@ -100,7 +100,7 @@ const scaleY = useSpring(scrollYProgress);
               src="./assets/timeline-7.png"
               date="June 2023"
               title="Code for America Brigade Cancellation"
-              text="Code for America cancels the local brigades program. Code for Hawaii rebrands as Code With Aloha."
+              text="Code for America cancels the local brigades program. Code for Hawaii rebrands as Code With Aloha and joins many other previous brigades in the Alliance of Civic Technologists."
             />
           </ul>
         </div>