hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-02-10 23:36:08 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #512 from openclassify/dia

Browse Source 
#1294 [user] Seperate phone login
This commit is contained in:
Fatih Alp 2020-04-23 15:09:24 +03:00 committed by GitHub
commit dfce0c4b91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php
View File

@ -105,13 +105,15 @@ class AdvCriteria extends EntryCriteria
{ {
$advModel = new AdvModel(); $advModel = new AdvModel();
$adv = $advModel->newQuery()->find($id); $adv = $advModel->newQuery()->find($id);
if (!$adv->cover_photo) { if ($adv) {
$adv->cover_photo = $this->image->make('visiosoft.theme.base::images/no-image.png', 'path')->url(); if (!$adv->cover_photo) {
} else if ( $adv->cover_photo = $this->image->make('visiosoft.theme.base::images/no-image.png', 'path')->url();
!empty($adv->cover_photo) && } else if (
substr($adv->cover_photo, 0, strlen('/')) !== '/' !empty($adv->cover_photo) &&
) { substr($adv->cover_photo, 0, strlen('/')) !== '/'
$adv->cover_photo = '/' . $adv->cover_photo; ) {
$adv->cover_photo = '/' . $adv->cover_photo;
}
} }
return $adv; return $adv;
} }

2
addons/default/visiosoft/base-theme/resources/js/login.js Normal file
View File

@ -0,0 +1,2 @@
// Add phone mask
phoneMask("input.phone");

2
addons/default/visiosoft/base-theme/resources/lang/en/field.php
View File

@ -39,6 +39,8 @@ return [
// Login page // Login page
'or' => 'or', 'or' => 'or',
'login_with_phone_number' => 'Login with Phone Number',
'login_with_email_address' => 'Login with Email Address',
// Side menu links // Side menu links
'company_directory' => 'Company directory', 'company_directory' => 'Company directory',

23
addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig
View File

@ -1,6 +1,7 @@
{% extends "theme::layouts/default" %} {% extends "theme::layouts/default" %}
{% block content %} {% block content %}
{% set phoneLogin = not setting_value('visiosoft.module.advs::register_email_field') or app.request.get('type') == 'phone' %}
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-12 text-left m-0 row justify-content-center"> <div class="col-12 text-left m-0 row justify-content-center">
<div class="col-12 col-lg-5 m-3 login-section"> <div class="col-12 col-lg-5 m-3 login-section">
@ -8,8 +9,8 @@
.redirect(app.request.get('redirect')) .redirect(app.request.get('redirect'))
.get() %} .get() %}
{{ form_open({ {{ form_open({
'class':'aaa', 'class': 'aaa',
'url':form.options.url 'url': form.options.url
})|raw }} })|raw }}
<div class="col-12 pt-4 pt-lg-0"> <div class="col-12 pt-4 pt-lg-0">
<h3 class="text-center login_subject"> <h3 class="text-center login_subject">
@ -17,12 +18,14 @@
</h3> </h3>
<div class="form-group email-field email-field_type"> <div class="form-group email-field email-field_type">
<label class="control-label"> <label class="control-label">
{{ trans('visiosoft.theme.base::field.email_or_phone_number') }} {{ phoneLogin ? trans('visiosoft.theme.base::field.phone_number') : trans('visiosoft.theme.base::field.email') }}
<span class="required">*</span> <span class="required">*</span>
</label> </label>
<div class="input-wrapper"> <div class="input-wrapper">
{{ form.fields.email.input|raw }} {{ form.fields.email.setAttributes({
'class': phoneLogin ? 'form-control phone' : 'form-control'
}).input|raw }}
</div> </div>
</div> </div>
</div> </div>
@ -63,9 +66,18 @@
{{ trans('visiosoft.theme.base::field.remember_me') }} {{ trans('visiosoft.theme.base::field.remember_me') }}
</label> </label>
</div> </div>
{% if addBlock('login/oauth') %}
{% if addBlock('login/oauth') or setting_value('visiosoft.module.advs::register_email_field') %}
<div class="text-center text-muted">- {{ trans('visiosoft.theme.base::field.or') }} -</div> <div class="text-center text-muted">- {{ trans('visiosoft.theme.base::field.or') }} -</div>
<div class="social-login py-2 px-3"> <div class="social-login py-2 px-3">
{% if setting_value('visiosoft.module.advs::register_email_field') %}
<a class="btn btn-info text-white w-100 d-flex align-items-center justify-content-center position-relative mb-3"
href="{{ url_route('anomaly.module.users::login') }}{{ phoneLogin ? '' : '?type=phone' }}">
<span class="position-relative py-1">
{{ phoneLogin ? trans('visiosoft.theme.base::field.login_with_email_address') : trans('visiosoft.theme.base::field.login_with_phone_number') }}
</span>
</a>
{% endif %}
{{ addBlock('login/oauth')|raw }} {{ addBlock('login/oauth')|raw }}
</div> </div>
{% endif %} {% endif %}
@ -84,5 +96,6 @@
</div> </div>
</div> </div>
</div> </div>
{{ asset_add('scripts.js','visiosoft.theme.base::js/login.js') }}
{{ asset_add('styles.css','visiosoft.theme.base::css/login.css') }} {{ asset_add('styles.css','visiosoft.theme.base::css/login.css') }}
{% endblock %} {% endblock %}