VSinerva/freesewing
1
0
Fork 0
Code Activity

fix: Undoing some merge issues

Browse source
This commit is contained in:
Joost De Cock 2021-11-28 17:11:37 +01:00
parent 147f9e40a0
commit ecb599cea7
2 changed files with 166 additions and 375 deletions
Download patch file Download diff file Expand all files Collapse all files

530
.all-contributorsrc
View file

@ -3,13 +3,14 @@
"projectOwner": "freesewing", "projectOwner": "freesewing",
"repoType": "github", "repoType": "github",
"repoHost": "https://github.com", "repoHost": "https://github.com",
"contributorsSortAlphabetically": true,
"files": [ "files": [
"CONTRIBUTORS.md" "CONTRIBUTORS.md"
], ],
"imageSize": 100, "imageSize": 100,
"commit": true, "commit": true,
"commitConvention": "angular", "commitConvention": "angular",
"skipCi": true,
"contributorsPerLine": 7,
"contributors": [ "contributors": [
{ {
"login": "joostdecock", "login": "joostdecock",
@ -21,454 +22,235 @@
] ]
}, },
{ {
"login": "nadege", "login": "starfetch",
"name": "Nadege Michel", "name": "starfetch",
"avatar_url": "https://avatars.githubusercontent.com/u/3792171?v=4", "avatar_url": "https://avatars.githubusercontent.com/u/80041179?v=4",
"profile": "https://github.com/nadege", "profile": "https://github.com/starfetch",
"contributions": [
"test",
"doc"
]
},
{
"login": "geeksam",
"name": "Sam Livingston-Gray",
"avatar_url": "https://avatars.githubusercontent.com/u/6462?v=4",
"profile": "http://resume.livingston-gray.com/faq.html",
"contributions": [
"doc"
]
},
{
"login": "kapunahelewong",
"name": "Kapunahele Wong",
"avatar_url": "https://avatars.githubusercontent.com/u/4116963?v=4",
"profile": "https://twitter.com/kapunahele",
"contributions": [
"doc"
]
},
{
"login": "joshessman",
"name": "Josh Essman",
"avatar_url": "https://avatars.githubusercontent.com/u/9941074?v=4",
"profile": "https://github.com/joshessman",
"contributions": [
"doc"
]
},
{
"login": "valadaptive",
"name": "valadaptive",
"avatar_url": "https://avatars.githubusercontent.com/u/79560998?v=4",
"profile": "https://github.com/valadaptive",
"contributions": [
"code"
]
},
{
"login": "martintribo",
"name": "Martin Tribo",
"avatar_url": "https://avatars.githubusercontent.com/u/1613442?v=4",
"profile": "https://github.com/martintribo",
"contributions": [
"doc"
]
},
{
"login": "phillipthelen",
"name": "Phillip Thelen",
"avatar_url": "https://avatars.githubusercontent.com/u/298062?v=4",
"profile": "https://github.com/phillipthelen",
"contributions": [
"code"
]
},
{
"login": "amysews",
"name": "amysews",
"avatar_url": "https://avatars.githubusercontent.com/u/25280778?v=4",
"profile": "https://github.com/amysews",
"contributions": [
"doc"
]
},
{
"login": "Slylele",
"name": "Slylele",
"avatar_url": "https://avatars.githubusercontent.com/u/57619777?v=4",
"profile": "https://www.instagram.com/celine_mge/",
"contributions": [
"doc",
"translation"
]
},
{
"login": "ElenaFdR",
"name": "Elena FdR",
"avatar_url": "https://avatars.githubusercontent.com/u/5113815?v=4",
"profile": "https://github.com/ElenaFdR",
"contributions": [
"doc",
"blog"
]
},
{
"login": "camerondubas",
"name": "Cameron Dubas",
"avatar_url": "https://avatars.githubusercontent.com/u/6216460?v=4",
"profile": "https://github.com/camerondubas",
"contributions": [
"doc"
]
},
{
"login": "KakeLP",
"name": "Kake",
"avatar_url": "https://avatars.githubusercontent.com/u/1956810?v=4",
"profile": "http://www.earth.li/~kake/",
"contributions": [
"doc"
]
},
{
"login": "Anternative",
"name": "Anternative",
"avatar_url": "https://avatars.githubusercontent.com/u/81079850?v=4",
"profile": "https://github.com/Anternative",
"contributions": [
"doc"
]
},
{
"login": "mcgnly",
"name": "Katie McGinley",
"avatar_url": "https://avatars.githubusercontent.com/u/5653631?v=4",
"profile": "https://github.com/mcgnly",
"contributions": [
"doc"
]
},
{
"login": "enyachoke",
"name": "Emmanuel Nyachoke",
"avatar_url": "https://avatars.githubusercontent.com/u/1908926?v=4",
"profile": "https://emmanuelnyachoke.com/",
"contributions": [ "contributions": [
"code", "code",
"doc"
]
},
{
"login": "econo202",
"name": "econo202",
"avatar_url": "https://avatars.githubusercontent.com/u/34138153?v=4",
"profile": "https://github.com/econo202",
"contributions": [
"doc"
]
},
{
"login": "chrisgloom",
"name": "tuesgloomsday",
"avatar_url": "https://avatars.githubusercontent.com/u/15905991?v=4",
"profile": "https://github.com/chrisgloom",
"contributions": [
"doc"
]
},
{
"login": "annekecaramin",
"name": "Anneke",
"avatar_url": "https://avatars.githubusercontent.com/u/38046191?v=4",
"profile": "https://github.com/annekecaramin",
"contributions": [
"doc", "doc",
"translation" "translation",
]
},
{
"login": "cloutiy",
"name": "yc",
"avatar_url": "https://avatars.githubusercontent.com/u/8433147?v=4",
"profile": "https://github.com/cloutiy",
"contributions": [
"translation"
]
},
{
"login": "fightingrabbit",
"name": "fightingrabbit",
"avatar_url": "https://avatars.githubusercontent.com/u/25751445?v=4",
"profile": "https://github.com/fightingrabbit",
"contributions": [
"code"
]
},
{
"login": "QuentinFelix",
"name": "Quentin FELIX",
"avatar_url": "https://avatars.githubusercontent.com/u/5288091?v=4",
"profile": "https://github.com/QuentinFelix",
"contributions": [
"code",
"design" "design"
] ]
}, },
{ {
"login": "nyergler", "login": "lucibytes",
"name": "Nathan Yergler", "name": "Lucian",
"avatar_url": "https://avatars.githubusercontent.com/u/510875?v=4", "avatar_url": "https://avatars.githubusercontent.com/u/77203781?v=4",
"profile": "http://yergler.net/", "profile": "https://github.com/lucibytes",
"contributions": [ "contributions": [
"doc" "eventOrganizing"
] ]
}, },
{ {
"login": "cabi", "login": "tangerineshark",
"name": "Carsten Biebricher", "name": "Karen",
"avatar_url": "https://avatars.githubusercontent.com/u/2596253?v=4", "avatar_url": "https://avatars.githubusercontent.com/u/70777269?v=4",
"profile": "https://github.com/cabi", "profile": "https://github.com/tangerineshark",
"contributions": [
"doc"
]
},
{
"login": "Kittycatou",
"name": "Kittycatou",
"avatar_url": "https://avatars.githubusercontent.com/u/48165583?v=4",
"profile": "https://github.com/Kittycatou",
"contributions": [
"translation"
]
},
{
"login": "Pixieish",
"name": "Pixieish",
"avatar_url": "https://avatars.githubusercontent.com/u/32991415?v=4",
"profile": "https://github.com/Pixieish",
"contributions": [
"doc"
]
},
{
"login": "kristinruben",
"name": "Kristin Ruben",
"avatar_url": "https://avatars.githubusercontent.com/u/17237479?v=4",
"profile": "https://github.com/kristinruben",
"contributions": [
"code"
]
},
{
"login": "Soazillon",
"name": "Soazillon",
"avatar_url": "https://avatars.githubusercontent.com/u/40845940?v=4",
"profile": "https://github.com/Soazillon",
"contributions": [
"translation"
]
},
{
"login": "ericamattos",
"name": "ericamattos",
"avatar_url": "https://avatars.githubusercontent.com/u/4341417?v=4",
"profile": "https://github.com/ericamattos",
"contributions": [
"translation"
]
},
{
"login": "berce",
"name": "berce",
"avatar_url": "https://avatars.githubusercontent.com/u/10439709?v=4",
"profile": "https://github.com/berce",
"contributions": [
"doc"
]
},
{
"login": "manufakturedelweiss",
"name": "Marcus",
"avatar_url": "https://avatars.githubusercontent.com/u/38063391?v=4",
"profile": "https://github.com/manufakturedelweiss",
"contributions": [
"translation"
]
},
{
"login": "PD75",
"name": "Paul",
"avatar_url": "https://avatars.githubusercontent.com/u/10294795?v=4",
"profile": "http://pd75.github.io/",
"contributions": [ "contributions": [
"doc", "doc",
"blog", "eventOrganizing"
"translation"
] ]
}, },
{ {
"login": "EvEkSwed", "login": "woutervdub",
"name": "EvEkSwed", "name": "Wouter van Wageningen",
"avatar_url": "https://avatars.githubusercontent.com/u/39723451?v=4", "avatar_url": "https://avatars.githubusercontent.com/u/24414629?v=4",
"profile": "https://github.com/EvEkSwed", "profile": "https://github.com/woutervdub",
"contributions": [ "contributions": [
"translation" "code",
"design",
"tool"
] ]
}, },
{ {
"login": "viocky", "login": "bobgeorgethe3rd",
"name": "viocky", "name": "bobgeorgethe3rd",
"avatar_url": "https://avatars.githubusercontent.com/u/39279173?v=4", "avatar_url": "https://avatars.githubusercontent.com/u/16866285?v=4",
"profile": "https://github.com/viocky", "profile": "https://github.com/bobgeorgethe3rd",
"contributions": [ "contributions": [
"translation" "code",
"doc",
"design"
] ]
}, },
{ {
"login": "Joebidido", "login": "sannek",
"name": "Joebidido", "name": "Sanne",
"avatar_url": "https://avatars.githubusercontent.com/u/39796210?v=4", "avatar_url": "https://avatars.githubusercontent.com/u/17491062?v=4",
"profile": "https://github.com/Joebidido", "profile": "https://github.com/sannek",
"contributions": [
"translation"
]
},
{
"login": "dingcycle",
"name": "dingcycle",
"avatar_url": "https://avatars.githubusercontent.com/u/1681985?v=4",
"profile": "https://github.com/dingcycle",
"contributions": [
"translation"
]
},
{
"login": "web-goddess",
"name": "Kris",
"avatar_url": "https://avatars.githubusercontent.com/u/5946286?v=4",
"profile": "https://www.krishoward.org/",
"contributions": [ "contributions": [
"code",
"doc" "doc"
] ]
}, },
{ {
"login": "Fantastik-Maman", "login": "hellgy",
"name": "Fantastik-Maman", "name": "hellgy",
"avatar_url": "https://avatars.githubusercontent.com/u/39785382?v=4", "avatar_url": "https://avatars.githubusercontent.com/u/6494414?v=4",
"profile": "https://github.com/Fantastik-Maman", "profile": "https://weblog.redisdead.net",
"contributions": [ "contributions": [
"translation" "design"
] ]
}, },
{ {
"login": "AdamRTomkins", "login": "biou",
"name": "Adam Tomkins", "name": "biou",
"avatar_url": "https://avatars.githubusercontent.com/u/5709603?v=4", "avatar_url": "https://avatars.githubusercontent.com/u/1340376?v=4",
"profile": "http://adamrtomkins.github.io/", "profile": "https://github.com/biou",
"contributions": [
"doc"
]
},
{
"login": "dpiquet",
"name": "Damien PIQUET",
"avatar_url": "https://avatars.githubusercontent.com/u/4688628?v=4",
"profile": "https://github.com/dpiquet",
"contributions": [ "contributions": [
"code" "code"
] ]
}, },
{ {
"login": "brmlyklr", "login": "chri5b",
"name": "brmlyklr", "name": "chri5b",
"avatar_url": "https://avatars.githubusercontent.com/u/22308713?v=4", "avatar_url": "https://avatars.githubusercontent.com/u/2373249?v=4",
"profile": "https://github.com/brmlyklr", "profile": "http://www.chrisbarrett.fr",
"contributions": [
"code",
"test"
]
},
{
"login": "ephphatha",
"name": "Andrew James",
"avatar_url": "https://avatars.githubusercontent.com/u/357684?v=4",
"profile": "http://thelettereph.com",
"contributions": [ "contributions": [
"doc" "doc"
] ]
}, },
{ {
"login": "Loudepeuter", "login": "AlfaLyr",
"name": "Loudepeuter", "name": "AlfaLyr",
"avatar_url": "https://avatars.githubusercontent.com/u/38081954?v=4", "avatar_url": "https://avatars.githubusercontent.com/u/39273729?v=4",
"profile": "https://github.com/Loudepeuter", "profile": "https://github.com/AlfaLyr",
"contributions": [ "contributions": [
"translation" "code",
"plugin",
"design"
] ]
}, },
{ {
"login": "stsydow", "login": "destos",
"name": "Stefan Sydow", "name": "Patrick Forringer",
"avatar_url": "https://avatars.githubusercontent.com/u/961256?v=4", "avatar_url": "https://avatars.githubusercontent.com/u/136456?v=4",
"profile": "http://metafly.info/", "profile": "https://pat.forringer.com/",
"contributions": [ "contributions": [
"translation" "plugin"
] ]
}, },
{ {
"login": "beautifulsummermoon", "login": "nataliasayang",
"name": "beautifulsummermoon", "name": "Natalia",
"avatar_url": "https://avatars.githubusercontent.com/u/40396388?v=4", "avatar_url": "https://avatars.githubusercontent.com/u/48160791?v=4",
"profile": "https://github.com/beautifulsummermoon", "profile": "https://github.com/nataliasayang",
"contributions": [ "contributions": [
"translation" "code",
"design",
"blog"
] ]
}, },
{ {
"login": "Chantalbijoux", "login": "kieranklaassen",
"name": "Chantal Lapointe", "name": "Kieran Klaassen",
"avatar_url": "https://avatars.githubusercontent.com/u/39673694?v=4", "avatar_url": "https://avatars.githubusercontent.com/u/209089?v=4",
"profile": "https://github.com/Chantalbijoux", "profile": "http://www.kieranklaassen.com/",
"contributions": [ "contributions": [
"translation" "code"
] ]
}, },
{ {
"login": "Irapeke", "login": "jejacks0n",
"name": "Irapeke", "name": "Jeremy Jackson",
"avatar_url": "https://avatars.githubusercontent.com/u/39604334?v=4", "avatar_url": "https://avatars.githubusercontent.com/u/13765?v=4",
"profile": "https://github.com/Irapeke", "profile": "https://github.com/jejacks0n",
"contributions": [ "contributions": [
"translation" "code"
] ]
}, },
{ {
"login": "marckiesel", "login": "DocSpencer77",
"name": "marckiesel", "name": "gaylyndie",
"avatar_url": "https://avatars.githubusercontent.com/u/39653780?v=4", "avatar_url": "https://avatars.githubusercontent.com/u/43393580?v=4",
"profile": "https://github.com/marckiesel", "profile": "https://github.com/DocSpencer77",
"contributions": [
"translation"
]
},
{
"login": "theUnmutual",
"name": "Unmutual",
"avatar_url": "https://avatars.githubusercontent.com/u/22374635?v=4",
"profile": "https://github.com/theUnmutual",
"contributions": [ "contributions": [
"doc" "doc"
] ]
}, },
{ {
"login": "cathyzoller", "login": "bankair",
"name": "Cathy Zoller", "name": "Alexandre Ignjatovic",
"avatar_url": "https://avatars.githubusercontent.com/u/2120275?v=4", "avatar_url": "https://avatars.githubusercontent.com/u/365999?v=4",
"profile": "https://github.com/cathyzoller", "profile": "http://polymerisation-des-concepts.fr/",
"contributions": [
"code"
]
},
{
"login": "darigovresearch",
"name": "Darigov Research",
"avatar_url": "https://avatars.githubusercontent.com/u/30328618?v=4",
"profile": "https://www.darigovresearch.com/",
"contributions": [
"doc",
"ideas"
]
},
{
"login": "sorchanidhubhghaill",
"name": "Prof. dr. Sorcha Ní Dhubhghaill",
"avatar_url": "https://avatars.githubusercontent.com/u/30624634?v=4",
"profile": "https://www.uza.be/persoon/prof-dr-sorcha-ni-dhubhghaill",
"contributions": [ "contributions": [
"doc" "doc"
] ]
}, },
{ {
"login": "jsawo", "login": "forresto",
"name": "Jacek Sawoszczuk", "name": "Forrest O.",
"avatar_url": "https://avatars.githubusercontent.com/u/1294706?v=4", "avatar_url": "https://avatars.githubusercontent.com/u/395307?v=4",
"profile": "https://github.com/jsawo", "profile": "https://www.forresto.com/",
"contributions": [ "contributions": [
"doc" "doc"
] ]
},
{
"login": "TriploidTree",
"name": "Tríona",
"avatar_url": "https://avatars.githubusercontent.com/u/4170521?v=4",
"profile": "https://github.com/TriploidTree",
"contributions": [
"doc"
]
},
{
"login": "woolishboy",
"name": "woolishboy",
"avatar_url": "https://avatars.githubusercontent.com/u/57816321?v=4",
"profile": "https://github.com/woolishboy",
"contributions": [
"code"
]
},
{
"login": "ttimearl",
"name": "ttimearl",
"avatar_url": "https://avatars.githubusercontent.com/u/77916590?v=4",
"profile": "https://github.com/ttimearl",
"contributions": [
"content"
]
},
{
"login": "grimlokason",
"name": "grimlokason",
"avatar_url": "https://avatars.githubusercontent.com/u/5112238?v=4",
"profile": "https://github.com/grimlokason",
"contributions": [
"code"
]
} }
], ]
"contributorsPerLine": 7
} }

