Skip to content

Commit

Permalink
Merge pull request #227 from gerMdz/alameda_64
Browse files Browse the repository at this point in the history
Alameda 64
  • Loading branch information
gerMdz authored Jan 29, 2024
2 parents bfedb83 + 48e83cf commit a6881a0
Show file tree
Hide file tree
Showing 234 changed files with 7,204 additions and 10,141 deletions.
11 changes: 9 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
# Real environment variables win over .env files.
#
# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
# https://symfony.com/doc/current/configuration/secrets.html
#
# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
Expand All @@ -23,16 +24,22 @@ APP_SECRET=c613cd77e9a38d7947796bdcaf501d23
# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
# For a PostgreSQL database, use: "postgresql://db_user:[email protected]:5432/db_name?serverVersion=11&charset=utf8"
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
DATABASE_URL=mysql://db_user:[email protected]:3306/db_name?serverVersion=5.7
#
# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
# DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=8.0.32&charset=utf8mb4"
# DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
DATABASE_URL="postgresql://app:[email protected]:5432/app?serverVersion=16&charset=utf8"
###< doctrine/doctrine-bundle ###
SITE_BASE_URL=http://localhost
SITE_BASE_UPLOADS=https://127.0.0.1:8000/uploads

###< redireccion temporal ###

SITE_TEMPORAL=true
SITE_ROBOT="index, follow"
SITE_DISALLOW_SEARCH_ENGINE_INDEX=false
###> symfony/mailer ###
# MAILER_DSN=smtp://localhost
# MAILER_DSN=null://null
###< symfony/mailer ###
### > facebook code
FACEBOOK_PIXEL_ENABLE=false
Expand Down
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,12 @@ yarn-error.log
public/images/logo-solo.png
/ROADMAP.md
/.php-version

###> phpstan/phpstan ###
phpstan.neon
###< phpstan/phpstan ###
/tools/php-cs-fixer/vendor/
/.php-cs-fixer.cache
/tools/php-cs-fixer/composer.json
/tools/php-cs-fixer/composer.lock
/sqls/
17 changes: 17 additions & 0 deletions .php-cs-fixer.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php

$finder = PhpCsFixer\Finder::create()
->in(__DIR__ . '/src');

$config = new PhpCsFixer\Config();

return $config->setRules(
[
'@Symfony' => true,
'yoda_style' => true,
'class_attributes_separation' => [
'elements' => ['method' => 'one', 'property' => 'one', 'trait_import' => 'one']
]
]
)
->setFinder($finder);
1 change: 1 addition & 0 deletions .php-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8.2
24 changes: 19 additions & 5 deletions assets/js/app.js → assets/app.js
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
/*
* Welcome to your app's main JavaScript file!
*
* We recommend including the built version of this JavaScript file
* (and its CSS file) in your base layout (base.html.twig).
*/

// any CSS you import will output into a single css file (app.css in this case)
import './styles/app.css';

// start the Stimulus application
import './bootstrap';


/*
* Welcome to your app's main JavaScript file!
*
Expand All @@ -6,12 +20,12 @@
*/

// any CSS you require will output into a single css file (app.css in this case)
require('../css/app.css');
require('../css/igles.css');
require('./styles/app.css');
require('./css/igles.css');
// require('../css/igle.scss');
require('../css/foundation-icons/foundation-icons.css');
require('../css/stream.css');
require('../css/styles.css');
require('./css/foundation-icons/foundation-icons.css');
require('./css/stream.css');
require('./css/styles.css');
// require('../fonts/univers/font.css');


Expand Down
12 changes: 12 additions & 0 deletions assets/bootstrap.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// import { startStimulusApp } from '@symfony/stimulus-bridge';
import { Controller } from '@hotwired/stimulus';

// Registers Stimulus controllers from controllers.json and in the controllers/ directory
export const app = Controller(require.context(
'@symfony/stimulus-bridge/lazy-controller-loader!./controllers',
true,
/\.[jt]sx?$/
));

// register any custom, 3rd party controllers here
// app.register('some_controller_name', SomeImportedController);
15 changes: 15 additions & 0 deletions assets/controllers.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"controllers": {
"@symfony/ux-turbo": {
"turbo-core": {
"enabled": true,
"fetch": "eager"
},
"mercure-turbo-stream": {
"enabled": false,
"fetch": "eager"
}
}
},
"entrypoints": []
}
16 changes: 16 additions & 0 deletions assets/controllers/hello_controller.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { Controller } from '@hotwired/stimulus';

