Skip to content

Commit

Permalink
Merge pull request #69 from RealEskalate/Blen.feat/post_hackathon_update
Browse files Browse the repository at this point in the history
Blen.feat/post hackathon update
  • Loading branch information
blenassefa2 authored Oct 28, 2024
2 parents 453ba0d + 26b640b commit 3c7edf0
Show file tree
Hide file tree
Showing 27 changed files with 851 additions and 224 deletions.
2 changes: 1 addition & 1 deletion dist/hacks-website/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,5 @@
<div class="square" id="sq9"></div>
</div>
</app-root>
<script src="runtime.fa4c12334e562a2f.js" type="module"></script><script src="polyfills.760898430c9172e5.js" type="module"></script><script src="scripts.f47a92d137b64119.js" defer></script><script src="vendor.ac5417b66aa71502.js" type="module"></script><script src="main.91088a41c272f59c.js" type="module"></script></body>
<script src="runtime.fa4c12334e562a2f.js" type="module"></script><script src="polyfills.760898430c9172e5.js" type="module"></script><script src="scripts.f47a92d137b64119.js" defer></script><script src="vendor.ac5417b66aa71502.js" type="module"></script><script src="main.8801ed7506f31619.js" type="module"></script></body>
</html>
1 change: 1 addition & 0 deletions dist/hacks-website/main.8801ed7506f31619.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dist/hacks-website/main.91088a41c272f59c.js

This file was deleted.

6 changes: 4 additions & 2 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ import { CoreDevComponent } from "./components/core-dev/core-dev.component";
import { DonateCardComponent } from "./components/donate-card/donate-card.component";
import { ContactUsComponent } from "./components/contact-us/contact-us.component";
import { DonationCardComponent } from "./components/donation-card/donation-card.component";

import { Winners2024Component } from "./components/winners-2024/winners-2024.component";
// import AboutUsComponent from './pages/about-us/about-us.component'
// import { ShareButton } from 'ngx-sharebuttons/button';