11
scripts/reconfigure.js
View file

@ -35,6 +35,12 @@ const packages = glob.sync('*', {
}) })
const contributors = fs.readFileSync(path.join(repoPath, 'CONTRIBUTORS.md'), 'utf-8') const contributors = fs.readFileSync(path.join(repoPath, 'CONTRIBUTORS.md'), 'utf-8')
const acconfig = JSON.parse(fs.readFileSync(path.join(repoPath, '.all-contributorsrc'), 'utf-8'))
const mainReadme = Mustache.render(
fs.readFileSync(path.join(repoPath, 'config', 'templates', 'readme.main.md'), 'utf-8'),
{ allcontributors: acconfig.contributors.length }
)
fs.writeFileSync(path.join(repoPath, 'README.md'), mainReadme + contributors)
validate(packages, config) validate(packages, config)
reconfigure(packages, config) reconfigure(packages, config)
@ -240,7 +246,10 @@ function badges(pkg, config) {
for (let group of ['_all', '_social']) { for (let group of ['_all', '_social']) {
markup += "<p align='center'>" markup += "<p align='center'>"
for (let key of Object.keys(config.badges[group])) { for (let key of Object.keys(config.badges[group])) {
markup += formatBadge(config.badges[group][key], pkg, fullName(pkg, config)) const name = (key === 'contributors')
? acconfig.contributors.length
: pkg
markup += formatBadge(config.badges[group][key], name, fullName(pkg, config))
} }
markup += '</p>' markup += '</p>'
} }