Skip to content

Refactor site into layouts #313

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.

Sign up for GitHub

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

Merged
merged 18 commits into from
Jul 27, 2022
Merged

Refactor site into layouts #313

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7607b3f
Merge pull request #2 from camchenry/add-eleventy-site
camchenry Jul 7, 2022
2691644
Add base layout
camchenry Jul 7, 2022
9bb624f
Load scripts after body
camchenry Jul 7, 2022
6281dec
Add base layout to test file
camchenry Jul 7, 2022
0efd83f
Fix documentation examples JS not working
camchenry Jul 7, 2022
5befd44
Load scripts in head, keep some scripts inline for compatibility
camchenry Jul 7, 2022
ffeab47
Add dynamic title
camchenry Jul 7, 2022
1103dbb
Merge pull request #4 from camchenry/add-eleventy-site
camchenry Jul 7, 2022
476eab7
Merge remote-tracking branch 'origin/main' into refactor-site
camchenry Jul 8, 2022
950a54f
Add a main layout and extract base layout
camchenry Jul 8, 2022
deeea01
Remove IE comment
camchenry Jul 8, 2022
7361913
Use base layout for online page
camchenry Jul 8, 2022
4a79e25
Revert quote escaping change
camchenry Jul 8, 2022
fae94bb
Revert formatting changes
camchenry Jul 8, 2022
0dde569
Revert parentheses change for formatting
camchenry Jul 8, 2022
412caad
Merge pull request #3 from camchenry/refactor-site
camchenry Jul 8, 2022
ab22c34
Merge branch 'peggyjs:main' into main
camchenry Jul 8, 2022
dc222a1
Update dev server config
camchenry Jul 23, 2022
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
28 changes: 28 additions & 0 deletions docs/_includes/base-layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="copyright" content="Copyright &copy; 2022 The Peggy Authors" />
<meta name="keywords" content="parser generator, PEG, JavaScript, PEG.js" />
<meta
name="description"
content="Peggy is a parser generator for JavaScript based on the parsing expression grammar formalism."
/>
<title>{% if title %}{{ title }} &raquo; {% endif %}Peggy &ndash; Parser Generator for JavaScript</title>
<link rel="stylesheet" href="{{ "/css/common.css" | url }}" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
{% if stylesheets %}
{% for stylesheet in stylesheets %}
<link rel="stylesheet" href="{{ stylesheet | url }}" />
{% endfor %}
{% endif %}
{% if scripts %}
{% for script in scripts %}
<script src="{{ script | url }}"></script>
{% endfor %}
{% endif %}
</head>
<body>
{{content}}
</body>
</html>
8 changes: 8 additions & 0 deletions docs/_includes/components/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<footer id="footer">
Copyright &copy; 2022
<a href="https://github.com/peggyjs/peggy/blob/main/AUTHORS"
>The Peggy Authors</a
>
&bull;
<a href="https://github.com/peggyjs/peggy">Source code</a>
</footer>
11 changes: 11 additions & 0 deletions docs/_includes/components/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<header id="header">
<h1><a href="#main">Peggy</a></h1>
<h2>Parser Generator for JavaScript</h2>
</header>

<nav id="menu">
<a {% if page.url == "/" %} aria-current="page" class="current" {% endif %} href="{{ "/index.html" | url }}">Home</a>
<a {% if page.url == "/online.html" %} aria-current="page" class="current" {% endif %} href="{{ "/online.html" | url }}">Online Version</a>
<a {% if page.url == "/documentation.html" %} aria-current="page" class="current" {% endif %} href="{{ "/documentation.html" | url }}">Documentation</a>
<a {% if page.url contains "/development" %} aria-current="page" class="current" {% endif %} href="{{ "/development/index.html" | url }}">Development</a>
</nav>
11 changes: 11 additions & 0 deletions docs/_includes/main-layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
layout: base-layout
stylesheets: ["/css/layout-default.css", "/css/content.css"]
---
<div id="main">
{% include 'components/header.html' %}

<div id="content">{{content}}</div>

