Skip to content

Commit 16de451

Browse files
greatislandergreatislander
authored
feat: configure Sveltia CMS (#15)
* feat: configure Sveltia CMS * feat: remove Pages CMS configuration
1 parent f856f0e commit 16de451

File tree

8 files changed

+5750
-12347
lines changed

8 files changed

+5750
-12347
lines changed

‎.pages.yml

-657
This file was deleted.

‎Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ WORKDIR /app
44

55
COPY package.json ./
66

7-
RUN apk add --no-cache git
7+
RUN apk add --no-cache git python3 py3-pip pango gcc musl-dev py3-wheel python3-dev libffi-dev zlib-dev jpeg-dev
8+
9+
RUN pip install weasyprint
810

911
RUN npm install
1012

‎eleventy.config.js

-9
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,6 @@ export default function eleventy(eleventyConfig) {
6363

6464
eleventyConfig.addPassthroughCopy({
6565
'node_modules/a11y-syntax-highlighting/dist/prism/a11y-dark.min.css': 'assets/styles/a11y-dark.min.css',
66-
'node_modules/decap-cms/dist/decap-cms.js': 'lib/cms/decap-cms.js',
67-
'node_modules/decap-cms/dist/decap-cms.js.map':
68-
'lib/cms/decap-cms.js.map',
69-
'node_modules/prop-types/prop-types.min.js':
70-
'lib/cms/prop-types.min.js',
71-
'node_modules/react/umd/react.development.js':
72-
'lib/cms/react.development.js',
73-
'node_modules/react/umd/react.production.min.js':
74-
'lib/cms/react.production.min.js',
7566
});
7667

7768
return {

‎package-lock.json

+5,725-11,483
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-9
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@
55
"main": "eleventy.config.js",
66
"scripts": {
77
"build": "npm-run-all -l clean -s build:*",
8-
"build:cms": "esbuild src/admin/previews.js --bundle --loader:.js=jsx --outfile=_site/admin/previews.js",
98
"build:eleventy": "eleventy",
109
"build:pdf": "weasyprint --pdf-variant=pdf/ua-1 _site/index.html _site/report.pdf",
1110
"clean": "rimraf _site",
12-
"cms": "decap-server",
1311
"create-pdf": "run",
1412
"debug": "DEBUG=Eleventy* eleventy",
1513
"dev": "cross-env NODE_ENV=development eleventy --serve",
@@ -19,10 +17,7 @@
1917
"lint:markdown": "markdownlint-cli2 \"**/*.md\"",
2018
"lint:yml": "xo \"**/*.yml\"",
2119
"open-pdf": "open-cli _site/report.pdf",
22-
"serve": "npx serve _site",
23-
"start": "npm-run-all -l clean -p start:*",
24-
"start:cms": "esbuild src/admin/previews.js --bundle --loader:.js=jsx --outfile=_site/admin/previews.js --watch",
25-
"start:eleventy": "run-p dev cms",
20+
"start": "npm-run-all -l clean dev",
2621
"prepare": "husky install"
2722
},
2823
"repository": {
@@ -41,17 +36,14 @@
4136
"@11ty/eleventy-fetch": "^4.0.0",
4237
"@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0",
4338
"a11y-syntax-highlighting": "^0.2.0",
44-
"decap-cms": "^3.1.2",
4539
"eleventy-plugin-markdown-shortcode": "^1.1.0",
46-
"esbuild": "^0.20.1",
4740
"new-github-issue-url": "^1.0.0"
4841
},
4942
"devDependencies": {
5043
"@commitlint/cli": "^19.0.3",
5144
"@commitlint/config-conventional": "^19.0.3",
5245
"cross-env": "^7.0.3",
5346
"debug": "^4.3.4",
54-
"decap-server": "^3.0.2",
5547
"eslint-config-xo-react": "^0.27.0",
5648
"eslint-plugin-jsdoc": "^48.2.1",
5749
"eslint-plugin-markdown": "^4.0.1",

‎src/admin/admin.njk

+1-13
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,8 @@ eleventyExcludeFromCollections: true
88
<meta charset="utf-8" />
99
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
1010
<title>IDRC WCAG Reporter</title>
11-
<script src="https://identity.netlify.com/v1/netlify-identity-widget.js"></script>
12-
<script>
13-
window.successCriteria = {{ successcriteria | dump | safe }};
14-
</script>
1511
</head>
1612
<body>
17-
<!-- Include the script that builds the page and powers Decap CMS -->
18-
<script src="/lib/cms/decap-cms.js"></script>
19-
{% if env.context === "dev" %}
20-
<script src="/lib/cms/react.development.js"></script>
21-
{% else %}
22-
<script src="/lib/cms/react.production.min.js"></script>
23-
{% endif %}
24-
<script src="/lib/cms/prop-types.min.js"></script>
25-
<script src="/admin/previews.js"></script>
13+
<script src="https://unpkg.com/@sveltia/cms/dist/sveltia-cms.js" type="module"></script>
2614
</body>
2715
</html>

‎src/admin/config.yml

+20-47
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
backend:
2-
name: git-gateway
2+
name: github
33
branch: main
4-
media_folder: src/_assets/uploads
5-
public_folder: /_assets/uploads
6-
local_backend: true
4+
repo: inclusive-design/idrc-wcag-reporter
5+
media_folder: src/assets/uploads
6+
public_folder: /assets/uploads
77
editor:
8-
preview: true
8+
preview: false
99
collections:
1010
- label: Report
1111
name: report
@@ -17,7 +17,7 @@ collections:
1717
- name: body
1818
label: About this report
1919
widget: markdown
20-
- label: Report
20+
- label: Report Details
2121
name: report
2222
file: src/report/index.md
2323
fields:
@@ -52,24 +52,24 @@ collections:
5252
label_singular: in scope item
5353
widget: list
5454
fields:
55-
- { name: "title", label: "Title", widget: "string" }
56-
- { name: "url", label: "URL", widget: "string" }
57-
- { name: "description", label: "Description", widget: "text", required: false }
55+
- {name: "title", label: "Title", widget: "string"}
56+
- {name: "url", label: "URL", widget: "string"}
57+
- {name: "description", label: "Description", widget: "text", required: false}
5858
- name: outOfScope
5959
label: Out of scope
6060
label_singular: out of scope item
6161
widget: list
6262
fields:
63-
- { name: "title", label: "Title", widget: "string" }
64-
- { name: "url", label: "URL", widget: "string" }
63+
- {name: "title", label: "Title", widget: "string"}
64+
- {name: "url", label: "URL", widget: "string"}
6565
- name: tools
6666
label: Tools used
6767
label_singular: tool
6868
widget: list
6969
summary: '{{fields.name}} {{fields.version}}'
7070
fields:
71-
- { name: "name", label: "Tool", widget: "string" }
72-
- { name: "version", label: "Version", widget: "string", required: false }
71+
- {name: "name", label: "Tool", widget: "string"}
72+
- {name: "version", label: "Version", widget: "string", required: false}
7373
hint: Enter browsers and assistive technologies used in auditing the website.
7474
- name: technologies
7575
label: Technologies used
@@ -115,6 +115,7 @@ collections:
115115
- name: number
116116
label: Number
117117
widget: string
118+
readonly: true
118119
- name: name
119120
label: Name
120121
widget: string
@@ -125,7 +126,7 @@ collections:
125126
extension: md
126127
create: true
127128
fields:
128-
- { label: Title, name: title, widget: string }
129+
- {label: Title, name: title, widget: string}
129130
- label: Success Criteria
130131
name: sc
131132
widget: relation
@@ -135,36 +136,8 @@ collections:
135136
value_field: successCriteria.*.number
136137
search_fields: [successCriteria.*.number, successCriteria.*.name]
137138
display_fields: [successCriteria.*.number, successCriteria.*.name]
138-
- {
139-
label: Severity,
140-
name: severity,
141-
widget: select,
142-
options: ["Unknown", "Low", "Medium", "High"],
143-
required: false,
144-
}
145-
- {
146-
label: Difficulty,
147-
name: difficulty,
148-
widget: select,
149-
options: ["Unknown", "Low", "Medium", "High"],
150-
required: false,
151-
}
152-
- { label: Sample Pages, name: sample, widget: string, default: "all" }
153-
- {
154-
label: Screenshots,
155-
name: screenshots,
156-
widget: object,
157-
required: false,
158-
fields:
159-
[
160-
{ label: "Screenshot", name: "src", widget: "image", required: false },
161-
{ label: "Alt Text", name: "alt", widget: "string", required: false },
162-
{ label: "Caption", name: "caption", widget: "text", required: false },
163-
],
164-
}
165-
- {
166-
label: Body,
167-
name: body,
168-
widget: markdown,
169-
default: "##### Problem\n\nDescribe the problem. Include code samples if necessary.\n\n##### Potential Solutions\n\nDescribe some potential solutions.\n\n##### Read more\n\nInclude some links to relevant examples and/or articles.",
170-
}
139+
- {label: Severity, name: severity, widget: select, options: ["Unknown", "Low", "Medium", "High"], required: false}
140+
- {label: Difficulty, name: difficulty, widget: select, options: ["Unknown", "Low", "Medium", "High"], required: false}
141+
- {label: Sample Pages, name: sample, widget: string, default: "all"}
142+
- {label: Screenshots, name: screenshots, widget: object, required: false, fields: [{label: "Screenshot", name: "src", widget: "image", required: false}, {label: "Alt Text", name: "alt", widget: "string", required: false}, {label: "Caption", name: "caption", widget: "text", required: false}]}
143+
- {label: Body, name: body, widget: markdown, default: "##### Problem\n\nDescribe the problem. Include code samples if necessary.\n\n##### Potential Solutions\n\nDescribe some potential solutions.\n\n##### Read more\n\nInclude some links to relevant examples and/or articles."}

‎src/admin/previews.js

-128
This file was deleted.

0 commit comments

Comments
 (0)