Skip to content

Commit

Permalink
- resolving conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
krzysztofrewak committed Sep 10, 2024
1 parent 8b460ac commit d195d45
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 15 deletions.
5 changes: 0 additions & 5 deletions app/Http/Controllers/Public/ContactController.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,7 @@ public function __invoke(): Response
$contactInfos = ContactInfo::query()->get();

return inertia("Public/Contact", [
"title" => $settings->teacher_titles,
"name" => $settings->teacher_name,
"email" => $settings->teacher_email,
"department" => $settings->department_name,
"university" => $settings->university_name,
"universityLogo" => asset("cwup-full.png"),
"contactInfos" => $contactInfos->map(fn(ContactInfo $contactInfo): ContactInfoData => ContactInfoData::fromModel($contactInfo)),
]);
}
Expand Down
9 changes: 0 additions & 9 deletions resources/js/Pages/Public/Contact.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,7 @@ import ContactItem from '@/Shared/Components/ContactItem.vue'
import { NoSymbolIcon } from '@heroicons/vue/24/outline'
defineProps({
title: String,
name: String,
email: String,
department: String,
university: String,
universityLogo: String,
sectionSettings: Object,
about: Array,
counters: Array,
contactInfos: Array,
})
</script>
Expand All @@ -36,7 +28,6 @@ defineProps({
Informacje kontaktowe.
</template>
</SectionHeader>
<img src="/cwup.png" alt="" class="pointer-events-none absolute right-0 z-0 hidden w-1/2 opacity-10 lg:mt-16 lg:block xl:mt-10 2xl:mt-0">
<div class="mx-auto mt-10 border-t border-gray-200 pt-10 sm:mt-16 sm:pt-16 lg:mx-0 lg:max-w-none lg:grid-cols-3">
<div class="mx-auto max-w-7xl text-center lg:mx-0 lg:flex-auto ">
<div v-if="email" class="mx-auto max-w-2xl py-6 text-left lg:mx-0 xl:py-3">
Expand Down
2 changes: 1 addition & 1 deletion resources/js/Pages/Public/Faq.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ defineProps({
FAQ
</template>
<template #subheader>
Często zadawane pytania i odpowiedzi na nie
Często zadawane pytania i odpowiedzi na nie.
</template>
</SectionHeader>

Expand Down

0 comments on commit d195d45

Please sign in to comment.