Skip to content

Commit

Permalink
Fix redirects (#661)
Browse files Browse the repository at this point in the history
* Update packages + remove unused ones

* Fix redirects

* update lockfile
  • Loading branch information
bradystroud authored Aug 13, 2024
1 parent 2ae78fb commit aed5e6f
Show file tree
Hide file tree
Showing 6 changed files with 1,765 additions and 5,397 deletions.
2 changes: 1 addition & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ This is a Gatsby generated site pulling data from:
1. Branch off main for your PBI
2. Run *yarn build* (or *npm run-script build*) (.env.production is required for this step)
3. Do your work
4. Run the site in development mode by *yarn develop* (or *npm run-script develop*) (.env.development is required for this step)
4. Run the site in development mode by *yarn dev* (or *npm run-script dev*) (.env.development is required for this step)
5. Commit code and push
6. Raise a PR
7. Get it merged!
Expand Down
2 changes: 1 addition & 1 deletion gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,6 @@ module.exports = {
},
plugins: [
...getPlugins(),
'gatsby-plugin-meta-redirect', // make sure to put last in the array
'gatsby-plugin-client-side-redirect', // make sure to put last in the array
],
};
89 changes: 41 additions & 48 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"license": "MIT",
"author": "SSWDevelopers <SSWDevelopers@ssw.com.au>",
"scripts": {
"develop": "gatsby develop",
"dev": "gatsby develop",
"serve": "gatsby serve",
"ssr": "yarn run build && yarn run serve",
"format": "prettier --config ./.prettierrc --write src/**/*.js",
Expand All @@ -21,46 +21,46 @@
]
},
"dependencies": {
"@babel/core": "^7.23.9",
"@babel/core": "^7.25.2",
"@brainhubeu/react-carousel": "^2.0.4",
"@fortawesome/free-brands-svg-icons": "^6.5.1",
"@fortawesome/free-regular-svg-icons": "^6.5.1",
"@microsoft/applicationinsights-web": "^3.1.0",
"@fortawesome/free-brands-svg-icons": "^6.6.0",
"@fortawesome/free-regular-svg-icons": "^6.6.0",
"@microsoft/applicationinsights-web": "^3.3.1",
"@raae/gatsby-remark-oembed": "^0.3.3",
"@reach/dialog": "^0.18.0",
"@reach/router": "^1.3.4",
"@reach/visually-hidden": "^0.18.0",
"@types/youtube": "^0.0.50",
"assert": "^2.1.0",
"axios": "^1.6.7",
"axios": "^1.7.3",
"browserify-zlib": "^0.2.0",
"buffer": "^6.0.3",
"classnames": "^2.5.1",
"copy-to-clipboard": "^3.3.3",
"core-js": "^3.36.0",
"gatsby": "^5.13.3",
"core-js": "^3.38.0",
"gatsby": "^5.13.7",
"gatsby-plugin-breadcrumb": "^12.3.2",
"gatsby-plugin-google-gtag": "^5.3.0",
"gatsby-plugin-client-side-redirect": "^1.1.0",
"gatsby-plugin-google-gtag": "^5.13.1",
"gatsby-plugin-google-tagmanager": "^5.13.1",
"gatsby-plugin-image": "^3.13.1",
"gatsby-plugin-meta-redirect": "^1.1.1",
"gatsby-plugin-postcss": "^6.13.1",
"gatsby-plugin-react-helmet": "^6.13.1",
"gatsby-plugin-react-svg": "^3.1.0",
"gatsby-plugin-react-svg": "^3.3.0",
"gatsby-plugin-sharp": "^4.25.1",
"gatsby-plugin-sitemap": "^6.13.1",
"gatsby-remark-copy-linked-files": "^6.13.1",
"gatsby-remark-custom-blocks": "^3.2.0",
"gatsby-remark-custom-blocks": "^3.15.0",
"gatsby-remark-embed-video": "^3.2.1",
"gatsby-remark-figure-caption": "^2.0.0",
"gatsby-remark-images": "^6.24.0",
"gatsby-remark-images": "^6.25.0",
"gatsby-remark-relative-images": "^0.3.0",
"gatsby-remark-responsive-iframe": "^6.3.0",
"gatsby-source-filesystem": "^5.3.1",
"gatsby-remark-responsive-iframe": "^6.13.1",
"gatsby-source-filesystem": "^5.13.1",
"gatsby-source-git": "^1.1.0",
"gatsby-transformer-json": "^5.13.1",
"gatsby-transformer-remark": "^3.2.0",
"gatsby-transformer-sharp": "^5.3.1",
"gatsby-transformer-sharp": "^5.13.1",
"gray-matter": "^4.0.3",
"history": "^5.3.0",
"https-browserify": "^1.0.0",
Expand All @@ -69,61 +69,57 @@
"node-fetch": "^2.7.0",
"os-browserify": "^0.3.0",
"path-browserify": "^1.0.1",
"postcss": "^8.4.35",
"postcss": "^8.4.41",
"postcss-import": "^15.1.0",
"postcss-nested": "^6.0.1",
"postcss-nested": "^6.2.0",
"preval.macro": "^5.0.0",
"prop-types": "^15.8.1",
"query-string": "^8.2.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-ga": "^3.3.1",
"react-github-calendar": "^4.1.2",
"react-github-calendar": "^4.2.2",
"react-google-recaptcha": "^3.1.0",
"react-helmet": "^6.1.0",
"react-hot-toast": "^2.4.1",
"react-jotform": "^1.0.2",
"react-lazy-youtube": "^1.0.1",
"react-pose": "^4.0.10",
"react-responsive-modal": "^6.4.2",
"react-tooltip": "^5.26.3",
"react-youtube": "^10.1.0",
"rollup": "^4.12.0",
"ssw.megamenu": "^4.2.2",
"ssw.rules.widget": "^1.6.2",
"rollup": "^4.20.0",
"ssw.megamenu": "^4.5.9",
"ssw.rules.widget": "^2.0.3",
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
"styled-components": "^5.3.11",
"url": "^0.11.3",
"url": "^0.11.4",
"util": "^0.12.5",
"webpack-assets-manifest": "^5.1.0"
"webpack-assets-manifest": "^5.2.1"
},
"devDependencies": {
"@babel/eslint-parser": "^7.23.10",
"@babel/preset-react": "^7.23.3",
"@fortawesome/fontawesome-svg-core": "^6.5.1",
"@fortawesome/free-solid-svg-icons": "^6.5.1",
"@fortawesome/react-fontawesome": "^0.2.0",
"@hot-loader/react-dom": "^17.0.2",
"applicationinsights": "^2.9.4",
"@babel/eslint-parser": "^7.25.1",
"@babel/preset-react": "^7.24.7",
"@fortawesome/fontawesome-svg-core": "^6.6.0",
"@fortawesome/free-solid-svg-icons": "^6.6.0",
"@fortawesome/react-fontawesome": "^0.2.2",
"applicationinsights": "^2.9.5",
"array-flat-polyfill": "^1.0.1",
"autoprefixer": "^10.4.17",
"autoprefixer": "^10.4.20",
"babel-eslint": "^10.1.0",
"chrome-launcher": "^0.15.2",
"css-loader": "^6.10.0",
"directory-named-webpack-plugin": "^4.1.0",
"dotenv": "^16.4.4",
"eslint": "^8.56.0",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.33.2",
"dotenv": "^16.4.5",
"eslint": "^8.57.0",
"eslint-plugin-jsx-a11y": "^6.9.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.35.0",
"favicons": "^6.2.2",
"gatsby-cli": "^5.13.2",
"gatsby-cli": "^5.13.3",
"lighthouse": "^9.6.8",
"mkdirp": "^3.0.1",
"prettier": "^3.2.5",
"tailwindcss": "^3.4.1",
"typescript": "^5.3.3"
"prettier": "^3.3.3",
"tailwindcss": "^3.4.9"
},
"packageComments": {
"⚠️ gatsby-remark-custom-blocks": "Locked to ^3.2.0 - Higher versions are incompatible with gatsby-transformer-remark@^4.0.0 as per https://www.gatsbyjs.com/plugins/gatsby-remark-custom-blocks/",
Expand All @@ -133,9 +129,6 @@
"⚠️ node-fetch": "Locked to ^2.6.7 - Higher versions require ESM syntax which we cannot use - https://github.com/node-fetch/node-fetch#commonjs",
"📦 mkdirp": "Added to have a simple cross-platform way of creating a directory"
},
"alias": {
"react-dom": "@hot-loader/react-dom"
},
"resolutions": {
"sharp": "0.33.2"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import GitHubCalendar from 'react-github-calendar';
import PropTypes from 'prop-types';
import ReactTooltip from 'react-tooltip';


const GitHubContributionCalendar = ({ githubUrl }) => {
let userName = githubUrl.split('/');
Expand All @@ -16,10 +16,7 @@ const GitHubContributionCalendar = ({ githubUrl }) => {
blockMargin={3}
fontSize={10}
hideColorLegend={true}
colorScheme="light"
>
<ReactTooltip delayShow={50} html />
</GitHubCalendar>
colorScheme="light"/>
</div>
</>
);
Expand Down
4 changes: 2 additions & 2 deletions src/pages/alumni/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { config } from '@fortawesome/fontawesome-svg-core';
import { Location } from '@reach/router';
import Filter from '../../components/filter/filter';
import RoleSort from '../../helpers/roleSort';
import ProfileSort from '../../helpers/profileSort';
import AlphabeticalSort from '../../helpers/profileSort';
import LocationFilter from '../../components/location-filter/location-filter';
import LocationSanitiser from '../../helpers/locationSanitizer';
import Distinct from '../../helpers/arrayHelpers';
Expand Down Expand Up @@ -64,7 +64,7 @@ const Index = ({ data }) => {
.filter(
(p) => selectedRoles.length === 0 || selectedRoles.includes(p.role)
)
.sort(ProfileSort);
.sort(AlphabeticalSort);

setFilteredPeople(people);
}, [selectedLocation, selectedRoles]);
Expand Down
Loading

0 comments on commit aed5e6f

Please sign in to comment.