Leahnaya/website
1
0
Fork 0
mirror of https://github.com/PretendoNetwork/website.git synced 2026-04-25 08:01:53 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'pr/126' into dev

Browse Source
This commit is contained in:
Ash Monty 2022-07-30 15:24:09 +02:00
commit a29ce7296f
No known key found for this signature in database
GPG Key ID: 740B7C88251D49B6
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
locales/DE_de.json
View File

@ -142,7 +142,7 @@
]
},
"specialThanks": {
"title": "Special thanks",
"title": "Besonderer Dank",
"text": "Ohne sie, wäre Pretendo nicht, wo es heute ist.",
"people": [
{
@ -184,13 +184,13 @@
},
{
"name": "NinStar",
"caption": "Icons for the Mii Editor and Juxt reactions",
"caption": "Icons für das Mii Editor und Juxt Reaktionen",
"picture": "https://github.com/ninstar.png",
"github": "https://github.com/ninstar"
},
{
"name": "GitHub contributors",
"caption": "Localizations and other contributions",
"caption": "Lokalisierungen und anderen Beiträgen",
"picture": "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png",
"github": "https://github.com/PretendoNetwork"
}

3
public/assets/js/progress-charts.js
View File

@ -5,9 +5,10 @@ document.querySelectorAll('.feature-list-wrapper').forEach(progressListElement =
const percentageOverride = progressListElement.querySelector('canvas.percentage-chart').dataset.percentageoverride;
const allFeatureNodes = progressListElement.querySelectorAll('.feature');
const allDoneFeatureNodes = progressListElement.querySelectorAll('.feature .done');
const allStartedFeatureNodes = progressListElement.querySelectorAll('.feature .ongoing');
// Use percentage override data attribute if present, else calculate
const progressPercentage = Math.round(percentageOverride) || Math.round(Math.min((allDoneFeatureNodes.length / allFeatureNodes.length) * 100, 100));
const progressPercentage = Math.round(percentageOverride) || Math.round(Math.min((allDoneFeatureNodes.length + allStartedFeatureNodes.length * 0.5) / allFeatureNodes.length * 100, 100));
const remainingPercentage = 100 - progressPercentage;
// Set inner paragraph

3
src/routes/home.js
View File

@ -54,7 +54,8 @@ router.get('/', async (request, response) => {
cache.sections.forEach(section => {
const { not_started, started, completed } = section.progress;
const sectionCompletionPercentage = completed.length / (completed.length + started.length + not_started.length);
// Calculates the completion percentage of the project, and sums it to the total
const sectionCompletionPercentage = (completed.length + started.length * 0.5) / (completed.length + started.length + not_started.length);
totalProgress._calc.percentageSum += sectionCompletionPercentage;
const sectionTitle = `${section.title} [${Math.round(sectionCompletionPercentage * 100)}%]`;

2
views/partials/footer.handlebars
View File

@ -25,7 +25,7 @@
</g>
</svg>
<p>Copyright 2022</p>
<p>Site by <a href="https://mrjvs.com/" target="_blank">mrjvs</a>, <a href="https://jipfr.nl/" target="_blank">jipfr</a> & <a href="https://ashmonty.com/" target="_blank">monty</a></p>
<p>Site by <a href="https://mrjvs.com/" target="_blank">mrjvs</a>, <a href="https://jipfr.nl/" target="_blank">jipfr</a> & <a href="https://ashm.dev/" target="_blank">monty</a></p>
</div>
<div>
<h1>{{ localeHelper locale "footer" "socials" }}</h1>