{% include 'components/footer.html' %}
</div>
19 changes: 19 additions & 0 deletions docs/css/documentation.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.example {
background-color: #f0f0f0;
display: flex;
flex-direction: row;
padding: 0.25em 0.5em;
margin: 0.5em;
border-radius: 0.5em;
}
.example .result {
font-family: monospace;
white-space: pre-wrap;
margin-left: 5px;
}
.example .try {
margin-left: 30px;
}
.error {
color: red;
}
109 changes: 30 additions & 79 deletions docs/development/benchmark.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,82 +1,33 @@
---
permalink: '/development/benchmark.html'
title: 'Benchmark'
permalink: "/development/benchmark.html"
layout: main-layout
stylesheets: ["/css/benchmark.css"]
scripts:
[
"https://unpkg.com/[email protected]/dist/jquery.min.js",
"https://unpkg.com/[email protected]/jquery.scrollTo.min.js",
]
---

<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8">
<meta name="copyright" content="Copyright &copy; 2022 The Peggy Authors">
<meta name="keywords" content="parser generator, PEG, JavaScript, PEG.js">
<meta name="description" content="Peggy is a parser generator for JavaScript based on the parsing expression grammar formalism.">
<title>Benchmark &raquo; Peggy &ndash; Parser Generator for JavaScript</title>
<link rel="stylesheet" href="../css/common.css">
<link rel="stylesheet" href="../css/layout-default.css">
<link rel="stylesheet" href="../css/content.css">
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
<!--[if IE]>
<script>
var html5elements = ["aside", "footer", "header", "nav"];
for (var i = 0; i < html5elements.length; i++) {
document.createElement(html5elements[i]);
}
</script>
<![endif]-->

</head>

<body>
<div id='main'>
<header id="header">
<h1><a href="../index.html">Peggy</a></h1>
<h2>Parser Generator for JavaScript</h2>
</header>

<nav id="menu">
<a href="../index.html">Home</a>
<a href="../online.html">Online Version</a>
<a href="../documentation.html">Documentation</a>
<a href="index.html">Development</a>
</nav>

<div id="content">



<link rel="stylesheet" href="../css/benchmark.css">

<div id="options">
<label for="run-count">Run each test</label>
<input type="text" id="run-count" value="10"> times
<input type="checkbox" id="cache">
<label for="cache">Use results cache</label>
<input type="button" id="run" value="Run">
</div>

<table id="results-table">
<tr class="columns">
<th>Test</th>
<th>Input Size</th>
<th>Average Parse Time</th>
<th>Average Parse Speed</th>
</tr>
<tr>
<td class="no-results" colspan="4">No results available yet.</td>
</tr>
</table>

<script src="https://unpkg.com/[email protected]/dist/jquery.min.js"></script>
<script src="https://unpkg.com/[email protected]/jquery.scrollTo.min.js"></script>
<script src="../js/benchmark-bundle.min.js"></script>
</div>

<footer id="footer">
Copyright &copy; 2022 <a href="https://github.com/peggyjs/peggy/blob/main/AUTHORS">The Peggy Authors</a>
&bull;
<a href="https://github.com/peggyjs/peggy">Source code</a>
</footer>
</div>
</body>

</html>
<script defer src="/js/benchmark-bundle.min.js"></script>

<div id="options">
<label for="run-count">Run each test</label>
<input type="text" id="run-count" value="10" /> times
<input type="checkbox" id="cache" />
<label for="cache">Use results cache</label>
<input type="button" id="run" value="Run" />
</div>

<table id="results-table">
<tr class="columns">
<th>Test</th>
<th>Input Size</th>
<th>Average Parse Time</th>
<th>Average Parse Speed</th>
</tr>
<tr>
<td class="no-results" colspan="4">No results available yet.</td>
</tr>
</table>
112 changes: 30 additions & 82 deletions docs/development/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,86 +1,34 @@
---
title: 'Development'
permalink: '/development/index.html'
layout: main-layout
---

<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8">
<meta name="copyright" content="Copyright &copy; 2022 The Peggy Authors">
<meta name="keywords" content="parser generator, PEG, JavaScript, PEG.js">
<meta name="description" content="Peggy is a parser generator for JavaScript based on the parsing expression grammar formalism.">
<title>Development &raquo; Peggy &ndash; Parser Generator for JavaScript</title>
<link rel="stylesheet" href="../css/common.css">
<link rel="stylesheet" href="../css/layout-default.css">
<link rel="stylesheet" href="../css/content.css">
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
<!--[if IE]>
<script>
var html5elements = ["aside", "footer", "header", "nav"];
for (var i = 0; i < html5elements.length; i++) {
document.createElement(html5elements[i]);
}
</script>
<![endif]-->

