Skip to content

Commit

Permalink
Update dependencies for package.json in root directory
Browse files Browse the repository at this point in the history 
outdated normalize url, Bull and JSDom

Updated jsdom and fixed ReferenceError: TextEncoder is not defined

Upgraded Bull package

Prettier files

Removed body-parser and wordcount from package.json

Removed wordcount

Prettier index

Added wordcount back to stats.js

Added wordcount module

Updated worcount
  • Loading branch information
@LuigiZaccagnini
LuigiZaccagnini committed Nov 23, 2021
1 parent c32d7ba commit c1a198d
Show file tree
Hide file tree
Showing 5 changed files with 175 additions and 80 deletions.
87 changes: 43 additions & 44 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,80 +51,79 @@
},
"homepage": "https://github.com/Seneca-CDOT/telescope#readme",
"dependencies": {
"@bull-board/api": "3.6.0",
"@bull-board/api": "3.7.0",
"@bull-board/express": "3.7.0",
"@elastic/elasticsearch": "7.11.0",
"@elastic/elasticsearch-mock": "0.3.0",
"@wordpress/wordcount": "2.15.0",
"body-parser": "1.19.0",
"bull": "3.20.1",
"@elastic/elasticsearch": "7.15.0",
"@elastic/elasticsearch-mock": "0.3.1",
"@wordpress/wordcount": "3.2.3",
"bull": "3.29.3",
"clean-whitespace": "0.1.2",
"connect-redis": "5.1.0",
"connect-redis": " 6.0.0",
"cors": "2.8.5",
"date-fns": "2.19.0",
"docker-compose": "0.23.6",
"dotenv": "8.2.0",
"entities": "2.2.0",
"date-fns": "2.26.0",
"docker-compose": "0.23.13",
"dotenv": "10.0.0",
"entities": "3.0.1",
"express": "4.17.1",
"express-healthcheck": "0.1.0",
"express-pino-logger": "6.0.0",
"express-session": "1.17.1",
"express-validator": "6.10.0",
"express-session": "1.17.2",
"express-validator": "6.13.0",
"feed": "4.2.2",
"helmet": "4.4.1",
"helmet": "4.6.0",
"highlight.js": "11.3.1",
"http-proxy-middleware": "1.0.6",
"ioredis": "4.26.0",
"ioredis-mock": "5.5.5",
"jsdom": "16.5.1",
"http-proxy-middleware": "2.0.1",
"ioredis": "4.28.0",
"ioredis-mock": "5.8.0",
"jsdom": "18.0.0",
"node-fetch": "2.6.1",
"normalize-url": "6.0.1",
"opml-generator": "1.1.1",
"passport": "0.4.1",
"passport-saml": "3.1.2",
"passport": "0.5.0",
"passport-saml": "3.2.0",
"pino": "7.3.0",
"pino-elasticsearch": "6.2.0",
"pino-pretty": "7.2.0",
"rss-parser": "3.12.0",
"sanitize-html": "2.3.2",
"sanitize-html": "2.5.3",
"set-interval-async": "2.0.3",
"stoppable": "1.1.0"
},
"devDependencies": {
"@babel/core": "7.14.3",
"@babel/plugin-transform-runtime": "7.13.15",
"@babel/preset-env": "7.13.15",
"@babel/preset-react": "7.13.13",
"@babel/core": "7.16.0",
"@babel/plugin-transform-runtime": "7.16.4",
"@babel/preset-env": "7.16.4",
"@babel/preset-react": "7.16.0",
"@babel/preset-typescript": "7.16.0",
"@types/jest": "27.0.2",
"@typescript-eslint/eslint-plugin": "4.17.0",
"@typescript-eslint/parser": "4.17.0",
"@vercel/node": "1.9.1",
"@typescript-eslint/eslint-plugin": "5.4.0",
"@typescript-eslint/parser": "5.4.0",
"@vercel/node": "1.12.1",
"babel-jest": "27.3.1",
"babel-preset-next": "1.4.0",
"cross-env": "7.0.3",
"eslint": "7.23.0",
"eslint-config-airbnb": "18.2.1",
"eslint-config-prettier": "8.1.0",
"eslint-plugin-import": "2.22.1",
"eslint-plugin-jest-playwright": "0.2.1",
"eslint-plugin-jsx-a11y": "6.4.1",
"eslint-plugin-prettier": "3.4.0",
"eslint-plugin-promise": "5.1.0",
"eslint-plugin-react": "7.22.0",
"eslint-plugin-react-hooks": "4.2.0",
"eslint": "8.2.0",
"eslint-config-airbnb": "19.0.0",
"eslint-config-prettier": "8.3.0",
"eslint-plugin-import": "2.25.3",
"eslint-plugin-jest-playwright": "0.6.0",
"eslint-plugin-jsx-a11y": "6.5.1",
"eslint-plugin-prettier": "4.0.0",
"eslint-plugin-promise": "5.1.1",
"eslint-plugin-react": "7.27.1",
"eslint-plugin-react-hooks": "4.3.0",
"fast-xml-parser": "3.19.0",
"husky": "5.1.3",
"husky": "7.0.4",
"jest": "27.3.1",
"jest-fetch-mock": "3.0.3",
"jest-playwright-preset": "1.7.0",
"nock": "13.0.11",
"nock": "13.2.1",
"npm-run-all": "4.1.5",
"playwright": "1.11.0",
"prettier": "2.2.1",
"pretty-quick": "3.1.0",
"playwright": "1.16.3",
"prettier": "2.4.1",
"pretty-quick": "3.1.2",
"run.env": "1.1.0",
"supertest": "6.1.3",
"supertest": "6.1.6",
"ts-jest": "27.0.7"
},
"engines": {
Expand Down
127 changes: 103 additions & 24 deletions src/api/status/public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,31 @@
</head>
<body class="g-sidenav-show bg-gray-200">
<aside
class="sidenav navbar navbar-vertical navbar-expand-xs border-0 border-radius-xl my-3 fixed-start ms-3 bg-gradient-dark"
class="
sidenav
navbar navbar-vertical navbar-expand-xs
border-0 border-radius-xl
my-3
fixed-start
ms-3
bg-gradient-dark
"
id="sidenav-main"
>
<div class="sidenav-header">
<i
class="fas fa-times p-3 cursor-pointer text-white opacity-5 position-absolute end-0 top-0 d-none d-xl-none"
class="
fas
fa-times
p-3
cursor-pointer
text-white
opacity-5
position-absolute
end-0
top-0
d-none d-xl-none
"
aria-hidden="true"
id="iconSidenav"
></i>
Expand Down Expand Up @@ -211,7 +230,15 @@ <h6 class="font-weight-bolder mb-0">Dashboard</h6>
<div class="card card--telescope">
<div class="card-header card-header--telescope p-3 pt-2">
<div
class="icon icon-lg icon-shape bg-gradient-dark shadow-dark text-center border-radius-xl mt-n4 position-absolute"
class="
icon icon-lg icon-shape
bg-gradient-dark
shadow-dark
text-center
border-radius-xl
mt-n4
position-absolute
"
>
<i class="material-icons opacity-10">commit</i>
</div>
Expand Down Expand Up @@ -246,7 +273,15 @@ <h4 class="mb-0" id="weekly-commits-telescope">&nbsp;</h4>
<div class="card card--telescope">
<div class="card-header card-header--telescope p-3 pt-2">
<div
class="icon icon-lg icon-shape bg-gradient-info shadow-info text-center border-radius-xl mt-n4 position-absolute"
class="
icon icon-lg icon-shape
bg-gradient-info
shadow-info
text-center
border-radius-xl
mt-n4
position-absolute
"
>
<i class="material-icons opacity-10">person</i>
</div>
Expand Down Expand Up @@ -284,7 +319,15 @@ <h4 class="mb-0" id="total-contributors-telescope">&nbsp;</h4>
<div class="card card--telescope">
<div class="card-header card-header--telescope p-3 pt-2">
<div
class="icon icon-lg icon-shape bg-gradient-dark shadow-dark text-center border-radius-xl mt-n4 position-absolute"
class="
icon icon-lg icon-shape
bg-gradient-dark
shadow-dark
text-center
border-radius-xl
mt-n4
position-absolute
"
>
<i class="material-icons opacity-10">commit</i>
</div>
Expand Down Expand Up @@ -319,7 +362,15 @@ <h4 class="mb-0" id="weekly-commits-satellite">&nbsp;</h4>
<div class="card card--telescope">
<div class="card-header card-header--telescope p-3 pt-2">
<div
class="icon icon-lg icon-shape bg-gradient-info shadow-info text-center border-radius-xl mt-n4 position-absolute"
class="
icon icon-lg icon-shape
bg-gradient-info
shadow-info
text-center
border-radius-xl
mt-n4
position-absolute
"
>
<i class="material-icons opacity-10">person</i>
</div>
Expand Down Expand Up @@ -353,19 +404,22 @@ <h4 class="mb-0" id="total-contributors-satellite">&nbsp;</h4>
</div>
</div>
</div>
<div class="col-xl-3 col-sm-6 mb-xl-0 mb-4 mt-4">
<div class="card card--telescope">
<div class="card-header card-header--telescope p-3 pt-2">
<div
class="icon icon-lg icon-shape bg-gradient-info shadow-info text-center border-radius-xl mt-n4 position-absolute"
>
<i class="material-icons opacity-10">person</i>
</div>
<div class="text-end pt-1">
<h6 class="mb-0 text-capitalize">Telescope</h6>
<p class="text-sm mb-0 text-capitalize">Total posts</p>
<h4 class="mb-0" id="totalPosts">&nbsp;</h4>
</div>
</div>
<div class="col-xl-3 col-sm-6 mb-xl-0 mb-4 mt-4">
<div class="card">
<div class="card-header p-3 pt-2">
<div
class="
icon icon-lg icon-shape
bg-gradient-success
shadow-success
text-center
border-radius-xl
mt-n4
position-absolute
"
>
<i class="material-icons opacity-10">person</i>
</div>
<hr class="dark horizontal my-0" />
<div class="card-footer p-3"></div>
Expand All @@ -375,7 +429,15 @@ <h4 class="mb-0" id="totalPosts">&nbsp;</h4>
<div class="card card--telescope">
<div class="card-header card-header--telescope p-3 pt-2">
<div
class="icon icon-lg icon-shape bg-gradient-info shadow-info text-center border-radius-xl mt-n4 position-absolute"
class="
icon icon-lg icon-shape
bg-gradient-info
shadow-info
text-center
border-radius-xl
mt-n4
position-absolute
"
>
<i class="material-icons opacity-10">person</i>
</div>
Expand Down Expand Up @@ -505,22 +567,39 @@ <h6>Projects</h6>
<thead>
<tr>
<th
class="text-uppercase text-secondary text-xxs font-weight-bolder opacity-7"
class="
text-uppercase text-secondary text-xxs
font-weight-bolder
opacity-7
"
>
Companies
</th>
<th
class="text-uppercase text-secondary text-xxs font-weight-bolder opacity-7 ps-2"
class="
text-uppercase text-secondary text-xxs
font-weight-bolder
opacity-7
ps-2
"
>
Members
</th>
<th
class="text-center text-uppercase text-secondary text-xxs font-weight-bolder opacity-7"
class="
text-center text-uppercase text-secondary text-xxs
font-weight-bolder
opacity-7
"
>
Budget
</th>
<th
class="text-center text-uppercase text-secondary text-xxs font-weight-bolder opacity-7"
class="
text-center text-uppercase text-secondary text-xxs
font-weight-bolder
opacity-7
"
>
Completion
</th>
Expand Down
23 changes: 21 additions & 2 deletions src/api/status/public/pages/build.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,31 @@

<body class="g-sidenav-show bg-gray-200">
<aside
class="sidenav navbar navbar-vertical navbar-expand-xs border-0 border-radius-xl my-3 fixed-start ms-3 bg-gradient-dark"
class="
sidenav
navbar navbar-vertical navbar-expand-xs
border-0 border-radius-xl
my-3
fixed-start
ms-3
bg-gradient-dark
"
id="sidenav-main"
>
<div class="sidenav-header">
<i
class="fas fa-times p-3 cursor-pointer text-white opacity-5 position-absolute end-0 top-0 d-none d-xl-none"
class="
fas
fa-times
p-3
cursor-pointer
text-white
opacity-5
position-absolute
end-0
top-0
d-none d-xl-none
"
aria-hidden="true"
id="iconSidenav"
></i>
Expand Down
3 changes: 3 additions & 0 deletions src/backend/utils/html/dom.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import { TextEncoder, TextDecoder } from 'util';
global.TextEncoder = TextEncoder;
global.TextDecoder = TextDecoder;
const jsdom = require('jsdom');

const { JSDOM } = jsdom;
Expand Down
Loading

0 comments on commit c1a198d

Please sign in to comment.