Skip to content

Commit c63d5d7

Browse files
marcpicaudmarcpicaud
committed
Comply with the Tab convention
1 parent 40ad1ab commit c63d5d7

File tree

4 files changed

+102
-102
lines changed

4 files changed

+102
-102
lines changed

‎scripts/build-copy.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ function process(file) {
1515
var output = Path.join('.build', file)
1616
mkdirp.sync(Path.dirname(output))
1717
Fs.createReadStream(file)
18-
.pipe(
19-
Fs.createWriteStream(output)
20-
.on('end', function () {
21-
delete processing[file]
22-
if (waiting[file]) {
23-
delete waiting[file]
24-
process(file)
25-
}
26-
})
27-
)
18+
.pipe(
19+
Fs.createWriteStream(output)
20+
.on('end', function () {
21+
delete processing[file]
22+
if (waiting[file]) {
23+
delete waiting[file]
24+
process(file)
25+
}
26+
})
27+
)
2828
}
2929

3030
cmdwatcher('build-copy'
31-
, ['!(node_modules)/**/*.@(png|jpg|svg|css|gif|ico)','*.@(png|jpg|svg|css|gif|ico|map)', 'js/*', 'CNAME']
32-
, function processFiles(files)
31+
, ['!(node_modules)/**/*.@(png|jpg|svg|css|gif|ico)','*.@(png|jpg|svg|css|gif|ico|map)', 'js/*', 'CNAME']
32+
, function processFiles(files)
3333
{
3434
files.forEach(process)
3535
})

‎scripts/build-html.js

Lines changed: 85 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -11,68 +11,68 @@ const FOOTER = Path.join(__dirname, '../footer.html')
1111

1212
const env = require('dotenv').config();
1313
if (env.error) {
14-
throw env.error;
14+
throw env.error;
1515
}
1616

1717
if (!process.env.GITHUB_PERSONAL_ACCESS_TOKEN) {
18-
throw new Error('GITHUB_PERSONAL_ACCESS_TOKEN environment variable is not found');
18+
throw new Error('GITHUB_PERSONAL_ACCESS_TOKEN environment variable is not found');
1919
}
2020

2121
const axios = require('axios').create({
22-
baseURL: 'https://api.github.com/',
23-
headers: { 'Authorization': `token ${process.env.GITHUB_PERSONAL_ACCESS_TOKEN}` }
22+
baseURL: 'https://api.github.com/',
23+
headers: { 'Authorization': `token ${process.env.GITHUB_PERSONAL_ACCESS_TOKEN}` }
2424
});
2525

2626
function createLangButton(dom, file, lang, langName) {
2727
var li = dom.createElement('li')
28-
li.className = 'nav-lang-' + lang
29-
li.innerHTML = '<a href="/' + (lang === 'en' ? '' : lang + '/') + (file === 'index.html' ? '' : file) + '" class="switch-lang" lang="' + lang + '">' + langName + '</a>'
30-
return li
28+
li.className = 'nav-lang-' + lang
29+
li.innerHTML = '<a href="/' + (lang === 'en' ? '' : lang + '/') + (file === 'index.html' ? '' : file) + '" class="switch-lang" lang="' + lang + '">' + langName + '</a>'
30+
return li
3131
}
3232

3333
function createSkipButton(dom) {
34-
var a = dom.createElement('a')
35-
a.className = 'skip'
36-
a.href = '#main'
37-
a.innerHTML = 'Skip to Content'
38-
return a
34+
var a = dom.createElement('a')
35+
a.className = 'skip'
36+
a.href = '#main'
37+
a.innerHTML = 'Skip to Content'
38+
return a
3939
}
4040

4141
function addTranslationNav(dom, file, languages) {
4242
var items = []
43-
var nav = dom.createElement('ul')
44-
nav.className = "nav-lang"
43+
var nav = dom.createElement('ul')
44+
nav.className = "nav-lang"
4545

46-
Object.keys(languages).sort(function (a, b) {
47-
return languages[a] > languages[b] ? 1 : -1
48-
}).forEach(function(lang) {
49-
var button = createLangButton(dom, file, lang, languages[lang])
50-
items.push(button.firstChild)
51-
nav.appendChild(button)
52-
})
53-
var node = dom.querySelector('header > *:first-child')
54-
if (node) {
55-
node.parentNode.insertBefore(createSkipButton(dom), node)
56-
node.parentNode.insertBefore(nav, node)
57-
}
58-
return items
46+
Object.keys(languages).sort(function (a, b) {
47+
return languages[a] > languages[b] ? 1 : -1
48+
}).forEach(function(lang) {
49+
var button = createLangButton(dom, file, lang, languages[lang])
50+
items.push(button.firstChild)
51+
nav.appendChild(button)
52+
})
53+
var node = dom.querySelector('header > *:first-child')
54+
if (node) {
55+
node.parentNode.insertBefore(createSkipButton(dom), node)
56+
node.parentNode.insertBefore(nav, node)
57+
}
58+
return items
5959
}
6060