/*
* This is an example Stimulus controller!
*
* Any element with a data-controller="hello" attribute will cause
* this controller to be executed. The name "hello" comes from the filename:
* hello_controller.js -> "hello"
*
* Delete this file or adapt it for your use!
*/
export default class extends Controller {
connect() {
this.element.textContent = 'Hello Stimulus! Edit me in assets/controllers/hello_controller.js';
}
}
8 changes: 4 additions & 4 deletions assets/js/select2-parent.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require('../css/app.css');
require('../styles/app.css');
const $ = require('jquery');
console.log('Select2 Parent');

require('select2')
require('select2/dist/css/select2.css')
$('.select2-enable').select2({ width: '100%', placeholder: "Seleccione un item", allowClear: true })
require('select2');
require('select2/dist/css/select2.css');
$('.select2-enable').select2({ width: '100%', placeholder: "Seleccione un item", allowClear: true });
File renamed without changes.
39 changes: 7 additions & 32 deletions bin/console
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,15 @@

use App\Kernel;
use Symfony\Bundle\FrameworkBundle\Console\Application;
use Symfony\Component\Console\Input\ArgvInput;
use Symfony\Component\ErrorHandler\Debug;

if (!in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
echo 'Warning: The console should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) {
throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
}

set_time_limit(0);
require_once dirname(__DIR__).'/vendor/autoload_runtime.php';

require dirname(__DIR__).'/vendor/autoload.php';
return function (array $context) {
$kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);

if (!class_exists(Application::class)) {
throw new LogicException('You need to add "symfony/framework-bundle" as a Composer dependency.');
}

$input = new ArgvInput();
if (null !== $env = $input->getParameterOption(['--env', '-e'], null, true)) {
putenv('APP_ENV='.$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $env);
}

if ($input->hasParameterOption('--no-debug', true)) {
putenv('APP_DEBUG='.$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = '0');
}

require dirname(__DIR__).'/config/bootstrap.php';

if ($_SERVER['APP_DEBUG']) {
umask(0000);

if (class_exists(Debug::class)) {
Debug::enable();
}
}

$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
$application = new Application($kernel);
$application->run($input);
return new Application($kernel);
};
24 changes: 17 additions & 7 deletions bin/phpunit
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
#!/usr/bin/env php
<?php

