Merge branch 'upstream'

# Conflicts:
#	README-CN.md
#	README.md
#	src/components/RunMap/index.tsx
#	src/components/RunTable/RunRow.tsx
#	src/components/SVGStat/index.tsx
#	src/components/YearsStat/index.tsx
#	src/pages/index.tsx

.eslintrc.js

@@ -8,6 +8,7 @@ module.exports = {
   extends: [
     'eslint:recommended',
     'plugin:react/recommended',
+    'plugin:react/jsx-runtime',
     'plugin:prettier/recommended',
   ],
   overrides: [],

Dockerfile

@@ -59,5 +59,5 @@ COPY --from=data /root/running_page /root/running_page
 RUN pnpm run build
 
 FROM nginx:alpine AS web
-COPY --from=frontend-build /root/running_page/public /usr/share/nginx/html/
+COPY --from=frontend-build /root/running_page/dist /usr/share/nginx/html/
 COPY --from=frontend-build /root/running_page/assets /usr/share/nginx/html/assets

assets/index.tsx

@@ -1 +1,2 @@
 export const yearStats = import.meta.glob('./year_*.svg', { import: 'ReactComponent' })
+export const totalStat = import.meta.glob(['./github.svg', './grid.svg'], { import: 'ReactComponent' })

package.json

@@ -6,6 +6,7 @@
   "dependencies": {
     "@mapbox/mapbox-gl-language": "^1.0.0",
     "@mapbox/polyline": "^1.1.1",
+    "@svgr/plugin-svgo": "^8.1.0",
     "@vercel/analytics": "^0.1.6",
     "@vitejs/plugin-react": "^4.0.0",
     "gcoord": "^0.3.2",
@@ -14,6 +15,7 @@
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "react-ga4": "^2.1.0",
     "react-helmet-async": "^1.3.0",
     "react-map-gl": "^7.1.6",
     "react-router-dom": "^6.15.0",

run_page/codoon_sync.py

@@ -129,6 +129,12 @@ def formated_input(
 def tcx_output(fit_array, run_data):
     # route ID
     fit_id = str(run_data["id"])
+    # local time
+    fit_start_time_local = run_data["start_time"]
+    # zulu time
+    utc = adjust_time_to_utc(to_date(fit_start_time_local), str(get_localzone()))
+    fit_start_time = utc.strftime("%Y-%m-%dT%H:%M:%SZ")
+
     # Root node
     training_center_database = ET.Element(
         "TrainingCenterDatabase",
@@ -154,7 +160,7 @@ def tcx_output(fit_array, run_data):
     activities.append(activity)
     #   Id
     activity_id = ET.Element("Id")
-    activity_id.text = fit_id
+    activity_id.text = fit_start_time  # Codoon use start_time as ID
     activity.append(activity_id)
     #   Creator
     activity_creator = ET.Element("Creator")
@@ -164,13 +170,6 @@ def tcx_output(fit_array, run_data):
     activity_creator_name.text = "咕咚"
     activity_creator.append(activity_creator_name)
     #   Lap
-
-    # local time
-    fit_start_time_local = run_data["start_time"]
-    # zulu time
-    utc = adjust_time_to_utc(to_date(fit_start_time_local), str(get_localzone()))
-    fit_start_time = utc.strftime("%Y-%m-%dT%H:%M:%SZ")
-
     activity_lap = ET.Element("Lap", {"StartTime": fit_start_time})
     activity.append(activity_lap)
     #       TotalTimeSeconds

run_page/utils.py

@@ -40,7 +40,9 @@ def to_date(ts):
             # shouldn't be an issue since it's an offline cmdline tool
             return datetime.strptime(ts, ts_fmt)
         except ValueError:
-            print("Error: Can not execute strptime")
+            print(
+                f"Warning: Can not execute strptime {ts} with ts_fmt {ts_fmt}, try next one..."
+            )
             pass
 
     raise ValueError(f"cannot parse timestamp {ts} into date with fmts: {ts_fmts}")

src/components/Header/index.tsx

@@ -1,5 +1,4 @@
 import { Link } from 'react-router-dom';
-import React from 'react';
 import useSiteMetadata from '@/hooks/useSiteMetadata';
 
 const Header = () => {

src/components/LocationStat/CitiesStat.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import Stat from '@/components/Stat';
 import useActivities from '@/hooks/useActivities';
 

src/components/LocationStat/LocationSummary.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import Stat from '@/components/Stat';
 import useActivities from '@/hooks/useActivities';
 

src/components/LocationStat/PeriodStat.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import Stat from '@/components/Stat';
 import useActivities from '@/hooks/useActivities';
 import { IS_CHINESE } from '@/utils/const';

src/components/LocationStat/index.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import YearStat from '@/components/YearStat';
 import {
   CHINESE_LOCATION_INFO_MESSAGE_FIRST,

src/components/RunMap/RunMapButtons.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import useActivities from '@/hooks/useActivities';
 import styles from './style.module.scss';
 

src/components/RunMap/RunMaker.tsx → src/components/RunMap/RunMarker.tsx

@@ -1,6 +1,5 @@
 import { ReactComponent as EndSvg } from '@assets/end.svg';
 import { ReactComponent as StartSvg } from '@assets/start.svg';
-import React from 'react';
 import { Marker } from 'react-map-gl';
 import styles from './style.module.scss';
 

src/components/RunMap/index.tsx

@@ -15,7 +15,7 @@ import {
   MAP_HEIGHT,
 } from '@/utils/const';
 import { Coordinate, IViewState, geoJsonForMap } from '@/utils/utils';
-import RunMarker from './RunMaker';
+import RunMarker from './RunMarker';
 import RunMapButtons from './RunMapButtons';
 import styles from './style.module.scss';
 import { FeatureCollection } from 'geojson';
@@ -110,7 +110,7 @@ const RunMap = ({
     [endLon, endLat] = points[points.length - 1];
   }
   let dash = USE_DASH_LINE && !isSingleRun && !isBigMap ? [2, 2] : [2, 0];
-  const onMove = React.useCallback(({ viewState }: {viewState: IViewState}) => {
+  const onMove = React.useCallback(({ viewState }: { viewState: IViewState }) => {
     setViewState(viewState);
   }, []);
   const style: React.CSSProperties = {
@@ -126,7 +126,7 @@ const RunMap = ({
 
   return (
     <Map
-      { ...viewState }
+      {...viewState}
       onMove={onMove}
       style={style}
       mapStyle="mapbox://styles/mapbox/dark-v10"

src/components/RunTable/RunRow.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { formatPace, colorFromType, formatRunTime, Activity, RunIds } from '@/utils/utils';
 import styles from './style.module.scss';
 

src/components/RunTable/index.tsx

@@ -38,8 +38,8 @@ const RunTable = ({
       : b.average_speed - a.average_speed;
   const sortBPMFunc: SortFunc = (a, b) => {
     return sortFuncInfo === 'BPM'
-      ? a.average_heartrate ?? 0 - (b.average_heartrate ?? 0)
-      : b.average_heartrate ?? 0 - (a.average_heartrate ?? 0);
+      ? (a.average_heartrate ?? 0) - (b.average_heartrate ?? 0)
+      : (b.average_heartrate ?? 0) - (a.average_heartrate ?? 0);
   };
   const sortRunTimeFunc: SortFunc = (a, b) => {
     const aTotalSeconds = convertMovingTime2Sec(a.moving_time);