Skip to content

Commit

Permalink
House keeping (#37)
Browse files Browse the repository at this point in the history
* Remove title block from the home page

* Migrate to addons-based config, housekeeping

* Fix lint
  • Loading branch information
sneridagh authored Mar 15, 2024
1 parent e15b4b9 commit 5404aa8
Show file tree
Hide file tree
Showing 38 changed files with 4,674 additions and 2,202 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"@id": "/Plone",
"@type": "Plone Site",
"UID": "c15b0bfa382142e493ec4fe23e2988c1",
"UID": "d9fa395c1757420698a37cc2b11c6034",
"allow_discussion": null,
"blocks": {
"03511c33-6c36-4135-a60a-0be82ccc7e8f": {
Expand Down Expand Up @@ -571,9 +571,6 @@
}
]
},
"bbfa53bd-b3c3-4dcd-88fc-3121fef5bb39": {
"@type": "title"
},
"c187b31d-f521-4ebe-98ec-01f2247599b4": {
"@type": "slate",
"plaintext": "Technical Details",
Expand Down Expand Up @@ -826,7 +823,6 @@
},
"blocks_layout": {
"items": [
"bbfa53bd-b3c3-4dcd-88fc-3121fef5bb39",
"303984b4-693a-408f-83f7-5a88b243d7db",
"fae599f3-e7d4-451b-a413-84355c796b7e",
"03511c33-6c36-4135-a60a-0be82ccc7e8f",
Expand All @@ -848,7 +844,7 @@
"creators": [
"admin"
],
"description": "A Plone Site",
"description": "Site created with a new Plone Distribution",
"effective": null,
"exclude_from_nav": false,
"expires": null,
Expand All @@ -865,6 +861,6 @@
"rights": "",
"subjects": [],
"table_of_contents": null,
"title": "Welcome to Plone 6!",
"title": "Welcome to Plone 6",
"type_title": "Plone Site"
}
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@
"locked": false,
"stealable": true
},
"modified": "2024-03-09T13:33:30+00:00",
"modified": "2024-03-14T16:44:16+00:00",
"parent": {
"@id": "/",
"@type": "Plone Site",
"UID": "c15b0bfa382142e493ec4fe23e2988c1",
"description": "A Plone Site",
"title": "Welcome to Plone 6!",
"UID": "d9fa395c1757420698a37cc2b11c6034",
"description": "Site created with a new Plone Distribution",
"title": "Welcome to Plone 6",
"type_title": "Plone Site"
},
"preview_caption": null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@
"locked": false,
"stealable": true
},
"modified": "2024-03-09T13:33:30+00:00",
"modified": "2024-03-14T16:44:16+00:00",
"parent": {
"@id": "/",
"@type": "Plone Site",
"UID": "c15b0bfa382142e493ec4fe23e2988c1",
"description": "A Plone Site",
"title": "Welcome to Plone 6!",
"UID": "d9fa395c1757420698a37cc2b11c6034",
"description": "Site created with a new Plone Distribution",
"title": "Welcome to Plone 6",
"type_title": "Plone Site"
},
"preview_caption": null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@
"locked": false,
"stealable": true
},
"modified": "2024-03-09T13:33:30+00:00",
"modified": "2024-03-14T16:44:15+00:00",
"parent": {
"@id": "/",
"@type": "Plone Site",
"UID": "c15b0bfa382142e493ec4fe23e2988c1",
"description": "A Plone Site",
"title": "Welcome to Plone 6!",
"UID": "d9fa395c1757420698a37cc2b11c6034",
"description": "Site created with a new Plone Distribution",
"title": "Welcome to Plone 6",
"type_title": "Plone Site"
},
"preview_caption": null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
"parent": {
"@id": "/",
"@type": "Plone Site",
"UID": "c15b0bfa382142e493ec4fe23e2988c1",
"description": "A Plone Site",
"title": "Welcome to Plone 6!",
"UID": "d9fa395c1757420698a37cc2b11c6034",
"description": "Site created with a new Plone Distribution",
"title": "Welcome to Plone 6",
"type_title": "Plone Site"
},
"review_state": null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
"locked": false,
"stealable": true
},
"modified": "2024-03-09T13:33:30+00:00",
"modified": "2024-03-14T16:44:16+00:00",
"parent": {
"@id": "/",
"@type": "Plone Site",
"UID": "c15b0bfa382142e493ec4fe23e2988c1",
"description": "A Plone Site",
"title": "Welcome to Plone 6!",
"UID": "d9fa395c1757420698a37cc2b11c6034",
"description": "Site created with a new Plone Distribution",
"title": "Welcome to Plone 6",
"type_title": "Plone Site"
},
"preview_caption": null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"locked": false,
"stealable": true
},
"modified": "2024-03-09T13:33:29+00:00",
"modified": "2024-03-14T16:44:15+00:00",
"parent": {
"@id": "/block",
"@type": "Document",
Expand Down
2 changes: 2 additions & 0 deletions frontend/.eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
src/addons/**/node_modules
src/addons/**/cypress
src/addons/**/build

!src/addons/volto-demo
2 changes: 2 additions & 0 deletions frontend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,5 @@ src/addons/*
!.yarn/releases
!.yarn/sdks
!.yarn/versions

!src/addons/volto-demo
3 changes: 2 additions & 1 deletion frontend/.prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
src/**/CHANGELOG.md
src/**/README.md
src/**/README.md
!src/addons/volto-demo
6 changes: 5 additions & 1 deletion frontend/mrs.developer.json
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
{}
{
"volto-demo": {
"local": "addons/volto-demo/src"
}
}
33 changes: 10 additions & 23 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,6 @@
"storybook": "start-storybook -p 6006",
"build-storybook": "build-storybook"
},
"addons": [
"volto-form-block",
"@eeacms/volto-accordion-block",
"@kitconcept/volto-button-block",
"@kitconcept/volto-heading-block",
"@kitconcept/volto-introduction-block",
"@kitconcept/volto-highlight-block",
"@kitconcept/volto-separator-block",
"@kitconcept/volto-slider-block",
"@kitconcept/volto-light-theme"
],
"jest": {
"transform": {
"^.+\\.js(x)?$": "babel-jest",
Expand Down Expand Up @@ -132,17 +121,15 @@
"engines": {
"node": "^18 || ^20"
},
"addons": [
"volto-demo"
],
"theme": "@kitconcept/volto-light-theme",
"workspaces": [
"src/addons/volto-demo"
],
"dependencies": {
"@eeacms/volto-accordion-block": "*",
"@kitconcept/volto-button-block": "*",
"@kitconcept/volto-heading-block": "*",
"@kitconcept/volto-highlight-block": "*",
"@kitconcept/volto-introduction-block": "*",
"@kitconcept/volto-light-theme": "*",
"@kitconcept/volto-separator-block": "*",
"@kitconcept/volto-slider-block": "*",
"@plone/volto": "17.15.1",
"volto-form-block": "*"
"@plone/volto": "17.15.5"
},
"devDependencies": {
"@plone/scripts": "^3.3.1",
Expand All @@ -158,6 +145,7 @@
"jest-junit": "8.0.0",
"mrs-developer": "*",
"postcss": "8.4.13",
"postcss-less": "6.0.0",
"prettier": "3.0.3",
"razzle": "4.2.18",
"stylelint": "15.10.3",
Expand All @@ -174,6 +162,5 @@
"volta": {
"node": "20.9.0",
"yarn": "3.6.0"
},
"theme": "@kitconcept/volto-light-theme"
}
}
1 change: 1 addition & 0 deletions frontend/src/addons/volto-demo/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
3 changes: 3 additions & 0 deletions frontend/src/addons/volto-demo/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
cypress
node_modules
acceptance
48 changes: 48 additions & 0 deletions frontend/src/addons/volto-demo/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"extends": ["react-app", "prettier", "plugin:jsx-a11y/recommended"],
"plugins": ["prettier", "react-hooks", "jsx-a11y"],
"env": {
"es6": true,
"browser": true,
"node": true,
"mocha": true,
"jasmine": true
},
"parser": "@babel/eslint-parser",
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
"ecmaFeatures": {
"legacyDecorators": true
}
},
"rules": {
"import/no-unresolved": 0,
"no-alert": 1,
"no-console": 1,
"no-debugger": 1,
"prettier/prettier": [
"error",
{ "trailingComma": "all", "singleQuote": true }
],
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "warn",
"react/react-in-jsx-scope": "off"
},
"globals": {
"root": true,
"__DEVELOPMENT__": true,
"__CLIENT__": true,
"__SERVER__": true,
"__DISABLE_SSR__": true,
"__DEVTOOLS__": true,
"__DEBUG__": true,
"__SSR__": true,
"__SENTRY__": true,
"cy": true,
"Cypress": true,
"jest": true,
"socket": true,
"webpackIsomorphicTools": true
}
}
27 changes: 27 additions & 0 deletions frontend/src/addons/volto-demo/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
.vscode/
.history
logs
*.log
npm-debug.log*
.DS_Store
*.swp
yarn-error.log

