Skip to content

Commit

Permalink
UPDATE Composer + Yarn
Browse files Browse the repository at this point in the history
  • Loading branch information
Boyquotes committed Mar 10, 2021
1 parent 104ea79 commit 3ebda8c
Show file tree
Hide file tree
Showing 4,315 changed files with 116,182 additions and 155,603 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
18 changes: 7 additions & 11 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,17 @@
# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration

###> symfony/framework-bundle ###
APP_ENV=prod
#APP_ENV=dev
APP_SECRET=2ca64f8d83b9e89f5f19d672841d6cc1
#TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
#TRUSTED_HOSTS='^(localhost|example\.com)$'
APP_ENV=dev
APP_SECRET=0e0e14fa540dc74699074adcf8f48066
###< symfony/framework-bundle ###

###> doctrine/doctrine-bundle ###
# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
# For a MySQL database, use: "mysql://db_user:[email protected]:3306/db_name"
# 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=sqlite:///%kernel.project_dir%/data/database.sqlite
#DATABASE_URL=mysql://root:[email protected]:3306/ge3
DATABASE_URL=mysql://gardenydata:[email protected]:3306/gardenydata
#
# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
# DATABASE_URL="mysql://db_user:[email protected]:3306/db_name?serverVersion=5.7"
DATABASE_URL="postgresql://db_user:[email protected]:5432/db_name?serverVersion=13&charset=utf8"
###< doctrine/doctrine-bundle ###

###> symfony/mailer ###
Expand All @@ -38,7 +34,7 @@ DATABASE_URL=mysql://gardenydata:[email protected]:330
###< symfony/mailer ###

###> nelmio/cors-bundle ###
CORS_ALLOW_ORIGIN=^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$
CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
###< nelmio/cors-bundle ###

###> symfony/mailgun-mailer ###
Expand Down
2 changes: 1 addition & 1 deletion .env.test
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ KERNEL_CLASS='App\Kernel'
APP_SECRET='$ecretf0rt3st'
SYMFONY_DEPRECATIONS_HELPER=999999
PANTHER_APP_ENV=panther
DATABASE_URL=sqlite:///%kernel.project_dir%/data/database_test.sqlite
PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/config/secrets/prod/prod.decrypt.private.php
/public/bundles/
/var/
#/vendor/
/vendor/
###< symfony/framework-bundle ###

###> symfony/phpunit-bridge ###
Expand All @@ -23,7 +23,7 @@

###> symfony/webpack-encore-bundle ###
/node_modules/
#/public/build/
/public/build/
npm-debug.log
yarn-error.log
###< symfony/webpack-encore-bundle ###
Expand Down
33 changes: 0 additions & 33 deletions .php_cs.dist
Original file line number Diff line number Diff line change
@@ -1,46 +1,13 @@
<?php

$fileHeaderComment = <<<COMMENT
This file is part of the Symfony package.
(c) Fabien Potencier <[email protected]>
For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
COMMENT;

$finder = PhpCsFixer\Finder::create()
->in(__DIR__)
->exclude('config')
->exclude('var')
->exclude('public/bundles')
->exclude('public/build')
// exclude files generated by Symfony Flex recipes
->notPath('bin/console')
->notPath('public/index.php')
;

return PhpCsFixer\Config::create()
->setRiskyAllowed(true)
->setRules([
'@Symfony' => true,
'@Symfony:risky' => true,
'array_syntax' => ['syntax' => 'short'],
'header_comment' => ['header' => $fileHeaderComment, 'separate' => 'both'],
'linebreak_after_opening_tag' => true,
'mb_str_functions' => true,
'no_php4_constructor' => true,
'no_superfluous_phpdoc_tags' => true,
'no_unreachable_default_argument_value' => true,
'no_useless_else' => true,
'no_useless_return' => true,
'ordered_imports' => true,
'php_unit_strict' => true,
'phpdoc_order' => true,
'semicolon_after_instruction' => true,
'strict_comparison' => true,
'strict_param' => true,
])
->setFinder($finder)
->setCacheFile(__DIR__.'/var/.php_cs.cache')
;
12 changes: 12 additions & 0 deletions assets/app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/*
* 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';
8 changes: 8 additions & 0 deletions assets/bootstrap.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { startStimulusApp } from '@symfony/stimulus-bridge';

// Registers Stimulus controllers from controllers.json and in the controllers/ directory
export const app = startStimulusApp(require.context(
'@symfony/stimulus-bridge/lazy-controller-loader!./controllers',
true,
/\.(j|t)sx?$/
));
4 changes: 4 additions & 0 deletions assets/controllers.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"controllers": [],
"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 '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';
}
}
3 changes: 2 additions & 1 deletion assets/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import 'bootstrap-sass/assets/javascripts/bootstrap/alert.js';
import 'bootstrap-sass/assets/javascripts/bootstrap/collapse.js';
import 'bootstrap-sass/assets/javascripts/bootstrap/dropdown.js';
import 'bootstrap-sass/assets/javascripts/bootstrap/modal.js';
import 'jquery'
import 'webpack-jquery-ui';
import 'jquery';

// create global $ and jQuery variables
global.$ = global.jQuery = $;
Expand Down
11 changes: 9 additions & 2 deletions assets/scss/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ footer #footer-resources i {
border-color: #e74c3c
}

.form-group.has-error .control-label {
.form-group.has-error, .form-group.has-error .control-label {
color: #e74c3c
}

Expand Down Expand Up @@ -604,7 +604,14 @@ body#admin_post_show .post-tags .label-default i {
word-wrap: anywhere;
word-wrap: break-word;
}

.ui-menu{
background: #FFF;
border: 1px solid #e7e8e6;
}
.ui-menu-item-wrapper, .ui-menu .ui-state-focus, .ui-menu .ui-state-active{
margin: 0;
line-height: 2em;
}
/* Photos ------------------------------------------------------------------------- */

.image-upload{
Expand Down
3 changes: 3 additions & 0 deletions assets/styles/app.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
body {
background-color: lightgray;
}
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@
"scripts": {
"auto-scripts": {
"cache:clear": "symfony-cmd",
"assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd"
"assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd",
"assets:install %PUBLIC_DIR%": "symfony-cmd"
},
"post-install-cmd": [
"@auto-scripts"
Expand All @@ -92,7 +93,7 @@
"extra": {
"symfony": {
"allow-contrib": true,
"require": "5.1.*"
"require": "5.2.*"
}
}
}
Loading

0 comments on commit 3ebda8c

Please sign in to comment.