RomanGolienko
/
Roman_applicant-site
forked from aslan/applicant-site
1
1
Fork 0
Code Pull Requests 2 Activity

prodV1 #2

Open
RomanGolienko wants to merge 309 commits from prodV1 into main
pull from: prodV1
merge into: RomanGolienko:main
Conversation 0 Commits 309 Files Changed 373 +18 -25
17 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 551864fbb8 - Show all commits

2
resources/views/admin/catalog/department/create.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.admin-layout')
@extends('layouts.admin_layout')
@section('content')
@auth()
<div class="row">

2
resources/views/admin/catalog/department/edit.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.admin-layout')
@extends('layouts.admin_layout')
@section('content')
@auth()
<div class="row">

2
resources/views/admin/catalog/department/index.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.admin-layout')
@extends('layouts.admin_layout')
@section('content')
<div class="container">
<h2>Кафедры</h2>

2
resources/views/admin/catalog/department/show.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.admin-layout')
@extends('layouts.admin_layout')
@section('content')
@auth()
<h6>

2
resources/views/admin/catalog/direction/create.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.admin-layout')
@extends('layouts.admin_layout')
@section('content')
@auth()
<div class="row">

2
resources/views/admin/catalog/direction/edit.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.admin-layout')
@extends('layouts.admin_layout')
@section('content')
@auth()

2
resources/views/admin/catalog/direction/index.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.admin-layout')
@extends('layouts.admin_layout')
@section('content')
<div class="container">
<h2>Направления</h2>

2
resources/views/admin/catalog/direction/show.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.admin-layout')
@extends('layouts.admin_layout')
@section('content')
@auth()
<h6>

2
resources/views/admin/catalog/educational_institution/create.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.admin-layout')
@extends('layouts.admin_layout')
@section('content')
@auth()
<div class="row">

2
resources/views/admin/catalog/educational_institution/edit.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.admin-layout')
@extends('layouts.admin_layout')
@section('content')
@auth()
<div class="row">

2
resources/views/admin/catalog/educational_institution/index.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.admin-layout')
@extends('layouts.admin_layout')
@section('content')
<div class="container">
<h2>Учебные заведения</h2>

2
resources/views/admin/catalog/educational_institution/show.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.admin-layout')
@extends('layouts.admin_layout')
@section('content')
@auth()
<div class="container mt-4">

2
resources/views/admin/catalog/faculty/create.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.admin-layout')
@extends('layouts.admin_layout')
@section('content')
@auth()
<div class="row">

2
resources/views/admin/catalog/faculty/edit.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.admin-layout')
@extends('layouts.admin_layout')
@section('content')
@auth()

2
resources/views/admin/catalog/faculty/index.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.admin-layout')
@extends('layouts.admin_layout')
@section('content')
<div class="container">
<h2>Факультеты</h2>

2
resources/views/admin/catalog/faculty/show.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.admin-layout')
@extends('layouts.admin_layout')
@section('content')
@auth()
<h6><a href="{{ route('educational_institutions.show', $faculty->educationalInstitution) }}">{{ $faculty->educationalInstitution->name }}</a> -> {{ $faculty->name }}</h6>

11
resources/views/layouts/admin-layout.blade.php → resources/views/layouts/admin_layout.blade.php
View File

@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="csrf-token" content="{{ csrf_token() }}">
<meta name="csrf-param" content="_token"/>
<title>Панель администратора</title>
@vite(['resources/js/app.js'])
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet">
@ -19,15 +18,11 @@
<ul class="nav col-9 col-md-auto mb-2 justify-content-start mb-md-0">
<li><a href="{{ route('dashboard') }}" class="nav-link px-2 link-secondary text-wrap" style="width: 4rem;">Главная</a>
</li>
</ul>
<div class="col-md-3 text-center">
<a href="{{ route('home') }}" class="nav-link px-2 link-secondary">Сайт abitur.mkgtu.ru</a>
</div>
<div class="col-md-3 text-end">
<div>
@guest()
<a href="{{ route("login") }}" class="btn btn-outline-primary me-2">
@ -46,11 +41,10 @@
</div>
</div>
</header>
<div class="row align-items-start">
<aside class="list-group col-2">
<ul>
<li class="list-group-item"><a href="{{ route('files.index') }}">Файлы</a></li>
<li class="list-group-item"><a href="{{ route('documents.index') }}">Документы</a></li>
<li class="list-group-item"><a href="{{ route('admin-reception-screen.index') }}">Экран Приема</a></li>
@if(!is_null(Auth::getUser()) && Auth::getUser()->name === 'admin')
<li class="list-group-item"></li>
@ -58,7 +52,7 @@
@endif
<li class="list-group-item"></li>
<li class="list-group-item">Справочники</li>
<li class="list-group-item"><a href="{{ route('educational-institutions.index') }}">Учебные
<li class="list-group-item"><a href="{{ route('educational_institutions.index') }}">Учебные
заведения</a></li>
<li class="list-group-item"><a href="{{ route('faculties.index') }}">Факультеты</a></li>
<li class="list-group-item"><a href="{{ route('departments.index') }}">Кафедры</a></li>
@ -67,7 +61,6 @@
</aside>
<main class="col-10">@yield('content')</main>
</div>
</div>
</body>
</html>