Skip to content

Commit

Permalink
refactor: w-vision > instride 🔄
Browse files Browse the repository at this point in the history
  • Loading branch information
aarongerig committed Feb 9, 2024
1 parent cc2234d commit 0f79700
Show file tree
Hide file tree
Showing 28 changed files with 1,573 additions and 1,417 deletions.
2 changes: 1 addition & 1 deletion .docker/apache2/httpd-ssl.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# For more information and complete configuration documentation have a look at the file in
# ".docker/apache2/default/httpd-ssl.conf". # Please keep in mind that this is a very basic setup and may require
# further configuration for special use cases. Also, if you find any bugs or you have a feature request,
# please report them here: https://github.com/w-vision/pimcore-skeleton/issues
# please report them here: https://github.com/instride-ch/pimcore-skeleton/issues

# Listen to the HTTPS port as well
Listen 443
Expand Down
4 changes: 2 additions & 2 deletions .docker/apache2/httpd.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# For more information and complete configuration documentation have a look at the file in
# ".docker/apache2/default/httpd.conf". Please keep in mind that this is a very basic setup and may require
# further configuration for special use cases. Also, if you find any bugs or you have a feature request,
# please report them here: https://github.com/w-vision/pimcore-skeleton/issues
# please report them here: https://github.com/instride-ch/pimcore-skeleton/issues

# Server root and default port
ServerRoot "/usr/local/apache2"
Expand Down Expand Up @@ -49,7 +49,7 @@ LoadModule rewrite_module modules/mod_rewrite.so
</IfModule>

# Default server config
ServerAdmin tools@w-vision.ch
ServerAdmin tools@instride.ch
ServerName localhost

# Deny access to the entirety of the server's filesystem
Expand Down
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
APP_ENV="dev"

#TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
TRUSTED_HOSTS="^.*(\.dev\.local|\.projects\.w-vision\.ch)$"
TRUSTED_HOSTS="^.*(\.dev\.local|\.projects\.instride\.dev)$"
###< symfony/framework-bundle ###

# See https://symfony.com/doc/current/mailer.html for more info on configuration.
Expand Down
31 changes: 17 additions & 14 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,16 @@ module.exports = {

env: {
browser: true,
commonjs: true,
es6: true,
es2023: true,
node: true,
},

parser: '@babel/eslint-parser',

parserOptions: {
ecmaVersion: 8,
sourceType: 'module',
requireConfigFile: false,
},

extends: [
'eslint:recommended',
'airbnb-base',
],
extends: ['eslint:recommended'],

globals: {
Class: true,
Expand All @@ -30,10 +23,20 @@ module.exports = {
VERSION: true,
},

rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
},
ignorePatterns: ['**/public/**/*', 'assets/js/validation/*'],

ignorePatterns: ['assets/js/validation/*'],
overrides: [
{
files: '*.js',
parser: '@babel/eslint-parser',
extends: [
'eslint:recommended',
'airbnb-base',
],
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
},
},
],
};
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
npx lint-staged
5 changes: 2 additions & 3 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
module.exports = {
extends: ['stylelint-config-standard-scss', './stylelint-config-airbnb-fixed'],
extends: ['stylelint-config-standard-scss'],
ignoreFiles: ['**/node_modules/**/*', '**/vendor/**/*', '**/public/**/*'],
rules: {
'at-rule-empty-line-before': [
'always',
{ ignore: ['after-comment'], except: ['blockless-after-same-name-blockless', 'first-nested'] },
],
'max-empty-lines': 2,
'scss/dollar-variable-colon-space-after': 'at-least-one-space',
'value-keyword-case': [
'lower',
{ 'ignoreProperties': ['/^.*font-family$/'] },
],
},
};
};
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ sudo nano /etc/hosts
**Create a new Project**

```
composer create-project w-vision/pimcore-skeleton:10.5
composer create-project instride/pimcore-skeleton:10.6
```

**Start and connect to Docker container**
Expand Down Expand Up @@ -49,6 +49,6 @@ yarn install && yarn dev

## Copyright

w-vision AG, Sandgruebestrasse 4, 6210 Sursee, Switzerland
https://w-vision.ch, support@w-vision.ch
Copyright © 2022 w-vision AG. All rights reserved.
instride AG, Sandgruebestrasse 4, 6210 Sursee, Switzerland
https://instride.ch, connect@instride.ch
Copyright © 2024 instride AG. All rights reserved.
22 changes: 13 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "w-vision/pimcore-skeleton",
"name": "instride/pimcore-skeleton",
"type": "project",
"description": "The Pimcore skeleton for projects at w-vision.",
"homepage": "https://w-vision.ch/",
"description": "The Pimcore skeleton for projects at instride.",
"homepage": "https://instride.ch",
"license": "proprietary",
"authors": [
{
"name": "w-vision AG",
"email": "support@w-vision.ch",
"homepage": "https://w-vision.ch/",
"role": "Web Development Agency"
"name": "instride AG",
"email": "connect@instride.ch",
"homepage": "https://instride.ch",
"role": "Digital Agency"
}
],
"config": {
Expand All @@ -21,9 +21,9 @@
"dachcom-digital/emailizr": "^2.0",
"dachcom-digital/seo": "^2.2",
"dachcom-digital/toolbox": "^4.1",
"instride/pimcore-monitor": "^2.0",
"pimcore/pimcore": "~10.6.0",
"symfony/webpack-encore-bundle": "^2.1",
"w-vision/pimcore-monitor-bundle": "^2.0"
"symfony/webpack-encore-bundle": "^2.1"
},
"require-dev": {
"deployer/deployer": "^7.3",
Expand Down Expand Up @@ -55,6 +55,10 @@
"Pimcore\\Composer::installAssets"
]
},
"conflict": {
"league/csv": ">=9.10.0",
"symfony/symfony": "*"
},
"minimum-stability": "dev",
"prefer-stable": true
}
Loading

0 comments on commit 0f79700

Please sign in to comment.