chore: refactor src files to src/ directory (#900)
Nolan Lawson
GitHub
|
|
@ -7,11 +7,11 @@ const writeFile = pify(fs.writeFile.bind(fs))
|
||||||
const readdir = pify(fs.readdir.bind(fs))
|
const readdir = pify(fs.readdir.bind(fs))
|
||||||
const render = pify(sass.render.bind(sass))
|
const render = pify(sass.render.bind(sass))
|
||||||
|
|
||||||
const globalScss = path.join(__dirname, '../scss/global.scss')
|
const globalScss = path.join(__dirname, '../src/scss/global.scss')
|
||||||
const defaultThemeScss = path.join(__dirname, '../scss/themes/_default.scss')
|
const defaultThemeScss = path.join(__dirname, '../src/scss/themes/_default.scss')
|
||||||
const offlineThemeScss = path.join(__dirname, '../scss/themes/_offline.scss')
|
const offlineThemeScss = path.join(__dirname, '../src/scss/themes/_offline.scss')
|
||||||
const customScrollbarScss = path.join(__dirname, '../scss/custom-scrollbars.scss')
|
const customScrollbarScss = path.join(__dirname, '../src/scss/custom-scrollbars.scss')
|
||||||
const themesScssDir = path.join(__dirname, '../scss/themes')
|
const themesScssDir = path.join(__dirname, '../src/scss/themes')
|
||||||
const assetsDir = path.join(__dirname, '../static')
|
const assetsDir = path.join(__dirname, '../static')
|
||||||
|
|
||||||
async function renderCss (file) {
|
async function renderCss (file) {
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ const builders = [
|
||||||
const partials = buildPartials()
|
const partials = buildPartials()
|
||||||
|
|
||||||
function buildPartials () {
|
function buildPartials () {
|
||||||
let rawTemplate = fs.readFileSync(path.resolve(__dirname, '../src-build/template.html'), 'utf8')
|
let rawTemplate = fs.readFileSync(path.resolve(__dirname, '../src/build/template.html'), 'utf8')
|
||||||
|
|
||||||
let partials = [rawTemplate]
|
let partials = [rawTemplate]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -65,13 +65,13 @@ async function setupMastodonDatabase () {
|
||||||
env: Object.assign({ PGPASSWORD: DB_PASS }, process.env)
|
env: Object.assign({ PGPASSWORD: DB_PASS }, process.env)
|
||||||
})
|
})
|
||||||
|
|
||||||
let dumpFile = path.join(dir, '../fixtures/dump.sql')
|
let dumpFile = path.join(dir, '../tests/fixtures/dump.sql')
|
||||||
await exec(`psql -h 127.0.0.1 -U ${DB_USER} -w -d ${DB_NAME} -f "${dumpFile}"`, {
|
await exec(`psql -h 127.0.0.1 -U ${DB_USER} -w -d ${DB_NAME} -f "${dumpFile}"`, {
|
||||||
cwd: mastodonDir,
|
cwd: mastodonDir,
|
||||||
env: Object.assign({ PGPASSWORD: DB_PASS }, process.env)
|
env: Object.assign({ PGPASSWORD: DB_PASS }, process.env)
|
||||||
})
|
})
|
||||||
|
|
||||||
let tgzFile = path.join(dir, '../fixtures/system.tgz')
|
let tgzFile = path.join(dir, '../tests/fixtures/system.tgz')
|
||||||
let systemDir = path.join(mastodonDir, 'public/system')
|
let systemDir = path.join(mastodonDir, 'public/system')
|
||||||
await mkdirp(systemDir)
|
await mkdirp(systemDir)
|
||||||
await exec(`tar -xzf "${tgzFile}"`, { cwd: systemDir })
|
await exec(`tar -xzf "${tgzFile}"`, { cwd: systemDir })
|
||||||
|
|
|
||||||
76
bin/svgs.js
|
|
@ -1,40 +1,40 @@
|
||||||
module.exports = [
|
module.exports = [
|
||||||
{ id: 'pinafore-logo', src: 'original-static/sailboat.svg' },
|
{ id: 'pinafore-logo', src: 'src/static/sailboat.svg' },
|
||||||
{ id: 'fa-bell', src: 'thirdparty/font-awesome-svg-png/white/svg/bell.svg' },
|
{ id: 'fa-bell', src: 'src/thirdparty/font-awesome-svg-png/white/svg/bell.svg' },
|
||||||
{ id: 'fa-users', src: 'thirdparty/font-awesome-svg-png/white/svg/users.svg' },
|
{ id: 'fa-users', src: 'src/thirdparty/font-awesome-svg-png/white/svg/users.svg' },
|
||||||
{ id: 'fa-globe', src: 'thirdparty/font-awesome-svg-png/white/svg/globe.svg' },
|
{ id: 'fa-globe', src: 'src/thirdparty/font-awesome-svg-png/white/svg/globe.svg' },
|
||||||
{ id: 'fa-gear', src: 'thirdparty/font-awesome-svg-png/white/svg/gear.svg' },
|
{ id: 'fa-gear', src: 'src/thirdparty/font-awesome-svg-png/white/svg/gear.svg' },
|
||||||
{ id: 'fa-reply', src: 'thirdparty/font-awesome-svg-png/white/svg/reply.svg' },
|
{ id: 'fa-reply', src: 'src/thirdparty/font-awesome-svg-png/white/svg/reply.svg' },
|
||||||
{ id: 'fa-reply-all', src: 'thirdparty/font-awesome-svg-png/white/svg/reply-all.svg' },
|
{ id: 'fa-reply-all', src: 'src/thirdparty/font-awesome-svg-png/white/svg/reply-all.svg' },
|
||||||
{ id: 'fa-retweet', src: 'thirdparty/font-awesome-svg-png/white/svg/retweet.svg' },
|
{ id: 'fa-retweet', src: 'src/thirdparty/font-awesome-svg-png/white/svg/retweet.svg' },
|
||||||
{ id: 'fa-star', src: 'thirdparty/font-awesome-svg-png/white/svg/star.svg' },
|
{ id: 'fa-star', src: 'src/thirdparty/font-awesome-svg-png/white/svg/star.svg' },
|
||||||
{ id: 'fa-ellipsis-h', src: 'thirdparty/font-awesome-svg-png/white/svg/ellipsis-h.svg' },
|
{ id: 'fa-ellipsis-h', src: 'src/thirdparty/font-awesome-svg-png/white/svg/ellipsis-h.svg' },
|
||||||
{ id: 'fa-spinner', src: 'thirdparty/font-awesome-svg-png/white/svg/spinner.svg' },
|
{ id: 'fa-spinner', src: 'src/thirdparty/font-awesome-svg-png/white/svg/spinner.svg' },
|
||||||
{ id: 'fa-user', src: 'thirdparty/font-awesome-svg-png/white/svg/user.svg' },
|
{ id: 'fa-user', src: 'src/thirdparty/font-awesome-svg-png/white/svg/user.svg' },
|
||||||
{ id: 'fa-play-circle', src: 'thirdparty/font-awesome-svg-png/white/svg/play-circle.svg' },
|
{ id: 'fa-play-circle', src: 'src/thirdparty/font-awesome-svg-png/white/svg/play-circle.svg' },
|
||||||
{ id: 'fa-eye', src: 'thirdparty/font-awesome-svg-png/white/svg/eye.svg' },
|
{ id: 'fa-eye', src: 'src/thirdparty/font-awesome-svg-png/white/svg/eye.svg' },
|
||||||
{ id: 'fa-eye-slash', src: 'thirdparty/font-awesome-svg-png/white/svg/eye-slash.svg' },
|
{ id: 'fa-eye-slash', src: 'src/thirdparty/font-awesome-svg-png/white/svg/eye-slash.svg' },
|
||||||
{ id: 'fa-lock', src: 'thirdparty/font-awesome-svg-png/white/svg/lock.svg' },
|
{ id: 'fa-lock', src: 'src/thirdparty/font-awesome-svg-png/white/svg/lock.svg' },
|
||||||
{ id: 'fa-unlock', src: 'thirdparty/font-awesome-svg-png/white/svg/unlock.svg' },
|
{ id: 'fa-unlock', src: 'src/thirdparty/font-awesome-svg-png/white/svg/unlock.svg' },
|
||||||
{ id: 'fa-envelope', src: 'thirdparty/font-awesome-svg-png/white/svg/envelope.svg' },
|
{ id: 'fa-envelope', src: 'src/thirdparty/font-awesome-svg-png/white/svg/envelope.svg' },
|
||||||
{ id: 'fa-user-times', src: 'thirdparty/font-awesome-svg-png/white/svg/user-times.svg' },
|
{ id: 'fa-user-times', src: 'src/thirdparty/font-awesome-svg-png/white/svg/user-times.svg' },
|
||||||
{ id: 'fa-user-plus', src: 'thirdparty/font-awesome-svg-png/white/svg/user-plus.svg' },
|
{ id: 'fa-user-plus', src: 'src/thirdparty/font-awesome-svg-png/white/svg/user-plus.svg' },
|
||||||
{ id: 'fa-external-link', src: 'thirdparty/font-awesome-svg-png/white/svg/external-link.svg' },
|
{ id: 'fa-external-link', src: 'src/thirdparty/font-awesome-svg-png/white/svg/external-link.svg' },
|
||||||
{ id: 'fa-search', src: 'thirdparty/font-awesome-svg-png/white/svg/search.svg' },
|
{ id: 'fa-search', src: 'src/thirdparty/font-awesome-svg-png/white/svg/search.svg' },
|
||||||
{ id: 'fa-comments', src: 'thirdparty/font-awesome-svg-png/white/svg/comments.svg' },
|
{ id: 'fa-comments', src: 'src/thirdparty/font-awesome-svg-png/white/svg/comments.svg' },
|
||||||
{ id: 'fa-paperclip', src: 'thirdparty/font-awesome-svg-png/white/svg/paperclip.svg' },
|
{ id: 'fa-paperclip', src: 'src/thirdparty/font-awesome-svg-png/white/svg/paperclip.svg' },
|
||||||
{ id: 'fa-thumb-tack', src: 'thirdparty/font-awesome-svg-png/white/svg/thumb-tack.svg' },
|
{ id: 'fa-thumb-tack', src: 'src/thirdparty/font-awesome-svg-png/white/svg/thumb-tack.svg' },
|
||||||
{ id: 'fa-bars', src: 'thirdparty/font-awesome-svg-png/white/svg/bars.svg' },
|
{ id: 'fa-bars', src: 'src/thirdparty/font-awesome-svg-png/white/svg/bars.svg' },
|
||||||
{ id: 'fa-ban', src: 'thirdparty/font-awesome-svg-png/white/svg/ban.svg' },
|
{ id: 'fa-ban', src: 'src/thirdparty/font-awesome-svg-png/white/svg/ban.svg' },
|
||||||
{ id: 'fa-camera', src: 'thirdparty/font-awesome-svg-png/white/svg/camera.svg' },
|
{ id: 'fa-camera', src: 'src/thirdparty/font-awesome-svg-png/white/svg/camera.svg' },
|
||||||
{ id: 'fa-smile', src: 'thirdparty/font-awesome-svg-png/white/svg/smile-o.svg' },
|
{ id: 'fa-smile', src: 'src/thirdparty/font-awesome-svg-png/white/svg/smile-o.svg' },
|
||||||
{ id: 'fa-exclamation-triangle', src: 'thirdparty/font-awesome-svg-png/white/svg/exclamation-triangle.svg' },
|
{ id: 'fa-exclamation-triangle', src: 'src/thirdparty/font-awesome-svg-png/white/svg/exclamation-triangle.svg' },
|
||||||
{ id: 'fa-check', src: 'thirdparty/font-awesome-svg-png/white/svg/check.svg' },
|
{ id: 'fa-check', src: 'src/thirdparty/font-awesome-svg-png/white/svg/check.svg' },
|
||||||
{ id: 'fa-trash', src: 'thirdparty/font-awesome-svg-png/white/svg/trash-o.svg' },
|
{ id: 'fa-trash', src: 'src/thirdparty/font-awesome-svg-png/white/svg/trash-o.svg' },
|
||||||
{ id: 'fa-hourglass', src: 'thirdparty/font-awesome-svg-png/white/svg/hourglass.svg' },
|
{ id: 'fa-hourglass', src: 'src/thirdparty/font-awesome-svg-png/white/svg/hourglass.svg' },
|
||||||
{ id: 'fa-pencil', src: 'thirdparty/font-awesome-svg-png/white/svg/pencil.svg' },
|
{ id: 'fa-pencil', src: 'src/thirdparty/font-awesome-svg-png/white/svg/pencil.svg' },
|
||||||
{ id: 'fa-times', src: 'thirdparty/font-awesome-svg-png/white/svg/times.svg' },
|
{ id: 'fa-times', src: 'src/thirdparty/font-awesome-svg-png/white/svg/times.svg' },
|
||||||
{ id: 'fa-volume-off', src: 'thirdparty/font-awesome-svg-png/white/svg/volume-off.svg' },
|
{ id: 'fa-volume-off', src: 'src/thirdparty/font-awesome-svg-png/white/svg/volume-off.svg' },
|
||||||
{ id: 'fa-volume-up', src: 'thirdparty/font-awesome-svg-png/white/svg/volume-up.svg' },
|
{ id: 'fa-volume-up', src: 'src/thirdparty/font-awesome-svg-png/white/svg/volume-up.svg' },
|
||||||
{ id: 'fa-link', src: 'thirdparty/font-awesome-svg-png/white/svg/link.svg' }
|
{ id: 'fa-link', src: 'src/thirdparty/font-awesome-svg-png/white/svg/link.svg' }
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 708 B After Width: | Height: | Size: 708 B |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 403 B After Width: | Height: | Size: 403 B |
|
Before Width: | Height: | Size: 326 B After Width: | Height: | Size: 326 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 941 B After Width: | Height: | Size: 941 B |
|
Before Width: | Height: | Size: 742 B After Width: | Height: | Size: 742 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 992 B After Width: | Height: | Size: 992 B |
|
Before Width: | Height: | Size: 372 B After Width: | Height: | Size: 372 B |
|
Before Width: | Height: | Size: 370 B After Width: | Height: | Size: 370 B |
|
Before Width: | Height: | Size: 560 B After Width: | Height: | Size: 560 B |
|
Before Width: | Height: | Size: 556 B After Width: | Height: | Size: 556 B |
|
Before Width: | Height: | Size: 564 B After Width: | Height: | Size: 564 B |
|
Before Width: | Height: | Size: 556 B After Width: | Height: | Size: 556 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 843 B After Width: | Height: | Size: 843 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 728 B After Width: | Height: | Size: 728 B |
|
Before Width: | Height: | Size: 822 B After Width: | Height: | Size: 822 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 465 B After Width: | Height: | Size: 465 B |
|
Before Width: | Height: | Size: 470 B After Width: | Height: | Size: 470 B |
|
Before Width: | Height: | Size: 466 B After Width: | Height: | Size: 466 B |
|
Before Width: | Height: | Size: 472 B After Width: | Height: | Size: 472 B |
|
Before Width: | Height: | Size: 314 B After Width: | Height: | Size: 314 B |
|
Before Width: | Height: | Size: 316 B After Width: | Height: | Size: 316 B |
|
Before Width: | Height: | Size: 315 B After Width: | Height: | Size: 315 B |
|
Before Width: | Height: | Size: 318 B After Width: | Height: | Size: 318 B |
|
Before Width: | Height: | Size: 564 B After Width: | Height: | Size: 564 B |
|
Before Width: | Height: | Size: 444 B After Width: | Height: | Size: 444 B |
|
Before Width: | Height: | Size: 247 B After Width: | Height: | Size: 247 B |
|
Before Width: | Height: | Size: 523 B After Width: | Height: | Size: 523 B |
|
Before Width: | Height: | Size: 516 B After Width: | Height: | Size: 516 B |
|
Before Width: | Height: | Size: 555 B After Width: | Height: | Size: 555 B |
|
Before Width: | Height: | Size: 575 B After Width: | Height: | Size: 575 B |
|
Before Width: | Height: | Size: 582 B After Width: | Height: | Size: 582 B |
|
Before Width: | Height: | Size: 559 B After Width: | Height: | Size: 559 B |
|
Before Width: | Height: | Size: 519 B After Width: | Height: | Size: 519 B |
|
Before Width: | Height: | Size: 515 B After Width: | Height: | Size: 515 B |
|
Before Width: | Height: | Size: 380 B After Width: | Height: | Size: 380 B |
|
Before Width: | Height: | Size: 390 B After Width: | Height: | Size: 390 B |
|
Before Width: | Height: | Size: 391 B After Width: | Height: | Size: 391 B |
|
Before Width: | Height: | Size: 399 B After Width: | Height: | Size: 399 B |
|
Before Width: | Height: | Size: 609 B After Width: | Height: | Size: 609 B |
|
Before Width: | Height: | Size: 372 B After Width: | Height: | Size: 372 B |
|
Before Width: | Height: | Size: 374 B After Width: | Height: | Size: 374 B |
|
Before Width: | Height: | Size: 585 B After Width: | Height: | Size: 585 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 574 B After Width: | Height: | Size: 574 B |
|
Before Width: | Height: | Size: 917 B After Width: | Height: | Size: 917 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 651 B After Width: | Height: | Size: 651 B |
|
Before Width: | Height: | Size: 322 B After Width: | Height: | Size: 322 B |
|
Before Width: | Height: | Size: 992 B After Width: | Height: | Size: 992 B |
|
Before Width: | Height: | Size: 490 B After Width: | Height: | Size: 490 B |
|
Before Width: | Height: | Size: 333 B After Width: | Height: | Size: 333 B |
|
Before Width: | Height: | Size: 452 B After Width: | Height: | Size: 452 B |
|
Before Width: | Height: | Size: 314 B After Width: | Height: | Size: 314 B |
|
Before Width: | Height: | Size: 314 B After Width: | Height: | Size: 314 B |
|
Before Width: | Height: | Size: 555 B After Width: | Height: | Size: 555 B |
|
Before Width: | Height: | Size: 458 B After Width: | Height: | Size: 458 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 437 B After Width: | Height: | Size: 437 B |
|
Before Width: | Height: | Size: 465 B After Width: | Height: | Size: 465 B |
|
Before Width: | Height: | Size: 465 B After Width: | Height: | Size: 465 B |
|
Before Width: | Height: | Size: 467 B After Width: | Height: | Size: 467 B |
|
Before Width: | Height: | Size: 468 B After Width: | Height: | Size: 468 B |
|
Before Width: | Height: | Size: 437 B After Width: | Height: | Size: 437 B |