tilderadio
/
AzuraCast
mirror of https://github.com/AzuraCast/AzuraCast.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Layout changes to profile for 2FA.

This commit is contained in:
Buster Neece 2019-03-13 20:49:19 -05:00
parent 126d2106f4
commit cea176f536
6 changed files with 55 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/forms/profile.php
View File

@ -82,7 +82,7 @@ return [
'description' => __('All times displayed on the site will be based on this time zone.') . '<br>' . sprintf(__('Current server time is <b>%s</b>.'),
date('g:ia')),
'options' => \Azura\Timezone::fetchSelect(),
'default' => 'UTC',
'default' => \App\Customization::DEFAULT_TIMEZONE,
]
],

8
config/settings.php
View File

@ -15,7 +15,6 @@ return [
/* Localization Settings */
'locale' => [
'default' => 'en_US.UTF-8',
'supported' => [
'en_US.UTF-8' => 'English (Default)',
'de_DE.UTF-8' => 'Deutsch', // German
@ -38,9 +37,4 @@ return [
'en_US.UTF-8' => 'g:i A',
],
'themes' => [
'default' => 'light',
'available' => ['light', 'dark'],
],
];
];

3
src/Controller/Frontend/ProfileController.php
View File

@ -35,14 +35,11 @@ class ProfileController
{
$user = $request->getUser();
$user_profile = $this->user_repo->toArray($user);
unset($user_profile['auth_password']);
$account_info_form = new \AzuraForms\Form($this->form_config['groups']['account_info'], $user_profile);
$customization_form = new \AzuraForms\Form($this->form_config['groups']['customization'], $user_profile);
return $request->getView()->renderToResponse($response, 'frontend/profile/index', [
'user' => $request->getUser(),
'account_info_form' => $account_info_form,
'customization_form' => $customization_form,
]);
}

19
src/Customization.php
View File

@ -12,6 +12,7 @@ class Customization
{
public const DEFAULT_TIMEZONE = 'UTC';
public const DEFAULT_LOCALE = 'en_US.UTF-8';
public const DEFAULT_THEME = 'light';
/** @var Settings */
protected $app_settings;
@ -41,7 +42,7 @@ class Customization
$locale = $this->getLocale();
} else {
$timezone = self::DEFAULT_TIMEZONE;
$locale = $this->app_settings['locale']['default'];
$locale = self::DEFAULT_LOCALE;
}
$translator = new Translator();
@ -204,7 +205,8 @@ class Customization
}
// Default to system option.
$locale = $this->app_settings['locale']['default'];
$locale = self::DEFAULT_LOCALE;
return $locale;
}
@ -216,13 +218,10 @@ class Customization
public function getTheme()
{
if ($this->user !== null && !empty($this->user->getTheme())) {
$available_themes = $this->app_settings['themes']['available'];
if (in_array($this->user->getTheme(), $available_themes)) {
return $this->user->getTheme();
}
return $this->user->getTheme();
}
return $this->app_settings['themes']['default'];
return self::DEFAULT_THEME;
}
/**
@ -230,7 +229,7 @@ class Customization
*
* @return string|null
*/
public function getInstanceName()
public function getInstanceName(): ?string
{
static $instance_name;
@ -246,7 +245,7 @@ class Customization
*
* @return string
*/
public function getPublicTheme()
public function getPublicTheme(): string
{
$public_theme = $this->settings_repo->getSetting(Entity\Settings::PUBLIC_THEME, null);
@ -254,7 +253,7 @@ class Customization
return $public_theme;
}
return $this->app_settings['themes']['default'];
return self::DEFAULT_THEME;
}
/**

3
src/Entity/User.php
View File

@ -191,9 +191,6 @@ class User
return false;
}
/**
* @throws \Exception
*/
public function generateRandomPassword(): void
{
$this->setAuthPassword(bin2hex(random_bytes(20)));

67
templates/frontend/profile/index.phtml
View File

@ -1,15 +1,35 @@
<?php $this->layout('main', ['title' => __('My Account'), 'manual' => true]); ?>
<?php
$this->layout('main', ['title' => __('My Account'), 'manual' => true]);
/** @var \App\Entity\User $user */
?>
<div class="row">
<div class="col-4">
<div class="card mb-4">
<a href="http://www.gravatar.com/" target="_blank">
<img class="card-img-top" src="<?=$user->getAvatar(500) ?>" width="100%" alt="">
</a>
<div class="card-body">
<div class="media">
<a class="align-self-center d-flex" href="http://www.gravatar.com/" target="_blank">
<img src="<?=$user->getAvatar(64) ?>" alt="">
</a>
<div class="media-body">
<h2 class="card-title mt-2">
<?php if (!empty($user->getName())): ?>
<?=$this->e($user->getName()) ?>
<?php else: ?>
<?=__('My Account') ?>
<?php endif; ?>
</h2>
<h3 class="card-subtitle">
<?=$this->e($user->getEmail()) ?>
</h3>
</div>
</div>
</div>
<div class="card-actions">
<a class="btn btn-outline-primary" href="http://www.gravatar.com/" target="_blank">
<i class="material-icons" aria-hidden="true">image</i>
<?=__('Update Profile Picture') ?>
<a class="btn btn-outline-primary" href="<?=$router->named('profile:edit') ?>">
<i class="material-icons" aria-hidden="true">edit</i>
<?=__('Edit Profile') ?>
</a>
</div>
</div>
@ -24,26 +44,27 @@
</ul>
</div>
</div>
<div class="col-8">
<div class="card mb-4">
<div class="col-4">
<div class="card">
<div class="card-body">
<h2 class="card-title"><?=__('My Account') ?></h2>
</div>
<div class="card-actions">
<a class="btn btn-outline-primary" href="<?=$router->named('profile:edit') ?>">
<i class="material-icons" aria-hidden="true">edit</i>
<?=__('Edit Profile') ?>
</a>
</div>
<div class="card-body">
<h3 class="card-subtitle"><?=__('Account Information') ?></h3>
<?=$account_info_form->renderView() ?>
<h3 class="card-subtitle mt-4"><?=__('Customization') ?></h3>
<h2 class="card-title"><?=__('Customization') ?></h2>
<?=$customization_form->renderView() ?>
</div>
<div class="card-actions">
<a class="btn btn-outline-primary" href="<?=$router->named('profile:edit') ?>#customization">
<i class="material-icons" aria-hidden="true">edit</i>
<?=__('Customize') ?>
</a>
</div>
</div>
</div>
<div class="col-4">
<div class="card">
<div class="card-body">
<h2 class="card-title"><?=__('Two-Factor Authentication') ?></h2>
</div>
</div>
</div>
</div>