Merge remote-tracking branch 'origin/main'

# Conflicts: # routes/web.php
2024-01-11 15:11:05 +03:00 · 2024-01-11 15:11:05 +03:00 · 1383cad8b9
parent 6dcf2c390f 727fcff641
commit 1383cad8b9
254 changed files with 14968 additions and 1 deletions
--- a/2
+++ b/2
@ -1,5 +1,5 @@
 start:
-	php artisan serve --host 0.0.0.0
+	php artisan serve
 start-frontend:
 	npm run dev
--- a/public/fonts/ElegantIcons.eot
+++ b/public/fonts/ElegantIcons.eot
--- a/public/fonts/ElegantIcons.svg
+++ b/public/fonts/ElegantIcons.svg
--- a/public/fonts/ElegantIcons.ttf
+++ b/public/fonts/ElegantIcons.ttf
--- a/public/fonts/ElegantIcons.woff
+++ b/public/fonts/ElegantIcons.woff
--- a/public/fonts/fa-brands-400.ttf
+++ b/public/fonts/fa-brands-400.ttf
--- a/public/fonts/fa-brands-400.woff2
+++ b/public/fonts/fa-brands-400.woff2
--- a/public/fonts/fa-light-300.ttf
+++ b/public/fonts/fa-light-300.ttf
--- a/public/fonts/fa-light-300.woff2
+++ b/public/fonts/fa-light-300.woff2
--- a/public/fonts/fa-regular-400.ttf
+++ b/public/fonts/fa-regular-400.ttf
--- a/public/fonts/fa-regular-400.woff2
+++ b/public/fonts/fa-regular-400.woff2
--- a/public/fonts/fa-solid-900.ttf
+++ b/public/fonts/fa-solid-900.ttf
--- a/public/fonts/fa-solid-900.woff2
+++ b/public/fonts/fa-solid-900.woff2
--- a/public/fonts/fa-thin-100.ttf
+++ b/public/fonts/fa-thin-100.ttf
--- a/public/fonts/fa-thin-100.woff2
+++ b/public/fonts/fa-thin-100.woff2
--- a/public/fonts/fa-v4compatibility.ttf
+++ b/public/fonts/fa-v4compatibility.ttf
--- a/public/fonts/fa-v4compatibility.woff2
+++ b/public/fonts/fa-v4compatibility.woff2
--- a/public/fonts/uicons-bold-rounded.eot
+++ b/public/fonts/uicons-bold-rounded.eot
--- a/public/fonts/uicons-bold-rounded.woff
+++ b/public/fonts/uicons-bold-rounded.woff
--- a/public/fonts/uicons-bold-rounded.woff2
+++ b/public/fonts/uicons-bold-rounded.woff2
--- a/public/fonts/uicons-bold-straight.eot
+++ b/public/fonts/uicons-bold-straight.eot
--- a/public/fonts/uicons-bold-straight.woff
+++ b/public/fonts/uicons-bold-straight.woff
--- a/public/fonts/uicons-bold-straight.woff2
+++ b/public/fonts/uicons-bold-straight.woff2
--- a/public/fonts/uicons-regular-rounded.eot
+++ b/public/fonts/uicons-regular-rounded.eot
--- a/public/fonts/uicons-regular-rounded.woff
+++ b/public/fonts/uicons-regular-rounded.woff
--- a/public/fonts/uicons-regular-rounded.woff2
+++ b/public/fonts/uicons-regular-rounded.woff2
--- a/public/fonts/uicons-regular-straight.eot
+++ b/public/fonts/uicons-regular-straight.eot
--- a/public/fonts/uicons-regular-straight.woff
+++ b/public/fonts/uicons-regular-straight.woff
--- a/public/fonts/uicons-regular-straight.woff2
+++ b/public/fonts/uicons-regular-straight.woff2
--- a/public/fonts/uicons-solid-rounded.eot
+++ b/public/fonts/uicons-solid-rounded.eot
--- a/public/fonts/uicons-solid-rounded.woff
+++ b/public/fonts/uicons-solid-rounded.woff
--- a/public/fonts/uicons-solid-rounded.woff2
+++ b/public/fonts/uicons-solid-rounded.woff2
--- a/public/fonts/uicons-solid-straight.eot
+++ b/public/fonts/uicons-solid-straight.eot
--- a/public/fonts/uicons-solid-straight.woff
+++ b/public/fonts/uicons-solid-straight.woff
--- a/public/fonts/uicons-solid-straight.woff2
+++ b/public/fonts/uicons-solid-straight.woff2
--- a/public/img/about/about-1.jpg
+++ b/public/img/about/about-1.jpg
--- a/public/img/about/about-2.1.png
+++ b/public/img/about/about-2.1.png
--- a/public/img/about/about-2.jpg
+++ b/public/img/about/about-2.jpg
--- a/public/img/about/about-3.jpg
+++ b/public/img/about/about-3.jpg
--- a/public/img/about/about-shapes.png
+++ b/public/img/about/about-shapes.png
--- a/public/img/about/mgtu1.jpg
+++ b/public/img/about/mgtu1.jpg
--- a/public/img/about/mgtu2.jpg
+++ b/public/img/about/mgtu2.jpg
--- a/public/img/about/ring-shape.png
+++ b/public/img/about/ring-shape.png
--- a/public/img/bg/2.jpg
+++ b/public/img/bg/2.jpg
--- a/public/img/bg/3.jpg
+++ b/public/img/bg/3.jpg
--- a/public/img/bg/agrar.jpg
+++ b/public/img/bg/agrar.jpg
--- a/public/img/bg/ecology.jpg
+++ b/public/img/bg/ecology.jpg
--- a/public/img/bg/econom.jpg
+++ b/public/img/bg/econom.jpg
--- a/public/img/bg/ecouprkon.jpg
+++ b/public/img/bg/ecouprkon.jpg
--- a/public/img/bg/farm.jpg
+++ b/public/img/bg/farm.jpg
--- a/public/img/bg/fis.jpg
+++ b/public/img/bg/fis.jpg
--- a/public/img/bg/inzh.jpg
+++ b/public/img/bg/inzh.jpg
--- a/public/img/bg/med.jpg
+++ b/public/img/bg/med.jpg
--- a/public/img/bg/ped.jpg
+++ b/public/img/bg/ped.jpg
--- a/public/img/bg/photo.jpg
+++ b/public/img/bg/photo.jpg
--- a/public/img/bg/stomat.jpg
+++ b/public/img/bg/stomat.jpg
--- a/public/img/bg/tech.jpg
+++ b/public/img/bg/tech.jpg
--- a/public/img/bg/uprtechsiskon.jpg
+++ b/public/img/bg/uprtechsiskon.jpg
--- a/public/img/blog/blog-1.jpg
+++ b/public/img/blog/blog-1.jpg
--- a/public/img/blog/blog-2.jpg
+++ b/public/img/blog/blog-2.jpg
--- a/public/img/blog/blog-3.jpg
+++ b/public/img/blog/blog-3.jpg
--- a/public/img/blog/blog-4.jpg
+++ b/public/img/blog/blog-4.jpg
--- a/public/img/blog/blog-bg-1.jpg
+++ b/public/img/blog/blog-bg-1.jpg
--- a/public/img/blog/blog-big-1.jpg
+++ b/public/img/blog/blog-big-1.jpg
--- a/public/img/blog/blog-big-2.jpg
+++ b/public/img/blog/blog-big-2.jpg
--- a/public/img/blog/blog-big-3.jpg
+++ b/public/img/blog/blog-big-3.jpg
--- a/public/img/blog/comments/comment-1.jpg
+++ b/public/img/blog/comments/comment-1.jpg
--- a/public/img/blog/comments/comment-2.jpg
+++ b/public/img/blog/comments/comment-2.jpg
--- a/public/img/blog/comments/comment-3.jpg
+++ b/public/img/blog/comments/comment-3.jpg
--- a/public/img/brand/agrar_fak.png
+++ b/public/img/brand/agrar_fak.png
--- a/public/img/brand/eco_fak.png
+++ b/public/img/brand/eco_fak.png
--- a/public/img/brand/ecolog_fak.png
+++ b/public/img/brand/ecolog_fak.png
--- a/public/img/brand/farm_fak.png
+++ b/public/img/brand/farm_fak.png
--- a/public/img/brand/fis_fak.png
+++ b/public/img/brand/fis_fak.png
--- a/public/img/brand/inz_fak.png
+++ b/public/img/brand/inz_fak.png
--- a/public/img/brand/lech_fak.png
+++ b/public/img/brand/lech_fak.png
--- a/public/img/brand/med_inst.png
+++ b/public/img/brand/med_inst.png
--- a/public/img/brand/mezd_fak.png
+++ b/public/img/brand/mezd_fak.png
--- a/public/img/brand/pediatr_fak.png
+++ b/public/img/brand/pediatr_fak.png
--- a/public/img/brand/posl_fak.png
+++ b/public/img/brand/posl_fak.png
--- a/public/img/brand/stomat_fak.png
+++ b/public/img/brand/stomat_fak.png
--- a/public/img/brand/tech_fak.png
+++ b/public/img/brand/tech_fak.png
--- a/public/img/breadcrumb/breadcrumb-bg-2.jpg
+++ b/public/img/breadcrumb/breadcrumb-bg-2.jpg
--- a/public/img/breadcrumb/breadcrumb-bg-3.jpg
+++ b/public/img/breadcrumb/breadcrumb-bg-3.jpg
--- a/public/img/breadcrumb/breadcrumb-bg.jpg
+++ b/public/img/breadcrumb/breadcrumb-bg.jpg
--- a/public/img/counter/countdown-bg.jpg
+++ b/public/img/counter/countdown-bg.jpg
--- a/public/img/courses/abit.png
+++ b/public/img/courses/abit.png
--- a/public/img/courses/abroad.png
+++ b/public/img/courses/abroad.png
--- a/public/img/courses/courses.png
+++ b/public/img/courses/courses.png
--- a/public/img/courses/doconline.png
+++ b/public/img/courses/doconline.png
--- a/public/img/courses/ekrpriem.png
+++ b/public/img/courses/ekrpriem.png
--- a/public/img/courses/fon/1.jpg
+++ b/public/img/courses/fon/1.jpg
--- a/public/img/courses/fon/2.jpg
+++ b/public/img/courses/fon/2.jpg
--- a/public/img/courses/fon/3.jpg
+++ b/public/img/courses/fon/3.jpg
--- a/public/img/courses/fon/4.jpg
+++ b/public/img/courses/fon/4.jpg
--- a/public/img/courses/fon/5.jpg
+++ b/public/img/courses/fon/5.jpg
--- a/public/img/courses/fon/6.jpg
+++ b/public/img/courses/fon/6.jpg
--- a/public/img/courses/fon/7.jpg
+++ b/public/img/courses/fon/7.jpg
--- a/public/img/courses/fon/8.jpg
+++ b/public/img/courses/fon/8.jpg
--- a/public/img/courses/openday.png
+++ b/public/img/courses/openday.png
--- a/Show More
+++ b/Show More