getActiveState($item) . '>' . $item->getIcon() . ' ' . $item->title . ' ' . PHP_EOL;
}
diff --git a/app/CMS/MenuPresenters/ProfileMenuPresenter.php b/app/CMS/MenuPresenters/ProfileMenuPresenter.php
index 255f0476..b0ce96b8 100644
--- a/app/CMS/MenuPresenters/ProfileMenuPresenter.php
+++ b/app/CMS/MenuPresenters/ProfileMenuPresenter.php
@@ -1,8 +1,9 @@
has_submodules = true;
+ $parentModule->save();
+ }
+
+ // insert module into database
+ $module = Module::create([
+ 'name' => $name,
+ 'description' => $description,
+ 'handler' => $handler,
+ 'static_name' => $staticName,
+ 'manages_content' => $managesContent,
+ 'support_categories' => $supportCategories,
+ 'alias' => $alias,
+ 'module_settings' => $settings,
+ 'parent_id' => $parentModuleId ? $parentModuleId : null,
+ 'enabled' => 1,
+ 'is_template' => $isTemplate
+ ]);
+
+ // install something module-specific
+ if ($handler && is_callable([$handler, 'install'])) {
+ call_user_func([$handler, 'install']);
+ }
+
+ return $module;
+ }
+}
\ No newline at end of file
diff --git a/app/CMS/ModuleManager/Providers/ModuleManager.php b/app/CMS/ModuleManager/Providers/ModuleManager.php
new file mode 100644
index 00000000..73080e85
--- /dev/null
+++ b/app/CMS/ModuleManager/Providers/ModuleManager.php
@@ -0,0 +1,54 @@
+all();
+ } catch (QueryException $e) {
+ return;
+ }
+
+ // iterate over all modules and enable or disable them
+ foreach ($modules as $module) {
+ if (isset($module->module_settings['providers']) && !empty($module->module_settings['providers'])) {
+ foreach ($module->module_settings['providers'] as $provider) {
+ $this->app->register($provider);
+ }
+ }
+
+ // include files (if any)
+ if (isset($module->module_settings['files']) && !empty($module->module_settings['files'])) {
+ foreach ($module->module_settings['files'] as $file) {
+ $path = config('modules.paths.modules') . '/' . $module->static_name . '/' . $file;
+
+ if (!file_exists($path)) {
+ $path = base_path($file);
+ }
+
+ @include_once $path;
+ }
+ }
+ }
+ }
+
+ /**
+ * Register the application services.
+ * @return void
+ */
+ public function register()
+ {
+ }
+}
diff --git a/app/CMS/ModuleManager/Uninstaller.php b/app/CMS/ModuleManager/Uninstaller.php
new file mode 100644
index 00000000..1406cbe5
--- /dev/null
+++ b/app/CMS/ModuleManager/Uninstaller.php
@@ -0,0 +1,60 @@
+is_template) {
+ self::deleteDirectory(resource_path('views/visitor'));
+ self::deleteDirectory(resource_path('views/modules'));
+ self::deleteDirectory(public_path('assets'));
+
+ // delete all template paths
+ TemplatePath::getQuery()
+ ->delete();
+ }
+
+ if ($module->handler && is_callable([$module->handler, 'uninstall'])) {
+ call_user_func([$module->handler, 'uninstall'], $module);
+ }
+
+ $module->delete();
+ }
+
+ /**
+ * Delete directory when uninstalling module.
+ *
+ * @param $directory
+ *
+ * @throws \ErrorException
+ */
+ private static function deleteDirectory($directory)
+ {
+ if (!is_dir($directory)) {
+ return;
+ }
+
+ $success = \File::deleteDirectory($directory, true);
+
+ if (!$success) {
+ throw new \ErrorException('Cannot delete ' . $directory);
+ }
+ }
+}
diff --git a/app/Providers/ModuleServiceProvider.php b/app/CMS/Modules/ServiceProviders/ServiceProvider.php
similarity index 86%
rename from app/Providers/ModuleServiceProvider.php
rename to app/CMS/Modules/ServiceProviders/ServiceProvider.php
index a121b014..f73a9f3a 100644
--- a/app/Providers/ModuleServiceProvider.php
+++ b/app/CMS/Modules/ServiceProviders/ServiceProvider.php
@@ -1,18 +1,19 @@
alias;
}, \Config::get('view.paths')), [$sourcePath]), $this->alias);
- if (is_dir($sourcePath)) {
+ if (is_dir($sourcePath) && $this->publishViews) {
$this->publishes([$sourcePath => $viewPath], 'module-views');
}
}
/**
* Register translations.
- *
* @return void
*/
protected function registerTranslations()
diff --git a/app/CMS/Modules/Stubs/Migrations/create.stub b/app/CMS/Modules/Stubs/Migrations/create.stub
new file mode 100644
index 00000000..4eba77e2
--- /dev/null
+++ b/app/CMS/Modules/Stubs/Migrations/create.stub
@@ -0,0 +1,27 @@
+increments('id');
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Rollback migration
+ */
+ public function down()
+ {
+ Schema::dropIfExists('$TableName$');
+ }
+}
\ No newline at end of file
diff --git a/app/CMS/Modules/Stubs/Migrations/new.stub b/app/CMS/Modules/Stubs/Migrations/new.stub
new file mode 100644
index 00000000..9d5b2fb1
--- /dev/null
+++ b/app/CMS/Modules/Stubs/Migrations/new.stub
@@ -0,0 +1,28 @@
+ '$Module$',
+ 'translatedName' => '$module$::$module$.name',
+ 'translatedDescription' => '$module$::$module$.description',
+ 'alias' => strtolower('$Module$'),
+ 'handler' => \Modules\$Module$\Handlers\$Module$Handler::class,
+ 'providers' => [\Modules\$Module$\Providers\$Module$ServiceProvider::class],
+ 'files' => ['Http/routes.php'],
+ 'order' => 0,
+];
\ No newline at end of file
diff --git a/app/Policies/.gitkeep b/app/CMS/Modules/Stubs/NewModule/Database/Migrations/.gitkeep
similarity index 100%
rename from app/Policies/.gitkeep
rename to app/CMS/Modules/Stubs/NewModule/Database/Migrations/.gitkeep
diff --git a/app/CMS/Modules/Stubs/NewModule/Entities/$Entity$.stub b/app/CMS/Modules/Stubs/NewModule/Entities/$Entity$.stub
new file mode 100644
index 00000000..9676203a
--- /dev/null
+++ b/app/CMS/Modules/Stubs/NewModule/Entities/$Entity$.stub
@@ -0,0 +1,10 @@
+dropdown(trans('$module$::$module$.name'), function ($submenu) use ($user) {
+ $submenu->route('$module$.overview', trans('$module$::$module$.overview'), [], 20, ['icon' => 'fa fa-fw fa-list']);
+ $submenu->route('$module$.new', trans('$module$::$module$.new'), [], 21, ['icon' => 'fa fa-fw fa-plus']);
+ }, 15, ['icon' => 'fa fa-fw']);
+
+
+
+ // TODO: add admin menu entries
+ }
+
+ /**
+ * Does this module support categories?
+ * @return boolean
+ */
+ public static function supportCategories()
+ {
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/app/CMS/Modules/Stubs/NewModule/Http/Controllers/Admin/$Module$.stub b/app/CMS/Modules/Stubs/NewModule/Http/Controllers/Admin/$Module$.stub
new file mode 100644
index 00000000..bada410e
--- /dev/null
+++ b/app/CMS/Modules/Stubs/NewModule/Http/Controllers/Admin/$Module$.stub
@@ -0,0 +1,103 @@
+$module$Repository = $$module$Repository;
+ }
+
+ /**
+ * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ */
+ public function index()
+ {
+ $items = $Entity$Entity::all();
+
+ return view('$module$::admin/index', compact('items'));
+ }
+
+ /**
+ * Display form for updating entity
+ *
+ * @param $Entity$Entity $entity
+ *
+ * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ */
+ public function edit($Entity$Entity $entity)
+ {
+ return view('$module$::admin/update', compact('entity'));
+ }
+
+ /**
+ * Update existing entity
+ *
+ * @param Update$Entity$ $request
+ * @param $Entity$Entity $item
+ *
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function update(Update$Entity$ $request, $Entity$Entity $entity)
+ {
+
+ // ...
+
+ $this->$module$Repository->update($entity, $request->all());
+
+ return redirect()
+ ->back()
+ ->with('success', trans('$module$.$module.successfullyUpdated'));
+ }
+
+ /**
+ * Display form for creating new entity
+ *
+ * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ */
+ public function create() {
+ $entity = new $Entity$Entity();
+
+ return view('$module$::admin/create', compact('entity'));
+ }
+
+ /**
+ * Create new instance of entity
+ */
+ public function store(Create$Entity$ $request) {
+ // ...
+
+ $this->$module$Repository->create($request->all());
+
+ return redirect()
+ ->back()
+ ->with('success', trans('$module$.$module.successfullyUpdated'));
+ }
+
+ /**
+ * Delete entity
+ *
+ * @param $Entity$ $entity
+ *
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function destroy($Entity$ $entity) {
+ $entity->delete();
+
+ return redirect()
+ ->back()
+ ->with('success', trans('$module$.$module.successfullyDeleted'));
+ }
+}
\ No newline at end of file
diff --git a/app/CMS/Modules/Stubs/NewModule/Http/Requests/Create$Entity$.stub b/app/CMS/Modules/Stubs/NewModule/Http/Requests/Create$Entity$.stub
new file mode 100644
index 00000000..f79dcc59
--- /dev/null
+++ b/app/CMS/Modules/Stubs/NewModule/Http/Requests/Create$Entity$.stub
@@ -0,0 +1,11 @@
+ \LaravelLocalization::setLocale() . '/admin/$module$',
+ 'middleware' => ['admin'],
+ 'namespace' => 'Modules\$Module$\Http\Controllers\Admin'
+ ], function () {
+ Route::get('/', '$Module$@index')
+ ->name('$module$.overview');
+
+ Route::get('/new', '$Module$@create')
+ ->name('$module$.new');
+
+ Route::post('/new', '$Module$@store')
+ ->name('$module$.postNew');
+
+ Route::get('/edit/{id}', '$Module$@edit')
+ ->name('$module$.edit');
+
+ Route::post('/edit/{id}', '$Module$@update')
+ ->name('$module$.postEdit');
+
+ Route::get('/delete/{id}', '$Module$@delete')
+ ->name('$module$.delete');
+});
\ No newline at end of file
diff --git a/app/CMS/Modules/Stubs/NewModule/Providers/$Module$ServiceProvider.stub b/app/CMS/Modules/Stubs/NewModule/Providers/$Module$ServiceProvider.stub
new file mode 100644
index 00000000..60fb3266
--- /dev/null
+++ b/app/CMS/Modules/Stubs/NewModule/Providers/$Module$ServiceProvider.stub
@@ -0,0 +1,31 @@
+alias = strtolower('$module$');
+ }
+
+ /**
+ * Set path to module
+ */
+ protected function setModulePath()
+ {
+ $this->path = __DIR__;
+ }
+}
\ No newline at end of file
diff --git a/app/CMS/Modules/Stubs/NewModule/Repositories/$Module$Repository.stub b/app/CMS/Modules/Stubs/NewModule/Repositories/$Module$Repository.stub
new file mode 100644
index 00000000..a835994f
--- /dev/null
+++ b/app/CMS/Modules/Stubs/NewModule/Repositories/$Module$Repository.stub
@@ -0,0 +1,24 @@
+update($data);
+ }
+}
\ No newline at end of file
diff --git a/app/CMS/Modules/Stubs/NewModule/Resources/lang/cs/$module$.stub b/app/CMS/Modules/Stubs/NewModule/Resources/lang/cs/$module$.stub
new file mode 100644
index 00000000..18238f41
--- /dev/null
+++ b/app/CMS/Modules/Stubs/NewModule/Resources/lang/cs/$module$.stub
@@ -0,0 +1,13 @@
+ '$Module$',
+ 'new' => 'Vytvořit nový',
+ 'description' => '',
+ 'successfullyUpdated' => 'Úspěšně upraveno.',
+ 'successfullyCreated' => 'Úspěšně vytvořeno.',
+ 'successfullyDeleted' => 'Úspěšně smazáno.',
+ 'overview' => 'Přehled',
+ 'noItems' => 'Žádná data.',
+ 'save' => 'Uložit'
+];
\ No newline at end of file
diff --git a/app/CMS/Modules/Stubs/NewModule/Resources/views/admin/create.blade.stub b/app/CMS/Modules/Stubs/NewModule/Resources/views/admin/create.blade.stub
new file mode 100644
index 00000000..e7d1aa6f
--- /dev/null
+++ b/app/CMS/Modules/Stubs/NewModule/Resources/views/admin/create.blade.stub
@@ -0,0 +1,7 @@
+@extends('admin.layoutWithNavigation')
+
+@section('pageHeading', @trans('$module$::$module$.name'))
+
+@section('content')
+ @include('$module$::admin/form', ['action' => route('$module$.new')])
+@endsection
\ No newline at end of file
diff --git a/app/CMS/Modules/Stubs/NewModule/Resources/views/admin/edit.blade.stub b/app/CMS/Modules/Stubs/NewModule/Resources/views/admin/edit.blade.stub
new file mode 100644
index 00000000..6b8bd1ff
--- /dev/null
+++ b/app/CMS/Modules/Stubs/NewModule/Resources/views/admin/edit.blade.stub
@@ -0,0 +1,7 @@
+@extends('admin.layoutWithNavigation')
+
+@section('pageHeading', @trans('$module$::$module$.name'))
+
+@section('content')
+ @include('$module$::admin/form', ['action' => route('$module$.update')])
+@endsection
\ No newline at end of file
diff --git a/app/CMS/Modules/Stubs/NewModule/Resources/views/admin/form.blade.stub b/app/CMS/Modules/Stubs/NewModule/Resources/views/admin/form.blade.stub
new file mode 100644
index 00000000..f422b7d9
--- /dev/null
+++ b/app/CMS/Modules/Stubs/NewModule/Resources/views/admin/form.blade.stub
@@ -0,0 +1,6 @@
+
\ No newline at end of file
diff --git a/app/CMS/Modules/Stubs/NewModule/Resources/views/admin/index.blade.stub b/app/CMS/Modules/Stubs/NewModule/Resources/views/admin/index.blade.stub
new file mode 100644
index 00000000..817e62e0
--- /dev/null
+++ b/app/CMS/Modules/Stubs/NewModule/Resources/views/admin/index.blade.stub
@@ -0,0 +1,17 @@
+@extends('admin.layoutWithNavigation')
+
+@section('pageHeading', @trans('$module$::$module$.overview'))
+
+@section('content')
+ @if (!empty($items))
+
+ @foreach($items as $item)
+
+ @endforeach
+
+ @else
+
+ @trans('$module$::$module$.noItems')
+
+ @endif
+@endsection
\ No newline at end of file
diff --git a/app/CMS/Pipeline/SavePipeline/Process/UploadRelatedFiles.php b/app/CMS/Pipeline/SavePipeline/Process/UploadRelatedFiles.php
index 447897f0..2fb245f2 100644
--- a/app/CMS/Pipeline/SavePipeline/Process/UploadRelatedFiles.php
+++ b/app/CMS/Pipeline/SavePipeline/Process/UploadRelatedFiles.php
@@ -1,4 +1,5 @@
join('modules', 'modules.handler', '=', 'contents.moduleHandler')
->join('users', 'users.id', '=', 'contents.userId')
- ->addSelect(DB::raw('COALESCE(users.name, users.email) AS author_name'))
- ->addSelect('users.email AS author_email')
->whereNull('contents.deleted_at')
+ ->whereNull('contents.parentId')
->where('contents.language', LaravelLocalization::getCurrentLocale())
->where('modules.enabled', 1)
+ ->with('module', 'subpages', 'subpages.module', 'subpages.templateModel', 'templateModel')
+ ->orderBy('contents.order')
->orderBy('contents.created_at', 'DESC');
// filter results using handler
diff --git a/app/CMS/Repositories/FileManager/Directory.php b/app/CMS/Repositories/FileManager/Directory.php
index 0e6250ec..1d697270 100644
--- a/app/CMS/Repositories/FileManager/Directory.php
+++ b/app/CMS/Repositories/FileManager/Directory.php
@@ -1,4 +1,5 @@
exists();
}
- public function update(DirectoryModel $directory, $data) {
+ /**
+ * Create new directory
+ *
+ * @param $data
+ *
+ * @return DirectoryModel
+ */
+ public function create($data)
+ {
+ $directory = new DirectoryModel();
+ $directory->name = $data['name'];
+ $directory->parent_id = $data['parentDirectory'];
+ $directory->user_id = \Auth::user()->id;
+ $directory->description = $data['description'];
+ $directory->save();
+
+ return $directory;
+ }
+
+ /**
+ * Update given directory
+ *
+ * @param DirectoryModel $directory
+ * @param $data
+ */
+ public function update(DirectoryModel $directory, $data)
+ {
$directory->name = $data['name'];
$directory->description = $data['description'];
$directory->save();
diff --git a/app/CMS/Repositories/FileManager/File.php b/app/CMS/Repositories/FileManager/File.php
new file mode 100644
index 00000000..23ffaaef
--- /dev/null
+++ b/app/CMS/Repositories/FileManager/File.php
@@ -0,0 +1,16 @@
+update($data);
+ }
+}
\ No newline at end of file
diff --git a/app/CMS/Repositories/Module.php b/app/CMS/Repositories/Module.php
index b8320d39..93d9fcb9 100644
--- a/app/CMS/Repositories/Module.php
+++ b/app/CMS/Repositories/Module.php
@@ -1,9 +1,11 @@
where('manages_content', true)
+ ->get();
+ });
+ }
+
public function getCreateContentTitle(ModuleModel $module)
{
$pageHeading = trans('admin/contents.new', ['name' => trans($module->name)]);
@@ -42,9 +53,14 @@ class Module extends Repository implements IModule
return is_null($moduleHeading) ? $pageHeading : $moduleHeading;
}
- public function getOverviewTitle(ModuleModel $module)
+ public function getOverviewTitle(ModuleModel $module = null)
{
$pageHeading = 'admin/contents.overview';
+
+ if (is_null($module)) {
+ return $pageHeading;
+ }
+
$moduleHeading = $this->call($module, 'getOverviewTitle');
return is_null($moduleHeading) ? $pageHeading : $moduleHeading;
@@ -52,8 +68,19 @@ class Module extends Repository implements IModule
public function all()
{
- return ModuleModel::where('enabled', true)
- ->get();
+ return Cache::remember('enabled-modules-and-template', setting('cacheModules', 3600), function () {
+ return ModuleModel::where('enabled', true)
+ ->get();
+ });
+ }
+
+ public function getOnlyModules()
+ {
+ return Cache::remember('enabled-modules', setting('cacheModules', 3600), function () {
+ return ModuleModel::where('enabled', true)
+ ->where('is_template', false)
+ ->get();
+ });
}
public function getByHandler($handler)
diff --git a/app/CMS/Repositories/Permissions/Permission.php b/app/CMS/Repositories/Permissions/Permission.php
new file mode 100644
index 00000000..f77952c6
--- /dev/null
+++ b/app/CMS/Repositories/Permissions/Permission.php
@@ -0,0 +1,15 @@
+with('subpermissions')
+ ->get();
+ }
+}
\ No newline at end of file
diff --git a/app/Models/ModelTraits/Settings.php b/app/CMS/Repositories/Settings/Settings.php
similarity index 59%
rename from app/Models/ModelTraits/Settings.php
rename to app/CMS/Repositories/Settings/Settings.php
index 841c6125..fe680c5d 100644
--- a/app/Models/ModelTraits/Settings.php
+++ b/app/CMS/Repositories/Settings/Settings.php
@@ -1,27 +1,27 @@
where('language', LaravelLocalization::getCurrentLocale())
- ->orWhere('language', null)
- ->orderBy('language', 'ASC');
+ ->where('language', LaravelLocalization::getCurrentLocale())
+ ->orWhere('language', null)
+ ->orderBy('language', 'ASC');
}
/**
* Load all settings
- *
* @return \stdClass
*/
public function getAll()
@@ -34,7 +34,6 @@ trait Settings
/**
* Get all settings with language info
- *
* @return \stdClass
*/
public function getAllWithLanguage()
@@ -55,7 +54,6 @@ trait Settings
/**
* Load only config for views
- *
* @return \stdClass
*/
public function getForView()
@@ -83,4 +81,31 @@ trait Settings
return $data;
}
+
+ /**
+ * Save settings
+ *
+ * @param array $data
+ */
+ public function save(array $data)
+ {
+ $commonSettings = isset($data['commonSettings']) ? $data['commonSettings'] : [];
+ unset($data['commonSettings']);
+
+ foreach ($data as $key => $value) {
+ // select language for this setting key
+ $language = isset($commonSettings[$key]) ? null : LaravelLocalization::getCurrentLocale();
+ $setting = SettingsModel::firstOrNew(['language' => $language, 'key' => $key]);
+
+ if ($setting->value == $value) {
+ continue;
+ }
+
+ // set value and save or delete
+ $setting->value = $value;
+ empty($value) ? $setting->delete() : $setting->save();
+ }
+
+ Cache::forget('settings');
+ }
}
\ No newline at end of file
diff --git a/app/CMS/Repositories/Templates/Template.php b/app/CMS/Repositories/Templates/Template.php
index dff25732..fdb0bcfd 100644
--- a/app/CMS/Repositories/Templates/Template.php
+++ b/app/CMS/Repositories/Templates/Template.php
@@ -1,10 +1,12 @@
id)
- ->select(['template_name', 'name', 'description'])
- ->get();
+ return Cache::remember('templates-for-module-'.$module->id, setting('cacheModules', 3600), function () use ($module) {
+ return TemplateModel::where('module_id', $module->id)
+ ->select(['template_name', 'name', 'description'])
+ ->get();
+ });
}
}
\ No newline at end of file
diff --git a/app/CMS/Repositories/Users/User.php b/app/CMS/Repositories/Users/User.php
new file mode 100644
index 00000000..f4c6d7df
--- /dev/null
+++ b/app/CMS/Repositories/Users/User.php
@@ -0,0 +1,65 @@
+username = $data['username'];
+ }
+
+ // change name (if set)
+ if (isset($data['name'])) {
+ $user->name = $data['name'];
+ }
+
+ if (isset($data['role'])) {
+ $user->role = $data['role'];
+ }
+
+ if (isset($data['status'])) {
+ $user->status = $data['status'];
+ }
+
+ if (isset($data['password'])) {
+ $user->password = Hash::make($data['password']);
+ }
+
+ $user->email = $data['email'];
+
+ $user->save();
+ }
+
+ /**
+ * Create new user
+ *
+ * @param $data
+ *
+ * @return UserModel
+ */
+ public function create($data)
+ {
+ // create new user
+ $user = new UserModel();
+ $user->name = $data['name'];
+ $user->email = $data['email'];
+ $user->username = $data['username'];
+ $user->role = $data['role'];
+ $user->password = Hash::make($data['password']);
+
+ // store user into database
+ $user->save();
+
+ return $user;
+ }
+}
\ No newline at end of file
diff --git a/app/CMS/Repositories/Widgets/Widget.php b/app/CMS/Repositories/Widgets/Widget.php
index bb924ce4..84299373 100644
--- a/app/CMS/Repositories/Widgets/Widget.php
+++ b/app/CMS/Repositories/Widgets/Widget.php
@@ -1,4 +1,5 @@
description = $data['description'];
$widget->container_class = $data['containerClass'];
$widget->container_id = empty($data['containerId']) ? null : $data['containerId'];
- $widget->settings = json_encode(call_user_func([$widgetType->handler, 'save'], $request));
+ $widget->settings = call_user_func([$widgetType->handler, 'save'], $request);
// save into database
$widget->save();
@@ -30,4 +31,22 @@ class Widget
return $widget;
}
+
+ public function edit(WidgetModel $widget, Request $request)
+ {
+ // update name
+ $widget->name = $request->name;
+ $widget->container_class = $request->containerClass;
+ $widget->container_id = empty($request->containerId) ? null : $request->containerId;
+ $widget->description = $request->description;
+
+ // try to save this widget
+ $widget->settings = call_user_func([$widget->widget_type_handler, 'save'], $request);
+
+ // save into database
+ $widget->save();
+
+ // fire event with editing widget
+ Event::fire(new \App\Events\EditWidget($widget));
+ }
}
\ No newline at end of file
diff --git a/app/CMS/Repositories/Widgets/WidgetArea.php b/app/CMS/Repositories/Widgets/WidgetArea.php
new file mode 100644
index 00000000..a278549f
--- /dev/null
+++ b/app/CMS/Repositories/Widgets/WidgetArea.php
@@ -0,0 +1,55 @@
+join('widget_in_widget_area', 'widget_in_widget_area.widget_id', '=', 'widgets.id')
+ ->join('widget_areas', 'widget_in_widget_area.widget_area_id', '=', 'widget_areas.id')
+ ->where('language', LaravelLocalization::getCurrentLocale())
+ ->orderBy('widget_in_widget_area.position');
+ if (!$uniqueCode) {
+ $widgets = $widgets->where('widget_areas.viewed', '>=', setting('preloadFrequentedWidgetAreasTreshold', 10));
+ } else {
+ $widgets = $widgets->where('code', $uniqueCode);
+ }
+
+ return $widgets;
+ }
+
+ public function update(\App\Models\Widgets\WidgetArea $area, Request $request) {
+ $area->name = $request->name;
+ $area->description = $request->description;
+ $area->save();
+
+ // fire event with new widget area
+ Event::fire(new \App\Events\EditWidgetArea($area));
+ }
+
+ /**
+ * Create new instance of widget area
+ *
+ * @param Request $request
+ */
+ public function create(Request $request)
+ {
+ $area = WidgetAreaModel::create([
+ 'code' => $request->code,
+ 'name' => $request->name,
+ 'description' => $request->description
+ ]);
+
+ // fire event with new widget area
+ Event::fire(new CreateNewWidgetArea($area));
+ }
+}
\ No newline at end of file
diff --git a/app/CMS/Widgets/Menu/Menu.php b/app/CMS/Widgets/Menu/Menu.php
index 21cf66e9..4d4bb697 100644
--- a/app/CMS/Widgets/Menu/Menu.php
+++ b/app/CMS/Widgets/Menu/Menu.php
@@ -1,19 +1,21 @@
whereIn('id', $ids)
- ->whereIn('status', $allowedStatuses)
- ->get();
- $used = [];
- foreach ($pages as $page) {
- $used[$page->id] = $page;
- }
+ return Cache::remember('widget-menu-content-pages', 5, function () use ($ids, $allowedStatuses) {
+ $pages = Content::where('language', LaravelLocalization::getCurrentLocale())
+ ->whereIn('id', $ids)
+ ->whereIn('status', $allowedStatuses)
+ ->where('moduleHandler', '!=', Article::class)
+ ->get();
- return $used;
+ $used = [];
+ foreach ($pages as $page) {
+ $used[$page->id] = $page;
+ }
+
+ return $used;
+ });
}
}
\ No newline at end of file
diff --git a/app/CMS/Widgets/Menu/Presenters/Menu.php b/app/CMS/Widgets/Menu/Presenters/Menu.php
index 7a1ccb02..aa6b9cb3 100644
--- a/app/CMS/Widgets/Menu/Presenters/Menu.php
+++ b/app/CMS/Widgets/Menu/Presenters/Menu.php
@@ -1,4 +1,5 @@
getOverview();
- $widget->settings = new \stdClass();
- $widget->settings->links = [];
+ $pages = $content->getOverview()
+ ->get();
return view('admin.widgets.menu.new', [
'type' => $type,
'widget' => $widget,
'pages' => $pages,
+ 'links' => []
]);
}
@@ -122,8 +123,6 @@ class Menu implements WidgetRenderer
return $a->order - $b->order;
});
- $widget->settings->links = (object)$links;
-
- return view('admin.widgets.menu.edit', ['widget' => $widget, 'pages' => $pages]);
+ return view('admin.widgets.menu.edit', ['widget' => $widget, 'pages' => $pages, 'links' => (object)$links]);
}
}
\ No newline at end of file
diff --git a/app/Console/Commands/ChangePassword.php b/app/Console/Commands/ChangePassword.php
index d8ab70a9..bb0789a8 100644
--- a/app/Console/Commands/ChangePassword.php
+++ b/app/Console/Commands/ChangePassword.php
@@ -30,7 +30,7 @@ class ChangePassword extends Command
$email = $this->argument('email');
try {
$user = User::where(['email' => $email])
- ->first();
+ ->firstOrFail();
} catch (ModelNotFoundException $e) {
$this->error('Invalid user ' . $email . '.');
return;
diff --git a/app/Console/Commands/InitDatabaseSchema.php b/app/Console/Commands/InitDatabaseSchema.php
index af8c11c0..ebeb91d6 100644
--- a/app/Console/Commands/InitDatabaseSchema.php
+++ b/app/Console/Commands/InitDatabaseSchema.php
@@ -13,14 +13,14 @@ class InitDatabaseSchema extends Command
*
* @var string
*/
- protected $signature = 'db:init {schema.sql}';
+ protected $signature = 'db:init';
/**
* The console command description.
*
* @var string
*/
- protected $description = 'Command description';
+ protected $description = 'Init database structure';
/**
* Create a new command instance.
@@ -39,13 +39,16 @@ class InitDatabaseSchema extends Command
*/
public function handle()
{
+ do {
+ $schema = $this->ask('Path to database schema file', 'database/schema.sql');
+ } while (!file_exists($schema));
- $schema = $this->argument('schema.sql');
-
- if (!file_exists($schema)) throw new NotFoundHttpException('File '.$schema.' does not exist.');
DB::unprepared(file_get_contents($schema));
- $this->line('Successfully imported');
+ $this->call('migrate');
+ $this->call('db:seed');
+
+ $this->line('Database successfully initialized.');
}
}
diff --git a/app/Console/Commands/InstallCMS.php b/app/Console/Commands/InstallCMS.php
new file mode 100644
index 00000000..f7819089
--- /dev/null
+++ b/app/Console/Commands/InstallCMS.php
@@ -0,0 +1,153 @@
+createEnv();
+
+ $this->line('Rerun this script again, we need to load changes.');
+ return;
+ }
+
+ // install php dependencies
+ $parameters = env('APP_DEBUG') ? '' : '--no-dev';
+ exec('composer install ' . $parameters);
+
+ // init database
+ try {
+ // does exist something in laguages table? (Or event table itself?)
+ Language::all();
+ } catch (QueryException $e) {
+ // database is not initialized
+ $this->call('db:init');
+ }
+
+ // install npm dependencies
+ exec('npm install');
+ exec('bower install');
+ exec('gulp');
+
+ // change chmod of needed directories
+ $directories = ['bootstrap/cache', 'storage', 'public'];
+ foreach ($directories as $directory) {
+ $this->changeChmod($directory);
+ }
+ $this->line('Chmod changed');
+
+ // generate APP_KEY in .env
+ $this->call('key:generate');
+
+ // create user
+ $this->line('Creating admin user...');
+ do {
+ $email = $this->ask('E-mail for admin user');
+ } while (empty($email));
+
+ $this->call('user:new', compact('email'));
+
+ $this->line('All done. CMS should be prepared.');
+ }
+
+ /**
+ * Insert value into .env config file
+ *
+ * @param $envConstant
+ * @param $value
+ */
+ private function setEnvConstant($envConstant, $value)
+ {
+ $content = file_get_contents(base_path('.env'));
+ $content = preg_replace('/' . $envConstant . '=(.*)/i', $envConstant . '=' . $value, $content);
+ file_put_contents(base_path('.env'), $content);
+ }
+
+ /**
+ * Create .env file with all needed constants
+ */
+ private function createEnv()
+ {
+ \File::copy(base_path('.env.example'), base_path('.env'));
+
+ // set environment
+ do {
+ $env = $this->ask('Install environment: ', 'local');
+ } while (empty($env));
+ $this->setEnvConstant('APP_ENV', $env);
+
+ // set debugging
+ if ($env == 'local') {
+ $debug = 'true';
+ } else {
+ $debug = $this->confirm('Enable debugging?', true) ? 'true' : 'false';
+ }
+ $this->setEnvConstant('APP_DEBUG', $debug);
+
+ // setup database
+ $databaseFields = [
+ 'DB_HOST' => 'Database server',
+ 'DB_DATABASE' => 'Database name',
+ 'DB_USERNAME' => 'Database user',
+ 'DB_PASSWORD' => 'Password'
+ ];
+ foreach ($databaseFields as $constant => $text) {
+ do {
+ $value = $this->ask($text);
+ } while (empty ($value));
+
+ $this->setEnvConstant($constant, $value);
+ }
+
+ // set app url
+ do {
+ $url = $this->ask('Application URL');
+ $url = trim($url, ' /');
+ } while (empty($url));
+ $this->setEnvConstant('SITE_URL', $url);
+ $this->setEnvConstant('UPLOAD_URL', $url . '/public/uploads');
+ $this->setEnvConstant('THUMBNAIL_URL', $url . '/public/uploads/thumbnails');
+ }
+
+ /**
+ * Recursively change chmod to 777 in given directory
+ *
+ * @param $directory
+ */
+ private function changeChmod($directory)
+ {
+ @chmod($directory, 0777);
+
+ if (!is_dir($directory)) {
+ return;
+ }
+
+ $subdirectories = \File::allFiles($directory);
+
+ foreach ($subdirectories as $subdirectory) {
+ $this->changeChmod($subdirectory);
+ }
+ }
+}
diff --git a/app/Console/Commands/Modules/CreateMigration.php b/app/Console/Commands/Modules/CreateMigration.php
new file mode 100644
index 00000000..1f42ce11
--- /dev/null
+++ b/app/Console/Commands/Modules/CreateMigration.php
@@ -0,0 +1,106 @@
+moduleName = $module = $this->argument('module');
+ $this->migrationName = $name = $this->argument('name');
+ $this->tableName = trim($this->option('table'), ' =');
+
+ $modules = Module::where('enabled', true)
+ ->get()
+ ->pluck('static_name', 'id')
+ ->toArray();
+
+ while (is_null($module) || !in_array($module, $modules)) {
+ $module = $this->anticipate('Input valid module name', $modules);
+ }
+
+ $selectedModule = Module::where('static_name', $module)
+ ->first();
+
+ $basePath = $selectedModule->is_template ? config('modules.path.template') : config('modules.paths.modules');
+ $path = $basePath . '/' . $module . '/Database/Migrations/';
+ if (!is_dir($path)) {
+ mkdir($path, 0777, true);
+ }
+
+ while (is_null($name)) {
+ $this->migrationName = $name = $this->ask('Input migration name');
+ }
+
+ $stubName = $this->option('create') ? 'create' : 'new';
+ $content = file_get_contents(config('modules.paths.stubs') . '/Migrations/' . $stubName . '.stub');
+ $content = $this->replacePlaceholders($content);
+
+ $migrationName = $path . $this->getMigrationName($name);
+
+ file_put_contents($migrationName, $content);
+
+ $this->line('Migration successfully created.', 'info');
+ }
+
+ /**
+ * Find and replace all placeholders in given content
+ *
+ * @param $content
+ *
+ * @return mixed
+ */
+ private function replacePlaceholders($content)
+ {
+ $replace = [
+ '$MigrationName$' => studly_case($this->migrationName),
+ '$ModuleName$' => $this->moduleName,
+ '$TableName$' => $this->tableName
+ ];
+
+ foreach ($replace as $what => $for) {
+ $content = str_replace($what, $for, $content);
+ }
+
+ return $content;
+ }
+
+ /**
+ * Get prefix for created migration
+ * @return false|string
+ */
+ protected function getDatePrefix()
+ {
+ return date('Y_m_d_His');
+ }
+
+ /**
+ * @param $name
+ *
+ * @return string
+ */
+ private function getMigrationName($name)
+ {
+ return $this->getDatePrefix() . '_' . snake_case($name) . '.php';
+ }
+}
diff --git a/app/Console/Commands/Modules/CreateNew.php b/app/Console/Commands/Modules/CreateNew.php
new file mode 100644
index 00000000..7a86e653
--- /dev/null
+++ b/app/Console/Commands/Modules/CreateNew.php
@@ -0,0 +1,122 @@
+loadArguments();
+ $path = preg_replace('|/{2,}|i', '/', config('modules.paths.modules') . '/' . $this->moduleNamespace);
+
+ if (is_dir($path)) {
+ $this->error('Module already exists in ' . $path);
+ return;
+ }
+
+ if (!is_dir($path))
+ mkdir($path);
+
+ // copy stub files
+ \File::copyDirectory(config('modules.paths.stubs').'/NewModule', $path);
+
+ $files = \File::allFiles($path);
+ foreach ($files as $file) {
+ $newName = str_replace('stub', 'php', $this->replacePlaceholders($file->getPathname()));
+
+ // ignore new entity when using existing entity
+ if ($this->entityNamespace != $defaultEntityNamespace && Str::contains('Entities', $file)) {
+ \File::delete($file);
+ continue;
+ }
+
+ // rename file
+ \File::move($file, $newName);
+
+ // change its content
+ $content = file_get_contents($newName);
+ $content = $this->replacePlaceholders($content);
+ file_put_contents($newName, $content);
+ }
+
+ $this->info('Module successfully created.');
+
+ $this->call('module:install', ['name' => $this->moduleName]);
+
+ }
+
+ /**
+ * Find and replace all placeholders in given content
+ *
+ * @param $content
+ *
+ * @return mixed
+ */
+ private function replacePlaceholders($content)
+ {
+ $replace = [
+ '$Module$' => $this->moduleName,
+ '$ModuleNamespace$' => str_replace('/', '\\', $this->moduleNamespace),
+ '$module$' => strtolower($this->moduleName),
+ '$EntityNamespace$' => $this->entityNamespace,
+ '$Entity$' => $this->entity
+ ];
+
+ foreach ($replace as $what => $for) {
+ $content = str_replace($what, $for, $content);
+ }
+
+ return $content;
+ }
+
+ /**
+ * Load command arguments
+ * @return string
+ */
+ private function loadArguments()
+ {
+ $parent = $this->argument('parentModule');
+ $this->moduleName = $moduleName = $this->argument('name');
+ $this->moduleNamespace = trim($parent . '/' . $moduleName, '/');
+
+ $entity = $this->option('entity');
+
+ $defaultEntityNamespace = '\\Modules\\' . str_replace('/', '\\', $this->moduleNamespace) . '\Entities\\';
+
+ if (!empty($entity)) {
+ $parts = explode('\\', $entity);
+ $this->entity = $parts[count($parts) - 1];
+ unset($parts[count($parts) - 1]);
+ $this->entityNamespace = implode('\\', $parts);
+ } else {
+ $this->entityNamespace = $defaultEntityNamespace;
+ $this->entity = $this->moduleName;
+ }
+
+ return $defaultEntityNamespace;
+ }
+}
\ No newline at end of file
diff --git a/app/Console/Commands/Modules/DisableModule.php b/app/Console/Commands/Modules/DisableModule.php
new file mode 100644
index 00000000..2e5b1aa7
--- /dev/null
+++ b/app/Console/Commands/Modules/DisableModule.php
@@ -0,0 +1,48 @@
+argument('module');
+ $module = Module::where('static_name', $moduleName)
+ ->firstOrFail();
+
+ if ($module->has_submodules) {
+ $submodules = $module->submodules;
+
+ foreach ($submodules as $submodule) {
+ $this->call('module:disable', ['module' => $submodule->static_name]);
+ }
+ }
+
+ $module->enabled = false;
+ $module->save();
+
+ \Cache::forget('enabled-modules');
+ \Cache::forget('enabled-content-modules');
+ \Cache::forget('enabled-modules-and-template');
+
+ $this->line('Module ' . $module->static_name . ' disabled.');
+ }
+}
diff --git a/app/Console/Commands/Modules/EnableModule.php b/app/Console/Commands/Modules/EnableModule.php
new file mode 100644
index 00000000..c1ddba27
--- /dev/null
+++ b/app/Console/Commands/Modules/EnableModule.php
@@ -0,0 +1,52 @@
+argument('module');
+ $module = Module::where('static_name', $moduleName)
+ ->firstOrFail();
+
+ if ($module->has_submodules) {
+ $submodules = $module->submodules;
+
+ foreach ($submodules as $submodule) {
+ $this->call('module:enable', ['module' => $submodule->static_name]);
+ }
+ }
+
+ if ($module->parent_id) {
+ $module->parent->update(['enabled' => true]);
+ }
+
+ $module->enabled = true;
+ $module->save();
+
+ \Cache::forget('enabled-modules');
+ \Cache::forget('enabled-content-modules');
+ \Cache::forget('enabled-modules-and-template');
+
+ $this->line('Module ' . $module->static_name . ' enabled.');
+ }
+}
diff --git a/app/Console/Commands/InstallAllModules.php b/app/Console/Commands/Modules/InstallAllModules.php
similarity index 75%
rename from app/Console/Commands/InstallAllModules.php
rename to app/Console/Commands/Modules/InstallAllModules.php
index 50f53ac7..36e0f7e2 100644
--- a/app/Console/Commands/InstallAllModules.php
+++ b/app/Console/Commands/Modules/InstallAllModules.php
@@ -1,6 +1,6 @@
call('install-module', ['name' => $moduleName]);
+ $this->call('module:install', ['name' => $moduleName]);
} catch (\Exception $e) {
$this->line('Module ' . $moduleName . ' already installed.');
}
diff --git a/app/Console/Commands/InstallModule.php b/app/Console/Commands/Modules/InstallModule.php
similarity index 87%
rename from app/Console/Commands/InstallModule.php
rename to app/Console/Commands/Modules/InstallModule.php
index 5bf435e5..3f2836c3 100644
--- a/app/Console/Commands/InstallModule.php
+++ b/app/Console/Commands/Modules/InstallModule.php
@@ -1,7 +1,8 @@
loadConfig();
- if (empty($config))
+ if (empty($config)) {
return;
+ }
// check if it is valid
$this->checkMandatoryFields($config);
@@ -68,14 +67,15 @@ class InstallModule extends Command
Cache::forget('enabled-modules');
Cache::forget('module-handler-to-id-enumeration');
+ exec('composer dump-autoload');
+
// inform user
- $this->line('Module ' . $name . ' successfuly installed');
+ $this->line('Module ' . $name . ' successfuly installed.');
}
/**
* Load config from Config/config.php in module files. We cannot use config() because the file have not published
* yet.
- *
* @return array
* @throws FileNotFoundException
*/
@@ -84,8 +84,9 @@ class InstallModule extends Command
$basePath = $this->modulesPath . DIRECTORY_SEPARATOR . $this->moduleName . DIRECTORY_SEPARATOR;
$path = $basePath . 'Config' . DIRECTORY_SEPARATOR . 'config.php';
- if (basename($basePath) == 'Database')
+ if (basename($basePath) == 'Database') {
return [];
+ }
// check if module has Config/config.php file
if (!file_exists($path)) {
@@ -120,7 +121,6 @@ class InstallModule extends Command
/**
* Installs module into database.
- *
* This method calls Module::install, which handles specific installation of module. In this way we should be able
* to install any module even with some other database structures.
*
@@ -154,14 +154,12 @@ class InstallModule extends Command
if (is_null($module)) {
// insert module into database
$settings = [
- 'staticName' => $this->moduleName,
- 'providers' => $providers,
- 'aliases' => isset($config['aliases']) ? $config['aliases'] : [],
- 'order' => isset($config['order']) ? $config['order'] : 0,
- 'files' => isset($config['files']) ? $config['files'] : []
+ 'providers' => $providers,
+ 'order' => isset($config['order']) ? $config['order'] : 0,
+ 'files' => isset($config['files']) ? $config['files'] : []
];
- $module = Module::install($name, $alias, $description, $handler, $this->parentModuleId, $settings);
+ $module = Installer::install($name, $alias, $this->moduleName, $description, $handler, $this->parentModuleId, $settings);
}
// try to install submodules
@@ -184,7 +182,7 @@ class InstallModule extends Command
$submodule = str_replace($this->modulesPath . DIRECTORY_SEPARATOR, '', $submodulePath);
try {
- $this->call('install-module', ['name' => $submodule, 'parentModuleId' => $parentModule->id]);
+ $this->call('module:install', ['name' => $submodule, 'parentModuleId' => $parentModule->id]);
} catch (\Exception $e) {
$this->error($e->getMessage());
}
diff --git a/app/Console/Commands/Modules/ModuleMigrate.php b/app/Console/Commands/Modules/ModuleMigrate.php
new file mode 100644
index 00000000..8af774f9
--- /dev/null
+++ b/app/Console/Commands/Modules/ModuleMigrate.php
@@ -0,0 +1,42 @@
+argument('module');
+ $module = Module::where('static_name', $moduleName)
+ ->firstOrFail();
+
+ if ($module->has_submodules) {
+ $submodules = $module->submodules;
+
+ foreach ($submodules as $submodule) {
+ $this->call('module:migrate', ['module' => $submodule->static_name]);
+ }
+ }
+
+ $this->line('Migrating ' . $module->static_name);
+ $this->call('migrate', ['--path' => config('modules.paths.modules').'/'.$moduleName.'/Database']);
+ }
+}
diff --git a/app/Console/Commands/Modules/RunMigrations.php b/app/Console/Commands/Modules/RunMigrations.php
new file mode 100644
index 00000000..0e6bd313
--- /dev/null
+++ b/app/Console/Commands/Modules/RunMigrations.php
@@ -0,0 +1,49 @@
+argument('module'))) {
+ $modules = $modules->where('static_name', $module);
+ }
+ $modules = $modules->get();
+
+ if ($modules->isEmpty()) {
+ $this->error('No valid modules.');
+ return;
+ }
+
+ $command = $this->option('rollback') ? 'migrate:rollback' : 'migrate';
+ foreach ($modules as $module) {
+ $this->info('Migrating '.$module->static_name);
+
+ $basePath = $module->is_template ? config('modules.path.templates') : config('modules.paths.modules');
+ $path = $basePath . '/' . $module->static_name . '/Database/Migrations/';
+ $path = str_replace(base_path(), '', $path);
+
+ $this->call($command, ['--path' => $path]);
+ }
+ }
+}
diff --git a/app/Console/Commands/Modules/UninstallModule.php b/app/Console/Commands/Modules/UninstallModule.php
new file mode 100644
index 00000000..6c79c84f
--- /dev/null
+++ b/app/Console/Commands/Modules/UninstallModule.php
@@ -0,0 +1,42 @@
+argument('email');
-
- // check if username is really email
- if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
- $this->error($email . ' is not a valid e-mail!');
- return;
- }
+ do {
+ $email = $this->argument('email');
+ } while (!filter_var($email, FILTER_VALIDATE_EMAIL));
// ask for password
do {
@@ -63,6 +58,8 @@ class NewUser extends Command
$user->role = $role;
$user->save();
+ event(new CreateNewUser($user));
+
$this->info('User ' . $email . ' successfully created.');
}
}
diff --git a/app/Console/Commands/SetTemplate.php b/app/Console/Commands/SetTemplate.php
index f24c2a7b..a196257c 100644
--- a/app/Console/Commands/SetTemplate.php
+++ b/app/Console/Commands/SetTemplate.php
@@ -2,6 +2,8 @@
namespace App\Console\Commands;
+use App\CMS\ModuleManager\Installer;
+use App\CMS\ModuleManager\Uninstaller;
use App\Models\Module;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Cache;
@@ -43,14 +45,13 @@ class SetTemplate extends Command
$config['staticName'] = $template;
if ($current) {
- $info = json_decode($current->module_settings);
-
- $this->line('Template is already installed. Currently using template ' . trans($current->name) . ' located in /templates/' . $info->staticName . '.');
+ $this->line('Template is already installed. Currently using template ' . trans($current->name) . ' located in /templates/' . $current->static_name . '.');
$confirm = $this->confirm('Uninstall it and install *' . trans($config['name']) . '*? All data associated with installed template will be lost!');
if ($confirm) {
$this->line('Uninstalling ' . $current->name . '.');
- $current->uninstall();
+
+ Uninstaller::uninstall($current);
} else {
$this->line('Aborting installation.');
return;
@@ -58,7 +59,7 @@ class SetTemplate extends Command
}
try {
- Module::install($config['name'], $config['alias'], $config['description'], $config['handler'], false, $config);
+ Installer::install($config['name'], $config['alias'], $config['staticName'], $config['description'], $config['handler'], false, $config);
} catch (\Exception $e) {
$this->error('Cannot install template ' . $template . '. Message: ' . $e->getMessage());
return;
@@ -72,6 +73,8 @@ class SetTemplate extends Command
// run again artisan for publishing resources
// it cannot be done using $this->call, because we need to load different template into service providers
- exec('php artisan vendor:publish');
+ if ($publish) {
+ exec('php artisan vendor:publish');
+ }
}
}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 00cf4923..a39e7fc0 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -2,6 +2,13 @@
namespace App\Console;
+use App\Console\Commands\InstallCMS;
+use App\Console\Commands\Modules\CreateMigration;
+use App\Console\Commands\Modules\RunMigrations;
+use App\Console\Commands\Modules\CreateNew;
+use App\Console\Commands\Modules\DisableModule;
+use App\Console\Commands\Modules\EnableModule;
+use App\Console\Commands\Modules\ModuleMigrate;
use App\Console\Commands\PublishTemplateResources;
use App\Console\Commands\TemplateInfo;
use Illuminate\Console\Scheduling\Schedule;
@@ -11,21 +18,27 @@ class Kernel extends ConsoleKernel
{
/**
* The Artisan commands provided by your application.
- *
* @var array
*/
protected $commands = [
Commands\NewUser::class,
Commands\ChangePassword::class,
- Commands\InstallModule::class,
- Commands\InstallAllModules::class,
+ CreateNew::class,
+ ModuleMigrate::class,
+ EnableModule::class,
+ DisableModule::class,
+ Commands\Modules\InstallModule::class,
+ Commands\Modules\InstallAllModules::class,
Commands\TranslateDirectory::class,
Commands\TranslateAll::class,
Commands\InitDatabaseSchema::class,
Commands\SetTemplate::class,
Commands\AddLanguage::class,
PublishTemplateResources::class,
- TemplateInfo::class
+ TemplateInfo::class,
+ InstallCMS::class,
+ CreateMigration::class,
+ RunMigrations::class
];
/**
@@ -37,7 +50,5 @@ class Kernel extends ConsoleKernel
*/
protected function schedule(Schedule $schedule)
{
- // $schedule->command('inspire')
- // ->hourly();
}
}
diff --git a/app/Events/EditWidgetArea.php b/app/Events/EditWidgetArea.php
index 8aa5642d..c069772c 100644
--- a/app/Events/EditWidgetArea.php
+++ b/app/Events/EditWidgetArea.php
@@ -2,10 +2,8 @@
namespace App\Events;
-use App\Events\Event;
-use App\Models\WidgetArea;
+use App\Models\Widgets\WidgetArea;
use Illuminate\Queue\SerializesModels;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
class EditWidgetArea extends Event
{
diff --git a/app/Events/UploadFile.php b/app/Events/UploadFile.php
index 05def8d0..2c67de2f 100644
--- a/app/Events/UploadFile.php
+++ b/app/Events/UploadFile.php
@@ -2,37 +2,33 @@
namespace App\Events;
+use App\Models\FileManager\File as FileModel;
use Illuminate\Queue\SerializesModels;
-use Symfony\Component\HttpFoundation\File\File;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
class UploadFile extends Event
{
use SerializesModels;
- /**
- * @var UploadedFile
- */
public $uploadedFile;
/**
- * @var
+ * @var FileModel
*/
- public $id;
+ public $file;
/**
* Create a new event instance.
*
- * @param File $uploadedFile
- * @param $id
+ * @param FileModel $file
+ * @param $id
+ *
+ * @internal param File $uploadedFile
*/
- public function __construct(File $uploadedFile, $id)
+ public function __construct(FileModel $file)
{
- $this->uploadedFile = $uploadedFile;
- $this->id = $id;
+ $this->file = $file;
}
/**
* Get the channels the event should be broadcast on.
- *
* @return array
*/
public function broadcastOn()
diff --git a/app/Http/Controllers/Admin/Contents/ContentActions.php b/app/Http/Controllers/Admin/Contents/ContentActions.php
index c73c4085..7ee63b40 100644
--- a/app/Http/Controllers/Admin/Contents/ContentActions.php
+++ b/app/Http/Controllers/Admin/Contents/ContentActions.php
@@ -7,6 +7,8 @@ use App\CMS\Interactions\Admin\Content\ChangeStatus;
use App\CMS\Interactions\Admin\Content\DeletePage;
use App\CMS\Interactions\Admin\Content\SetHomepage;
use App\Http\Controllers\Admin\Controller;
+use App\Models\Content\Content;
+use App\Models\Content\ContentHistory;
class ContentActions extends Controller
{
@@ -25,15 +27,13 @@ class ContentActions extends Controller
* This method is called in static page overview from quick actions. It checks if status is valid, if page exists
* and updates status.
*
- * @param $id
- * @param $status
+ * @param Content $page
+ * @param $status
*
* @return \Illuminate\Http\RedirectResponse
*/
- public function changeStatus($id, $status)
+ public function changeStatus(Content $page, $status)
{
- $page = $this->content->getOne($id);
-
Interaction::handle(ChangeStatus::class, ['status' => $status], $page);
// redirect back to overview with info for user
@@ -45,14 +45,12 @@ class ContentActions extends Controller
/**
* Delete page
*
- * @param $id
+ * @param Content $page
*
* @return \Illuminate\Http\RedirectResponse
*/
- public function delete($id)
+ public function delete(Content $page)
{
- $page = $this->content->getOne($id);
-
Interaction::handle(DeletePage::class, [], $page);
// redirect back to overview with info for user
@@ -66,14 +64,12 @@ class ContentActions extends Controller
/**
* Sets page as homepage
*
- * @param $id
+ * @param Content $page
*
* @return \Illuminate\Http\RedirectResponse
*/
- public function setHomepage($id)
+ public function setHomepage(Content $page)
{
- $page = $this->content->getOne($id);
-
Interaction::handle(SetHomepage::class, [], $page);
// redirect back to overview with info for user
diff --git a/app/Http/Controllers/Admin/Contents/ContentOverview.php b/app/Http/Controllers/Admin/Contents/ContentOverview.php
index b4f09afa..7e5c55d9 100644
--- a/app/Http/Controllers/Admin/Contents/ContentOverview.php
+++ b/app/Http/Controllers/Admin/Contents/ContentOverview.php
@@ -5,6 +5,7 @@ use App\CMS\Contracts\Repositories\Content as IContent;
use App\CMS\Contracts\Repositories\Module as IModule;
use App\CMS\Enumerations\ContentStatuses;
use App\Http\Controllers\Admin\Controller;
+use App\Models\Module;
class ContentOverview extends Controller
{
@@ -26,29 +27,32 @@ class ContentOverview extends Controller
/**
* Overview for all content pages.
*
- * @param null|int $moduleId
- * @param null $status
+ * @param Module|null $module
+ * @param null $status
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ * @internal param int|null $moduleId
*/
- public function index($moduleId = null, $status = null)
+ public function index(Module $module, $status = null)
{
// get module settings
- $module = $this->module->getOne($moduleId);
$pageHeading = $this->module->getOverviewTitle($module);
// get pages for overview
- $handler = $module !== null ? $module->handler : null;
+ $handler = $module->exists ? $module->handler : null;
$pages = $this->content->getOverview($handler, [$status])
->paginate(setting('paginatedResults', 20));
// get homepage - for checking if homepage is set and available
$homepage = $this->content->getHomepage();
+ $contentModules = app(\App\CMS\Repositories\Module::class)->getContentModules();
+
return view('admin.content.overview', [
'pages' => $pages,
'homepage' => $homepage,
'pageHeading' => $pageHeading,
+ 'contentModules' => $contentModules,
'statuses' => ContentStatuses::getWithTranslations(),
'module' => isset($module) ? $module : null
]);
diff --git a/app/Http/Controllers/Admin/Contents/CreateNewContent.php b/app/Http/Controllers/Admin/Contents/CreateNewContent.php
index 18081270..24e047cc 100644
--- a/app/Http/Controllers/Admin/Contents/CreateNewContent.php
+++ b/app/Http/Controllers/Admin/Contents/CreateNewContent.php
@@ -1,4 +1,5 @@
content = $content;
$this->module = $module;
- $this->category = $category;
$this->template = $template;
}
@@ -67,13 +61,16 @@ class CreateNewContent extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
- public function create($module)
+ public function create(Module $module)
{
- $module = $this->module->getOne($module);
$statuses = ContentStatuses::getWithTranslations();
$pageHeading = $this->module->getCreateContentTitle($module);
$templates = $this->template->getForModule($module);
- $categories = $this->category->getForModule($module);
+
+ $categories = new Collection();
+ if (class_exists(ICategory::class)) {
+ $categories = app(ICategory::class)->getForModule($module);
+ }
$page = $this->content->getOne();
@@ -95,15 +92,14 @@ class CreateNewContent extends Controller
/**
* Save new content page
*
- * @param CreateNewContentRequest $request
- * @param $moduleId
+ * @param CreateNewContentRequest|Request $request
+ * @param Module $module
*
* @return \Illuminate\Http\RedirectResponse
+ * @internal param $moduleId
*/
- public function store(Request $request, $moduleId)
+ public function store(Request $request, Module $module)
{
- $module = $this->module->getOne($moduleId);
-
// create new page
Interaction::handle(NewContent::class, $request->all(), $module->handler);
diff --git a/app/Http/Controllers/Admin/Contents/EditContent.php b/app/Http/Controllers/Admin/Contents/EditContent.php
index 4d0104cb..9fe2da1d 100644
--- a/app/Http/Controllers/Admin/Contents/EditContent.php
+++ b/app/Http/Controllers/Admin/Contents/EditContent.php
@@ -1,4 +1,5 @@
history = $history;
$this->file = $file;
$this->content = $content;
$this->module = $module;
- $this->category = $category;
$this->template = $template;
}
/**
* Display form for editing static page
*
- * @param $id
+ * @param Content $page
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
- public function edit($id)
+ public function edit(Content $page)
{
$statuses = ContentStatuses::getWithTranslations();
- $page = $this->content->getOne($id);
// get module ID
$module = $this->module->getByHandler($page->moduleHandler);
$pageHeading = $this->module->getUpdateContentTitle($module, $page);
$templates = $this->template->getForModule($module);
- $categories = $this->category->getForModule($module);
$history = $this->history->getStructuredHistoryOf($page);
+ $categories = new Collection();
+ if (class_exists(ICategory::class)) {
+ $categories = app(ICategory::class)->getForModule($module);
+ }
+
// render view
return view('admin.content.edit', [
'pageHeading' => $pageHeading,
@@ -94,7 +89,8 @@ class EditContent extends Controller
'page' => $page,
'module' => $module,
'categories' => $categories,
- 'rootPages' => $this->content->getOverview()->get(),
+ 'rootPages' => $this->content->getOverview()
+ ->get(),
'templates' => $templates,
'formSectionNames' => $this->module->call($module, 'getExtendedFormSections'),
'formSections' => $this->module->call($module, 'getExtendedFormInputsEdit'),
@@ -105,29 +101,14 @@ class EditContent extends Controller
/**
* Edit static page and save changes into history.
*
- * @param EditContentRequest $request
- * @param $id
+ * @param EditContentRequest|Request $request
+ * @param Content $page
*
* @return \Illuminate\Http\RedirectResponse
+ * @internal param $id
*/
- public function update(Request $request, $id)
+ public function update(Request $request, Content $page)
{
- try {
- /**
- * @var $page Content
- */
- $page = $this->content->getOne($id);
- } catch (NotFoundHttpException $e) {
-
- // log attempt of invalid edit
- Event::fire(new AttemptToEditInvalidContent($id));
-
- // page for editing not found
- return redirect()
- ->route('content.overview')
- ->with('error', trans('admin/contents.invalidPage'));
- }
-
// edit page
Interaction::handle(EditContentInteraction::class, $request->all(), $page);
@@ -136,4 +117,24 @@ class EditContent extends Controller
->route('content.overview')
->with('success', trans('admin/contents.successfullyEdited'));
}
+
+ public function order() {
+ $pages = $this->content->getOverview()->get();
+
+ return view('admin.content.order', compact('pages'));
+ }
+
+ public function setOrder(Request $request) {
+
+ $data = $request->get('page');
+
+ foreach ($data as $id => $order) {
+ Content::where('id', $id)->update(['order' => $order]);
+ }
+
+ // something was changed, inform user
+ return redirect()
+ ->route('content.overview')
+ ->with('success', trans('admin/contents.orderSuccessfullySet'));
+ }
}
\ No newline at end of file
diff --git a/app/Http/Controllers/Admin/Contents/History.php b/app/Http/Controllers/Admin/Contents/History.php
index 28b74412..7811b507 100644
--- a/app/Http/Controllers/Admin/Contents/History.php
+++ b/app/Http/Controllers/Admin/Contents/History.php
@@ -19,30 +19,31 @@ class History extends Controller
}
/**
- * @param $id
+ * @param Content $page
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
- public function getOverview($id)
+ public function getOverview(Content $page)
{
- // test if given content id is static page and if exists
- $content = Content::findOrFail($id);
-
- $history = $this->history->getStructuredHistoryOf($content);
+ $history = $this->history->getStructuredHistoryOf($page);
return view('admin/history.overview', [
'history' => $history,
- 'page' => $content
+ 'page' => $page
]);
}
- public function getDiff($revision, $id)
+ /**
+ * @param ContentHistory $revision
+ *
+ * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ */
+ public function getDiff(ContentHistory $revision)
{
- $change = $this->history->findOrFail($id);
- $diff = $this->history->getDiff($change);
+ $diff = $this->history->getDiff($revision);
return view('admin/history.diff', [
- 'change' => $change,
+ 'change' => $revision,
'diff' => $diff
]);
}
diff --git a/app/Http/Controllers/Admin/Dashboard/Dashboard.php b/app/Http/Controllers/Admin/Dashboard/Dashboard.php
index bad941c3..cfacc789 100644
--- a/app/Http/Controllers/Admin/Dashboard/Dashboard.php
+++ b/app/Http/Controllers/Admin/Dashboard/Dashboard.php
@@ -2,13 +2,22 @@
namespace App\Http\Controllers\Admin\Dashboard;
+use App\CMS\Contracts\Repositories\Module;
use App\Http\Controllers\Admin\Controller;
-use Illuminate\Http\Request;
+use App\Models\Content\Content;
+use Illuminate\Support\Facades\Auth;
class Dashboard extends Controller
{
- public function index(Request $request)
+ public function index()
{
- return redirect()->route('content.overview');
+ $contentModules = app(Module::class)->getContentModules();
+
+ if (\Auth::user()
+ ->can('manage', Content::class) && !$contentModules->isEmpty()) {
+ return redirect()->route('content.overview');
+ } else {
+ return redirect()->route('users.detail', ['user' => Auth::user()]);
+ }
}
}
diff --git a/app/Http/Controllers/Admin/FileManager/CreateNewDirectory.php b/app/Http/Controllers/Admin/FileManager/CreateNewDirectory.php
index f6b4732c..8a9a3396 100644
--- a/app/Http/Controllers/Admin/FileManager/CreateNewDirectory.php
+++ b/app/Http/Controllers/Admin/FileManager/CreateNewDirectory.php
@@ -8,6 +8,7 @@ use App\CMS\Interactions\Admin\FileManager\CreateDirectory;
use App\CMS\Repositories\FileManager\Directory as DirectoryRepository;
use App\Http\Controllers\Admin\Controller;
use App\Http\Requests;
+use App\Models\FileManager\Directory;
use Illuminate\Http\Request;
class CreateNewDirectory extends Controller
@@ -30,9 +31,10 @@ class CreateNewDirectory extends Controller
/**
* Create new directory
*
- * @param Requests\CreateNewDirectoryRequest $request
+ * @param Requests\CreateNewDirectoryRequest|Request $request
*
* @return $this|\Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
+ * @internal param Directory $parentDirectory
*/
public function store(Request $request)
{
diff --git a/app/Http/Controllers/Admin/FileManager/EditDirectory.php b/app/Http/Controllers/Admin/FileManager/EditDirectory.php
index f9e5b12e..9da13545 100644
--- a/app/Http/Controllers/Admin/FileManager/EditDirectory.php
+++ b/app/Http/Controllers/Admin/FileManager/EditDirectory.php
@@ -5,19 +5,20 @@ namespace App\Http\Controllers\Admin\FileManager;
use App\CMS\Repositories\FileManager\Directory as DirectoryRepository;
use App\Http\Controllers\Admin\Controller;
use App\Http\Requests;
+use App\Http\Requests\EditDirectoryRequest;
use App\Models\FileManager\Directory;
class EditDirectory extends Controller
{
/**
- * @param Requests\EditDirectoryRequest $request
+ * @param EditDirectoryRequest $request
* @param Directory $directory
*
* @return $this|\Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
* @internal param $directoryId
*
*/
- public function update(Requests\EditDirectoryRequest $request, Directory $directory)
+ public function update(EditDirectoryRequest $request, Directory $directory)
{
$repository = app(DirectoryRepository::class);
if ($repository->checkIfNameExists($request->name, $directory->parent_id, $directory->id)) {
diff --git a/app/Http/Controllers/Admin/FileManager/EditUploadedFile.php b/app/Http/Controllers/Admin/FileManager/EditUploadedFile.php
index 374f4dcf..de494d21 100644
--- a/app/Http/Controllers/Admin/FileManager/EditUploadedFile.php
+++ b/app/Http/Controllers/Admin/FileManager/EditUploadedFile.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin\FileManager;
use App\CMS\Helpers\FileManager;
use App\CMS\Helpers\RootDirectory;
+use App\CMS\Repositories\FileManager\File as FileRepository;
use App\Events\EditFile;
use App\Http\Controllers\Admin\Controller;
use App\Http\Requests\EditUploadedFileRequest;
@@ -14,14 +15,12 @@ class EditUploadedFile extends Controller
{
/**
* Edit form
- *
* Render edit form for displaying details and updating given file
*
* @param File $file
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\View\View
* @internal param int $id file id
- *
*/
public function show(File $file)
{
@@ -35,7 +34,6 @@ class EditUploadedFile extends Controller
/**
* Updates file
- *
* User can change only keywords, original filename and description. Mime type, hash and other fields remain
* unchanged
*
@@ -44,16 +42,11 @@ class EditUploadedFile extends Controller
*
* @return \Illuminate\Http\RedirectResponse
* @internal param $id
- *
*/
public function update(EditUploadedFileRequest $request, File $file)
{
- // set values from form
- $file->name = $request->name;
- $file->keywords = $request->keywords;
- $file->description = $request->description;
- $file->directory_id = $request->directory_id;
- $file->save();
+ $repository = app(FileRepository::class);
+ $repository->update($file, $request->all());
// fire action
Event::fire(new EditFile($file));
diff --git a/app/Http/Controllers/Admin/FileManager/UploadFile.php b/app/Http/Controllers/Admin/FileManager/UploadFile.php
index 3c4a7933..03b5f91f 100644
--- a/app/Http/Controllers/Admin/FileManager/UploadFile.php
+++ b/app/Http/Controllers/Admin/FileManager/UploadFile.php
@@ -1,8 +1,8 @@
directoryRepository->getAllSubdirectories($directory);
- if (!$includeHidden) {
+ if (!Input::get('hidden', true)) {
$subdirectories = $subdirectories->where('hidden', false);
}
diff --git a/app/Http/Controllers/Admin/Login.php b/app/Http/Controllers/Admin/Login.php
deleted file mode 100644
index 524cd8f9..00000000
--- a/app/Http/Controllers/Admin/Login.php
+++ /dev/null
@@ -1,87 +0,0 @@
-email;
-
- // try to find user
- $user = User::where('email', $email)
- ->where('role', '!=', User::ROLE_VISITOR)
- ->where('status', User::STATE_ACTIVE)
- ->first();
-
- if (!$user) {
- return $this->loginFailed();
- }
-
- // try to log in user
- if (Hash::check($request->password, $user->password)) {
- Auth::login($user);
-
- $redirect = $request->redirectTo ? $request->redirectTo : route('admin.dashboard');
-
- return redirect()->intended($redirect);
- }
-
- // login invalid, redirect and inform the user
- return $this->loginFailed();
- }
-
- /**
- * Logs out user
- *
- * @return \Illuminate\Http\RedirectResponse
- */
- public function logout()
- {
-
- // remove user information
- \Auth::logout();
-
- // redirect to login form with info about successfull logout
- return redirect()
- ->route('login')
- ->with('success', trans('admin/common.logoutSuccessfull'));
- }
-
- private function loginFailed()
- {
- return redirect()
- ->route('login')
- ->with('error', trans('auth.failed'))
- ->withInput();
- }
-}
diff --git a/app/Http/Controllers/Admin/Permissions.php b/app/Http/Controllers/Admin/Permissions.php
new file mode 100644
index 00000000..0f9636a7
--- /dev/null
+++ b/app/Http/Controllers/Admin/Permissions.php
@@ -0,0 +1,43 @@
+get();
+
+ return view('admin/permissions.index', compact('permissions'));
+ }
+
+ /**
+ * Setup default permissions
+ *
+ * @param Request $request
+ *
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function setDefault(Request $request)
+ {
+ Permission::where('default', true)
+ ->update(['default' => false]);
+
+ $permissions = $request->permissions;
+
+ Permission::whereIn('string_id', array_keys($permissions))
+ ->update(['default' => true]);
+
+ return redirect()
+ ->back()
+ ->with('success', trans('admin/permissions.defaultSuccessfullySet'));
+ }
+}
diff --git a/app/Http/Controllers/Admin/Search.php b/app/Http/Controllers/Admin/Search.php
index 1d93c14f..ffabde36 100644
--- a/app/Http/Controllers/Admin/Search.php
+++ b/app/Http/Controllers/Admin/Search.php
@@ -13,7 +13,6 @@ class Search extends Controller
{
/**
* Create form for searching
- *
* @return $this|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function getSearch()
@@ -37,7 +36,6 @@ class Search extends Controller
/**
* Method used for performing search.
- *
* This method iterates over all registered search engines and returns results for each engine apart.
*
* @param string $term search text
@@ -60,10 +58,16 @@ class Search extends Controller
// try to find given term
$results = $search->search($term);
+ $content = $presenter->render($results);
+
+ if (is_null($content)) {
+ continue;
+ }
+
// create result object
$resultsParts[$search->getId()] = [
'name' => $search->getName(),
- 'content' => $presenter->render($results),
+ 'content' => $content,
'count' => count($results)
];
}
diff --git a/app/Http/Controllers/Admin/Settings.php b/app/Http/Controllers/Admin/Settings.php
index db782248..31e4a285 100644
--- a/app/Http/Controllers/Admin/Settings.php
+++ b/app/Http/Controllers/Admin/Settings.php
@@ -2,15 +2,15 @@
namespace App\Http\Controllers\Admin;
+use App\CMS\Repositories\Settings\Settings as SettingsRepository;
use App\Http\Requests;
use App\Models\Settings as SettingsModel;
use Illuminate\Support\Facades\App;
-use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
class Settings extends Controller
{
/**
- * @var SettingsModel
+ * @var SettingsRepository
*/
protected $settings;
@@ -19,14 +19,13 @@ class Settings extends Controller
*
* @param SettingsModel $settings
*/
- public function __construct(SettingsModel $settings)
+ public function __construct(SettingsRepository $settings)
{
$this->settings = $settings;
}
/**
* Get overview (with form) for editing settings
- *
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function getOverview()
@@ -45,7 +44,6 @@ class Settings extends Controller
/**
* Save all settings (ignore empty ones)
- *
* When settings used to be non-empty string and user deletes it, key is also deleted from database
*
* @param Requests\SaveSettingsRequest $request
@@ -54,25 +52,8 @@ class Settings extends Controller
*/
public function saveSettings(Requests\SaveSettingsRequest $request)
{
- $data = $request->all();
- $commonSettings = isset($data['commonSettings']) ? $data['commonSettings'] : [];
- // remove CSRF token field
- unset($data['_token'], $data['commonSettings']);
-
- foreach ($data as $key => $value) {
- // select language for this setting key
- $language = isset($commonSettings[$key]) ? null : LaravelLocalization::getCurrentLocale();
- $setting = SettingsModel::firstOrNew(['language' => $language, 'key' => $key]);
-
- if ($setting->value == $value) {
- continue;
- }
-
- // set value and save or delete
- $setting->value = $value;
- $setting->save();
- }
+ $this->settings->save($request->except(['_token']));
return redirect()
->route('settings.overview')
diff --git a/app/Http/Controllers/Admin/Templates/CopyTemplate.php b/app/Http/Controllers/Admin/Templates/CopyTemplate.php
index 41701e16..b0ea9bfe 100644
--- a/app/Http/Controllers/Admin/Templates/CopyTemplate.php
+++ b/app/Http/Controllers/Admin/Templates/CopyTemplate.php
@@ -2,6 +2,7 @@
namespace App\Http\Controllers\Admin\Templates;
+use App\Cms\Repositories\Templates\Template as TemplateRepository;
use App\Http\Controllers\Admin\Controller;
use App\Http\Requests\CopyTemplateRequest;
use App\Models\Templates\Template;
@@ -10,7 +11,6 @@ class CopyTemplate extends Controller
{
/**
* Method for copying given template.
- *
* This method is supposed to be called by POST method.
*
* @param CopyTemplateRequest $request
@@ -32,15 +32,22 @@ class CopyTemplate extends Controller
$namespace .= '::';
}
+ $repository = app(TemplateRepository::class);
+ $repository->setModel($template);
+
// get template absolute paths
- $realTemplatePath = $template->getPathToTemplate();
- $customTemplatePath = $template->getPathToTemplate(Template::CUSTOM_EDIT_DIRECTORY);
+ $realTemplatePath = $repository->getPathToTemplate();
+ $customTemplatePath = $repository->getPathToTemplate(TemplateRepository::CUSTOM_EDIT_DIRECTORY);
$path = dirname($customTemplatePath);
// create file copy
$data = file_get_contents($realTemplatePath);
- $written = file_put_contents($path . DIRECTORY_SEPARATOR . $newName . Template::TEMPLATE_SUFFIX, $data);
+ if (!is_dir($path)) {
+ mkdir($path, 0777, true);
+ }
+
+ $written = file_put_contents($path . DIRECTORY_SEPARATOR . $newName . TemplateRepository::TEMPLATE_SUFFIX, $data);
// were data written?
if ($written === false) {
return $this->copyFailed($request, $template);
@@ -67,7 +74,6 @@ class CopyTemplate extends Controller
* @param Template $template
*
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
- *
*/
private function copyFailed(CopyTemplateRequest $request, Template $template)
{
diff --git a/app/Http/Controllers/Admin/Templates/EditTemplate.php b/app/Http/Controllers/Admin/Templates/EditTemplate.php
index 2938c129..65998dc2 100644
--- a/app/Http/Controllers/Admin/Templates/EditTemplate.php
+++ b/app/Http/Controllers/Admin/Templates/EditTemplate.php
@@ -34,13 +34,8 @@ class EditTemplate extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
- public function getEdit($template)
+ public function getEdit(Template $template)
{
- /**
- * @var $template Template
- */
- $template = Template::findOrFail($template);
-
$this->templateRepository->setModel($template);
// load template content
@@ -59,15 +54,13 @@ class EditTemplate extends Controller
* Save meta information about template and edited content
*
* @param EditTemplateRequest $request
- * @param $templateId
+ * @param Template $template
*
* @return \Illuminate\Http\RedirectResponse
+ * @internal param $templateId
*/
- public function postEdit(EditTemplateRequest $request, $templateId)
+ public function postEdit(EditTemplateRequest $request, Template $template)
{
- // find template
- $template = Template::findOrFail($templateId);
-
// setup meta information
$template->name = $request->name;
@@ -105,7 +98,7 @@ class EditTemplate extends Controller
// try to save content
if (!is_writable($customDir) && !is_writable($originalDir)) {
return redirect()
- ->route('templates.edit', ['id' => $request->id])
+ ->route('templates.edit', ['id' => $template->id])
->withInput()
->with('warning', trans('admin/templates.cannotWriteContent'));
}
diff --git a/app/Http/Controllers/Admin/Templates/TemplateOverview.php b/app/Http/Controllers/Admin/Templates/TemplateOverview.php
index 6576b76a..98609767 100644
--- a/app/Http/Controllers/Admin/Templates/TemplateOverview.php
+++ b/app/Http/Controllers/Admin/Templates/TemplateOverview.php
@@ -7,17 +7,28 @@ use App\Models\Templates\TemplatePath;
class TemplateOverview extends Controller
{
- public function getPath($path)
+ public function index()
{
- $path = TemplatePath::findOrFail($path);
+ $templatePaths = TemplatePath::with('subdirectories')
+ ->whereNull('parent_id')
+ ->get();
+
+ return view('admin.templates.index', compact('templatePaths'));
+ }
+
+ /**
+ * Display overview of all templates in given path
+ *
+ * @param TemplatePath $templatePath
+ *
+ * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ */
+ public function getPath(TemplatePath $templatePath)
+ {
return view('admin.templates.list', [
- 'directory' => $path,
- 'isWritable' => is_writable(base_path($path->path)),
- 'templates' => $path->templates()
- ->get(),
- 'subdirectories' => $path->subdirectories()
- ->get()
+ 'directory' => $templatePath,
+ 'isWritable' => is_writable(base_path($templatePath->path))
]);
}
}
diff --git a/app/Http/Controllers/Admin/Users/CreateNewUser.php b/app/Http/Controllers/Admin/Users/CreateNewUser.php
index 863e5fe0..dac56a3b 100644
--- a/app/Http/Controllers/Admin/Users/CreateNewUser.php
+++ b/app/Http/Controllers/Admin/Users/CreateNewUser.php
@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Admin\Users;
use App\CMS\Enumerations\UserRoles;
+use App\CMS\Repositories\Users\User as UserRepository;
use App\Events\CreateNewUser as CreateNewUserEvent;
use App\Http\Controllers\Admin\Controller;
use App\Http\Requests\CreateNewUserRequest;
@@ -28,28 +29,21 @@ class CreateNewUser extends Controller
/**
* Create new user
- *
* This method saves new user into database
*
* @param CreateNewUserRequest $request
+ * @param UserRepository $userRepository
*
* @return \Illuminate\Http\RedirectResponse
*/
- protected function postRegistration(CreateNewUserRequest $request)
+ protected function postRegistration(CreateNewUserRequest $request, UserRepository $userRepository)
{
// when user did not provide any username, use his email
$username = isset($request->username) && !empty($request->username) ? $request->username : $request->email;
- // create new user
- $user = new User();
- $user->name = $request->name;
- $user->email = $request->email;
- $user->username = $username;
- $user->role = $request->role;
- $user->password = Hash::make($request->password);
-
- // store user into database
- $user->save();
+ $data = $request->all();
+ $data['username'] = $username;
+ $user = $userRepository->create($data);
// fire event
Event::fire(new CreateNewUserEvent($user));
diff --git a/app/Http/Controllers/Admin/Users/EditUser.php b/app/Http/Controllers/Admin/Users/EditUser.php
index 1b77f3a8..b111d1f8 100644
--- a/app/Http/Controllers/Admin/Users/EditUser.php
+++ b/app/Http/Controllers/Admin/Users/EditUser.php
@@ -4,26 +4,48 @@ namespace App\Http\Controllers\Admin\Users;
use App\CMS\Enumerations\UserRoles;
use App\CMS\Enumerations\UserStates;
+use App\CMS\Repositories\Users\User as UserRepository;
use App\Events\EditUser as EditUserEvent;
use App\Http\Controllers\Admin\Controller;
use App\Http\Requests\EditUserRequest;
+use App\Http\Requests\Request;
+use App\Models\Permissions\Permission;
use App\Models\User;
use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Event;
-use Illuminate\Support\Facades\Hash;
class EditUser extends Controller
{
- public function getEditUser($id = null)
+ /**
+ * @var UserRepository
+ */
+ private $userRepository;
+
+ /**
+ * EditUser constructor.
+ *
+ * @param UserRepository $userRepository
+ */
+ public function __construct(UserRepository $userRepository)
+ {
+ $this->userRepository = $userRepository;
+ }
+
+ /**
+ * Display form for editing user
+ *
+ * @param User|null $user
+ *
+ * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ */
+ public function getEditUser(User $user = null)
{
// when no user specified, lets assume we want to edit "me"
- if (!$id) {
- $id = Auth::user()->id;
+ if (!$user->exists) {
+ $user = Auth::user();
}
- // try to find given user
- $user = User::findOrFail($id);
-
$states = UserStates::getWithTranslations();
$roles = UserRoles::getWithTranslations();
@@ -35,49 +57,26 @@ class EditUser extends Controller
}
/**
+ * Edit user - store information
+ *
* @param EditUserRequest $request
- * @param $id
+ * @param User $user
*
* @return \Illuminate\Http\RedirectResponse
+ * @internal param $id
*/
- public function postEdit(EditUserRequest $request, $id)
+ public function postEdit(EditUserRequest $request, User $user)
{
$loggedUser = Auth::user();
- $user = User::findOrFail($id);
-
// non-admin user is trying to edit someone else
- if ($loggedUser->role != User::ROLE_ADMIN && $id != $loggedUser->id) {
+ if ($loggedUser->role != User::ROLE_ADMIN && $user->id != $loggedUser->id) {
return redirect()
->back()
->with('error', trans('auth.accessDenied'));
}
- // update username if set
- if (isset($request->username)) {
- $user->username = $request->username;
- }
-
- // change name (if set)
- if (isset($request->name)) {
- $user->name = $request->name;
- }
-
- if (isset($request->role)) {
- $user->role = $request->role;
- }
-
- if (isset($request->status)) {
- $user->status = $request->status;
- }
-
- if (isset($request->password)) {
- $user->password = Hash::make($request->password);
- }
-
- $user->email = $request->email;
-
- $user->save();
+ $this->userRepository->update($user, $request->all());
// fire event about editing user
Event::fire(new EditUserEvent($user));
@@ -86,4 +85,34 @@ class EditUser extends Controller
->back()
->with('success', trans('admin/userManagement.userSuccessfullyEdited'));
}
+
+ /**
+ * Update the specified resource in storage.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param int $id
+ *
+ * @return \Illuminate\Http\Response
+ */
+ public function setPermissions(Request $request, User $user)
+ {
+ $permissionIds = $request->get('permissions', []);
+ $permissions = Permission::whereIn('string_id', array_keys($permissionIds))
+ ->get();
+
+ DB::transaction(function () use ($user, $permissions) {
+ // remove all permissions
+ $user->permissions()
+ ->detach();
+
+ foreach ($permissions as $permission) {
+ $user->permissions()
+ ->attach($permission->id);
+ }
+ });
+
+ return redirect()
+ ->back()
+ ->with('success', trans('admin/permissions.successfullySet'));
+ }
}
\ No newline at end of file
diff --git a/app/Http/Controllers/Admin/Users/UserDetail.php b/app/Http/Controllers/Admin/Users/UserDetail.php
index ae6c1d3e..47b71498 100644
--- a/app/Http/Controllers/Admin/Users/UserDetail.php
+++ b/app/Http/Controllers/Admin/Users/UserDetail.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin\Users;
use App\CMS\Enumerations\UserRoles;
use App\CMS\Enumerations\UserStates;
use App\Cms\Repositories\ActionLog\Actions;
+use App\CMS\Repositories\Permissions\Permission;
use App\Http\Controllers\Admin\Controller;
use App\Models\ActionLog\ActionLog;
use App\Models\User;
@@ -22,26 +23,24 @@ class UserDetail extends Controller
$this->log = $log;
}
- public function getDetail($id = null)
+ public function getDetail(User $user = null)
{
// when no user specified, lets assume we want to edit "me"
- if (!$id) {
- $id = Auth::user()->id;
+ if (!$user->exists) {
+ $user = Auth::user();
}
- // try to find given user
- $user = User::findOrFail($id);
-
- $actions = $this->log->getUserActions($id, 10);
-
+ $actions = $this->log->getUserActions($user->id, 10);
$roles = UserRoles::getWithTranslations();
$states = UserStates::getWithTranslations();
+ $permissions = app(Permission::class)->getRootPermissions();
return view('admin.userManagement.detail', [
- 'user' => $user,
- 'statuses' => $states,
- 'roles' => $roles,
- 'actions' => $actions
+ 'user' => $user,
+ 'statuses' => $states,
+ 'roles' => $roles,
+ 'actions' => $actions,
+ 'permissions' => $permissions
]);
}
}
\ No newline at end of file
diff --git a/app/Http/Controllers/Admin/Widgets/Areas/CreateNewWidgetArea.php b/app/Http/Controllers/Admin/Widgets/Areas/CreateNewWidgetArea.php
index a9ec44e3..636b469e 100644
--- a/app/Http/Controllers/Admin/Widgets/Areas/CreateNewWidgetArea.php
+++ b/app/Http/Controllers/Admin/Widgets/Areas/CreateNewWidgetArea.php
@@ -2,19 +2,34 @@
namespace App\Http\Controllers\Admin\Widgets\Areas;
+use App\CMS\Repositories\Widgets\WidgetArea as WidgetAreaRepository;
use App\Http\Controllers\Admin\Controller;
use App\Http\Requests\NewWidgetAreaRequest;
use App\Models\Widgets\WidgetArea;
-use Illuminate\Support\Facades\Event;
class CreateNewWidgetArea extends Controller
{
+ /**
+ * @var WidgetAreaRepository
+ */
+ private $widgetAreaRepository;
+
+ /**
+ * CreateNewWidgetArea constructor.
+ *
+ * @param WidgetAreaRepository $widgetAreaRepository
+ */
+ public function __construct(WidgetAreaRepository $widgetAreaRepository)
+ {
+ $this->widgetAreaRepository = $widgetAreaRepository;
+ }
+
/**
* Form for new widget area
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
- public function getNew()
+ public function create()
{
return view('admin.widgets.area.new', ['area' => new WidgetArea()]);
}
@@ -24,18 +39,9 @@ class CreateNewWidgetArea extends Controller
*
* @return \Illuminate\Http\RedirectResponse
*/
- public function postNew(NewWidgetAreaRequest $request)
+ public function store(NewWidgetAreaRequest $request)
{
- $parameters = [
- 'code' => $request->code,
- 'name' => $request->name,
- 'description' => $request->description
- ];
-
- $area = WidgetArea::create($parameters);
-
- // fire event with new widget area
- Event::fire(new \App\Events\CreateNewWidgetArea($area));
+ $this->widgetAreaRepository->create($request);
// redirect with success notification
return redirect()
diff --git a/app/Http/Controllers/Admin/Widgets/Areas/EditWidgetArea.php b/app/Http/Controllers/Admin/Widgets/Areas/EditWidgetArea.php
index a512334c..393745b8 100644
--- a/app/Http/Controllers/Admin/Widgets/Areas/EditWidgetArea.php
+++ b/app/Http/Controllers/Admin/Widgets/Areas/EditWidgetArea.php
@@ -2,6 +2,8 @@
namespace App\Http\Controllers\Admin\Widgets\Areas;
+use App\CMS\Repositories\Widgets\WidgetArea as WidgetAreaRepository;
+use App\Events\DeleteWidgetArea;
use App\Http\Controllers\Admin\Controller;
use App\Http\Requests\EditWidgetAreaRequest;
use App\Models\Widgets\Widget;
@@ -13,22 +15,37 @@ use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
class EditWidgetArea extends Controller
{
+ /**
+ * @var WidgetAreaRepository
+ */
+ private $widgetAreaRepository;
+
+ /**
+ * EditWidgetArea constructor.
+ *
+ * @param WidgetAreaRepository $widgetAreaRepository
+ */
+ public function __construct(WidgetAreaRepository $widgetAreaRepository)
+ {
+ $this->widgetAreaRepository = $widgetAreaRepository;
+ }
+
/**
* Display form for editing given widget area
*
- * @param $id
+ * @param WidgetArea $widgetArea
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ *
*/
- public function getEdit($id)
+ public function edit(WidgetArea $widgetArea)
{
- $area = WidgetArea::findOrFail($id);
- $associatedWidgetIds = WidgetInWidgetArea::getWidgetIdsFromArea($area->id);
+ $associatedWidgetIds = WidgetInWidgetArea::getWidgetIdsFromArea($widgetArea->id);
$widgets = Widget::where('language', LaravelLocalization::getCurrentLocale())
->paginate(25);
return view('admin.widgets.area.edit', [
- 'area' => $area,
+ 'area' => $widgetArea,
'widgets' => $widgets,
'associatedWidgetIds' => $associatedWidgetIds
]);
@@ -36,26 +53,14 @@ class EditWidgetArea extends Controller
/**
* @param EditWidgetAreaRequest $request
- * @param $id
+ * @param WidgetArea $widgetArea
*
* @return \Illuminate\Http\RedirectResponse
+ *
*/
- public function postEdit(EditWidgetAreaRequest $request, $id)
+ public function update(EditWidgetAreaRequest $request, WidgetArea $widgetArea)
{
- try {
- $area = WidgetArea::findOrFail($id);
- } catch (ModelNotFoundException $e) {
- return $this->invalidArea();
- }
-
- $area->name = $request->name;
- $area->description = $request->description;
-
- $area->timestamps = true;
- $area->save();
-
- // fire event with new widget area
- Event::fire(new \App\Events\EditWidgetArea($area));
+ $this->widgetAreaRepository->update($widgetArea, $request);
return redirect()
->route('widgetareas.overview')
@@ -65,47 +70,28 @@ class EditWidgetArea extends Controller
/**
* Hard deletes widget area
*
- * @param $id
+ * @param WidgetArea $widgetArea
*
* @return \Illuminate\Http\RedirectResponse
*/
- public function deleteArea($id)
+ public function delete(WidgetArea $widgetArea)
{
- // try to find area
- try {
- $area = WidgetArea::findOrFail($id);
- } catch (ModelNotFoundException $e) {
- return $this->invalidArea();
- }
-
// check if widget area is deletable
- if (!$area->deletable) {
+ if (!$widgetArea->deletable) {
return redirect()
->back()
->with('error', trans('admin/widgetAreas.notDeletableArea'));
}
// delete area
- $area->delete();
+ $widgetArea->delete();
// fire event with new widget area
- Event::fire(new \App\Events\DeleteWidgetArea($area));
+ Event::fire(new DeleteWidgetArea($widgetArea));
// redirect and inform user
return redirect()
->route('widgetareas.overview')
->with('success', trans('admin/widgetAreas.successfullyDeleted'));
}
-
- /**
- * Redirect user to overview with message about invalid widget area
- *
- * @return \Illuminate\Http\RedirectResponse
- */
- private function invalidArea()
- {
- return redirect()
- ->route('widgetareas.overview')
- ->with('error', trans('admin/widgetAreas.invalidArea'));
- }
}
diff --git a/app/Http/Controllers/Admin/Widgets/CreateNewWidget.php b/app/Http/Controllers/Admin/Widgets/CreateNewWidget.php
index f50f749b..1195deac 100644
--- a/app/Http/Controllers/Admin/Widgets/CreateNewWidget.php
+++ b/app/Http/Controllers/Admin/Widgets/CreateNewWidget.php
@@ -23,14 +23,13 @@ class CreateNewWidget extends Controller
/**
* Form for new widget area
*
- * @param $type
+ * @param WidgetType $widgetType
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ *
*/
- public function getNew($type)
+ public function getNew(WidgetType $widgetType)
{
- $widgetType = WidgetType::findOrFail($type);
-
$presenter = call_user_func([$widgetType->handler, 'getPresenter']);
return call_user_func([$presenter, 'renderAddForm'], $widgetType);
@@ -40,23 +39,22 @@ class CreateNewWidget extends Controller
* Create new instance of given widget type
*
* @param NewWidgetRequest $request
- * @param $type
+ *
+ * @param WidgetType $widgetType
*
* @return \Illuminate\Http\RedirectResponse
*/
- public function postNew(NewWidgetRequest $request, $type)
+ public function postNew(NewWidgetRequest $request, WidgetType $widgetType)
{
- $widgetType = WidgetType::findOrFail($type);
-
// try to save this widget
try {
$this->widget->createNew($widgetType, $request);
} catch (MissingParameterException $e) {
// user omitted some value
- return $this->invalidWidget($type, $e->getMessage());
- // } catch (\Exception $e) {
- // // something went wrong
- // return $this->invalidWidget($type, trans('admin/widgets.cannotSave', ['exception' => $e->getMessage()]));
+ return redirect()
+ ->back()
+ ->withInput()
+ ->with('error', $e->getMessage());
}
// redirect with success notification
@@ -64,12 +62,4 @@ class CreateNewWidget extends Controller
->route('widgets.overview')
->with('success', trans('admin/widgets.successfullyCreated'));
}
-
- private function invalidWidget($widgetType, $error)
- {
- return redirect()
- ->route('widgets.new', ['type' => $widgetType])
- ->withInput()
- ->with('error', $error);
- }
}
diff --git a/app/Http/Controllers/Admin/Widgets/EditWidget.php b/app/Http/Controllers/Admin/Widgets/EditWidget.php
index 81ca9ad2..0548b895 100644
--- a/app/Http/Controllers/Admin/Widgets/EditWidget.php
+++ b/app/Http/Controllers/Admin/Widgets/EditWidget.php
@@ -1,26 +1,39 @@
widgetRepository = $widgetRepository;
+ }
+
/**
* Render edit form
*
- * @param $id
+ * @param Widget $widget
*
* @return mixed
*/
- public function getEdit($id)
+ public function getEdit(Widget $widget)
{
- $widget = Widget::findOrFail($id);
- $widget->settings = json_decode($widget->settings);
-
$presenter = call_user_func([$widget->widget_type_handler, 'getPresenter']);
return call_user_func([$presenter, 'renderEditForm'], $widget);
@@ -30,24 +43,14 @@ class EditWidget extends Controller
* Save changes into database
*
* @param EditWidgetRequest $request
- * @param $widget
+ * @param Widget $widget
*
* @return \Illuminate\Http\RedirectResponse
*/
- public function postEdit(EditWidgetRequest $request, $widget)
+ public function postEdit(EditWidgetRequest $request, Widget $widget)
{
- // create new widget
- $widget = Widget::findOrFail($widget);
-
- // update name
- $widget->name = $request->name;
- $widget->container_class = $request->containerClass;
- $widget->container_id = empty($request->containerId) ? null : $request->containerId;
- $widget->description = $request->description;
-
- // try to save this widget
try {
- $widget->settings = json_encode(call_user_func([$widget->widget_type_handler, 'save'], $request));
+ $this->widgetRepository->edit($widget, $request);
} catch (MissingParameterException $e) {
// user omitted some value
return $this->invalidWidget($e->getMessage());
@@ -56,12 +59,6 @@ class EditWidget extends Controller
return $this->invalidWidget(trans('admin/widgets.cannotSave', ['exception' => $e->getMessage()]));
}
- // save into database
- $widget->save();
-
- // fire event with editing widget
- Event::fire(new \App\Events\EditWidget($widget));
-
// redirect with success notification
return redirect()
->back()
@@ -71,15 +68,12 @@ class EditWidget extends Controller
/**
* Deletes widget
*
- * @param $id
+ * @param Widget $widget
*
* @return \Illuminate\Http\RedirectResponse
*/
- public function deleteWidget($id)
+ public function deleteWidget(Widget $widget)
{
- // create new widget
- $widget = Widget::findOrFail($id);
-
// check if widget area is deletable
if (!$widget->deletable) {
return redirect()
diff --git a/app/Http/Controllers/Admin/Widgets/WidgetsOverview.php b/app/Http/Controllers/Admin/Widgets/WidgetsOverview.php
index 4f95be2c..e5cd5529 100644
--- a/app/Http/Controllers/Admin/Widgets/WidgetsOverview.php
+++ b/app/Http/Controllers/Admin/Widgets/WidgetsOverview.php
@@ -1,17 +1,25 @@
paginate(25);
- return view('admin.widgets.overview', ['widgets' => $widgets]);
+ $widgetTypes = WidgetType::all();
+
+ return view('admin.widgets.overview', compact('widgetTypes', 'widgets'));
}
}
\ No newline at end of file
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
new file mode 100644
index 00000000..6a247fef
--- /dev/null
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -0,0 +1,32 @@
+middleware('guest');
+ }
+}
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
new file mode 100644
index 00000000..a4c37755
--- /dev/null
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -0,0 +1,46 @@
+middleware('guest')->except('logout');
+ }
+
+ public function logout() {
+ Auth::logout();
+ return redirect()->route('login');
+ }
+}
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
new file mode 100644
index 00000000..de74489d
--- /dev/null
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -0,0 +1,73 @@
+middleware('guest');
+ }
+
+ /**
+ * Get a validator for an incoming registration request.
+ *
+ * @param array $data
+ *
+ * @return \Illuminate\Contracts\Validation\Validator
+ */
+ protected function validator(array $data)
+ {
+ return Validator::make($data, [
+ 'name' => 'required|string|max:255',
+ 'email' => 'required|string|email|max:255|unique:users',
+ 'password' => 'required|string|min:6|confirmed',
+ 'g-recaptcha-response' => 'required|recaptcha',
+ ]);
+ }
+
+ /**
+ * Create a new user instance after a valid registration.
+ *
+ * @param array $data
+ *
+ * @return \App\User
+ */
+ protected function create(array $data)
+ {
+ return User::create([
+ 'name' => $data['name'],
+ 'role' => User::ROLE_VISITOR,
+ 'state' => User::STATE_ACTIVE,
+ 'email' => $data['email'],
+ 'password' => bcrypt($data['password']),
+ ]);
+ }
+}
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
new file mode 100644
index 00000000..44672583
--- /dev/null
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -0,0 +1,39 @@
+middleware('guest');
+ }
+}
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 4c01a2dd..a8b5a9c1 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -14,7 +14,6 @@ class Controller extends BaseController
/**
* Custom wrapper for generating view.
- *
* This method will be used for switching among templates.
*
* @param $template
@@ -23,10 +22,25 @@ class Controller extends BaseController
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
- public static function VisitorsView($template, $data = [], $mergeData = [])
+ public static function visitorsView($template, $data = [], $mergeData = [])
+ {
+ $view = self::getView($template, $data, $mergeData);
+
+ return response($view)->header('X-Powered-By', strrev('zc.ytiranib.www//:sptth | .o.r.s ytiranib | SMCiniM'));
+ }
+
+ /**
+ * Get instance of view for passing into response
+ *
+ * @param $template
+ * @param $data
+ * @param $mergeData
+ *
+ * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ */
+ public static function getView($template, $data = [], $mergeData = [])
{
$view = Template::name($template);
-
- return response(view($view, $data, $mergeData))->header('X-Powered-By', strrev('zc.ytiranib.www//:sptth | .o.r.s ytiranib | SMCiniM'));
+ return view($view, $data, $mergeData);
}
}
diff --git a/app/Http/Controllers/Visitor/ContentPage.php b/app/Http/Controllers/Visitor/ContentPage.php
index 6610bb50..81635ee0 100644
--- a/app/Http/Controllers/Visitor/ContentPage.php
+++ b/app/Http/Controllers/Visitor/ContentPage.php
@@ -65,7 +65,7 @@ class ContentPage extends Controller
$displayPipeline = app('displayPipeline');
$page = $displayPipeline->run($page);
- return Controller::VisitorsView($page->template, ['page' => $page]);
+ return Controller::visitorsView($page->template, ['page' => $page]);
}
}
diff --git a/app/Http/Controllers/Visitor/Homepage.php b/app/Http/Controllers/Visitor/Homepage.php
index 38b77969..06e2b6a1 100644
--- a/app/Http/Controllers/Visitor/Homepage.php
+++ b/app/Http/Controllers/Visitor/Homepage.php
@@ -10,7 +10,7 @@ class Homepage extends ContentPage
{
// try to find some homepage
$contentModel = $this->content;
- $page = Cache::remember('hp', setting('homepageCacheLifetime', 5), function () use ($contentModel) {
+ $page = Cache::remember('homepage', setting('homepageCacheLifetime', 5), function () use ($contentModel) {
return $contentModel->getHomepage();
});
diff --git a/app/Http/Controllers/Sitemap.php b/app/Http/Controllers/Visitor/Sitemap.php
similarity index 96%
rename from app/Http/Controllers/Sitemap.php
rename to app/Http/Controllers/Visitor/Sitemap.php
index fe5c4360..bcd4b3fe 100644
--- a/app/Http/Controllers/Sitemap.php
+++ b/app/Http/Controllers/Visitor/Sitemap.php
@@ -1,9 +1,9 @@
[
CheckForMaintenanceMode::class,
+ TemplateChecker::class,
AddQueuedCookiesToResponse::class,
+ IncrementWidgetsViews::class,
],
'admin' => [
- Middleware\Authenticate::class,
- Middleware\AdminMenuRegistrator::class,
- TemplatePathInstaller::class,
- WidgetInstaller::class,
+ Middleware\Admin\Authenticate::class,
+ Middleware\Admin\AdminMenuRegistrator::class,
+ Middleware\Admin\TemplatePathInstaller::class,
+ Middleware\Admin\WidgetInstaller::class,
],
'api' => [
'throttle:60,1',
@@ -53,19 +53,18 @@ class Kernel extends HttpKernel
];
/**
* The application's route middleware.
- *
* These middleware may be assigned to groups or used individually.
- *
* @var array
*/
protected $routeMiddleware = [
- 'auth' => Middleware\Authenticate::class,
- 'onlyAdmin' => Middleware\RequireAdminRole::class,
- 'adminMenu' => Middleware\AdminMenuRegistrator::class,
+ 'can' => Authorize::class,
+ 'auth' => Middleware\Admin\Authenticate::class,
+ 'adminMenu' => Middleware\Admin\AdminMenuRegistrator::class,
'guest' => Middleware\RedirectIfAuthenticated::class,
'throttle' => ThrottleRequests::class,
'localize' => LaravelLocalizationRoutes::class,
'localizationRedirect' => LaravelLocalizationRedirectFilter::class,
- 'localeSessionRedirect' => LocaleSessionRedirect::class
+ 'localeSessionRedirect' => LocaleSessionRedirect::class,
+ 'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
];
}
diff --git a/app/Http/Middleware/AdminMenuRegistrator.php b/app/Http/Middleware/Admin/AdminMenuRegistrator.php
similarity index 80%
rename from app/Http/Middleware/AdminMenuRegistrator.php
rename to app/Http/Middleware/Admin/AdminMenuRegistrator.php
index ca591767..873b5bb2 100644
--- a/app/Http/Middleware/AdminMenuRegistrator.php
+++ b/app/Http/Middleware/Admin/AdminMenuRegistrator.php
@@ -1,9 +1,9 @@
get();
+ $modules = app(ModuleRepository::class)->all();
// iterate over all enabled modules
foreach ($modules as $key => $module) {
- if (!is_callable([$module->handler, 'registerAdminMenu']))
+ if (!is_callable([$module->handler, 'registerAdminMenu'])) {
continue;
+ }
// try to register menus
try {
diff --git a/app/Http/Middleware/Admin/Authenticate.php b/app/Http/Middleware/Admin/Authenticate.php
new file mode 100644
index 00000000..a6daacf7
--- /dev/null
+++ b/app/Http/Middleware/Admin/Authenticate.php
@@ -0,0 +1,46 @@
+check() || Auth::user()->status != User::STATE_ACTIVE || Auth::user()->role == User::ROLE_VISITOR || 0) {
+ Auth::logout();
+
+ if ($request->ajax()) {
+ return response('Unauthorized.', 401);
+ }
+
+ // select right message
+ if (Auth::user() && Auth::user()->status != User::STATE_ACTIVE) {
+ $message = 'auth.userNotActive';
+ } elseif (Auth::user() && Auth::user()->role == User::ROLE_VISITOR) {
+ $message = 'auth.visitorInAdmin';
+ } else {
+ $message = 'auth.loginExpired';
+ }
+
+ return redirect()
+ ->route('login')
+ ->with('warning', trans($message));
+ }
+
+ return $next($request);
+ }
+}
diff --git a/app/Http/Middleware/TemplatePathInstaller.php b/app/Http/Middleware/Admin/TemplatePathInstaller.php
similarity index 88%
rename from app/Http/Middleware/TemplatePathInstaller.php
rename to app/Http/Middleware/Admin/TemplatePathInstaller.php
index d1c23267..1c2c741d 100644
--- a/app/Http/Middleware/TemplatePathInstaller.php
+++ b/app/Http/Middleware/Admin/TemplatePathInstaller.php
@@ -1,6 +1,6 @@
saveTemplates();
+ $registator->deleteNonExistingPaths();
+
return $next($request);
}
}
diff --git a/app/Http/Middleware/WidgetInstaller.php b/app/Http/Middleware/Admin/WidgetInstaller.php
similarity index 94%
rename from app/Http/Middleware/WidgetInstaller.php
rename to app/Http/Middleware/Admin/WidgetInstaller.php
index 06eae5c3..0b495848 100644
--- a/app/Http/Middleware/WidgetInstaller.php
+++ b/app/Http/Middleware/Admin/WidgetInstaller.php
@@ -1,6 +1,6 @@
check()) {
- if ($request->ajax()) {
- return response('Unauthorized.', 401);
- }
-
- return redirect()
- ->route('login')
- ->with('redirectTo', $request->fullUrl());
- }
-
- return $next($request);
- }
-}
diff --git a/app/Http/Middleware/RequireAdminRole.php b/app/Http/Middleware/TemplateChecker.php
similarity index 61%
rename from app/Http/Middleware/RequireAdminRole.php
rename to app/Http/Middleware/TemplateChecker.php
index f0ea40b1..42c39dfc 100644
--- a/app/Http/Middleware/RequireAdminRole.php
+++ b/app/Http/Middleware/TemplateChecker.php
@@ -2,10 +2,10 @@
namespace App\Http\Middleware;
-use App\Models\User;
+use App\CMS\Helpers\CurrentTemplate;
use Closure;
-class RequireAdminRole
+class TemplateChecker
{
/**
* Handle an incoming request.
@@ -17,10 +17,10 @@ class RequireAdminRole
*/
public function handle($request, Closure $next)
{
- if (\Auth::user()->role != User::ROLE_ADMIN) {
- return redirect()
- ->back()
- ->with('error', trans('auth.accessDenied'));
+ $template = CurrentTemplate::get();
+
+ if (!$template) {
+ throw new \ErrorException('Template is not set, cannot continue');
}
return $next($request);
diff --git a/app/Http/Middleware/Web/IncrementWidgetsViews.php b/app/Http/Middleware/Web/IncrementWidgetsViews.php
new file mode 100644
index 00000000..84b4e8d3
--- /dev/null
+++ b/app/Http/Middleware/Web/IncrementWidgetsViews.php
@@ -0,0 +1,36 @@
+increment('viewed');
+ }
+ }
+}
diff --git a/app/Http/routes.php b/app/Http/routes.php
deleted file mode 100644
index c648aaf7..00000000
--- a/app/Http/routes.php
+++ /dev/null
@@ -1,75 +0,0 @@
- LaravelLocalization::setLocale()], function () {
- /**
- * This route group serves to handle request in admin
- */
- Route::group([
- 'middleware' => ['admin'],
- 'namespace' => 'Admin',
- 'prefix' => 'admin'
- ], function () {
-
- // include all routes in routes/admin subfolder
- $files = ['contents', 'fileManager', 'settings', 'templates', 'users', 'widgets'];
- foreach ($files as $file) {
- require_once __DIR__ . DIRECTORY_SEPARATOR . 'routes' . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR . $file . '.php';
- }
-
- // display dashboard with some usefull information
- Route::get('/', 'Dashboard\Dashboard@index')
- ->name('admin.dashboard');
-
- // list of all actions
- Route::get('actions', 'ActionLog\Overview@index')
- ->name('log.overview');
-
- // search form with results
- Route::get('search', 'Search@getSearch')
- ->name('search');
-
- // logout method
- Route::get('logout', 'Login@logout')
- ->name('logout');
- });
-
- /**************************************************************************************/
-
- /**
- * This section must be specified as last one
- */
-
- Route::group(['middleware' => ['web']], function () {
-
- // Homepage
- Route::get('/', 'Visitor\Homepage@getIndex')
- ->name('page.index');
-
- // display login form
- Route::get('admin/login', 'Admin\Login@getLogin')
- ->name('loginForm');
-
- // handle login
- Route::post('admin/login', 'Admin\Login@postLogin')
- ->name('login');
-
- // route for sitemap
- Route::get('sitemap.xml', 'Sitemap@getMap')
- ->name('sitemap');
-
- // route for all content pages. This rule must be specified last (because it matches every route)
- Route::get('{url}', 'Visitor\ContentPage@getPage')
- ->name('page.content');
- });
-});
\ No newline at end of file
diff --git a/app/Http/routes/admin/contents.php b/app/Http/routes/admin/contents.php
deleted file mode 100644
index 54b70c6b..00000000
--- a/app/Http/routes/admin/contents.php
+++ /dev/null
@@ -1,42 +0,0 @@
- 'Contents'], function () {
- // list of all static pages
- Route::get('content/overview/{module?}', 'ContentOverview@index')
- ->name('content.overview');
-
- // form for creating new static page
- Route::get('content/new/{module}', 'CreateNewContent@create')
- ->name('content.new');
-
- // form for editing existing static page
- Route::get('content/edit/{id}', 'EditContent@edit')
- ->name('content.edit');
-
- // post method for creating new static page
- Route::post('content/new/{moduleId}', 'CreateNewContent@store')
- ->name('content.newPost');
-
- // post method for creating new static page
- Route::post('content/edit/{id}', 'EditContent@update')
- ->name('content.editPost');
-
- // change status of page (protected, public or draft)
- Route::get('content/status/{id}/{status}', 'ContentActions@changeStatus')
- ->name('content.changeStatus');
-
- // set homepage
- Route::get('content/homepage/{id}', 'ContentActions@setHomepage')
- ->name('content.setHomepage');
-
- // delete page
- Route::get('content/delete/{id}', 'ContentActions@delete')
- ->name('content.delete');
-
- // history of changes for specified page
- Route::get('history/{id}', 'History@getOverview')
- ->name('content.history');
-
- // history of changes for specified page
- Route::get('history/{revision}/{id}', 'History@getDiff')
- ->name('history.diff');
-});
\ No newline at end of file
diff --git a/app/Http/routes/admin/fileManager.php b/app/Http/routes/admin/fileManager.php
deleted file mode 100644
index ec85fc37..00000000
--- a/app/Http/routes/admin/fileManager.php
+++ /dev/null
@@ -1,32 +0,0 @@
- 'FileManager'], function () {
-
- Route::get('files/overview/{directory?}', 'UploadedFilesOverview@index')
- ->name('upload.overview');
-
- // uploader methods
- Route::get('directories/new/{parentDirectory?}', 'CreateNewDirectory@create')
- ->name('upload.newDirectory');
-
- Route::get('directories/edit/{directory}', 'EditDirectory@edit')
- ->name('upload.editDirectory');
-
- Route::post('directories/edit/{directory}', 'EditDirectory@update')
- ->name('upload.postEditDirectory');
-
- route::post('directories/new', 'CreateNewDirectory@store')
- ->name('upload.postNewDirectory');
-
- Route::get('upload/detail/{file}', 'EditUploadedFile@show')
- ->name('upload.detail');
-
- Route::post('upload/detail/{file}', 'EditUploadedFile@update')
- ->name('upload.postEdit');
-
- Route::get('upload/delete/{file}', 'EditUploadedFile@delete')
- ->name('upload.delete');
-
- // uploader methods
- Route::post('upload', 'UploadFile@store')
- ->name('upload.postFile');
-});
diff --git a/app/Http/routes/admin/settings.php b/app/Http/routes/admin/settings.php
deleted file mode 100644
index 70b2b996..00000000
--- a/app/Http/routes/admin/settings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-name('settings.overview');
-
-Route::post('settings', 'Settings@saveSettings')
- ->name('settings.save');
\ No newline at end of file
diff --git a/app/Http/routes/admin/templates.php b/app/Http/routes/admin/templates.php
deleted file mode 100644
index bb265533..00000000
--- a/app/Http/routes/admin/templates.php
+++ /dev/null
@@ -1,15 +0,0 @@
- 'onlyAdmin', 'namespace' => 'Templates'], function () {
- Route::get('templates/overview/path/{id}', 'TemplateOverview@getPath')
- ->name('templates.overview');
-
- Route::post('templates/copy', 'CopyTemplate@createCopy')
- ->name('templates.postCopy');
-
- Route::get('templates/edit/{id}', 'EditTemplate@getEdit')
- ->name('templates.edit');
-
- Route::post('templates/edit/{id}', 'EditTemplate@postEdit')
- ->name('templates.postEdit');
-});
\ No newline at end of file
diff --git a/app/Http/routes/admin/users.php b/app/Http/routes/admin/users.php
deleted file mode 100644
index 69d643f7..00000000
--- a/app/Http/routes/admin/users.php
+++ /dev/null
@@ -1,27 +0,0 @@
- 'Users'], function () {
- // display form for creating new user
- Route::get('users/new', 'CreateNewUser@getNewUser')
- ->name('users.new');
-
- // POST methods
- // display form for creating new user
- Route::post('users/new', 'CreateNewUser@postRegistration')
- ->name('users.newPost');
-
- // display form for edit of existing user
- Route::get('users/edit/{id}', 'EditUser@getEditUser')
- ->name('users.edit');
-
- // display user detail in admin
- Route::get('users/detail/{id?}', 'UserDetail@getDetail')
- ->name('users.detail');
-
- // method for saving edited data of user
- Route::post('users/edit/{id}', 'EditUser@postEdit')
- ->name('users.editPost');
-
- // display list of all users registered into our system
- Route::get('users/overview/{state?}/{perPage?}', 'UsersOverview@getOverview')
- ->name('users.overview');
-});
diff --git a/app/Http/routes/admin/widgets.php b/app/Http/routes/admin/widgets.php
deleted file mode 100644
index d10df3fd..00000000
--- a/app/Http/routes/admin/widgets.php
+++ /dev/null
@@ -1,60 +0,0 @@
- 'Widgets'], function () {
-
- // list of all installed widget types
- Route::get('widgets/overview', 'WidgetsOverview@getOverview')
- ->name('widgets.overview');
-
- // create new instance of widget of given type
- Route::get('widgets/new/{type}', 'CreateNewWidget@getNew')
- ->name('widgets.new');
-
- Route::post('widgets/new/{type}', 'CreateNewWidget@postNew')
- ->name('widgets.postNew');
-
- // edit widget settings
- Route::get('widgets/edit/{id}', 'EditWidget@getEdit')
- ->name('widgets.edit');
-
- // delete widget settings
- Route::get('widgets/delete/{id}', 'EditWidget@deleteWidget')
- ->name('widgets.delete');
-
- Route::post('widgets/edit/{id}', 'EditWidget@postEdit')
- ->name('widgets.postEdit');
-
- // display form for association of widget and widget area
- Route::get('widgets/associate/{widgetArea}', 'AssociateWidget@getList')
- ->name('widgets.associate');
-
- Route::get('widgets/deassociate/{widgetId}/{widgetArea}', 'AssociateWidget@deleteAssociation')
- ->name('widgets.deleteAssociation');
-
- Route::get('widgets/associate/{widgetId}/{widgetArea}', 'AssociateWidget@makeAssociation')
- ->name('widgets.makeAssociation');
-
- Route::group(['namespace' => 'Areas'], function () {
- Route::get('widgets/areas/overview', 'WidgetAreaOverview@getOverview')
- ->name('widgetareas.overview');
-
- // form for new widget area
- Route::get('widgets/areas/new', 'CreateNewWidgetArea@getNew')
- ->name('widgetareas.new');
-
- // form for new widget area
- Route::post('widgets/areas/new', 'CreateNewWidgetArea@postNew')
- ->name('widgetareas.postNew');
-
- // edit form for widget area
- Route::get('widgets/areas/edit/{id}', 'EditWidgetArea@getEdit')
- ->name('widgetareas.edit');
-
- Route::post('widgets/areas/edit/{id}', 'EditWidgetArea@postEdit')
- ->name('widgetareas.postEdit');
-
- // edit form for widget area
- Route::get('widgets/areas/delete/{id}', 'EditWidgetArea@deleteArea')
- ->name('widgetareas.delete');
- });
-});
diff --git a/app/Listeners/CreateImageThumbnail.php b/app/Listeners/CreateImageThumbnail.php
index 07ff6145..c569645c 100644
--- a/app/Listeners/CreateImageThumbnail.php
+++ b/app/Listeners/CreateImageThumbnail.php
@@ -3,23 +3,16 @@
namespace App\Listeners;
use App\Events\UploadFile;
+use App\Models\FileManager\File;
+use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Support\Facades\File as FileFacade;
use Illuminate\Support\Str;
use Intervention\Image\Constraint;
use Intervention\Image\Facades\Image;
use Symfony\Component\HttpFoundation\File\File as SymphonyFile;
-class CreateImageThumbnail
+class CreateImageThumbnail implements ShouldQueue
{
- /**
- * Create the event listener.
- *
- * @return void
- */
- public function __construct()
- {
- }
-
/**
* Handle the event.
*
@@ -29,10 +22,10 @@ class CreateImageThumbnail
*/
public function handle(UploadFile $event)
{
- $uploadedFile = $event->uploadedFile;
+ $uploadedFile = $event->file;
// is uploaded file an image?
- if (!Str::startsWith($uploadedFile->getMimeType(), 'image')) {
+ if (!Str::startsWith($uploadedFile->mime_type, 'image')) {
return;
}
// yes, create thumbnail
@@ -42,10 +35,12 @@ class CreateImageThumbnail
/**
* Create thumbnail of given image
*
- * @param SymphonyFile $file
+ * @param File $uploadedFile
*/
- private function createThumbnail(SymphonyFile $file)
+ private function createThumbnail(File $uploadedFile)
{
+ $file = new SymphonyFile(config('app.upload_path') . '/' . $uploadedFile->filename);
+
// does thumbnail directory exist?
if (!is_dir(config('app.thumbnail_path'))) {
FileFacade::makeDirectory(config('app.thumbnail_path'));
@@ -61,6 +56,6 @@ class CreateImageThumbnail
});
// save thumbnail with lower quality
- $image->save(config('app.thumbnail_path') . DIRECTORY_SEPARATOR . $file->getFilename(), 75);
+ $image->save(config('app.thumbnail_path') . DIRECTORY_SEPARATOR . $file->getFilename(), setting('previewQuality', 75));
}
}
diff --git a/app/Listeners/Loggers/LogLogout.php b/app/Listeners/Loggers/LogLogout.php
index 6ca608bf..abda7140 100644
--- a/app/Listeners/Loggers/LogLogout.php
+++ b/app/Listeners/Loggers/LogLogout.php
@@ -3,19 +3,22 @@
namespace App\Listeners\Loggers;
use Illuminate\Auth\Events\Logout;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
class LogLogout extends Logger
{
/**
* Handle the event.
*
- * @param Logout $event
+ * @param Logout $event
+ *
* @return void
*/
public function handle(Logout $event)
{
+ if (is_null($event->user)) {
+ return;
+ }
+
$parameters = [
'id' => $event->user->id,
'name' => $event->user->name,
@@ -27,7 +30,6 @@ class LogLogout extends Logger
/**
* Getter for action name. Used only internally
- *
* @return mixed
*/
protected function getName()
diff --git a/app/Listeners/Loggers/LogUploadFile.php b/app/Listeners/Loggers/LogUploadFile.php
index 38dac179..14a4f627 100644
--- a/app/Listeners/Loggers/LogUploadFile.php
+++ b/app/Listeners/Loggers/LogUploadFile.php
@@ -2,30 +2,33 @@
namespace App\Listeners\Loggers;
-use App\Events\Uploadfile;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
+use App\Events\UploadFile;
-class LogUploadFile
+class LogUploadFile extends Logger
{
- /**
- * Create the event listener.
- *
- * @return void
- */
- public function __construct()
- {
- //
- }
-
/**
* Handle the event.
*
- * @param Uploadfile $event
+ * @param CreateNewWidget $event
+ *
* @return void
*/
- public function handle(Uploadfile $event)
+ public function handle(UploadFile $event)
{
- //
+ $parameters = [
+ 'name' => $event->file->filename,
+ 'mime' => $event->file->mime_type,
+ ];
+
+ $this->saveLog($parameters);
+ }
+
+ /**
+ * Getter for action name. Used only internally
+ * @return mixed
+ */
+ protected function getName()
+ {
+ return 'newFile';
}
}
diff --git a/app/Listeners/SetDefaultPermissions.php b/app/Listeners/SetDefaultPermissions.php
new file mode 100644
index 00000000..66f3e5c1
--- /dev/null
+++ b/app/Listeners/SetDefaultPermissions.php
@@ -0,0 +1,27 @@
+get();
+
+ foreach ($permissions as $permission) {
+ $event->user->permissions()
+ ->attach($permission);
+ }
+ }
+}
diff --git a/app/Models/Content/Content.php b/app/Models/Content/Content.php
index e016392b..052ff9d3 100644
--- a/app/Models/Content/Content.php
+++ b/app/Models/Content/Content.php
@@ -6,6 +6,8 @@ use App\CMS\Contracts\Repositories\Content as ContentContract;
use App\CMS\Helpers\Traits\Nullable;
use App\CMS\Observers\Content as ContentObserver;
use App\Models\FileManager\File;
+use App\Models\Module;
+use App\Models\Templates\Template;
use App\Models\User;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
@@ -32,6 +34,7 @@ class Content extends Model
'isHomepage',
'title',
'url',
+ 'order',
'metaKeywords',
'metaDescription',
'pageContent',
@@ -55,7 +58,6 @@ class Content extends Model
/**
* Mark relationship with its historical records
- *
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function history()
@@ -63,9 +65,12 @@ class Content extends Model
return $this->hasMany(ContentHistory::class);
}
+ public function templateModel() {
+ return $this->belongsTo(Template::class, 'template', 'template_name');
+ }
+
/**
* Mark relationship with users table
- *
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function author()
@@ -75,7 +80,6 @@ class Content extends Model
/**
* Related files to content page
- *
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
*/
public function files()
@@ -85,27 +89,54 @@ class Content extends Model
/**
* Category of content page
- *
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function category()
{
+ if (!class_exists(Category::class)) {
+ throw new \ErrorException('Categories are not installed');
+ }
+
return $this->belongsTo(Category::class);
}
/**
* Subpages assigned to page
- *
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function subpages()
{
- return $this->hasMany(Content::class, 'parentId');
+ return $this->hasMany(Content::class, 'parentId')->orderBy('order')->orderBy('created_at', 'DESC');
+ }
+
+ /**
+ * Subpages assigned to page
+ * @return \Illuminate\Database\Eloquent\Relations\HasMany
+ */
+ public function publishedSubpages()
+ {
+ $query = $this->subpages();
+
+ if (\Auth::check()) {
+ $query = $query->where('status', '!=', ContentContract::STATUS_DRAFT);
+ } else {
+ $query = $query->where('status', ContentContract::STATUS_PUBLIC);
+ }
+
+ return $query;
+ }
+
+ /**
+ * Module relationship
+ * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+ */
+ public function module()
+ {
+ return $this->belongsTo(Module::class, 'moduleHandler', 'handler');
}
/**
* Parent page
- *
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function parentPage()
@@ -115,7 +146,6 @@ class Content extends Model
/**
* Is current content draft?
- *
* @return bool
*/
public function isDraft()
@@ -125,7 +155,6 @@ class Content extends Model
/**
* Is current content visible for all visitors?
- *
* @return bool
*/
public function isPublic()
@@ -135,7 +164,6 @@ class Content extends Model
/**
* Is current content visible only for logged users?
- *
* @return bool
*/
public function isProtected()
@@ -145,7 +173,6 @@ class Content extends Model
/**
* Is current content visible for logged user OR for everyone?
- *
* @return bool
*/
public function isVisible()
@@ -164,6 +191,9 @@ class Content extends Model
return parent::save($options);
}
+ /**
+ * Increment number of viewed content
+ */
public function view()
{
$this->timestamps = false;
diff --git a/app/Models/Content/ContentHistory.php b/app/Models/Content/ContentHistory.php
index dca25307..b81d4c59 100644
--- a/app/Models/Content/ContentHistory.php
+++ b/app/Models/Content/ContentHistory.php
@@ -2,6 +2,7 @@
namespace App\Models\Content;
+use App\Models\User;
use Illuminate\Database\Eloquent\Model;
/**
@@ -21,5 +22,14 @@ class ContentHistory extends Model
'new_value',
'old_value'
];
- protected $guarded = [];
+
+ /**
+ * Author of the change
+ *
+ * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+ */
+ public function author()
+ {
+ return $this->belongsTo(User::class, 'user_id');
+ }
}
\ No newline at end of file
diff --git a/app/Models/FileManager/ModelTraits/File.php b/app/Models/FileManager/ModelTraits/File.php
index 759c6bf6..3da83ec9 100644
--- a/app/Models/FileManager/ModelTraits/File.php
+++ b/app/Models/FileManager/ModelTraits/File.php
@@ -6,6 +6,7 @@ use App\Events\UploadFile;
use App\Models\FileManager\File as FileModel;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Gate;
use Symfony\Component\HttpFoundation\File\File as SymphonyFile;
use Symfony\Component\HttpFoundation\File\UploadedFile;
@@ -36,6 +37,8 @@ trait File
*/
public function upload(UploadedFile $file, $data = [])
{
+ abort_unless(Auth::user()->can('upload', FileModel::class), 403);
+
$data = (object)$data;
$destination = config('app.upload_path');
@@ -45,15 +48,15 @@ trait File
$uploadedFile = $file->move($destination, $filename);
// insert record into database
- $id = $this->saveIntoDatabase($uploadedFile, $data, $file->getClientOriginalName());
+ $fileInDB = $this->saveIntoDatabase($uploadedFile, $data, $file->getClientOriginalName());
// fire event about new file
- Event::fire(new UploadFile($uploadedFile, $id));
+ Event::fire(new UploadFile($fileInDB));
return [
'filename' => $filename,
'file' => $file,
- 'id' => $id
+ 'id' => $fileInDB->id
];
}
@@ -89,6 +92,6 @@ trait File
'keywords' => isset($request->keyword) ? $request->keyword : ''
]);
- return $newFile->id;
+ return $newFile;
}
}
\ No newline at end of file
diff --git a/app/Models/ModelTraits/Module.php b/app/Models/ModelTraits/Module.php
deleted file mode 100644
index a60cfd61..00000000
--- a/app/Models/ModelTraits/Module.php
+++ /dev/null
@@ -1,113 +0,0 @@
-has_submodules = true;
- $parentModule->save();
- }
-
- // insert module into database
- $module = ModuleModel::create([
- 'name' => $name,
- 'description' => $description,
- 'handler' => $handler,
- 'manages_content' => $managesContent,
- 'support_categories' => $supportCategories,
- 'alias' => $alias,
- 'module_settings' => json_encode($settings),
- 'parent_id' => $parentModuleId ? $parentModuleId : null,
- 'enabled' => 1,
- 'is_template' => $isTemplate
- ]);
-
- // install something module-specific
- if ($handler && is_callable([$handler, 'install'])) {
- call_user_func([$handler, 'install']);
- }
-
- return $module;
- }
-
- /**
- * Delete module from database and uninstall its dependencies
- *
- * @throws \ErrorException
- */
- public function uninstall()
- {
- // check if user does not want to install module in runtime
- if (!App::runningInConsole()) {
- throw new \ErrorException('Modules can be uninstalled only via Artisan!');
- }
-
- // delete everything in /resources/views/visitor
- if ($this->is_template) {
- $this->deleteDirectory(resource_path('views/visitor'));
- $this->deleteDirectory(resource_path('views/modules'));
- $this->deleteDirectory(public_path('assets'));
-
- // delete all template paths
- TemplatePath::getQuery()
- ->delete();
- }
-
- if ($this->handler && is_callable([$this->handler, 'uninstall'])) {
- call_user_func([$this->handler, 'uninstall'], $this);
- }
-
- $this->delete();
- }
-
- /**
- * Delete directory when uninstalling module.
- *
- * @param $directory
- *
- * @throws \ErrorException
- */
- private function deleteDirectory($directory)
- {
- if (!is_dir($directory)) {
- return;
- }
-
- $success = \File::deleteDirectory($directory, true);
-
- if (!$success) {
- throw new \ErrorException('Cannot delete ' . $directory);
- }
- }
-}
\ No newline at end of file
diff --git a/app/Models/Module.php b/app/Models/Module.php
index f6940aad..8b56b74d 100644
--- a/app/Models/Module.php
+++ b/app/Models/Module.php
@@ -9,13 +9,13 @@ use Illuminate\Database\Eloquent\Model;
*/
class Module extends Model
{
- use ModelTraits\Module;
public $timestamps = false;
protected $fillable = [
'handler',
'parent_id',
'name',
'description',
+ 'static_name',
'alias',
'module_settings',
'enabled',
@@ -23,4 +23,23 @@ class Module extends Model
'manages_content',
'is_template'
];
+ protected $casts = [
+ 'module_settings' => 'array',
+ 'is_template' => 'boolean',
+ 'has_submodules' => 'boolean'
+ ];
+
+ public function getRouteKeyName()
+ {
+ return 'alias';
+ }
+
+ public function submodules()
+ {
+ return $this->hasMany(Module::class, 'parent_id');
+ }
+
+ public function parent() {
+ return $this->belongsTo(Module::class, 'parent_id');
+ }
}
\ No newline at end of file
diff --git a/app/Models/Permissions/Permission.php b/app/Models/Permissions/Permission.php
new file mode 100644
index 00000000..fd4d1ed0
--- /dev/null
+++ b/app/Models/Permissions/Permission.php
@@ -0,0 +1,40 @@
+ 'boolean'
+ ];
+
+ /**
+ * Assign observer for this model for logging
+ */
+ protected static function boot()
+ {
+ parent::boot();
+
+ self::observe(PermissionObserver::class);
+ }
+
+ public function parent()
+ {
+ return $this->hasOne(Permission::class, 'parent_id');
+ }
+
+ public function subpermissions()
+ {
+ return $this->hasMany(Permission::class, 'parent_id');
+ }
+}
diff --git a/app/Models/Permissions/PermissionObserver.php b/app/Models/Permissions/PermissionObserver.php
new file mode 100644
index 00000000..f52fb18e
--- /dev/null
+++ b/app/Models/Permissions/PermissionObserver.php
@@ -0,0 +1,26 @@
+default) {
+ $users = User::where('role', '!=', User::ROLE_VISITOR)
+ ->get();
+
+ foreach ($users as $user) {
+ $user->permissions()
+ ->attach($permission->id);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/Models/Settings.php b/app/Models/Settings.php
index 5ab99456..ecf7c313 100644
--- a/app/Models/Settings.php
+++ b/app/Models/Settings.php
@@ -3,12 +3,9 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
-use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
class Settings extends Model
{
- use ModelTraits\Settings;
-
protected $table = 'settings';
public $timestamps = false;
protected $fillable = ['key', 'value', 'language'];
diff --git a/app/Models/User.php b/app/Models/User.php
index 35d4911f..b0db4a04 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -2,18 +2,29 @@
namespace App\Models;
+use App\Models\Permissions\Permission;
+use App\Notifications\ResetPasswordNotification;
use Illuminate\Auth\Authenticatable;
use Illuminate\Contracts\Auth\Authenticatable as AuthenticableInterface;
+use Illuminate\Contracts\Auth\CanResetPassword;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Foundation\Auth\Access\Authorizable;
+use Illuminate\Notifications\Notifiable;
/**
* Class User
*/
-class User extends Model implements AuthenticableInterface
+class User extends Model implements AuthenticableInterface, CanResetPassword
{
- use SoftDeletes, Authenticatable, Authorizable;
+ use SoftDeletes, Authenticatable, Authorizable, Notifiable;
+ const STATE_DELETED = 'deleted';
+ const STATE_BLOCKED = 'blocked';
+ const STATE_ACTIVE = 'active';
+ const ROLE_VISITOR = 'visitor';
+ const ROLE_EDITOR = 'editor';
+ const ROLE_ADMIN = 'admin';
+ protected static $abilities;
public $timestamps = true;
protected $fillable = [
'email',
@@ -24,17 +35,52 @@ class User extends Model implements AuthenticableInterface
];
/**
* The attributes excluded from the model's JSON form.
- *
* @var array
*/
protected $hidden = [
'password',
'remember_token',
];
- const STATE_DELETED = 'deleted';
- const STATE_BLOCKED = 'blocked';
- const STATE_ACTIVE = 'active';
- const ROLE_VISITOR = 'visitor';
- const ROLE_EDITOR = 'editor';
- const ROLE_ADMIN = 'admin';
+
+ /**
+ * Get the e-mail address where password reset links are sent.
+ * @return string
+ */
+ public function getEmailForPasswordReset()
+ {
+ return $this->email;
+ }
+
+ /**
+ * Send the password reset notification.
+ *
+ * @param string $token
+ *
+ * @return void
+ */
+ public function sendPasswordResetNotification($token)
+ {
+ $this->notify(new ResetPasswordNotification($token));
+ }
+
+ public function permissions()
+ {
+ return $this->belongsToMany(Permission::class, 'user_has_permissions');
+ }
+
+ /**
+ * Check if current user has given ability
+ *
+ * @param $ability
+ *
+ * @return bool
+ */
+ public function hasAbility($ability)
+ {
+ if (!isset(self::$abilities[$this->id])) {
+ self::$abilities[$this->id] = $this->permissions->pluck('string_id')->toArray();
+ }
+
+ return in_array($ability, self::$abilities[$this->id]);
+ }
}
diff --git a/app/Models/Widgets/ModelTraits/Widget.php b/app/Models/Widgets/ModelTraits/Widget.php
deleted file mode 100644
index 82f1c263..00000000
--- a/app/Models/Widgets/ModelTraits/Widget.php
+++ /dev/null
@@ -1,41 +0,0 @@
-handler, 'save'], $request);
-
- // create new widget
- $widget = WidgetModel::create([
- 'widget_type_handler' => $widgetType->handler,
- 'language' => LaravelLocalization::getCurrentLocale(),
- 'user_id' => \Auth::user()->id,
- 'name' => $request->name,
- 'container_class' => $request->containerClass,
- 'container_id' => empty($request->containerId) ? null : $request->containerId,
- 'description' => $request->description,
- 'settings' => json_encode($settings),
- ]);
-
- // fire event with newly created widget
- \Event::fire(new CreateNewWidget($widget));
-
- return $widget;
- }
-}
\ No newline at end of file
diff --git a/app/Models/Widgets/ModelTraits/WidgetArea.php b/app/Models/Widgets/ModelTraits/WidgetArea.php
deleted file mode 100644
index f457fb35..00000000
--- a/app/Models/Widgets/ModelTraits/WidgetArea.php
+++ /dev/null
@@ -1,24 +0,0 @@
-join('widget_in_widget_area', 'widget_in_widget_area.widget_id', '=', 'widgets.id')
- ->join('widget_areas', 'widget_in_widget_area.widget_area_id', '=', 'widget_areas.id')
- ->where('language', LaravelLocalization::getCurrentLocale())
- ->orderBy('widget_in_widget_area.position');
- if (!$uniqueCode) {
- $widgets = $widgets->where('widget_areas.viewed', '>=', setting('preloadFrequentedWidgetAreasTreshold', 10));
- } else {
- $widgets = $widgets->where('code', $uniqueCode);
- }
-
- return $widgets;
- }
-}
\ No newline at end of file
diff --git a/app/Models/Widgets/Widget.php b/app/Models/Widgets/Widget.php
index fdb27d56..b4f25fff 100644
--- a/app/Models/Widgets/Widget.php
+++ b/app/Models/Widgets/Widget.php
@@ -22,4 +22,9 @@ class Widget extends Model
'viewed',
'deletable'
];
+
+ protected $casts = [
+ 'settings' => 'object',
+ 'deletable' => 'boolean',
+ ];
}
\ No newline at end of file
diff --git a/app/Models/Widgets/WidgetArea.php b/app/Models/Widgets/WidgetArea.php
index 2e32cb5b..d326783a 100644
--- a/app/Models/Widgets/WidgetArea.php
+++ b/app/Models/Widgets/WidgetArea.php
@@ -3,19 +3,24 @@
namespace App\Models\Widgets;
use Illuminate\Database\Eloquent\Model;
+use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
/**
* Class WidgetArea
*/
class WidgetArea extends Model
{
- use ModelTraits\WidgetArea;
-
- public $timestamps = false;
+ public $timestamps = true;
protected $fillable = [
'name',
'code',
'description',
'deletable'
];
+
+ public function widgets()
+ {
+ return $this->hasMany(Widget::class)
+ ->where('language', LaravelLocalization::getCurrentLocale());
+ }
}
\ No newline at end of file
diff --git a/app/Notifications/ResetPasswordNotification.php b/app/Notifications/ResetPasswordNotification.php
new file mode 100644
index 00000000..03418cda
--- /dev/null
+++ b/app/Notifications/ResetPasswordNotification.php
@@ -0,0 +1,52 @@
+token = $token;
+ }
+
+ /**
+ * Get the notification's delivery channels.
+ *
+ * @param mixed $notifiable
+ *
+ * @return array
+ */
+ public function via($notifiable)
+ {
+ return ['mail'];
+ }
+
+ /**
+ * Get the mail representation of the notification.
+ *
+ * @param mixed $notifiable
+ *
+ * @return \Illuminate\Notifications\Messages\MailMessage
+ */
+ public function toMail($notifiable)
+ {
+ $url = route('password.reset', ['token' => $this->token, 'email' => $notifiable->email]);
+
+ return (new MailMessage())->subject(trans('notification.forgottenPassword.subject'))
+ ->line(trans('notification.forgottenPassword.firstLine'))
+ ->action(trans('notification.forgottenPassword.button'), $url)
+ ->line(trans('notification.forgottenPassword.lastLine'));
+ }
+}
diff --git a/app/Policies/ActionLogPolicy.php b/app/Policies/ActionLogPolicy.php
new file mode 100644
index 00000000..7522281d
--- /dev/null
+++ b/app/Policies/ActionLogPolicy.php
@@ -0,0 +1,11 @@
+manage($user)) {
+ return false;
+ }
+ }
+
+ /**
+ * Can user manage given entity?
+ *
+ * @param User $user
+ *
+ * @return bool
+ */
+ public function manage(User $user)
+ {
+ return $user->hasAbility($this->entity . '-management');
+ }
+
+ /**
+ * Determine whether the user can delete the content.
+ *
+ * @param \App\Models\User $user
+ * @param Model $model
+ *
+ * @return mixed
+ */
+ public function delete(User $user, Model $model)
+ {
+ return $user->hasAbility('delete-' . $this->entity);
+ }
+}
diff --git a/app/Policies/ContentPolicy.php b/app/Policies/ContentPolicy.php
new file mode 100644
index 00000000..1ee72ca6
--- /dev/null
+++ b/app/Policies/ContentPolicy.php
@@ -0,0 +1,118 @@
+id != $content->user_id) {
+ return $user->hasAbility('update-contents') && $user->hasAbility('update-all-contents');
+ };
+
+ return $user->hasAbility('update-contents');
+ }
+
+ /**
+ * Does given user has permissions to create new content page?
+ *
+ * @param User $user
+ *
+ * @return bool
+ */
+ public function create(User $user)
+ {
+ return $user->hasAbility('create-contents');
+ }
+
+ /**
+ * Change page status
+ *
+ * @param User $user
+ * @param Content $page
+ * @param $status
+ *
+ * @return bool
+ */
+ public function changeStatus(User $user, Content $page, $status)
+ {
+ switch ($status) {
+ case ContentContract::STATUS_PUBLIC:
+ return $this->publish($user, $page);
+ break;
+ case ContentContract::STATUS_DRAFT:
+ return $this->draft($user, $page);
+ break;
+ case ContentContract::STATUS_PROTECTED:
+ return $this->protect($user, $page);
+ break;
+ }
+
+ return false;
+ }
+
+ /**
+ * Can user publish given page?
+ *
+ * @param User $user
+ * @param Content $page
+ *
+ * @return bool
+ */
+ public function publish(User $user, Content $page)
+ {
+ return $user->hasAbility('publish-contents');
+ }
+
+ /**
+ * Can user make draft from given page?
+ *
+ * @param User $user
+ * @param Content $page
+ *
+ * @return bool
+ */
+ public function draft(User $user, Content $page)
+ {
+ return $user->hasAbility('draft-contents');
+ }
+
+ /**
+ * Can user publish page only for protected users?
+ *
+ * @param User $user
+ * @param Content $page
+ *
+ * @return bool
+ */
+ public function protect(User $user, Content $page)
+ {
+ return $user->hasAbility('protect-contents');
+ }
+
+ public function setHomepage(User $user)
+ {
+ return $user->hasAbility('set-homepage-contents');
+ }
+
+ public function viewHistory(User $user)
+ {
+ return $user->hasAbility('view-history-contents');
+ }
+}
diff --git a/app/Policies/DirectoriesPolicy.php b/app/Policies/DirectoriesPolicy.php
new file mode 100644
index 00000000..97cb6da4
--- /dev/null
+++ b/app/Policies/DirectoriesPolicy.php
@@ -0,0 +1,36 @@
+hasAbility('create-directories');
+ }
+
+ /**
+ * Determine whether the user can update the directory.
+ *
+ * @param \App\Models\User $user
+ * @param \App\Directory $directory
+ * @return mixed
+ */
+ public function update(User $user, Directory $directory)
+ {
+ return $user->hasAbility('update-directories');
+ }
+}
diff --git a/app/Policies/FilesPolicy.php b/app/Policies/FilesPolicy.php
new file mode 100644
index 00000000..7c8e5545
--- /dev/null
+++ b/app/Policies/FilesPolicy.php
@@ -0,0 +1,39 @@
+hasAbility('upload-files');
+ }
+
+ /**
+ * Determine whether the user can update the appModelsFileManagerFile.
+ *
+ * @param User $user
+ * @param File $file
+ *
+ * @return mixed
+ */
+ public function update(User $user, File $file)
+ {
+ return $user->hasAbility('update-files');
+ }
+}
diff --git a/app/Policies/ModulePolicy.php b/app/Policies/ModulePolicy.php
new file mode 100644
index 00000000..7c4d387d
--- /dev/null
+++ b/app/Policies/ModulePolicy.php
@@ -0,0 +1,27 @@
+hasAbility('create-contents-' . $module->alias);
+ }
+}
diff --git a/app/Policies/SettingsPolicy.php b/app/Policies/SettingsPolicy.php
new file mode 100644
index 00000000..6b0ff0e5
--- /dev/null
+++ b/app/Policies/SettingsPolicy.php
@@ -0,0 +1,11 @@
+hasAbility('copy-templates');
+ }
+
+ /**
+ * Determine whether the user can update the template.
+ *
+ * @param \App\Models\User $user
+ * @param \App\Template $template
+ *
+ * @return mixed
+ */
+ public function update(User $user, Template $template)
+ {
+ return $user->hasAbility('edit-templates');
+ }
+}
diff --git a/app/Policies/UserPolicy.php b/app/Policies/UserPolicy.php
new file mode 100644
index 00000000..eb6dd2b7
--- /dev/null
+++ b/app/Policies/UserPolicy.php
@@ -0,0 +1,111 @@
+id == $user->id)
+ return true;
+
+ return $this->manage($currentUser);
+ }
+
+ /**
+ * Can current user updates other users (or himself?)
+ *
+ * @param User $currentUser
+ * @param User $user
+ *
+ * @return bool
+ */
+ public function update(User $currentUser, User $user)
+ {
+ return $currentUser->id == $user->id || $currentUser->hasAbility('update-users');
+ }
+
+ /**
+ * Can user create other users?
+ *
+ * @param User $user
+ *
+ * @return bool
+ */
+ public function create(User $user) {
+ return $user->hasAbility('create-users');
+ }
+
+ /**
+ * Does current user has permissions for setting permissions to other users?
+ *
+ * @param User $currentUser
+ * @param User $user
+ *
+ * @return bool
+ */
+ public function setPermissions(User $currentUser, User $user)
+ {
+ if ($currentUser->id == $user->id || $user->role == User::ROLE_VISITOR) {
+ return false;
+ }
+
+ return $currentUser->hasAbility('set-permissions-users');
+ }
+
+ /**
+ * Can logged user change status of other users?
+ *
+ * @param User $currentUser
+ * @param User $user
+ *
+ * @return bool
+ */
+ public function changeStatus(User $currentUser, User $user)
+ {
+ if ($currentUser->id == $user->id) {
+ return false;
+ }
+
+ return $currentUser->hasAbility('change-status-users');
+ }
+
+ /**
+ * Can current user change role of other users?
+ *
+ * @param User $currentUser
+ * @param User $user
+ *
+ * @return bool
+ */
+ public function changeRole(User $currentUser, User $user)
+ {
+ if ($currentUser->id == $user->id) {
+ return false;
+ }
+
+ return $currentUser->hasAbility('change-role-users');
+ }
+}
diff --git a/app/Policies/WidgetAreaPolicy.php b/app/Policies/WidgetAreaPolicy.php
new file mode 100644
index 00000000..cb16bd8f
--- /dev/null
+++ b/app/Policies/WidgetAreaPolicy.php
@@ -0,0 +1,36 @@
+hasAbility('create-widgetareas');
+ }
+
+ /**
+ * Determine whether the user can update the widgetArea.
+ *
+ * @param \App\Models\User $user
+ * @param \App\WidgetArea $widgetArea
+ * @return mixed
+ */
+ public function update(User $user, WidgetArea $widgetArea)
+ {
+ return $user->id == $widgetArea->user_id || $user->hasAbility('edit-widgetareas');
+ }
+}
diff --git a/app/Policies/WidgetsPolicy.php b/app/Policies/WidgetsPolicy.php
new file mode 100644
index 00000000..9d73f927
--- /dev/null
+++ b/app/Policies/WidgetsPolicy.php
@@ -0,0 +1,48 @@
+hasAbility('create-widgets');
+ }
+
+ /**
+ * Determine whether the user can update the widget.
+ *
+ * @param \App\Models\User $user
+ * @param \App\Widget $widget
+ *
+ * @return mixed
+ */
+ public function update(User $user, Widget $widget)
+ {
+ return $user->id == $widget->user_id || $user->hasAbility('edit-widgets');
+ }
+
+ public function assign(User $user)
+ {
+ return $user->hasAbility('assign-widgets');
+ }
+
+ public function unassign(User $user)
+ {
+ return $user->hasAbility('unassign-widgets');
+ }
+}
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index e25b2de4..39c11cbb 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -25,11 +25,10 @@ use App\CMS\Repositories\Module as ModuleRepository;
use App\CMS\Repositories\Templates\Template as TemplateRepository;
use App\CMS\Widgets\HtmlCode\HtmlCode;
use App\CMS\Widgets\Menu\Menu;
+use App\CMS\Widgets\SocialButtons\SocialButtons;
use Barryvdh\Debugbar\ServiceProvider as DebugBarServiceProvider;
use Illuminate\Support\Facades\App;
use Illuminate\Support\ServiceProvider;
-use Pingpong\Menus\MenusServiceProvider;
-use Pingpong\Modules\ModulesServiceProvider;
class AppServiceProvider extends ServiceProvider
{
@@ -63,14 +62,11 @@ class AppServiceProvider extends ServiceProvider
$this->app->register(DebugBarServiceProvider::class);
}
- // register PingPong module extension
- $this->app->register(ModulesServiceProvider::class);
- $this->app->register(MenusServiceProvider::class);
$this->app->register(LaravelLocalizationServiceProvider::class);
// create singletons for registering widgets
$this->app->singleton('registerWidget', function ($app) {
- return new WidgetRegistrator($app);
+ return new WidgetRegistrator();
});
// create singleton for display pipeline - pipeline used for displaying visitor pages
@@ -85,7 +81,7 @@ class AppServiceProvider extends ServiceProvider
// create registrator for template directories
$this->app->singleton('registerTemplateDir', function ($app) {
- return new TemplateRegistrator($app);
+ return new TemplateRegistrator();
});
$this->app->singleton('registerSettingsExtension', function ($app) {
@@ -110,6 +106,7 @@ class AppServiceProvider extends ServiceProvider
// register all available widgets
$registrator->register(HtmlCode::class);
$registrator->register(Menu::class);
+ $registrator->register(SocialButtons::class);
}
/**
@@ -122,6 +119,7 @@ class AppServiceProvider extends ServiceProvider
$registrator->register('basic', 'admin/settings.basic', 'admin.settings.parts.basic');
$registrator->register('meta', 'admin/settings.meta', 'admin.settings.parts.meta');
$registrator->register('social', 'admin/settings.socialSites', 'admin.settings.parts.social');
+ $registrator->register('advanced', 'admin/settings.advanced.title', 'admin.settings.parts.advanced', 999);
}
/**
@@ -140,7 +138,7 @@ class AppServiceProvider extends ServiceProvider
$registrator = $this->app->make('displayPipeline');
$registrator->add(AddViewedToPage::class);
- $registrator->add(CompileShortcodes::class);
+// $registrator->add(CompileShortcodes::class);
}
private function registerSavePipeline()
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index 57d88ea3..08e6ed49 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -2,30 +2,58 @@
namespace App\Providers;
-use Illuminate\Contracts\Auth\Access\Gate as GateContract;
-use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
+use App\Models\ActionLog\ActionLog;
+use App\Models\Content\Content;
+use App\Models\FileManager\Directory;
+use App\Models\FileManager\File;
+use App\Models\Module;
+use App\Models\Settings;
+use App\Models\Templates\Template;
+use App\Models\User;
+use App\Models\Widgets\Widget;
+use App\Models\Widgets\WidgetArea;
+use App\Policies\ActionLogPolicy;
+use App\Policies\ContentPolicy;
+use App\Policies\DirectoriesPolicy;
+use App\Policies\FilesPolicy;
+use App\Policies\ModulePolicy;
+use App\Policies\SettingsPolicy;
+use App\Policies\TemplatePolicy;
+use App\Policies\UserPolicy;
+use App\Policies\WidgetAreaPolicy;
+use App\Policies\WidgetsPolicy;
+use Illuminate\Foundation\Support\Providers\AuthServiceProvider as IlluminateAuthServiceProvider;
-class AuthServiceProvider extends ServiceProvider
+class AuthServiceProvider extends IlluminateAuthServiceProvider
{
/**
* The policy mappings for the application.
- *
* @var array
*/
protected $policies = [
- 'App\Model' => 'App\Policies\ModelPolicy',
+ Content::class => ContentPolicy::class,
+ User::class => UserPolicy::class,
+ Module::class => ModulePolicy::class,
+ File::class => FilesPolicy::class,
+ ActionLog::class => ActionLogPolicy::class,
+ Template::class => TemplatePolicy::class,
+ Directory::class => DirectoriesPolicy::class,
+ Settings::class => SettingsPolicy::class,
+ Widget::class => WidgetsPolicy::class,
+ WidgetArea::class => WidgetAreaPolicy::class,
+ ActionLog::class => ActionLogPolicy::class,
];
/**
* Register any application authentication / authorization services.
*
- * @param \Illuminate\Contracts\Auth\Access\Gate $gate
+ * @param \Illuminate\Contracts\Auth\Access\Gate $gate
+ *
* @return void
*/
- public function boot(GateContract $gate)
+ public function boot()
{
- $this->registerPolicies($gate);
-
+ $this->registerPolicies();
//
}
}
diff --git a/app/Providers/BladeExtender.php b/app/Providers/BladeExtender.php
index 3475ea2d..fea57a1f 100644
--- a/app/Providers/BladeExtender.php
+++ b/app/Providers/BladeExtender.php
@@ -26,7 +26,7 @@ class BladeExtender extends ServiceProvider
$this->extendBlade();
- Shortcode::register('widget', Widget::class);
+// Shortcode::register('widget', Widget::class);
}
/**
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 47403ba2..da038506 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -43,21 +43,21 @@ use App\Listeners\Loggers\LogPublishContent;
use App\Listeners\Loggers\LogRemoveWidgetFromArea;
use App\Listeners\Loggers\LogSetHomepage;
use App\Listeners\Loggers\LogUploadFile;
+use App\Listeners\SetDefaultPermissions;
use Illuminate\Auth\Events\Login;
use Illuminate\Auth\Events\Logout;
-use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
class EventServiceProvider extends ServiceProvider
{
/**
* The event listener mappings for the application.
- *
* @var array
*/
protected $listen = [
CreateNewUser::class => [
LogCreatedUser::class,
+ SetDefaultPermissions::class,
],
EditUser::class => [
LogEditUser::class,
diff --git a/app/Providers/LaravelLocalizationServiceProvider.php b/app/Providers/LaravelLocalizationServiceProvider.php
index 00b3db64..491d5861 100644
--- a/app/Providers/LaravelLocalizationServiceProvider.php
+++ b/app/Providers/LaravelLocalizationServiceProvider.php
@@ -1,5 +1,6 @@
get();
+ try {
+ $languages = DB::table('languages')
+ ->get();
+ } catch (QueryException $e) {
+ $supportedLocales[config('app.locale')] = [
+ 'native' => env('LOCALE_NATIVE_NAME', config('app.locale')),
+ 'script' => env('LOCALE_SCRIPT', 'Latn'),
+ 'name' => env('LOCALE_TRANSLATED_NAME', config('app.locale')),
+ 'code' => config('app.locale'),
+ ];
+ $this->setSupportedLocales($supportedLocales);
+ return;
+ }
$supportedLocales = [];
if (empty($languages)) {
@@ -32,15 +44,20 @@ class LaravelLocalizationServiceProvider extends ServiceProvider
];
}
- config([
- 'laravellocalization.supportedLocales' => $supportedLocales,
- 'laravellocalization.useAcceptLanguageHeader' => true,
- 'laravellocalization.hideDefaultLocaleInURL' => true
- ]);
+ $this->setSupportedLocales($supportedLocales);
}
public function boot()
{
\App::setLocale(LaravelLocalization::getCurrentLocale());
}
+
+ private function setSupportedLocales($supportedLocales)
+ {
+ config([
+ 'laravellocalization.supportedLocales' => $supportedLocales,
+ 'laravellocalization.useAcceptLanguageHeader' => true,
+ 'laravellocalization.hideDefaultLocaleInURL' => true
+ ]);
+ }
}
\ No newline at end of file
diff --git a/app/Providers/ModuleManager.php b/app/Providers/ModuleManager.php
deleted file mode 100644
index 5594544f..00000000
--- a/app/Providers/ModuleManager.php
+++ /dev/null
@@ -1,93 +0,0 @@
-get();
-
- foreach ($modules as $module) {
- $module->module_settings = json_decode($module->module_settings);
- }
-
- return $modules;
- });
-
- // iterate over all modules and enable or disable them
- foreach ($modules as $module) {
- if ($module->is_template) {
- if (isset($module->module_settings->providers) && !empty($module->module_settings->providers)) {
- foreach ($module->module_settings->providers as $provider) {
- $this->app->register($provider);
- }
- }
-
- continue;
- }
-
- $this->createModulesJson($module);
- }
- }
-
- /**
- * Register the application services.
- * @return void
- */
- public function register()
- {
- }
-
- /**
- * Read config file and merge it with module config in database.
- * This method REQUIRES published config of given module (otherwise config(modulename) is not available)!
- *
- * @param Module $module
- *
- * @throws \ErrorException when module.json is not writable
- */
- private function createModulesJson(Module $module)
- {
- $config = $module->module_settings;
-
- if (is_null($config)) {
- return;
- }
-
- // path to module.json
- $path = config('modules.paths.modules') . DIRECTORY_SEPARATOR . $config->staticName . DIRECTORY_SEPARATOR . 'module.json';
-
- // check if module config is writable
- if (!is_writable(dirname($path))) {
- Log::warning('Cannot write to ' . $path);
- return;
- }
-
- // set enabled/disabled status for this module
- $data = new \stdClass();
- $data->name = $config->staticName;
- $data->description = $module->description;
- $data->alias = $module->alias;
- $data->providers = $config->providers;
- $data->aliases = $config->aliases;
- $data->order = $config->order;
- $data->files = $config->files;
- $data->active = $module->enabled;
-
- // create file
- file_put_contents($path, json_encode($data));
- }
-}
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index d50b1c0f..c18b2785 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -2,43 +2,52 @@
namespace App\Providers;
-use Illuminate\Routing\Router;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Route;
class RouteServiceProvider extends ServiceProvider
{
/**
- * This namespace is applied to the controller routes in your routes file.
- *
+ * This namespace is applied to your controller routes.
* In addition, it is set as the URL generator's root namespace.
- *
* @var string
*/
protected $namespace = 'App\Http\Controllers';
/**
- * Define your route model bindings, pattern filters, etc.
- *
- * @param \Illuminate\Routing\Router $router
+ * Define the routes for the application.
* @return void
*/
- public function boot(Router $router)
+ public function map()
{
- //
-
- parent::boot($router);
+ $this->mapAdminRoutes();
+ $this->mapWebRoutes();
}
/**
- * Define the routes for the application.
- *
- * @param \Illuminate\Routing\Router $router
+ * Define the "admin" routes for the application.
+ * These routes all receive session state, CSRF protection, etc.
* @return void
*/
- public function map(Router $router)
+ protected function mapAdminRoutes()
{
- $router->group(['namespace' => $this->namespace], function ($router) {
- require app_path('Http/routes.php');
- });
+ // separate route file for Auth::routes()
+ Route::namespace($this->namespace)
+ ->group(base_path('routes/auth.php'));
+
+ // routes for administration
+ Route::namespace($this->namespace . '\\Admin')
+ ->group(base_path('routes/admin.php'));
}
-}
+
+ /**
+ * Define the "web" routes for the application.
+ * These routes all receive session state, CSRF protection, etc.
+ * @return void
+ */
+ protected function mapWebRoutes()
+ {
+ Route::namespace($this->namespace)
+ ->group(base_path('routes/web.php'));
+ }
+}
\ No newline at end of file
diff --git a/app/Providers/SubmodulesManager.php b/app/Providers/SubmodulesManager.php
deleted file mode 100644
index ee8bbe77..00000000
--- a/app/Providers/SubmodulesManager.php
+++ /dev/null
@@ -1,64 +0,0 @@
-getPath();
- $config = new Json($modulePath . DIRECTORY_SEPARATOR . 'module.json');
-
- // Does this module specify any providers? If not, consider this module with submodules and register them
- if ($config->get('providers')) {
- continue;
- }
-
- $submodules = \File::directories($modulePath);
-
- foreach ($submodules as $submodulePath) {
- try {
- $config = new Json($submodulePath . DIRECTORY_SEPARATOR . 'module.json');
-
- if (!$config->get('active')) {
- continue;
- }
-
- $serviceProviders = $config->get('providers', []);
- foreach ($serviceProviders as $serviceProvider) {
- $this->app->register($serviceProvider);
- }
-
- $initFiles = $config->get('files', []);
-
- foreach ($initFiles as $file) {
- require $submodulePath . DIRECTORY_SEPARATOR . $file;
- }
- } catch (FileNotFoundException $e) {
- // ignore missing module and do not register this submodule
- }
- }
- }
- }
-
- /**
- * Register the service provider.
- *
- * @return void
- */
- public function register()
- {
- }
-}
\ No newline at end of file
diff --git a/app/Providers/TemplateServiceProvider.php b/app/Providers/TemplateServiceProvider.php
index 6c30bf40..606ec283 100644
--- a/app/Providers/TemplateServiceProvider.php
+++ b/app/Providers/TemplateServiceProvider.php
@@ -5,7 +5,8 @@ namespace App\Providers;
use App\CMS\Contracts\Repositories\Template as TemplateContract;
use App\CMS\Handlers\Registrators\TemplateRegistrator;
use App\CMS\Helpers\CurrentTemplate;
-use App\Models\Module;
+use App\CMS\Repositories\Module;
+use Illuminate\Database\QueryException;
use Illuminate\Support\Facades\App;
use Illuminate\Support\ServiceProvider;
@@ -13,25 +14,20 @@ class TemplateServiceProvider extends ServiceProvider
{
public function boot()
{
+ try {
+ $template = CurrentTemplate::get();
+ } catch (QueryException $e) {
+ return;
+ }
+
// ignore running from artisan
- if (App::runningInConsole() || App::environment('testing')) {
+ if (App::runningInConsole() || App::environment('testing') || !$template) {
$this->publishViewResources();
return;
}
- $template = CurrentTemplate::get();
-
- if (!$template) {
- throw new \ErrorException('Template is not set, cannot continue');
- }
-
- // include files
- $files = isset($template->moduleSettings->files) ? $template->moduleSettings->files : [];
-
- foreach ($files as $file) {
- include_once $file;
- }
+ // service providers and files already registered in ModuleManager
// register templates
$publicTemplates = CurrentTemplate::getPublicTemplatePaths();
@@ -43,12 +39,17 @@ class TemplateServiceProvider extends ServiceProvider
$this->registerTemplatePaths($publicTemplates);
}
+ /**
+ * Register template paths from public templates
+ *
+ * @param $publicTemplates
+ */
public function registerTemplatePaths($publicTemplates)
{
- $modules = Module::where('enabled', true)
- ->get()
- ->pluck('id', 'alias')
- ->toArray();
+ $modules = app(Module::class)
+ ->all()
+ ->pluck('id', 'alias')
+ ->toArray();
/**
* @var $registrator TemplateRegistrator
@@ -77,7 +78,6 @@ class TemplateServiceProvider extends ServiceProvider
/**
* Register the service provider.
- *
* @return void
*/
public function register()
@@ -94,7 +94,7 @@ class TemplateServiceProvider extends ServiceProvider
return;
}
- $templateDir = base_path('templates/' . $template->module_settings->staticName . '/Resources');
+ $templateDir = base_path('templates/' . $template->static_name . '/Resources');
$assetsDir = $templateDir . '/' . TemplateContract::ASSETS_DIRECTORY;
$viewsDir = $templateDir . '/views';
diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
index 38301379..a30639dc 100644
--- a/bootstrap/autoload.php
+++ b/bootstrap/autoload.php
@@ -14,21 +14,5 @@ define('LARAVEL_START', microtime(true));
|
*/
+require_once __DIR__ . '/../app/CMS/Helpers/functions.php';
require __DIR__.'/../vendor/autoload.php';
-
-/*
-|--------------------------------------------------------------------------
-| Include The Compiled Class File
-|--------------------------------------------------------------------------
-|
-| To dramatically increase your application's performance, you may use a
-| compiled class file which contains all of the classes commonly used
-| by a request. The Artisan "optimize" is used to create this file.
-|
-*/
-
-$compiledPath = __DIR__.'/cache/compiled.php';
-
-if (file_exists($compiledPath)) {
- require $compiledPath;
-}
diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore
old mode 100755
new mode 100644
diff --git a/bower.json b/bower.json
index 313afb2b..da75cfaf 100644
--- a/bower.json
+++ b/bower.json
@@ -4,14 +4,14 @@
"devDependencies": {},
"dependencies": {
"animate.css": "~3.4.0",
- "bootstrap": "v4.0.0-alpha.3",
+ "bootstrap": "v4.0.0-alpha.5",
"font-awesome": "~4.5.0",
- "jquery": "~2.1.4",
+ "jquery": "~3.2.1",
"metisMenu": "~2.0.3",
"nprogress": "~0.2.0",
"responsive-bootstrap-toolkit": "~2.5.0",
"Sortable": "~1.4.2",
- "tether": "~1.1.1",
+ "tether": "~1.3.7",
"tinycolor": "~1.2.1",
"dropzone": "~4.2.0",
"jquery.are-you-sure": "~1.9",
diff --git a/composer.json b/composer.json
index 67731974..ab91ed62 100644
--- a/composer.json
+++ b/composer.json
@@ -7,15 +7,16 @@
"license": "MIT",
"type": "project",
"require": {
- "php": ">=5.5.9",
- "laravel/framework": "5.2.*",
- "pingpong/modules": "~2.0",
- "pingpong/menus": "^2.2",
+ "php": ">=7.0.0",
+ "laravel/framework": "5.5.*",
"watson/sitemap": "^2.0",
"mcamara/laravel-localization": "^1.1",
- "franzose/closure-table": "^4.1",
+ "franzose/closure-table": "5.*",
"intervention/image": "^2.3",
- "webwizo/laravel-shortcodes": "1.0.4"
+ "webwizo/laravel-shortcodes": "1.*",
+ "greggilbert/recaptcha": "^2.2@dev",
+ "doctrine/dbal": "^2.7@dev",
+ "nwidart/laravel-menus": "dev-master"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
@@ -23,7 +24,6 @@
"phpunit/phpunit": "~4.0",
"symfony/css-selector": "2.8.*|3.0.*",
"symfony/dom-crawler": "2.8.*|3.0.*",
- "ignasbernotas/laravel-model-generator": "^1.0",
"barryvdh/laravel-debugbar": "^2.1"
},
"autoload": {
@@ -38,16 +38,9 @@
}
},
"scripts": {
- "post-install-cmd": [
- "php artisan clear-compiled",
- "php artisan optimize"
- ],
- "pre-update-cmd": [
- "php artisan clear-compiled"
- ],
- "post-update-cmd": [
- "php artisan optimize"
- ]
+ "post-install-cmd": [],
+ "pre-update-cmd": [],
+ "post-update-cmd": []
},
"config": {
"preferred-install": "dist",
diff --git a/composer.lock b/composer.lock
index 72379f2f..5df7945e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,127 +4,39 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "1d486fb23e76c7af1daf00bee207919c",
- "content-hash": "957b49e5a2e691ad8dbc0e665a87d6c7",
+ "content-hash": "1d30e667fae6843a172f62a333c2b60c",
"packages": [
- {
- "name": "classpreloader/classpreloader",
- "version": "dev-master",
- "source": {
- "type": "git",
- "url": "https://github.com/ClassPreloader/ClassPreloader.git",
- "reference": "de1d55df4f492374f0b77eb06da990b7393a433f"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/ClassPreloader/ClassPreloader/zipball/de1d55df4f492374f0b77eb06da990b7393a433f",
- "reference": "de1d55df4f492374f0b77eb06da990b7393a433f",
- "shasum": ""
- },
- "require": {
- "nikic/php-parser": "^1.0|^2.0",
- "php": ">=5.5.9"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.8|^5.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.0-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "ClassPreloader\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Michael Dowling",
- "email": "mtdowling@gmail.com"
- },
- {
- "name": "Graham Campbell",
- "email": "graham@alt-three.com"
- }
- ],
- "description": "Helps class loading performance by generating a single PHP file containing all of the autoloaded files for a specific use case",
- "keywords": [
- "autoload",
- "class",
- "preload"
- ],
- "time": "2016-01-24 12:28:38"
- },
- {
- "name": "dnoegel/php-xdg-base-dir",
- "version": "0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/dnoegel/php-xdg-base-dir.git",
- "reference": "265b8593498b997dc2d31e75b89f053b5cc9621a"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/265b8593498b997dc2d31e75b89f053b5cc9621a",
- "reference": "265b8593498b997dc2d31e75b89f053b5cc9621a",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2"
- },
- "require-dev": {
- "phpunit/phpunit": "@stable"
- },
- "type": "project",
- "autoload": {
- "psr-4": {
- "XdgBaseDir\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "description": "implementation of xdg base directory specification for php",
- "time": "2014-10-24 07:27:01"
- },
{
"name": "doctrine/annotations",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
- "reference": "f9cf50745a45cae4a55f35e7691d124c4d887e45"
+ "reference": "2497b1f9db56278d3ad2248f9e4bdbbbaa271c3e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/annotations/zipball/f9cf50745a45cae4a55f35e7691d124c4d887e45",
- "reference": "f9cf50745a45cae4a55f35e7691d124c4d887e45",
+ "url": "https://api.github.com/repos/doctrine/annotations/zipball/2497b1f9db56278d3ad2248f9e4bdbbbaa271c3e",
+ "reference": "2497b1f9db56278d3ad2248f9e4bdbbbaa271c3e",
"shasum": ""
},
"require": {
"doctrine/lexer": "1.*",
- "php": ">=5.3.2"
+ "php": "^7.1"
},
"require-dev": {
"doctrine/cache": "1.*",
- "phpunit/phpunit": "4.*"
+ "phpunit/phpunit": "^5.7"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3.x-dev"
+ "dev-master": "1.6.x-dev"
}
},
"autoload": {
- "psr-0": {
- "Doctrine\\Common\\Annotations\\": "lib/"
+ "psr-4": {
+ "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -160,7 +72,7 @@
"docblock",
"parser"
],
- "time": "2016-08-31 09:31:57"
+ "time": "2017-07-22T11:08:38+00:00"
},
{
"name": "doctrine/cache",
@@ -168,28 +80,35 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
- "reference": "fe68e4f78804684e31cce17590b0bd9f088db1b0"
+ "reference": "beb0fa35b61e9073f8612d9ffd34920bdaec406a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/cache/zipball/fe68e4f78804684e31cce17590b0bd9f088db1b0",
- "reference": "fe68e4f78804684e31cce17590b0bd9f088db1b0",
+ "url": "https://api.github.com/repos/doctrine/cache/zipball/beb0fa35b61e9073f8612d9ffd34920bdaec406a",
+ "reference": "beb0fa35b61e9073f8612d9ffd34920bdaec406a",
"shasum": ""
},
"require": {
- "php": "~5.5|~7.0"
+ "php": "~7.1"
},
"conflict": {
"doctrine/common": ">2.2,<2.4"
},
"require-dev": {
- "phpunit/phpunit": "~4.8|~5.0",
- "predis/predis": "~1.0"
+ "alcaeus/mongo-php-adapter": "^1.1",
+ "doctrine/coding-standard": "^1.0",
+ "mongodb/mongodb": "^1.1",
+ "phpunit/phpunit": "^6.3",
+ "predis/predis": "~1.0",
+ "squizlabs/php_codesniffer": "^3.0"
+ },
+ "suggest": {
+ "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7.x-dev"
+ "dev-master": "1.8.x-dev"
}
},
"autoload": {
@@ -229,7 +148,7 @@
"cache",
"caching"
],
- "time": "2016-07-15 15:57:08"
+ "time": "2017-08-25T06:51:37+00:00"
},
{
"name": "doctrine/collections",
@@ -237,29 +156,31 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/collections.git",
- "reference": "2dfc898f2a66c192d6a195bdc9c5040f65adfaab"
+ "reference": "42c4039eca9535e4f201f50d2695648658e9e5a8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/collections/zipball/2dfc898f2a66c192d6a195bdc9c5040f65adfaab",
- "reference": "2dfc898f2a66c192d6a195bdc9c5040f65adfaab",
+ "url": "https://api.github.com/repos/doctrine/collections/zipball/42c4039eca9535e4f201f50d2695648658e9e5a8",
+ "reference": "42c4039eca9535e4f201f50d2695648658e9e5a8",
"shasum": ""
},
"require": {
- "php": "^5.3.2 || ^7.0"
+ "php": "^7.1"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "doctrine/coding-standard": "^1.0",
+ "phpunit/phpunit": "^6.3",
+ "squizlabs/php_codesniffer": "^3.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3.x-dev"
+ "dev-master": "1.6.x-dev"
}
},
"autoload": {
- "psr-0": {
- "Doctrine\\Common\\Collections\\": "lib/"
+ "psr-4": {
+ "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -295,7 +216,7 @@
"collections",
"iterator"
],
- "time": "2016-09-01 10:39:08"
+ "time": "2017-08-30T09:16:50+00:00"
},
{
"name": "doctrine/common",
@@ -303,12 +224,12 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/common.git",
- "reference": "670d814b6c8b5e8f39a2764d090463d39b3502c9"
+ "reference": "a3e240fa07ec9748387c13534949d543c0e177fa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/common/zipball/670d814b6c8b5e8f39a2764d090463d39b3502c9",
- "reference": "670d814b6c8b5e8f39a2764d090463d39b3502c9",
+ "url": "https://api.github.com/repos/doctrine/common/zipball/a3e240fa07ec9748387c13534949d543c0e177fa",
+ "reference": "a3e240fa07ec9748387c13534949d543c0e177fa",
"shasum": ""
},
"require": {
@@ -317,15 +238,17 @@
"doctrine/collections": "1.*",
"doctrine/inflector": "1.*",
"doctrine/lexer": "1.*",
- "php": "~5.6|~7.0"
+ "php": "~7.1"
},
"require-dev": {
- "phpunit/phpunit": "^5.4.6"
+ "doctrine/coding-standard": "^1.0",
+ "phpunit/phpunit": "^6.3",
+ "squizlabs/php_codesniffer": "^3.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7.x-dev"
+ "dev-master": "2.9.x-dev"
}
},
"autoload": {
@@ -357,6 +280,10 @@
{
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com"
+ },
+ {
+ "name": "Marco Pivetta",
+ "email": "ocramius@gmail.com"
}
],
"description": "Common Library for Doctrine projects",
@@ -368,7 +295,7 @@
"persistence",
"spl"
],
- "time": "2016-07-20 15:39:51"
+ "time": "2017-09-02T17:51:46+00:00"
},
{
"name": "doctrine/dbal",
@@ -376,21 +303,24 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "c446c31130e6db7178e4188f8c12033b2ca3ee4a"
+ "reference": "373ae9ed860960cf4e3a061ff27db254de955fb9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/c446c31130e6db7178e4188f8c12033b2ca3ee4a",
- "reference": "c446c31130e6db7178e4188f8c12033b2ca3ee4a",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/373ae9ed860960cf4e3a061ff27db254de955fb9",
+ "reference": "373ae9ed860960cf4e3a061ff27db254de955fb9",
"shasum": ""
},
"require": {
- "doctrine/common": "~2.4",
- "php": "^5.6 || ^7.0"
+ "doctrine/common": "^2.7.1",
+ "ext-pdo": "*",
+ "php": "^7.1"
},
"require-dev": {
- "phpunit/phpunit": "^5.4.6",
+ "doctrine/coding-standard": "^1.0",
+ "phpunit/phpunit": "^6.3",
"phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5",
+ "squizlabs/php_codesniffer": "^3.0",
"symfony/console": "2.*||^3.0"
},
"suggest": {
@@ -402,7 +332,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6.x-dev"
+ "dev-master": "2.7.x-dev"
}
},
"autoload": {
@@ -440,7 +370,7 @@
"persistence",
"queryobject"
],
- "time": "2016-08-25 23:11:10"
+ "time": "2017-09-12T09:50:27+00:00"
},
{
"name": "doctrine/inflector",
@@ -448,29 +378,29 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/inflector.git",
- "reference": "803a2ed9fea02f9ca47cd45395089fe78769a392"
+ "reference": "03d4145619c2762948e4a8c53a899af24a1e4f73"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/inflector/zipball/803a2ed9fea02f9ca47cd45395089fe78769a392",
- "reference": "803a2ed9fea02f9ca47cd45395089fe78769a392",
+ "url": "https://api.github.com/repos/doctrine/inflector/zipball/03d4145619c2762948e4a8c53a899af24a1e4f73",
+ "reference": "03d4145619c2762948e4a8c53a899af24a1e4f73",
"shasum": ""
},
"require": {
- "php": ">=5.3.2"
+ "php": "^7.1"
},
"require-dev": {
- "phpunit/phpunit": "4.*"
+ "phpunit/phpunit": "^6.2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1.x-dev"
+ "dev-master": "1.3.x-dev"
}
},
"autoload": {
- "psr-0": {
- "Doctrine\\Common\\Inflector\\": "lib/"
+ "psr-4": {
+ "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -507,7 +437,7 @@
"singularize",
"string"
],
- "time": "2016-05-12 17:23:41"
+ "time": "2017-08-25T04:43:19+00:00"
},
{
"name": "doctrine/lexer",
@@ -515,12 +445,12 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/lexer.git",
- "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
+ "reference": "cc709ba91eee09540091ad5a5f2616727662e41b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
- "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
+ "url": "https://api.github.com/repos/doctrine/lexer/zipball/cc709ba91eee09540091ad5a5f2616727662e41b",
+ "reference": "cc709ba91eee09540091ad5a5f2616727662e41b",
"shasum": ""
},
"require": {
@@ -533,8 +463,8 @@
}
},
"autoload": {
- "psr-0": {
- "Doctrine\\Common\\Lexer\\": "lib/"
+ "psr-4": {
+ "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -561,22 +491,82 @@
"lexer",
"parser"
],
- "time": "2014-09-09 13:34:57"
+ "time": "2017-07-24T09:37:08+00:00"
},
{
- "name": "erusev/parsedown",
- "version": "1.6.0",
+ "name": "egulias/email-validator",
+ "version": "2.1.2",
"source": {
"type": "git",
- "url": "https://github.com/erusev/parsedown.git",
- "reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7"
+ "url": "https://github.com/egulias/EmailValidator.git",
+ "reference": "bc31baa11ea2883e017f0a10d9722ef9d50eac1c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/erusev/parsedown/zipball/3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7",
- "reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7",
+ "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/bc31baa11ea2883e017f0a10d9722ef9d50eac1c",
+ "reference": "bc31baa11ea2883e017f0a10d9722ef9d50eac1c",
"shasum": ""
},
+ "require": {
+ "doctrine/lexer": "^1.0.1",
+ "php": ">= 5.5"
+ },
+ "require-dev": {
+ "dominicsayers/isemail": "dev-master",
+ "phpunit/phpunit": "^4.8.0",
+ "satooshi/php-coveralls": "dev-master"
+ },
+ "suggest": {
+ "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Egulias\\EmailValidator\\": "EmailValidator"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Eduardo Gulias Davis"
+ }
+ ],
+ "description": "A library for validating emails against several RFCs",
+ "homepage": "https://github.com/egulias/EmailValidator",
+ "keywords": [
+ "email",
+ "emailvalidation",
+ "emailvalidator",
+ "validation",
+ "validator"
+ ],
+ "time": "2017-01-30T22:07:36+00:00"
+ },
+ {
+ "name": "erusev/parsedown",
+ "version": "1.6.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/erusev/parsedown.git",
+ "reference": "728952b90a333b5c6f77f06ea9422b94b585878d"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/erusev/parsedown/zipball/728952b90a333b5c6f77f06ea9422b94b585878d",
+ "reference": "728952b90a333b5c6f77f06ea9422b94b585878d",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
"type": "library",
"autoload": {
"psr-0": {
@@ -600,64 +590,20 @@
"markdown",
"parser"
],
- "time": "2015-10-04 16:44:32"
- },
- {
- "name": "erusev/parsedown-extra",
- "version": "0.7.1",
- "source": {
- "type": "git",
- "url": "https://github.com/erusev/parsedown-extra.git",
- "reference": "0db5cce7354e4b76f155d092ab5eb3981c21258c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/erusev/parsedown-extra/zipball/0db5cce7354e4b76f155d092ab5eb3981c21258c",
- "reference": "0db5cce7354e4b76f155d092ab5eb3981c21258c",
- "shasum": ""
- },
- "require": {
- "erusev/parsedown": "~1.4"
- },
- "type": "library",
- "autoload": {
- "psr-0": {
- "ParsedownExtra": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Emanuil Rusev",
- "email": "hello@erusev.com",
- "homepage": "http://erusev.com"
- }
- ],
- "description": "An extension of Parsedown that adds support for Markdown Extra.",
- "homepage": "https://github.com/erusev/parsedown-extra",
- "keywords": [
- "markdown",
- "markdown extra",
- "parsedown",
- "parser"
- ],
- "time": "2015-11-01 10:19:22"
+ "time": "2017-05-14T14:47:48+00:00"
},
{
"name": "franzose/closure-table",
- "version": "4.1.4",
+ "version": "v5.1",
"source": {
"type": "git",
"url": "https://github.com/franzose/ClosureTable.git",
- "reference": "8198a43f2237da35a2b9298d286a073650e95568"
+ "reference": "0056fdb54256bf23b10ac10139b4a892ad478385"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/franzose/ClosureTable/zipball/8198a43f2237da35a2b9298d286a073650e95568",
- "reference": "8198a43f2237da35a2b9298d286a073650e95568",
+ "url": "https://api.github.com/repos/franzose/ClosureTable/zipball/0056fdb54256bf23b10ac10139b4a892ad478385",
+ "reference": "0056fdb54256bf23b10ac10139b4a892ad478385",
"shasum": ""
},
"require": {
@@ -702,7 +648,59 @@
"laravel",
"pages"
],
- "time": "2016-07-08 08:19:46"
+ "time": "2017-09-10T23:00:47+00:00"
+ },
+ {
+ "name": "greggilbert/recaptcha",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/greggilbert/recaptcha.git",
+ "reference": "c2ed383785a4fe20467ce470c97c303e5c5b85de"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/greggilbert/recaptcha/zipball/c2ed383785a4fe20467ce470c97c303e5c5b85de",
+ "reference": "c2ed383785a4fe20467ce470c97c303e5c5b85de",
+ "shasum": ""
+ },
+ "require": {
+ "illuminate/support": "~5.1",
+ "php": ">=5.3.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.2-dev"
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "src/migrations"
+ ],
+ "psr-4": {
+ "Greggilbert\\Recaptcha\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Greg Gilbert",
+ "email": "greg@greg-gilbert.com"
+ }
+ ],
+ "description": "reCAPTCHA Validator for Laravel 5",
+ "homepage": "http://github.com/greggilbert/recaptcha",
+ "keywords": [
+ "captcha",
+ "laravel",
+ "laravel5",
+ "recaptcha"
+ ],
+ "time": "2017-08-31T03:39:47+00:00"
},
{
"name": "guzzlehttp/psr7",
@@ -710,12 +708,12 @@
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "64862e854f876bc5aee2996cab2f552db8586065"
+ "reference": "811b676fbab9c99e359885032e5ebc70e442f5b8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/64862e854f876bc5aee2996cab2f552db8586065",
- "reference": "64862e854f876bc5aee2996cab2f552db8586065",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/811b676fbab9c99e359885032e5ebc70e442f5b8",
+ "reference": "811b676fbab9c99e359885032e5ebc70e442f5b8",
"shasum": ""
},
"require": {
@@ -767,20 +765,20 @@
"uri",
"url"
],
- "time": "2016-08-03 09:33:34"
+ "time": "2017-07-17T09:11:21+00:00"
},
{
"name": "intervention/image",
- "version": "dev-master",
+ "version": "2.4.0",
"source": {
"type": "git",
"url": "https://github.com/Intervention/image.git",
- "reference": "4064a980324f6c3bfa2bd981dfb247afa705ec3c"
+ "reference": "322a4ade249467179c50a3e50eda8760ff3af2a3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Intervention/image/zipball/4064a980324f6c3bfa2bd981dfb247afa705ec3c",
- "reference": "4064a980324f6c3bfa2bd981dfb247afa705ec3c",
+ "url": "https://api.github.com/repos/Intervention/image/zipball/322a4ade249467179c50a3e50eda8760ff3af2a3",
+ "reference": "322a4ade249467179c50a3e50eda8760ff3af2a3",
"shasum": ""
},
"require": {
@@ -790,7 +788,7 @@
},
"require-dev": {
"mockery/mockery": "~0.9.2",
- "phpunit/phpunit": "3.*"
+ "phpunit/phpunit": "^4.8 || ^5.7"
},
"suggest": {
"ext-gd": "to use GD library based image processing.",
@@ -801,6 +799,14 @@
"extra": {
"branch-alias": {
"dev-master": "2.3-dev"
+ },
+ "laravel": {
+ "providers": [
+ "Intervention\\Image\\ImageServiceProvider"
+ ],
+ "aliases": {
+ "Image": "Intervention\\Image\\Facades\\Image"
+ }
}
},
"autoload": {
@@ -815,8 +821,8 @@
"authors": [
{
"name": "Oliver Vogel",
- "email": "oliver@olivervogel.net",
- "homepage": "http://olivervogel.net/"
+ "email": "oliver@olivervogel.com",
+ "homepage": "http://olivervogel.com/"
}
],
"description": "Image handling and manipulation library with support for Laravel integration",
@@ -829,191 +835,45 @@
"thumbnail",
"watermark"
],
- "time": "2016-09-01 17:04:03"
- },
- {
- "name": "jakub-onderka/php-console-color",
- "version": "0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/JakubOnderka/PHP-Console-Color.git",
- "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/e0b393dacf7703fc36a4efc3df1435485197e6c1",
- "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2"
- },
- "require-dev": {
- "jakub-onderka/php-code-style": "1.0",
- "jakub-onderka/php-parallel-lint": "0.*",
- "jakub-onderka/php-var-dump-check": "0.*",
- "phpunit/phpunit": "3.7.*",
- "squizlabs/php_codesniffer": "1.*"
- },
- "type": "library",
- "autoload": {
- "psr-0": {
- "JakubOnderka\\PhpConsoleColor": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-2-Clause"
- ],
- "authors": [
- {
- "name": "Jakub Onderka",
- "email": "jakub.onderka@gmail.com",
- "homepage": "http://www.acci.cz"
- }
- ],
- "time": "2014-04-08 15:00:19"
- },
- {
- "name": "jakub-onderka/php-console-highlighter",
- "version": "v0.3.2",
- "source": {
- "type": "git",
- "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git",
- "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5",
- "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5",
- "shasum": ""
- },
- "require": {
- "jakub-onderka/php-console-color": "~0.1",
- "php": ">=5.3.0"
- },
- "require-dev": {
- "jakub-onderka/php-code-style": "~1.0",
- "jakub-onderka/php-parallel-lint": "~0.5",
- "jakub-onderka/php-var-dump-check": "~0.1",
- "phpunit/phpunit": "~4.0",
- "squizlabs/php_codesniffer": "~1.5"
- },
- "type": "library",
- "autoload": {
- "psr-0": {
- "JakubOnderka\\PhpConsoleHighlighter": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jakub Onderka",
- "email": "acci@acci.cz",
- "homepage": "http://www.acci.cz/"
- }
- ],
- "time": "2015-04-20 18:58:01"
- },
- {
- "name": "jeremeamia/SuperClosure",
- "version": "dev-master",
- "source": {
- "type": "git",
- "url": "https://github.com/jeremeamia/super_closure.git",
- "reference": "6fe8ad066d3b2b01ad71d2130ebd38ccaabd549f"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/6fe8ad066d3b2b01ad71d2130ebd38ccaabd549f",
- "reference": "6fe8ad066d3b2b01ad71d2130ebd38ccaabd549f",
- "shasum": ""
- },
- "require": {
- "nikic/php-parser": "^1.2|^2.0",
- "php": ">=5.4",
- "symfony/polyfill-php56": "^1.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.0|^5.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.2-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "SuperClosure\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jeremy Lindblom",
- "email": "jeremeamia@gmail.com",
- "homepage": "https://github.com/jeremeamia",
- "role": "Developer"
- }
- ],
- "description": "Serialize Closure objects, including their context and binding",
- "homepage": "https://github.com/jeremeamia/super_closure",
- "keywords": [
- "closure",
- "function",
- "lambda",
- "parser",
- "serializable",
- "serialize",
- "tokenizer"
- ],
- "time": "2016-02-29 04:36:50"
+ "time": "2017-07-03T15:50:40+00:00"
},
{
"name": "laravel/framework",
- "version": "5.2.x-dev",
+ "version": "5.5.x-dev",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "557b9f62005639cfe6a20c26c3e7c9dc8a7a637a"
+ "reference": "d12f1edfd30aa4279a32b64fc67598d927ca97f3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/557b9f62005639cfe6a20c26c3e7c9dc8a7a637a",
- "reference": "557b9f62005639cfe6a20c26c3e7c9dc8a7a637a",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/d12f1edfd30aa4279a32b64fc67598d927ca97f3",
+ "reference": "d12f1edfd30aa4279a32b64fc67598d927ca97f3",
"shasum": ""
},
"require": {
- "classpreloader/classpreloader": "~3.0",
- "doctrine/inflector": "~1.0",
+ "doctrine/inflector": "~1.1",
+ "erusev/parsedown": "~1.6",
"ext-mbstring": "*",
"ext-openssl": "*",
- "jeremeamia/superclosure": "~2.2",
"league/flysystem": "~1.0",
- "monolog/monolog": "~1.11",
+ "monolog/monolog": "~1.12",
"mtdowling/cron-expression": "~1.0",
"nesbot/carbon": "~1.20",
- "paragonie/random_compat": "~1.4",
- "php": ">=5.5.9",
- "psy/psysh": "0.7.*",
- "swiftmailer/swiftmailer": "~5.1",
- "symfony/console": "2.8.*|3.0.*",
- "symfony/debug": "2.8.*|3.0.*",
- "symfony/finder": "2.8.*|3.0.*",
- "symfony/http-foundation": "2.8.*|3.0.*",
- "symfony/http-kernel": "2.8.*|3.0.*",
- "symfony/polyfill-php56": "~1.0",
- "symfony/process": "2.8.*|3.0.*",
- "symfony/routing": "2.8.*|3.0.*",
- "symfony/translation": "2.8.*|3.0.*",
- "symfony/var-dumper": "2.8.*|3.0.*",
+ "php": ">=7.0",
+ "psr/container": "~1.0",
+ "psr/simple-cache": "^1.0",
+ "ramsey/uuid": "~3.0",
+ "swiftmailer/swiftmailer": "~6.0",
+ "symfony/console": "~3.3",
+ "symfony/debug": "~3.3",
+ "symfony/finder": "~3.3",
+ "symfony/http-foundation": "~3.3",
+ "symfony/http-kernel": "~3.3",
+ "symfony/process": "~3.3",
+ "symfony/routing": "~3.3",
+ "symfony/var-dumper": "~3.3",
+ "tijsverkoyen/css-to-inline-styles": "~2.2",
"vlucas/phpdotenv": "~2.2"
},
"replace": {
@@ -1035,6 +895,7 @@
"illuminate/http": "self.version",
"illuminate/log": "self.version",
"illuminate/mail": "self.version",
+ "illuminate/notifications": "self.version",
"illuminate/pagination": "self.version",
"illuminate/pipeline": "self.version",
"illuminate/queue": "self.version",
@@ -1049,37 +910,39 @@
},
"require-dev": {
"aws/aws-sdk-php": "~3.0",
- "mockery/mockery": "~0.9.4",
+ "doctrine/dbal": "~2.5",
+ "filp/whoops": "^2.1.4",
+ "mockery/mockery": "~1.0",
+ "orchestra/testbench-core": "3.5.*",
"pda/pheanstalk": "~3.0",
- "phpunit/phpunit": "~4.1",
- "predis/predis": "~1.0",
- "symfony/css-selector": "2.8.*|3.0.*",
- "symfony/dom-crawler": "2.8.*|3.0.*"
+ "phpunit/phpunit": "~6.0",
+ "predis/predis": "^1.1.1",
+ "symfony/css-selector": "~3.3",
+ "symfony/dom-crawler": "~3.3"
},
"suggest": {
"aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).",
- "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.4).",
+ "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.5).",
"fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).",
- "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~5.3|~6.0).",
+ "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).",
+ "laravel/tinker": "Required to use the tinker console command (~1.0).",
"league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).",
"league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).",
+ "nexmo/client": "Required to use the Nexmo transport (~1.0).",
"pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).",
"predis/predis": "Required to use the redis cache and queue drivers (~1.0).",
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0).",
- "symfony/css-selector": "Required to use some of the crawler integration testing tools (2.8.*|3.0.*).",
- "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (2.8.*|3.0.*).",
- "symfony/psr-http-message-bridge": "Required to use psr7 bridging features (0.2.*)."
+ "symfony/css-selector": "Required to use some of the crawler integration testing tools (~3.3).",
+ "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~3.3).",
+ "symfony/psr-http-message-bridge": "Required to psr7 bridging features (~1.0)."
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.2-dev"
+ "dev-master": "5.5-dev"
}
},
"autoload": {
- "classmap": [
- "src/Illuminate/Queue/IlluminateQueueClosure.php"
- ],
"files": [
"src/Illuminate/Foundation/helpers.php",
"src/Illuminate/Support/helpers.php"
@@ -1095,45 +958,56 @@
"authors": [
{
"name": "Taylor Otwell",
- "email": "taylorotwell@gmail.com"
+ "email": "taylor@laravel.com"
}
],
"description": "The Laravel Framework.",
- "homepage": "http://laravel.com",
+ "homepage": "https://laravel.com",
"keywords": [
"framework",
"laravel"
],
- "time": "2016-08-26 16:26:18"
+ "time": "2017-09-12T18:46:04+00:00"
},
{
"name": "laravelcollective/html",
- "version": "5.2.x-dev",
+ "version": "5.5.x-dev",
"source": {
"type": "git",
"url": "https://github.com/LaravelCollective/html.git",
- "reference": "abec449ed8208b0b335cfc5b0f1237134477e27f"
+ "reference": "2f6dc39ab3655724a615fe8a652d8b7f04fc9ac6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/LaravelCollective/html/zipball/abec449ed8208b0b335cfc5b0f1237134477e27f",
- "reference": "abec449ed8208b0b335cfc5b0f1237134477e27f",
+ "url": "https://api.github.com/repos/LaravelCollective/html/zipball/2f6dc39ab3655724a615fe8a652d8b7f04fc9ac6",
+ "reference": "2f6dc39ab3655724a615fe8a652d8b7f04fc9ac6",
"shasum": ""
},
"require": {
- "illuminate/http": "5.2.*",
- "illuminate/routing": "5.2.*",
- "illuminate/session": "5.2.*",
- "illuminate/support": "5.2.*",
- "illuminate/view": "5.2.*",
- "php": ">=5.5.9"
+ "illuminate/http": "5.5.*",
+ "illuminate/routing": "5.5.*",
+ "illuminate/session": "5.5.*",
+ "illuminate/support": "5.5.*",
+ "illuminate/view": "5.5.*",
+ "php": ">=7.0.0"
},
"require-dev": {
- "illuminate/database": "5.2.*",
- "mockery/mockery": "~0.9",
- "phpunit/phpunit": "~4.0"
+ "illuminate/database": "5.5.*",
+ "mockery/mockery": "~0.9.4",
+ "phpunit/phpunit": "~5.4"
},
"type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "Collective\\Html\\HtmlServiceProvider"
+ ],
+ "aliases": {
+ "Form": "Collective\\Html\\FormFacade",
+ "Html": "Collective\\Html\\HtmlFacade"
+ }
+ }
+ },
"autoload": {
"psr-4": {
"Collective\\Html\\": "src/"
@@ -1158,7 +1032,7 @@
],
"description": "HTML and Form Builders for the Laravel Framework",
"homepage": "http://laravelcollective.com",
- "time": "2016-07-12 14:16:43"
+ "time": "2017-08-31T14:46:03+00:00"
},
{
"name": "league/flysystem",
@@ -1166,16 +1040,16 @@
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "f2ccd52d8e8a271fb340f6636e01d24673e8087b"
+ "reference": "3245df3acae2dded99694b499d3bbf937679c8f3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f2ccd52d8e8a271fb340f6636e01d24673e8087b",
- "reference": "f2ccd52d8e8a271fb340f6636e01d24673e8087b",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3245df3acae2dded99694b499d3bbf937679c8f3",
+ "reference": "3245df3acae2dded99694b499d3bbf937679c8f3",
"shasum": ""
},
"require": {
- "php": ">=5.4.0"
+ "php": ">=5.5.9"
},
"conflict": {
"league/flysystem-sftp": "<1.0.6"
@@ -1192,13 +1066,13 @@
"league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3",
"league/flysystem-azure": "Allows you to use Windows Azure Blob storage",
"league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching",
- "league/flysystem-copy": "Allows you to use Copy.com storage",
- "league/flysystem-dropbox": "Allows you to use Dropbox storage",
"league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem",
"league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files",
"league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib",
"league/flysystem-webdav": "Allows you to use WebDAV storage",
- "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter"
+ "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter",
+ "spatie/flysystem-dropbox": "Allows you to use Dropbox storage",
+ "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications"
},
"type": "library",
"extra": {
@@ -1241,30 +1115,41 @@
"sftp",
"storage"
],
- "time": "2016-08-26 20:18:09"
+ "time": "2017-09-04T09:35:39+00:00"
},
{
"name": "mcamara/laravel-localization",
- "version": "1.1.7",
+ "version": "1.3.2",
"source": {
"type": "git",
"url": "https://github.com/mcamara/laravel-localization.git",
- "reference": "ff6d398d8437d0169f1d3b97e4244552a5abcced"
+ "reference": "86d6d9d95faf9c60decb8a3f59bfb894aace4798"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mcamara/laravel-localization/zipball/ff6d398d8437d0169f1d3b97e4244552a5abcced",
- "reference": "ff6d398d8437d0169f1d3b97e4244552a5abcced",
+ "url": "https://api.github.com/repos/mcamara/laravel-localization/zipball/86d6d9d95faf9c60decb8a3f59bfb894aace4798",
+ "reference": "86d6d9d95faf9c60decb8a3f59bfb894aace4798",
"shasum": ""
},
"require": {
- "laravel/framework": "~5.2",
- "php": ">=5.5.0"
+ "laravel/framework": "~5.2||~5.3||~5.4||~5.5",
+ "php": ">=7.0.0"
},
"require-dev": {
- "orchestra/testbench": "3.2.*"
+ "orchestra/testbench-browser-kit": "~3.4",
+ "phpunit/phpunit": "6.0.*"
},
"type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "Mcamara\\LaravelLocalization\\LaravelLocalizationServiceProvider"
+ ],
+ "aliases": {
+ "LaravelLocalization": "Mcamara\\LaravelLocalization\\Facades\\LaravelLocalization"
+ }
+ }
+ },
"autoload": {
"classmap": [],
"psr-0": {
@@ -1289,7 +1174,7 @@
"localization",
"php"
],
- "time": "2016-08-25 18:28:07"
+ "time": "2017-09-11T11:52:50+00:00"
},
{
"name": "monolog/monolog",
@@ -1297,12 +1182,12 @@
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952"
+ "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952",
- "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
+ "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
"shasum": ""
},
"require": {
@@ -1313,7 +1198,7 @@
"psr/log-implementation": "1.0.0"
},
"require-dev": {
- "aws/aws-sdk-php": "^2.4.9",
+ "aws/aws-sdk-php": "^2.4.9 || ^3.0",
"doctrine/couchdb": "~1.0@dev",
"graylog2/gelf-php": "~1.0",
"jakub-onderka/php-parallel-lint": "0.9",
@@ -1323,7 +1208,7 @@
"phpunit/phpunit-mock-objects": "2.3.0",
"ruflin/elastica": ">=0.90 <3.0",
"sentry/sentry": "^0.13",
- "swiftmailer/swiftmailer": "~5.3"
+ "swiftmailer/swiftmailer": "^5.3|^6.0"
},
"suggest": {
"aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
@@ -1367,20 +1252,20 @@
"logging",
"psr-3"
],
- "time": "2016-07-29 03:23:52"
+ "time": "2017-06-19T01:22:40+00:00"
},
{
"name": "mtdowling/cron-expression",
- "version": "v1.1.0",
+ "version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/mtdowling/cron-expression.git",
- "reference": "c9ee7886f5a12902b225a1a12f36bb45f9ab89e5"
+ "reference": "9504fa9ea681b586028adaaa0877db4aecf32bad"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/c9ee7886f5a12902b225a1a12f36bb45f9ab89e5",
- "reference": "c9ee7886f5a12902b225a1a12f36bb45f9ab89e5",
+ "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/9504fa9ea681b586028adaaa0877db4aecf32bad",
+ "reference": "9504fa9ea681b586028adaaa0877db4aecf32bad",
"shasum": ""
},
"require": {
@@ -1391,8 +1276,8 @@
},
"type": "library",
"autoload": {
- "psr-0": {
- "Cron": "src/"
+ "psr-4": {
+ "Cron\\": "src/Cron/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1411,7 +1296,7 @@
"cron",
"schedule"
],
- "time": "2016-01-26 21:23:30"
+ "time": "2017-01-23T04:29:33+00:00"
},
{
"name": "nesbot/carbon",
@@ -1419,26 +1304,26 @@
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "7a026991092624a245d300685ce09ff5b4d110e0"
+ "reference": "926aee5ab38c2868816aa760f862a85ad01cb61a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7a026991092624a245d300685ce09ff5b4d110e0",
- "reference": "7a026991092624a245d300685ce09ff5b4d110e0",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/926aee5ab38c2868816aa760f862a85ad01cb61a",
+ "reference": "926aee5ab38c2868816aa760f862a85ad01cb61a",
"shasum": ""
},
"require": {
"php": ">=5.3.0",
- "symfony/translation": "~2.6|~3.0"
+ "symfony/translation": "~2.6 || ~3.0"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "~1.11",
- "phpunit/phpunit": "~4.0|~5.0"
+ "friendsofphp/php-cs-fixer": "~2",
+ "phpunit/phpunit": "~4.0 || ~5.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.22-dev"
+ "dev-master": "1.23-dev"
}
},
"autoload": {
@@ -1464,71 +1349,88 @@
"datetime",
"time"
],
- "time": "2016-07-22 14:20:35"
+ "time": "2017-02-06T22:02:47+00:00"
},
{
- "name": "nikic/php-parser",
- "version": "2.x-dev",
+ "name": "nwidart/laravel-menus",
+ "version": "dev-master",
"source": {
"type": "git",
- "url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "83f34e7fa4975e9646e118b61226e17cebc5db14"
+ "url": "https://github.com/nWidart/laravel-menus.git",
+ "reference": "ffebe35a127d37790395a09283e7083a13b2f444"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/83f34e7fa4975e9646e118b61226e17cebc5db14",
- "reference": "83f34e7fa4975e9646e118b61226e17cebc5db14",
+ "url": "https://api.github.com/repos/nWidart/laravel-menus/zipball/ffebe35a127d37790395a09283e7083a13b2f444",
+ "reference": "ffebe35a127d37790395a09283e7083a13b2f444",
"shasum": ""
},
"require": {
- "ext-tokenizer": "*",
- "php": ">=5.4"
+ "illuminate/config": "5.5.*",
+ "illuminate/support": "5.5.*",
+ "illuminate/view": "5.5.*",
+ "laravelcollective/html": "5.5.*",
+ "php": ">=5.6.4"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "friendsofphp/php-cs-fixer": "^2.4",
+ "mockery/mockery": "~0.9",
+ "orchestra/testbench": "3.5.*",
+ "phpro/grumphp": "^0.11",
+ "phpunit/phpunit": "~6.0"
},
- "bin": [
- "bin/php-parse"
- ],
"type": "library",
"extra": {
- "branch-alias": {
- "dev-master": "2.1-dev"
+ "laravel": {
+ "providers": [
+ "Nwidart\\Menus\\MenusServiceProvider"
+ ],
+ "aliases": {
+ "Menu": "Nwidart\\Menus\\Facades\\Menu"
+ }
}
},
"autoload": {
"psr-4": {
- "PhpParser\\": "lib/PhpParser"
+ "Nwidart\\Menus\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
"authors": [
{
- "name": "Nikita Popov"
+ "name": "Pingpong Labs",
+ "email": "pingpong.labs@gmail.com"
+ },
+ {
+ "name": "Nicolas Widart",
+ "email": "n.widart@gmail.com"
}
],
- "description": "A PHP parser written in PHP",
+ "description": "Laravel Menu management",
"keywords": [
- "parser",
- "php"
+ "bootstrap",
+ "laravel",
+ "menus",
+ "nav",
+ "navigation"
],
- "time": "2016-08-30 20:37:51"
+ "time": "2017-09-01T11:38:49+00:00"
},
{
"name": "paragonie/random_compat",
- "version": "v1.x-dev",
+ "version": "v2.0.10",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "1115ffa06bad72d01735d91f51eb022db556e205"
+ "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/1115ffa06bad72d01735d91f51eb022db556e205",
- "reference": "1115ffa06bad72d01735d91f51eb022db556e205",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/634bae8e911eefa89c1abfbf1b66da679ac8f54d",
+ "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d",
"shasum": ""
},
"require": {
@@ -1563,201 +1465,56 @@
"pseudorandom",
"random"
],
- "time": "2016-04-03 05:47:09"
+ "time": "2017-03-13T16:27:32+00:00"
},
{
- "name": "pingpong/generators",
- "version": "2.2.x-dev",
+ "name": "psr/container",
+ "version": "dev-master",
"source": {
"type": "git",
- "url": "https://github.com/pingpong-labs/generators.git",
- "reference": "7649e2dfa7d9b66a649696a83959e2d68f8d6073"
+ "url": "https://github.com/php-fig/container.git",
+ "reference": "2cc4a01788191489dc7459446ba832fa79a216a7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pingpong-labs/generators/zipball/7649e2dfa7d9b66a649696a83959e2d68f8d6073",
- "reference": "7649e2dfa7d9b66a649696a83959e2d68f8d6073",
+ "url": "https://api.github.com/repos/php-fig/container/zipball/2cc4a01788191489dc7459446ba832fa79a216a7",
+ "reference": "2cc4a01788191489dc7459446ba832fa79a216a7",
"shasum": ""
},
"require": {
- "doctrine/dbal": "~2.5",
- "illuminate/filesystem": "5.2.*",
- "illuminate/support": "5.2.*",
- "php": ">=5.4.0",
- "pingpong/support": "2.2.*@dev"
- },
- "require-dev": {
- "mockery/mockery": "~0.9",
- "phpunit/phpunit": "~4"
+ "php": ">=5.3.0"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
"autoload": {
"psr-4": {
- "Pingpong\\Generators\\": ""
+ "Psr\\Container\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
"authors": [
{
- "name": "Pingpong Labs",
- "email": "pingpong.labs@gmail.com"
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
}
],
- "description": "Laravel Generators",
+ "description": "Common Container Interface (PHP FIG PSR-11)",
+ "homepage": "https://github.com/php-fig/container",
"keywords": [
- "generators",
- "laravel",
- "pingpong"
+ "PSR-11",
+ "container",
+ "container-interface",
+ "container-interop",
+ "psr"
],
- "time": "2016-02-26 04:53:40"
- },
- {
- "name": "pingpong/menus",
- "version": "2.2.x-dev",
- "source": {
- "type": "git",
- "url": "https://github.com/pingpong-labs/menus.git",
- "reference": "03112523d3c5ff3e86997ce6e2de7fc1a5d372ca"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/pingpong-labs/menus/zipball/03112523d3c5ff3e86997ce6e2de7fc1a5d372ca",
- "reference": "03112523d3c5ff3e86997ce6e2de7fc1a5d372ca",
- "shasum": ""
- },
- "require": {
- "illuminate/config": "5.2.*",
- "illuminate/support": "5.2.*",
- "illuminate/view": "5.2.*",
- "laravelcollective/html": "~5.0",
- "php": ">=5.5.9"
- },
- "require-dev": {
- "mockery/mockery": "~0.9",
- "phpunit/phpunit": "~4"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Pingpong\\Menus\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Pingpong Labs",
- "email": "pingpong.labs@gmail.com"
- }
- ],
- "description": "Laravel Menus",
- "keywords": [
- "bootstrap",
- "laravel",
- "menus",
- "nav",
- "navigation",
- "pingpong"
- ],
- "time": "2016-08-23 05:51:55"
- },
- {
- "name": "pingpong/modules",
- "version": "2.2.x-dev",
- "source": {
- "type": "git",
- "url": "https://github.com/pingpong-labs/modules.git",
- "reference": "8ee9dfcc49e56173a26b3cfdc46b6037a1400a5a"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/pingpong-labs/modules/zipball/8ee9dfcc49e56173a26b3cfdc46b6037a1400a5a",
- "reference": "8ee9dfcc49e56173a26b3cfdc46b6037a1400a5a",
- "shasum": ""
- },
- "require": {
- "laravel/framework": "5.2.*",
- "laravelcollective/html": "~5.0",
- "php": ">=5.4.0",
- "pingpong/generators": "2.2.*",
- "pingpong/support": "2.2.*"
- },
- "require-dev": {
- "mockery/mockery": "~0.9",
- "phpunit/phpunit": "~4"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Pingpong\\Modules\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Pingpong Labs",
- "email": "pingpong.labs@gmail.com"
- }
- ],
- "description": "Laravel Modules",
- "keywords": [
- "hmvc",
- "laravel",
- "module",
- "modules",
- "pingpong"
- ],
- "time": "2016-01-29 04:39:40"
- },
- {
- "name": "pingpong/support",
- "version": "2.2.x-dev",
- "source": {
- "type": "git",
- "url": "https://github.com/pingpong-labs/support.git",
- "reference": "2b4ada3e8071da1b39152cfb6a2df86f053d8bb6"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/pingpong-labs/support/zipball/2b4ada3e8071da1b39152cfb6a2df86f053d8bb6",
- "reference": "2b4ada3e8071da1b39152cfb6a2df86f053d8bb6",
- "shasum": ""
- },
- "require": {
- "erusev/parsedown-extra": "0.7.*",
- "illuminate/filesystem": "5.2.*",
- "illuminate/support": "5.2.*",
- "php": ">=5.4.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Pingpong\\Support\\": ""
- },
- "files": [
- "helpers.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Pingpong Labs",
- "email": "pingpong.labs@gmail.com"
- }
- ],
- "description": "Support Component of Pingpong Sky Package",
- "time": "2016-01-07 08:23:04"
+ "time": "2017-06-28T15:35:32+00:00"
},
{
"name": "psr/http-message",
@@ -1807,7 +1564,7 @@
"request",
"response"
],
- "time": "2016-08-06 14:39:51"
+ "time": "2016-08-06T14:39:51+00:00"
},
{
"name": "psr/log",
@@ -1815,12 +1572,12 @@
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "d8e60a5619fff77f9669da8997697443ef1a1d7e"
+ "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/d8e60a5619fff77f9669da8997697443ef1a1d7e",
- "reference": "d8e60a5619fff77f9669da8997697443ef1a1d7e",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+ "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
"shasum": ""
},
"require": {
@@ -1854,57 +1611,34 @@
"psr",
"psr-3"
],
- "time": "2016-01-06 21:40:42"
+ "time": "2016-10-10T12:19:37+00:00"
},
{
- "name": "psy/psysh",
- "version": "v0.7.2",
+ "name": "psr/simple-cache",
+ "version": "dev-master",
"source": {
"type": "git",
- "url": "https://github.com/bobthecow/psysh.git",
- "reference": "e64e10b20f8d229cac76399e1f3edddb57a0f280"
+ "url": "https://github.com/php-fig/simple-cache.git",
+ "reference": "753fa598e8f3b9966c886fe13f370baa45ef0e24"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e64e10b20f8d229cac76399e1f3edddb57a0f280",
- "reference": "e64e10b20f8d229cac76399e1f3edddb57a0f280",
+ "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/753fa598e8f3b9966c886fe13f370baa45ef0e24",
+ "reference": "753fa598e8f3b9966c886fe13f370baa45ef0e24",
"shasum": ""
},
"require": {
- "dnoegel/php-xdg-base-dir": "0.1",
- "jakub-onderka/php-console-highlighter": "0.3.*",
- "nikic/php-parser": "^1.2.1|~2.0",
- "php": ">=5.3.9",
- "symfony/console": "~2.3.10|^2.4.2|~3.0",
- "symfony/var-dumper": "~2.7|~3.0"
+ "php": ">=5.3.0"
},
- "require-dev": {
- "fabpot/php-cs-fixer": "~1.5",
- "phpunit/phpunit": "~3.7|~4.0|~5.0",
- "squizlabs/php_codesniffer": "~2.0",
- "symfony/finder": "~2.1|~3.0"
- },
- "suggest": {
- "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
- "ext-pdo-sqlite": "The doc command requires SQLite to work.",
- "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.",
- "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history."
- },
- "bin": [
- "bin/psysh"
- ],
"type": "library",
"extra": {
"branch-alias": {
- "dev-develop": "0.8.x-dev"
+ "dev-master": "1.0.x-dev"
}
},
"autoload": {
- "files": [
- "src/Psy/functions.php"
- ],
"psr-4": {
- "Psy\\": "src/Psy/"
+ "Psr\\SimpleCache\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1913,45 +1647,128 @@
],
"authors": [
{
- "name": "Justin Hileman",
- "email": "justin@justinhileman.info",
- "homepage": "http://justinhileman.com"
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
}
],
- "description": "An interactive shell for modern PHP.",
- "homepage": "http://psysh.org",
+ "description": "Common interfaces for simple caching",
"keywords": [
- "REPL",
- "console",
- "interactive",
- "shell"
+ "cache",
+ "caching",
+ "psr",
+ "psr-16",
+ "simple-cache"
],
- "time": "2016-03-09 05:03:14"
+ "time": "2017-01-02T13:31:39+00:00"
},
{
- "name": "swiftmailer/swiftmailer",
- "version": "5.x-dev",
+ "name": "ramsey/uuid",
+ "version": "dev-master",
"source": {
"type": "git",
- "url": "https://github.com/swiftmailer/swiftmailer.git",
- "reference": "0b3e60404c3e398f521e9f366555678178695d91"
+ "url": "https://github.com/ramsey/uuid.git",
+ "reference": "0ef23d1b10cf1bc576e9d865a7e9c47982c5715e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/0b3e60404c3e398f521e9f366555678178695d91",
- "reference": "0b3e60404c3e398f521e9f366555678178695d91",
+ "url": "https://api.github.com/repos/ramsey/uuid/zipball/0ef23d1b10cf1bc576e9d865a7e9c47982c5715e",
+ "reference": "0ef23d1b10cf1bc576e9d865a7e9c47982c5715e",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "paragonie/random_compat": "^1.0|^2.0",
+ "php": "^5.4 || ^7.0"
+ },
+ "replace": {
+ "rhumsaa/uuid": "self.version"
},
"require-dev": {
- "mockery/mockery": "~0.9.1"
+ "apigen/apigen": "^4.1",
+ "codeception/aspect-mock": "^1.0 | ^2.0",
+ "doctrine/annotations": "~1.2.0",
+ "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1",
+ "ircmaxell/random-lib": "^1.1",
+ "jakub-onderka/php-parallel-lint": "^0.9.0",
+ "mockery/mockery": "^0.9.4",
+ "moontoast/math": "^1.1",
+ "php-mock/php-mock-phpunit": "^0.3|^1.1",
+ "phpunit/phpunit": "^4.7|>=5.0 <5.4",
+ "satooshi/php-coveralls": "^0.6.1",
+ "squizlabs/php_codesniffer": "^2.3"
+ },
+ "suggest": {
+ "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
+ "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
+ "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
+ "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).",
+ "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid",
+ "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type."
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.4-dev"
+ "dev-master": "3.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Ramsey\\Uuid\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Marijn Huizendveld",
+ "email": "marijn.huizendveld@gmail.com"
+ },
+ {
+ "name": "Thibaud Fabre",
+ "email": "thibaud@aztech.io"
+ },
+ {
+ "name": "Ben Ramsey",
+ "email": "ben@benramsey.com",
+ "homepage": "https://benramsey.com"
+ }
+ ],
+ "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
+ "homepage": "https://github.com/ramsey/uuid",
+ "keywords": [
+ "guid",
+ "identifier",
+ "uuid"
+ ],
+ "time": "2017-08-04T13:39:04+00:00"
+ },
+ {
+ "name": "swiftmailer/swiftmailer",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/swiftmailer/swiftmailer.git",
+ "reference": "1a2f9df896c8bfa6e22e8e1a78cca637c6f70613"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/1a2f9df896c8bfa6e22e8e1a78cca637c6f70613",
+ "reference": "1a2f9df896c8bfa6e22e8e1a78cca637c6f70613",
+ "shasum": ""
+ },
+ "require": {
+ "egulias/email-validator": "~2.0",
+ "php": ">=7.0.0"
+ },
+ "require-dev": {
+ "mockery/mockery": "~0.9.1",
+ "symfony/phpunit-bridge": "~3.3@dev"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "6.0-dev"
}
},
"autoload": {
@@ -1973,46 +1790,55 @@
}
],
"description": "Swiftmailer, free feature-rich PHP mailer",
- "homepage": "http://swiftmailer.org",
+ "homepage": "http://swiftmailer.symfony.com",
"keywords": [
"email",
"mail",
"mailer"
],
- "time": "2016-08-19 20:47:22"
+ "time": "2017-08-29T20:44:31+00:00"
},
{
"name": "symfony/console",
- "version": "3.0.x-dev",
+ "version": "3.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "926061e74229e935d3c5b4e9ba87237316c6693f"
+ "reference": "ed85f121340bfeb8378cf736a1332a505f8382f1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/926061e74229e935d3c5b4e9ba87237316c6693f",
- "reference": "926061e74229e935d3c5b4e9ba87237316c6693f",
+ "url": "https://api.github.com/repos/symfony/console/zipball/ed85f121340bfeb8378cf736a1332a505f8382f1",
+ "reference": "ed85f121340bfeb8378cf736a1332a505f8382f1",
"shasum": ""
},
"require": {
- "php": ">=5.5.9",
+ "php": "^5.5.9|>=7.0.8",
+ "symfony/debug": "~2.8|~3.0|~4.0",
"symfony/polyfill-mbstring": "~1.0"
},
+ "conflict": {
+ "symfony/dependency-injection": "<3.3",
+ "symfony/process": "<3.3"
+ },
"require-dev": {
"psr/log": "~1.0",
- "symfony/event-dispatcher": "~2.8|~3.0",
- "symfony/process": "~2.8|~3.0"
+ "symfony/config": "~3.3|~4.0",
+ "symfony/dependency-injection": "~3.3|~4.0",
+ "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
+ "symfony/lock": "~3.4|~4.0",
+ "symfony/process": "~3.3|~4.0"
},
"suggest": {
"psr/log": "For using the console logger",
"symfony/event-dispatcher": "",
+ "symfony/lock": "",
"symfony/process": ""
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -2039,37 +1865,89 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2016-07-30 07:22:48"
+ "time": "2017-09-11T21:23:16+00:00"
},
{
- "name": "symfony/debug",
+ "name": "symfony/css-selector",
"version": "3.0.x-dev",
"source": {
"type": "git",
- "url": "https://github.com/symfony/debug.git",
- "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a"
+ "url": "https://github.com/symfony/css-selector.git",
+ "reference": "b8999c1f33c224b2b66b38253f5e3a838d0d0115"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/697c527acd9ea1b2d3efac34d9806bf255278b0a",
- "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/b8999c1f33c224b2b66b38253f5e3a838d0d0115",
+ "reference": "b8999c1f33c224b2b66b38253f5e3a838d0d0115",
"shasum": ""
},
"require": {
- "php": ">=5.5.9",
+ "php": ">=5.5.9"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\CssSelector\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jean-François Simon",
+ "email": "jeanfrancois.simon@sensiolabs.com"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony CssSelector Component",
+ "homepage": "https://symfony.com",
+ "time": "2016-06-29T05:40:00+00:00"
+ },
+ {
+ "name": "symfony/debug",
+ "version": "3.4.x-dev",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/debug.git",
+ "reference": "14076792065c98c32c234fbb94da9a478b394281"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/14076792065c98c32c234fbb94da9a478b394281",
+ "reference": "14076792065c98c32c234fbb94da9a478b394281",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.5.9|>=7.0.8",
"psr/log": "~1.0"
},
"conflict": {
"symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
},
"require-dev": {
- "symfony/class-loader": "~2.8|~3.0",
- "symfony/http-kernel": "~2.8|~3.0"
+ "symfony/http-kernel": "~2.8|~3.0|~4.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -2096,7 +1974,7 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2016-07-30 07:22:48"
+ "time": "2017-09-12T08:02:51+00:00"
},
{
"name": "symfony/event-dispatcher",
@@ -2104,23 +1982,26 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "5382f4c882e73c267c80b8edcd482a76ef62bbe2"
+ "reference": "e7aca240dda99d78e4a51f4eee1390207a4dc8f8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5382f4c882e73c267c80b8edcd482a76ef62bbe2",
- "reference": "5382f4c882e73c267c80b8edcd482a76ef62bbe2",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/e7aca240dda99d78e4a51f4eee1390207a4dc8f8",
+ "reference": "e7aca240dda99d78e4a51f4eee1390207a4dc8f8",
"shasum": ""
},
"require": {
- "php": ">=5.5.9"
+ "php": "^7.1.3"
+ },
+ "conflict": {
+ "symfony/dependency-injection": "<3.4"
},
"require-dev": {
"psr/log": "~1.0",
- "symfony/config": "~2.8|~3.0",
- "symfony/dependency-injection": "~2.8|~3.0",
- "symfony/expression-language": "~2.8|~3.0",
- "symfony/stopwatch": "~2.8|~3.0"
+ "symfony/config": "~3.4|~4.0",
+ "symfony/dependency-injection": "~3.4|~4.0",
+ "symfony/expression-language": "~3.4|~4.0",
+ "symfony/stopwatch": "~3.4|~4.0"
},
"suggest": {
"symfony/dependency-injection": "",
@@ -2129,7 +2010,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.2-dev"
+ "dev-master": "4.0-dev"
}
},
"autoload": {
@@ -2156,29 +2037,29 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2016-07-19 10:47:02"
+ "time": "2017-09-11T20:45:27+00:00"
},
{
"name": "symfony/finder",
- "version": "3.0.x-dev",
+ "version": "3.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9"
+ "reference": "c661886c5a8f6398300812ae31445cd078af2a57"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9",
- "reference": "3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/c661886c5a8f6398300812ae31445cd078af2a57",
+ "reference": "c661886c5a8f6398300812ae31445cd078af2a57",
"shasum": ""
},
"require": {
- "php": ">=5.5.9"
+ "php": "^5.5.9|>=7.0.8"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -2205,33 +2086,33 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2016-06-29 05:40:00"
+ "time": "2017-09-11T20:45:17+00:00"
},
{
"name": "symfony/http-foundation",
- "version": "3.0.x-dev",
+ "version": "3.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "49ba00f8ede742169cb6b70abe33243f4d673f82"
+ "reference": "eb635edacc95e9be0eaed39d65f7e320efb6f70c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/49ba00f8ede742169cb6b70abe33243f4d673f82",
- "reference": "49ba00f8ede742169cb6b70abe33243f4d673f82",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/eb635edacc95e9be0eaed39d65f7e320efb6f70c",
+ "reference": "eb635edacc95e9be0eaed39d65f7e320efb6f70c",
"shasum": ""
},
"require": {
- "php": ">=5.5.9",
+ "php": "^5.5.9|>=7.0.8",
"symfony/polyfill-mbstring": "~1.1"
},
"require-dev": {
- "symfony/expression-language": "~2.8|~3.0"
+ "symfony/expression-language": "~2.8|~3.0|~4.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -2258,52 +2139,55 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2016-07-17 13:54:30"
+ "time": "2017-09-11T21:34:45+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "3.0.x-dev",
+ "version": "3.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "03ac7bbc8fccbf002e0bea88dbe09262b29dc2a9"
+ "reference": "a29b12f878f1493428cca25997c4199955b2bc0e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/03ac7bbc8fccbf002e0bea88dbe09262b29dc2a9",
- "reference": "03ac7bbc8fccbf002e0bea88dbe09262b29dc2a9",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a29b12f878f1493428cca25997c4199955b2bc0e",
+ "reference": "a29b12f878f1493428cca25997c4199955b2bc0e",
"shasum": ""
},
"require": {
- "php": ">=5.5.9",
+ "php": "^5.5.9|>=7.0.8",
"psr/log": "~1.0",
- "symfony/debug": "~2.8|~3.0",
- "symfony/event-dispatcher": "~2.8|~3.0",
- "symfony/http-foundation": "~2.8.8|~3.0.8|~3.1.2|~3.2"
+ "symfony/debug": "~2.8|~3.0|~4.0",
+ "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
+ "symfony/http-foundation": "~3.3|~4.0"
},
"conflict": {
- "symfony/config": "<2.8"
+ "symfony/config": "<2.8",
+ "symfony/dependency-injection": "<3.4",
+ "symfony/var-dumper": "<3.3",
+ "twig/twig": "<1.34|<2.4,>=2"
},
"require-dev": {
- "symfony/browser-kit": "~2.8|~3.0",
+ "psr/cache": "~1.0",
+ "symfony/browser-kit": "~2.8|~3.0|~4.0",
"symfony/class-loader": "~2.8|~3.0",
- "symfony/config": "~2.8|~3.0",
- "symfony/console": "~2.8|~3.0",
- "symfony/css-selector": "~2.8|~3.0",
- "symfony/dependency-injection": "~2.8|~3.0",
- "symfony/dom-crawler": "~2.8|~3.0",
- "symfony/expression-language": "~2.8|~3.0",
- "symfony/finder": "~2.8|~3.0",
- "symfony/process": "~2.8|~3.0",
- "symfony/routing": "~2.8|~3.0",
- "symfony/stopwatch": "~2.8|~3.0",
- "symfony/templating": "~2.8|~3.0",
- "symfony/translation": "~2.8|~3.0",
- "symfony/var-dumper": "~2.8|~3.0"
+ "symfony/config": "~2.8|~3.0|~4.0",
+ "symfony/console": "~2.8|~3.0|~4.0",
+ "symfony/css-selector": "~2.8|~3.0|~4.0",
+ "symfony/dependency-injection": "~3.4|~4.0",
+ "symfony/dom-crawler": "~2.8|~3.0|~4.0",
+ "symfony/expression-language": "~2.8|~3.0|~4.0",
+ "symfony/finder": "~2.8|~3.0|~4.0",
+ "symfony/process": "~2.8|~3.0|~4.0",
+ "symfony/routing": "~2.8|~3.0|~4.0",
+ "symfony/stopwatch": "~2.8|~3.0|~4.0",
+ "symfony/templating": "~2.8|~3.0|~4.0",
+ "symfony/translation": "~2.8|~3.0|~4.0",
+ "symfony/var-dumper": "~3.3|~4.0"
},
"suggest": {
"symfony/browser-kit": "",
- "symfony/class-loader": "",
"symfony/config": "",
"symfony/console": "",
"symfony/dependency-injection": "",
@@ -2313,7 +2197,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -2340,7 +2224,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2016-07-30 09:29:03"
+ "time": "2017-09-11T21:23:16+00:00"
},
{
"name": "symfony/polyfill-mbstring",
@@ -2348,12 +2232,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "53ad9faffe141fbe8f98cd6a7fd9a5e84513f56c"
+ "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/53ad9faffe141fbe8f98cd6a7fd9a5e84513f56c",
- "reference": "53ad9faffe141fbe8f98cd6a7fd9a5e84513f56c",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803",
+ "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803",
"shasum": ""
},
"require": {
@@ -2365,7 +2249,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2-dev"
+ "dev-master": "1.5-dev"
}
},
"autoload": {
@@ -2399,137 +2283,29 @@
"portable",
"shim"
],
- "time": "2016-08-30 17:06:17"
- },
- {
- "name": "symfony/polyfill-php56",
- "version": "dev-master",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php56.git",
- "reference": "3dd0fbb5810358b86b5a8ebb4529134597a0f95f"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/3dd0fbb5810358b86b5a8ebb4529134597a0f95f",
- "reference": "3dd0fbb5810358b86b5a8ebb4529134597a0f95f",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3",
- "symfony/polyfill-util": "~1.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.2-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Php56\\": ""
- },
- "files": [
- "bootstrap.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "time": "2016-08-17 08:39:54"
- },
- {
- "name": "symfony/polyfill-util",
- "version": "dev-master",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-util.git",
- "reference": "ef830ce3d218e622b221d6bfad42c751d974bf99"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ef830ce3d218e622b221d6bfad42c751d974bf99",
- "reference": "ef830ce3d218e622b221d6bfad42c751d974bf99",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.2-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Util\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony utilities for portability of PHP codes",
- "homepage": "https://symfony.com",
- "keywords": [
- "compat",
- "compatibility",
- "polyfill",
- "shim"
- ],
- "time": "2016-05-18 14:26:46"
+ "time": "2017-06-14T15:44:48+00:00"
},
{
"name": "symfony/process",
- "version": "3.0.x-dev",
+ "version": "3.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "768debc5996f599c4372b322d9061dba2a4bf505"
+ "reference": "19d5369c0b38820685adeb119e717e292df2b46b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/768debc5996f599c4372b322d9061dba2a4bf505",
- "reference": "768debc5996f599c4372b322d9061dba2a4bf505",
+ "url": "https://api.github.com/repos/symfony/process/zipball/19d5369c0b38820685adeb119e717e292df2b46b",
+ "reference": "19d5369c0b38820685adeb119e717e292df2b46b",
"shasum": ""
},
"require": {
- "php": ">=5.5.9"
+ "php": "^5.5.9|>=7.0.8"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -2556,36 +2332,39 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2016-07-28 11:13:34"
+ "time": "2017-09-11T21:23:16+00:00"
},
{
"name": "symfony/routing",
- "version": "3.0.x-dev",
+ "version": "3.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "9038984bd9c05ab07280121e9e10f61a7231457b"
+ "reference": "27ec5b35a8af4dea0de400e974569cc655ef9763"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/9038984bd9c05ab07280121e9e10f61a7231457b",
- "reference": "9038984bd9c05ab07280121e9e10f61a7231457b",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/27ec5b35a8af4dea0de400e974569cc655ef9763",
+ "reference": "27ec5b35a8af4dea0de400e974569cc655ef9763",
"shasum": ""
},
"require": {
- "php": ">=5.5.9"
+ "php": "^5.5.9|>=7.0.8"
},
"conflict": {
- "symfony/config": "<2.8"
+ "symfony/config": "<2.8",
+ "symfony/dependency-injection": "<3.3",
+ "symfony/yaml": "<3.3"
},
"require-dev": {
"doctrine/annotations": "~1.0",
"doctrine/common": "~2.2",
"psr/log": "~1.0",
- "symfony/config": "~2.8|~3.0",
- "symfony/expression-language": "~2.8|~3.0",
- "symfony/http-foundation": "~2.8|~3.0",
- "symfony/yaml": "~2.8|~3.0"
+ "symfony/config": "~2.8|~3.0|~4.0",
+ "symfony/dependency-injection": "~3.3|~4.0",
+ "symfony/expression-language": "~2.8|~3.0|~4.0",
+ "symfony/http-foundation": "~2.8|~3.0|~4.0",
+ "symfony/yaml": "~3.3|~4.0"
},
"suggest": {
"doctrine/annotations": "For using the annotation loader",
@@ -2598,7 +2377,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -2631,34 +2410,38 @@
"uri",
"url"
],
- "time": "2016-06-29 05:40:00"
+ "time": "2017-09-11T21:23:16+00:00"
},
{
"name": "symfony/translation",
- "version": "3.0.x-dev",
+ "version": "3.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "eee6c664853fd0576f21ae25725cfffeafe83f26"
+ "reference": "eb3635f1bd757a0a13b93264e85c5fc81fe6819a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/eee6c664853fd0576f21ae25725cfffeafe83f26",
- "reference": "eee6c664853fd0576f21ae25725cfffeafe83f26",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/eb3635f1bd757a0a13b93264e85c5fc81fe6819a",
+ "reference": "eb3635f1bd757a0a13b93264e85c5fc81fe6819a",
"shasum": ""
},
"require": {
- "php": ">=5.5.9",
+ "php": "^5.5.9|>=7.0.8",
"symfony/polyfill-mbstring": "~1.0"
},
"conflict": {
- "symfony/config": "<2.8"
+ "symfony/config": "<2.8",
+ "symfony/dependency-injection": "<3.4",
+ "symfony/yaml": "<3.3"
},
"require-dev": {
"psr/log": "~1.0",
- "symfony/config": "~2.8|~3.0",
- "symfony/intl": "~2.8|~3.0",
- "symfony/yaml": "~2.8|~3.0"
+ "symfony/config": "~2.8|~3.0|~4.0",
+ "symfony/dependency-injection": "~3.4|~4.0",
+ "symfony/finder": "~2.8|~3.0|~4.0",
+ "symfony/intl": "^2.8.18|^3.2.5|~4.0",
+ "symfony/yaml": "~3.3|~4.0"
},
"suggest": {
"psr/log": "To use logging capability in translator",
@@ -2668,7 +2451,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -2695,36 +2478,42 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "time": "2016-07-30 07:22:48"
+ "time": "2017-09-12T12:37:35+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "3.0.x-dev",
+ "version": "3.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "1f7e071aafc6676fcb6e3f0497f87c2397247377"
+ "reference": "3f046fae2a075208272799339f8ba17e92292de0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1f7e071aafc6676fcb6e3f0497f87c2397247377",
- "reference": "1f7e071aafc6676fcb6e3f0497f87c2397247377",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3f046fae2a075208272799339f8ba17e92292de0",
+ "reference": "3f046fae2a075208272799339f8ba17e92292de0",
"shasum": ""
},
"require": {
- "php": ">=5.5.9",
+ "php": "^5.5.9|>=7.0.8",
"symfony/polyfill-mbstring": "~1.0"
},
+ "conflict": {
+ "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
+ },
"require-dev": {
- "twig/twig": "~1.20|~2.0"
+ "ext-iconv": "*",
+ "twig/twig": "~1.34|~2.4"
},
"suggest": {
+ "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
+ "ext-intl": "To show region name in time zone dump",
"ext-symfony_debug": ""
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -2758,7 +2547,54 @@
"debug",
"dump"
],
- "time": "2016-07-26 08:03:56"
+ "time": "2017-09-11T21:23:16+00:00"
+ },
+ {
+ "name": "tijsverkoyen/css-to-inline-styles",
+ "version": "2.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
+ "reference": "ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b",
+ "reference": "ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.5 || ^7",
+ "symfony/css-selector": "^2.7|~3.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.8|5.1.*"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "TijsVerkoyen\\CssToInlineStyles\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Tijs Verkoyen",
+ "email": "css_to_inline_styles@verkoyen.eu",
+ "role": "Developer"
+ }
+ ],
+ "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
+ "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
+ "time": "2016-09-20T12:50:39+00:00"
},
{
"name": "vlucas/phpdotenv",
@@ -2766,12 +2602,12 @@
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
- "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c"
+ "reference": "3dd3d8f90e6604e75cca48ec32b033b50b05135b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
- "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
+ "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/3dd3d8f90e6604e75cca48ec32b033b50b05135b",
+ "reference": "3dd3d8f90e6604e75cca48ec32b033b50b05135b",
"shasum": ""
},
"require": {
@@ -2808,20 +2644,20 @@
"env",
"environment"
],
- "time": "2016-09-01 10:05:43"
+ "time": "2017-08-08T20:02:34+00:00"
},
{
"name": "watson/sitemap",
- "version": "2.0.14",
+ "version": "2.0.20",
"source": {
"type": "git",
"url": "https://github.com/dwightwatson/sitemap.git",
- "reference": "cca97f87135fc9fcaf70093453d71ec616ea90e1"
+ "reference": "2618d3e4e1d7cb7ae5bde3587489df76a6f37f03"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dwightwatson/sitemap/zipball/cca97f87135fc9fcaf70093453d71ec616ea90e1",
- "reference": "cca97f87135fc9fcaf70093453d71ec616ea90e1",
+ "url": "https://api.github.com/repos/dwightwatson/sitemap/zipball/2618d3e4e1d7cb7ae5bde3587489df76a6f37f03",
+ "reference": "2618d3e4e1d7cb7ae5bde3587489df76a6f37f03",
"shasum": ""
},
"require": {
@@ -2834,6 +2670,16 @@
"phpunit/phpunit": "4.3.*"
},
"type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "Watson\\Sitemap\\SitemapServiceProvider"
+ ],
+ "aliases": {
+ "Sitemap": "Watson\\Sitemap\\Facades\\Sitemap"
+ }
+ }
+ },
"autoload": {
"psr-4": {
"Watson\\": "src/Watson"
@@ -2854,26 +2700,26 @@
"laravel",
"sitemaps"
],
- "time": "2016-08-18 23:27:53"
+ "time": "2017-06-30T01:15:34+00:00"
},
{
"name": "webwizo/laravel-shortcodes",
- "version": "v1.0.4",
+ "version": "1.0.9",
"source": {
"type": "git",
"url": "https://github.com/webwizo/laravel-shortcodes.git",
- "reference": "da0774fcba968b11591693cc55b28fabe7eaf047"
+ "reference": "9e42444a2fe5e5d3496bfbadd7546f91d91fcf51"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webwizo/laravel-shortcodes/zipball/da0774fcba968b11591693cc55b28fabe7eaf047",
- "reference": "da0774fcba968b11591693cc55b28fabe7eaf047",
+ "url": "https://api.github.com/repos/webwizo/laravel-shortcodes/zipball/9e42444a2fe5e5d3496bfbadd7546f91d91fcf51",
+ "reference": "9e42444a2fe5e5d3496bfbadd7546f91d91fcf51",
"shasum": ""
},
"require": {
- "illuminate/contracts": "~5.2",
- "illuminate/support": "~5.2",
- "illuminate/view": "~5.2",
+ "illuminate/contracts": "~5.1|~5.2|~5.3|~5.4",
+ "illuminate/support": "~5.1|~5.2|~5.3|~5.4",
+ "illuminate/view": "~5.1|~5.2|~5.3|~5.4",
"php": "~5.5|~7.0"
},
"require-dev": {
@@ -2883,11 +2729,6 @@
"squizlabs/php_codesniffer": "~2.3"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0-dev"
- }
- },
"autoload": {
"classmap": [
"tests/TestCase.php"
@@ -2908,43 +2749,38 @@
"role": "Developer"
}
],
- "description": "Wordpress like shortcodes for Laravel 5.2",
+ "description": "Wordpress like shortcodes for Laravel 5.x",
"homepage": "https://github.com/webwizo/laravel-shortcodes",
"keywords": [
"laravel",
"shortcodes",
"wordpress"
],
- "time": "2016-08-25 06:02:46"
+ "time": "2017-01-30T08:37:02+00:00"
}
],
"packages-dev": [
{
"name": "barryvdh/laravel-debugbar",
- "version": "dev-master",
+ "version": "2.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-debugbar.git",
- "reference": "5056a3878db4ab7ac232d5a075d54aaa590c2d27"
+ "reference": "b45cee906d15a798ae60db8edf71b31355dba929"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/5056a3878db4ab7ac232d5a075d54aaa590c2d27",
- "reference": "5056a3878db4ab7ac232d5a075d54aaa590c2d27",
+ "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/b45cee906d15a798ae60db8edf71b31355dba929",
+ "reference": "b45cee906d15a798ae60db8edf71b31355dba929",
"shasum": ""
},
"require": {
- "illuminate/support": "5.1.*|5.2.*|5.3.*",
- "maximebf/debugbar": "~1.11.0|~1.12.0",
+ "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*",
+ "maximebf/debugbar": "~1.14.0",
"php": ">=5.5.9",
"symfony/finder": "~2.7|~3.0"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.2-dev"
- }
- },
"autoload": {
"psr-4": {
"Barryvdh\\Debugbar\\": "src/"
@@ -2971,7 +2807,7 @@
"profiler",
"webprofiler"
],
- "time": "2016-08-25 20:55:54"
+ "time": "2017-09-06T08:02:33+00:00"
},
{
"name": "doctrine/instantiator",
@@ -2979,28 +2815,28 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
- "reference": "416fb8ad1d095a87f1d21bc40711843cd122fd4a"
+ "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/416fb8ad1d095a87f1d21bc40711843cd122fd4a",
- "reference": "416fb8ad1d095a87f1d21bc40711843cd122fd4a",
+ "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+ "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
"shasum": ""
},
"require": {
- "php": ">=5.3,<8.0-DEV"
+ "php": "^7.1"
},
"require-dev": {
"athletic/athletic": "~0.1.8",
"ext-pdo": "*",
"ext-phar": "*",
- "phpunit/phpunit": "~4.0",
- "squizlabs/php_codesniffer": "~2.0"
+ "phpunit/phpunit": "^6.2.3",
+ "squizlabs/php_codesniffer": "^3.0.2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.2.x-dev"
}
},
"autoload": {
@@ -3025,7 +2861,7 @@
"constructor",
"instantiate"
],
- "time": "2016-03-31 10:24:22"
+ "time": "2017-07-22T11:58:36+00:00"
},
{
"name": "fzaninotto/faker",
@@ -3033,26 +2869,26 @@
"source": {
"type": "git",
"url": "https://github.com/fzaninotto/Faker.git",
- "reference": "efcde03be3051be1045515fb1520451283357fbb"
+ "reference": "95b16a4802b998f330f8a8bfc3fa4e412a7ce05b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/efcde03be3051be1045515fb1520451283357fbb",
- "reference": "efcde03be3051be1045515fb1520451283357fbb",
+ "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/95b16a4802b998f330f8a8bfc3fa4e412a7ce05b",
+ "reference": "95b16a4802b998f330f8a8bfc3fa4e412a7ce05b",
"shasum": ""
},
"require": {
- "php": "^5.3.3|^7.0"
+ "php": "^5.3.3 || ^7.0"
},
"require-dev": {
"ext-intl": "*",
- "phpunit/phpunit": "~4.0",
- "squizlabs/php_codesniffer": "~1.5"
+ "phpunit/phpunit": "^4.0 || ^5.0",
+ "squizlabs/php_codesniffer": "^1.5"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.6.x-dev"
+ "dev-master": "1.8-dev"
}
},
"autoload": {
@@ -3075,7 +2911,7 @@
"faker",
"fixtures"
],
- "time": "2016-09-01 09:55:47"
+ "time": "2017-09-08T09:53:19+00:00"
},
{
"name": "hamcrest/hamcrest-php",
@@ -3126,50 +2962,7 @@
"keywords": [
"test"
],
- "time": "2016-01-19 12:08:55"
- },
- {
- "name": "ignasbernotas/laravel-model-generator",
- "version": "1.1.4",
- "source": {
- "type": "git",
- "url": "https://github.com/ignasbernotas/laravel-model-generator.git",
- "reference": "343ad81e5ec64b224aff01e7054e98faf98f1c61"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/ignasbernotas/laravel-model-generator/zipball/343ad81e5ec64b224aff01e7054e98faf98f1c61",
- "reference": "343ad81e5ec64b224aff01e7054e98faf98f1c61",
- "shasum": ""
- },
- "require": {
- "illuminate/support": "~5.0",
- "php": ">=5.4.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Iber\\Generator\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Ignas Bernotas",
- "email": "ignas@iber.lt"
- }
- ],
- "description": "Laravel 5 model generator from existing schema",
- "keywords": [
- "generator",
- "laravel",
- "model",
- "schema"
- ],
- "time": "2016-05-24 16:57:40"
+ "time": "2016-01-19T12:08:55+00:00"
},
{
"name": "maximebf/debugbar",
@@ -3177,12 +2970,12 @@
"source": {
"type": "git",
"url": "https://github.com/maximebf/php-debugbar.git",
- "reference": "c639a8435172116f4edf6d1cdad64801b1f2fad6"
+ "reference": "82a53b6ed8b16e3f7527d9a6f2e4bea68c6b14d8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/c639a8435172116f4edf6d1cdad64801b1f2fad6",
- "reference": "c639a8435172116f4edf6d1cdad64801b1f2fad6",
+ "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/82a53b6ed8b16e3f7527d9a6f2e4bea68c6b14d8",
+ "reference": "82a53b6ed8b16e3f7527d9a6f2e4bea68c6b14d8",
"shasum": ""
},
"require": {
@@ -3201,7 +2994,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.14-dev"
}
},
"autoload": {
@@ -3230,20 +3023,20 @@
"debug",
"debugbar"
],
- "time": "2016-08-28 15:57:48"
+ "time": "2017-08-31T09:05:54+00:00"
},
{
"name": "mockery/mockery",
"version": "0.9.x-dev",
"source": {
"type": "git",
- "url": "https://github.com/padraic/mockery.git",
- "reference": "dc369985a60578ca38f3525e98c1038f84153bc6"
+ "url": "https://github.com/mockery/mockery.git",
+ "reference": "80ac8060487db317c133ee00154f0862bd4d4ec7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/padraic/mockery/zipball/dc369985a60578ca38f3525e98c1038f84153bc6",
- "reference": "dc369985a60578ca38f3525e98c1038f84153bc6",
+ "url": "https://api.github.com/repos/mockery/mockery/zipball/80ac8060487db317c133ee00154f0862bd4d4ec7",
+ "reference": "80ac8060487db317c133ee00154f0862bd4d4ec7",
"shasum": ""
},
"require": {
@@ -3271,7 +3064,7 @@
],
"authors": [
{
- "name": "Pádraic Brady",
+ "name": "Padraic Brady",
"email": "padraic.brady@gmail.com",
"homepage": "http://blog.astrumfutura.com"
},
@@ -3295,7 +3088,7 @@
"test double",
"testing"
],
- "time": "2016-09-03 07:05:34"
+ "time": "2017-06-07T08:41:50+00:00"
},
{
"name": "phpdocumentor/reflection-common",
@@ -3303,12 +3096,12 @@
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionCommon.git",
- "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
+ "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
- "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+ "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
"shasum": ""
},
"require": {
@@ -3349,26 +3142,26 @@
"reflection",
"static analysis"
],
- "time": "2015-12-27 11:43:31"
+ "time": "2017-09-11T18:02:19+00:00"
},
{
"name": "phpdocumentor/reflection-docblock",
- "version": "3.1.0",
+ "version": "4.1.1",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
- "reference": "9270140b940ff02e58ec577c237274e92cd40cdd"
+ "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd",
- "reference": "9270140b940ff02e58ec577c237274e92cd40cdd",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/2d3d238c433cf69caeb4842e97a3223a116f94b2",
+ "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2",
"shasum": ""
},
"require": {
- "php": ">=5.5",
+ "php": "^7.0",
"phpdocumentor/reflection-common": "^1.0@dev",
- "phpdocumentor/type-resolver": "^0.2.0",
+ "phpdocumentor/type-resolver": "^0.4.0",
"webmozart/assert": "^1.0"
},
"require-dev": {
@@ -3394,24 +3187,24 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
- "time": "2016-06-10 09:48:41"
+ "time": "2017-08-30T18:51:59+00:00"
},
{
"name": "phpdocumentor/type-resolver",
- "version": "0.2",
+ "version": "0.4.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
- "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443"
+ "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443",
- "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443",
+ "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
+ "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
"shasum": ""
},
"require": {
- "php": ">=5.5",
+ "php": "^5.5 || ^7.0",
"phpdocumentor/reflection-common": "^1.0"
},
"require-dev": {
@@ -3441,7 +3234,7 @@
"email": "me@mikevanriel.com"
}
],
- "time": "2016-06-10 07:14:17"
+ "time": "2017-07-14T14:27:02+00:00"
},
{
"name": "phpspec/prophecy",
@@ -3449,28 +3242,29 @@
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "d883566b83ae601a50b38b249e92450dc57cf875"
+ "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d883566b83ae601a50b38b249e92450dc57cf875",
- "reference": "d883566b83ae601a50b38b249e92450dc57cf875",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
+ "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0",
- "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
- "sebastian/comparator": "^1.1",
- "sebastian/recursion-context": "^1.0"
+ "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
+ "sebastian/comparator": "^1.1|^2.0",
+ "sebastian/recursion-context": "^1.0|^2.0|^3.0"
},
"require-dev": {
- "phpspec/phpspec": "^2.0"
+ "phpspec/phpspec": "^2.5|^3.2",
+ "phpunit/phpunit": "^4.8 || ^5.6.5"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.6.x-dev"
+ "dev-master": "1.7.x-dev"
}
},
"autoload": {
@@ -3503,7 +3297,7 @@
"spy",
"stub"
],
- "time": "2016-07-19 16:08:43"
+ "time": "2017-09-04T11:05:03+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -3565,7 +3359,7 @@
"testing",
"xunit"
],
- "time": "2015-10-06 15:47:00"
+ "time": "2015-10-06T15:47:00+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -3573,12 +3367,12 @@
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
- "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
+ "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
- "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+ "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
"shasum": ""
},
"require": {
@@ -3612,7 +3406,7 @@
"filesystem",
"iterator"
],
- "time": "2015-06-21 13:08:43"
+ "time": "2016-10-03T07:40:28+00:00"
},
{
"name": "phpunit/php-text-template",
@@ -3653,29 +3447,34 @@
"keywords": [
"template"
],
- "time": "2015-06-21 13:50:34"
+ "time": "2015-06-21T13:50:34+00:00"
},
{
"name": "phpunit/php-timer",
- "version": "1.0.8",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git",
- "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
+ "reference": "d107f347d368dd8a384601398280c7c608390ab7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
- "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/d107f347d368dd8a384601398280c7c608390ab7",
+ "reference": "d107f347d368dd8a384601398280c7c608390ab7",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": "^5.3.3 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "~4|~5"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
"autoload": {
"classmap": [
"src/"
@@ -3697,20 +3496,20 @@
"keywords": [
"timer"
],
- "time": "2016-05-12 18:03:57"
+ "time": "2017-03-07T15:42:04+00:00"
},
{
"name": "phpunit/php-token-stream",
- "version": "dev-master",
+ "version": "1.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
- "reference": "cab6c6fefee93d7b7c3a01292a0fe0884ea66644"
+ "reference": "958103f327daef5dd0bb328dec53e0a9e43cfaf7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/cab6c6fefee93d7b7c3a01292a0fe0884ea66644",
- "reference": "cab6c6fefee93d7b7c3a01292a0fe0884ea66644",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/958103f327daef5dd0bb328dec53e0a9e43cfaf7",
+ "reference": "958103f327daef5dd0bb328dec53e0a9e43cfaf7",
"shasum": ""
},
"require": {
@@ -3746,7 +3545,7 @@
"keywords": [
"tokenizer"
],
- "time": "2015-09-23 14:46:55"
+ "time": "2017-03-07T08:21:50+00:00"
},
{
"name": "phpunit/phpunit",
@@ -3754,12 +3553,12 @@
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "41433b0d64caa3f2a73e415596dfa73490c262fc"
+ "reference": "18e5f52e8412d23e739f7d8744e177039860e800"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/41433b0d64caa3f2a73e415596dfa73490c262fc",
- "reference": "41433b0d64caa3f2a73e415596dfa73490c262fc",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/18e5f52e8412d23e739f7d8744e177039860e800",
+ "reference": "18e5f52e8412d23e739f7d8744e177039860e800",
"shasum": ""
},
"require": {
@@ -3775,7 +3574,7 @@
"phpunit/php-text-template": "~1.2",
"phpunit/php-timer": "^1.0.6",
"phpunit/phpunit-mock-objects": "~2.3",
- "sebastian/comparator": "~1.1",
+ "sebastian/comparator": "~1.2.2",
"sebastian/diff": "~1.2",
"sebastian/environment": "~1.3",
"sebastian/exporter": "~1.2",
@@ -3818,7 +3617,7 @@
"testing",
"xunit"
],
- "time": "2016-08-28 06:58:45"
+ "time": "2017-06-23T12:44:27+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -3874,26 +3673,26 @@
"mock",
"xunit"
],
- "time": "2015-10-02 06:51:40"
+ "time": "2015-10-02T06:51:40+00:00"
},
{
"name": "sebastian/comparator",
- "version": "dev-master",
+ "version": "1.2.x-dev",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
+ "reference": "18a5d97c25f408f48acaf6d1b9f4079314c5996a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
- "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/18a5d97c25f408f48acaf6d1b9f4079314c5996a",
+ "reference": "18a5d97c25f408f48acaf6d1b9f4079314c5996a",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"sebastian/diff": "~1.2",
- "sebastian/exporter": "~1.2"
+ "sebastian/exporter": "~1.2 || ~2.0"
},
"require-dev": {
"phpunit/phpunit": "~4.4"
@@ -3938,27 +3737,27 @@
"compare",
"equality"
],
- "time": "2015-07-26 15:48:44"
+ "time": "2017-03-07T10:34:43+00:00"
},
{
"name": "sebastian/diff",
- "version": "dev-master",
+ "version": "1.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
+ "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
- "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
+ "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": "^5.3.3 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.8"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
},
"type": "library",
"extra": {
@@ -3990,7 +3789,7 @@
"keywords": [
"diff"
],
- "time": "2015-12-08 07:14:41"
+ "time": "2017-05-22T07:24:03+00:00"
},
{
"name": "sebastian/environment",
@@ -3998,19 +3797,19 @@
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
+ "reference": "67f55699c2810ff0f2cc47478bbdeda8567e68ee"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
- "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/67f55699c2810ff0f2cc47478bbdeda8567e68ee",
+ "reference": "67f55699c2810ff0f2cc47478bbdeda8567e68ee",
"shasum": ""
},
"require": {
"php": "^5.3.3 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.8 || ^5.0"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
},
"type": "library",
"extra": {
@@ -4040,34 +3839,34 @@
"environment",
"hhvm"
],
- "time": "2016-08-18 05:49:44"
+ "time": "2017-02-28T08:18:59+00:00"
},
{
"name": "sebastian/exporter",
- "version": "dev-master",
+ "version": "1.2.x-dev",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
+ "reference": "dcd43bcc0fd3551bd2ede0081882d549bb78225d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
- "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/dcd43bcc0fd3551bd2ede0081882d549bb78225d",
+ "reference": "dcd43bcc0fd3551bd2ede0081882d549bb78225d",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
- "sebastian/recursion-context": "~1.0"
+ "php": "^5.3.3 || ^7.0",
+ "sebastian/recursion-context": "^1.0"
},
"require-dev": {
"ext-mbstring": "*",
- "phpunit/phpunit": "~4.4"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3.x-dev"
+ "dev-master": "1.2.x-dev"
}
},
"autoload": {
@@ -4107,27 +3906,27 @@
"export",
"exporter"
],
- "time": "2016-06-17 09:04:28"
+ "time": "2017-02-26T13:09:30+00:00"
},
{
"name": "sebastian/global-state",
- "version": "1.1.1",
+ "version": "1.1.x-dev",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/global-state.git",
- "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
+ "reference": "cea85a84b00f2795341ebbbca4fa396347f2494e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
- "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
+ "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/cea85a84b00f2795341ebbbca4fa396347f2494e",
+ "reference": "cea85a84b00f2795341ebbbca4fa396347f2494e",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "phpunit/phpunit": "~4.2"
+ "phpunit/phpunit": "~4.2|~5.0"
},
"suggest": {
"ext-uopz": "*"
@@ -4158,20 +3957,20 @@
"keywords": [
"global state"
],
- "time": "2015-10-12 03:26:01"
+ "time": "2017-02-23T14:11:06+00:00"
},
{
"name": "sebastian/recursion-context",
- "version": "dev-master",
+ "version": "1.0.x-dev",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git",
- "reference": "7ff5b1b3dcc55b8ab8ae61ef99d4730940856ee7"
+ "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/7ff5b1b3dcc55b8ab8ae61ef99d4730940856ee7",
- "reference": "7ff5b1b3dcc55b8ab8ae61ef99d4730940856ee7",
+ "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
+ "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
"shasum": ""
},
"require": {
@@ -4211,7 +4010,7 @@
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
- "time": "2016-01-28 05:39:29"
+ "time": "2016-10-03T07:41:43+00:00"
},
{
"name": "sebastian/version",
@@ -4246,60 +4045,7 @@
],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version",
- "time": "2015-06-21 13:59:46"
- },
- {
- "name": "symfony/css-selector",
- "version": "3.0.x-dev",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/css-selector.git",
- "reference": "b8999c1f33c224b2b66b38253f5e3a838d0d0115"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/b8999c1f33c224b2b66b38253f5e3a838d0d0115",
- "reference": "b8999c1f33c224b2b66b38253f5e3a838d0d0115",
- "shasum": ""
- },
- "require": {
- "php": ">=5.5.9"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.0-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\CssSelector\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jean-François Simon",
- "email": "jeanfrancois.simon@sensiolabs.com"
- },
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony CssSelector Component",
- "homepage": "https://symfony.com",
- "time": "2016-06-29 05:40:00"
+ "time": "2015-06-21T13:59:46+00:00"
},
{
"name": "symfony/dom-crawler",
@@ -4355,27 +4101,30 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
- "time": "2016-07-30 07:22:48"
+ "time": "2016-07-30T07:22:48+00:00"
},
{
"name": "symfony/yaml",
- "version": "dev-master",
+ "version": "3.4.x-dev",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "aa8be2235b5dd4e472424552390609f61996f5ab"
+ "reference": "c076a2d6f809130a84f99616b425b9665b3ce0a5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/aa8be2235b5dd4e472424552390609f61996f5ab",
- "reference": "aa8be2235b5dd4e472424552390609f61996f5ab",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/c076a2d6f809130a84f99616b425b9665b3ce0a5",
+ "reference": "c076a2d6f809130a84f99616b425b9665b3ce0a5",
"shasum": ""
},
"require": {
- "php": ">=5.5.9"
+ "php": "^5.5.9|>=7.0.8"
+ },
+ "conflict": {
+ "symfony/console": "<3.4"
},
"require-dev": {
- "symfony/console": "~2.8|~3.0"
+ "symfony/console": "~3.4|~4.0"
},
"suggest": {
"symfony/console": "For validating YAML files using the lint command"
@@ -4383,7 +4132,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.2-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -4410,7 +4159,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2016-09-02 02:14:06"
+ "time": "2017-09-04T13:18:59+00:00"
},
{
"name": "webmozart/assert",
@@ -4418,12 +4167,12 @@
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
- "reference": "8444f2ac9f86342665cdae47b6d3ea6e07794456"
+ "reference": "4a8bf11547e139e77b651365113fc12850c43d9a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webmozart/assert/zipball/8444f2ac9f86342665cdae47b6d3ea6e07794456",
- "reference": "8444f2ac9f86342665cdae47b6d3ea6e07794456",
+ "url": "https://api.github.com/repos/webmozart/assert/zipball/4a8bf11547e139e77b651365113fc12850c43d9a",
+ "reference": "4a8bf11547e139e77b651365113fc12850c43d9a",
"shasum": ""
},
"require": {
@@ -4436,7 +4185,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2-dev"
+ "dev-master": "1.3-dev"
}
},
"autoload": {
@@ -4460,16 +4209,20 @@
"check",
"validate"
],
- "time": "2016-08-18 09:30:53"
+ "time": "2016-11-23T20:04:41+00:00"
}
],
"aliases": [],
"minimum-stability": "dev",
- "stability-flags": [],
+ "stability-flags": {
+ "greggilbert/recaptcha": 20,
+ "doctrine/dbal": 20,
+ "nwidart/laravel-menus": 20
+ },
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
- "php": ">=5.5.9"
+ "php": ">=7.0.0"
},
"platform-dev": []
}
diff --git a/config/.gitignore b/config/.gitignore
index a6acbe5b..30f2be9f 100644
--- a/config/.gitignore
+++ b/config/.gitignore
@@ -19,3 +19,4 @@
!sitemap.php
!image.php
!view.php
+!recaptcha.php
\ No newline at end of file
diff --git a/config/app.php b/config/app.php
index 8655d7a1..d62c8e9c 100644
--- a/config/app.php
+++ b/config/app.php
@@ -153,16 +153,14 @@ return [
Illuminate\Translation\TranslationServiceProvider::class,
Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class,
+ Illuminate\Notifications\NotificationServiceProvider::class,
Mcamara\LaravelLocalization\LaravelLocalizationServiceProvider::class,
- // this class must be before ModulesServiceProvider from PingPong, because it handles files module.json
- App\Providers\ModuleManager::class,
- Pingpong\Modules\ModulesServiceProvider::class,
- Pingpong\Menus\MenusServiceProvider::class,
- App\Providers\SubmodulesManager::class,
+ \App\CMS\ModuleManager\Providers\ModuleManager::class,
+ \Nwidart\Menus\MenusServiceProvider::class,
Franzose\ClosureTable\ClosureTableServiceProvider::class,
\Watson\Sitemap\SitemapServiceProvider::class,
Intervention\Image\ImageServiceProvider::class,
- Webwizo\Shortcodes\ShortcodesServiceProvider::class,
+// Webwizo\Shortcodes\ShortcodesServiceProvider::class,
/*
* Application Service Providers...
*/
@@ -172,6 +170,7 @@ return [
App\Providers\RouteServiceProvider::class,
App\Providers\BladeExtender::class,
\App\Providers\TemplateServiceProvider::class,
+ \Greggilbert\Recaptcha\RecaptchaServiceProvider::class,
],
/*
@@ -186,7 +185,6 @@ return [
*/
'aliases' => [
-
'App' => Illuminate\Support\Facades\App::class,
'Artisan' => Illuminate\Support\Facades\Artisan::class,
'Auth' => Illuminate\Support\Facades\Auth::class,
@@ -204,8 +202,7 @@ return [
'Lang' => Illuminate\Support\Facades\Lang::class,
'Log' => Illuminate\Support\Facades\Log::class,
'Mail' => Illuminate\Support\Facades\Mail::class,
- 'Menu' => Pingpong\Menus\MenuFacade::class,
- 'Module' => Pingpong\Modules\Facades\Module::class,
+ 'Menu' => Nwidart\Menus\Facades\Menu::class,
'Password' => Illuminate\Support\Facades\Password::class,
'Queue' => Illuminate\Support\Facades\Queue::class,
'Redirect' => Illuminate\Support\Facades\Redirect::class,
@@ -221,8 +218,9 @@ return [
'Validator' => Illuminate\Support\Facades\Validator::class,
'LaravelLocalization' => Mcamara\LaravelLocalization\Facades\LaravelLocalization::class,
'View' => Illuminate\Support\Facades\View::class,
+ 'Recaptcha' => Greggilbert\Recaptcha\Facades\Recaptcha::class,
'Shortcode' => Webwizo\Shortcodes\Facades\Shortcode::class,
-
+ 'Notification' => Illuminate\Support\Facades\Notification::class,
],
];
diff --git a/config/mail.php b/config/mail.php
index 7c60a671..8f0edf46 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -111,4 +111,22 @@ return [
'sendmail' => '/usr/sbin/sendmail -bs',
+ /*
+ |--------------------------------------------------------------------------
+ | Markdown Mail Settings
+ |--------------------------------------------------------------------------
+ |
+ | If you are using Markdown based email rendering, you may configure your
+ | theme and component paths here, allowing you to customize the design
+ | of the emails. Or, you may simply stick with the Laravel defaults!
+ |
+ */
+
+ 'markdown' => [
+ 'theme' => 'default',
+
+ 'paths' => [
+ resource_path('views/vendor/mail'),
+ ],
+ ]
];
diff --git a/config/menus.php b/config/menus.php
index 0fc4ae4c..9119ddb8 100644
--- a/config/menus.php
+++ b/config/menus.php
@@ -3,12 +3,6 @@
return [
'styles' => [
- 'navbar' => 'Pingpong\Menus\Presenters\Bootstrap\NavbarPresenter',
- 'navbar-right' => 'Pingpong\Menus\Presenters\Bootstrap\NavbarRightPresenter',
- 'nav-pills' => 'Pingpong\Menus\Presenters\Bootstrap\NavPillsPresenter',
- 'nav-tab' => 'Pingpong\Menus\Presenters\Bootstrap\NavTabPresenter',
- 'sidebar' => 'Pingpong\Menus\Presenters\Bootstrap\SidebarMenuPresenter',
- 'navmenu' => 'Pingpong\Menus\Presenters\Bootstrap\NavMenuPresenter',
'foundation-drilldown' => App\CMS\MenuPresenters\FoundationDrilldownMenuPresenter::class,
'foundation-dropdown' => App\CMS\MenuPresenters\FoundationDropdownMenuPresenter::class,
'foundation-dropdown-initialized' => App\CMS\MenuPresenters\FoundationInitializedDropdownMenuPresenter::class,
diff --git a/config/modules.php b/config/modules.php
index 80edfbbb..038f14dc 100644
--- a/config/modules.php
+++ b/config/modules.php
@@ -1,160 +1,11 @@
'Modules',
-
- /*
- |--------------------------------------------------------------------------
- | Module Stubs
- |--------------------------------------------------------------------------
- |
- | Default module stubs.
- |
- */
-
- 'stubs' => [
- 'enabled' => false,
- 'path' => base_path().'/vendor/pingpong/modules/src/Pingpong/Modules/Commands/stubs',
- 'files' => [
- 'start' => 'start.php',
- 'routes' => 'Http/routes.php',
- 'json' => 'module.json',
- 'views/index' => 'Resources/views/index.blade.php',
- 'views/master' => 'Resources/views/layouts/master.blade.php',
- 'scaffold/config' => 'Config/config.php',
- 'composer' => 'composer.json',
- ],
- 'replacements' => [
- 'start' => ['LOWER_NAME'],
- 'routes' => ['LOWER_NAME', 'STUDLY_NAME', 'MODULE_NAMESPACE'],
- 'json' => ['LOWER_NAME', 'STUDLY_NAME', 'MODULE_NAMESPACE'],
- 'views/index' => ['LOWER_NAME'],
- 'views/master' => ['STUDLY_NAME'],
- 'scaffold/config' => ['STUDLY_NAME'],
- 'composer' => [
- 'LOWER_NAME',
- 'STUDLY_NAME',
- 'VENDOR',
- 'AUTHOR_NAME',
- 'AUTHOR_EMAIL',
- 'MODULE_NAMESPACE',
- ],
- ],
- ],
- 'paths' => [
- /*
- |--------------------------------------------------------------------------
- | Modules path
- |--------------------------------------------------------------------------
- |
- | This path used for save the generated module. This path also will added
- | automatically to list of scanned folders.
- |
- */
-
- 'modules' => base_path('modules'),
- /*
- |--------------------------------------------------------------------------
- | Modules assets path
- |--------------------------------------------------------------------------
- |
- | Here you may update the modules assets path.
- |
- */
-
- 'assets' => public_path('modules'),
- /*
- |--------------------------------------------------------------------------
- | The migrations path
- |--------------------------------------------------------------------------
- |
- | Where you run 'module:publish-migration' command, where do you publish the
- | the migration files?
- |
- */
-
- 'migration' => base_path('database/migrations'),
- /*
- |--------------------------------------------------------------------------
- | Generator path
- |--------------------------------------------------------------------------
- |
- | Here you may update the modules generator path.
- |
- */
-
- 'generator' => [
- 'assets' => 'Assets',
- 'config' => 'Config',
- 'command' => 'Console',
- 'migration' => 'Database/Migrations',
- 'model' => 'Entities',
- 'repository' => 'Repositories',
- 'seeder' => 'Database/Seeders',
- 'controller' => 'Http/Controllers',
- 'filter' => 'Http/Middleware',
- 'request' => 'Http/Requests',
- 'provider' => 'Providers',
- 'lang' => 'Resources/lang',
- 'views' => 'Resources/views',
- 'test' => 'Tests',
- ],
- ],
- /*
- |--------------------------------------------------------------------------
- | Scan Path
- |--------------------------------------------------------------------------
- |
- | Here you define which folder will be scanned. By default will scan vendor
- | directory. This is useful if you host the package in packagist website.
- |
- */
-
- 'scan' => [
- 'enabled' => false,
- 'paths' => [
- base_path('vendor/*/*'),
- ],
- ],
- /*
- |--------------------------------------------------------------------------
- | Composer File Template
- |--------------------------------------------------------------------------
- |
- | Here is the config for composer.json file, generated by this package
- | in every module since version >= 1.2.0.
- |
- */
-
- 'composer' => [
- 'vendor' => 'pingpong-modules',
- 'author' => [
- 'name' => 'Pingpong Labs',
- 'email' => 'pingpong.labs@gmail.com',
- ],
- ],
- /*
- |--------------------------------------------------------------------------
- | Caching
- |--------------------------------------------------------------------------
- |
- | Here is the config for setting up caching feature.
- |
- */
- 'cache' => [
- 'enabled' => false,
- 'key' => 'pingpong-modules',
- 'lifetime' => 60,
- ],
-
+ 'paths' => [
+ 'modules' => base_path('modules'),
+ 'templates' => base_path('templates'),
+ 'assets' => public_path('modules'),
+ 'stubs' => base_path('app/CMS/Modules/Stubs'),
+ ]
];
diff --git a/config/recaptcha.php b/config/recaptcha.php
new file mode 100644
index 00000000..61957b81
--- /dev/null
+++ b/config/recaptcha.php
@@ -0,0 +1,66 @@
+ env('RECAPTCHA_PUBLIC_KEY', ''),
+ 'private_key' => env('RECAPTCHA_PRIVATE_KEY', ''),
+
+ /*
+ |--------------------------------------------------------------------------
+ | Template
+ |--------------------------------------------------------------------------
+ |
+ | Set a template to use if you don't want to use the standard one.
+ |
+ */
+ 'template' => '',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Driver
+ |--------------------------------------------------------------------------
+ |
+ | Determine how to call out to get response; values are 'curl' or 'native'.
+ | Only applies to v2.
+ |
+ */
+ 'driver' => 'curl',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Options
+ |--------------------------------------------------------------------------
+ |
+ | Various options for the driver
+ |
+ */
+ 'options' => [
+
+ 'curl_timeout' => 1,
+ 'curl_verify' => true,
+
+ ],
+
+ /*
+ |--------------------------------------------------------------------------
+ | Version
+ |--------------------------------------------------------------------------
+ |
+ | Set which version of ReCaptcha to use.
+ |
+ */
+
+ 'version' => 2,
+
+];
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index 96f72d25..4eb4ec98 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -28,10 +28,13 @@ $factory->define(User::class, function (Faker\Generator $faker) {
});
$factory->define(Content::class, function (Faker\Generator $faker) {
+
+ $slug = isset($faker->slug) ? $faker->slug : $faker->slug(5);
+
return [
'title' => $faker->sentence(5),
'userId' => 1,
- 'url' => $faker->slug(5),
+ 'url' => $slug,
'pageContent' => $faker->text(1500),
'metaDescription' => $faker->text,
'moduleHandler' => config('staticpages.handler'),
diff --git a/database/migrations/2016_10_11_135756_AddUniqueCodeToWidgets.php b/database/migrations/2016_10_11_135756_AddUniqueCodeToWidgets.php
index c8456ba9..2c24874d 100644
--- a/database/migrations/2016_10_11_135756_AddUniqueCodeToWidgets.php
+++ b/database/migrations/2016_10_11_135756_AddUniqueCodeToWidgets.php
@@ -1,5 +1,6 @@
dropUnique('widgets_language_container_id_unique');
- });
+ try {
+ Schema::table('widgets', function (Blueprint $table) {
+ $table->dropUnique('widgets_language_container_id_unique');
+ });
+ } catch (\Exception $e) {
+
+ }
// migrate data
- $widgets = \App\Models\Widget::all();
+ $widgets = Widget::all();
foreach ($widgets as $widget) {
$widget->settings = (object)json_decode($widget->settings);
$widget->settings->containerClass = $widget->container_class;
diff --git a/database/migrations/2016_10_25_071455_rename_column_in_contents.php b/database/migrations/2016_10_25_071455_rename_column_in_contents.php
index 45b03e33..1ffcfd51 100644
--- a/database/migrations/2016_10_25_071455_rename_column_in_contents.php
+++ b/database/migrations/2016_10_25_071455_rename_column_in_contents.php
@@ -27,7 +27,6 @@ class RenameColumnInContents extends Migration
'url',
'meta_keywords',
'meta_description',
- 'content',
'module_settings',
'status'
];
diff --git a/database/migrations/2017_08_01_181056_add_static_name_to_modules_table.php b/database/migrations/2017_08_01_181056_add_static_name_to_modules_table.php
new file mode 100644
index 00000000..4818ab62
--- /dev/null
+++ b/database/migrations/2017_08_01_181056_add_static_name_to_modules_table.php
@@ -0,0 +1,38 @@
+string('static_name')->after('description');
+ });
+
+ $modules = \App\Models\Module::all();
+ foreach ($modules as $module) {
+ $module->update(['static_name' => $module->static_name]);
+ }
+
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('modules', function (Blueprint $table) {
+ $table->dropColumn('static_name');
+ });
+ }
+}
diff --git a/database/migrations/2017_08_01_212743_add_new_action_log_type.php b/database/migrations/2017_08_01_212743_add_new_action_log_type.php
new file mode 100644
index 00000000..3e91923f
--- /dev/null
+++ b/database/migrations/2017_08_01_212743_add_new_action_log_type.php
@@ -0,0 +1,29 @@
+ 'newFile',
+ 'name' => 'admin/actionLog.nameNewFile',
+ 'value' => 'admin/actionLog.newFile'
+ ]);
+ }
+
+ /**
+ * Reverse the migrations.
+ * @return void
+ */
+ public function down()
+ {
+ \App\Models\ActionLog\ActionLogType::where('string_id', 'newFile')
+ ->delete();
+ }
+}
diff --git a/database/migrations/2017_08_10_202656_CreatePermissionsTable.php b/database/migrations/2017_08_10_202656_CreatePermissionsTable.php
new file mode 100644
index 00000000..134536f5
--- /dev/null
+++ b/database/migrations/2017_08_10_202656_CreatePermissionsTable.php
@@ -0,0 +1,65 @@
+increments('id');
+ $table->integer('parent_id')
+ ->nullable()
+ ->unsigned();
+ $table->string('string_id')
+ ->unique();
+ $table->string('name');
+ $table->string('group')
+ ->nullable(true);
+ });
+
+ Schema::table('permissions', function (Blueprint $table) {
+ $table->foreign('parent_id')
+ ->references('id')
+ ->on('permissions')
+ ->onDelete('set null')
+ ->onUpdate('cascade');
+ });
+
+ Schema::create('user_has_permissions', function (Blueprint $table) {
+ $table->integer('user_id');
+ $table->integer('permission_id')
+ ->unsigned();
+ });
+
+ Schema::table('user_has_permissions', function (Blueprint $table) {
+ $table->foreign('user_id')
+ ->references('id')
+ ->on('users')
+ ->onDelete('cascade')
+ ->onUpdate('cascade');
+
+ $table->foreign('permission_id')
+ ->references('id')
+ ->on('permissions')
+ ->onDelete('cascade')
+ ->onUpdate('cascade');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ * @return void
+ */
+ public function down()
+ {
+ Schema::drop('user_has_permissions');
+ Schema::drop('permissions');
+ }
+}
diff --git a/database/migrations/2017_08_10_214109_add_default_permissions.php b/database/migrations/2017_08_10_214109_add_default_permissions.php
new file mode 100644
index 00000000..6e4c8d04
--- /dev/null
+++ b/database/migrations/2017_08_10_214109_add_default_permissions.php
@@ -0,0 +1,66 @@
+boolean('default')
+ ->default(false);
+ });
+
+ Permission::getQuery()
+ ->delete();
+
+ $permissions = [
+ 'contents' => ['create', 'update', 'update-all', 'delete', 'set-homepage', 'publish', 'draft', 'protect', 'view-history'],
+ 'users' => ['create', 'update', 'delete', 'set-permissions', 'change-status', 'change-role'],
+ 'files' => ['upload', 'update', 'delete', 'move-to-directories'],
+ 'directories' => ['create', 'edit', 'delete'],
+ 'widgetareas' => ['create', 'edit', 'delete'],
+ 'widgets' => ['create', 'edit', 'delete', 'assign', 'unassign'],
+ 'templates' => ['copy', 'edit'],
+ 'actions' => [],
+ 'settings' => []
+ ];
+ foreach ($permissions as $entity => $abilities) {
+
+ $parent = Permission::create([
+ 'name' => 'admin/permissions.' . $entity . '.management',
+ 'string_id' => $entity . '-management',
+ 'group' => $entity,
+ 'default' => true,
+ ]);
+
+ foreach ($abilities as $ability) {
+ Permission::create([
+ 'name' => 'admin/permissions.' . $entity . '.' . $ability,
+ 'string_id' => $ability . '-' . $entity,
+ 'group' => $entity,
+ 'parent_id' => $parent->id,
+ 'default' => true,
+ ]);
+ }
+ }
+ }
+
+ /**
+ * Reverse the migrations.
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('permissions', function (Blueprint $table) {
+ $table->dropColumn('default');
+ });
+ }
+}
diff --git a/database/migrations/2017_08_24_011314_drop_custom_fields_tables.php b/database/migrations/2017_08_24_011314_drop_custom_fields_tables.php
new file mode 100644
index 00000000..57a1c773
--- /dev/null
+++ b/database/migrations/2017_08_24_011314_drop_custom_fields_tables.php
@@ -0,0 +1,30 @@
+integer('order')
+ ->after('viewed')
+ ->default(0);
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('contents', function (Blueprint $table) {
+ $table->dropColumn('order');
+ });
+ }
+}
diff --git a/gulpfile.js b/gulpfile.js
index 4832a5de..226ae6e4 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,6 +1,19 @@
var elixir = require ('laravel-elixir');
+require ('laravel-elixir-remove')
+
elixir (function (mix) {
+ var defaultColor = "green";
+ var colors = ["blue", "seagreen", 'orange', "green", 'purple', 'red'];
+ var outputName;
+ colors.forEach (function (color) {
+ outputName = color === defaultColor ? 'app.css' : 'app-' + color + ".css";
+ mix.copy ('resources/assets/sass/admin/_themes/' + color + '-theme.scss', 'public/css/admin/theme.scss')
+ .sass ([
+ 'admin/**/!(_imports|_variables|*-theme)*.scss',
+ '../admin/css'
+ ], 'public/css/admin/' + outputName, null, {includePaths: ['bower_components', 'resources/assets/sass/admin']})
+ })
// vendor files
mix
@@ -13,27 +26,14 @@ elixir (function (mix) {
'tinycolor/dist/tinycolor-min.js',
'chart.js/dist/Chart.bundle.min.js',
'jquery.are-you-sure/jquery.are-you-sure.js',
- '../resources/assets/admin/js/app.js',
- ], 'public/js/vendor.js', 'bower_components');
-
- var defaultColor = "green";
- var colors = ["blue", "seagreen", 'orange', "green", 'purple', 'red'];
- var outputName;
- colors.forEach (function (color) {
- outputName = color == defaultColor ? 'app.css' : 'app-' + color + ".css";
- mix.copy ('resources/assets/sass/admin/_themes/' + color + '-theme.scss', 'public/css/admin/theme.scss');
- mix.sass ([
- 'admin/**/!(_imports|_variables|*-theme)*.scss',
- '../admin/css/custom.css'
-
- ], 'public/css/admin/' + outputName, null, {includePaths: ['bower_components', 'resources/assets/sass/admin']});
- })
-
- mix.copy ('bower_components/font-awesome/css/font-awesome.min.css', 'public/css');
- mix.copy ('bower_components/font-awesome/fonts', 'public/fonts');
- mix.sass (['bootstrap/bootstrap.scss'], 'public/css/admin/bootstrap.css');
- mix.styles ([
- '../../../public/css/admin/bootstrap.css',
- '../../../bower_components/animate.css/animate.css',
- ], 'public/css/admin/style.css');
+ '../resources/assets/admin/js/*.js',
+ ], 'public/js/vendor.js', 'bower_components')
+ .copy ('bower_components/font-awesome/css/font-awesome.min.css', 'public/css')
+ .copy ('bower_components/font-awesome/fonts', 'public/fonts')
+ .sass (['bootstrap/bootstrap.scss'], 'public/css/admin/bootstrap.css')
+ .styles ([
+ '../../../public/css/admin/bootstrap.css',
+ '../../../bower_components/animate.css/animate.css',
+ ], 'public/css/admin/style.css')
+ .remove ('public/css/admin/theme.scss');
});
diff --git a/index.php b/index.php
index 48384dc5..3fc4bbdc 100644
--- a/index.php
+++ b/index.php
@@ -16,5 +16,4 @@ if ($uri !== '/' && file_exists(__DIR__ . '/public' . $uri)) {
return false;
}
-require_once __DIR__ . '/app/CMS/Helpers/functions.php';
require_once __DIR__ . '/public/index.php';
diff --git a/modules/Blog/Article/Config/config.php b/modules/Blog/Article/Config/config.php
deleted file mode 100644
index fb19fdc4..00000000
--- a/modules/Blog/Article/Config/config.php
+++ /dev/null
@@ -1,12 +0,0 @@
- 'Articles',
- 'translatedName' => 'article::module.name',
- 'translatedDescription' => 'article::module.description',
- 'alias' => 'article',
- 'handler' => \Modules\Blog\Article\Handlers\Article::class,
- 'providers' => [\Modules\Blog\Article\Providers\ArticleServiceProvider::class],
- 'files' => ['start.php'],
- 'order' => 0,
-];
\ No newline at end of file
diff --git a/modules/Blog/Article/Entities/Article.php b/modules/Blog/Article/Entities/Article.php
deleted file mode 100644
index 1222a7bb..00000000
--- a/modules/Blog/Article/Entities/Article.php
+++ /dev/null
@@ -1,15 +0,0 @@
-hasMany(Comment::class, 'content_id')
- ->where('approved', true);
- }
-}
\ No newline at end of file
diff --git a/modules/Blog/Article/Entities/Comment.php b/modules/Blog/Article/Entities/Comment.php
deleted file mode 100644
index 25a5e4f8..00000000
--- a/modules/Blog/Article/Entities/Comment.php
+++ /dev/null
@@ -1,27 +0,0 @@
-belongsTo(User::class, 'user_id');
- }
-
- public function article()
- {
- return $this->belongsTo(Content::class, 'content_id');
- }
-}
\ No newline at end of file
diff --git a/modules/Blog/Article/Events/ApprovedComment.php b/modules/Blog/Article/Events/ApprovedComment.php
deleted file mode 100644
index 3fab72bc..00000000
--- a/modules/Blog/Article/Events/ApprovedComment.php
+++ /dev/null
@@ -1,20 +0,0 @@
-comment = $comment;
- }
-}
\ No newline at end of file
diff --git a/modules/Blog/Article/Events/CreatedComment.php b/modules/Blog/Article/Events/CreatedComment.php
deleted file mode 100644
index d21f685b..00000000
--- a/modules/Blog/Article/Events/CreatedComment.php
+++ /dev/null
@@ -1,20 +0,0 @@
-comment = $comment;
- }
-}
\ No newline at end of file
diff --git a/modules/Blog/Article/Events/DeletedComment.php b/modules/Blog/Article/Events/DeletedComment.php
deleted file mode 100644
index 048341ab..00000000
--- a/modules/Blog/Article/Events/DeletedComment.php
+++ /dev/null
@@ -1,20 +0,0 @@
-comment = $comment;
- }
-}
\ No newline at end of file
diff --git a/modules/Blog/Article/Handlers/Article.php b/modules/Blog/Article/Handlers/Article.php
deleted file mode 100644
index 9a2b2615..00000000
--- a/modules/Blog/Article/Handlers/Article.php
+++ /dev/null
@@ -1,153 +0,0 @@
-whereTitle(trans('article::module.blog'));
- if (!$blogSubmenu) {
- $blogSubmenu = $menu->dropdown(trans('article::module.blog'), function ($sub) {
- }, 20, ['icon' => 'fa fa-fw fa-book']);
- }
-
- $blogSubmenu->dropdown(trans('article::module.name'), function ($sub) {
- $sub->route('content.new', trans('article::article.new'), ['id' => config('article.alias')], 10, ['icon' => 'fa fa-fw fa-pencil']);
- $sub->route('content.overview', trans('article::article.overview'), ['id' => config('article.alias')], 30, ['icon' => 'fa fa-fw fa-book']);
- }, 10, ['icon' => 'fa fa-fw fa-book']);
-
- $blogSubmenu->route('comments.overview', trans('article::module.commentsOverview'), [], 20, ['icon' => 'fa fa-fw fa-commenting-o']);
- }
-
- /**
- * Install module
- */
- public static function install()
- {
- $types = [
- [
- 'string_id' => 'commentCreated',
- 'name' => 'article::comments.events.names.commentCreated',
- 'value' => 'article::comments.events.descriptions.commentCreated',
- ],
- [
- 'string_id' => 'commentDeleted',
- 'name' => 'article::comments.events.names.commentDeleted',
- 'value' => 'article::comments.events.descriptions.commentDeleted',
- ],
- [
- 'string_id' => 'commentApproved',
- 'name' => 'article::comments.events.names.commentApproved',
- 'value' => 'article::comments.events.descriptions.commentApproved',
- ],
-
- ];
- foreach ($types as $type) {
- ActionLogType::create($type);
- }
- }
-
- /**
- * Uninstalls module
- *
- * @param Module $module
- *
- * @return mixed|void
- */
- public static function uninstall(Module $module)
- {
- ActionLogType::whereIn('string_id', ['commentCreated', 'commentDeleted', 'commentApproved'])
- ->delete();
- }
-
- /**
- * Get translated title for pages overview of given type.
- *
- * This value is used for rendering list of all content pages of given type in administration.
- *
- * @return string
- */
- public static function getOverviewTitle()
- {
- return trans('article::module.allArticles');
- }
-
- /**
- * Title displayed above for for creating new content page
- *
- * @return string
- */
- public static function getCreateNewTitle()
- {
- return trans('article::module.newArticle');
- }
-
- /**
- * Title for form displayed for editin content page
- *
- * @param Content $content
- *
- * @return mixed
- */
- public static function getEditTitle(Content $content)
- {
- return trans('article::module.editArticle');
- }
-
- /**
- * Method called right after content page is marked as deleted
- *
- * This method is supposed to clean after "deleted" page.
- *
- * @param Content $content
- *
- * @return mixed
- */
- public static function delete(Content $content)
- {
- }
-
- /**
- * Does this module support categories?
- *
- * @return boolean
- */
- public static function supportCategories()
- {
- return true;
- }
-}
\ No newline at end of file
diff --git a/modules/Blog/Article/Http/Controllers/Admin/CommentsOverview.php b/modules/Blog/Article/Http/Controllers/Admin/CommentsOverview.php
deleted file mode 100644
index 9293d2b1..00000000
--- a/modules/Blog/Article/Http/Controllers/Admin/CommentsOverview.php
+++ /dev/null
@@ -1,19 +0,0 @@
-with('author')
- ->orderBy('approved')
- ->orderBy('created_at', 'DESC')
- ->paginate(25);
-
- return view('article::admin/comments.overview', ['comments' => $comments]);
- }
-}
\ No newline at end of file
diff --git a/modules/Blog/Article/Http/Controllers/Admin/EditComment.php b/modules/Blog/Article/Http/Controllers/Admin/EditComment.php
deleted file mode 100644
index 969f845d..00000000
--- a/modules/Blog/Article/Http/Controllers/Admin/EditComment.php
+++ /dev/null
@@ -1,37 +0,0 @@
-approved = 1;
- $comment->save();
-
- Event::fire(new ApprovedComment($comment));
-
- return redirect()
- ->back()
- ->with('success', trans('article::comments.approved'));
- }
-
- public function delete($id)
- {
- $comment = Comment::findOrFail($id);
-
- Event::fire(new DeletedComment($comment));
-
- $comment->delete();
-
- return redirect()
- ->back()
- ->with('success', trans('article::comments.deleted'));
- }
-}
\ No newline at end of file
diff --git a/modules/Blog/Article/Http/Controllers/Visitor/CreateNewComment.php b/modules/Blog/Article/Http/Controllers/Visitor/CreateNewComment.php
deleted file mode 100644
index c274f653..00000000
--- a/modules/Blog/Article/Http/Controllers/Visitor/CreateNewComment.php
+++ /dev/null
@@ -1,48 +0,0 @@
-moduleSettings['allowComments']) || !$article->moduleSettings['allowComments']) {
- return redirect()
- ->route('page.content', ['url' => $article->url])
- ->with('error', trans('article::comments.disabledComments'));
- }
-
- $content = $request->message;
- $user = Auth::user();
- if ($user) {
- $name = is_null($user->name) ? $user->email : $user->name;
- $email = $user->email;
- } else {
- $name = $request->name;
- $email = $request->email;
- }
-
- $comment = Comment::create([
- 'user_id' => $user ? $user->id : null,
- 'content_id' => $article->id,
- 'name' => $name,
- 'email' => $email,
- 'content' => $content,
- 'approved' => !is_null($user)
- ]);
-
- // fire event about new comment
- Event::fire(new CreatedComment($comment));
-
- return redirect()
- ->route('page.content', ['url' => $article->url])
- ->with('success', trans('article::comments.saved'));
- }
-}
\ No newline at end of file
diff --git a/modules/Blog/Article/Http/Requests/CreateNewComment.php b/modules/Blog/Article/Http/Requests/CreateNewComment.php
deleted file mode 100644
index 18044f43..00000000
--- a/modules/Blog/Article/Http/Requests/CreateNewComment.php
+++ /dev/null
@@ -1,28 +0,0 @@
- 'required'];
-
- if (!$user) {
- $required['name'] = 'required';
- $required['email'] = 'required|email';
- }
-
- return $required;
- }
-}
diff --git a/modules/Blog/Article/Http/routes.php b/modules/Blog/Article/Http/routes.php
deleted file mode 100644
index 145c30ba..00000000
--- a/modules/Blog/Article/Http/routes.php
+++ /dev/null
@@ -1,28 +0,0 @@
- LaravelLocalization::setLocale(),
- 'namespace' => 'Modules\Blog\Article\Http\Controllers'
- ], function () {
- Route::group([
- 'middleware' => ['admin'],
- 'prefix' => 'admin/comments',
- 'namespace' => 'Admin'
- ], function () {
-
- Route::get('/', 'CommentsOverview@getOverview')
- ->name('comments.overview');
-
- Route::get('/delete/{id}', 'EditComment@delete')
- ->name('comments.delete');
-
- Route::get('/approve/{id}', 'EditComment@approve')
- ->name('comments.approve');
- });
-
- // public routes
- Route::group(['middleware' => ['web'], 'namespace' => 'Visitor'], function () {
-
- Route::post('comments/new/{article}', 'CreateNewComment@store')
- ->name('comments.new');
- });
-});
\ No newline at end of file
diff --git a/modules/Blog/Article/Listeners/LogCommentApproval.php b/modules/Blog/Article/Listeners/LogCommentApproval.php
deleted file mode 100644
index 2ff4f14b..00000000
--- a/modules/Blog/Article/Listeners/LogCommentApproval.php
+++ /dev/null
@@ -1,35 +0,0 @@
- $event->comment->name,
- 'email' => $event->comment->email,
- 'content' => $event->comment->content
- ];
-
- $this->saveLog($parameters);
- }
-
- /**
- * Getter for action name. Used only internally
- *
- * @return mixed
- */
- protected function getName()
- {
- return 'commentApproved';
- }
-}
\ No newline at end of file
diff --git a/modules/Blog/Article/Listeners/LogDeletedComment.php b/modules/Blog/Article/Listeners/LogDeletedComment.php
deleted file mode 100644
index 0a016e0c..00000000
--- a/modules/Blog/Article/Listeners/LogDeletedComment.php
+++ /dev/null
@@ -1,35 +0,0 @@
- $event->comment->name,
- 'email' => $event->comment->email,
- 'content' => $event->comment->content
- ];
-
- $this->saveLog($parameters);
- }
-
- /**
- * Getter for action name. Used only internally
- *
- * @return mixed
- */
- protected function getName()
- {
- return 'commentDeleted';
- }
-}
\ No newline at end of file
diff --git a/modules/Blog/Article/Listeners/LogNewComment.php b/modules/Blog/Article/Listeners/LogNewComment.php
deleted file mode 100644
index d2e6e313..00000000
--- a/modules/Blog/Article/Listeners/LogNewComment.php
+++ /dev/null
@@ -1,40 +0,0 @@
-comment->user_id) {
- return;
- }
-
- $parameters = [
- 'author' => $event->comment->name,
- 'email' => $event->comment->email,
- 'content' => $event->comment->content
- ];
-
- $this->saveLog($parameters);
- }
-
- /**
- * Getter for action name. Used only internally
- *
- * @return mixed
- */
- protected function getName()
- {
- return 'commentCreated';
- }
-}
\ No newline at end of file
diff --git a/modules/Blog/Article/Modificators/PerexCreator.php b/modules/Blog/Article/Modificators/PerexCreator.php
deleted file mode 100644
index ad76b0be..00000000
--- a/modules/Blog/Article/Modificators/PerexCreator.php
+++ /dev/null
@@ -1,60 +0,0 @@
-DOMDocument = new \DOMDocument('1.0', 'UTF-8');
- $this->maxLength = 300;
- $this->maxImages = 2;
- $this->perex = '';
- }
-
- private function addHtml($node)
- {
- $this->perex .= strip_tags($this->DOMDocument->saveHTML($node), '');
- }
-
- public function create($html)
- {
- if (empty($html)) {
- return null;
- }
-
- $html = mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8');
- $this->DOMDocument->loadHTML($html);
-
- $texts = $this->DOMDocument->getElementsByTagName('p');
- $images = $this->DOMDocument->getElementsByTagName('img');
- $iframes = $this->DOMDocument->getElementsByTagName('iframe');
-
- $textId = 0;
- $imgId = 0;
- if ($texts->length > 1) {
- $this->addHtml($texts[$textId++]);
- }
-
- if (mb_strlen($this->perex) < $this->maxLength) {
- if ($iframes->length > 0) {
- $this->perex .= $this->DOMDocument->saveHTML($iframes[0]);
- } elseif ($images->length > 0) {
- while ($imgId < $images->length && $imgId < $this->maxImages) {
- $this->perex .= $this->DOMDocument->saveHTML($images[$imgId++]);
- }
- } else {
- while (mb_strlen($this->perex) < $this->maxLength && $textId < $texts->length) {
- $this->addHtml($texts[$textId++]);
- }
- }
- }
-
- return $this->perex;
- }
-}
\ No newline at end of file
diff --git a/modules/Blog/Article/Pipeline/DisplayContent/LoadCommentsForBlogpost.php b/modules/Blog/Article/Pipeline/DisplayContent/LoadCommentsForBlogpost.php
deleted file mode 100644
index 575f9249..00000000
--- a/modules/Blog/Article/Pipeline/DisplayContent/LoadCommentsForBlogpost.php
+++ /dev/null
@@ -1,33 +0,0 @@
-moduleHandler != Article::class)
- return;
-
- $content->comments = new Collection();
- if (isset($content->moduleSettings['allowComments']) && $content->moduleSettings['allowComments']) {
- $content->comments = Comment::where('content_id', $content->id)
- ->with('author')
- ->where('approved', 1)
- ->orderBy('created_at')
- ->get();
- }
- }
-}
\ No newline at end of file
diff --git a/modules/Blog/Article/Pipeline/SaveContent/TurnCommentsOnOrOff.php b/modules/Blog/Article/Pipeline/SaveContent/TurnCommentsOnOrOff.php
deleted file mode 100644
index f52e4bc1..00000000
--- a/modules/Blog/Article/Pipeline/SaveContent/TurnCommentsOnOrOff.php
+++ /dev/null
@@ -1,29 +0,0 @@
-moduleHandler, '\\') !== Article::class) {
- return;
- }
-
- $settings = $content->moduleSettings;
- $settings['allowComments'] = isset($input['allowComments']) ? (int)$input['allowComments'] : 0;
- $content->moduleSettings = $settings;
- $content->save();
- }
-}
\ No newline at end of file
diff --git a/modules/Blog/Article/Providers/ArticleEventServiceProvider.php b/modules/Blog/Article/Providers/ArticleEventServiceProvider.php
deleted file mode 100644
index 1004bfd3..00000000
--- a/modules/Blog/Article/Providers/ArticleEventServiceProvider.php
+++ /dev/null
@@ -1,36 +0,0 @@
- [LogCommentApproval::class],
- DeletedComment::class => [LogDeletedComment::class],
- CreatedComment::class => [LogNewComment::class],
- ];
-
- public function boot(DispatcherContract $events)
- {
- parent::boot($events);
- }
-
- protected function setModulePath()
- {
- $this->path = __DIR__;
- }
-}
\ No newline at end of file
diff --git a/modules/Blog/Article/Providers/ArticleServiceProvider.php b/modules/Blog/Article/Providers/ArticleServiceProvider.php
deleted file mode 100644
index bae25fe8..00000000
--- a/modules/Blog/Article/Providers/ArticleServiceProvider.php
+++ /dev/null
@@ -1,35 +0,0 @@
-app->register(ArticleEventServiceProvider::class);
-
- // load comments for blogpost
- app('displayPipeline')->add(LoadCommentsForBlogpost::class);
-
- app('saveContentPipeline')->add(TurnCommentsOnOrOff::class);
- }
-
- protected function setModuleAlias()
- {
- $this->alias = 'article';
- }
-
- protected function setModulePath()
- {
- $this->path = __DIR__;
- }
-}
diff --git a/modules/Blog/Article/Resources/lang/cs/article.php b/modules/Blog/Article/Resources/lang/cs/article.php
deleted file mode 100644
index fd1c65c6..00000000
--- a/modules/Blog/Article/Resources/lang/cs/article.php
+++ /dev/null
@@ -1,6 +0,0 @@
- "Povolit komentáře?",
-"new" => "Napsat",
-"overview" => "Všechny články",
-];
diff --git a/modules/Blog/Article/Resources/lang/cs/comments.php b/modules/Blog/Article/Resources/lang/cs/comments.php
deleted file mode 100644
index fa9aca67..00000000
--- a/modules/Blog/Article/Resources/lang/cs/comments.php
+++ /dev/null
@@ -1,22 +0,0 @@
- "Schválit komentář a zobrazovat ho u článku",
- "approved" => "Komentář úspěšně schválen",
- "commentedArticle" => "Komentovaný článek",
- "createdAt" => "Vloženo :date",
- "deleted" => "Komentář smazán",
- "events" => [
- "descriptions" => [
- "commentApproved" => "Schválen komentář od autora :authro (:email) s následujícím obsahem: :content",
- "commentCreated" => "Přidán komentář od autora :author (e-mail :e-mail) s následujícím obsahem: :content",
- "commentDeleted" => "Smazán komentář od autora :author (:email) s následujícím obsahem: :content",
- ],
- "names" => [
- "commentApproved" => "Komentář schválen",
- "commentCreated" => "Komentář úspěšně přidán.",
- "commentDeleted" => "Smazán komentář",
- ],
- ],
- "noComments" => "Nejsou dostupné žádné komentáře",
- "unknownArticle" => "Neznámý článek",
-];
diff --git a/modules/Blog/Article/Resources/lang/cs/module.php b/modules/Blog/Article/Resources/lang/cs/module.php
deleted file mode 100644
index 22653cac..00000000
--- a/modules/Blog/Article/Resources/lang/cs/module.php
+++ /dev/null
@@ -1,12 +0,0 @@
- "Všechny články",
- "blog" => "Blog",
- "comments" => "Komentáře",
- "commentsOverview" => "Všechny komentáře",
- "description" => "Základní submodul pro blog. Tento modul umožňuje psát články.",
- "editArticle" => "Upravuji článek",
- "name" => "Články",
- "newArticle" => "Napsat nový článek",
- "templatePath" => "Články",
-];
diff --git a/modules/Blog/Article/Resources/lang/en/article.php b/modules/Blog/Article/Resources/lang/en/article.php
deleted file mode 100644
index 2d1e8b44..00000000
--- a/modules/Blog/Article/Resources/lang/en/article.php
+++ /dev/null
@@ -1,6 +0,0 @@
- 'Allow comments?',
- 'new' => 'Write new',
- 'overview' => 'All articles'
-];
\ No newline at end of file
diff --git a/modules/Blog/Article/Resources/lang/en/comments.php b/modules/Blog/Article/Resources/lang/en/comments.php
deleted file mode 100644
index de5e7301..00000000
--- a/modules/Blog/Article/Resources/lang/en/comments.php
+++ /dev/null
@@ -1,22 +0,0 @@
- 'Created at :date',
- 'commentedArticle' => 'Article',
- 'approve' => 'Approve comment',
- 'approved' => 'Comment successfully approved',
- 'deleted' => 'Comment deleted',
- 'unknownArticle' => 'Unknown article',
- 'noComments' => 'No comments available',
- 'events' => [
- 'names' => [
- 'commentCreated' => 'Added comment',
- 'commentApproved' => 'Approved comment',
- 'commentDeleted' => 'Deleted comment',
- ],
- 'descriptions' => [
- 'commentCreated' => 'Added comment from author :author with e-mail :email and following content: :content',
- 'commentApproved' => 'Approved comment from author :author with e-mail :email and following content: :content',
- 'commentDeleted' => 'Deleted comment from author :author with e-mail :email and following content: :content',
- ],
- ]
-];
\ No newline at end of file
diff --git a/modules/Blog/Article/Resources/lang/en/module.php b/modules/Blog/Article/Resources/lang/en/module.php
deleted file mode 100644
index 1e272945..00000000
--- a/modules/Blog/Article/Resources/lang/en/module.php
+++ /dev/null
@@ -1,12 +0,0 @@
- 'Articles',
- 'description' => 'Base submodule for blog',
- 'comments' => 'Comments',
- 'commentsOverview' => 'All comments',
- 'blog' => 'Blog',
- 'allArticles' => 'All articles',
- 'newArticle' => 'Write new article',
- 'editArticle' => 'Editing article',
- 'templatePath' => 'Articles',
-];
\ No newline at end of file
diff --git a/modules/Blog/Article/Resources/lang/sk/article.php b/modules/Blog/Article/Resources/lang/sk/article.php
deleted file mode 100644
index 2a3ce3a6..00000000
--- a/modules/Blog/Article/Resources/lang/sk/article.php
+++ /dev/null
@@ -1,6 +0,0 @@
- "Povoliť komentáre?",
- "new" => " Napísať nový",
- "overview" => "Všetky články",
-];
diff --git a/modules/Blog/Article/Resources/lang/sk/comments.php b/modules/Blog/Article/Resources/lang/sk/comments.php
deleted file mode 100644
index 5bde58a3..00000000
--- a/modules/Blog/Article/Resources/lang/sk/comments.php
+++ /dev/null
@@ -1,8 +0,0 @@
- "Schváliť komentár",
- "approved" => "Komentár úspešne schválený.",
- "commentedArticle" => "Článok",
- "createdAt" => "Vytvorené: :date",
- "deleted" => "Komentár zmazaný.",
-];
diff --git a/modules/Blog/Article/Resources/lang/sk/module.php b/modules/Blog/Article/Resources/lang/sk/module.php
deleted file mode 100644
index 04b574c0..00000000
--- a/modules/Blog/Article/Resources/lang/sk/module.php
+++ /dev/null
@@ -1,9 +0,0 @@
- "Všetky články",
- "blog" => "Blog",
- "comments" => "Komentáre",
- "commentsOverview" => "Všetky komentáre",
- "description" => "Základný submodul pre blog",
- "name" => "Články",
-];
diff --git a/modules/Blog/Article/Resources/views/admin/comments/overview.blade.php b/modules/Blog/Article/Resources/views/admin/comments/overview.blade.php
deleted file mode 100644
index adccff8f..00000000
--- a/modules/Blog/Article/Resources/views/admin/comments/overview.blade.php
+++ /dev/null
@@ -1,56 +0,0 @@
-@extends('admin.layoutWithNavigation')
-
-@section('pageHeading', trans('article::module.comments'))
-
-@section('content')
- @if (count($comments))
- @foreach($comments as $comment)
-
-
- @endforeach
- @else
-
- @lang('article::comments.noComments')
-
- @endif
-@endsection
\ No newline at end of file
diff --git a/modules/Blog/Article/Resources/views/admin/content/basicInfo.blade.php b/modules/Blog/Article/Resources/views/admin/content/basicInfo.blade.php
deleted file mode 100644
index dd808110..00000000
--- a/modules/Blog/Article/Resources/views/admin/content/basicInfo.blade.php
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
- @foreach($contentStatuses as $status => $translation)
- status) == $status) selected @endif>
- {{$translation}}
-
- @endforeach
-
-
- @include('admin.snippets.hasError', ['field' => 'status'])
-
-
-
- @lang('admin/contents.noParentPage')
-
- @foreach($rootPages as $rootPage)
- parentId) == $rootPage->id) selected @endif>
- {{$rootPage->title}}
-
- @endforeach
-
-
- @include('admin.snippets.hasError', ['field' => 'parentPage'])
-
-
-
-
- @lang('article::article.allowComments')
-
-
-
- @if($module->support_categories && count($categories))
-
-
- @lang('admin/contents.noCategory')
- @foreach($categories as $category)
- id == old('categoryId', $page->categoryId)) selected @endif>
- {{str_repeat(' - ', $category->real_depth)}} {{$category->name}}
-
- @endforeach
-
-
- @endif
-
-
-
- @lang('categories::categories.name')
- @lang('categories::categories.module')
- @lang('categories::categories.actions')
-
-
-
- @foreach($categories as $category)
- @include('categories::admin.snippets.overviewRow', ['level' => 0, 'currentCategory' => $category])
- @endforeach
-
-
- @else
-
- @lang('categories::categories.noCategories')
-
- @endif
-@stop
\ No newline at end of file
diff --git a/modules/Categories/Resources/views/admin/snippets/optionParentCategories.blade.php b/modules/Categories/Resources/views/admin/snippets/optionParentCategories.blade.php
deleted file mode 100644
index aee0f619..00000000
--- a/modules/Categories/Resources/views/admin/snippets/optionParentCategories.blade.php
+++ /dev/null
@@ -1,9 +0,0 @@
-parent_id) selected @endif value="{{$currentCategory['id']}}">
- {{str_repeat('-', $level)}} {{$currentCategory['name']}}
-
-
-@if(isset($currentCategory['children']))
- @foreach($currentCategory['children'] as $category)
- @include('categories::admin.snippets.optionParentCategories', ['selectedCategory' => $selectedCategory, 'currentCategory' => $category, 'level' => $level+1])
- @endforeach
-@endif
\ No newline at end of file
diff --git a/modules/Categories/Resources/views/admin/snippets/overviewRow.blade.php b/modules/Categories/Resources/views/admin/snippets/overviewRow.blade.php
deleted file mode 100644
index 13c15e65..00000000
--- a/modules/Categories/Resources/views/admin/snippets/overviewRow.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- {{str_repeat('-', $level)}} {{$currentCategory['name']}}
-
- @lang($modules[$currentCategory['module_id']])
-
-
-
-
-
-@if(isset($currentCategory['children']))
- @foreach($currentCategory['children'] as $category)
- @include('categories::admin.snippets.overviewRow', ['currentCategory' => $category, 'level' => $level+1])
- @endforeach
-@endif
\ No newline at end of file
diff --git a/modules/Categories/composer.json b/modules/Categories/composer.json
deleted file mode 100644
index 660f3a21..00000000
--- a/modules/Categories/composer.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "name": "pingpong-modules/categories",
- "description": "",
- "authors": [
- {
- "name": "Pingpong Labs",
- "email": "pingpong.labs@gmail.com"
- }
- ],
- "autoload": {
- "psr-4": {
- "Modules\\Categories\\": ""
- }
- }
-}
\ No newline at end of file
diff --git a/modules/Categories/start.php b/modules/Categories/start.php
deleted file mode 100644
index 7d8ae759..00000000
--- a/modules/Categories/start.php
+++ /dev/null
@@ -1,15 +0,0 @@
- 'ContactForm',
- 'translatedName' => 'contactform::module.name',
- 'translatedDescription' => 'contactform::module.description',
- 'alias' => 'contactform',
- 'handler' => '\\Modules\\ContactForm\\Handlers\\ContactForm',
- 'providers' => [\Modules\ContactForm\Providers\ContactFormServiceProvider::class],
- 'files' => ['start.php'],
- 'order' => 0,
-];
\ No newline at end of file
diff --git a/modules/ContactForm/Handlers/ContactForm.php b/modules/ContactForm/Handlers/ContactForm.php
deleted file mode 100644
index 6763d513..00000000
--- a/modules/ContactForm/Handlers/ContactForm.php
+++ /dev/null
@@ -1,152 +0,0 @@
-. View is returned only as name in plain text
- *
- * @return array of views/templates/html codes divided into section
- */
- public static function getExtendedFormInputsCreate()
- {
- return [
- 'basicInfo' => 'contactform::admin.form.basicInfo',
- 'content' => 'contactform::admin.form.content',
- 'meta' => 'admin.content.formParts.metaInformation',
- 'appearance' => 'admin.content.formParts.appearance',
- 'publication' => 'admin.content.formParts.publicationSetup',
- 'files' => 'admin.content.formParts.files',
- ];
- }
-
- public static function getExtendedFormInputsEdit()
- {
- return self::getExtendedFormInputsCreate();
- }
-
- /**
- * Register admin menu (or multiple ones)
- *
- * This cannot be in ServiceProvider because Session is started at middleware. And ServiceProvider is called before
- * starting any middleware..
- *
- * @param User $user model of logged user
- */
- public static function registerAdminMenu(User $user)
- {
- // register links in admin menu
- $menu = \Menu::instance('mainMenu');
-
- $submenu = $menu->whereTitle(trans('admin/mainMenu.contentPages'));
- $submenu->dropdown(trans('contactform::admin/adminMenu.contactForm'), function ($submenu) use ($user) {
- $submenu->route('content.new', trans('contactform::admin/adminMenu.new'), ['moduleId' => self::getModuleId()], 10, ['icon' => 'fa fa-plus']);
- $submenu->route('content.overview', trans('contactform::admin/adminMenu.overview'), ['moduleId' => self::getModuleId()], 20, ['icon' => 'fa fa-list']);
- // $submenu->route('emails.sent', trans('contactform::admin/adminMenu.sentMessages'), [], 30, ['icon' => 'fa fa-send']);
- }, 25, ['icon' => 'fa fa-envelope-o']);
- }
-
- /**
- * Does given module manage content? Or is it just module with widgets/something internal/something absolutely else?
- *
- * @return bool
- */
- public static function managesContent()
- {
- return true;
- }
-
- /**
- * Get translated title for pages overview of given type.
- *
- * This value is used for rendering list of all content pages of given type in administration.
- *
- * @return string
- */
- public static function getOverviewTitle()
- {
- return trans('contactform::module.allForms');
- }
-
- /**
- * Title displayed above for for creating new content page
- *
- * @return string
- */
- public static function getCreateNewTitle()
- {
- return trans('contactform::module.newForm');
- }
-
- /**
- * Title for form displayed for editin content page
- *
- * @param Content $content
- *
- * @return mixed
- */
- public static function getEditTitle(Content $content)
- {
- return trans('contactform::module.editForm');
- }
-
- /**
- * Does this module support categories?
- *
- * @return boolean
- */
- public static function supportCategories()
- {
- return true;
- }
-
- /**
- * Method called right after content page is marked as deleted
- *
- * This method is supposed to clean after "deleted" page.
- *
- * @param Content $content
- *
- * @return mixed
- */
- public static function delete(Content $content)
- {
- }
-}
\ No newline at end of file
diff --git a/modules/ContactForm/Handlers/ContactFormHistory.php b/modules/ContactForm/Handlers/ContactFormHistory.php
deleted file mode 100644
index 3a1def56..00000000
--- a/modules/ContactForm/Handlers/ContactFormHistory.php
+++ /dev/null
@@ -1,28 +0,0 @@
-findOrFail($formId);
-
- // select template
- $template = isset($form->moduleSettings['emailTemplate']) ? $form->moduleSettings['emailTemplate'] : 'contactform::emails.default';
-
- // send email
- $status = Mail::send(Template::name($template), ['data' => $request], function (Message $message) use ($request, $form) {
- $message->from($request->email, $request->name);
-
- // get message subject
- $subject = isset($form->moduleSettings['subject']) ? $form->moduleSettings['subject'] : trans('contactform::admin/contents.defaultSubject');
-
- $message->to($form->moduleSettings['email'])
- ->subject($subject);
- });
-
- // inform user about success or failure
- return $this->sendResponse($status, $request, $form);
- }
-
- private function sendResponse($status, SendNewEmailRequest $request, $form)
- {
- // send response for ajax
- if ($request->ajax()) {
- return response()->json([
- 'status' => $status ? 'success' : 'failed',
- 'redirectUrl' => $form->url
- ]);
- } else {
- // redirect user to previous form
- $response = redirect()->back();
-
- return $status ? $response->with('success', 'sent') : $response->with('error', 'cannotSend');
- }
- }
-}
diff --git a/modules/ContactForm/Http/Requests/SendNewEmailRequest.php b/modules/ContactForm/Http/Requests/SendNewEmailRequest.php
deleted file mode 100644
index e1a84208..00000000
--- a/modules/ContactForm/Http/Requests/SendNewEmailRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
- 'required',
- 'email' => 'required|email',
- 'message' => 'required',
- ];
- }
-}
diff --git a/modules/ContactForm/Http/routes.php b/modules/ContactForm/Http/routes.php
deleted file mode 100644
index 2ff17cff..00000000
--- a/modules/ContactForm/Http/routes.php
+++ /dev/null
@@ -1,12 +0,0 @@
- ['web'],
- 'namespace' => '\Modules\ContactForm\Http\Controllers\Visitor',
- 'prefix' => LaravelLocalization::setLocale() . '/contactform'
- ], function () {
-
- // method for sending new message
-
- Route::post('/message/{formId}', 'CreateNewMessage@postMessage')
- ->name('email.send');
-});
\ No newline at end of file
diff --git a/modules/ContactForm/Pipeline/SavePipeline/SaveContactInformation.php b/modules/ContactForm/Pipeline/SavePipeline/SaveContactInformation.php
deleted file mode 100644
index a4f74412..00000000
--- a/modules/ContactForm/Pipeline/SavePipeline/SaveContactInformation.php
+++ /dev/null
@@ -1,39 +0,0 @@
-
- */
- function handle(Content & $page, array & $input)
- {
- if (trim($page->moduleHandler, '\\') != ContactForm::class) {
- return;
- }
-
- $settings = [
- 'phone' => $input['phone'],
- 'email' => $input['email'],
- 'contactEmail' => $input['contactEmail'],
- 'subject' => $input['subject'],
- 'companyName' => $input['companyName'],
- 'address' => $input['address'],
- 'gpsLat' => $input['gpsLat'],
- 'gpsLng' => $input['gpsLng'],
- ];
-
- // save settings
- $page->moduleSettings = $settings;
- $page->save();
- }
-}
\ No newline at end of file
diff --git a/modules/ContactForm/Providers/ContactFormServiceProvider.php b/modules/ContactForm/Providers/ContactFormServiceProvider.php
deleted file mode 100644
index a04f0762..00000000
--- a/modules/ContactForm/Providers/ContactFormServiceProvider.php
+++ /dev/null
@@ -1,52 +0,0 @@
-registerWidgets();
-
- app('saveContentPipeline')->add(SaveContactInformation::class);
- }
-
- /**
- * Register the service provider.
- *
- * @return void
- */
- public function register()
- {
- $registrator = $this->app->make('registerSettingsExtension');
- $registrator->register('contactForm', 'contactform::module.name', 'contactform::admin.settings.form');
- }
-
- private function registerWidgets()
- {
- $registrator = $this->app->make('registerWidget');
-
- $registrator->register(Address::class, null, ContactForm::getModuleId());
- $registrator->register(Form::class, null, ContactForm::getModuleId());
- }
-
- protected function setModuleAlias()
- {
- $this->alias = 'contactform';
- }
-
- protected function setModulePath()
- {
- $this->path = __DIR__;
- }
-}
diff --git a/modules/ContactForm/Resources/lang/cs/admin/adminMenu.php b/modules/ContactForm/Resources/lang/cs/admin/adminMenu.php
deleted file mode 100644
index 72e7b038..00000000
--- a/modules/ContactForm/Resources/lang/cs/admin/adminMenu.php
+++ /dev/null
@@ -1,9 +0,0 @@
- "Kontaktní formulář",
-"emails" => "E-mailové šablony",
-"new" => "Nový",
-"overview" => "Všechny formuláře",
-"sentMessages" => "Zprávy",
-"templatePath" => "Kontaktní formulář",
-];
diff --git a/modules/ContactForm/Resources/lang/cs/admin/content.php b/modules/ContactForm/Resources/lang/cs/admin/content.php
deleted file mode 100644
index 85db12f7..00000000
--- a/modules/ContactForm/Resources/lang/cs/admin/content.php
+++ /dev/null
@@ -1,15 +0,0 @@
- "Adresa",
-"compName" => "Jméno zobrazené nad adresou",
-"contactEmail" => "E-mail, kam budou doručovány zprávy z tohoto formuláře",
-"contactInformation" => "Kontaktní informace",
-"content" => "Obsah kontaktního formuláře",
-"defaultSubject" => "Nová zpráva z kontaktního formuláře",
-"email" => "E-mail",
-"emailList" => "Odesílat zprávy na tyto adresy",
-"gpsLat" => "GPS šířka",
-"gpsLng" => "GPS délka",
-"phone" => "Kontaktní telefon",
-"subject" => "Předmět zprávy",
-];
diff --git a/modules/ContactForm/Resources/lang/cs/admin/history.php b/modules/ContactForm/Resources/lang/cs/admin/history.php
deleted file mode 100644
index 2c6525b8..00000000
--- a/modules/ContactForm/Resources/lang/cs/admin/history.php
+++ /dev/null
@@ -1,11 +0,0 @@
- "Adresa",
-"columnCompanyName" => "Jméno společnosti",
-"columnContactEmail" => "Kontaktní e-mail",
-"columnEmail" => "E-mail",
-"columnGpsLat" => "GPS šířka",
-"columnGpsLng" => "GPS délka",
-"columnPhone" => "Telefon",
-"columnSubject" => "Předmět",
-];
diff --git a/modules/ContactForm/Resources/lang/cs/admin/settings.php b/modules/ContactForm/Resources/lang/cs/admin/settings.php
deleted file mode 100644
index aee9fa69..00000000
--- a/modules/ContactForm/Resources/lang/cs/admin/settings.php
+++ /dev/null
@@ -1,5 +0,0 @@
- "Application secret kez pro reCaptcha",
-"recaptchaSiteKey" => "Site key pro reCaptcha",
-];
diff --git a/modules/ContactForm/Resources/lang/cs/admin/widgets.php b/modules/ContactForm/Resources/lang/cs/admin/widgets.php
deleted file mode 100644
index 9c2f1d09..00000000
--- a/modules/ContactForm/Resources/lang/cs/admin/widgets.php
+++ /dev/null
@@ -1,16 +0,0 @@
- [
- "description" => "Malý widget určený pro zobrazení adresy, která byla uložena u vybraného kontaktního formuláře.",
- "edit" => "Upravuji blok s adresou",
- "name" => "Blok s adresou",
- "new" => "Nový blok s adresou",
- ],
- "form" => [
- "description" => "Widget pro zobrazení kontaktního formuláře kdekoliv na webu - v obsahu stránky, menu, patičce, ...",
- "name" => "Kontaktní formulář",
- "new" => "Nový widget s kontaktním formulářem",
- ],
- "noContactForms" => "Vypadá to, že v systému nebyl vytvořen žádný kontaktní formulář. Z toho důvodu není možné vytvořit ani tento widget. Vytvořte nejprve nějaký kontaktní formulář a pak opakujte tento pokus.",
- "selectContactForm" => "Vybrat kontaktní formulář",
-];
diff --git a/modules/ContactForm/Resources/lang/cs/module.php b/modules/ContactForm/Resources/lang/cs/module.php
deleted file mode 100644
index c76b9420..00000000
--- a/modules/ContactForm/Resources/lang/cs/module.php
+++ /dev/null
@@ -1,8 +0,0 @@
- "Všechny formuláře",
-"description" => "Jednoduchý kontaktní formulář",
-"editForm" => "Upravuji formulář",
-"name" => "Kontaktní formulář",
-"newForm" => "Vytvořit nový kontaktní formulář",
-];
diff --git a/modules/ContactForm/Resources/lang/en/admin/adminMenu.php b/modules/ContactForm/Resources/lang/en/admin/adminMenu.php
deleted file mode 100644
index 3e869c0f..00000000
--- a/modules/ContactForm/Resources/lang/en/admin/adminMenu.php
+++ /dev/null
@@ -1,9 +0,0 @@
- 'Contact form',
- 'new' => 'New',
- 'overview' => 'All contact forms',
- 'sentMessages' => 'Messages',
- 'templatePath' => 'Contact form',
- 'emails' => 'E-mail templates',
-];
\ No newline at end of file
diff --git a/modules/ContactForm/Resources/lang/en/admin/content.php b/modules/ContactForm/Resources/lang/en/admin/content.php
deleted file mode 100644
index 134b9b30..00000000
--- a/modules/ContactForm/Resources/lang/en/admin/content.php
+++ /dev/null
@@ -1,15 +0,0 @@
- 'Contact form content',
- 'address' => 'Address',
- 'emailList' => 'Send emails to these addresses',
- 'gpsLat' => 'GPS latitude',
- 'gpsLng' => 'GPS longitude',
- 'compName' => 'Name displayed above address',
- 'phone' => 'Contact phone',
- 'email' => 'E-mail',
- 'contactEmail' => 'E-mail, where messages from this form will be delivered',
- 'contactInformation' => 'Contact information',
- 'subject' => 'Subject',
- 'defaultSubject' => 'New message from contact form'
-];
\ No newline at end of file
diff --git a/modules/ContactForm/Resources/lang/en/admin/history.php b/modules/ContactForm/Resources/lang/en/admin/history.php
deleted file mode 100644
index dab90865..00000000
--- a/modules/ContactForm/Resources/lang/en/admin/history.php
+++ /dev/null
@@ -1,12 +0,0 @@
- 'Phone',
- 'columnAddress' => 'Address',
- 'columnEmail' => 'E-mail',
- 'columnContactEmail' => 'Contact E-mail',
- 'columnSubject' => 'Subject',
- 'columnCompanyName' => 'Company name',
- 'columnGpsLat' => 'GPS Latitude',
- 'columnGpsLng' => 'Gps Longitude',
-];
-
diff --git a/modules/ContactForm/Resources/lang/en/admin/settings.php b/modules/ContactForm/Resources/lang/en/admin/settings.php
deleted file mode 100644
index 7bd1d2f4..00000000
--- a/modules/ContactForm/Resources/lang/en/admin/settings.php
+++ /dev/null
@@ -1,5 +0,0 @@
- 'reCAPTCHA site key',
- 'recaptchaSecret' => 'reCAPTCHA application secret key',
-];
\ No newline at end of file
diff --git a/modules/ContactForm/Resources/lang/en/admin/widgets.php b/modules/ContactForm/Resources/lang/en/admin/widgets.php
deleted file mode 100644
index 3d387a0d..00000000
--- a/modules/ContactForm/Resources/lang/en/admin/widgets.php
+++ /dev/null
@@ -1,16 +0,0 @@
- [
- 'name' => 'Address block',
- 'description' => 'Small widget for displaying address saved in selected contact form.',
- 'new' => 'New address block',
- 'edit' => 'Editing address block'
- ],
- 'form' => [
- 'name' => 'Contact form',
- 'description' => 'Display small contact form anywhere on website.',
- 'new' => 'New contact form widget'
- ],
- 'noContactForms' => 'You have not created any contact form. Try to create one before creating this widget.',
- 'selectContactForm' => 'Select contact form'
-];
\ No newline at end of file
diff --git a/modules/ContactForm/Resources/lang/en/module.php b/modules/ContactForm/Resources/lang/en/module.php
deleted file mode 100644
index 3e9d374e..00000000
--- a/modules/ContactForm/Resources/lang/en/module.php
+++ /dev/null
@@ -1,8 +0,0 @@
- 'Contact form',
- 'description' => 'Simple contact form',
- 'allForms' => 'All contact forms',
- 'newForm' => 'Create new contact form',
- 'editForm' => 'Editing contact form'
-];
\ No newline at end of file
diff --git a/modules/ContactForm/Resources/lang/sk/admin/adminMenu.php b/modules/ContactForm/Resources/lang/sk/admin/adminMenu.php
deleted file mode 100644
index d4dcea93..00000000
--- a/modules/ContactForm/Resources/lang/sk/admin/adminMenu.php
+++ /dev/null
@@ -1,8 +0,0 @@
- "Kontaktný formulár",
- "new" => "Nový",
- "overview" => "Všetky formuláre",
- "sentMessages" => "Správy",
- "templatePath" => "Kontaktný formulár",
-];
\ No newline at end of file
diff --git a/modules/ContactForm/Resources/lang/sk/admin/content.php b/modules/ContactForm/Resources/lang/sk/admin/content.php
deleted file mode 100644
index c283c250..00000000
--- a/modules/ContactForm/Resources/lang/sk/admin/content.php
+++ /dev/null
@@ -1,15 +0,0 @@
- "Adresa",
- "compName" => "Názov zobrazený nad adresou",
- "contactEmail" => "E-mail, kam budú doručované správy z tohoto formulára",
- "contactInformation" => "Kontaktné informácie",
- "content" => "Obsah kontaktného formulára",
- "defaultSubject" => "Nová správa z kontaktného formulára",
- "email" => "E-mail",
- "emailList" => "Odosielať správy na tieto adresy",
- "gpsLat" => "GPS šírka",
- "gpsLng" => "GPS dĺžka",
- "phone" => "Kontaktný telefón",
- "subject" => "Predmet správy",
-];
diff --git a/modules/ContactForm/Resources/lang/sk/admin/history.php b/modules/ContactForm/Resources/lang/sk/admin/history.php
deleted file mode 100644
index c0664dfd..00000000
--- a/modules/ContactForm/Resources/lang/sk/admin/history.php
+++ /dev/null
@@ -1,11 +0,0 @@
- "Adresa",
- "columnCompanyName" => "Názov spoločnosti",
- "columnContactEmail" => "Kontaktný e-mail",
- "columnEmail" => "E-mail",
- "columnGpsLat" => "GPS šírka",
- "columnGpsLng" => "GPS dĺžka",
- "columnPhone" => "Telefón",
- "columnSubject" => "Predmet",
-];
diff --git a/modules/ContactForm/Resources/lang/sk/admin/settings.php b/modules/ContactForm/Resources/lang/sk/admin/settings.php
deleted file mode 100644
index fa9eddd4..00000000
--- a/modules/ContactForm/Resources/lang/sk/admin/settings.php
+++ /dev/null
@@ -1,5 +0,0 @@
- "Application secret key pre reCaptcha",
- "recaptchaSiteKey" => "Site key pre reCaptcha",
-];
diff --git a/modules/ContactForm/Resources/lang/sk/module.php b/modules/ContactForm/Resources/lang/sk/module.php
deleted file mode 100644
index ad642712..00000000
--- a/modules/ContactForm/Resources/lang/sk/module.php
+++ /dev/null
@@ -1,5 +0,0 @@
- "Jednoduchý kontaktný formulár",
- "name" => "Kontaktný formulár",
-];
diff --git a/modules/ContactForm/Resources/views/admin/form/basicInfo.blade.php b/modules/ContactForm/Resources/views/admin/form/basicInfo.blade.php
deleted file mode 100644
index 184df299..00000000
--- a/modules/ContactForm/Resources/views/admin/form/basicInfo.blade.php
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-
-
-
-
-
-
-
- @lang('admin/contents.lockUrl')
-
-
-
-
-
-
- @foreach($contentStatuses as $status => $translation)
- status) == $status) selected @endif>
- {{$translation}}
-
- @endforeach
-
-
- @include('admin.snippets.hasError', ['field' => 'status'])
-
-
-
- @lang('admin/contents.noParentPage')
-
- @foreach($rootPages as $rootPage)
- parent_id) == $rootPage->id) selected @endif>
- {{$rootPage->title}}
-
- @endforeach
-
-
- @include('admin.snippets.hasError', ['field' => 'parentPage'])
-
-
- @if($module->support_categories && count($categories))
-
-
- @lang('admin/contents.noCategory')
- @foreach($categories as $category)
- id == old('categoryId', $page->categoryId)) selected @endif>
- {{str_repeat(' - ', $category->real_depth)}} {{$category->name}}
-
- @endforeach
-
-
- @endif
-
@lang('contactform::admin/content.contactInformation')
-
-
diff --git a/modules/ContactForm/Resources/views/admin/form/content.blade.php b/modules/ContactForm/Resources/views/admin/form/content.blade.php
deleted file mode 100644
index 5d680a14..00000000
--- a/modules/ContactForm/Resources/views/admin/form/content.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/modules/ContactForm/Resources/views/admin/settings/form.blade.php b/modules/ContactForm/Resources/views/admin/settings/form.blade.php
deleted file mode 100644
index a79ea856..00000000
--- a/modules/ContactForm/Resources/views/admin/settings/form.blade.php
+++ /dev/null
@@ -1,13 +0,0 @@
-
- @lang('contactform::admin/settings.recaptchaSiteKey')
-
-
-
- @lang('contactform::admin/settings.recaptchaSecret')
-
-
- reCAPTCHA @lang('contactform::admin/widgets.noContactForms')
- @else
-
- @include('contactform::admin.widgets.address.form', ['action' => route('widgets.postEdit', ['id' => $widget->id])])
-
-
- @widgetPreview($widget)
-
- @endif
-@endsection
-
diff --git a/modules/ContactForm/Resources/views/admin/widgets/address/form.blade.php b/modules/ContactForm/Resources/views/admin/widgets/address/form.blade.php
deleted file mode 100644
index e6cda721..00000000
--- a/modules/ContactForm/Resources/views/admin/widgets/address/form.blade.php
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/modules/ContactForm/Resources/views/admin/widgets/address/new.blade.php b/modules/ContactForm/Resources/views/admin/widgets/address/new.blade.php
deleted file mode 100644
index 3a5eef53..00000000
--- a/modules/ContactForm/Resources/views/admin/widgets/address/new.blade.php
+++ /dev/null
@@ -1,14 +0,0 @@
-@extends('admin.layoutWithNavigation')
-
-@section('pageHeading', @trans('contactform::admin/widgets.address.new'))
-@section('pageDescription', @trans($type->description))
-
-@section('content')
-
- @if(!count($forms))
- @lang('contactform::admin/widgets.noContactForms')
- @else
- @include('contactform::admin.widgets.address.form', ['action' => route('widgets.postNew', ['type' => $type])])
- @endif
-@endsection
-
diff --git a/modules/ContactForm/Resources/views/admin/widgets/form/edit.blade.php b/modules/ContactForm/Resources/views/admin/widgets/form/edit.blade.php
deleted file mode 100644
index b3b0b98c..00000000
--- a/modules/ContactForm/Resources/views/admin/widgets/form/edit.blade.php
+++ /dev/null
@@ -1,19 +0,0 @@
-@extends('admin.layoutWithNavigation')
-
-@section('pageHeading', @trans('contactform::admin/widgets.address.edit'))
-@section('pageDescription', $widget->description)
-
-@section('content')
-
- @if(!count($forms))
- @lang('contactform::admin/widgets.noContactForms')
- @else
-
- @include('contactform::admin.widgets.form.form', ['action' => route('widgets.postEdit', ['id' => $widget->id])])
-
-
- @widgetPreview($widget)
-
- @endif
-@endsection
-
diff --git a/modules/ContactForm/Resources/views/admin/widgets/form/form.blade.php b/modules/ContactForm/Resources/views/admin/widgets/form/form.blade.php
deleted file mode 100644
index 19dfcd3e..00000000
--- a/modules/ContactForm/Resources/views/admin/widgets/form/form.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-
\ No newline at end of file
diff --git a/modules/ContactForm/Resources/views/admin/widgets/form/new.blade.php b/modules/ContactForm/Resources/views/admin/widgets/form/new.blade.php
deleted file mode 100644
index fc3ff7cb..00000000
--- a/modules/ContactForm/Resources/views/admin/widgets/form/new.blade.php
+++ /dev/null
@@ -1,14 +0,0 @@
-@extends('admin.layoutWithNavigation')
-
-@section('pageHeading', @trans('contactform::admin/widgets.form.new'))
-@section('pageDescription', @trans($type->description))
-
-@section('content')
-
- @if(!count($forms))
- @lang('contactform::admin/widgets.noContactForms')
- @else
- @include('contactform::admin.widgets.form.form', ['action' => route('widgets.postNew', ['type' => $type])])
- @endif
-@endsection
-
diff --git a/modules/ContactForm/Widgets/Address/Address.php b/modules/ContactForm/Widgets/Address/Address.php
deleted file mode 100644
index 75d6f63f..00000000
--- a/modules/ContactForm/Widgets/Address/Address.php
+++ /dev/null
@@ -1,51 +0,0 @@
- $data->contactFormId];
- }
-}
\ No newline at end of file
diff --git a/modules/ContactForm/Widgets/Address/Presenter.php b/modules/ContactForm/Widgets/Address/Presenter.php
deleted file mode 100644
index d828752d..00000000
--- a/modules/ContactForm/Widgets/Address/Presenter.php
+++ /dev/null
@@ -1,76 +0,0 @@
-settings->contactFormId);
-
- if (!$form)
- return null;
-
- $formData = $form->moduleSettings;
-
- $code = '";
-
- return $code;
- }
-
- /**
- * Display form for creating new instance of widget
- *
- * @param WidgetType $type
- *
- * @return mixed
- */
- public static function renderAddForm(WidgetType $type)
- {
- $contactForms = Content::where('moduleHandler', config('contactform.handler'))
- ->get();
-
- return view('contactform::admin.widgets.address.new', [
- 'type' => $type,
- 'widget' => new Widget(),
- 'forms' => $contactForms
- ]);
- }
-
- /**
- * Display form for editing already existing widget
- *
- * @param Widget $widget
- *
- * @return mixed
- */
- public static function renderEditForm(Widget $widget)
- {
- $contactForms = Content::where('moduleHandler', config('contactform.handler'))
- ->get();
- return view('contactform::admin.widgets.address.edit', [
- 'widget' => $widget,
- 'forms' => $contactForms
- ]);
- }
-}
\ No newline at end of file
diff --git a/modules/ContactForm/Widgets/Form/Form.php b/modules/ContactForm/Widgets/Form/Form.php
deleted file mode 100644
index cb30e07f..00000000
--- a/modules/ContactForm/Widgets/Form/Form.php
+++ /dev/null
@@ -1,51 +0,0 @@
- $data->contactFormId];
- }
-}
\ No newline at end of file
diff --git a/modules/ContactForm/Widgets/Form/Presenter.php b/modules/ContactForm/Widgets/Form/Presenter.php
deleted file mode 100644
index b4859ede..00000000
--- a/modules/ContactForm/Widgets/Form/Presenter.php
+++ /dev/null
@@ -1,73 +0,0 @@
-settings->contactFormId);
-
- if (!$form) {
- return null;
- }
-
- return view(self::$template, ['widget' => $widget, 'form' => $form]);
- }
-
- /**
- * Display form for creating new instance of widget
- *
- * @param WidgetType $type
- *
- * @return mixed
- */
- public static function renderAddForm(WidgetType $type)
- {
- $contactForms = Content::where('moduleHandler', config('contactform.handler'))
- ->get();
-
- return view('contactform::admin.widgets.form.new', [
- 'type' => $type,
- 'widget' => new Widget(),
- 'forms' => $contactForms
- ]);
- }
-
- /**
- * Display form for editing already existing widget
- *
- * @param Widget $widget
- *
- * @return mixed
- */
- public static function renderEditForm(Widget $widget)
- {
- $contactForms = Content::where('moduleHandler', config('contactform.handler'))
- ->get();
- return view('contactform::admin.widgets.address.edit', [
- 'widget' => $widget,
- 'forms' => $contactForms
- ]);
- }
-}
\ No newline at end of file
diff --git a/modules/ContactForm/composer.json b/modules/ContactForm/composer.json
deleted file mode 100644
index 6fe0e828..00000000
--- a/modules/ContactForm/composer.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "name": "pingpong-modules/contactform",
- "description": "",
- "authors": [
- {
- "name": "Pingpong Labs",
- "email": "pingpong.labs@gmail.com"
- }
- ],
- "autoload": {
- "psr-4": {
- "Modules\\ContactForm\\": ""
- }
- }
-}
\ No newline at end of file
diff --git a/modules/ContactForm/start.php b/modules/ContactForm/start.php
deleted file mode 100644
index 7be329cb..00000000
--- a/modules/ContactForm/start.php
+++ /dev/null
@@ -1,15 +0,0 @@
- 'Gallery',
- 'translatedName' => 'gallery::module.name',
- 'translatedDescription' => 'gallery::module.description',
- 'alias' => 'gallery',
- 'handler' => '\\Modules\\Gallery\\Handlers\\Gallery',
- 'providers' => [\Modules\Gallery\Providers\GalleryServiceProvider::class],
- 'files' => ['start.php'],
- 'order' => 0,
-];
\ No newline at end of file
diff --git a/modules/Gallery/Handlers/Gallery.php b/modules/Gallery/Handlers/Gallery.php
deleted file mode 100644
index 262acb3b..00000000
--- a/modules/Gallery/Handlers/Gallery.php
+++ /dev/null
@@ -1,255 +0,0 @@
-moduleSettings->directoryId;
-
- // get all images in given directory
- $images = File::where('directory_id', $directoryId)
- ->where('mime_type', 'LIKE', 'image%')
- ->get();
-
- // render content
- return Controller::VisitorsView($content->template, [
- 'images' => $images,
- 'page' => $content,
- 'extra' => $parameters
- ]);
- }
-
- public static function getHistoryHandler()
- {
- return History::class;
- }
-
- /**
- * @param Content $content
- *
- * @return array
- */
- public static function loadExtraData(Content $content)
- {
- if (is_string($content->moduleSettings)) {
- $content->moduleSettings = json_decode($content->moduleSettings);
- }
-
- $extra = [
- 'slider' => isset($content->moduleSettings->slider) ? $content->moduleSettings->slider : false
- ];
-
- return $extra;
- }
-
- /**
- * Save module-specific values into database
- *
- * @param Content $content
- * @param Request $request
- *
- * @return mixed
- * @internal param Widget $widget
- */
- public static function createNew(Content &$content, Request $request)
- {
- $parentDirectoryId = Storage::get(self::CONFIG_FILENAME);
-
- // create new directory for images
- $directory = Directory::create([
- 'name' => $content->id . '_' . $request->title,
- 'description' => $request->description,
- 'parent_id' => $parentDirectoryId
- ]);
-
- // save id into module_config array
- $settings = ['directoryId' => $directory->id];
-
- // save settings
- $content->moduleSettings = json_encode($settings);
- }
-
- /**
- * Method used for editing existing content page.
- *
- * Reason why it is separated from createNew() method is simple - we need to save history of changes.
- *
- * @param Content $content
- * @param Request $request
- *
- * @param $revisionID string ID of revision used
- *
- * @return int number of edited fields
- */
- public static function edit(Content &$content, Request $request, $revisionID)
- {
- // nothing to edit
- }
-
- /**
- * Does given module manage content? Or is it just module with widgets/something internal/something absolutely else?
- *
- * @return bool
- */
- public static function managesContent()
- {
- return true;
- }
-
- public static function getModuleId()
- {
- $handler = config('gallery.handler');
- $allModules = ModulesHandlerToId::getWithTranslations();
- $moduleId = isset($allModules[$handler]) ? $allModules[$handler] : null;
-
- return $moduleId;
- }
-
- /**
- * Getter for section names in creating/editing content resource
- *
- * @return mixed
- */
- public static function getExtendedFormSections()
- {
- $sections = Handler::getExtendedFormSections();
-
- $sections['upload'] = trans('gallery::admin/content.upload');
-
- return $sections;
- }
-
- /**
- * Getter for views used in extended part of form for creating new content
- *
- * This method should return pairs . View is returned only as name in plain text
- *
- * @return array of views/templates/html codes divided into section
- */
- public static function getExtendedFormInputsCreate()
- {
- $parts = Handler::getExtendedFormInputsCreate();
- $parts['upload'] = 'gallery::admin.content.newUpload';
-
- return $parts;
- }
-
- /**
- * Getter for extended part of form for editing existing content
- *
- * Basically, this method may be
- *
- * @return array of views/templates/html codes divided into section
- */
- public static function getExtendedFormInputsEdit()
- {
- $parts = Handler::getExtendedFormInputsCreate();
- $parts['upload'] = 'gallery::admin.content.editUpload';
-
- return $parts;
- }
-
- /**
- * Register admin menu (or multiple ones)
- *
- * This cannot be in ServiceProvider because Session is started at middleware. And ServiceProvider is called before
- * starting any middleware..
- *
- * @param User $user model of logged user
- */
- public static function registerAdminMenu(User $user)
- {
- $menu = \Menu::instance('mainMenu');
- $submenu = $menu->whereTitle(trans('admin/mainMenu.contentPages'));
- $submenu->dropdown(trans('gallery::module.name'), function ($submenu) use ($user) {
- $submenu->route('content.new', trans('gallery::admin/adminMenu.new'), ['moduleId' => self::getModuleId()], 10, ['icon' => 'fa fa-plus']);
- $submenu->route('content.overview', trans('gallery::admin/adminMenu.overview'), ['moduleId' => self::getModuleId()], 20, ['icon' => 'fa fa-list']);
- // $submenu->route('emails.sent', trans('contactform::admin/adminMenu.sentMessages'), [], 30, ['icon' => 'fa fa-send']);
- }, 25, ['icon' => 'fa fa-camera']);
- }
-
- /**
- * Install module
- *
- * @return mixed
- */
- public static function install()
- {
- $directory = Directory::where('name', self::DIRECTORY_NAME)
- ->first();
-
- if (!count($directory)) {
- $directory = Directory::create([
- 'name' => self::DIRECTORY_NAME,
- 'hidden' => true
- ]);
- }
-
- Storage::put(self::CONFIG_FILENAME, $directory->id);
- }
-
- /**
- * Method called right after content page is marked as deleted
- *
- * This method is supposed to clean after "deleted" page.
- *
- * @param Content $content
- *
- * @return mixed
- */
- public static function delete(Content $content)
- {
- // try to convert moduleSettings into something more accessible
- if (is_string($content->moduleSettings)) {
- $content->moduleSettings = json_decode($content->moduleSettings);
- }
-
- // get directory id
- $directoryId = $content->moduleSettings->directoryId;
-
- $directory = Directory::find($directoryId);
-
- // check if gallery exists
- if (!$directory) {
- return;
- }
-
- // delete directory used as photogallery
- $directory->delete();
- }
-
- /**
- * Does this module support categories?
- *
- * @return boolean
- */
- public static function supportCategories()
- {
- return true;
- }
-}
\ No newline at end of file
diff --git a/modules/Gallery/Providers/GalleryServiceProvider.php b/modules/Gallery/Providers/GalleryServiceProvider.php
deleted file mode 100644
index aac0bc39..00000000
--- a/modules/Gallery/Providers/GalleryServiceProvider.php
+++ /dev/null
@@ -1,16 +0,0 @@
-alias = 'gallery';
- }
-
- protected function setModulePath()
- {
- $this->path = __DIR__;
- }
-}
diff --git a/modules/Gallery/Resources/lang/cs/admin/adminMenu.php b/modules/Gallery/Resources/lang/cs/admin/adminMenu.php
deleted file mode 100644
index 91299728..00000000
--- a/modules/Gallery/Resources/lang/cs/admin/adminMenu.php
+++ /dev/null
@@ -1,6 +0,0 @@
- "Nová galerie",
-"overview" => "Všechny galerie",
-"templatePath" => "Šablony galerie",
-];
diff --git a/modules/Gallery/Resources/lang/cs/admin/content.php b/modules/Gallery/Resources/lang/cs/admin/content.php
deleted file mode 100644
index ac72921f..00000000
--- a/modules/Gallery/Resources/lang/cs/admin/content.php
+++ /dev/null
@@ -1,11 +0,0 @@
- "Tato stránka není platnou fotogalerií.",
-"makeSlider" => "Vytvořit slider z této fotogalerie",
-"orbitSliderMissing" => "Nelze vytvořit slider. Widget pro zobrazení slideru není nainstalován.",
-"sliderCreated" => "Slider úspěšně vytvořen.",
-"sliderEdit" => "Nastavení slideru",
-"sliderFailed" => "Slider nemohl být vytvořen. Zpráva: :message",
-"upload" => "Nahrát fotografie",
-"uploadAfterSavingGallery" => "Nahrávání do této galerie zatím není dostupné. Uložte galerii a nahrávejte fotografie až v rámci editace.",
-];
diff --git a/modules/Gallery/Resources/lang/cs/module.php b/modules/Gallery/Resources/lang/cs/module.php
deleted file mode 100644
index 337dd6d5..00000000
--- a/modules/Gallery/Resources/lang/cs/module.php
+++ /dev/null
@@ -1,5 +0,0 @@
- "Jednoduchá galerie zobrazující fotografie/grafiku v jednoduchém lightboxu. Tento modul nenabízí žádné speciální zobrazení pro fotografie.",
-"name" => "Galerie",
-];
diff --git a/modules/Gallery/Resources/lang/en/admin/adminMenu.php b/modules/Gallery/Resources/lang/en/admin/adminMenu.php
deleted file mode 100644
index 099f852a..00000000
--- a/modules/Gallery/Resources/lang/en/admin/adminMenu.php
+++ /dev/null
@@ -1,6 +0,0 @@
- 'Gallery templates',
- 'new' => 'New gallery',
- 'overview' => 'All galleries'
-];
\ No newline at end of file
diff --git a/modules/Gallery/Resources/lang/en/admin/content.php b/modules/Gallery/Resources/lang/en/admin/content.php
deleted file mode 100644
index c7741f22..00000000
--- a/modules/Gallery/Resources/lang/en/admin/content.php
+++ /dev/null
@@ -1,11 +0,0 @@
- 'Upload photos',
- 'uploadAfterSavingGallery' => 'Uploading for this gallery is not available yet. You must create the gallery first and upload later.',
- 'makeSlider' => 'Make slider from this photogallery',
- 'orbitSliderMissing' => 'Cannot create slider. Widget for slider is not installed.',
- 'invalidGallery' => 'This content page is not a valid gallery page.',
- 'sliderFailed' => 'Slider could not be created. Reason: :message',
- 'sliderCreated' => 'Slider successfully created.',
- 'sliderEdit' => 'Slider settings',
-];
\ No newline at end of file
diff --git a/modules/Gallery/Resources/lang/en/module.php b/modules/Gallery/Resources/lang/en/module.php
deleted file mode 100644
index 6b0048ab..00000000
--- a/modules/Gallery/Resources/lang/en/module.php
+++ /dev/null
@@ -1,6 +0,0 @@
- 'Gallery',
- 'description' => 'Simple photogallery',
-
-];
\ No newline at end of file
diff --git a/modules/Gallery/Resources/lang/sk/admin/adminMenu.php b/modules/Gallery/Resources/lang/sk/admin/adminMenu.php
deleted file mode 100644
index bd541608..00000000
--- a/modules/Gallery/Resources/lang/sk/admin/adminMenu.php
+++ /dev/null
@@ -1,6 +0,0 @@
- "Nová galéria",
-"overview" => "Všetky galérie",
-"templatePath" => "Šablóny galérie",
-];
diff --git a/modules/Gallery/Resources/lang/sk/admin/content.php b/modules/Gallery/Resources/lang/sk/admin/content.php
deleted file mode 100644
index 41ffac65..00000000
--- a/modules/Gallery/Resources/lang/sk/admin/content.php
+++ /dev/null
@@ -1,11 +0,0 @@
- "Táto stránka nie je platná fotogaléria.",
- "makeSlider" => "Vytvoriť slider z tejto fotogalérie",
- "orbitSliderMissing" => "Nie je možné vytvoriť slider. Widget pre zobrazenie slideru nie je nainštalovaný.",
- "sliderCreated" => "Slider úspešne vytvorený.",
- "sliderEdit" => "Nastavenie slideru",
- "sliderFailed" => "Slider nemohol byť vytvorený. Správa: :message",
- "upload" => "Nahrať fotografie",
- "uploadAfterSavingGallery" => "Nahrávanie do tejto galérie nie je dostupné. Najprv uložte galériu a fotografie nahrávajte až v rámci editácie.",
-];
diff --git a/modules/Gallery/Resources/lang/sk/module.php b/modules/Gallery/Resources/lang/sk/module.php
deleted file mode 100644
index 01532983..00000000
--- a/modules/Gallery/Resources/lang/sk/module.php
+++ /dev/null
@@ -1,5 +0,0 @@
- "Jednoduchá galéria zobrazujúca fotografie/grafiku v jednoduchom lightboxe. Tento modul neponúka žiadne špeciálne zobrazovanie fotografií.",
- "name" => "Galéria",
-];
diff --git a/modules/Gallery/Resources/views/admin/content/editUpload.blade.php b/modules/Gallery/Resources/views/admin/content/editUpload.blade.php
deleted file mode 100644
index 75f03669..00000000
--- a/modules/Gallery/Resources/views/admin/content/editUpload.blade.php
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/modules/Gallery/Resources/views/admin/content/newUpload.blade.php b/modules/Gallery/Resources/views/admin/content/newUpload.blade.php
deleted file mode 100644
index 8d84eda9..00000000
--- a/modules/Gallery/Resources/views/admin/content/newUpload.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-
- @lang('gallery::admin/content.uploadAfterSavingGallery')
-
\ No newline at end of file
diff --git a/modules/Gallery/composer.json b/modules/Gallery/composer.json
deleted file mode 100644
index 24d1e0a0..00000000
--- a/modules/Gallery/composer.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "name": "pingpong-modules/gallery",
- "description": "",
- "authors": [
- {
- "name": "Pingpong Labs",
- "email": "pingpong.labs@gmail.com"
- }
- ],
- "autoload": {
- "psr-4": {
- "Modules\\Gallery\\": ""
- }
- }
-}
\ No newline at end of file
diff --git a/modules/Gallery/start.php b/modules/Gallery/start.php
deleted file mode 100644
index a4abe2da..00000000
--- a/modules/Gallery/start.php
+++ /dev/null
@@ -1,2 +0,0 @@
- 'StaticPages',
- 'translatedName' => 'staticpages::module.name',
- 'translatedDescription' => 'staticpages::module.description',
- 'alias' => 'staticpages',
- 'handler' => '\\Modules\\StaticPages\\Handlers\\StaticPage',
- 'providers' => [\Modules\Staticpages\Providers\StaticPagesServiceProvider::class],
- 'files' => ['start.php'],
- 'order' => 0,
-];
\ No newline at end of file
diff --git a/modules/StaticPages/Handlers/StaticPage.php b/modules/StaticPages/Handlers/StaticPage.php
deleted file mode 100644
index e2926855..00000000
--- a/modules/StaticPages/Handlers/StaticPage.php
+++ /dev/null
@@ -1,76 +0,0 @@
-whereTitle(trans('admin/mainMenu.contentPages'));
-
- $submenu->dropdown(trans('staticpages::adminMenu.staticPages'), function ($submenu) use ($user) {
- $submenu->route('content.new', trans('staticpages::adminMenu.new'), ['module' => config('staticpages.alias')], 10, ['icon' => 'fa fa-plus']);
- $submenu->route('content.overview', trans('staticpages::adminMenu.overview'), ['module' => config('staticpages.alias')], 20, ['icon' => 'fa fa-list']);
- }, 15, ['icon' => 'fa fa-newspaper-o']);
- }
-
- /**
- * Get translated title for pages overview of given type.
- *
- * This value is used for rendering list of all content pages of given type in administration.
- *
- * @return string
- */
- public static function getOverviewTitle()
- {
- return trans('staticpages::module.allPages');
- }
-
- /**
- * Title displayed above for for creating new content page
- *
- * @return string
- */
- public static function getCreateNewTitle()
- {
- return trans('staticpages::module.newPage');
- }
-
- /**
- * Title for form displayed for editin content page
- *
- * @param Content $content
- *
- * @return mixed
- */
- public static function getEditTitle(Content $content)
- {
- return trans('staticpages::module.editPage');
- }
-
- /**
- * Does given module manage content? Or is it just module with widgets/something internal/something absolutely else?
- *
- * @return bool
- */
- public static function managesContent()
- {
- return true;
- }
-
- /**
- * Does this module support categories?
- *
- * @return boolean
- */
- public static function supportCategories()
- {
- return true;
- }
-}
\ No newline at end of file
diff --git a/modules/StaticPages/Providers/StaticPagesServiceProvider.php b/modules/StaticPages/Providers/StaticPagesServiceProvider.php
deleted file mode 100644
index ba92ce7f..00000000
--- a/modules/StaticPages/Providers/StaticPagesServiceProvider.php
+++ /dev/null
@@ -1,16 +0,0 @@
-alias = 'staticpages';
- }
-
- protected function setModulePath()
- {
- $this->path = __DIR__;
- }
-}
diff --git a/modules/StaticPages/Resources/lang/cs/admin.php b/modules/StaticPages/Resources/lang/cs/admin.php
deleted file mode 100644
index 9f233cff..00000000
--- a/modules/StaticPages/Resources/lang/cs/admin.php
+++ /dev/null
@@ -1,6 +0,0 @@
- "Nová stránka",
-"overview" => "Seznam všech statických stránek",
-"templatePath" => "Statické stránky",
-];
diff --git a/modules/StaticPages/Resources/lang/cs/adminMenu.php b/modules/StaticPages/Resources/lang/cs/adminMenu.php
deleted file mode 100644
index 48aa0404..00000000
--- a/modules/StaticPages/Resources/lang/cs/adminMenu.php
+++ /dev/null
@@ -1,6 +0,0 @@
- "Vytvořit novou",
-"overview" => "Přehled",
-"staticPages" => "Statické stránky",
-];
diff --git a/modules/StaticPages/Resources/lang/cs/module.php b/modules/StaticPages/Resources/lang/cs/module.php
deleted file mode 100644
index e0dfbbeb..00000000
--- a/modules/StaticPages/Resources/lang/cs/module.php
+++ /dev/null
@@ -1,8 +0,0 @@
- "Všechny statické stránky",
-"description" => "Statické stránky jsou určeny k zobrazování statického obsahu na stránkách.",
-"editPage" => "Upravuji statickou stránku",
-"name" => "Statické stránky",
-"newPage" => "Vytvářím novou stránku",
-];
diff --git a/modules/StaticPages/Resources/lang/en/admin.php b/modules/StaticPages/Resources/lang/en/admin.php
deleted file mode 100644
index c7ee3368..00000000
--- a/modules/StaticPages/Resources/lang/en/admin.php
+++ /dev/null
@@ -1,6 +0,0 @@
- 'List of all static pages',
- 'templatePath' => 'Static pages',
- 'new' => 'nova stranka'
-];
\ No newline at end of file
diff --git a/modules/StaticPages/Resources/lang/en/adminMenu.php b/modules/StaticPages/Resources/lang/en/adminMenu.php
deleted file mode 100644
index ae842272..00000000
--- a/modules/StaticPages/Resources/lang/en/adminMenu.php
+++ /dev/null
@@ -1,6 +0,0 @@
- 'Static pages',
- 'new' => 'Create new',
- 'overview' => 'Overview'
-];
\ No newline at end of file
diff --git a/modules/StaticPages/Resources/lang/en/module.php b/modules/StaticPages/Resources/lang/en/module.php
deleted file mode 100644
index db22a5b4..00000000
--- a/modules/StaticPages/Resources/lang/en/module.php
+++ /dev/null
@@ -1,8 +0,0 @@
- 'Static pages',
- 'description' => 'Static pages are intended for displaying static content on webpage.',
- 'allPages' => 'All static pages',
- 'editPage' => 'Editing static page',
- 'newPage' => 'Create new static page'
-];
\ No newline at end of file
diff --git a/modules/StaticPages/Resources/lang/sk/admin.php b/modules/StaticPages/Resources/lang/sk/admin.php
deleted file mode 100644
index ba6b774e..00000000
--- a/modules/StaticPages/Resources/lang/sk/admin.php
+++ /dev/null
@@ -1,6 +0,0 @@
- "Nová stránka",
- "overview" => "Zoznam všetkých statických stránok",
- "templatePath" => "Statické stránky",
-];
diff --git a/modules/StaticPages/Resources/lang/sk/adminMenu.php b/modules/StaticPages/Resources/lang/sk/adminMenu.php
deleted file mode 100644
index 89bf8bd4..00000000
--- a/modules/StaticPages/Resources/lang/sk/adminMenu.php
+++ /dev/null
@@ -1,6 +0,0 @@
- "Vytvoriť novú",
- "overview" => "Prehľad",
- "staticPages" => "Statické stránky",
-];
diff --git a/modules/StaticPages/Resources/lang/sk/module.php b/modules/StaticPages/Resources/lang/sk/module.php
deleted file mode 100644
index c3f11703..00000000
--- a/modules/StaticPages/Resources/lang/sk/module.php
+++ /dev/null
@@ -1,5 +0,0 @@
- "Statické stránky sú určené k zobrazovaniu statického obsahu na webe.",
- "name" => "Statické stránky",
-];
diff --git a/modules/StaticPages/composer.json b/modules/StaticPages/composer.json
deleted file mode 100644
index d9cb85d6..00000000
--- a/modules/StaticPages/composer.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "name": "pingpong-modules/staticpages",
- "description": "",
- "authors": [
- {
- "name": "Pingpong Labs",
- "email": "pingpong.labs@gmail.com"
- }
- ],
- "autoload": {
- "psr-4": {
- "Modules\\StaticPages\\": ""
- }
- }
-}
\ No newline at end of file
diff --git a/modules/StaticPages/start.php b/modules/StaticPages/start.php
deleted file mode 100644
index b3d9bbc7..00000000
--- a/modules/StaticPages/start.php
+++ /dev/null
@@ -1 +0,0 @@
-
- ./tests/unit/
+ ./tests/Unit/
diff --git a/public/.htaccess b/public/.htaccess
index 8eb2dd0d..47a002ec 100644
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -14,3 +14,69 @@
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule ^ index.php [L]
+
+
+
+ AddOutputFilterByType DEFLATE application/javascript
+ AddOutputFilterByType DEFLATE application/rss+xml
+ AddOutputFilterByType DEFLATE application/vnd.ms-fontobject
+ AddOutputFilterByType DEFLATE application/x-font
+ AddOutputFilterByType DEFLATE application/x-font-opentype
+ AddOutputFilterByType DEFLATE application/x-font-otf
+ AddOutputFilterByType DEFLATE application/x-font-truetype
+ AddOutputFilterByType DEFLATE application/x-font-ttf
+ AddOutputFilterByType DEFLATE application/x-javascript
+ AddOutputFilterByType DEFLATE application/xhtml+xml
+ AddOutputFilterByType DEFLATE application/xml
+ AddOutputFilterByType DEFLATE font/opentype
+ AddOutputFilterByType DEFLATE font/otf
+ AddOutputFilterByType DEFLATE font/ttf
+ AddOutputFilterByType DEFLATE image/svg+xml
+ AddOutputFilterByType DEFLATE image/x-icon
+ AddOutputFilterByType DEFLATE text/css
+ AddOutputFilterByType DEFLATE text/html
+ AddOutputFilterByType DEFLATE text/javascript
+ AddOutputFilterByType DEFLATE text/plain
+
+
+
+ mod_gzip_on Yes
+ mod_gzip_dechunk Yes
+ mod_gzip_item_include file .(html?|txt|css|js|php|pl)$
+ mod_gzip_item_include handler ^cgi-script$
+ mod_gzip_item_include mime ^text/.*
+ mod_gzip_item_include mime ^application/x-javascript.*
+ mod_gzip_item_exclude mime ^image/.*
+ mod_gzip_item_exclude rspheader ^Content-Encoding:.*gzip.*
+
+#
+# Leverage Browser Caching
+
+ ExpiresActive On
+ ExpiresByType image/jpg "access 1 year"
+ ExpiresByType image/jpeg "access 1 year"
+ ExpiresByType image/gif "access 1 year"
+ ExpiresByType image/png "access 1 year"
+ ExpiresByType text/css "access 1 month"
+ ExpiresByType text/html "access 1 month"
+ ExpiresByType application/pdf "access 1 month"
+ ExpiresByType text/x-javascript "access 1 month"
+ ExpiresByType application/x-shockwave-flash "access 1 month"
+ ExpiresByType image/x-icon "access 1 year"
+ ExpiresDefault "access 1 month"
+
+
+
+
+ Header set Cache-Control "max-age=2678400, public"
+
+
+ Header set Cache-Control "max-age=7200, private, must-revalidate"
+
+
+ Header set Cache-Control "max-age=86400, public"
+
+
+ Header set Cache-Control "max-age=2678400, private"
+
+
\ No newline at end of file
diff --git a/public/index.php b/public/index.php
old mode 100644
new mode 100755
diff --git a/resources/assets/admin/css/custom.css b/resources/assets/admin/css/custom.css
index d3d68009..da3ef95c 100644
--- a/resources/assets/admin/css/custom.css
+++ b/resources/assets/admin/css/custom.css
@@ -22,8 +22,9 @@ a:focus {
padding-bottom: 20px !important;
}
-.form-control {
- margin: .3em 0;
+.blur {
+ -webkit-filter: blur(3px);
+ filter: blur(3px);
}
.text-center {
@@ -413,5 +414,11 @@ img {
/*background-color: #C9302C;*/
/*}*/
+.has-subpages:hover {
+ cursor: pointer;
+}
+#orderSetup .subpage td:first-child {
+ padding-left: 35px;
+}
diff --git a/resources/assets/admin/js/app.js b/resources/assets/admin/js/app.js
index fbb223ad..5ca40345 100644
--- a/resources/assets/admin/js/app.js
+++ b/resources/assets/admin/js/app.js
@@ -1,487 +1,9 @@
-var config = window.config = {};
-
-// Config reference element
-var $ref = $ ("#ref");
-
-// Configure responsive bootstrap toolkit
-config.ResponsiveBootstrapToolkitVisibilityDivs = {
- 'xs': $ ('
'),
- 'sm': $ ('
'),
- 'md': $ ('
'),
- 'lg': $ ('
'),
- 'xl': $ ('
')
-};
-
-ResponsiveBootstrapToolkit.use ('Custom', config.ResponsiveBootstrapToolkitVisibilityDivs);
-
-//validation configuration
-config.validations = {
- debug: true,
- errorClass: 'has-error',
- validClass: 'success',
- errorElement: "span",
-
- // add error class
- highlight: function (element, errorClass, validClass) {
- $ (element).parents ("div.form-group")
- .addClass (errorClass)
- .removeClass (validClass);
- },
-
- // add error class
- unhighlight: function (element, errorClass, validClass) {
- $ (element).parents (".has-error")
- .removeClass (errorClass)
- .addClass (validClass);
- },
-
- // submit handler
- submitHandler: function (form) {
- form.submit ();
- }
-};
-
-//delay time configuration
-config.delayTime = 50;
-
-// chart configurations
-config.chart = {};
-
-/***********************************************
- * Animation Settings
- ***********************************************/
-function animate(options) {
- var animationName = "animated " + options.name;
- var animationEnd = "webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend";
- $ (options.selector)
- .addClass (animationName)
- .one (animationEnd,
- function () {
- $ (this).removeClass (animationName);
- }
- );
-}
-
-$ (function () {
- var $itemActions = $ (".item-actions-dropdown");
-
- $ (document).on ('click', function (e) {
- if (!$ (e.target).closest ('.item-actions-dropdown').length) {
- $itemActions.removeClass ('active');
- }
- });
-
- $ ('.item-actions-toggle-btn').on ('click', function (e) {
- e.preventDefault ();
-
- var $thisActionList = $ (this).closest ('.item-actions-dropdown');
-
- $itemActions.not ($thisActionList).removeClass ('active');
-
- $thisActionList.toggleClass ('active');
- });
-});
-
-// /***********************************************
-// * NProgress Settings
-// ***********************************************/
-// var npSettings = {
-// easing: 'ease',
-// speed: 500
-// };
-//
-// NProgress.configure (npSettings);
-// $ (function () {
-// setSameHeights ();
-//
-// var resizeTimer;
-//
-// $ (window).resize (function () {
-// clearTimeout (resizeTimer);
-// resizeTimer = setTimeout (setSameHeights, 150);
-// });
-// });
-
-function setSameHeights($container) {
-
- $container = $container || $ ('.sameheight-container');
-
- var viewport = ResponsiveBootstrapToolkit.current ();
-
- $container.each (function () {
-
- var $items = $ (this).find (".sameheight-item");
-
- // Get max height of items in container
- var maxHeight = 0;
-
- $items.each (function () {
- $ (this).css ({height: 'auto'});
- maxHeight = Math.max (maxHeight, $ (this).innerHeight ());
- });
-
- // Set heights of items
- $items.each (function () {
- // Ignored viewports for item
- var excludedStr = $ (this).data ('exclude') || '';
- var excluded = excludedStr.split (',');
-
- // Set height of element if it's not excluded on
- if (excluded.indexOf (viewport) === -1) {
- $ (this).innerHeight (maxHeight);
- }
- });
- });
-}
-
-$ (function () {
- animate ({
- name: 'flipInY',
- selector: '.error-card > .error-title-block'
- });
-
- setTimeout (function () {
- var $el = $ ('.error-card > .error-container');
-
- animate ({
- name: 'fadeInUp',
- selector: $el
- });
-
- $el.addClass ('visible');
- }, 500);
-});
-
-$ (function () {
-
- $ ('#sidebar-menu, #customize-menu').metisMenu ({
- activeClass: 'open'
- });
-
- $ ('#sidebar-collapse-btn').on ('click', function (event) {
- event.preventDefault ();
-
- $ ("#app").toggleClass ("sidebar-open");
- });
-
- $ ("#sidebar-overlay").on ('click', function () {
- $ ("#app").removeClass ("sidebar-open");
- });
-
-});
-$ (function () {
-
- $ ('.actions-list > li').on ('click', '.check', function (e) {
- e.preventDefault ();
-
- $ (this).parents ('.tasks-item')
- .find ('.checkbox')
- .prop ("checked", true);
-
- // removeActionList ();
- });
-
-});
-
-// $ (function () {
-
- // // set sortable options
- // $ ('.images-container').sortable ({
- // animation: 150,
- // handle: ".control-btn.move",
- // draggable: ".image-container",
- // onMove: function (evt) {
- // var $relatedElem = $ (evt.related);
- //
- // if ($relatedElem.hasClass ('add-image')) {
- // return false;
- // }
- // }
- // });
- //
- // var $controlsButtons = $ ('.controls');
- //
- // var $controlsButtonsStar = $controlsButtons.find ('.star');
- //
- // $controlsButtonsStar.on ('click', function (e) {
- // e.preventDefault ();
- //
- // $controlsButtonsStar.removeClass ('active');
- // $controlsButtonsStar.parents ('.image-container').removeClass ('main');
- //
- // $ (this).addClass ('active');
- //
- // $ (this).parents ('.image-container').addClass ('main');
- // })
-// });
-
-$ (function () {
- $ ('.nav-profile > li > a').on ('click', function () {
- var $el = $ (this).next ();
-
- animate ({
- name: 'flipInX',
- selector: $el
- });
- });
-});
-
-$ (function () {
- // Local storage settings
- var themeSettings = getThemeSettings ();
-
- // Elements
-
- var $app = $ ('#app');
- var $styleLink = $ ('#theme-style');
- var $customizeMenu = $ ('#customize-menu');
-
- // Color switcher
- var $customizeMenuColorBtns = $customizeMenu.find ('.color-item');
-
- // Position switchers
- var $customizeMenuRadioBtns = $customizeMenu.find ('.radio');
-
- // /////////////////////////////////////////////////
-
- // Initial state
-
- // On setting event, set corresponding options
-
- // Update customize view based on options
-
- // Update theme based on options
-
- /************************************************
- * Initial State
- *************************************************/
-
- setThemeSettings ();
-
- /************************************************
- * Events
- *************************************************/
-
- // set theme type
- $customizeMenuColorBtns.on ('click', function () {
- themeSettings.themeName = $ (this).data ('theme');
-
- setThemeSettings ();
- });
-
- $customizeMenuRadioBtns.on ('click', function () {
-
- var optionName = $ (this).prop ('name');
- themeSettings[optionName] = $ (this).val ();
-
- setThemeSettings ();
- });
-
- function setThemeSettings() {
- setThemeState ()
- .delay (config.delayTime)
- .queue (function (next) {
-
- setThemeColor ();
- setThemeControlsState ();
- saveThemeSettings ();
-
- $ (document).trigger ("themechange");
-
- next ();
- });
- }
-
- /************************************************
- * Update theme based on options
- *************************************************/
-
- function setThemeState() {
- // set theme type
- if (themeSettings.themeName) {
- $styleLink.attr ('href', window.cssPath + '/app-' + themeSettings.themeName + '.css');
- }
- else {
- $styleLink.attr ('href', window.cssPath + '/app.css');
- }
- // App classes
- $app.removeClass ('header-fixed footer-fixed sidebar-fixed');
-
- // set header
- $app.addClass (themeSettings.headerPosition);
-
- // set footer
- $app.addClass (themeSettings.footerPosition);
-
- // set footer
- $app.addClass (themeSettings.sidebarPosition);
-
- return $app;
- }
-
- /************************************************
- * Update theme controls based on options
- *************************************************/
-
- function setThemeControlsState() {
- // set color switcher
- $customizeMenuColorBtns.each (function () {
- if ($ (this).data ('theme') === themeSettings.themeName) {
- $ (this).addClass ('active');
- }
- else {
- $ (this).removeClass ('active');
- }
- });
-
- // set radio buttons
- $customizeMenuRadioBtns.each (function () {
- var name = $ (this).prop ('name');
- var value = $ (this).val ();
-
- if (themeSettings[name] === value) {
- $ (this).prop ("checked", true);
- }
- else {
- $ (this).prop ("checked", false);
- }
- });
- }
-
- /************************************************
- * Update theme color
- *************************************************/
- function setThemeColor() {
- config.chart.colorPrimary = tinycolor ($ref.find (".chart .color-primary").css ("color"));
- config.chart.colorSecondary = tinycolor ($ref.find (".chart .color-secondary").css ("color"));
- }
-
- /************************************************
- * Storage Functions
- *************************************************/
-
- function getThemeSettings() {
- var settings = (localStorage.getItem ('themeSettings')) ? JSON.parse (localStorage.getItem ('themeSettings')) : {};
-
- settings.headerPosition = settings.headerPosition || '';
- settings.sidebarPosition = settings.sidebarPosition || '';
- settings.footerPosition = settings.footerPosition || '';
-
- return settings;
- }
-
- function saveThemeSettings() {
- localStorage.setItem ('themeSettings', JSON.stringify (themeSettings));
- }
-
-});
-
-$ (function () {
+// bind some custom methods
+$ (document).ready (function () {
$ ("body").addClass ("loaded");
- var notification = $ ('.notification');
- if (notification.length) {
-
- notification.click (function () {
- $ (this).fadeOut ('fast');
- });
-
- setTimeout (function () {
- notification.fadeOut (1500)
- }, 5 * 1000)
- }
-});
-
-/**
- * Makes slug from input string
- *
- * @param text
- * @param trimSpaces
- *
- * @returns {string}
- */
-function slugify(text, trimSpaces) {
- text = text.toString ().toLowerCase ();
-
- if (trimSpaces)
- text = text.trim ();
-
- return text.replace (/ /g, '-')
- .replace (/[àáâãäå]/g, "a")
- .replace (/[čç]/g, "c")
- .replace (/[ěèéêë]/g, "e")
- .replace (/[ùúûüů]/g, "u")
- .replace (/[ìíîï]/g, "i")
- .replace (/[ňńñ]/g, "n")
- .replace (/[òóôõö]/g, "o")
- .replace (/[ýÿ]/g, "y")
- .replace (/œ/g, "oe")
- .replace (/ď/g, "d")
- .replace (/ř/g, "r")
- .replace (/š/g, "s")
- .replace (/ž/g, "z")
- .replace (/ť/g, "t")
- .replace (/æ/g, "ae")
- .replace (/[^a-z0-9\-]+/g, '')
- .replace (/--+/g, '-');
-}
-
-// bind some custom methods
-$ (document).ready (function () {
- var previousTitle, previousMessage;
-
- $ ('.confirm').click (function (e) {
-
- var titleElement = $ ('#confirmation-title');
- var messageElement = $ ('#confirmation-message');
-
- previousTitle = titleElement.text ();
- previousMessage = messageElement.text ();
-
- var confirmTitle = $ (this).data ('title');
- var confirmMessage = $ (this).data ('message');
- var href = $ (this).attr ('href');
-
- $ ('#confirm-button').attr ('href', href);
-
- if (confirmTitle)
- titleElement.text (confirmTitle);
-
- if (confirmMessage)
- messageElement.text (confirmMessage);
-
- $ ('#confirm-modal').modal ('show');
-
- e.preventDefault ();
- });
-
- $ ('#confirm-modal').on ('hidden.bs.modal', function () {
- $ ('#confirmation-title').text (previousTitle);
- $ ('#confirmation-message').text (previousMessage);
- });
-
- $ ('#lockUrl').change (function () {
- $ ('.slug-source').keyup ();
- });
-
- $ ('.slug-target').keyup (function () {
- $ (this).val (slugify ($ (this).val (), false));
- $ ('#lockUrl').prop ('checked', true);
- });
-
- $ ('.slug-source').keyup (function () {
- var source = $ (this);
- var target = $ ('.slug-target');
- var locked = $ ('#lockUrl');
-
- if (!locked.is (':checked'))
- target.val (slugify (source.val (), true));
- });
-
- $ (function () {
- $ ('[data-toggle="tooltip"]').tooltip ()
- });
+ $ ('[data-toggle="tooltip"]').tooltip ()
// find if any error occured and mark tab with that error
$ ('.has-error').each (function () {
@@ -491,20 +13,31 @@ $ (document).ready (function () {
$ ("#" + tabCard.prop ('id') + "-tab").addClass ('tab-with-error');
});
- $('#removeTitlePhoto').click(function () {
- $('#titlePhotoContainer').remove();
- // $('existingTitlePhoto').val(null);
+ $ ('#removeTitlePhoto').click (function () {
+ $ ('#titlePhotoContainer').remove ();
});
- $('form').areYouSure();
+ $ ('form').areYouSure ();
});
-// /***********************************************
-// * NProgress Settings
-// ***********************************************/
-//
-// // start load bar
-// NProgress.start ();
-//
-// // end loading bar
-// NProgress.done ();
\ No newline at end of file
+$ ('.checkbox').change (function () {
+ var e = $ (this);
+ var checked = e.is (':checked');
+ var id = e.data ('id');
+
+ $ ('.child-' + id).prop ('checked', checked);
+
+ // check also parent
+ if (e.hasClass ('child-checkbox') && checked) {
+ var parent = e.data ('parent');
+ $ ('#checkbox-parent-' + parent).prop ('checked', true);
+ }
+});
+
+$ ('.has-subpages').click (function (e) {
+ if (!$ (e.target).is ("div"))
+ return;
+
+ var id = $ (this).data ('id');
+ $ ('.parent-page-' + id).toggleClass ('hidden-xs-up');
+})
\ No newline at end of file
diff --git a/resources/assets/admin/js/confirmModal.js b/resources/assets/admin/js/confirmModal.js
new file mode 100644
index 00000000..93c3c603
--- /dev/null
+++ b/resources/assets/admin/js/confirmModal.js
@@ -0,0 +1,43 @@
+var previousTitle, previousMessage;
+
+$ ('.confirm').click (function (e) {
+
+ var titleElement = $ ('#confirmation-title');
+ var messageElement = $ ('#confirmation-message');
+
+ previousTitle = titleElement.text ();
+ previousMessage = messageElement.text ();
+
+ var confirmTitle = $ (this).data ('title');
+ var confirmMessage = $ (this).data ('message');
+
+ var tag = $ (this).prop ('tagName');
+ if (tag === 'A') {
+ var href = $ (this).attr ('href');
+
+ $ ('#confirm-button').attr ('href', href);
+ } else if (tag === 'BUTTON') {
+ var form = $ (this).closest ('form');
+ $ ('#confirm-button').click (function () {
+ form.submit ();
+ })
+ }
+
+ if (confirmTitle)
+ titleElement.text (confirmTitle);
+
+ if (confirmMessage)
+ messageElement.text (confirmMessage);
+
+ $ ('#confirm-modal').modal ('show');
+
+ $ ('.main-wrapper').addClass ('blur');
+
+ e.preventDefault ();
+});
+
+$ ('#confirm-modal').on ('hidden.bs.modal', function () {
+ $ ('#confirmation-title').text (previousTitle);
+ $ ('#confirmation-message').text (previousMessage);
+ $ ('.main-wrapper').removeClass ('blur');
+});
\ No newline at end of file
diff --git a/resources/assets/admin/js/notification.js b/resources/assets/admin/js/notification.js
new file mode 100644
index 00000000..44a7f6fd
--- /dev/null
+++ b/resources/assets/admin/js/notification.js
@@ -0,0 +1,11 @@
+var notification = $ ('.notification');
+if (notification.length) {
+
+ notification.click (function () {
+ $ (this).fadeOut ('fast');
+ });
+
+ setTimeout (function () {
+ notification.fadeOut (1500)
+ }, 5 * 1000)
+}
\ No newline at end of file
diff --git a/resources/assets/admin/js/slugify.js b/resources/assets/admin/js/slugify.js
new file mode 100644
index 00000000..9892f153
--- /dev/null
+++ b/resources/assets/admin/js/slugify.js
@@ -0,0 +1,51 @@
+/**
+ * Makes slug from input string
+ *
+ * @param text
+ * @param trimSpaces
+ *
+ * @returns {string}
+ */
+function slugify(text, trimSpaces) {
+ text = text.toString ().toLowerCase ();
+
+ if (trimSpaces)
+ text = text.trim ();
+
+ return text.replace (/ /g, '-')
+ .replace (/[àáâãäå]/g, "a")
+ .replace (/[čç]/g, "c")
+ .replace (/[ěèéêë]/g, "e")
+ .replace (/[ùúûüů]/g, "u")
+ .replace (/[ìíîï]/g, "i")
+ .replace (/[ňńñ]/g, "n")
+ .replace (/[òóôõö]/g, "o")
+ .replace (/[ýÿ]/g, "y")
+ .replace (/œ/g, "oe")
+ .replace (/ď/g, "d")
+ .replace (/ř/g, "r")
+ .replace (/š/g, "s")
+ .replace (/ž/g, "z")
+ .replace (/ť/g, "t")
+ .replace (/æ/g, "ae")
+ .replace (/[^a-z0-9\-]+/g, '')
+ .replace (/--+/g, '-');
+}
+
+$ ('#lockUrl').change (function () {
+ $ ('.slug-source').keyup ();
+});
+
+$ ('.slug-target').keyup (function () {
+ $ (this).val (slugify ($ (this).val (), false));
+ $ ('#lockUrl').prop ('checked', true);
+});
+
+$ ('.slug-source').keyup (function () {
+ var source = $ (this);
+ var target = $ ('.slug-target');
+ var locked = $ ('#lockUrl');
+
+ if (!locked.is (':checked'))
+ target.val (slugify (source.val (), true));
+});
diff --git a/resources/assets/admin/js/theme.js b/resources/assets/admin/js/theme.js
new file mode 100644
index 00000000..506a8f9b
--- /dev/null
+++ b/resources/assets/admin/js/theme.js
@@ -0,0 +1,316 @@
+var config = window.config = {};
+
+// Config reference element
+var $ref = $ ("#ref");
+
+// Configure responsive bootstrap toolkit
+config.ResponsiveBootstrapToolkitVisibilityDivs = {
+ 'xs': $ ('
'),
+ 'sm': $ ('
'),
+ 'md': $ ('
'),
+ 'lg': $ ('
'),
+ 'xl': $ ('
')
+};
+
+ResponsiveBootstrapToolkit.use ('Custom', config.ResponsiveBootstrapToolkitVisibilityDivs);
+
+//validation configuration
+config.validations = {
+ debug: true,
+ errorClass: 'has-error',
+ validClass: 'success',
+ errorElement: "span",
+
+ // add error class
+ highlight: function (element, errorClass, validClass) {
+ $ (element).parents ("div.form-group")
+ .addClass (errorClass)
+ .removeClass (validClass);
+ },
+
+ // add error class
+ unhighlight: function (element, errorClass, validClass) {
+ $ (element).parents (".has-error")
+ .removeClass (errorClass)
+ .addClass (validClass);
+ },
+
+ // submit handler
+ submitHandler: function (form) {
+ form.submit ();
+ }
+};
+
+//delay time configuration
+config.delayTime = 50;
+
+// chart configurations
+config.chart = {};
+
+/***********************************************
+ * Animation Settings
+ ***********************************************/
+function animate(options) {
+ var animationName = "animated " + options.name;
+ var animationEnd = "webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend";
+ $ (options.selector)
+ .addClass (animationName)
+ .one (animationEnd,
+ function () {
+ $ (this).removeClass (animationName);
+ }
+ );
+}
+
+$ (function () {
+ var $itemActions = $ (".item-actions-dropdown");
+
+ $ (document).on ('click', function (e) {
+ if (!$ (e.target).closest ('.item-actions-dropdown').length) {
+ $itemActions.removeClass ('active');
+ }
+ });
+
+ $ ('.item-actions-toggle-btn').on ('click', function (e) {
+ e.preventDefault ();
+
+ var $thisActionList = $ (this).closest ('.item-actions-dropdown');
+
+ $itemActions.not ($thisActionList).removeClass ('active');
+
+ $thisActionList.toggleClass ('active');
+ });
+});
+
+function setSameHeights($container) {
+
+ $container = $container || $ ('.sameheight-container');
+
+ var viewport = ResponsiveBootstrapToolkit.current ();
+
+ $container.each (function () {
+
+ var $items = $ (this).find (".sameheight-item");
+
+ // Get max height of items in container
+ var maxHeight = 0;
+
+ $items.each (function () {
+ $ (this).css ({height: 'auto'});
+ maxHeight = Math.max (maxHeight, $ (this).innerHeight ());
+ });
+
+ // Set heights of items
+ $items.each (function () {
+ // Ignored viewports for item
+ var excludedStr = $ (this).data ('exclude') || '';
+ var excluded = excludedStr.split (',');
+
+ // Set height of element if it's not excluded on
+ if (excluded.indexOf (viewport) === -1) {
+ $ (this).innerHeight (maxHeight);
+ }
+ });
+ });
+}
+
+$ (function () {
+ animate ({
+ name: 'flipInY',
+ selector: '.error-card > .error-title-block'
+ });
+
+ setTimeout (function () {
+ var $el = $ ('.error-card > .error-container');
+
+ animate ({
+ name: 'fadeInUp',
+ selector: $el
+ });
+
+ $el.addClass ('visible');
+ }, 500);
+});
+
+$ (function () {
+
+ $ ('#sidebar-menu, #customize-menu').metisMenu ({
+ activeClass: 'open'
+ });
+
+ $ ('#sidebar-collapse-btn').on ('click', function (event) {
+ event.preventDefault ();
+
+ $ ("#app").toggleClass ("sidebar-open");
+ });
+
+ $ ("#sidebar-overlay").on ('click', function () {
+ $ ("#app").removeClass ("sidebar-open");
+ });
+
+});
+$ (function () {
+
+ $ ('.actions-list > li').on ('click', '.check', function (e) {
+ e.preventDefault ();
+
+ $ (this).parents ('.tasks-item')
+ .find ('.checkbox')
+ .prop ("checked", true);
+
+ // removeActionList ();
+ });
+
+});
+
+$ (function () {
+ $ ('.nav-profile > li > a').on ('click', function () {
+ var $el = $ (this).next ();
+
+ animate ({
+ name: 'flipInX',
+ selector: $el
+ });
+ });
+});
+
+$ (function () {
+ // Local storage settings
+ var themeSettings = getThemeSettings ();
+
+ // Elements
+
+ var $app = $ ('#app');
+ var $styleLink = $ ('#theme-style');
+ var $customizeMenu = $ ('#customize-menu');
+
+ // Color switcher
+ var $customizeMenuColorBtns = $customizeMenu.find ('.color-item');
+
+ // Position switchers
+ var $customizeMenuRadioBtns = $customizeMenu.find ('.radio');
+
+ /************************************************
+ * Initial State
+ *************************************************/
+
+ setThemeSettings ();
+
+ setSameHeights ();
+
+ /************************************************
+ * Events
+ *************************************************/
+
+ // set theme type
+ $customizeMenuColorBtns.on ('click', function () {
+ themeSettings.themeName = $ (this).data ('theme');
+
+ setThemeSettings ();
+ });
+
+ $customizeMenuRadioBtns.on ('click', function () {
+
+ var optionName = $ (this).prop ('name');
+ themeSettings[optionName] = $ (this).val ();
+
+ setThemeSettings ();
+ });
+
+ function setThemeSettings() {
+ setThemeState ()
+ .delay (config.delayTime)
+ .queue (function (next) {
+
+ setThemeColor ();
+ setThemeControlsState ();
+ saveThemeSettings ();
+
+ $ (document).trigger ("themechange");
+
+ next ();
+ });
+ }
+
+ /************************************************
+ * Update theme based on options
+ *************************************************/
+
+ function setThemeState() {
+ // set theme type
+ if (themeSettings.themeName) {
+ $styleLink.attr ('href', window.cssPath + '/app-' + themeSettings.themeName + '.css');
+ }
+ else {
+ $styleLink.attr ('href', window.cssPath + '/app.css');
+ }
+ // App classes
+ $app.removeClass ('header-fixed footer-fixed sidebar-fixed');
+
+ // set header
+ $app.addClass (themeSettings.headerPosition);
+
+ // set footer
+ $app.addClass (themeSettings.footerPosition);
+
+ // set footer
+ $app.addClass (themeSettings.sidebarPosition);
+
+ return $app;
+ }
+
+ /************************************************
+ * Update theme controls based on options
+ *************************************************/
+
+ function setThemeControlsState() {
+ // set color switcher
+ $customizeMenuColorBtns.each (function () {
+ if ($ (this).data ('theme') === themeSettings.themeName) {
+ $ (this).addClass ('active');
+ }
+ else {
+ $ (this).removeClass ('active');
+ }
+ });
+
+ // set radio buttons
+ $customizeMenuRadioBtns.each (function () {
+ var name = $ (this).prop ('name');
+ var value = $ (this).val ();
+
+ if (themeSettings[name] === value) {
+ $ (this).prop ("checked", true);
+ }
+ else {
+ $ (this).prop ("checked", false);
+ }
+ });
+ }
+
+ /************************************************
+ * Update theme color
+ *************************************************/
+ function setThemeColor() {
+ config.chart.colorPrimary = tinycolor ($ref.find (".chart .color-primary").css ("color"));
+ config.chart.colorSecondary = tinycolor ($ref.find (".chart .color-secondary").css ("color"));
+ }
+
+ /************************************************
+ * Storage Functions
+ *************************************************/
+
+ function getThemeSettings() {
+ var settings = (localStorage.getItem ('themeSettings')) ? JSON.parse (localStorage.getItem ('themeSettings')) : {};
+
+ settings.headerPosition = settings.headerPosition || '';
+ settings.sidebarPosition = settings.sidebarPosition || '';
+ settings.footerPosition = settings.footerPosition || '';
+
+ return settings;
+ }
+
+ function saveThemeSettings() {
+ localStorage.setItem ('themeSettings', JSON.stringify (themeSettings));
+ }
+});
\ No newline at end of file
diff --git a/resources/assets/sass/admin/_common/_styles/layout.scss b/resources/assets/sass/admin/_common/_styles/layout.scss
index 47b0ec98..a5c1edef 100644
--- a/resources/assets/sass/admin/_common/_styles/layout.scss
+++ b/resources/assets/sass/admin/_common/_styles/layout.scss
@@ -3,8 +3,8 @@
.row {
.col {
- padding-left: $grid-gutter-width/2;
- padding-right: $grid-gutter-width/2;
+ padding-left: $grid-gutter-width-base/2;
+ padding-right: $grid-gutter-width-base/2;
float: left;
}
}
diff --git a/resources/assets/sass/admin/_common/items-list.scss b/resources/assets/sass/admin/_common/items-list.scss
index dcd99ce7..f0c3bd4a 100644
--- a/resources/assets/sass/admin/_common/items-list.scss
+++ b/resources/assets/sass/admin/_common/items-list.scss
@@ -1,386 +1,390 @@
@import "../imports";
-
-
/* *******************************************
* Item List general styles
********************************************** */
.item-list {
- list-style: none;
- padding: 0;
- margin: 0;
- margin-bottom: 0;
- line-height: $item-list-line-height;
-
- @include media(lg) {
- font-size: 1rem;
- }
+ list-style: none;
+ padding: 0;
+ margin: 0;
+ line-height: $item-list-line-height;
- @include media(md) {
- font-size: 0.95rem;
- }
+ @include media(lg) {
+ font-size: 1rem;
+ }
- @include media-down(sm) {
- font-size: 1.05rem;
- }
+ @include media(md) {
+ font-size: 0.95rem;
+ }
- display: flex;
- flex-flow: column nowrap;
+ @include media-down(sm) {
+ font-size: 1.05rem;
+ }
- &.striped {
- & > li {
- border-bottom: 1px solid $item-list-color-border;
- }
-
- & > li:nth-child(2n + 1) {
- background-color: lighten($color-divider, 12%);
-
- @include media-down(sm) {
- background-color: lighten($color-divider, 11%);
- }
- }
-
- .item-list-footer {
- border-bottom: none;
- }
- }
+ display: flex;
+ flex-flow: column nowrap;
}
+ .striped {
+ & > div, & tr {
+ border-bottom: 1px solid $item-list-color-border;
+ }
+
+ & > div:nth-child(2n + 1), & tr:nth-child(2n + 1) {
+ background-color: lighten($color-divider, 12%);
+
+ @include media-down(sm) {
+ background-color: lighten($color-divider, 11%);
+ }
+ }
+
+ .item-list-footer {
+ border-bottom: none;
+ }
+ }
/* *******************************************
* Item general styles
********************************************** */
-
.item-list {
- .item {
- display: flex;
- flex-direction: column;
- }
- .item-row {
- display: flex;
- align-items: stretch;
- flex-direction: row;
- justify-content: space-between;
- flex-wrap: wrap;
- min-width: 100%;
+ .subpage {
+ padding-left: 35px;
+ }
- &.nowrap {
- flex-wrap: nowrap;
- }
- }
+ .thumbnail {
+ width: 100%;
+ height: 80px;
+ background-size: cover;
+ background-repeat: no-repeat;
+ background-position: center center;
+ }
- .item-col {
- align-items: center;
- display: flex;
- padding: $item-list-padding-y $item-list-padding-x $item-list-padding-y 0;
- flex-basis: 0;
- flex-grow: $item-list-col-grow;
- flex-shrink: $item-list-col-shrink;
- margin-left: auto;
- margin-right: auto;
- min-width: 0;
+ .item {
+ display: flex;
+ flex-direction: column;
+ }
- &.fixed {
- flex-grow: 0;
- flex-shrink: 0;
- flex-basis: auto;
- }
+ .item-row {
+ display: flex;
+ align-items: stretch;
+ flex-direction: row;
+ justify-content: space-between;
+ flex-wrap: wrap;
+ min-width: 100%;
- &.pull-left {
- margin-right: auto;
- }
+ &.nowrap {
+ flex-wrap: nowrap;
+ }
+ }
- &.pull-right {
- margin-left: auto;
- }
+ .item-col {
+ align-items: center;
+ display: flex;
+ padding: $item-list-padding-y $item-list-padding-x $item-list-padding-y 0;
+ flex-basis: 0;
+ flex-grow: $item-list-col-grow;
+ flex-shrink: $item-list-col-shrink;
+ margin-left: auto;
+ margin-right: auto;
+ min-width: 0;
- & > div {
- width: 100%;
- }
+ &.fixed {
+ flex-grow: 0;
+ flex-shrink: 0;
+ flex-basis: auto;
+ }
- &:last-child {
- padding-right: 0;
- }
- }
+ &.pull-left {
+ margin-right: auto;
+ }
- .no-overflow {
- overflow: hidden;
- }
+ &.pull-right {
+ margin-left: auto;
+ }
- .no-wrap {
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- }
+ & > div {
+ width: 100%;
+ }
+
+ &:last-child {
+ padding-right: 0;
+ }
+ }
+
+ .no-overflow {
+ overflow: hidden;
+ }
+
+ .no-wrap {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
}
-
/* *******************************************
* Item components
********************************************** */
-
.item-list {
- /********************************************
- * Header
- *********************************************/
+ /********************************************
+ * Header
+ *********************************************/
- .item-list-header {
- .item-col.item-col-header {
- span {
- color: #999;
- font-size: 0.8rem;
- font-weight: 700 !important;
- }
- }
- }
+ .item-list-header {
+ .item-col.item-col-header {
+ span {
+ color: #999;
+ font-size: 0.8rem;
+ font-weight: 700 !important;
+ }
+ }
+ }
- /********************************************
- * Heading
- *********************************************/
+ /********************************************
+ * Heading
+ *********************************************/
- .item-heading {
- font-size: 0.9rem;
- display: none;
- color: #666;
- font-weight: 700;
- padding-right: $item-list-padding-x;
+ .item-heading {
+ font-size: 0.9rem;
+ display: none;
+ color: #666;
+ font-weight: 700;
+ padding-right: $item-list-padding-x;
- @include media-down(sm) {
- display: block;
- }
+ @include media-down(sm) {
+ display: block;
+ }
- @include media(sm) {
- width: 100%;
- }
+ @include media(sm) {
+ width: 100%;
+ }
- @include media(xs) {
- width: 40%;
- }
- }
+ @include media(xs) {
+ width: 40%;
+ }
+ }
- /********************************************
- * Checkbox
- *********************************************/
+ /********************************************
+ * Checkbox
+ *********************************************/
- .item-col.item-col-check {
- flex-basis: 20px + $item-list-padding-x;
+ .item-col.item-col-check {
+ flex-basis: 20px + $item-list-padding-x;
- @include media-down(sm) {
- order: -8;
- }
- }
+ @include media-down(sm) {
+ order: -8;
+ }
+ }
- .item-check {
- margin-bottom: 0;
+ .item-check {
+ margin-bottom: 0;
- .checkbox + span {
- padding-right: 0;
+ .checkbox + span {
+ padding-right: 0;
- &:before {
- width: 20px;
- }
- }
- }
+ &:before {
+ width: 20px;
+ }
+ }
+ }
- /********************************************
- * Image
- *********************************************/
+ /********************************************
+ * Image
+ *********************************************/
- .item-col.item-col-img {
- display: flex;
- flex-basis: 60px + $item-list-padding-x;
+ .item-col.item-col-img {
+ display: flex;
+ flex-basis: 60px + $item-list-padding-x;
- &.xs{
- flex-basis: 30px + $item-list-padding-x;
- }
+ &.xs {
+ flex-basis: 30px + $item-list-padding-x;
+ }
- &.sm {
- flex-basis: 40px + $item-list-padding-x;
- }
+ &.sm {
+ flex-basis: 40px + $item-list-padding-x;
+ }
- &.lg {
- flex-basis: 90px + $item-list-padding-x;
- }
+ &.lg {
+ flex-basis: 90px + $item-list-padding-x;
+ }
- &.xl {
- flex-basis: 110px + $item-list-padding-x;
- }
+ &.xl {
+ flex-basis: 110px + $item-list-padding-x;
+ }
- a {
- width: 100%;
- // display: flex;
- }
- }
+ a {
+ width: 100%;
+ // display: flex;
+ }
+ }
- .item-img {
- flex-grow: 1;
- align-self: stretch;
- background-color: #efefef;
- padding-bottom: 100%;
- width: 100%;
- height: 0;
+ .item-img {
+ flex-grow: 1;
+ align-self: stretch;
+ background-color: #EFEFEF;
+ padding-bottom: 100%;
+ width: 100%;
+ height: 0;
- @include bg-cover();
- }
+ @include bg-cover();
+ }
- /********************************************
- * Title
- *********************************************/
+ /********************************************
+ * Title
+ *********************************************/
- .item-col.item-col-title {
+ .item-col.item-col-title {
- @include media-down(sm) {
- order: -4;
- }
+ @include media-down(sm) {
+ order: -4;
+ }
- a {
- display: block;
- }
- }
+ a {
+ display: block;
+ }
+ }
- .item-title {
- margin: 0;
- font-size: inherit;
- line-height: inherit;
- font-weight: 600;
- }
+ .item-title {
+ margin: 0;
+ font-size: inherit;
+ line-height: inherit;
+ font-weight: 600;
+ }
- /********************************************
- * Stats
- *********************************************/
+ /********************************************
+ * Stats
+ *********************************************/
- .item-stats {
- height: $item-list-line-height;
- }
+ .item-stats {
+ height: $item-list-line-height;
+ }
- /********************************************
- * Actions
- *********************************************/
+ /********************************************
+ * Actions
+ *********************************************/
- .item-col.item-col-actions-dropdown {
- flex-basis: 30px + $item-list-padding-x;
- text-align: center;
- padding-left: 0 !important;
+ .item-col.item-col-actions-dropdown {
+ flex-basis: 30px + $item-list-padding-x;
+ text-align: center;
+ padding-left: 0 !important;
- @include media-down(sm) {
- order: -3;
+ @include media-down(sm) {
+ order: -3;
- flex-basis: 30px + $item-list-padding-x !important;
- padding-right: $item-list-padding-x;
- }
- }
+ flex-basis: 30px + $item-list-padding-x !important;
+ padding-right: $item-list-padding-x;
+ }
+ }
- .item-actions-dropdown {
- position: relative;
- font-size: 1.1rem;
+ .item-actions-dropdown {
+ position: relative;
+ font-size: 1.1rem;
- &.active {
- .item-actions-block {
- max-width: 120px;
- }
+ &.active {
+ .item-actions-block {
+ max-width: 120px;
+ }
- .item-actions-toggle-btn {
- color: $color-primary;
+ .item-actions-toggle-btn {
+ color: $color-primary;
- .active {
- display: block;
- }
+ .active {
+ display: block;
+ }
- .inactive {
- display: none;
- }
- }
- }
+ .inactive {
+ display: none;
+ }
+ }
+ }
- .item-actions-toggle-btn {
- color: lighten($color-text-light, 10);
- font-size: 1.2rem;
- cursor: pointer;
- width: 100%;
- line-height: 30px;
- text-align: center;
- text-decoration: none;
+ .item-actions-toggle-btn {
+ color: lighten($color-text-light, 10);
+ font-size: 1.2rem;
+ cursor: pointer;
+ width: 100%;
+ line-height: 30px;
+ text-align: center;
+ text-decoration: none;
- .active {
- display: none;
- }
- }
+ .active {
+ display: none;
+ }
+ }
- .item-actions-block {
- height: 30px;
- max-width: 0px;
- line-height: 30px;
- overflow: hidden;
- position: absolute;
- top: 0;
- right: 100%;
- background-color: $color-divider;
- border-radius: 3px;
- transition: all 0.15s ease-in-out;
+ .item-actions-block {
+ height: 30px;
+ max-width: 0px;
+ line-height: 30px;
+ overflow: hidden;
+ position: absolute;
+ top: 0;
+ right: 100%;
+ background-color: $color-divider;
+ border-radius: 3px;
+ transition: all 0.15s ease-in-out;
- &.direction-right {
- right: auto;
- left: 100%;
- }
+ &.direction-right {
+ right: auto;
+ left: 100%;
+ }
+ .item-actions-list {
+ padding: 0;
+ list-style: none;
+ white-space: nowrap;
+ padding: 0 5px;
- .item-actions-list {
- padding: 0;
- list-style: none;
- white-space: nowrap;
- padding: 0 5px;
+ li {
+ display: inline-block;
+ padding: 0;
+ }
- li{
- display: inline-block;
- padding: 0;
- }
+ a {
+ display: block;
+ padding: 0 5px;
- a {
- display: block;
- padding: 0 5px;
+ &.edit {
+ color: #38424C;
+ }
- &.edit {
- color: #38424C;
- }
+ &.check {
+ color: #40B726;
+ }
- &.check {
- color: #40B726;
- }
+ &.remove {
+ color: #DB0E1E;
+ }
+ }
+ }
+ }
- &.remove {
- color: #DB0E1E;
- }
- }
- }
- }
+ }
- }
-
- /********************************************
- * Something else?
- *********************************************/
+ /********************************************
+ * Something else?
+ *********************************************/
}
-
/* *******************************************
* Adjustments
********************************************** */
// Item which is located inside card inside item-list
.card > .item-list .item > .item-row {
- padding: 0 $card-padding-x;
+ padding: 0 $card-padding-x;
- @include media(xl) {
- padding: 0 $card-padding-x-xl;
- }
+ @include media(xl) {
+ padding: 0 $card-padding-x-xl;
+ }
- @include media-down(sm) {
- padding: 0 $card-padding-x-sm;
- }
+ @include media-down(sm) {
+ padding: 0 $card-padding-x-sm;
+ }
}
\ No newline at end of file
diff --git a/resources/assets/sass/admin/app/items/list/items-list.scss b/resources/assets/sass/admin/app/items/list/items-list.scss
index bd9eb441..c5fff005 100644
--- a/resources/assets/sass/admin/app/items/list/items-list.scss
+++ b/resources/assets/sass/admin/app/items/list/items-list.scss
@@ -1,5 +1,9 @@
@import "../../../imports";
+.item-list {
+
+}
+
.items-list-page {
.title-search-block {
@@ -313,12 +317,7 @@
text-align: left;
}
-
}
-
-
}
}
-
-
}
\ No newline at end of file
diff --git a/resources/lang/cs/admin/actionLog.php b/resources/lang/cs/admin/actionLog.php
index 66fd4f6d..75b32942 100644
--- a/resources/lang/cs/admin/actionLog.php
+++ b/resources/lang/cs/admin/actionLog.php
@@ -1,51 +1,53 @@
"Přiřadil widget :widgetName (#:widgetId) do plochy :widgetAreaName (#:widgetAreaId)",
- "changeSettings" => "Změna nastavení",
- "createNewContent" => "Vytvořena nová obsahová stránka. Titulek :title , url :url a ID #:id",
- "createUser" => "Vytvořen nový uživatel :name s e-mailem :email.",
- "deleteContent" => 'Smazána stránka ":title", url "url a ID #:id. Tato změna je zaznamenána v revizi :revision.',
- "deleteCustomField" => "a",
- "deleteWidgetArea" => "Smazal plochu pro widget :name",
- "displayingUsersActions" => "Zobrazuji všechny akce od uživatele :name (:email).",
- "draftFromContent" => "Upraven widget :name (#:id)",
- "editContent" => 'Editace stránky - nový titulek je ":title", url :url a ID #:id. Revize změny: :revision.',
- "editCustomField" => "a",
- "editWidget" => "Upraven widget :name (#:id)",
- "editWidgetArea" => 'Upravena plocha pro widgety :name (#:id) s popisem ":description"',
- "invalidEditContentAttempt" => "Pokus o editaci obsahu s ID :contentId",
- "ip" => "IP adresa",
- "login" => "Přihlášen",
- "logout" => "Odhlášen",
- "nameAssignWidget" => "Přiřazení widgetu",
- "nameChangeSettings" => "Změna nastavení",
- "nameCreateNewContent" => "Vytvoření nové stránky",
- "nameCreateUser" => "Vytvořen uživatel",
- "nameDeleteContent" => "Smazání stránky",
- "nameDeleteCustomField" => "Smazání uživatelského pole",
- "nameDeleteWidgetArea" => "Smazání plochy pro widgety",
- "nameDraftFromContent" => "Vytvoření konceptu z publikované stránky",
- "nameEditContent" => "Úprava obsahu",
- "nameEditCustomField" => "Editace uživatelského pole",
- "nameEditWidget" => "Úprava widgetu",
- "nameEditWidgetArea" => "Úprava plochy pro widgety",
+ "assignWidget" => "Přiřadil widget :widgetName (#:widgetId) do plochy :widgetAreaName (#:widgetAreaId)",
+ "changeSettings" => "Změna nastavení",
+ "createNewContent" => "Vytvořena nová obsahová stránka. Titulek :title , url :url a ID #:id",
+ "createUser" => "Vytvořen nový uživatel :name s e-mailem :email.",
+ "deleteContent" => 'Smazána stránka ":title", url "url a ID #:id. Tato změna je zaznamenána v revizi :revision.',
+ "deleteCustomField" => "a",
+ "deleteWidgetArea" => "Smazal plochu pro widget :name",
+ "displayingUsersActions" => "Zobrazuji všechny akce od uživatele :name (:email).",
+ "draftFromContent" => "Upraven widget :name (#:id)",
+ "editContent" => 'Editace stránky - nový titulek je ":title", url :url a ID #:id. Revize změny: :revision.',
+ "editCustomField" => "a",
+ "editWidget" => "Upraven widget :name (#:id)",
+ "editWidgetArea" => 'Upravena plocha pro widgety :name (#:id) s popisem ":description"',
+ "invalidEditContentAttempt" => "Pokus o editaci obsahu s ID :contentId",
+ "ip" => "IP adresa",
+ "login" => "Přihlášen",
+ "logout" => "Odhlášen",
+ "nameAssignWidget" => "Přiřazení widgetu",
+ "nameChangeSettings" => "Změna nastavení",
+ "nameCreateNewContent" => "Vytvoření nové stránky",
+ "nameCreateUser" => "Vytvořen uživatel",
+ "nameDeleteContent" => "Smazání stránky",
+ "nameDeleteCustomField" => "Smazání uživatelského pole",
+ "nameDeleteWidgetArea" => "Smazání plochy pro widgety",
+ "nameDraftFromContent" => "Vytvoření konceptu z publikované stránky",
+ "nameEditContent" => "Úprava obsahu",
+ "nameEditCustomField" => "Editace uživatelského pole",
+ "nameEditWidget" => "Úprava widgetu",
+ "nameEditWidgetArea" => "Úprava plochy pro widgety",
"nameInvalidEditContentAttempt" => "Pokus o editaci neexistující/neplatné stránky",
- "nameLogin" => "Login",
- "nameLogout" => "Odhlášení",
- "nameNewCustomField" => "Vytvoření uživatelského pole",
- "nameNewWidget" => "Nový widget",
- "nameNewWidgetArea" => "Vytoření plochy pro widgety",
- "namePublishContent" => "Publikace stránky",
- "nameRemoveWidgetFromArea" => "Odebrání widgetu z plochy",
- "nameSetHomepage" => "Nastavení domovské stránky",
- "nameUserEdit" => "Editace uživatele",
- "newCustomField" => 'Přidal nové uživatelské pole s ID #:id a jménem ":name"',
- "newWidget" => 'Vytvořen nový widget :type se jménem :name (#:id) a popisem ":description".',
- "newWidgetArea" => 'Vytvořil plochu pro widgety :name (#:id) s popisem ":description"',
- "overview" => "Seznam všech akcí",
- "publishContent" => 'Publikována stránka ":title" (url :url, ID #:id). Revize :revision.',
- "removeWidgetFromArea" => "Odebrán widget :widgetName z oblasti :widgetAreaName (#widgetAreaId)",
- "setHomepage" => "Nastavena nová domovská stránka: :title, URL: :url a ID #:id. Revize :revision.",
- "userAgent" => "Prohlížeč",
- "userEdit" => "Upravil uživatele :name (:email)",
+ "nameLogin" => "Login",
+ "nameLogout" => "Odhlášení",
+ "nameNewCustomField" => "Vytvoření uživatelského pole",
+ "nameNewWidget" => "Nový widget",
+ "nameNewWidgetArea" => "Vytoření plochy pro widgety",
+ "namePublishContent" => "Publikace stránky",
+ "nameRemoveWidgetFromArea" => "Odebrání widgetu z plochy",
+ "nameSetHomepage" => "Nastavení domovské stránky",
+ "nameUserEdit" => "Editace uživatele",
+ "newCustomField" => 'Přidal nové uživatelské pole s ID #:id a jménem ":name"',
+ "newWidget" => 'Vytvořen nový widget :type se jménem :name (#:id) a popisem ":description".',
+ "newWidgetArea" => 'Vytvořil plochu pro widgety :name (#:id) s popisem ":description"',
+ "overview" => "Seznam všech akcí",
+ "publishContent" => 'Publikována stránka ":title" (url :url, ID #:id). Revize :revision.',
+ "removeWidgetFromArea" => "Odebrán widget :widgetName z oblasti :widgetAreaName (#widgetAreaId)",
+ "setHomepage" => "Nastavena nová domovská stránka: :title, URL: :url a ID #:id. Revize :revision.",
+ "userAgent" => "Prohlížeč",
+ "userEdit" => "Upravil uživatele :name (:email)",
+ 'newFile' => 'Nahrál soubor :name (typ :mime)',
+ 'nameNewFile' => 'Nahrání souboru'
];
diff --git a/resources/lang/cs/admin/common.php b/resources/lang/cs/admin/common.php
index 6f0180de..a8cc3e2c 100644
--- a/resources/lang/cs/admin/common.php
+++ b/resources/lang/cs/admin/common.php
@@ -7,5 +7,6 @@ return [
"logoutSuccessfull" => "Odhlášení proběhlo úspěšně",
"no" => "Ne",
"yes" => "Ano",
- 'empty' => 'Žádná data nebyla nalezena.'
+ 'empty' => 'Žádná data nebyla nalezena.',
+ "noSearchEngine" => 'Není dostupný žádný vyhledávač.'
];
diff --git a/resources/lang/cs/admin/contents.php b/resources/lang/cs/admin/contents.php
index f4ce8ddd..1e84ba2a 100644
--- a/resources/lang/cs/admin/contents.php
+++ b/resources/lang/cs/admin/contents.php
@@ -35,10 +35,10 @@ return [
"noHomepage" => "Domovská stránka není nastavena (a nebo je nastavena jako Koncept)! Vyberte prosím jinou stránku, nebo stávající publikujte.",
"noPagesAvailable" => "Nejsou dostupné žádné stránky. Pro zobrazení přehledu nejprve nějakou vytvořte.",
"noParentPage" => "-- Nadřazená stránka nevybrána --",
- "noTemplates" => "Nelze vytvořit stránku. Pro tento modul neexistuje žádná šablona, která by šla použít pro vykreslení obsahu.",
+ "noTemplates" => "Pro tento modul neexistuje žádná šablona, která by šla použít pro vykreslení obsahu. Nebude možné tuto stránku zobrazit!",
"nothingToEdit" => "Nebyly provedeny žádné změny, proto nedošlo k editaci.",
"overview" => "Seznam všech obsahových stránek",
- "pageDeleted" => "Stránka :name (:url) úspěšně smazána.",
+ "pageDeleted" => "Stránka :name úspěšně smazána.",
"parentPage" => "Nadřazená stránka",
"publicationOptions" => "Nastavení publikace",
"save" => "Uložit",
@@ -56,4 +56,6 @@ return [
"title" => "Titulek",
"uploadTitleImage" => "Nahrát titulní obrázek",
"viewPage" => "Zobrazit",
+ 'setOrder' => 'Nastavení pořadí stránek',
+ 'orderSuccessfullySet' => 'Pořadí stránek úspěšně nastaveno',
];
diff --git a/resources/lang/cs/admin/history.php b/resources/lang/cs/admin/history.php
index f0191438..72ed3fa5 100644
--- a/resources/lang/cs/admin/history.php
+++ b/resources/lang/cs/admin/history.php
@@ -6,7 +6,7 @@ return [
"changedFromTo" => "Změna z :from na :to ",
"columnCategory" => "Kategorie",
"columnFile" => "Přiřazené soubory",
- "columnIs_homepage" => "Domovská stránka",
+ "columnIsHomepage" => "Domovská stránka",
"columnMetaDescription" => "Popis",
"columnMetaKeywords" => "Klíčová slova",
"columnPageContent" => "Obsah stránky",
@@ -14,6 +14,7 @@ return [
"columnStatus" => "Viditelnost stránky",
"columnTemplate" => "Šablona",
"columnTitle" => "Titulek",
+ "columnTitlePhoto" => "Titulní obrázek",
"columnTitlePhotoFilename" => "Titulní obrázek",
"columnUrl" => "URL",
"deletedFile" => "Odebrán soubor :file.",
diff --git a/resources/lang/cs/admin/loginForm.php b/resources/lang/cs/admin/loginForm.php
index bc8dec7a..d6236905 100644
--- a/resources/lang/cs/admin/loginForm.php
+++ b/resources/lang/cs/admin/loginForm.php
@@ -10,4 +10,6 @@ return [
'loginToContinue' => 'Pro vstup je nutné přihlášení',
'yourEmail' => 'Váš e-mail',
'yourPassword' => 'Vaše heslo',
+ 'sendConfirmEmail' => 'Odeslat odkaz pro resetování hesla',
+ 'passwordReset' => 'Nové heslo'
];
diff --git a/resources/lang/cs/admin/mainMenu.php b/resources/lang/cs/admin/mainMenu.php
index 5fa6e0ac..595883d3 100644
--- a/resources/lang/cs/admin/mainMenu.php
+++ b/resources/lang/cs/admin/mainMenu.php
@@ -27,4 +27,6 @@ return [
"widgetAreas" => "Plochy pro widgety",
"widgets" => "Widgety",
"widgetsOverview" => "Všechny widgety",
+ 'permissions' => 'Přístupová práva',
+ 'contentOrder' => 'Pořadí stránek'
];
diff --git a/resources/lang/cs/admin/permissions.php b/resources/lang/cs/admin/permissions.php
new file mode 100644
index 00000000..b45b9125
--- /dev/null
+++ b/resources/lang/cs/admin/permissions.php
@@ -0,0 +1,69 @@
+ 'Výchozí oprávnění úspěšně nastavena.',
+ 'pageTitle' => 'Nastavení výchozích oprávnění',
+ 'description' => 'Nastavte výchozí oprávnění, která budou přidělena nově vytvořeným uživatelům.',
+ 'successfullySet' => 'Oprávnění úspěšně nastavena.',
+ 'contents' => [
+ 'management' => 'Správa obsahu',
+ 'create' => 'Vytvořit novou stránku',
+ 'update' => 'Upravovat své stránky',
+ 'update-all' => 'Upravovat i cizí stránky',
+ 'delete' => 'Mazat',
+ 'set-homepage' => 'Nastavovat domovskou stránku',
+ 'publish' => 'Publikovat',
+ 'protect' => 'Publikovat jen pro přihlášené',
+ 'draft' => 'Skrýt publikovanou stránku',
+ 'view-history' => 'Zobrazit historii',
+ ],
+ 'users' => [
+ 'management' => 'Správa uživatelů',
+ 'create' => 'Vytvořit nového uživatele',
+ 'update' => 'Upravovat ostatní uživatele',
+ 'block' => 'Zablokovat',
+ 'delete' => 'Mazat',
+ 'unblock' => 'Odblokovat',
+ 'set-permissions' => 'Nastavovat oprávnění',
+ 'change-role' => 'Změnit roli',
+ 'change-status' => 'Změnit status uživatele (zablokovat/odblokovat)'
+ ],
+ 'files' => [
+ 'management' => 'Správa souborů',
+ 'upload' => 'Nahrávání',
+ 'update' => 'Úprava',
+ 'delete' => 'Mazání',
+ 'move-to-directories' => 'Přesouvat soubory mezi adresáři'
+ ],
+ 'directories' => [
+ 'management' => 'Správa složek',
+ 'create' => 'Vytváření',
+ 'edit' => 'Úprava',
+ 'delete' => 'Mazání'
+ ],
+ 'widgetareas' => [
+ 'management' => 'Správa ploch pro widgety',
+ 'create' => 'Vytváření',
+ 'edit' => 'Úprava',
+ 'delete' => 'Mazání'
+ ],
+ 'widgets' => [
+ 'management' => 'Správa widgetů',
+ 'create' => 'Vytváření',
+ 'edit' => 'Úprava',
+ 'delete' => 'Mazání',
+ 'assign' => 'Přiřazování widgetů do plochy',
+ 'unassign' => 'Odstraňování widgetů z plochy'
+ ],
+ 'templates' => [
+ 'management' => 'Správa šablon',
+ 'copy' => 'Kopírování',
+ 'edit' => 'Úprava',
+ ],
+ 'actions' => [
+ 'management' => 'Zobrazení přehledu akcí',
+ ],
+ 'settings' => [
+ 'management' => 'Správa nastavení',
+ ],
+ 'save' => 'Uložit výchozí nastavení'
+];
\ No newline at end of file
diff --git a/resources/lang/cs/admin/settings.php b/resources/lang/cs/admin/settings.php
index 4e1ed5ab..e4043ed2 100644
--- a/resources/lang/cs/admin/settings.php
+++ b/resources/lang/cs/admin/settings.php
@@ -21,4 +21,21 @@ return [
],
"socialSites" => "Sociální sítě",
"successfullySaved" => "Nastavení úspěšně změněno",
+ 'advanced' => [
+ "title" => 'Pokročilé',
+ ],
+
+ 'previews' => [
+ 'title' => 'Nastavení obrázkových náhledů',
+ 'quality' => 'Kvalita',
+ 'size' => 'Velikost (v pixelech)'
+ ],
+
+ 'widgets' => [
+ 'title' => 'Widgety',
+ 'useWidgetPreloading' => 'Používat přednačítání widgetů?',
+ 'preloadFrequentedWidgetAreasTreshold' => 'Práh pro přednačtení widgetů',
+ 'widgetCacheLifetime' => 'Platnost cache pro widgety'
+ ]
+
];
diff --git a/resources/lang/cs/admin/templates.php b/resources/lang/cs/admin/templates.php
index 6256abf6..060179da 100644
--- a/resources/lang/cs/admin/templates.php
+++ b/resources/lang/cs/admin/templates.php
@@ -1,23 +1,27 @@
"Adresář nemá potřebná práva k zápisu. Kopírování není dostupné.",
- "cannotWriteContent" => "Nelze uložit obsah šablony, adresář pro uložení souboru nemá dostatečná oprávnění pro zápis. Meta informace k šabloně však byly uloženy.",
- "copyFailed" => "Nelze zkopírovat šablonu do :name. Zkontrolujte prosím právo pro zápis do adresáře s šablonami.",
- "copySuccessfull" => "Šablona :name úspěšně vytvořena zkopírováním z jiné šablony",
- "core" => "Společné šablony",
- "description" => "Popis",
- "edit" => "Úprava šablony :name",
- "editSuccessfull" => "Šablona úspěšně uložena",
- "error" => "Šablony pro zobrazení chyb",
- "homepage" => "Domovská stránka",
- "name" => "Jméno šablony",
- "new" => "Nová šablona",
- "newTemplateName" => "Jméno šablony použité v Blade šablonách",
+ "copy" => 'Kopírovat šablonu',
+ "cannotCopy" => "Adresář nemá potřebná práva k zápisu. Kopírování není dostupné.",
+ "cannotWriteContent" => "Nelze uložit obsah šablony, adresář pro uložení souboru nemá dostatečná oprávnění pro zápis. Meta informace k šabloně však byly uloženy.",
+ "copyFailed" => "Nelze zkopírovat šablonu do :name. Zkontrolujte prosím právo pro zápis do adresáře s šablonami.",
+ "copySuccessfull" => "Šablona :name úspěšně vytvořena zkopírováním z jiné šablony",
+ "core" => "Společné šablony",
+ "description" => "Popis",
+ "edit" => "Úprava šablony :name",
+ "editSuccessfull" => "Šablona úspěšně uložena",
+ "error" => "Šablony pro zobrazení chyb",
+ "homepage" => "Domovská stránka",
+ "name" => "Jméno šablony",
+ "new" => "Nová šablona",
+ "newTemplateName" => "Jméno šablony použité v Blade šablonách",
"newTemplateNameSuffix" => "kopie",
- "noSubdirectories" => "Nejsou k dispozici žádné podadresáře",
- "noTemplates" => "Žádná šablona k dispozici",
- "notWritable" => "Nelze zapisovat do :file. Veškeré úpravy na tomto soubory nebudou uloženy!",
- "overview" => "Šablony",
- "parentDirectory" => "Rodičovský adresář",
- "subdirectories" => "Podadresáře",
+ "noSubdirectories" => "Nejsou k dispozici žádné podadresáře",
+ "noTemplates" => "Žádná šablona k dispozici",
+ "notWritable" => "Nelze zapisovat do :file. Veškeré úpravy na tomto soubory nebudou uloženy!",
+ "overview" => "Šablony",
+ "parentDirectory" => "Rodičovský adresář",
+ "subdirectories" => "Podadresáře",
+ 'widgets' => 'Widgety',
+ 'errors' => 'Chybové stránky',
+ 'contact' => 'Kontaktní formulář'
];
diff --git a/resources/lang/cs/admin/userManagement.php b/resources/lang/cs/admin/userManagement.php
index 0cec8e24..ec7e6a7e 100644
--- a/resources/lang/cs/admin/userManagement.php
+++ b/resources/lang/cs/admin/userManagement.php
@@ -1,32 +1,32 @@
"Přidat nového uživatele",
- "allStatuses" => "Všechny",
- "detail" => "Detaily uživatele :name (:email)",
- "edit" => "Upravit uživatele",
- "editUser" => "Editace uživatele :name (:email)",
- "email" => "E-mail",
- "gravatarLink" => 'Nastavte si avatar na gravatar.com ',
- "moreUserActions" => "Zobrazit více...",
- "name" => "Celé jméno",
- "noActions" => "Uživatel zatím v systému nic neudělal.",
- "noUsers" => "Žádní uživatelé.",
- "overview" => "Seznam všech uživatelů",
- "password" => "Heslo",
- "passwordLeaveEmpty" => "Nevyplňujte, pokud nechcete změnit heslo.",
- "profile" => "Profil uživatele",
- "register" => "Vytvořit uživatele",
+ "addNewUser" => "Přidat nového uživatele",
+ "allStatuses" => "Všechny",
+ "detail" => "Detaily uživatele :name (:email)",
+ "edit" => "Upravit uživatele",
+ "editUser" => "Editace uživatele :name (:email)",
+ "email" => "E-mail",
+ "gravatarLink" => 'Nastavte si avatar na gravatar.com ',
+ "moreUserActions" => "Zobrazit více...",
+ "name" => "Celé jméno",
+ "noActions" => "Uživatel zatím v systému nic neudělal.",
+ "noUsers" => "Žádní uživatelé.",
+ "overview" => "Seznam všech uživatelů",
+ "password" => "Heslo",
+ "passwordLeaveEmpty" => "Nevyplňujte, pokud nechcete změnit heslo.",
+ "profile" => "Profil uživatele",
+ "register" => "Vytvořit uživatele",
"registrationSuccessfull" => "Nový úživatel úspěšně přidán.",
- "role_admin" => "Administrátor",
- "role_editor" => "Editor",
- "role_visitor" => "Návštěvník",
- "roles" => "Prosím, zvolte roli uživatele",
- "status" => "Stav",
- "status_active" => "Aktivní",
- "status_blocked" => "Zablokovaný",
- "status_deleted" => "Smazaný",
- "update" => "Upravit informace",
- "userDetail" => "Informace",
- "userSuccessfullyEdited" => "Uživatel úspěšně upraven.",
- "usersActions" => "Akce uživatele",
+ "role_admin" => "Uživatel s přístupem do administrace",
+ "role_visitor" => "Návštěvník (bez přístupu do administrace)",
+ "roles" => "Prosím, zvolte roli uživatele",
+ "status" => "Stav",
+ "status_active" => "Aktivní",
+ "status_blocked" => "Zablokovaný",
+ "status_deleted" => "Smazaný",
+ "update" => "Upravit informace",
+ "userDetail" => "Informace",
+ "userSuccessfullyEdited" => "Uživatel úspěšně upraven.",
+ "usersActions" => "Akce uživatele",
+ 'permissions' => 'Oprávnění'
];
diff --git a/resources/lang/cs/admin/widgetAreas.php b/resources/lang/cs/admin/widgetAreas.php
index c601cf81..912cefaa 100644
--- a/resources/lang/cs/admin/widgetAreas.php
+++ b/resources/lang/cs/admin/widgetAreas.php
@@ -20,4 +20,5 @@ return [
"successfullyCreated" => "Plocha pro widgety úspěšně vytvořena",
"successfullyDeleted" => "Úspěšně smazáno",
"uniqueCode" => "Unikátní kód",
+ 'pageDescription' => 'Plochy pro widgety jsou oblasti, do kterých je možné přiřadit widgety a následně je zobrazovat na webu.'
];
diff --git a/resources/lang/cs/auth.php b/resources/lang/cs/auth.php
index 3c6641c8..e27fa692 100644
--- a/resources/lang/cs/auth.php
+++ b/resources/lang/cs/auth.php
@@ -1,6 +1,9 @@
"Nelze přistoupit k tomuto zdroji",
- "failed" => "Přihlašovací údaje nejsou správné.",
- "throttle" => "Příliš mnoho neplatných přihlášení. Zkuste to znovu za :seconds sekund.",
+ "accessDenied" => "Nelze přistoupit k tomuto zdroji",
+ "failed" => "Přihlašovací údaje nejsou správné.",
+ "throttle" => "Příliš mnoho neplatných přihlášení. Zkuste to znovu za :seconds sekund.",
+ 'userNotActive' => 'Uživatel nebyl aktivován, či byl administrátorem zablokován.',
+ 'visitorInAdmin' => 'Návštěvník nemá oprávnění do adminstrace!',
+ 'loginExpired' => 'Vaše přihlášení expirovalo. Přihlašte se prosím znovu.'
];
diff --git a/resources/lang/cs/common.php b/resources/lang/cs/common.php
index 763c5c6c..2a258214 100644
--- a/resources/lang/cs/common.php
+++ b/resources/lang/cs/common.php
@@ -28,5 +28,7 @@ return [
"positionStatic" => "statické",
"sidebar" => "Sidebar",
'no' => 'Ne',
- 'yes' => 'Ano'
+ 'yes' => 'Ano',
+ 'minutes' => 'minut',
+ 'views' => 'zobrazení'
];
diff --git a/resources/lang/cs/notification.php b/resources/lang/cs/notification.php
new file mode 100644
index 00000000..d79ea618
--- /dev/null
+++ b/resources/lang/cs/notification.php
@@ -0,0 +1,9 @@
+ [
+ 'firstLine' => 'Dostali jste tento e-mail, protože byl zaslán požadavek na reset hesla. Pro nastavení nového hesla klikněte na následující tlačítko:',
+ 'lastLine' => 'V případě, že tento e-mail neočekáváte, můžete ho klidně ignorovat.',
+ 'button' => 'Resetovat heslo',
+ 'subject' => 'Odkaz pro změnu hesla'
+ ]
+];
\ No newline at end of file
diff --git a/resources/lang/cs/register.php b/resources/lang/cs/register.php
new file mode 100644
index 00000000..38d8ec29
--- /dev/null
+++ b/resources/lang/cs/register.php
@@ -0,0 +1,10 @@
+ 'Registrace nového uživatele',
+ 'name' => 'Jméno',
+ 'email' => 'E-mail',
+ 'password' => 'Heslo',
+ 'passwordConfirm' => 'Heslo (znovu)',
+ 'register' => 'Vytvořit účet',
+ 'setNewPassword' => 'Nastavit nové heslo'
+];
\ No newline at end of file
diff --git a/resources/lang/cs/widgets/common.php b/resources/lang/cs/widgets/common.php
index 5d545038..49bf9a4d 100644
--- a/resources/lang/cs/widgets/common.php
+++ b/resources/lang/cs/widgets/common.php
@@ -1,9 +1,10 @@
"HTML třída použitá pro obalový element widgetu",
- "containerId" => "Unikátní ID widgetu (může být i prázdné)",
- "description" => "Popis",
- "edit" => "Upravuji widget :name",
- "name" => "Jméno",
- "new" => "Vytvořit nový widget"
+"containerClass" => "HTML třída použitá pro obalový element widgetu",
+"containerId" => "Unikátní ID widgetu (může být i prázdné)",
+"description" => "Popis",
+"edit" => "Upravuji widget :name",
+"name" => "Jméno",
+"new" => "Vytvořit nový widget",
+"widgetDescription" => "Jednoduchý widget pro vkládání HTML kódů.",
];
diff --git a/resources/lang/cs/widgets/orbitSlider.php b/resources/lang/cs/widgets/orbitSlider.php
deleted file mode 100644
index 3ac4aab9..00000000
--- a/resources/lang/cs/widgets/orbitSlider.php
+++ /dev/null
@@ -1,21 +0,0 @@
- "Dodatečný HTML/JS kód pro slider",
-"containerClass" => "HTML třída pro obalový element tohoto widgetu",
-"createNew" => "Vytvořit nový",
-"description" => "Popis",
-"displayBullets" => "Zobrazit odrážky?",
-"edit" => "Upravit :name",
-"editExisting" => "Uložit",
-"extraSettings" => "Další nastavení",
-"fullscreen" => "Zobrazit slider na celou obrazovku",
-"imagesPerSlide" => "Obrázků na slide",
-"name" => "Jméno slideru",
-"new" => "Vytvořit nový slider",
-"preview" => "Náhled",
-"showInFullscreen" => "Zobrazit na celou obrazovku",
-"slideContainerClass" => "HTML třída pro každý obrázek ve slideru",
-"upload" => "Přidat obrázky do slideru",
-"widgetDescription" => "Slider pro obrázky. Tento widget používá Foundation framework a jeho vlastní slider zvaný Orbit. (Nebude fungovat bez Foundation 6!)",
-"widgetName" => "Orbit slider",
-];
diff --git a/resources/lang/cs/widgets/socialButtons.php b/resources/lang/cs/widgets/socialButtons.php
new file mode 100644
index 00000000..987ef446
--- /dev/null
+++ b/resources/lang/cs/widgets/socialButtons.php
@@ -0,0 +1,16 @@
+ "HTML kod",
+"containerClass" => "HTML třída pro obalový element tohoto widgetu",
+"createNew" => "Vytvořit nový widget",
+"description" => "Popis",
+"edit" => "Edituji widget :name",
+"editExisting" => "Upravit widget",
+"name" => "Jméno",
+"new" => "Vytvořit nový widget",
+"preview" => "Náhled",
+"save" => "Uložit",
+"successfullyEdited" => "Widget úspěšně upraven",
+"widgetDescription" => "Jednoduchý widget pro vkládání sociálních tlačítek.",
+"widgetName" => "Sociální tlačítka",
+];
diff --git a/resources/views/admin/content/_partials/orderSetupRow.blade.php b/resources/views/admin/content/_partials/orderSetupRow.blade.php
new file mode 100644
index 00000000..db691d26
--- /dev/null
+++ b/resources/views/admin/content/_partials/orderSetupRow.blade.php
@@ -0,0 +1,16 @@
+
\ No newline at end of file
diff --git a/resources/views/admin/content/_partials/overviewRow.blade.php b/resources/views/admin/content/_partials/overviewRow.blade.php
new file mode 100644
index 00000000..12ed6919
--- /dev/null
+++ b/resources/views/admin/content/_partials/overviewRow.blade.php
@@ -0,0 +1,137 @@
+
\ No newline at end of file
diff --git a/resources/views/admin/content/edit.blade.php b/resources/views/admin/content/edit.blade.php
index ba31fe6c..49bdee65 100644
--- a/resources/views/admin/content/edit.blade.php
+++ b/resources/views/admin/content/edit.blade.php
@@ -21,9 +21,12 @@
@if ($historySize > 0)
-
+ @can('viewHistory', $page)
+
+ @endcan
@endif
diff --git a/resources/views/admin/content/formParts/appearance.blade.php b/resources/views/admin/content/formParts/appearance.blade.php
index 341a5ca3..e9991903 100644
--- a/resources/views/admin/content/formParts/appearance.blade.php
+++ b/resources/views/admin/content/formParts/appearance.blade.php
@@ -4,25 +4,30 @@
class="col-lg-4 col-lg-offset-4 col-md-6 col-md-offset-3 col-sm-12 title-photo text-center">
-
-
+ @can('upload', \App\Models\FileManager\File::class)
+
+
+ @endcan
@endif
-
-
-
- @lang('admin/contents.uploadTitleImage')
-
-
+@can('upload', \App\Models\FileManager\File::class)
+
-
+@endcan
@if (count($templates))
diff --git a/resources/views/admin/content/formParts/publicationSetup.blade.php b/resources/views/admin/content/formParts/publicationSetup.blade.php
index 62725948..479a07ff 100644
--- a/resources/views/admin/content/formParts/publicationSetup.blade.php
+++ b/resources/views/admin/content/formParts/publicationSetup.blade.php
@@ -5,7 +5,7 @@
@@ -16,7 +16,7 @@
+ placeholder="@lang('admin/contents.field_published_to')" />
@include('admin.snippets.hasError', ['field' => 'publishedTo'])
}})
+ @endif
+ @endif
+
-)
- {{$comment->name}} ({{$comment->email}})
-
-- {{$comment->content}} -
-