andre/30-seconds-of-code
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #169 from 30-seconds/update-extractor

Browse Source 
[Chore] Update extractor for 30-seconds-web
This commit is contained in:
Angelos Chalaris
2019-11-06 19:25:04 +02:00
committed by GitHub
parent 255614418d 9b675bfdd3
commit acc432f60f
7 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
config.js
View File

@ -12,7 +12,16 @@ module.exports = {
pagePath: `src/docs/pages`,
staticPartsPath: `src/static-parts`,
// General information
language: `css`,
secondLanguage: `html`,
optionalLanguage: `js`
language: {
short: `css`,
long: `CSS`,
},
secondLanguage: {
short: `html`,
long: `HTML`
},
optionalLanguage:{
short: `js`,
long: `JavaScript`
}
}

6
scripts/build.js
View File

@ -91,10 +91,10 @@ try {
output += snippet.attributes.text
output += `\`\`\`${config.secondLanguage}\n${snippet.attributes.codeBlocks.html}\n\`\`\`\n\n`
output += `\`\`\`${config.language}\n${snippet.attributes.codeBlocks.css}\n\`\`\`\n\n`
output += `\`\`\`${config.secondLanguage.short}\n${snippet.attributes.codeBlocks.html}\n\`\`\`\n\n`
output += `\`\`\`${config.language.short}\n${snippet.attributes.codeBlocks.css}\n\`\`\`\n\n`
if (snippet.attributes.codeBlocks.js)
output += `\`\`\`${config.optionalLanguage}\n${snippet.attributes.codeBlocks.js}\n\`\`\`\n\n`
output += `\`\`\`${config.optionalLanguage.short}\n${snippet.attributes.codeBlocks.js}\n\`\`\`\n\n`
output += headers.h4('Explanation')
output += snippet.attributes.explanation

8
scripts/extract.js
View File

@ -42,7 +42,9 @@ const completeData = {
data: [...snippetsArray],
meta: {
specification: 'http://jsonapi.org/format/',
type: 'snippetArray'
type: 'snippetArray',
language: config.language,
otherLanguages: [config.secondLanguage, config.optionalLanguage]
}
}
let listingData = {
@ -60,7 +62,9 @@ let listingData = {
})),
meta: {
specification: 'http://jsonapi.org/format/',
type: 'snippetListingArray'
type: 'snippetListingArray',
language: config.language,
otherLanguages: [config.secondLanguage, config.optionalLanguage]
}
}
// Write files

4
scripts/util/helpers.js
View File

@ -35,10 +35,10 @@ const prepTaggedData = tagDbData =>
)
const makeExamples = data => {
data =
data.slice(0, data.lastIndexOf(`\`\`\`${config.language}`)).trim() +
data.slice(0, data.lastIndexOf(`\`\`\`${config.language.short}`)).trim() +
misc.collapsible(
'Examples',
data.slice(data.lastIndexOf(`\`\`\`${config.language}`), data.lastIndexOf('```')) +
data.slice(data.lastIndexOf(`\`\`\`${config.language.short}`), data.lastIndexOf('```')) +
data.slice(data.lastIndexOf('```'))
)
return `${data}\n<br>${misc.link('⬆ Back to top', misc.anchor('Contents'))}\n\n`

11
scripts/util/snippetParser.js
View File

@ -51,9 +51,9 @@ const getCodeBlocks = str => {
results.push(match)
})
}
const replacer = new RegExp(`\`\`\`${config.language}([\\s\\S]*?)\`\`\``, 'g')
const secondReplacer = new RegExp(`\`\`\`${config.secondLanguage}([\\s\\S]*?)\`\`\``, 'g')
const optionalReplacer = new RegExp(`\`\`\`${config.optionalLanguage}([\\s\\S]*?)\`\`\``, 'g')
const replacer = new RegExp(`\`\`\`${config.language.short}([\\s\\S]*?)\`\`\``, 'g')
const secondReplacer = new RegExp(`\`\`\`${config.secondLanguage.short}([\\s\\S]*?)\`\`\``, 'g')
const optionalReplacer = new RegExp(`\`\`\`${config.optionalLanguage.short}([\\s\\S]*?)\`\`\``, 'g')
results = results.map(v =>
v
.replace(replacer, '$1')
@ -159,7 +159,10 @@ const readSnippets = snippetsPath => {
tags: data.attributes.tags.split(',').map(t => t.trim())
},
meta: {
hash: hashData(data.body)
hash: hashData(data.body),
firstSeen: execSync(`git log --diff-filter=A --pretty=format:%at -- snippets/${snippet}`).toString(),
lastUpdated: execSync(`git log -n 1 --pretty=format:%at -- snippets/${snippet}`).toString(),
updateCount: execSync(`git log --pretty=%H -- snippets/${snippet}`).toString().split('\n').length
}
}
snippets[snippet].attributes.codeBlocks.scopedCss = sass

6
src/docs/components/SnippetCard.js
View File

@ -81,19 +81,19 @@ const FullCard = ({ snippetData, isDarkMode }) => {
<div className='card-bottom'>
<h5 className='card-section-title card-section-html'>HTML</h5>
<pre
className={`card-code language-${config.secondLanguage}`}
className={`card-code language-${config.secondLanguage.short}`}
dangerouslySetInnerHTML={{ __html: cardCodeHtml }}
/>
<h5 className='card-section-title card-section-css'>CSS</h5>
<pre
className={`card-code language-${config.language}`}
className={`card-code language-${config.language.short}`}
dangerouslySetInnerHTML={{ __html: cardCodeCss }}
/>
{
cardCodeJs && <>
<h5 className='card-section-title card-section-js'>JavaScript</h5>
<pre
className={`card-code language-${config.optionalLanguage}`}
className={`card-code language-${config.optionalLanguage.short}`}
dangerouslySetInnerHTML={{ __html: cardCodeJs }}
/>
</>

8
src/docs/util/index.js
View File

@ -56,15 +56,15 @@ const getCodeBlocks = str => {
});
}
const replacer = new RegExp(
`<pre class="language-${config.language}"><code class="language-${config.language}">([\\s\\S]*?)</code></pre>`,
`<pre class="language-${config.language.short}"><code class="language-${config.language.short}">([\\s\\S]*?)</code></pre>`,
'g',
);
const secondReplacer = new RegExp(
`<pre class="language-${config.secondLanguage}"><code class="language-${config.secondLanguage}">([\\s\\S]*?)</code></pre>`,
`<pre class="language-${config.secondLanguage.short}"><code class="language-${config.secondLanguage.short}">([\\s\\S]*?)</code></pre>`,
'g',
);
const optionalReplacer = new RegExp(
`<pre class="language-${config.optionalLanguage}"><code class="language-${config.optionalLanguage}">([\\s\\S]*?)</code></pre>`,
`<pre class="language-${config.optionalLanguage.short}"><code class="language-${config.optionalLanguage.short}">([\\s\\S]*?)</code></pre>`,
'g',
);
results = results.map(v =>
@ -136,7 +136,7 @@ const getRawCodeBlocks = str => {
});
}
const replacer = new RegExp(
`\`\`\`${config.language}([\\s\\S]*?)\`\`\``,
`\`\`\`${config.language.short}([\\s\\S]*?)\`\`\``,
'g',
);
results = results.map(v => v.replace(replacer, '$1').trim());