6161
function createLanguageLink(dom, href, locale) {
62-
var link = dom.createElement('link')
63-
link.setAttribute('rel', 'alternate')
64-
link.setAttribute('href', href)
65-
link.setAttribute('hreflang', locale)
66-
return link
62+
var link = dom.createElement('link')
63+
link.setAttribute('rel', 'alternate')
64+
link.setAttribute('href', href)
65+
link.setAttribute('hreflang', locale)
66+
return link
6767
}
6868

6969
function addLanguageLinks(dom, file, locales) {
70-
var head = dom.querySelector('head')
71-
return Object.keys(locales).map(function (locale) {
70+
var head = dom.querySelector('head')
71+
return Object.keys(locales).map(function (locale) {
7272
var link = createLanguageLink(dom, (locale != 'en' ? '/' + locale : '') + '/' + (file === 'index.html' ? '' : file), locale)
7373
head.appendChild(link)
7474
return link
75-
})
75+
})
7676
}
7777

7878
function getNodeByLanguage(nodes, lang) {
@@ -87,53 +87,53 @@ function getNodeByLanguage(nodes, lang) {
8787
}
8888

8989
async function getStargazers(workshopElement) {
90-
const url = require('url');
91-
const githubUrl = workshopElement.getAttribute("href");
92-
let response, parsedUrl;
90+
const url = require('url');
91+
const githubUrl = workshopElement.getAttribute("href");
92+
let response, parsedUrl;
9393

94-
if (!githubUrl) {
95-
return 0;
96-
}
94+
if (!githubUrl) {
95+
return 0;
96+
}
9797

98-
try {
99-
parsedUrl = url.parse(githubUrl);
100-
} catch (e) {
101-
throw e;
102-
}
98+
try {
99+
parsedUrl = url.parse(githubUrl);
100+
} catch (e) {
101+
throw e;
102+
}
103103

104-
try {
105-
response = await axios.get(`/repos${parsedUrl.path}?per_page=1`);
106-
} catch (e) {
107-
throw e;
108-
}
109-
writeStargazers(workshopElement, response.data.stargazers_count)
104+
try {
105+
response = await axios.get(`/repos${parsedUrl.path}?per_page=1`);
106+
} catch (e) {
107+
throw e;
108+
}
109+
writeStargazers(workshopElement, response.data.stargazers_count)
110110
}
111111

112112
function writeStargazers(workshopElement, stargazersCount) {
113-
const starIconSVG = `<svg style="vertical-align: middle" viewBox="0 0 16 16" version="1.1" width="16" height="16" role="img"><path fill="currentColor" fill-rule="evenodd" d="M14 6l-4.9-.64L7 1 4.9 5.36 0 6l3.6 3.26L2.67 14 7 11.67 11.33 14l-.93-4.74L14 6z"></path></svg>`;
114-
workshopElement.innerHTML = `
115-
<span>${workshopElement.innerHTML}</span>
116-
<span>(${starIconSVG}${kFormatter(stargazersCount)})<span>
117-
`;
113+
const starIconSVG = `<svg style="vertical-align: middle" viewBox="0 0 16 16" version="1.1" width="16" height="16" role="img"><path fill="currentColor" fill-rule="evenodd" d="M14 6l-4.9-.64L7 1 4.9 5.36 0 6l3.6 3.26L2.67 14 7 11.67 11.33 14l-.93-4.74L14 6z"></path></svg>`;
114+
workshopElement.innerHTML = `
115+
<span>${workshopElement.innerHTML}</span>
116+
<span>(${starIconSVG}${kFormatter(stargazersCount)})<span>
117+
`;
118118
}
119119

120120
function kFormatter(number) {
121-
return number > 999 ? (number / 1000).toFixed(1) + 'k' : number
121+
return number > 999 ? (number / 1000).toFixed(1) + 'k' : number
122122
}
123123

124124
async function isRateLimitReached(nbToPerform) {
125-
const remaining = await axios.get('/rate_limit')
126-
if (remaining.data.resources.core.remaining < nbToPerform) {
127-
console.error(`💔 GitHub Rate Limit Reached. Reset at ${new Date(remaining.data.resources.core.reset * 1000).toLocaleTimeString()}`);
128-
return true;
129-
}
130-
return false;
125+
const remaining = await axios.get('/rate_limit')
126+
if (remaining.data.resources.core.remaining < nbToPerform) {
127+
console.error(`💔 GitHub Rate Limit Reached. Reset at ${new Date(remaining.data.resources.core.reset * 1000).toLocaleTimeString()}`);
128+
return true;
129+
}
130+
return false;
131131
}
132132

133133
cmdwatcher('build-html'
134-
, '!(node_modules).html'
135-
, 'languages/**'
136-
, function processFiles(files)
134+
, '!(node_modules).html'
135+
, 'languages/**'
136+
, function processFiles(files)
137137
{
138138
var languages
139139
try {
@@ -144,7 +144,7 @@ cmdwatcher('build-html'
144144
var translations = {}
145145
Object.keys(languages).forEach(function (lang) {
146146
var raw
147-
, translationPath = Path.join(__dirname, '../languages/', lang + '.json')
147+
, translationPath = Path.join(__dirname, '../languages/', lang + '.json')
148148
try {
149149
raw = Fs.readFileSync(translationPath, 'utf8')
150150
} catch (e) {
@@ -163,27 +163,27 @@ cmdwatcher('build-html'
163163
languages['en'] = 'English'
164164
files.forEach(async function (file) {
165165
var raw
166-
, dom
167-
, original
166+
, dom
167+
, original
168168
try {
169169
raw = Fs.readFileSync(file, 'utf8')
170170
} catch(e) {
171171
return console.log('Error while reading %s:\n%s', file, e)
172172
}
173173
try {
174-
dom = jsdom.jsdom(raw)
175-
if (file === 'index.html') {
176-
const t0 = performance.now();
177-
const workshops = dom.getElementsByClassName('js-workshop-link');
178-
await isRateLimitReached(workshops.length);
179-
const githubPromises = Array.from(workshops).map(getStargazers);
180-
await Promise.all(githubPromises);
181-
const t1 = performance.now();
182-
console.log(`⭐️ GitHub Stargazers fetched in ${((t1 - t0) / 1000).toFixed(1)}s`)
183-
}
174+
dom = jsdom.jsdom(raw)
175+
if (file === 'index.html') {
176+
const t0 = performance.now();
177+
const workshops = dom.getElementsByClassName('js-workshop-link');
178+
await isRateLimitReached(workshops.length);
179+
const githubPromises = Array.from(workshops).map(getStargazers);
180+
await Promise.all(githubPromises);
181+
const t1 = performance.now();
182+
console.log(`⭐️ GitHub Stargazers fetched in ${((t1 - t0) / 1000).toFixed(1)}s`)
183+
}
184184
} catch(e) {
185-
return console.log('Error while domify %s:\n%s', file, e)
186-
}
185+
return console.log('Error while domify %s:\n%s', file, e)
186+
}
187187

188188
var footer = dom.querySelector('footer')
189189
if(footer) {
@@ -209,9 +209,9 @@ cmdwatcher('build-html'
209209

210210
Object.keys(languages).forEach(function (lang) {
211211
var translation = translations[lang]
212-
, outputPath = Path.join('.build/', (lang === 'en' ? '' : lang + '/'), file)
213-
, outputDir = Path.dirname(outputPath)
214-
, output
212+
, outputPath = Path.join('.build/', (lang === 'en' ? '' : lang + '/'), file)
213+
, outputDir = Path.dirname(outputPath)
214+
, output
215215
html.setAttribute('lang', lang)
216216
if (list) {
217217
try {

‎scripts/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22
if [[ -f ../.env ]]
33
then
4-
echo 'Missing .env file'
5-
echo 'Please consult README for setup instructions'
6-
exit 1
4+
echo 'Missing .env file'
5+
echo 'Please consult README for setup instructions'
6+
exit 1
77
fi
88
npm run build-chapters -- $@
99
npm run generate-css

‎scripts/deploy.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ rm -rf "$BUILD_FOLDER"
1414
# Checkout the current repo
1515
if [[ -z $GITHUB_PERSONAL_ACCESS_TOKEN ]]
1616
then
17-
git clone -b master git@github.com:nodeschool/nodeschool.github.io.git .build
17+
git clone -b master git@github.com:nodeschool/nodeschool.github.io.git .build
1818
else
19-
git clone -b master https://$GITHUB_USER:$GITHUB_PERSONAL_ACCESS_TOKEN@github.com/nodeschool/nodeschool.github.io.git .build
19+
git clone -b master https://$GITHUB_USER:$GITHUB_PERSONAL_ACCESS_TOKEN@github.com/nodeschool/nodeschool.github.io.git .build
2020
fi
2121

2222
npm run build

0 commit comments

Comments
 (0)