Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: table selection and menu click #56

Merged
merged 4 commits into from
Sep 8, 2021
Merged

fix: table selection and menu click #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85563ca
Remove caption
desoindx Sep 8, 2021
80fa96b
Add link in header
desoindx Sep 8, 2021
d639d2d
Update packages
desoindx Sep 8, 2021
a381e78
Update snapshots
desoindx Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion report/www/config/webpack.dev.hot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ module.exports = {
],
},
devServer: {
contentBase: path.resolve(baseConfig.context, "dist"),
headers: {
"Access-Control-Allow-Origin": "*",
},
Expand Down
24 changes: 12 additions & 12 deletions report/www/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"private": true,
"homepage": "dashlord/",
"dependencies": {
"@dataesr/react-dsfr": "^0.5.9",
"@dataesr/react-dsfr": "^0.6.2",
"classnames": "^2.3.1",
"country-flag-icons": "^1.4.9",
"country-flag-icons": "^1.4.10",
"date-fns": "^2.23.0",
"gaugeJS": "^1.3.7",
"lodash.orderby": "^4.6.0",
Expand All @@ -17,7 +17,7 @@
"react-dom": "^17.0.2",
"react-feather": "^2.0.9",
"react-router": "^5.2.1",
"react-router-dom": "^5.2.1",
"react-router-dom": "^5.3.0",
"react-scripts": "^4.0.3",
"recharts": "^2.1.2",
"web-vitals": "^2.1.0"
Expand Down Expand Up @@ -60,15 +60,15 @@
"@types/jest": "^27.0.1",
"@types/lodash.orderby": "^4.6.6",
"@types/lodash.uniq": "^4.5.6",
"@types/node": "^16.4.13",
"@types/node": "^16.7.13",
"@types/react": "^17.0.20",
"@types/react-bootstrap": "^0.32.26",
"@types/react-dom": "^17.0.9",
"@types/react-router-bootstrap": "^0.24.5",
"@types/react-router-dom": "^5.1.8",
"@types/react-test-renderer": "^17.0.1",
"@typescript-eslint/eslint-plugin": "^4.29.3",
"@typescript-eslint/parser": "^4.29.3",
"@typescript-eslint/eslint-plugin": "^4.31.0",
"@typescript-eslint/parser": "^4.31.0",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.2.2",
"clean-webpack-plugin": "^4.0.0",
Expand All @@ -81,22 +81,22 @@
"eslint-plugin-import": "^2.24.2",
"eslint-plugin-jest": "^24.4.0",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-react": "^7.25.1",
"eslint-plugin-react-hooks": "^4.2.0",
"file-loader": "^6.2.0",
"html-loader": "^2.1.2",
"html-webpack-plugin": "^5.3.2",
"markdown-loader": "^6.0.0",
"prettier": "^2.3.2",
"react-test-renderer": "^17.0.2",
"sass": "^1.37.5",
"sass": "^1.39.0",
"sass-loader": "^12.1.0",
"style-loader": "^3.2.1",
"svg-url-loader": "^7.1.1",
"ts-loader": "^9.2.5",
"typescript": "^4.3.5",
"webpack": "^5.50.0",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^3.11.2"
"typescript": "^4.4.2",
"webpack": "^5.52.0",
"webpack-cli": "^4.8.0",
"webpack-dev-server": "^4.1.1"
}
}
18 changes: 14 additions & 4 deletions report/www/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import { ScrollToTop } from "./components/ScrollToTop";
import { About } from "./components/About";
import { WappalyzerDashboard } from "./components/WappalyzerDashboard";

import "./colors.css";

const report: DashLordReport = require("./report.json");
const trends: Trends = require("./trends.json");

Expand All @@ -40,8 +42,12 @@ const CategoryRoute: React.FC<CategoryRouteProps> = (props) => {
{urls.length ? (
<>
<h3>
{category} : {urls.length} urls
</h3>
{category}
{' '}
:{urls.length}
{' '}
urls
</h3>
<Dashboard report={urls} />
</>
) : (
Expand All @@ -65,8 +71,12 @@ const TagRoute: React.FC<TagRouteProps> = (props) => {
<>
<br />
<h3>
{tag} : {urls.length} urls
</h3>
{tag}
{' '}
:{urls.length}
{' '}
urls
</h3>
<Dashboard report={urls} />
</>
);
Expand Down
Loading