</head>

<body>
<div id='main'>
<header id="header">
<h1><a href="../index.html">Peggy</a></h1>
<h2>Parser Generator for JavaScript</h2>
</header>

<nav id="menu">
<a href="../index.html">Home</a>
<a href="../online.html">Online Version</a>
<a href="../documentation.html">Documentation</a>
<a class="current" href="index.html">Development</a>
</nav>

<div id="content">



<h1>Development</h1>

<ul>
<li><a href="https://github.com/peggyjs/peggy/wiki">Wiki</a></li>
<li><a href="https://github.com/peggyjs/peggy">Source code</a></li>
<li><a href="benchmark.html">Benchmark Suite</a></li>
<li><a href="test.html">Test Suite</a></li>
<li><a href="../online.html">Try Development Version online</a></li>
<li><a href="https://github.com/peggyjs/peggy/issues">Issue tracker</a></li>
<li><a href="https://groups.google.com/group/pegjs">Google Group</a></li>
</ul>

<p>Starting in April 2021, Peggy has been maintained by
<a href="https://github.com/hildjj">Joe Hildebrand</a>
(<a href="https://twitter.com/hildjj/">@hildjj</a>). It was previously
known as <a href="https://github.com/pegjs/pegjs">PEG.js</a>, but had
fallen into <a href="https://github.com/pegjs/pegjs/issues/639">limbo</a>
before a community-desired fork.</p>

<p>Since its <a href="https://www.google.com/search?q=inception&plus;meaning">inception</a>
in 2010, PEG.js was maintained by <a href="https://majda.cz/">David Majda</a>
(<a href="https://twitter.com/dmajda">@dmajda</a>),
until <a href="https://github.com/pegjs/pegjs/issues/503">May 2017</a>
when <a href="https://github.com/futagoza">Futago-za Ryuu</a> took over.</p>

<p>You are welcome to contribute code. Unless your contribution is really
trivial you should <a href="https://github.com/peggyjs/peggy/discussions">get in touch with us</a>
first &mdash; this can prevent wasted effort on both sides.</p>

</div>

<footer id="footer">
Copyright &copy; 2022 <a href="https://github.com/peggyjs/peggy/blob/main/AUTHORS">The Peggy Authors</a>
&bull;
<a href="https://github.com/peggyjs/peggy">Source code</a>
</footer>
</div>
</body>

</html>
<h1>Development</h1>

<ul>
<li><a href="https://github.com/peggyjs/peggy/wiki">Wiki</a></li>
<li><a href="https://github.com/peggyjs/peggy">Source code</a></li>
<li><a href="benchmark.html">Benchmark Suite</a></li>
<li><a href="test.html">Test Suite</a></li>
<li><a href="../online.html">Try Development Version online</a></li>
<li><a href="https://github.com/peggyjs/peggy/issues">Issue tracker</a></li>
<li><a href="https://groups.google.com/group/pegjs">Google Group</a></li>
</ul>

<p>Starting in April 2021, Peggy has been maintained by
<a href="https://github.com/hildjj">Joe Hildebrand</a>
(<a href="https://twitter.com/hildjj/">@hildjj</a>). It was previously
known as <a href="https://github.com/pegjs/pegjs">PEG.js</a>, but had
fallen into <a href="https://github.com/pegjs/pegjs/issues/639">limbo</a>
before a community-desired fork.</p>

<p>Since its <a href="https://www.google.com/search?q=inception&plus;meaning">inception</a>
in 2010, PEG.js was maintained by <a href="https://majda.cz/">David Majda</a>
(<a href="https://twitter.com/dmajda">@dmajda</a>),
until <a href="https://github.com/pegjs/pegjs/issues/503">May 2017</a>
when <a href="https://github.com/futagoza">Futago-za Ryuu</a> took over.</p>

<p>You are welcome to contribute code. Unless your contribution is really
trivial you should <a href="https://github.com/peggyjs/peggy/discussions">get in touch with us</a>
first &mdash; this can prevent wasted effort on both sides.</p>
Loading