@NgModule({
declarations: [
AppComponent,
Expand Down Expand Up @@ -116,6 +116,8 @@ import { DonationCardComponent } from "./components/donation-card/donation-card.
LandingComponent,
TimelineComponent,
AboutUsComponent,
Winners2024Component

// NgxMatIntlTelInputComponent
// RegistrationComponent,
// ShareButton
Expand Down
22 changes: 11 additions & 11 deletions src/app/components/info/info.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
/>

<div
class="container relative max-lg:px-4 max-sm:mt-4 px-12 pt-4 mt-12 flex flex-col"
class="container relative max-lg:px-4 max-sm:mt-4 px-12 flex flex-col"
>
<div
class="flex flex-col lg:flex-row justify-center gap-x-12 items-center"
Expand All @@ -27,29 +27,29 @@
About The Hackathon
</p>
<p class="mt-3 text-gray-300 leading-relaxed">
Our exciting multi-stage Hackathon, starts with
Our exciting multi-stage Hackathon, started with
<span
class="text-transparent bg-gradient-to-r from-indigo-600 to-pink-500 bg-clip-text animate-text"
>Workshops</span
>
from 13-14 July, 2024. You'll learn about AI, hackathon dynamics, UI design and styling
from 13-14 July, 2024. Participants learnt about AI, hackathon dynamics, UI design and styling
and project management tools.
</p>
<p class="mt-3 text-gray-300 leading-relaxed">
Then, from July 19-22, compete in the
Then, from July 19-22, they competed in the
<span
class="text-transparent bg-gradient-to-r from-indigo-600 to-pink-500 bg-clip-text animate-text"
>Quarter-finals</span
>, a virtual hackathon where you'll aim for a spot among the top 30
projects. Throughout, expert mentors will guide you.
>, a virtual hackathon where they aimed for a spot among the top 32
projects. Throughout, expert mentors were guiding them.
</p>
<p class="mt-3 text-gray-300 leading-relaxed">
In the
<span
class="text-transparent bg-gradient-to-r from-indigo-600 to-pink-500 bg-clip-text animate-text"
>Semi-finals</span
>
(July 28 - September 20, 2024), selected 32 teams will receive
(July 28 - September 20, 2024), selected 32 teams received
ongoing support to refine their projects with feedback.
</p>
<p class="mt-3 text-gray-300 leading-relaxed">
Expand All @@ -58,8 +58,8 @@
class="text-transparent bg-gradient-to-r from-indigo-600 to-pink-500 bg-clip-text animate-text"
>Grand Finale</span
>
on October 12-17, 2024, is the ultimate showdown. The top 8 teams
will fly to Ethiopia for an all-expense-paid event, competing for a
on October 12-17, 2024, was the ultimate showdown. The top 7 teams
flew to Ethiopia for an all-expense-paid event, competing for a
$30,000 USD prize pool and presenting their projects to a
distinguished jury.
</p>
Expand Down Expand Up @@ -87,7 +87,7 @@
>Get Hackathon Calendar</a
>
</div> -->
<a href="https://form.typeform.com/to/XoEqw6vQ" target="_blank">
<!-- <a href="https://form.typeform.com/to/XoEqw6vQ" target="_blank">
<button
(click)="
setActiveButton(
Expand All @@ -99,7 +99,7 @@
>
Sign up for event updates
</button>
</a>
</a> -->
<!-- </div> -->
</div>
<img
Expand Down
32 changes: 14 additions & 18 deletions src/app/components/landing/landing.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -113,25 +113,25 @@
</div>
</div>
<p>In case you missed the Grand Finale:
<span class="bg-purple-500 text-white rounded bg-opacity-50 rounded-2xl p-2 hover:bg-gradient-to-r from-purple-700 to-pink-500 hover:cursor-pointer hover:text-white">
<!-- <span class="bg-purple-500 text-white rounded bg-opacity-50 rounded-2xl p-2 hover:bg-gradient-to-r from-purple-700 to-pink-500 hover:cursor-pointer hover:text-white">
<a class="font-bold " (click)="setActiveButton('stream', 'https://www.youtube.com/live/f6zPchafc9Y?si=RGTQYSuzagCXf1qk
')">
<b> Find the live stream here</b>
</a>
</span>
</span> -->
</p>
</div>

<!-- <div
<div
class="flex flex-col md:flex-row max-md:items-center justify-start"
>
<button
(click)="onShowAdvisorsModal()"
(click)="setActiveButton('stream', 'https://www.youtube.com/live/f6zPchafc9Y?si=RGTQYSuzagCXf1qk')"
class="max-md:mt-5 text-sm rounded-full px-8 py-3 text-white transition-all bg-purple-500 cursor-pointer ease-out duration-300 left-1/2 hover:bg-gradient-to-r from-purple-700 to-pink-500"
>
<span>Partner with us</span>
<span>Find the live stream here</span>
</button>
</div> -->
</div>
</div>
</section>
</div>
Expand All @@ -151,18 +151,14 @@
aria-hidden="true"
>
<div class="relative h-full w-full">
<video
autoplay
[muted]="isMuted"
loop
class="w-full object-cover h-full"
>
<source
src="https://res.cloudinary.com/eskalate/video/upload/v1729275428/Hackathon-2024/Biggest_Tech_Competition_in_Africa_Ever_-_A2SV_Hackathon.mp4"
type="video/mp4"
/>
Your browser does not support the video tag.
</video>
<iframe
id="videoIframe"
class="h-full w-full absolute bg-black inset-0 object-center object-contain rounded-2xl"
src="https://www.youtube.com/embed/-pqUq5bFu3E?si=BDBKqeDBNnOfOFdY"
frameborder="0"
allow="autoplay; fullscreen; picture-in-picture"
allowfullscreen
></iframe>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/prize2024/prize2024.component.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<section
id="prize2024"
id=""
class=" fade min-h-screen py-24 max-sm:px-4 max-md:py-16 max-xl:px-12 px-5 flex flex-col justify-center items-center"
>
<!-- This is the video content -->
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/projects/projects.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
}
.child-component {
margin: 0; /* Set margin to zero to remove spacing between child components */
}
}
Loading

0 comments on commit 3c7edf0

Please sign in to comment.