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.

Sign up for GitHub

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

Jump to bottom

Bugfix/welcome page #513

Merged
merged 6 commits into from
Jul 11, 2024
Merged

Bugfix/welcome page #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
77b3234
Fix wrong variable use (#483)
TimKardol Jul 11, 2024
2ba4055
Fix text on welcome page (#465)
TimKardol Jul 11, 2024
7f83a79
Fix text on FAQ page (#470)
TimKardol Jul 11, 2024
df2d825
Fix icons in the footer (#472)
TimKardol Jul 11, 2024
30e2e64
Fix 'powered by' to 'co-hosted by' (#464)
TimKardol Jul 11, 2024
f14e88a
Removed redundant code
TimKardol Jul 11, 2024
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
2 changes: 1 addition & 1 deletion resources/views/crew/sponsorships/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
@if($company->logo_path)
<img class="w-6 h-6 mx-auto my-auto max-w-full block dark:text-white"
src="{{ url('storage/'. $company->logo_path) }}"
alt="Logo of {{$team->name}}">
alt="Logo of {{$company->name}}">
@else
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
stroke-width="1"
Expand Down
4 changes: 3 additions & 1 deletion resources/views/faq.blade.php
View file
Open in desktop
TimKardol marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@
--}}
<div class="border rounded border-gray-300 shadow p-4 dark:bg-gray-800 dark:border-gray-700">
<dt class="leading-7 font-semibold text-base dark:text-white">Can I join the conference as a participant?</dt>
<dd class="leading-7 mt-2 dark:text-gray-200">You can if you are a HZ-ICT student, Scalda student, an Alumni HZ-ICT student, a company with a dedicated IT department or a member of our partnering company representatives. You can register using this website as soon as registrations have opened.</dd>
<dd class="leading-7 mt-2 dark:text-gray-200">You can join the conference if you are an IT student, an Alumni HZ-ICT student,
a company with a dedicated IT department or a member of our partnering company representatives.
You can register using this website as soon as registrations have opened.</dd>
</div>
<div class="border rounded border-gray-300 shadow p-4 dark:bg-gray-800 dark:border-gray-700">
<dt class="leading-7 font-semibold text-base dark:text-white">Can I be a partner with the 'We are in IT together Conference'?</dt>
Expand Down
37 changes: 11 additions & 26 deletions resources/views/layouts/app.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,37 +95,22 @@ class="bg-gradient-to-br from-gradient-light-blue via-gradient-light-pink to-gra
<span class="text-sm text-gray-500 dark:text-gray-300 sm:text-center"> © 2024 IT Together Conference | Made by IT-Conference Website Team. All Rights Reserved.
</span>
<div class="flex mt-4 sm:justify-center md:mt-0 space-x-5 rtl:space-x-reverse">
<a href="#" class="text-gray-400 hover:text-gray-900 dark:hover:text-white">
<svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg"
fill="currentColor"
viewBox="0 0 8 19">
<path fill-rule="evenodd"
d="M6.135 3H8V0H6.135a4.147 4.147 0 0 0-4.142 4.142V6H0v3h2v9.938h3V9h2.021l.592-3H5V3.591A.6.6 0 0 1 5.592 3h.543Z"
clip-rule="evenodd"/>
</svg>
<span class="sr-only">Facebook page</span>
</a>
<a href="#" class="text-gray-400 hover:text-gray-900 dark:hover:text-white">
<svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg"
fill="currentColor"
viewBox="0 0 21 16">
<a href="https://www.linkedin.com/company/we-are-in-it-together-conference/" class="text-gray-400 hover:text-gray-900 dark:hover:text-white">
<svg class="w-4 h-4 fill-blue-900" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512">
<path
d="M16.942 1.556a16.3 16.3 0 0 0-4.126-1.3 12.04 12.04 0 0 0-.529 1.1 15.175 15.175 0 0 0-4.573 0 11.585 11.585 0 0 0-.535-1.1 16.274 16.274 0 0 0-4.129 1.3A17.392 17.392 0 0 0 .182 13.218a15.785 15.785 0 0 0 4.963 2.521c.41-.564.773-1.16 1.084-1.785a10.63 10.63 0 0 1-1.706-.83c.143-.106.283-.217.418-.33a11.664 11.664 0 0 0 10.118 0c.137.113.277.224.418.33-.544.328-1.116.606-1.71.832a12.52 12.52 0 0 0 1.084 1.785 16.46 16.46 0 0 0 5.064-2.595 17.286 17.286 0 0 0-2.973-11.59ZM6.678 10.813a1.941 1.941 0 0 1-1.8-2.045 1.93 1.93 0 0 1 1.8-2.047 1.919 1.919 0 0 1 1.8 2.047 1.93 1.93 0 0 1-1.8 2.045Zm6.644 0a1.94 1.94 0 0 1-1.8-2.045 1.93 1.93 0 0 1 1.8-2.047 1.918 1.918 0 0 1 1.8 2.047 1.93 1.93 0 0 1-1.8 2.045Z"/>
d="M100.3 448H7.4V148.9h92.9zM53.8 108.1C24.1 108.1 0 83.5 0 53.8a53.8 53.8 0 0 1 107.6 0c0 29.7-24.1 54.3-53.8 54.3zM447.9 448h-92.7V302.4c0-34.7-.7-79.2-48.3-79.2-48.3 0-55.7 37.7-55.7 76.7V448h-92.8V148.9h89.1v40.8h1.3c12.4-23.5 42.7-48.3 87.9-48.3 94 0 111.3 61.9 111.3 142.3V448z" />
</svg>
<span class="sr-only">Discord community</span>
<span class="sr-only">Linkedin</span>
</a>
<a href="#" class="text-gray-400 hover:text-gray-900 dark:hover:text-white">
<svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg"
fill="currentColor"
viewBox="0 0 20 17">
<path fill-rule="evenodd"
d="M20 1.892a8.178 8.178 0 0 1-2.355.635 4.074 4.074 0 0 0 1.8-2.235 8.344 8.344 0 0 1-2.605.98A4.13 4.13 0 0 0 13.85 0a4.068 4.068 0 0 0-4.1 4.038 4 4 0 0 0 .105.919A11.705 11.705 0 0 1 1.4.734a4.006 4.006 0 0 0 1.268 5.392 4.165 4.165 0 0 1-1.859-.5v.05A4.057 4.057 0 0 0 4.1 9.635a4.19 4.19 0 0 1-1.856.07 4.108 4.108 0 0 0 3.831 2.807A8.36 8.36 0 0 1 0 14.184 11.732 11.732 0 0 0 6.291 16 11.502 11.502 0 0 0 17.964 4.5c0-.177 0-.35-.012-.523A8.143 8.143 0 0 0 20 1.892Z"
clip-rule="evenodd"/>
<a href="https://www.youtube.com/@weareinittogether" class="text-gray-400 hover:text-gray-900 dark:hover:text-white">
<svg class="w-4 h-4 fill-red-700" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512">
<path
d="M549.7 124.1c-6.3-23.7-24.8-42.3-48.3-48.6C458.8 64 288 64 288 64S117.2 64 74.6 75.5c-23.5 6.3-42 24.9-48.3 48.6-11.4 42.9-11.4 132.3-11.4 132.3s0 89.4 11.4 132.3c6.3 23.7 24.8 41.5 48.3 47.8C117.2 448 288 448 288 448s170.8 0 213.4-11.5c23.5-6.3 42-24.2 48.3-47.8 11.4-42.9 11.4-132.3 11.4-132.3s0-89.4-11.4-132.3zm-317.5 213.5V175.2l142.7 81.2-142.7 81.2z" />
</svg>
<span class="sr-only">Twitter page</span>
<span class="sr-only">Youtube</span>
</a>
<a href="#" class="text-gray-400 hover:text-gray-900 dark:hover:text-white">
<svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg"
<a href="https://github.com/HZ-HBO-ICT/it-conference" class="text-gray-400 hover:text-gray-900 dark:hover:text-white">
<svg class="w-4 h-4 fill-black" aria-hidden="true" xmlns="http://www.w3.org/2000/svg"
fill="currentColor"
viewBox="0 0 20 20">
<path fill-rule="evenodd"
Expand Down
34 changes: 4 additions & 30 deletions resources/views/welcome.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class="text-white w-full lg:ml-16 md:w-3/5 font-extrabold text-5xl lg:text-7xl m
</h1>
@if($goldSponsorCompany)
<h2 class="mt-3 pl-1 uppercase font-bold text-lg">
Powered by {{ $goldSponsorCompany->name }}
Co-hosted by {{ $goldSponsorCompany->name }}
</h2>
@endif
</div>
Expand Down Expand Up @@ -75,30 +75,6 @@ class="text-white w-full lg:ml-16 md:w-3/5 font-extrabold text-5xl lg:text-7xl m
@endif
@endif
</div>
{{-- <div class="flex flex-row">--}}
{{-- <div class="md:basis-1/2 basis-full md:pr-6 hidden md:flex lg:flex">--}}
{{-- <div class="flex flex-col items-start pt-10">--}}
{{-- <p class="text-black uppercase pb-2">15 November 2024</p>--}}
{{-- <x-countdown/>--}}
{{-- </div>--}}
{{-- </div>--}}
<!-- The div for the logo of the sponsor -->
<!-- TODO: Fix when database gets rebuilt -->
{{--@if($goldSponsor && $goldSponsor->is_sponsor_approved)
<div class="basis-1/3 pt-16">
<p class="uppercase pt-2 pl-24 text-gray-200">sponsored by</p>
</div>
<div class="basis-1/3 pt-16">
<p class="uppercase text-xl pt-1 pl-4 text-gold">{{ $goldSponsor->name }}</p>
</div>
@endif--}}
{{-- </div>--}}
<!-- TODO: Fix when authentication gets implemented -->
{{--@guest()
<div class="my-4 md:mt-16 lg:mt-16 xl:mt-16 flex flex-col items-center md:pb-12 lg:pb-0">
<x-custom-button-link href="{{ route('register') }}">Register now</x-custom-button-link>
</div>
@endguest--}}
</div>
</div>

Expand Down Expand Up @@ -148,11 +124,9 @@ class="absolute -top-48 -right-36 md:-top-32 md:-right-20 lg:-top-32 lg:-right-3
<div
class="absolute inset-0 bg-gradient-to-br from-gradient-light-blue via-gradient-light-pink to-gradient-light-pink dark:from-gradient-dark-blue dark:via-gradient-dark-pink dark:to-gradient-dark-pink opacity-80"></div>

<h2 class="flex justify-center mt-8 mb-5 uppercase text-xl font-montserrat font-bold relative z-10">What to
expect
on this
year's
conference?</h2>
<h2 class="flex justify-center mt-8 mb-5 uppercase text-xl font-montserrat font-bold relative z-10">
What to expect during the conference
</h2>

{{-- Cards for speakers, presentations, companies --}}
<div class="flex flex-wrap justify-between mb-16 lg:px-44 md:px-32 sm:px-24">
Expand Down
Loading