Skip to content

Commit

Permalink
Trying to get this working again
Browse files Browse the repository at this point in the history
-Lots of dependency updates
-Working locally with bump to socket.io v4
  • Loading branch information
alexgladd committed Feb 5, 2024
1 parent 56b85a9 commit 8d4bf76
Show file tree
Hide file tree
Showing 9 changed files with 15,272 additions and 14,168 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: '12.x'
node-version: '20.x'

- name: Install
run: npm ci
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: '12.x'
node-version: '20.x'

- name: Install
run: npm ci
Expand Down
29,400 changes: 15,251 additions & 14,149 deletions package-lock.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bm-hotgroups",
"version": "1.0.0",
"version": "1.1.0",
"private": true,
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.35",
Expand All @@ -10,13 +10,13 @@
"@sentry/react": "^6.3.5",
"@sentry/tracing": "^6.3.5",
"lodash": "^4.17.21",
"moment": "^2.29.1",
"moment": "^2.30.1",
"prop-types": "^15.7.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-ga": "^3.3.0",
"react-scripts": "4.0.3",
"socket.io-client": "^2.4.0"
"react-ga4": "^2.1.0",
"react-scripts": "5.0.1",
"socket.io-client": "^4.4.1"
},
"scripts": {
"start": "react-scripts start",
Expand All @@ -25,7 +25,7 @@
"eject": "react-scripts eject"
},
"engines": {
"node": "12.x"
"node": "20.x"
},
"browserslist": {
"production": [
Expand Down
6 changes: 3 additions & 3 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import ReactGA from 'react-ga';
import ReactGA from 'react-ga4';
import moment from 'moment';
import BMLH from './util/bmlastheard';
import BMAgg from './util/bmagg';
Expand Down Expand Up @@ -146,8 +146,8 @@ class App extends React.Component {

if (process.env.NODE_ENV === 'production') {
// only use analytics in prod
ReactGA.initialize('UA-121772253-1');
ReactGA.pageview(window.location.pathname);
ReactGA.initialize('G-LSNRGQJRG7');
ReactGA.send({ hitType: "pageview", page: window.location.pathname, title: "Brandmeister Top Activity" });

// only open automatically in prod
this.bmlh.open();
Expand Down
2 changes: 1 addition & 1 deletion src/components/Header.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState } from 'react';
import PropTypes from 'prop-types';
import ReactGA from 'react-ga';
import ReactGA from 'react-ga4';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faBroadcastTower, faInfoCircle, faNewspaper, faCoffee } from '@fortawesome/free-solid-svg-icons';
import './Header.css';
Expand Down
2 changes: 1 addition & 1 deletion src/components/TopCallsigns.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import ReactGA from 'react-ga';
import ReactGA from 'react-ga4';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faUser } from '@fortawesome/free-solid-svg-icons';
import _ from 'lodash';
Expand Down
2 changes: 1 addition & 1 deletion src/components/TopGroups.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import ReactGA from 'react-ga';
import ReactGA from 'react-ga4';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faUsers } from '@fortawesome/free-solid-svg-icons';
import _ from 'lodash';
Expand Down
4 changes: 3 additions & 1 deletion src/util/bmlastheard.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ import log from './logger';
const BM_DEFAULT_URL = 'https://api.brandmeister.network';
const BM_DEFAULT_OPTS = {
path: '/lh',
reconnection: true
transports: ['websocket', 'polling'],
secure: true,
reconnection: true,
};

export default class BrandmeisterLastHeard {
Expand Down

0 comments on commit 8d4bf76

Please sign in to comment.