Skip to content

Commit

Permalink
syncing changes
Browse files Browse the repository at this point in the history
  • Loading branch information
tonesto7 committed Dec 6, 2023
1 parent 100e883 commit a03152c
Show file tree
Hide file tree
Showing 18 changed files with 1,276 additions and 1,546 deletions.
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
{
"dependencies": {
"@fortawesome/fontawesome-free": "~6.4.0",
"@mdi/font": "7.2.96",
"@fortawesome/fontawesome-free": "~6.4.2",
"@mdi/font": "7.3.67",
"angular": "1.8.3",
"angular-sanitize": "1.8.3",
"angular-ui": "1.0.0",
"axios": "1.6.0",
"bootstrap": "5.3.1",
"axios": "1.6.2",
"bootstrap": "5.3.2",
"buffer": "6.0.3",
"form-data": "4.0.0",
"global": "4.4.0",
"jquery": "3.7.0",
"jquery": "3.7.1",
"jsonschema": "1.4.1",
"load-awesome": "1.1.0",
"material-icons": "1.13.9",
"material-icons": "1.13.12",
"mdb-ui-kit": "5.0.0",
"ui-bootstrap4": "3.0.7"
},
"devDependencies": {
"@babel/core": "7.22.9",
"@babel/core": "7.23.5",
"@fontsource/roboto": "4.5.8",
"@popperjs/core": "2.11.8",
"@snyk/protect": "1.1198.0",
"@types/jquery": "3.5.16",
"@types/node": "20.4.5",
"@types/pbf": "3.0.2",
"@snyk/protect": "1.1260.0",
"@types/jquery": "3.5.29",
"@types/node": "20.10.3",
"@types/pbf": "3.0.5",
"@types/typescript": "2.0.0",
"del": "7.0.0",
"eslint": "8.46.0",
"del": "7.1.0",
"eslint": "8.55.0",
"eslint-config-prettier": "8.9.0",
"eslint-plugin-prettier": "5.0.0",
"eslint-plugin-prettier": "5.0.1",
"gulp": "4.0.2",
"gulp-autoprefixer": "8.0.0",
"gulp-babel": "8.0.0",
Expand All @@ -50,9 +50,9 @@
"gulp-useref": "5.0.0",
"gulplog": "2.0.1",
"hint": "7.1.10",
"js-beautify": "1.14.9",
"js-beautify": "1.14.11",
"lazypipe": "1.0.2",
"prettier": "3.0.0",
"prettier": "3.1.0",
"prettier-babel": "1.0.0"
},
"engines": {
Expand Down
2,197 changes: 896 additions & 1,301 deletions powerup_data.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions public/css/combined.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/css/combined.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/index.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/js/body-combined.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/js/header-combined.js

Large diffs are not rendered by default.

Binary file modified public/webfonts/fa-brands-400.ttf
Binary file not shown.
Binary file modified public/webfonts/fa-brands-400.woff2
Binary file not shown.
Binary file modified public/webfonts/fa-regular-400.ttf
Binary file not shown.
Binary file modified public/webfonts/fa-regular-400.woff2
Binary file not shown.
Binary file modified public/webfonts/fa-solid-900.ttf
Binary file not shown.
Binary file modified public/webfonts/fa-solid-900.woff2
Binary file not shown.
Binary file modified public/webfonts/fa-v4compatibility.ttf
Binary file not shown.
Binary file modified public/webfonts/fa-v4compatibility.woff2
Binary file not shown.
2 changes: 1 addition & 1 deletion src/web/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<div class="card-header bg-light-gray ps-3 pe-2 py-1 w-100">
<div class="d-flex justify-content-between">
<div class="">
<div class="card-title fw-bolder text-large my-auto">{{ sub.powerupVersion }}</div>
<div class="card-title fw-bolder text-large my-auto">{{ formatPowerupVersion(sub.powerupVersion) }}</div>
<div class="small" ng-bind-html="GetReleaseDateHtml(sub)"></div>
</div>
<div class="my-auto">
Expand Down
7 changes: 7 additions & 0 deletions src/web/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ mainApp.controller("PwrUpInfoController", [
return resp;
};

$scope.formatPowerupVersion = function (powerupVersion) {
if (Array.isArray(powerupVersion)) {
return powerupVersion.join(", "); // Join the array elements with a comma and a space
}
return powerupVersion; // If it's not an array, return as is
};

$scope.getInhibitTagCls = (inhibit) => {
return inhibit ? "badge-inhibit-enabled-tags" : "badge-inhibit-disabled-tags";
};
Expand Down
566 changes: 347 additions & 219 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit a03152c

Please sign in to comment.