if (!file_exists(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
exit(1);
if (!ini_get('date.timezone')) {
ini_set('date.timezone', 'UTC');
}

if (false === getenv('SYMFONY_PHPUNIT_DIR')) {
putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
}
if (is_file(dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit')) {
if (PHP_VERSION_ID >= 80000) {
require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit';
} else {
define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php');
require PHPUNIT_COMPOSER_INSTALL;
PHPUnit\TextUI\Command::main();
}
} else {
if (!is_file(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
exit(1);
}

require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
}
84 changes: 43 additions & 41 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,64 +2,62 @@
"type": "project",
"license": "MIT",
"name": "germdz/alamedacms",
"description": "CMS Sencillo con reservas por email, y manejo de usuarios",
"description": "CMS Sencillo con reservas por email, y manejo de usuarios, bootstrap en CSS",
"require": {
"php": "^7.4.0",
"php": "^8.2.0",
"ext-ctype": "*",
"ext-iconv": "*",
"ext-json": "*",
"antishov/doctrine-extensions-bundle": "^1.4",
"composer/package-versions-deprecated": "^1.11",
"doctrine/annotations": "^1.0",
"doctrine/common": "^3.2.1",
"doctrine/dbal": "^3.2",
"doctrine/doctrine-bundle": "^2.5",
"doctrine/doctrine-migrations-bundle": "^3.0",
"doctrine/doctrine-migrations-bundle": "^3.3",
"doctrine/orm": "^2.10",
"endroid/qr-code-bundle": "^3.4",
"endroid/qr-code-bundle": "4.3.*",
"erusev/parsedown": "^1.6",
"friendsofsymfony/ckeditor-bundle": "^2.2",
"friendsofsymfony/ckeditor-bundle": "^2.4",
"gedmo/doctrine-extensions": "^v3.4.0",
"knplabs/knp-markdown-bundle": "^1.8",
"knplabs/knp-paginator-bundle": "^5.2",
"knplabs/knp-time-bundle": "^1.11",
"laminas/laminas-code": "^3.4",
"laminas/laminas-code": "^4.7",
"laminas/laminas-eventmanager": "^3.2",
"liip/imagine-bundle": "^2.7.4",
"oneup/flysystem-bundle": "^3.4",
"oneup/flysystem-bundle": "^4.11.2",
"phpdocumentor/reflection-docblock": "^5.2",
"phpoffice/phpspreadsheet": "^1.15",
"ramsey/uuid-doctrine": "^1.6",
"sensio/framework-extra-bundle": "^6.1",
"stof/doctrine-extensions-bundle": "^1.10.1",
"symfony/apache-pack": "^1.0",
"symfony/asset": "^5.4",
"symfony/console": "^5.4",
"symfony/dotenv": "^5.4",
"symfony/expression-language": "^5.4",
"symfony/asset": "6.4.*",
"symfony/console": "6.4.*",
"symfony/dotenv": "6.4.*",
"symfony/expression-language": "6.4.*",
"symfony/flex": "^1.17.1",
"symfony/form": "^v5.4.0",
"symfony/framework-bundle": "^v5.4.0",
"symfony/http-client": "5.4.*",
"symfony/intl": "^5.4",
"symfony/mailer": "^5.4",
"symfony/form": "^v6.1.0",
"symfony/framework-bundle": "^v6.1.0",
"symfony/html-sanitizer": "6.4.*",
"symfony/http-client": "6.4.*",
"symfony/intl": "6.4.*",
"symfony/mailer": "6.4.*",
"symfony/polyfill-intl-messageformatter": "^1.12",
"symfony/polyfill-php72": "^1.15",
"symfony/property-access": "^v5.4.0",
"symfony/property-info": "5.4.*",
"symfony/runtime": "^5.4",
"symfony/security-bundle": "^5.4",
"symfony/serializer": "5.4.*",
"symfony/string": "^5.4",
"symfony/translation": "^5.4",
"symfony/twig-bridge": "^v5.4.0",
"symfony/twig-bundle": "^v5.4.0",
"symfony/property-access": "^v6.1.0",
"symfony/property-info": "6.4.*",
"symfony/runtime": "6.4.*",
"symfony/security-bundle": "6.4.*",
"symfony/serializer": "6.4.*",
"symfony/string": "6.4.*",
"symfony/translation": "6.4.*",
"symfony/twig-bridge": "6.4.*",
"symfony/twig-bundle": "6.4.*",
"symfony/ux-turbo": "^2.1",
"symfony/validator": "^5.4",
"symfony/validator": "6.4.*",
"symfony/webpack-encore-bundle": "^1.13",
"symfony/yaml": "^5.4",
"symfony/yaml": "6.4.*",
"symfonycasts/reset-password-bundle": "^1.17",
"tgalopin/html-sanitizer-bundle": "^1.4",
"twig/cssinliner-extra": "^3.1",
"twig/cssinliner-extra": "^3.7",
"twig/extensions": "^1.5",
"twig/extra-bundle": "^3.1",
"twig/intl-extra": "^3.1",
Expand All @@ -70,24 +68,27 @@
"require-dev": {
"dama/doctrine-test-bundle": "^6.7",
"doctrine/doctrine-fixtures-bundle": "^3.4",
"fzaninotto/faker": "^1.9",
"fakerphp/faker": "*",
"phpunit/phpunit": "^9.5",
"sensiolabs/security-checker": "^6.0",
"symfony/browser-kit": "^5.4",
"symfony/css-selector": "^5.4",
"symfony/debug-bundle": "^5.4",
"rector/rector": "^0.19.0",
"symfony/browser-kit": "6.4.*",
"symfony/css-selector": "6.4.*",
"symfony/debug-bundle": "6.4.*",
"symfony/maker-bundle": "^1.19",
"symfony/monolog-bundle": "^3.1",
"symfony/phpunit-bridge": "^6.1",
"symfony/stopwatch": "^5.4",
"symfony/stopwatch": "6.4.*",
"symfony/var-dumper": "*",
"symfony/web-profiler-bundle": "^5.4"
"symfony/web-profiler-bundle": "6.4.*"
},
"config": {
"preferred-install": {
"*": "dist"
},
"sort-packages": true,
"platform": {
"php": "8.2"
},
"allow-plugins": {
"endroid/installer": true,
"symfony/flex": true,
Expand Down Expand Up @@ -115,7 +116,8 @@
"scripts": {
"auto-scripts": {
"cache:clear": "symfony-cmd",
"assets:install %PUBLIC_DIR%": "symfony-cmd"
"assets:install %PUBLIC_DIR%": "symfony-cmd",
"ckeditor:install": "symfony-cmd"
},
"post-install-cmd": [
"@auto-scripts"
Expand All @@ -130,7 +132,7 @@
"extra": {
"symfony": {
"allow-contrib": true,
"require": "5.4.*"
"require": "6.4.*"
}
}
}
Loading

0 comments on commit a6881a0

Please sign in to comment.