merge

.eslintrc

@@ -9,6 +9,12 @@
   "plugins": [
     "prettier"
   ],
+  "prettier/prettier": [
+    "error",
+    {
+      "endOfLine": "auto"
+    }
+  ],
 
   "env": {
     "browser": true,

.github/workflows/run_data_sync.yml

@@ -113,11 +113,9 @@ jobs:
           python scripts/gen_svg.py --from-db --year $(date +"%Y")  --language zh_CN --title "$(date +"%Y") Running" --type github --athlete "${{ env.ATHLETE }}" --special-distance 10 --special-distance2 20 --special-color yellow --special-color2 red --output assets/github_$(date +"%Y").svg --use-localtime --min-distance 0.5
 
       - name: Push new runs
-        uses: github-actions-x/commit@v2.6
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "Add new runs"
-          files: activities src/static/ scripts/ assets/ GPX_OUT/
-          rebase: 'true'
-          name: ${{ env.GITHUB_NAME }}
-          email: ${{ env.GITHUB_EMAIL }}
+        run: |
+          git config --local user.email "${{ env.GITHUB_EMAIL }}"
+          git config --local user.name "${{ env.GITHUB_EMAIL }}"
+          git commit -a -m 'update new runs' || echo "nothing to commit"
+          git push || echo "nothing to push"
+

.nvmrc

@@ -0,0 +1 @@
+14.15.0

README-CN.md

@@ -19,8 +19,8 @@ R.I.P. 希望大家都能健康顺利的跑过终点，逝者安息。
 
 | Runner                                          | page                                       | App       |
 | ----------------------------------------------- | ------------------------------------------ | --------- |
-| [shaonianche](https://github.com/shaonianche)   | https://run.duangfei.org                   | Nike      |
-| [yihong0618](https://github.com/yihong0618)     | https://yihong.run/running                 | Nike      |
+| [shaonianche](https://github.com/shaonianche)   | https://run.duanfei.org                    | Strava    |
+| [yihong0618](https://github.com/yihong0618)     | https://yihong.run                         | Nike      |
 | [superleeyom](https://github.com/superleeyom)   | https://running.leeyom.top                 | Nike      |
 | [geekplux](https://github.com/geekplux)         | https://activities.geekplux.com            | Nike      |
 | [guanlan](https://github.com/guanlan)           | https://grun.vercel.app                    | Strava    |
@@ -37,15 +37,18 @@ R.I.P. 希望大家都能健康顺利的跑过终点，逝者安息。
 | [wh1994](https://github.com/wh1994)             | https://run4life.fun                       | Garmin    |
 | [liuyihui](https://github.com/YiHui-Liu)        | https://run.foolishfox.cn                  | Keep      |
 | [FrankSun](https://github.com/hi-franksun)      | https://hi-franksun.github.io/running_page | Nike      |
-| [AhianZhang](https://github.com/AhianZhang)     | https://running.ahianzhang.com             | Keep      |
+| [AhianZhang](https://github.com/AhianZhang)     | https://running.ahianzhang.com             | Nike      |
 | [L1cardo](https://github.com/L1cardo)           | https://run.licardo.cn                     | Nike      |
 | [luckylele666](https://github.com/luckylele666) | https://0000928.xyz                        | Strava    |
 | [MFYDev](https://github.com/MFYDev)             | https://mfydev.run                         | Garmin-cn |
-| [Jim Gao](https://github.com/tianheg)           | https://run.yidajiabei.xyz/                | Keep      |
+| [tianheg](https://github.com/tianheg)           | https://run.tianheg.xyz/                   | Keep      |
 | [Oysmart](https://github.com/oysmart)           | https://run.ouyang.wang                    | Garmin-cn |
 | [Eished](https://github.com/eished)             | https://run.iknow.fun                      | Keep      |
-| [Liuxin](https://github.com/liuxindtc)          | https://liuxin.run                         | Nike     |
+| [Liuxin](https://github.com/liuxindtc)          | https://liuxin.run                         | Nike      |
 | [loucx](https://github.com/loucx)               | https://loucx.github.io/running            | Nike      |
+| [winf42](https://github.com/winf42)             | https://winf42.github.io                   | Garmin-cn |
+| [sun0225SUN](https://github.com/sun0225SUN)     | https://run.sunguoqi.com                   | Nike      |
+| [Zhan](https://www.zlog.in/about)               | https://run.zlog.in                        | Nike      |
 
 ## 它是怎么工作的
 
@@ -113,7 +116,7 @@ const MAPBOX_TOKEN =
 
 ## 一些个性化选项
 
-在仓库目录下找到 `gatsby-config.js`，找到以下内容并修改成你自己想要的。
+* 在仓库目录下找到 `gatsby-config.js`，找到以下内容并修改成你自己想要的。
 
 ```javascript
 siteMetadata: {
@@ -133,7 +136,13 @@ siteMetadata: {
   ],
 },
 ```
-
+* 修改 `src/utils/const.js` 文件中的样式： 
+```javascript
+// styling: 关闭虚线: 设置为 `false`
+const USE_DASH_LINE = true;
+// styling: 透明度: [0, 1]
+const LINE_OPACITY = 0.4;
+```
 ## 下载您的 Nike Run Club/Strava/Garmin/Garmin-cn/Keep 数据, [别忘了在 `total` 页面生成可视化 SVG](#Total-Data-Analysis).
 
 ### GPX

README.md

@@ -3,7 +3,7 @@
 </p>
 
 <h3 align="center">
-  <a href="https://yihong.run/running"> Create a personal running home page </a>
+  <a href="https://yihong.run"> Create a personal running home page </a>
 </h3>
 
 <p align="center">
@@ -21,8 +21,8 @@ English | [简体中文](https://github.com/yihong0618/running_page/blob/master/
 
 | Runner                                          | page                                       | App       |
 | ----------------------------------------------- | ------------------------------------------ | --------- |
-| [shaonianche](https://github.com/shaonianche)   | https://run.duangfei.org                   | Nike      |
-| [yihong0618](https://github.com/yihong0618)     | https://yihong.run/running                 | Nike      |
+| [shaonianche](https://github.com/shaonianche)   | https://run.duanfei.org                    | Strava    |
+| [yihong0618](https://github.com/yihong0618)     | https://yihong.run                         | Nike      |
 | [superleeyom](https://github.com/superleeyom)   | https://running.leeyom.top                 | Nike      |
 | [geekplux](https://github.com/geekplux)         | https://activities.geekplux.com            | Nike      |
 | [guanlan](https://github.com/guanlan)           | https://grun.vercel.app                    | Strava    |
@@ -39,13 +39,17 @@ English | [简体中文](https://github.com/yihong0618/running_page/blob/master/
 | [wh1994](https://github.com/wh1994)             | https://run4life.fun                       | Garmin    |
 | [liuyihui](https://github.com/YiHui-Liu)        | https://run.foolishfox.cn                  | Keep      |
 | [FrankSun](https://github.com/hi-franksun)      | https://hi-franksun.github.io/running_page | Nike      |
-| [AhianZhang](https://github.com/AhianZhang)     | https://running.ahianzhang.com             | Keep      |
+| [AhianZhang](https://github.com/AhianZhang)     | https://running.ahianzhang.com             | Nike      |
 | [L1cardo](https://github.com/L1cardo)           | https://run.licardo.cn                     | Nike      |
 | [luckylele666](https://github.com/luckylele666) | https://0000928.xyz                        | Strava    |
 | [MFYDev](https://github.com/MFYDev)             | https://mfydev.run                         | Garmin-cn |
-| [Jim Gao](https://github.com/tianheg)             | https://run.yidajiabei.xyz/ | Keep |
+| [tianheg](https://github.com/tianheg)           | https://run.tianheg.xyz/                   | Keep      |
 | [Eished](https://github.com/eished)             | https://run.iknow.fun                      | Keep      |
-| [Liuxin](https://github.com/liuxindtc)             | https://liuxin.run                   |  Nike      |
+| [Liuxin](https://github.com/liuxindtc)          | https://liuxin.run                         | Nike      |
+| [loucx](https://github.com/loucx)               | https://loucx.github.io/running            | Nike      |
+| [winf42](https://github.com/winf42)             | https://winf42.github.io                   | Garmin-cn |
+| [sun0225SUN](https://github.com/sun0225SUN)     | https://run.sunguoqi.com                   | Nike      |
+| [Zhan](https://www.zlog.in/about/)              | https://run.zlog.in                        | Nike      |
 
 ## How it works
 
@@ -107,7 +111,7 @@ const MAPBOX_TOKEN =
 
 ## Custom your page
 
-Find `gatsby-config.js` in the repository directory, find the following content, and change it to what you want.
+* Find `gatsby-config.js` in the repository directory, find the following content, and change it to what you want.
 
 ```javascript
 siteMetadata: {
@@ -127,6 +131,13 @@ siteMetadata: {
   ],
 },
 ```
+* Modifying styling in `src/utils/const.js`
+```javascript
+// styling: set to `false` if you want to disable dash-line route
+const USE_DASH_LINE = true;
+// styling: route line opacity: [0, 1]
+const LINE_OPACITY = 0.4;
+```
 
 ## Download your running data and do not forget to [generate svg in `total` page](#Total-Data-Analysis).
 

gatsby-config.js

@@ -1,5 +1,5 @@
 module.exports = {
-  pathPrefix: `/`, // Change to `/running_page` when running on github pages
+  pathPrefix: '/', // Change to `/running_page` when running on github pages
   siteMetadata: {
     siteTitle: 'Running Page',
     siteUrl: 'https://yihong.run',
@@ -57,7 +57,12 @@ module.exports = {
     {
       resolve: 'gatsby-plugin-sass',
       options: {
-        precision: 8,
+        cssLoaderOptions: {
+          esModule: false,
+          modules: {
+            namedExport: false,
+          },
+        },
       },
     },
     {

package.json

@@ -8,40 +8,41 @@
     "@mapbox/polyline": "^1.1.1",
     "classnames": "^2.2.6",
     "date-fns": "^2.14.0",
-    "gatsby": "^2.29.2",
+    "gatsby": "^4.6.2",
     "gatsby-alias-imports": "^1.0.6",
-    "gatsby-image": "^2.8.0",
-    "gatsby-plugin-feed": "^2.5.5",
-    "gatsby-plugin-manifest": "^2.4.11",
+    "gatsby-image": "^3.0.0",
+    "gatsby-plugin-feed": "^4.6.0",
+    "gatsby-plugin-manifest": "^4.6.0",
     "gatsby-plugin-meta-redirect": "^1.1.1",
-    "gatsby-plugin-offline": "^3.2.9",
-    "gatsby-plugin-react-helmet": "^3.7.0",
+    "gatsby-plugin-offline": "^5.6.0",
+    "gatsby-plugin-react-helmet": "^5.6.0",
     "gatsby-plugin-react-svg": "^3.0.0",
     "gatsby-plugin-robots-txt": "^1.5.1",
-    "gatsby-plugin-sass": "^2.3.4",
-    "gatsby-plugin-sharp": "^2.6.11",
-    "gatsby-plugin-sitemap": "^2.4.5",
-    "gatsby-redirect-from": "^0.2.4",
-    "gatsby-remark-autolink-headers": "^2.3.5",
+    "gatsby-plugin-sass": "^5.6.0",
+    "gatsby-plugin-sharp": "^4.6.0",
+    "gatsby-plugin-sitemap": "^5.6.0",
+    "gatsby-redirect-from": "^0.4.3",
+    "gatsby-remark-autolink-headers": "^5.6.0",
     "gatsby-remark-classes": "^1.0.0",
     "gatsby-remark-external-links": "^0.0.4",
-    "gatsby-remark-images": "^3.3.10",
-    "gatsby-remark-responsive-iframe": "^2.4.5",
-    "gatsby-remark-smartypants": "^2.3.4",
+    "gatsby-remark-images": "^6.6.0",
+    "gatsby-remark-responsive-iframe": "^5.6.0",
+    "gatsby-remark-smartypants": "^5.6.0",
     "gatsby-remark-widows": "^1.0.0",
-    "gatsby-source-filesystem": "^2.8.1",
-    "gatsby-transformer-json": "^2.8.0",
-    "gatsby-transformer-remark": "^2.8.15",
-    "gatsby-transformer-sharp": "^2.5.5",
-    "gatsby-transformer-yaml": "^2.4.4",
-    "node-sass": "^4.14.1",
+    "gatsby-source-filesystem": "^4.6.0",
+    "gatsby-transformer-json": "^4.6.0",
+    "gatsby-transformer-remark": "^5.6.0",
+    "gatsby-transformer-sharp": "^4.6.0",
+    "gatsby-transformer-yaml": "^4.6.0",
+    "gcoord": "^0.3.2",
     "pngquant-bin": "^6.0.0",
     "prettier": "^2.2.1",
     "prop-types": "^15.7.2",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-helmet": "^6.1.0",
     "react-map-gl": "^5.2.11",
+    "sass": "^1.50.0",
     "sass-mq": "^5.0.1",
     "styled-components": "^4.4.1",
     "tachyons": "^4.12.0",
@@ -61,8 +62,9 @@
     "check": "npx prettier --write *.{js,jsx,scss,json,md,yaml}",
     "ci": "yarn run check && yarn run build && yarn run test"
   },
+  "engineStrict": true,
   "engines": {
-    "node": ">=10.0.0 < 15.0.0"
+    "node": ">=14.15.0"
   },
   "repository": {
     "type": "git",

requirements.txt

@@ -1,7 +1,6 @@
 httpx==0.15.4
 gpxpy==1.4.2
-# stravalib==0.10.2
-git+https://github.com/hozn/stravalib.git
+stravalib
 appdirs>=1.4.0
 svgwrite>=1.1.9
 colour
@@ -13,4 +12,4 @@ sqlalchemy
 timezonefinder
 pyyaml
 aiofiles
-cloudscraper
+cloudscraper==1.2.58

scripts/gpxtrackposter/track.py

@@ -45,10 +45,11 @@ def load_gpx(self, file_name):
                 raise TrackLoadError("Empty GPX file")
             with open(file_name, "r") as file:
                 self._load_gpx_data(mod_gpxpy.parse(file))
-        except:
+        except Exception as e:
             print(
                 f"Something went wrong when loading GPX. for file {self.file_names[0]}, we just ignore this file and continue"
             )
+            print(str(e))
             pass
 
     def load_from_db(self, activity):
@@ -204,7 +205,9 @@ def _get_moving_data(gpx):
             "elapsed_time": datetime.timedelta(
                 seconds=(moving_data.moving_time + moving_data.stopped_time)
             ),
-            "average_speed": moving_data.moving_distance / moving_data.moving_time,
+            "average_speed": moving_data.moving_distance / moving_data.moving_time
+            if moving_data.moving_time
+            else 0,
         }
 
     def to_namedtuple(self):

scripts/nike_sync.py

@@ -97,7 +97,10 @@ def run(refresh_token):
             # ignore NTC record
             app_id = activity["app_id"]
             activity_id = activity["id"]
-            if app_id == "com.nike.ntc.brand.ios":
+            if (
+                app_id == "com.nike.ntc.brand.ios"
+                or app_id == "com.nike.ntc.brand.droid"
+            ):
                 logger.info(f"Ignore NTC record {activity_id}")
                 continue
 

src/components/RunMap/index.jsx

@@ -7,6 +7,8 @@ import {
   MAIN_COLOR,
   MAPBOX_TOKEN,
   PROVINCE_FILL_COLOR,
+  USE_DASH_LINE,
+  LINE_OPACITY,
 } from 'src/utils/const';
 import { geoJsonForMap } from 'src/utils/utils';
 import RunMarker from './RunMaker';
@@ -59,6 +61,7 @@ const RunMap = ({
     [startLon, startLat] = points[0];
     [endLon, endLat] = points[points.length - 1];
   }
+  let dash = USE_DASH_LINE && !isSingleRun ? [2, 2] : [2, 0];
 
   return (
     <ReactMapGL
@@ -75,7 +78,7 @@ const RunMap = ({
       />
       <Source id="data" type="geojson" data={geoData}>
         <Layer
-          id="prvince"
+          id="province"
           type="fill"
           paint={{
             'fill-color': PROVINCE_FILL_COLOR,
@@ -88,6 +91,8 @@ const RunMap = ({
           paint={{
             'line-color': MAIN_COLOR,
             'line-width': isBigMap ? 1 : 2,
+            'line-dasharray': dash,
+            'line-opacity': isSingleRun ? 1 : LINE_OPACITY,
           }}
           layout={{
             'line-join': 'round',

src/pages/index.jsx

@@ -20,7 +20,7 @@ import {
   titleForShow,
 } from 'src/utils/utils';
 
-export default () => {
+const Index = () => {
   const { siteTitle } = useSiteMetadata();
   const { activities, thisYear } = useActivities();
   const [year, setYear] = useState(thisYear);
@@ -209,3 +209,5 @@ export default () => {
     </Layout>
   );
 };
+
+export default Index;

src/utils/const.js

@@ -10,6 +10,11 @@ const MUNICIPALITY_CITIES_ARR = [
   '澳门特别行政区',
 ];
 
+// styling: set to `true` if you want dash-line route
+const USE_DASH_LINE = true;
+// styling: route line opacity: [0, 1]
+const LINE_OPACITY = 0.4;
+
 // IF you outside China please make sure IS_CHINESE = false
 const IS_CHINESE = true;
 const USE_ANIMATION_FOR_GRID = false;
@@ -53,8 +58,14 @@ export {
   INFO_MESSAGE,
   RUN_TITLES,
   USE_ANIMATION_FOR_GRID,
+  USE_DASH_LINE,
+  LINE_OPACITY,
 };
 
 const nike = 'rgb(224,237,94)'; // if you want change the main color change here src/styles/variables.scss
+
+// If your map has an offset please change this line
+// issues #92 and #198
+export const NEED_FIX_MAP = false;
 export const MAIN_COLOR = nike;
 export const PROVINCE_FILL_COLOR = '#47b8e0';

src/utils/utils.js

@@ -1,7 +1,8 @@
 import * as mapboxPolyline from '@mapbox/polyline';
+import gcoord from 'gcoord';
 import { WebMercatorViewport } from 'react-map-gl';
 import { chinaGeojson } from '../static/run_countries';
-import { MUNICIPALITY_CITIES_ARR, RUN_TITLES } from './const';
+import { MUNICIPALITY_CITIES_ARR, NEED_FIX_MAP, RUN_TITLES } from './const';
 
 const titleForShow = (run) => {
   const date = run.start_date_local.slice(0, 11);
@@ -91,7 +92,7 @@ const pathForRun = (run) => {
     const c = mapboxPolyline.decode(run.summary_polyline);
     // reverse lat long for mapbox
     c.forEach((arr) => {
-      [arr[0], arr[1]] = [arr[1], arr[0]];
+      [arr[0], arr[1]] = !NEED_FIX_MAP ? [arr[1], arr[0]] : gcoord.transform([arr[1], arr[0]], gcoord.GCJ02, gcoord.WGS84);
     });
     return c;
   } catch (err) {