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

Design v2 #2744

Open
wants to merge 57 commits into
base: next
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
c84d193
[Design-v2] - set webpack , base scss styles, b-icons, flag-icons, h…
codingioanniskrikos Sep 9, 2024
16b621f
[Design-v2] - test
codingioanniskrikos Sep 9, 2024
92557ab
[Design-v2] - topbar, cart widget
codingioanniskrikos Sep 9, 2024
a40826a
[Design-v2] - remove extra template
codingioanniskrikos Sep 9, 2024
e0fe1a7
[Design-v2] - product preview , form
codingioanniskrikos Sep 11, 2024
83f4e68
[Design-v2] - product detail
codingioanniskrikos Sep 12, 2024
ed8beb9
[Design-v2] - category, add cart
codingioanniskrikos Sep 13, 2024
fee078f
[Design-v2] - category, checkout cart step 1
codingioanniskrikos Sep 17, 2024
959ef73
[Design-v2] - cart steps
codingioanniskrikos Sep 17, 2024
33142fd
[Design-v2] - checkout steps
codingioanniskrikos Sep 18, 2024
43c20c2
[Design-v2] - flash message, summary
codingioanniskrikos Sep 19, 2024
4b5e403
[Design-v2] - change logic for the javascripts, bootstrap 5.3
codingioanniskrikos Sep 23, 2024
4faa213
[Design-v2] - add JS
codingioanniskrikos Sep 24, 2024
d5b9e2c
[Design-v2] - checkout thank summary
codingioanniskrikos Sep 24, 2024
5d768ef
[Design-v2] - profile pages
codingioanniskrikos Sep 27, 2024
9308ea3
[Desing-v2] - profile pages
codingioanniskrikos Sep 27, 2024
b95d5c9
Merge branch 'next' into Design-v2
codingioanniskrikos Oct 9, 2024
60387b2
[Design-v2] - remove jquery, convert to vanillajs, remove packages no…
codingioanniskrikos Oct 10, 2024
252f36d
[Design-v2] - format address JS
codingioanniskrikos Oct 10, 2024
ffb9755
[Design-v2] - cart list
codingioanniskrikos Oct 14, 2024
94143a8
[Design-v2] - load Cart widget vis AJax request
codingioanniskrikos Oct 21, 2024
d30214e
Merge branch 'next' into Design-v2
dpfaffenbauer Nov 5, 2024
12ba2da
[Design-v2] - refactor code - SonarCloud
codingioanniskrikos Nov 5, 2024
5505c9e
[Design-v2] - refactor SonarCloud
codingioanniskrikos Nov 5, 2024
6da3310
[Design-v2] - refactor SonarCloud
codingioanniskrikos Nov 5, 2024
cc889c9
[Design-v2] - refactor sonarcloud
codingioanniskrikos Nov 6, 2024
a9532ca
[Design-v2] - refactor sonarcloud
codingioanniskrikos Nov 6, 2024
3440852
[Design-v2]- refactor sonarcloud
codingioanniskrikos Nov 6, 2024
6f9ce43
[Design-v2] - refactor sonarcloud test
codingioanniskrikos Nov 6, 2024
8846507
[Design-v2] - refactor code
codingioanniskrikos Nov 6, 2024
309324c
[Design-v2] - refactor code
codingioanniskrikos Nov 6, 2024
0be3dc8
[Design-v2] - remove defer
codingioanniskrikos Nov 6, 2024
5c6ce89
[Design-v2] - fix Behat part 1
codingioanniskrikos Nov 6, 2024
7acf93d
[Behat] fix checkbox click
dpfaffenbauer Nov 6, 2024
c24ad5c
[Design-v2] - Behat tests
codingioanniskrikos Nov 8, 2024
93a8579
[Design-v2] - refactor sonarcloud
codingioanniskrikos Nov 8, 2024
7608765
[Design-v2] - behat test, category filter icons
codingioanniskrikos Nov 11, 2024
76dc279
[Design-v2] - behat fix feature
codingioanniskrikos Nov 14, 2024
19fbc1e
[DesignV2] use webpack builds and asset paths
dpfaffenbauer Nov 14, 2024
39c10f7
Merge branch 'Design-v2' of github.com:codingioanniskrikos/CoreShop i…
dpfaffenbauer Nov 14, 2024
fca53aa
[DesignV2] reverts
dpfaffenbauer Nov 14, 2024
b84467e
[DesignV2] use address formatter
dpfaffenbauer Nov 14, 2024
425956d
[Design-v2] - adapt style and structure
codingioanniskrikos Nov 25, 2024
48d9f61
[Design-v2] - fix behat test
codingioanniskrikos Nov 26, 2024
085336d
[Design-v2] - Category page, Wishlist add/remove, gift, Units price
codingioanniskrikos Nov 27, 2024
3fcb57c
[Design-v2] - remove shortdescription
codingioanniskrikos Nov 27, 2024
f5e8042
Merge branch 'next' into Design-v2
dpfaffenbauer Feb 17, 2025
98b5157
[PHP8-4] updates
codingioanniskrikos Feb 19, 2025
68de8b5
Merge branch 'next' into Design-v2
codingioanniskrikos Feb 19, 2025
2d6117f
php8.4
dpfaffenbauer Feb 19, 2025
df2a59d
[Pimcore] remove downward compatibility - Pimcore is not compatible i…
dpfaffenbauer Feb 19, 2025
6ab890a
use payum/payum 2.0
dpfaffenbauer Feb 19, 2025
9d54319
use payum/payum 2.0
dpfaffenbauer Feb 19, 2025
7c13b40
[PHP8.4] fixes
dpfaffenbauer Feb 19, 2025
33ddf24
[PHP8.4] fixes
dpfaffenbauer Feb 19, 2025
a719852
use payum/payum 2.0
dpfaffenbauer Feb 19, 2025
bc240ca
[PHP8.4] stan and psalm
dpfaffenbauer Feb 21, 2025
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
Prev Previous commit
Next Next commit
[Design-v2] - change logic for the javascripts, bootstrap 5.3
codingioanniskrikos committed Sep 23, 2024
commit 4b5e4037acf4a722e8354423e703476c7e3c01b9
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* STYLES */
import '../scss/app.scss';

