Commit a2c81bb4 authored by Lucas Nunes's avatar Lucas Nunes

fix

parent 5c6477d6
......@@ -2,17 +2,10 @@
<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/SliderSeeder.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/seeds/SliderSeeder.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Frontend/Auth/LoginController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Frontend/Auth/LoginController.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" />
<change beforePath="$PROJECT_DIR$/resources/views/frontend/layouts/modals/loginModal.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/frontend/layouts/modals/loginModal.blade.php" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -278,7 +271,7 @@
<workItem from="1567743881913" duration="190000" />
<workItem from="1567832429427" duration="62000" />
<workItem from="1579682757164" duration="8495000" />
<workItem from="1579740326050" duration="31961000" />
<workItem from="1579740326050" duration="33814000" />
</task>
<task id="LOCAL-00001" summary="fix">
<created>1579690799404</created>
......@@ -322,7 +315,14 @@
<option name="project" value="LOCAL" />
<updated>1580073406782</updated>
</task>
<option name="localTasksCounter" value="7" />
<task id="LOCAL-00007" summary="fix">
<created>1580088702511</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1580088702511</updated>
</task>
<option name="localTasksCounter" value="8" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -333,10 +333,10 @@
<option name="LAST_COMMIT_MESSAGE" value="fix" />
</component>
<component name="WindowStateProjectService">
<state x="1975" y="104" key="CommitChangelistDialog2" timestamp="1580073405833">
<state x="1975" y="104" key="CommitChangelistDialog2" timestamp="1580088701656">
<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="1580073405833" />
<state x="1975" y="104" key="CommitChangelistDialog2/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580088701656" />
<state x="2150" y="433" key="NewPhpFileDialog" timestamp="1580087547127">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
......@@ -345,10 +345,10 @@
<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="1580073408735">
<state x="1925" y="243" key="Vcs.Push.Dialog.v2" timestamp="1580088704242">
<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="1580073408735" />
<state x="1925" y="243" key="Vcs.Push.Dialog.v2/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580088704242" />
<state x="2102" y="244" key="VcsDiffUtil.ChangesDialog" timestamp="1579686223702">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
......@@ -357,14 +357,14 @@
<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="1580087347181">
<state x="2025" y="115" width="628" height="795" key="find.popup" timestamp="1580089094386">
<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="1580087347181" />
<state x="1989" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1579750722318">
<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="1580089094386" />
<state x="1989" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1580090095601">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
<state x="1989" y="225" width="672" height="678" key="search.everywhere.popup/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1579750722318" />
<state x="1989" y="225" width="672" height="678" key="search.everywhere.popup/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580090095601" />
</component>
<component name="masterDetails">
<states>
......
......@@ -77,7 +77,8 @@ class LoginController extends Controller
if(auth()->user()->isAdmin()){
$redirect = 'dashboard';
}else{
$redirect = 'back';
// $redirect = 'back';
$redirect = 'dashboard';
}
return response(['success' => true,'redirect' => $redirect], Response::HTTP_OK);
}else{
......
......@@ -1291,7 +1291,7 @@ return array (
'new_user_note' => 'Novo usuário? Inscreva-se aqui',
'registration_message' => 'Inscrito com sucesso. Por favor, faça o Login',
'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>',
'login_register' => '<a href="#" class="font-weight-bold go-login px-0">FAÇA LOGIN</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' => 'Fazer login',
'register_now' => 'Inscrever-se agora',
......
......@@ -263,13 +263,13 @@
class="title">@lang('menus.backend.sidebar.invoices.title')</span>
</a>
</li>
<li class="nav-item ">
{{--<li class="nav-item ">
<a class="nav-link {{ $request->segment(1) == 'certificates' ? 'active' : '' }}"
href="{{ route('admin.certificates.index') }}">
<i class="nav-icon icon-badge"></i> <span
class="title">@lang('menus.backend.sidebar.certificates.title')</span>
</a>
</li>
</li>--}}
@endif
@if ($logged_in_user->hasRole('teacher'))
<li class="nav-item ">
......
......@@ -113,7 +113,7 @@
</div>
</div>
<div class="tab-pane container fade" id="register">
<div class="tab-pane container fade" id="register222">
<form id="registerForm" class="contact_form"
action="#"
......@@ -211,6 +211,16 @@
</div>
</form>
</div>
<div class="tab-pane container fade" id="register">
{{-- route('frontend.auth.login.post')--}}
<form action="{{ home_route() }}">
<div class="nws-button text-center white text-capitalize">
<button id="registerButton" type="submit"
value="Submit">FAZER PRÉ-MATRICULA</button>
</div>
</form>
</div>
</div>
</div>
</div>
......@@ -241,6 +251,10 @@
$('#login').removeClass('active').addClass('fade')
$('#register').addClass('active').removeClass('fade')
});*/
$(document).on('click', '.go-register', function () {
$('#login').removeClass('active').addClass('fade')
$('#register').addClass('active').removeClass('fade')
});
$(document).on('click', '#openLoginModal', function (e) {
$.ajax({
......
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