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

[#33] twig tailwind prettier #58

Draft
wants to merge 43 commits into
base: 5.x
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
82acf58
[#44] Adds icon macro
joshuapease Sep 24, 2024
dfd45c6
[#44] Adds a button component
joshuapease Sep 24, 2024
b91f06c
[#44] Adds a card component
joshuapease Sep 24, 2024
4daa7e0
[#44] Install Alpine JS
joshuapease Sep 24, 2024
bf5ca7e
[#44] Adds Alert Banner Component
joshuapease Sep 24, 2024
c1234fb
[#44] Adds Accordion Component
joshuapease Sep 24, 2024
54a42b1
[#44] Adds Tag Component
joshuapease Sep 24, 2024
476d4ac
[#44] Adds Dialog Component
joshuapease Sep 24, 2024
e5cac4c
[#44] Adds video component
joshuapease Sep 24, 2024
83f4ee0
[#44] Install `spacecatninja/imager-x-power-pack`
joshuapease Sep 25, 2024
e490944
[#44] Adds image components. Also image card component.
joshuapease Sep 25, 2024
6ed09de
[#44] Install standalone Viget Parts Kit
joshuapease Sep 25, 2024
659c795
[#44] Adds local filesystem and asset volume
joshuapease Sep 25, 2024
abde8cc
[#44] Tweaks during code review
joshuapease Sep 27, 2024
29a1ada
[#45] Adds home entry type
joshuapease Sep 30, 2024
eba1676
[#45] Adds simple Rich Text block
joshuapease Sep 30, 2024
8fcd314
[#45] Adds Card Grid Block
joshuapease Sep 30, 2024
21811cb
[#45] Adds text with media block
joshuapease Oct 1, 2024
7993662
[#45] Rename primaryLink to href. Adds linkText and newWindow fields.
joshuapease Oct 1, 2024
9e9eff5
[#45] Adds Call To Action block
joshuapease Oct 1, 2024
8de4e85
[#45] Adds Page Hero block
joshuapease Oct 1, 2024
b2c2f39
[#45] Adds advanced / simple CKEditor configs
joshuapease Oct 1, 2024
cf41a52
[#45] Actually use _blocks/index.twig
joshuapease Oct 2, 2024
274f761
[n/a] Use real TW class
joshuapease Oct 2, 2024
9d19fd3
[#45] Adds rough RTE styling
joshuapease Oct 2, 2024
d542cff
[#45] Adds a simple .container component for setting a site max width.
joshuapease Oct 2, 2024
01c9db6
[#45] Adds a heading block
joshuapease Oct 2, 2024
e79486c
[#45] Spacing management on page builder
joshuapease Oct 2, 2024
dd63dec
[#45] Block heading level accessibility
joshuapease Oct 2, 2024
d46d25a
[#45] Add heading to card grid block. Make card heading levels dynamic
joshuapease Oct 3, 2024
ec9a0e9
[#45] More context on container component
joshuapease Oct 3, 2024
c814436
[#45] Misc cleanup
joshuapease Oct 3, 2024
ee7d7ff
[#51] Nav Project Config
joshuapease Oct 3, 2024
83477f7
[#51] Basic desktop nav.
joshuapease Oct 3, 2024
dc4c19f
[#51] Adds skip link
joshuapease Oct 4, 2024
a68bbd8
[#51] Adds mobile nav
joshuapease Oct 4, 2024
b22b055
[#51] Adjust focus strategy for desktop nav.
joshuapease Oct 4, 2024
6064f44
[#51] Mobile nav polish
joshuapease Oct 4, 2024
8d583b1
[#51] Footer project config
joshuapease Oct 7, 2024
1493c53
[#51] Footer markup
joshuapease Oct 7, 2024
5233944
[#51] Fix tab control edge cases
joshuapease Oct 7, 2024
d526e75
[#51] Nav styling changes
joshuapease Oct 7, 2024
d081320
[#33] POC Twig/Tailwind Prettier
joshuapease Nov 11, 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
2 changes: 1 addition & 1 deletion .ddev/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ web_extra_exposed_ports:
web_extra_daemons:
# Run vite in a separate process
- name: 'vite'
command: 'npm install && npm run dev'
command: 'npm install && npm run build && npm run dev'
directory: /var/www/html
# Key features of ddev's config.yaml:

Expand Down
3 changes: 3 additions & 0 deletions .env.example.dev
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@ CRAFT_SECURITY_KEY=
CRAFT_DEV_MODE=true
CRAFT_ALLOW_ADMIN_CHANGES=true
CRAFT_DISALLOW_ROBOTS=true

# Asset Settings
ASSET_FILESYSTEM=local
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
.DS_Store
node_modules
/web/dist
/web/assets
/web/imager
/.vite
php-cs-fixer.cache

Expand Down
11 changes: 10 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,14 @@
"semi": false,
"singleQuote": true,
"tabWidth": 2,
"trailingComma": "all"
"trailingComma": "all",
"plugins": ["@zackad/prettier-plugin-twig", "prettier-plugin-tailwindcss"],
"twigPrintWidth": 80,
"twigAlwaysBreakObjects": true,
"twigMultiTags": [
"nav,endnav",
"switch,case,default,endswitch",
"ifchildren,endifchildren",
"cache,endcache"
]
}
8 changes: 7 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
"nystudio107/craft-seomatic": "5.1.3",
"nystudio107/craft-vite": "5.0.1",
"spacecatninja/imager-x": "5.0.2",
"spacecatninja/imager-x-power-pack": "1.0.5",
"verbb/navigation": "3.0.4",
"viget/craft-classnames": "3.0.0",
"viget/craft-parts-kit": "dev-main",
"vlucas/phpdotenv": "^5.4.0"
},
"require-dev": {
Expand Down Expand Up @@ -66,6 +68,10 @@
"type": "composer",
"url": "https://composer.craftcms.com",
"canonical": false
},
{
"type": "github",
"url": "https://github.com/vigetlabs/craft-parts-kit.git"
}
]
}
}
Loading