node_modules
build
dist
.env.local
.env.development.local
.env.test.local
.env.production.local

.changelog.draft

# yarn 3
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
27 changes: 27 additions & 0 deletions frontend/src/addons/volto-demo/.gitignorefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
.vscode/
.history
logs
*.log
npm-debug.log*
.DS_Store
*.swp
yarn-error.log

node_modules
build
dist
.env.local
.env.development.local
.env.test.local
.env.production.local

.changelog.draft

# yarn 3
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
2 changes: 2 additions & 0 deletions frontend/src/addons/volto-demo/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CHANGELOG.md
README.md
12 changes: 12 additions & 0 deletions frontend/src/addons/volto-demo/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"trailingComma": "all",
"singleQuote": true,
"overrides": [
{
"files": "*.overrides",
"options": {
"parser": "less"
}
}
]
}
19 changes: 19 additions & 0 deletions frontend/src/addons/volto-demo/.release-it.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"hooks": {
"after:bump": "pipx run towncrier build --draft --yes --version ${version} > .changelog.draft && pipx run towncrier build --yes --version ${version}",
"after:release": "rm .changelog.draft"
},
"git": {
"changelog": "pipx run towncrier build --draft --yes --version 0.0.0",
"requireUpstream": false,
"requireCleanWorkingDir": false,
"commitMessage": "Release ${version}",
"tagName": "${version}",
"tagAnnotation": "Release ${version}"
},
"github": {
"release": true,
"releaseName": "${version}",
"releaseNotes": "cat .changelog.draft"
}
}
Loading

0 comments on commit 5404aa8

Please sign in to comment.