diff --git a/.env.example b/.env.example index 907bb477..cd7fdb90 100644 --- a/.env.example +++ b/.env.example @@ -37,3 +37,4 @@ VANILLA_FORUM_SECRET= DISQUS_API_KEY= DISQUS_API_SECRET= DISQUS_DOMAIN= +DISQUS_ENABLED=false diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php index 14b81839..cf635e4d 100644 --- a/app/Http/Controllers/AccountApiController.php +++ b/app/Http/Controllers/AccountApiController.php @@ -52,8 +52,8 @@ public function update($id) if (!Input::has('password')) { $this->validator->setData(Input::except(['password', 'password_confirmation'])); } - $input = $this->validator->validate('update'); $user = $this->userRepo->getById($id); + $input = $this->validator->bind('nickName', ['userId' => $user->id])->validate('update'); $this->userRepo->update($user, $input); return Response::json(['success' => true]); } catch (ValidationException $e) { diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index b1160400..03821542 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -38,7 +38,7 @@ function ($view) { if ($user) { $data = [ "id" => $user["id"], - "username" => $user["firstName"] . ' ' . $user["lastName"], + "username" => $user->getPresenter()->displayName(), "email" => $user["email"], //"avatar" => $user["avatar"], ]; diff --git a/config/disqus.php b/config/disqus.php index 2f65c80a..6054d1d5 100644 --- a/config/disqus.php +++ b/config/disqus.php @@ -3,5 +3,5 @@ 'api_key' => env('DISQUS_API_KEY', ''), 'api_secret' => env('DISQUS_API_SECRET', ''), 'domain' => env('DISQUS_DOMAIN', ''), //.disqus.com/embed.js - 'enabled' => false, + 'enabled' => env('DISQUS_ENABLED', 'false'), ]; diff --git a/config/gzero.php b/config/gzero.php index 3f4468b3..31abbfab 100644 --- a/config/gzero.php +++ b/config/gzero.php @@ -6,6 +6,7 @@ 'seoTitleAlternativeField' => 'title', 'seoDescriptionAlternativeField' => 'body', 'seoDescLength' => 160, + 'useUsersNickNames' => true, 'siteDesc' => 'Content management system.', 'multilang' => [ 'enabled' => true, diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php index 5fd521be..b383082f 100644 --- a/resources/lang/en/common.php +++ b/resources/lang/en/common.php @@ -33,10 +33,12 @@ 'loginWith' => 'or sign in with', 'logout' => 'Logout', 'newPassword' => 'New password', + 'nickName' => 'Nick name', 'noTranslation' => 'No translation', 'notAMember' => 'Not a member yet?', 'notPublished' => 'Not published', 'numberOfViews' => 'Number of views:', + 'optional' => 'optional', 'options' => 'Options', 'order' => 'Order', 'pageNotFound' => 'Page not found', diff --git a/resources/lang/pl/common.php b/resources/lang/pl/common.php index 7ddf4890..c7b90903 100644 --- a/resources/lang/pl/common.php +++ b/resources/lang/pl/common.php @@ -33,10 +33,12 @@ 'loginWith' => 'lub zaloguj się z', 'logout' => 'Wyloguj', 'newPassword' => 'Nowe hasło', + 'nickName' => 'Nick', 'noTranslation' => 'Brak tłumaczenia', 'notAMember' => 'Nie masz jeszcze konta?', 'notPublished' => 'Niepublikowany', 'numberOfViews' => 'Liczba wyświetleń:', + 'optional' => 'opcjonalnie', 'options' => 'Opcje', 'order' => 'Kolejność', 'pageNotFound' => 'Nie znaleziono strony', diff --git a/resources/views/account/edit.blade.php b/resources/views/account/edit.blade.php index 7213dbb3..2f01ad62 100644 --- a/resources/views/account/edit.blade.php +++ b/resources/views/account/edit.blade.php @@ -15,6 +15,15 @@
+
+ + + @if($errors->first('nickName')) +

{{ $errors->first('nickName') }}

+ @endif +
-

{{ Auth::user()->firstName }} {{ Auth::user()->lastName }}

+

{{ Auth::user()->getPresenter()->displayName() }}

@foreach($menu as $link)
  • @if($link['children']) diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 48c67cf9..12ddeb0b 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -19,11 +19,20 @@

    {{ $errors->first('email') }}

    @endif
    • +
    + + + @if($errors->first('nickName')) +

    {{ $errors->first('nickName') }}

    + @endif +
    + placeholder="@lang('common.firstName') (@lang('common.optional'))"> @if($errors->first('firstName'))

    {{ $errors->first('firstName') }}

    @endif @@ -32,7 +41,7 @@ + placeholder="@lang('common.lastName') (@lang('common.optional'))"> @if($errors->first('lastName'))

    {{ $errors->first('lastName') }}

    @endif diff --git a/resources/views/includes/navbar.blade.php b/resources/views/includes/navbar.blade.php index 3b74cb6c..4d6af022 100644 --- a/resources/views/includes/navbar.blade.php +++ b/resources/views/includes/navbar.blade.php @@ -35,7 +35,7 @@ - {{ Auth::user()->firstName }} {{ Auth::user()->lastName }} + {{ Auth::user()->getPresenter()->displayName() }}
      diff --git a/scripts/link_package.sh b/scripts/link_package.sh index 371fb29a..1974a2f5 100755 --- a/scripts/link_package.sh +++ b/scripts/link_package.sh @@ -19,7 +19,7 @@ function contains() { } SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" -PACKAGES=("admin" "api" "cms" "social") +PACKAGES=("admin" "api" "cms" "social" "vanilla-integration") OPERATIONS=("mount" "umount") PACKAGE=$1 OPERATION=$2 diff --git a/tests/_data/dump.sql b/tests/_data/dump.sql index e212c5a7..f95f9e9d 100644 --- a/tests/_data/dump.sql +++ b/tests/_data/dump.sql @@ -71,7 +71,7 @@ CREATE TABLE `BlockTypes` ( LOCK TABLES `BlockTypes` WRITE; /*!40000 ALTER TABLE `BlockTypes` DISABLE KEYS */; -INSERT INTO `BlockTypes` VALUES ('basic',1,'2016-03-24 09:47:45','2016-03-24 09:47:45'),('content',1,'2016-03-24 09:47:45','2016-03-24 09:47:45'),('menu',1,'2016-03-24 09:47:45','2016-03-24 09:47:45'),('slider',1,'2016-03-24 09:47:45','2016-03-24 09:47:45'),('widget',1,'2016-03-24 09:47:45','2016-03-24 09:47:45'); +INSERT INTO `BlockTypes` VALUES ('basic',1,'2016-04-03 16:43:47','2016-04-03 16:43:47'),('content',1,'2016-04-03 16:43:47','2016-04-03 16:43:47'),('menu',1,'2016-04-03 16:43:47','2016-04-03 16:43:47'),('slider',1,'2016-04-03 16:43:47','2016-04-03 16:43:47'),('widget',1,'2016-04-03 16:43:47','2016-04-03 16:43:47'); /*!40000 ALTER TABLE `BlockTypes` ENABLE KEYS */; UNLOCK TABLES; @@ -174,7 +174,7 @@ CREATE TABLE `ContentTypes` ( LOCK TABLES `ContentTypes` WRITE; /*!40000 ALTER TABLE `ContentTypes` DISABLE KEYS */; -INSERT INTO `ContentTypes` VALUES ('category',1,'2016-03-24 09:47:44','2016-03-24 09:47:44'),('content',1,'2016-03-24 09:47:44','2016-03-24 09:47:44'); +INSERT INTO `ContentTypes` VALUES ('category',1,'2016-04-03 16:43:47','2016-04-03 16:43:47'),('content',1,'2016-04-03 16:43:47','2016-04-03 16:43:47'); /*!40000 ALTER TABLE `ContentTypes` ENABLE KEYS */; UNLOCK TABLES; @@ -248,7 +248,7 @@ CREATE TABLE `Langs` ( LOCK TABLES `Langs` WRITE; /*!40000 ALTER TABLE `Langs` DISABLE KEYS */; -INSERT INTO `Langs` VALUES ('en','en_US',1,1,'2016-03-24 09:47:43','2016-03-24 09:47:43'),('pl','pl_PL',1,0,'2016-03-24 09:47:43','2016-03-24 09:47:43'),('de','de_DE',0,0,'2016-03-24 09:47:43','2016-03-24 09:47:43'),('fr','fr_FR',0,0,'2016-03-24 09:47:43','2016-03-24 09:47:43'); +INSERT INTO `Langs` VALUES ('en','en_US',1,1,'2016-04-03 16:43:46','2016-04-03 16:43:46'),('pl','pl_PL',1,0,'2016-04-03 16:43:46','2016-04-03 16:43:46'),('de','de_DE',0,0,'2016-04-03 16:43:46','2016-04-03 16:43:46'),('fr','fr_FR',0,0,'2016-04-03 16:43:46','2016-04-03 16:43:46'); /*!40000 ALTER TABLE `Langs` ENABLE KEYS */; UNLOCK TABLES; @@ -274,7 +274,7 @@ CREATE TABLE `OptionCategories` ( LOCK TABLES `OptionCategories` WRITE; /*!40000 ALTER TABLE `OptionCategories` DISABLE KEYS */; -INSERT INTO `OptionCategories` VALUES ('general','2016-03-24 09:47:44','2016-03-24 09:47:44'),('seo','2016-03-24 09:47:44','2016-03-24 09:47:44'); +INSERT INTO `OptionCategories` VALUES ('general','2016-04-03 16:43:47','2016-04-03 16:43:47'),('seo','2016-04-03 16:43:47','2016-04-03 16:43:47'); /*!40000 ALTER TABLE `OptionCategories` ENABLE KEYS */; UNLOCK TABLES; @@ -304,7 +304,7 @@ CREATE TABLE `Options` ( LOCK TABLES `Options` WRITE; /*!40000 ALTER TABLE `Options` DISABLE KEYS */; -INSERT INTO `Options` VALUES (1,'siteName','general','{\"en\":\"G-ZERO CMS\",\"pl\":\"G-ZERO CMS\",\"de\":\"G-ZERO CMS\",\"fr\":\"G-ZERO CMS\"}','2016-03-24 09:47:44','2016-03-24 09:47:44'),(2,'siteDesc','general','{\"en\":\"Content management system.\",\"pl\":\"Content management system.\",\"de\":\"Content management system.\",\"fr\":\"Content management system.\"}','2016-03-24 09:47:44','2016-03-24 09:47:44'),(3,'defaultPageSize','general','{\"en\":5,\"pl\":5,\"de\":5,\"fr\":5}','2016-03-24 09:47:44','2016-03-24 09:47:44'),(4,'cookiesPolicyUrl','general','{\"en\":null,\"pl\":null,\"de\":null,\"fr\":null}','2016-03-24 09:47:44','2016-03-24 09:47:44'),(5,'seoDescLength','seo','{\"en\":160,\"pl\":160,\"de\":160,\"fr\":160}','2016-03-24 09:47:44','2016-03-24 09:47:44'),(6,'googleAnalyticsId','seo','{\"en\":null,\"pl\":null,\"de\":null,\"fr\":null}','2016-03-24 09:47:44','2016-03-24 09:47:44'); +INSERT INTO `Options` VALUES (1,'siteName','general','{\"en\":\"G-ZERO CMS\",\"pl\":\"G-ZERO CMS\",\"de\":\"G-ZERO CMS\",\"fr\":\"G-ZERO CMS\"}','2016-04-03 16:43:47','2016-04-03 16:43:47'),(2,'siteDesc','general','{\"en\":\"Content management system.\",\"pl\":\"Content management system.\",\"de\":\"Content management system.\",\"fr\":\"Content management system.\"}','2016-04-03 16:43:47','2016-04-03 16:43:47'),(3,'defaultPageSize','general','{\"en\":5,\"pl\":5,\"de\":5,\"fr\":5}','2016-04-03 16:43:47','2016-04-03 16:43:47'),(4,'cookiesPolicyUrl','general','{\"en\":null,\"pl\":null,\"de\":null,\"fr\":null}','2016-04-03 16:43:47','2016-04-03 16:43:47'),(5,'seoDescLength','seo','{\"en\":160,\"pl\":160,\"de\":160,\"fr\":160}','2016-04-03 16:43:47','2016-04-03 16:43:47'),(6,'googleAnalyticsId','seo','{\"en\":null,\"pl\":null,\"de\":null,\"fr\":null}','2016-04-03 16:43:47','2016-04-03 16:43:47'); /*!40000 ALTER TABLE `Options` ENABLE KEYS */; UNLOCK TABLES; @@ -433,6 +433,7 @@ CREATE TABLE `Users` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `email` varchar(255) COLLATE utf8_unicode_ci NOT NULL, `password` varchar(255) COLLATE utf8_unicode_ci NOT NULL, + `nickName` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, `firstName` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, `lastName` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, `rememberToken` varchar(255) COLLATE utf8_unicode_ci NOT NULL, @@ -451,7 +452,7 @@ CREATE TABLE `Users` ( LOCK TABLES `Users` WRITE; /*!40000 ALTER TABLE `Users` DISABLE KEYS */; -INSERT INTO `Users` VALUES (1,'admin@gzero.pl','$2y$10$1VzgwEjGBfam3lN2wWeU8.q83SWpt6OlGV8qc71nEveCrDc1Nwlty','John','Doe','cUMbAqMU7uXdeWaGWSRwcmXQFRTe3VZ8PMvEVQvEVEnXBuWcNvCAX3bEXixL',1,0,'2016-03-24 09:47:44','2016-03-24 11:04:42'); +INSERT INTO `Users` VALUES (1,'admin@gzero.pl','$2y$10$iDOTV75LH2aQFq9iL8Qvw.TTt8pekafeMSpKi5GkCPAFMod3RLlsW','Admin','John','Doe','',1,0,'2016-04-03 16:43:46','2016-04-03 16:43:46'); /*!40000 ALTER TABLE `Users` ENABLE KEYS */; UNLOCK TABLES; @@ -524,4 +525,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2016-03-24 13:48:55 +-- Dump completed on 2016-04-03 16:44:07 diff --git a/tests/functional/LoginCest.php b/tests/functional/LoginCest.php index 7e06f745..7ca0f137 100644 --- a/tests/functional/LoginCest.php +++ b/tests/functional/LoginCest.php @@ -19,6 +19,7 @@ public function register(FunctionalTester $I) $I->wantTo('register a user'); $I->amOnPage('/en/register'); + $I->fillField('nickName', 'NickName'); $I->fillField('firstName', 'John'); $I->fillField('lastName', 'Doe'); $I->fillField('email', 'example@example.com'); @@ -36,6 +37,7 @@ public function registerAlreadyExistingUser(FunctionalTester $I) $I->haveRecord( 'Users', [ + 'nickName' => 'NickName', 'firstName' => 'John', 'lastName' => 'Doe', 'email' => 'john@doe.com', @@ -46,12 +48,14 @@ public function registerAlreadyExistingUser(FunctionalTester $I) ); $I->amOnPage('/en/register'); + $I->fillField('nickName', 'NickName'); $I->fillField('firstName', 'John'); $I->fillField('lastName', 'Doe'); $I->fillField('email', 'john@doe.com'); $I->fillField('password', 'password'); $I->click('button[type=submit]'); - $I->see('This email is already registered.'); + $I->see('The email has already been taken.'); + $I->see('The nick name has already been taken.'); $I->dontSeeAuthentication(); } @@ -60,6 +64,7 @@ public function preventSpamUserRegistrations(FunctionalTester $I) $I->wantTo('prevent a spammer users registrations'); $I->amOnPage('/en/register'); + $I->fillField('nickName', 'NickName'); $I->fillField('firstName', 'John'); $I->fillField('lastName', 'Doe'); $I->fillField('email', 'example@example.com');