Commit 5c6477d6 authored by Lucas Nunes's avatar Lucas Nunes

fix

parent 95d806a7
......@@ -2,9 +2,17 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="853286ae-8652-453d-8e83-ab776ad9c7ae" name="Default" comment="fix">
<change afterPath="$PROJECT_DIR$/resources/lang/pt-Br/messenger.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/database/seeds/PageSeeder.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/seeds/PageSeeder.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/database/seeds/SliderSeeder.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/seeds/SliderSeeder.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/lang/pt-Br/labels.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/pt-Br/labels.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/lang/pt-Br/menus.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/pt-Br/menus.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/lang/pt-Br/roles.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/pt-Br/roles.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/backend/messages/index-desktop.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/backend/messages/index-desktop.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/frontend/courses/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/frontend/courses/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/routes/backend/admin.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/backend/admin.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/gerardojbaez/messenger/src/Messenger/Models/MessageThread.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/gerardojbaez/messenger/src/Messenger/Models/MessageThread.php" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -270,7 +278,7 @@
<workItem from="1567743881913" duration="190000" />
<workItem from="1567832429427" duration="62000" />
<workItem from="1579682757164" duration="8495000" />
<workItem from="1579740326050" duration="24084000" />
<workItem from="1579740326050" duration="31961000" />
</task>
<task id="LOCAL-00001" summary="fix">
<created>1579690799404</created>
......@@ -307,7 +315,14 @@
<option name="project" value="LOCAL" />
<updated>1579777118852</updated>
</task>
<option name="localTasksCounter" value="6" />
<task id="LOCAL-00006" summary="fix">
<created>1580073406782</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1580073406782</updated>
</task>
<option name="localTasksCounter" value="7" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -318,22 +333,22 @@
<option name="LAST_COMMIT_MESSAGE" value="fix" />
</component>
<component name="WindowStateProjectService">
<state x="1975" y="104" key="CommitChangelistDialog2" timestamp="1579777118066">
<state x="1975" y="104" key="CommitChangelistDialog2" timestamp="1580073405833">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
<state x="1975" y="104" key="CommitChangelistDialog2/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1579777118066" />
<state x="2150" y="433" key="NewPhpFileDialog" timestamp="1579759337815">
<state x="1975" y="104" key="CommitChangelistDialog2/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580073405833" />
<state x="2150" y="433" key="NewPhpFileDialog" timestamp="1580087547127">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
<state x="2150" y="433" key="NewPhpFileDialog/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1579759337815" />
<state x="2150" y="433" key="NewPhpFileDialog/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580087547127" />
<state x="2148" y="220" key="RollbackChangesDialog" timestamp="1580073294419">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
<state x="2148" y="220" key="RollbackChangesDialog/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580073294419" />
<state x="1925" y="243" key="Vcs.Push.Dialog.v2" timestamp="1579777121548">
<state x="1925" y="243" key="Vcs.Push.Dialog.v2" timestamp="1580073408735">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
<state x="1925" y="243" key="Vcs.Push.Dialog.v2/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1579777121548" />
<state x="1925" y="243" key="Vcs.Push.Dialog.v2/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580073408735" />
<state x="2102" y="244" key="VcsDiffUtil.ChangesDialog" timestamp="1579686223702">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
......@@ -342,10 +357,10 @@
<screen x="1366" y="0" width="1920" height="1080" />
</state>
<state x="2019" y="340" key="com.intellij.ide.util.TipDialog/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1579740357559" />
<state x="2025" y="115" width="628" height="795" key="find.popup" timestamp="1579776838714">
<state x="2025" y="115" width="628" height="795" key="find.popup" timestamp="1580087347181">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
<state x="2025" y="115" width="628" height="795" key="find.popup/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1579776838714" />
<state x="2025" y="115" width="628" height="795" key="find.popup/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580087347181" />
<state x="1989" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1579750722318">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
......
......@@ -21,6 +21,15 @@ class SliderSeeder extends Seeder
];
$slide_2 = [
'name' => 'Slide 1',
'content' => '{"hero_text":"Solução inventiva para educação","sub_text":"Organização de educação e treinamento","buttons":[{"label":"Nossos Cursos","link":"'.env('APP_URL').'/courses"}]}',
'bg_image' => 'slider-1.jpg',
'sequence' => 1,
'status' => 1,
'overlay' => 0,
];
$slide_3 = [
'name' => 'Slide 2',
'content' => '{"hero_text":"Navegue pelos melhores cursos","sub_text":"Organização de educação e treinamento","widget":{"type":1}}',
'bg_image' => 'slider-2.jpg',
......@@ -29,7 +38,7 @@ class SliderSeeder extends Seeder
'overlay' => 0,
];
$slide_3 = [
$slide_4 = [
'name' => 'Slide 3',
'content' => '{"hero_text":"Informação ao alcance das suas mãos","sub_text":"","widget":{"type":2,"timer":"2019/02/15 11:01"},"buttons":[{"label":"Sobre Nós","link":"'.env('APP_URL').'about-us"},{"label":"Entre em contato","link":"'.env('APP_URL').'/contact-us"}]}',
'bg_image' => 'slider-3.jpg',
......@@ -41,5 +50,6 @@ class SliderSeeder extends Seeder
\App\Models\Slider::firstOrCreate($slide_1);
\App\Models\Slider::firstOrCreate($slide_2);
\App\Models\Slider::firstOrCreate($slide_3);
\App\Models\Slider::firstOrCreate($slide_4);
}
}
......@@ -814,7 +814,7 @@ return array (
),
'contacts' =>
array (
'title' => 'Leads',
'title' => 'Interessados (Formulário de contato do site)',
'fields' =>
array (
'name' => 'Nome',
......@@ -1208,7 +1208,7 @@ return array (
'full_text' => 'TEXTO COMPLETO',
'find_courses' => 'ENCONTRE CURSOS',
'your_test_score' => 'Resultado do seu teste',
'find_your_course' => '<span>Encontre</span>seu curso.',
'find_your_course' => '<span>Encontre</span> seu curso.',
'next' => 'PRÓXIMO',
'progress' => 'Progresso',
'finish_course' => 'Finalizar curso',
......@@ -1293,7 +1293,7 @@ return array (
'my_account' => 'Minha Conta',
'login_register' => '<a href="#" class="font-weight-bold go-login px-0">LOGUE</a> em nosso website ou <a href="#" class="font-weight-bold go-register px-0" id="">INSCREVA-SE</a>',
'already_user_note' => 'Já é registrado? Logue aqui',
'login_now' => 'Logar Agora',
'login_now' => 'Fazer login',
'register_now' => 'Inscrever-se agora',
),
'search_result' =>
......
......@@ -5,73 +5,73 @@ return array (
array (
'sidebar' =>
array (
'general' => 'General',
'dashboard' => 'Dashboard',
'general' => 'Geral',
'dashboard' => 'Painel',
'courses' =>
array (
'management' => 'Courses Management',
'title' => 'Courses',
'manage' => 'Manage Courses',
'management' => 'Gerenciador de Cursos',
'title' => 'Cursos',
'manage' => 'Gerenciar Cursos',
),
'site-management' =>
array (
'title' => 'Site Management',
'title' => 'Gerenciar Site',
),
'menu-manager' =>
array (
'title' => 'Menu Manager',
'title' => 'Gerenciar Menu',
),
'system' => 'System',
'system' => 'Sistema',
'settings' =>
array (
'title' => 'Settings',
'general' => 'General',
'social-login' => 'Social Login',
'title' => 'Configurações',
'general' => 'Geral',
'social-login' => 'Login Redes Sociais',
),
'debug-site' =>
array (
'title' => 'Debug Site',
),
'history' => 'History',
'history' => 'Histórico',
'lessons' =>
array (
'title' => 'Lessons',
'title' => 'Atividades',
),
'questions' =>
array (
'title' => 'Questions',
'title' => 'Questões',
),
'questions-options' =>
array (
'title' => 'Questions Options',
'title' => 'Opção Questões',
),
'tests' =>
array (
'title' => 'Tests',
'title' => 'Testes',
),
'change-password' =>
array (
'title' => 'Change Password',
'title' => 'Mudar Senha',
),
'account' =>
array (
'title' => 'Account',
'title' => 'Conta',
),
'messages' =>
array (
'title' => 'Messages',
'title' => 'Mensagens',
),
'orders' =>
array (
'title' => 'Orders',
'title' => 'Pedidos',
),
'categories' =>
array (
'title' => 'Categories',
'title' => 'Categorias',
),
'teachers' =>
array (
'title' => 'Teachers',
'title' => 'Professores',
),
'hero-slider' =>
array (
......@@ -79,11 +79,11 @@ return array (
),
'sponsors' =>
array (
'title' => 'Sponsors',
'title' => 'Patrocinadores',
),
'testimonials' =>
array (
'title' => 'Testimonials',
'title' => 'Depoimentos',
),
'blogs' =>
array (
......@@ -95,47 +95,47 @@ return array (
),
'reasons' =>
array (
'title' => 'Reasons',
'title' => 'Razões',
),
'contact' =>
array (
'title' => 'Contact',
'title' => 'Contato',
),
'footer' =>
array (
'title' => 'Footer',
'title' => 'Rodapé',
),
'newsletter-configuration' =>
array (
'title' => 'Newsletter Configuration',
'title' => 'Configuração da Newsletter',
),
'invoices' =>
array (
'title' => 'Invoices',
'title' => 'Faturas',
),
'certificates' =>
array (
'title' => 'Certificates',
'title' => 'Certificados',
),
'contacts' =>
array (
'title' => 'Leads',
'title' => 'Interessados',
),
'pages' =>
array (
'title' => 'Pages Manager',
'title' => 'Gerenciar Páginas',
),
'reviews' =>
array (
'title' => 'Reviews',
'title' => 'Avaliações',
),
'translations' =>
array (
'title' => 'Translation Manager',
'title' => 'Gerenciador de Tradução',
),
'update' =>
array (
'title' => 'Update',
'title' => 'Atualizações',
),
'backup' =>
array (
......@@ -143,64 +143,64 @@ return array (
),
'bundles' =>
array (
'title' => 'Bundles',
'title' => 'Pacotes',
),
'reports' =>
array (
'title' => 'Reports',
'students' => 'Students',
'sales' => 'Sales',
'title' => 'Relatórios',
'students' => 'Estudantes',
'sales' => 'Vendas',
),
'coupons' =>
array (
'title' => 'Coupons',
'title' => 'Cupons',
),
'tax' =>
array (
'title' => 'Tax',
'title' => 'Taxas',
),
'sitemap' =>
array (
'title' => 'Sitemap',
'title' => 'Mapa do site',
),
'forums-category' =>
array (
'title' => 'Forums Categories',
'title' => 'Categorias do Forum',
),
),
'access' =>
array (
'title' => 'Access',
'title' => 'Acesso',
'roles' =>
array (
'management' => 'Role Management',
'create' => 'Create Role',
'edit' => 'Edit Role',
'all' => 'All Roles',
'main' => 'Roles',
'management' => 'Gerenciar Funções',
'create' => 'Criar Funções',
'edit' => 'Editar Funções',
'all' => 'Todas as Funções',
'main' => 'Funções',
),
'users' =>
array (
'deactivated' => 'Deactivated Users',
'deleted' => 'Deleted Users',
'view' => 'View User',
'edit' => 'Edit User',
'change-password' => 'Change Password',
'all' => 'All Users',
'create' => 'Create User',
'main' => 'Users',
'deactivated' => 'Usuários Desativados',
'deleted' => 'Usuários Excluídos',
'view' => 'Visualizar Usuários',
'edit' => 'Editar Usuários',
'change-password' => 'Mudar Senha',
'all' => 'Todos os Usuários',
'create' => 'Criar Usuários',
'main' => 'Usuários',
),
),
'log-viewer' =>
array (
'dashboard' => 'Debug dashboard',
'dashboard' => 'Debug do Painel',
'logs' => 'Logs',
'main' => 'Log Viewer',
),
),
'language-picker' =>
array (
'language' => 'Language',
'language' => 'Idiomas',
'langs' =>
array (
'ar' => 'Arabic',
......@@ -219,8 +219,8 @@ return array (
'ja' => 'Japanese',
'nl' => 'Dutch',
'no' => 'Norwegian',
'pt_BR' => 'Portuguese (Brazil)',
'pt-Br' => 'Portuguese (Brazil)',
'pt_BR' => 'Português (Brazil)',
'pt-Br' => 'Português(Brazil)',
'ru' => 'Russian',
'sv' => 'Swedish',
'th' => 'Thai',
......
<?php
return array (
'threads' => [
'title' => [
]
]
);
......@@ -3,4 +3,6 @@
return array (
'administrator' => 'Administrador',
'user' => 'Usuário',
'teacher' => 'Professor',
'student' => 'Aluno'
);
......@@ -103,7 +103,7 @@
</a>
</li>
@endcan
<li class="nav-item nav-dropdown {{ active_class(Active::checkUriPattern(['user/reports*']), 'open') }}">
{{--<li class="nav-item nav-dropdown {{ active_class(Active::checkUriPattern(['user/reports*']), 'open') }}">
<a class="nav-link nav-dropdown-toggle {{ active_class(Active::checkUriPattern('admin/*')) }}"
href="#">
<i class="nav-icon icon-pie-chart"></i>@lang('menus.backend.sidebar.reports.title')
......@@ -122,7 +122,7 @@
</a>
</li>
</ul>
</li>
</li>--}}
@endif
......
......@@ -50,9 +50,9 @@
<div data-thread="{{$item->id}}"
class="chat_list @if(($thread != "") && ($thread->id == $item->id)) active_chat @endif" >
<div class="chat_people">
<div class="chat_ib">
<h5>{{ $item->title }} <span
<h5>{{ $item->title }}
<span
class="chat_date">{{ $item->lastMessage->created_at->diffForHumans() }}</span>
@if($item->unreadMessagesCount > 0)
<span class="badge badge-primary mr-5">{{$item->unreadMessagesCount}}</span>
......
......@@ -238,21 +238,22 @@
<div class="listing-filter-form pb30">
<form action="{{route('search-course')}}" method="get">
<div class="filter-search mb20">
<div class="filter-search mb20 shorting-filter d-inline">
<label class="text-uppercase">@lang('labels.frontend.course.category')</label>
<select name="category" class="form-control listing-filter-form select">
<option value="">@lang('labels.frontend.course.select_category')</option>
@if(count($categories) > 0)
@foreach($categories as $category)
<option value="{{$category->id}}">{{$category->name}}</option>
<option value="{{$category->id}}">
<span>{{ $category->name }}</span>
</option>
@endforeach
@endif
</select>
<br>
</div>
<div class="filter-search mb20">
<label>@lang('labels.frontend.course.full_text')</label>
<input type="text" class="" name="q" placeholder="{{trans('labels.frontend.course.looking_for')}}">
......
......@@ -239,10 +239,10 @@ Route::post('delete-locale', function () {
})->name('delete-locale');
//==== Certificates ====//
/*//==== Certificates ====//
Route::get('certificates', 'CertificateController@getCertificates')->name('certificates.index');
Route::post('certificates/generate', 'CertificateController@generateCertificate')->name('certificates.generate');
Route::get('certificates/download', ['uses' => 'CertificateController@download', 'as' => 'certificates.download']);
Route::get('certificates/download', ['uses' => 'CertificateController@download', 'as' => 'certificates.download']);*/
//===Trouble shoot ====//
......
......@@ -50,7 +50,6 @@ Route::group(['namespace' => 'Backend', 'prefix' => 'user', 'as' => 'admin.', 'm
Route::post('messages/reply', ['uses' => 'MessagesController@reply', 'as' => 'messages.reply']);
});
/*
Route::get('certificates', 'CertificateController@getCertificates')->name('certificates.index');
Route::post('certificates/generate', 'CertificateController@generateCertificate')->name('certificates.generate');*/
......
......@@ -86,10 +86,12 @@ class MessageThread extends Model implements MessageThreadInterface
++$numberOfParticipants;
}
return trans_choice('messenger::messenger.threads.title', $numberOfParticipants, [
/*return trans_choice('messenger::messenger.threads.title', $numberOfParticipants, [
'name' => $participants[0],
'count' => ($numberOfParticipants - 1), // substract one since we have shown the name.
]);
]);*/
return $participants[0];
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment