Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sidemenu search activated #755

Open
wants to merge 35 commits into
base: 1.10
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
bf060e8
upgrade laravel -10
spektra2147 Nov 9, 2023
1f9961f
Revert "upgrade laravel -10"
spektra2147 Nov 10, 2023
daee751
upgrade laravel -10
spektra2147 Nov 10, 2023
8c49a68
update laravel 10
spektra2147 Nov 10, 2023
4a4f9ef
fix Translatable.php
spektra2147 Nov 10, 2023
ce63a53
upgrade Laravel 10
spektra2147 Nov 11, 2023
a7267e3
update composer package
spektra2147 Nov 11, 2023
fd7390b
Update composer.json
spektra2147 Nov 11, 2023
a68559e
Update composer.json
spektra2147 Nov 11, 2023
8fa48da
upgrade for laravel 10
spektra2147 Nov 13, 2023
25bdc52
Update Image.php
spektra2147 Dec 5, 2023
010986e
Update EloquentQueryBuilder.php
emrullahardc Dec 5, 2023
870ff89
Merge pull request #52 from openclassify/emrullahardc-patch-3
MostafaMoradii Dec 5, 2023
ee0ab4e
fix migration new class error
spektra2147 Dec 18, 2023
2f4a625
Merge pull request #56 from openclassify/1.10-database-fix
erhanask Dec 18, 2023
58b3648
Addon Uninstall Bug Fix
emrullahardc Feb 1, 2024
b8accff
Merge pull request #61 from openclassify/addon-uninstall-bug-fix
spektra2147 Feb 2, 2024
2ecf85b
ORDERABLE COLUMN LANG FIX
emrullahardc Feb 22, 2024
34dcf6c
Revert "ORDERABLE COLUMN LANG FIX"
emrullahardc Feb 26, 2024
8f30093
Merge pull request #66 from openclassify/lang-revert
spektra2147 Feb 26, 2024
90e9bf7
added select isSelect for order
spektra2147 Feb 26, 2024
aac6552
added select translatable column
spektra2147 Feb 26, 2024
2e7c085
Update EloquentQueryBuilder.php
spektra2147 Feb 26, 2024
fd20bce
Merge pull request #68 from openclassify/1.10-fix-select-translatable2
emrullahardc Feb 26, 2024
e13aae7
Merge pull request #67 from openclassify/1.10-fixed-entryId2
emrullahardc Feb 26, 2024
a1ca3e7
lang fix
spektra2147 Feb 26, 2024
5cf8097
check Translatable stream
spektra2147 Feb 26, 2024
218a7d7
Merge pull request #69 from openclassify/1.10-lang-fix
emrullahardc Feb 27, 2024
a7456dd
Merge pull request #70 from openclassify/1.10-check-translatable
fatihalp Feb 28, 2024
a879261
fix parameters
spektra2147 Mar 19, 2024
594d7f0
Merge pull request #71 from openclassify/fix-columns
erhanask Mar 19, 2024
2ecba79
fix addon reinstall
spektra2147 Mar 28, 2024
7378111
Merge pull request #72 from openclassify/fix-reinstall
emrullahardc May 14, 2024
e82067a
submenus added
emrullahardc Jun 3, 2024
27fcff5
sectionlink renamed
emrullahardc Jun 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
{
"name": "anomaly/streams-platform",
"name": "visiosoft/streams-platform",
"description": "A powerful, inclusive, modular PHP application engine built lovingly for Laravel.",
"authors": [
{
"name": "Ryan Thompson",
"email": "[email protected]"
"email": "[email protected]",
"role": "Owner"
},
{
"name": "Vedat Akdogan",
"email": "[email protected]",
"role": "Developer"
}
],
"require": {
Expand All @@ -21,11 +27,12 @@
"nicmart/string-template": "^0.1.3",
"symfony/yaml": "^6.1",
"jenssegers/agent": "^2.6.0",
"barryvdh/laravel-httpcache": "^1.0",
"spektra2147/laravel-httpcache": "^1.0",
"asm89/twig-cache-extension": "^1.3.0",
"vstelmakh/url-highlight": "^2.3",
"ezyang/htmlpurifier": "~4.0",
"tubalmartin/cssmin": "~4.0"
"tubalmartin/cssmin": "~4.0",
"scssphp/scssphp": "^1.11"
},
"autoload": {
"psr-4": {
Expand Down
8 changes: 4 additions & 4 deletions docs/en/02.getting-started/04.configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Configuration

## Introduction

Streams configuration can be found in `vendor/anomaly/streams-platform/resources/config`. It is a good idea to look through the configuration files to get acquainted with what's available.
Streams configuration can be found in `vendor/visiosoft/streams-platform/resources/config`. It is a good idea to look through the configuration files to get acquainted with what's available.

[Configuration Reference](../reference/configuration){.link}

Expand Down Expand Up @@ -40,11 +40,11 @@ This will copy all configuration to `resources/{application}/streams/config` so

### Settings and Preferences

The [Settings](https://pyrocms.com/documentation/settings-module) and [Preferences](https://pyrocms.com/documentation/preferences-module) modules both `bind` values to configuration. This let's you manage much of the configuration for the Streams Platform via the control panel.
The [Settings](https://pyrocms.com/documentation/settings-module) and [Preferences](https://pyrocms.com/documentation/preferences-module) modules both `bind` values to configuration. This let's you manage much of the configuration for the Streams Platform via the control panel.

You can see what settings are bound to what configuration by reviewing the settings and preferences configuration found within the following files:

```bash
vendor/anomaly/streams-platform/resources/config/settings/settings.php
vendor/anomaly/streams-platform/resources/config/preferences/preferences.php
vendor/visiosoft/streams-platform/resources/config/settings/settings.php
vendor/visiosoft/streams-platform/resources/config/preferences/preferences.php
```
16 changes: 8 additions & 8 deletions docs/en/03.reference/02.hints.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ The `storage::` path hint represents your application's storage directory `stora

### streams

The `streams::` path hint represents the `resources` directory for the Streams Platform `vendor/anomaly/streams-platform/resources/`.
The `streams::` path hint represents the `resources` directory for the Streams Platform `vendor/visiosoft/streams-platform/resources/`.

### module

Expand Down Expand Up @@ -126,7 +126,7 @@ The `storage::` path hint represents your application's storage directory `stora

### streams

The `streams::` path hint represents the `resources` directory for the Streams Platform `vendor/anomaly/streams-platform/resources/`.
The `streams::` path hint represents the `resources` directory for the Streams Platform `vendor/visiosoft/streams-platform/resources/`.


## Config Hints
Expand All @@ -143,11 +143,11 @@ config('streams::datetime.date_format');

### addons

Every addon has a config path hint for the addon's `config` directory `{addon_path}/resources/config/` which looks like `anomaly.module.documentation::`.
Every addon has a config path hint for the addon's `config` directory `{addon_path}/resources/config/` which looks like `anomaly.module.documentation::`.

### streams

The `streams::` path hint represents the `config` directory for the Streams Platform `vendor/anomaly/streams-platform/resources/config/`.
The `streams::` path hint represents the `config` directory for the Streams Platform `vendor/visiosoft/streams-platform/resources/config/`.


## Translator Hints
Expand All @@ -164,7 +164,7 @@ trans('streams::distribution.name');

### addons

Every addon has a config path hint for the addon's `lang` directory `{addon_path}/resources/lang/` which looks like `anomaly.module.documentation::`.
Every addon has a config path hint for the addon's `lang` directory `{addon_path}/resources/lang/` which looks like `anomaly.module.documentation::`.

### module

Expand All @@ -176,7 +176,7 @@ The `theme::` path hint represents the `lang` directory for the `active` theme `

### streams

The `streams::` path hint represents the `lang` directory for the Streams Platform `vendor/anomaly/streams-platform/resources/lang/`.
The `streams::` path hint represents the `lang` directory for the Streams Platform `vendor/visiosoft/streams-platform/resources/lang/`.


## View Hints
Expand All @@ -193,7 +193,7 @@ view('streams::form.form');

### addons

Every addon has a path hint for the addon's `view` directory `{addon_path}/resources/views/` which looks like `anomaly.module.documentation::`.
Every addon has a path hint for the addon's `view` directory `{addon_path}/resources/views/` which looks like `anomaly.module.documentation::`.

### module

Expand All @@ -205,7 +205,7 @@ The `theme::` path hint represents the `views` directory for the `active` theme

### streams

The `streams::` path hint represents the `views` directory for the Streams Platform `vendor/anomaly/streams-platform/resources/views/`.
The `streams::` path hint represents the `views` directory for the Streams Platform `vendor/visiosoft/streams-platform/resources/views/`.

### app

Expand Down
6 changes: 3 additions & 3 deletions docs/en/05.core-concepts/04.image.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ All paths are relative to your application's base path.
* `asset`: public/app/{app_reference}/
* `storage`: storage/streams/{app_reference}/
* `download`: public/app/{app_reference}/assets/downloads/
* `streams`: vendor/anomaly/streams-platform/resources/
* `streams`: vendor/visiosoft/streams-platform/resources/
* `bower`: bin/bower_components/
* `theme`: {active_theme_path}/resources/
* `module`: {active_module_path}/resources/
Expand Down Expand Up @@ -1488,15 +1488,15 @@ The name of the macro to run.
.macro("thumb")
.macro("desaturate")
.macro("responsive")|raw }}

### Image::base64()

The `base64` method returns the base64 encoded data of the image.

#### Returns: `string`
#### Example
$base64 = $image->base64(); // data:image/png;base64,iVBORw0KGgoAAAANSU...

#### Twig
<image src="{{ image('theme::img/logo.jpg').base64() }}"/>

Expand Down
1 change: 1 addition & 0 deletions resources/config/settings/sections.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
'mail_port',
'mail_username',
'mail_password',
'mail_encrypt',
],
],
'cache' => [
Expand Down
8 changes: 8 additions & 0 deletions resources/config/settings/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,14 @@
'type' => 'password',
],
],
'mail_encrypt' => [
'env' => 'MAIL_ENCRYPTION',
'bind' => 'mail.encryption',
'type' => 'anomaly.field_type.text',
'config' => [
'default_value' => 'ssl',
],
],
'http_cache' => [
'env' => 'HTTP_CACHE',
'bind' => 'streams::httpcache.enabled',
Expand Down
4 changes: 4 additions & 0 deletions resources/lang/en/setting.php
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,10 @@
'label' => 'SMTP Password',
'instructions' => 'Specify the SMTP password to use.',
],
'mail_encrypt' => [
'label' => 'SMTP Encryption',
'instructions' => 'Specify the SMTP encryption to use.',
],
'http_cache' => [
'label' => 'HTTP Cache',
'instructions' => 'Do you want to enable HTTP cache?',
Expand Down
4 changes: 4 additions & 0 deletions resources/lang/tr/setting.php
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,10 @@
'label' => 'SMTP Şifresi',
'instructions' => 'Kullanılacak SMTP şifresini belirtin.',
],
'mail_encrypt' => [
'label' => 'SMTP Şifreleme',
'instructions' => 'Kullanılacak SMTP şifreleme yöntemini belirtin.',
],
'http_cache' => [
'label' => 'HTTP Önbelleği',
'instructions' => 'HTTP önbelleğini etkinleştirmek istiyor musunuz?',
Expand Down
2 changes: 1 addition & 1 deletion src/Addon/Addon.php
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public function isShared()
*/
public function isTesting()
{
return Str::contains($this->getPath(), 'vendor/anomaly/streams-platform/addons/' . $this->getVendor());
return Str::contains($this->getPath(), 'vendor/visiosoft/streams-platform/addons/' . $this->getVendor());
}

/**
Expand Down
40 changes: 27 additions & 13 deletions src/Addon/AddonIntegrator.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php namespace Anomaly\Streams\Platform\Addon;

use Anomaly\Streams\Platform\Addon\Command\GetNamespaceWithComposer;
use Anomaly\Streams\Platform\Addon\Event\AddonWasRegistered;
use Anomaly\Streams\Platform\Addon\Extension\Extension;
use Anomaly\Streams\Platform\Addon\Module\Module;
Expand Down Expand Up @@ -76,18 +77,19 @@ class AddonIntegrator
* @internal param Image $image
*/
public function __construct(
Factory $views,
Container $container,
AddonProvider $provider,
Application $application,
Configurator $configurator,
Factory $views,
Container $container,
AddonProvider $provider,
Application $application,
Configurator $configurator,
AddonCollection $collection
) {
$this->views = $views;
$this->provider = $provider;
$this->container = $container;
$this->collection = $collection;
$this->application = $application;
)
{
$this->views = $views;
$this->provider = $provider;
$this->container = $container;
$this->collection = $collection;
$this->application = $application;
$this->configurator = $configurator;
}

Expand All @@ -112,11 +114,23 @@ public function register($path, $namespace, $enabled, $installed)
$slug
) . studly_case($type);

/* @var Addon|Module|Extension|Twig_ExtensionInterface $addon */
if (!class_exists($class)) {
return null;

$namespace = dispatch_sync(new GetNamespaceWithComposer($path));

list($vendor, $type, $slug) = explode('.', $namespace);

$class = studly_case($vendor) . '\\' . studly_case($slug) . studly_case($type) . '\\' . studly_case(
$slug
) . studly_case($type);

if (!class_exists($class)) {
return null;
}
}



$addon = app($class)
->setPath($path)
->setType($type)
Expand Down
60 changes: 44 additions & 16 deletions src/Addon/AddonManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Anomaly\Streams\Platform\Addon;

use Anomaly\Streams\Platform\Addon\Command\GetNamespaceWithComposer;
use Illuminate\Support\Str;
use Illuminate\Support\Facades\Request;
use Illuminate\Contracts\Container\Container;
Expand Down Expand Up @@ -80,22 +81,23 @@ class AddonManager
* @param AddonCollection $addons
*/
public function __construct(
AddonPaths $paths,
AddonLoader $loader,
ModuleModel $modules,
Container $container,
ExtensionModel $extensions,
AddonPaths $paths,
AddonLoader $loader,
ModuleModel $modules,
Container $container,
ExtensionModel $extensions,
AddonIntegrator $integrator,
AddonCollection $addons
) {
$this->paths = $paths;
$this->addons = $addons;
$this->loader = $loader;
$this->modules = $modules;
$this->container = $container;
)
{
$this->paths = $paths;
$this->addons = $addons;
$this->loader = $loader;
$this->modules = $modules;
$this->container = $container;
$this->integrator = $integrator;
$this->extensions = $extensions;
$this->loader = $loader;
$this->loader = $loader;
}

/**
Expand All @@ -105,7 +107,7 @@ public function __construct(
*/
public function register($reload = false)
{
$enabled = $this->getEnabledAddonNamespaces();
$enabled = $this->getEnabledAddonNamespaces();
$installed = $this->getInstalledAddonNamespaces();

$this->container->bind(
Expand Down Expand Up @@ -155,7 +157,7 @@ function () use ($installed) {

$this->loader->classLoader()->addPsr4(
'Anomaly\\StreamsPlatformTests\\',
base_path('vendor/anomaly/streams-platform/tests')
base_path('vendor/visiosoft/streams-platform/tests')
);

$this->loader->register();
Expand Down Expand Up @@ -200,7 +202,11 @@ function () use ($installed) {
}

// Sort all addons.
$this->addons = $this->addons->sort();
/**
* Commented because of the sort problem of modules
*/
// $this->addons = $this->addons->sort();


/*
* Disperse addons to their
Expand Down Expand Up @@ -316,6 +322,28 @@ protected function getAddonNamespace($path)
$slug = strtolower(substr(basename($path), 0, strpos(basename($path), '-')));
$type = strtolower(substr(basename($path), strpos(basename($path), '-') + 1));

return "{$vendor}.{$type}.{$slug}";
$namespace = "{$vendor}.{$type}.{$slug}";

list($vendor, $type, $slug) = explode('.', $namespace);

$class = studly_case($vendor) . '\\' . studly_case($slug) . studly_case($type) . '\\' . studly_case(
$slug
) . studly_case($type);

if (!class_exists($class)) {
$composer_namespace = dispatch_sync(new GetNamespaceWithComposer($path));

list($vendor, $type, $slug) = explode('.', $composer_namespace);

$class = studly_case($vendor) . '\\' . studly_case($slug) . studly_case($type) . '\\' . studly_case(
$slug
) . studly_case($type);

if (class_exists($class)) {
return $composer_namespace;
}
}

return $namespace;
}
}
Loading