/* JS */
/* JS */
import 'bootstrap';
266 changes: 158 additions & 108 deletions src/CoreShop/Bundle/FrontendBundle/Resources/assets/package-lock.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -8,7 +8,9 @@
"not IE >= 0"
],
"devDependencies": {
"@popperjs/core": "^2.11.8",
"@symfony/webpack-encore": "^4.7.0",
"@types/bootstrap": "^5.2.10",
"@types/node": "^22.5.4",
"bootstrap": "^5.3.3",
"bootstrap-icons": "^1.11.3",
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* styles */
@import "bootstrap/scss/bootstrap";
@import "fonts";
@import "flag-icons/sass/flag-icons";
@import "bootstrap-icons/font/bootstrap-icons";
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"compilerOptions": {
"types": ["tsd", "node"],
"target": "es2022",
"target": "es5",
"module": "esnext",
"lib": ["dom", "es6"],
"strict": true,
"moduleResolution": "node",
"resolveJsonModule": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"baseUrl": "./",
"paths": {
"@/*": ["node_modules/*"]
}
}
},
"include": ["./js/**/*"]
}
Original file line number Diff line number Diff line change
@@ -5,12 +5,10 @@ if (!Encore.isRuntimeEnvironmentConfigured()) {
}

Encore
// directory where compiled assets will be stored
.setOutputPath('../public/build/')
// public path used by the web server to access the output path
.setPublicPath('/build')
// only needed for CDN's or sub-directory deploy
//.setManifestKeyPrefix('')
.setPublicPath('/bundles/coreshopfrontend/build/')
.setManifestKeyPrefix('bundles/coreshopfrontend/build/')
.cleanupOutputBeforeBuild()

/*
* ENTRY CONFIG
@@ -25,7 +23,7 @@ Encore

// will require an extra script tag for runtime.js
// but, you probably want this, unless you're building a single-page app
.enableSingleRuntimeChunk()
.disableSingleRuntimeChunk()

/*
* FEATURE CONFIG
@@ -69,8 +67,6 @@ Encore
// requires WebpackEncoreBundle 1.4 or higher
//.enableIntegrityHashes(Encore.isProduction())

// uncomment if you're having problems with a jQuery plugin
.autoProvidejQuery()
.copyFiles([
{
from: "./node_modules/bootstrap-icons/font/fonts",
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
twig:
form_themes:
- '@CoreShopFrontend/Form/fields.html.twig'
- '@CoreShopFrontend/Form/fields.html.twig'

# TODO SET CORRECT THE PATH #
webpack_encore:
output_path: '%kernel.project_dir%/src/CoreShop/Bundle/FrontendBundle/Resources/public/build'
script_attributes:
defer: true

Large diffs are not rendered by default.

172 changes: 163 additions & 9 deletions src/CoreShop/Bundle/FrontendBundle/Resources/public/build/app.js

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@
"entrypoints": {
"app": {
"js": [
"/build/runtime.js",
"/build/app.js"
"/bundles/coreshopfrontend/build/vendors-node_modules_bootstrap_dist_js_bootstrap_esm_js.js",
"/bundles/coreshopfrontend/build/app.js"
],
"css": [
"/build/app.css"
"/bundles/coreshopfrontend/build/app.css"
]
}
}
616 changes: 308 additions & 308 deletions src/CoreShop/Bundle/FrontendBundle/Resources/public/build/manifest.json

Large diffs are not rendered by default.

160 changes: 0 additions & 160 deletions src/CoreShop/Bundle/FrontendBundle/Resources/public/build/runtime.js

This file was deleted.

Loading