Merge branch 'yihong0618:master' into master

jujimeizuo · Oct 29, 2023 · 4e17332 · 4e17332
2 parents bf3a2ac + 23464b5
commit 4e17332
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 30 deletions.
diff --git a/README-CN.md b/README-CN.md
@@ -1,13 +1,15 @@
 ## Note
+
 1. clone or Fork before vercel 404 need to pull the latest code
 2. python3(python) in README means python3 python
 3. use v2.0 need change vercel setting from gatsby to vite
 4. 2023.09.26 garmin need secret_string(and in Actions) get
+
 ```bash
   python run_page/get_garmin_secret.py ${email} ${password}
   # if cn
   python run_page/get_garmin_secret.py ${email} ${password} --is-cn
-  ```
+```
 
 ![running_page](https://socialify.git.ci/yihong0618/running_page/image?description=1&font=Inter&forks=1&issues=1&language=1&logo=https%3A%2F%2Fraw.githubusercontent.com%2Fshaonianche%2Fgallery%2Fmaster%2Frunning_page%2Frunning_page_logo_150*150.jpg&owner=1&pulls=1&stargazers=1&theme=Light)
 
@@ -85,7 +87,7 @@ R.I.P. 希望大家都能健康顺利的跑过终点，逝者安息。
 | [Vint](https://github.com/VintLin)                | <https://vinton.store/Running/>                | Keep        |
 | [Muyids](https://github.com/muyids)               | <https://muyids.github.io/running>             | Garmin-cn   |
 | [Gao Hao](https://github.com/efish2002)           | <https://efish2002.github.io/running_page/>    | Garmin-cn   |
-| [Jinlei](https://github.com/iamjinlei0312)        | <https://jinlei.run/>                          | AW-GPX      |
+| [Jinlei](https://github.com/iamjinlei0312)        | <https://jinlei.run/>                          | 咕咚        |
 | [Ray Wang](https://github.com/raywangsy)          | <https://run.raywang.pro/>                     | Garmin      |
 | [RealTiny656](https://github.com/tiny656)         | <https://tiny656.github.io/running_page/>      | JoyRun      |
 | [EINDEX](https://github.com/eindex)               | <https://workouts.eindex.me/>                  | Strava/Nike |
@@ -194,11 +196,10 @@ docker run -itd -p 80:80   running_page:latest
 > 如果你是海外用户请更改 `IS_CHINESE = false` in `src/utils/const.ts`
 
 ```typescript
-const MAPBOX_TOKEN ='pk.eyJ1IjoieWlob25nMDYxOCIsImEiOiJja2J3M28xbG4wYzl0MzJxZm0ya2Fua2p2In0.PNKfkeQwYuyGOTT_x9BJ4Q';
+const MAPBOX_TOKEN =
+  'pk.eyJ1IjoieWlob25nMDYxOCIsImEiOiJja2J3M28xbG4wYzl0MzJxZm0ya2Fua2p2In0.PNKfkeQwYuyGOTT_x9BJ4Q';
 ```
 
-
-
 ## 个性化设置
 
 > 在仓库目录下找到 `src/static/site-metadata.ts`，找到以下内容并修改成你自己想要的。
@@ -378,6 +379,7 @@ python3(python) run_page/joyrun_sync.py 13333xxxx xxxx
 ```
 
 joyrun 导出 gpx 文件
+
 > 导出的 gpx 在 GPX_OUT 目录，方便上传到其它软件
 
 ```bash
@@ -907,6 +909,7 @@ python3(python) run_page/gen_svg.py --from-db --type circular --use-localtime
 </details>
 
 ## GitHub Actions
+
 > Fork 的同学请一定不要忘了把 GitHub Token 改成自己的，否则会 push 到我的 repo 中，谢谢大家。
 
 <details>
@@ -964,7 +967,6 @@ curl https://api.github.com/repos/yihong0618/running_page/actions/workflows -H "
 
 </details>
 
-
 ## Github Cache
 
 <details>
@@ -1033,17 +1035,18 @@ curl https://api.github.com/repos/yihong0618/running_page/actions/workflows -H "
 
 # FAQ
 
--  Strava 100 每 15 分钟的请求，1000 每日限制
+- Strava 100 每 15 分钟的请求，1000 每日限制
 
-   <https://www.strava.com/settings/api>
+  <https://www.strava.com/settings/api>
   <https://developers.strava.com/docs/#rate-limiting>
 
-    等待时间限制（这里是 strava 接口请求限制），不要关闭终端，这里会自动执行下一组上传数据
+  等待时间限制（这里是 strava 接口请求限制），不要关闭终端，这里会自动执行下一组上传数据
+
+  ```
+  Strava API Rate Limit Exceeded. Retry after 100 seconds
+  Strava API Rate Limit Timeout. Retry in 799.491622 seconds
+  ```
 
-    ```
-    Strava API Rate Limit Exceeded. Retry after 100 seconds
-    Strava API Rate Limit Timeout. Retry in 799.491622 seconds
-    ```
 - vercel git
 
   如果想 ignpre gh-pages 可以在 `settings` -> `build` -> `Ignored Build Step` -> `Custom` 输入命令：

diff --git a/README.md b/README.md
@@ -1,13 +1,15 @@
 ## Note
+
 1. clone or Fork before vercel 404 need to pull the latest code
 2. python3(python) in README means python3 python
 3. use v2.0 need change vercel setting from gatsby to vite
 4. 2023.09.26 garmin need secret_string(and in Actions) get
+
 ```bash
   python run_page/get_garmin_secret.py ${email} ${password}
   # if cn
   python run_page/get_garmin_secret.py ${email} ${password} --is-cn
-  ```
+```
 
 <p align="center">
   <img width="150" src="https://raw.githubusercontent.com/shaonianche/gallery/master/running_page/running_page_logo.png" />
@@ -81,7 +83,7 @@ English | [简体中文](https://github.com/yihong0618/running_page/blob/master/
 | [Vint](https://github.com/VintLin)                | <https://vinton.store/Running/>                | Keep        |
 | [Muyids](https://github.com/muyids)               | <https://muyids.github.io/running>             | Garmin-cn   |
 | [Gao Hao](https://github.com/efish2002)           | <https://efish2002.github.io/running_page/>    | Garmin-cn   |
-| [Jinlei](https://github.com/iamjinlei0312)        | <https://jinlei.run/>                          | AW-GPX      |
+| [Jinlei](https://github.com/iamjinlei0312)        | <https://jinlei.run/>                          | 咕咚        |
 | [RealTiny656](https://github.com/tiny656)         | <https://tiny656.github.io/running_page/>      | JoyRun      |
 | [EINDEX](https://github.com/eindex)               | <https://workouts.eindex.me/>                  | Strava/Nike |
 | [Melt](https://github.com/fpGHwd)                 | <https://running.autove.dev/>                  | Strava      |
@@ -104,9 +106,9 @@ English | [简体中文](https://github.com/yihong0618/running_page/blob/master/
 4. Mapbox for map display
 5. Supports most sports apps such as nike strava...
 
-  > automatically backup gpx data for easy backup and uploading to other software.
+> automatically backup gpx data for easy backup and uploading to other software.
 
-  > Note: If you don't want to make the data public, you can choose strava's fuzzy processing, or private repositories.
+> Note: If you don't want to make the data public, you can choose strava's fuzzy processing, or private repositories.
 
 ## Support
 
@@ -176,7 +178,8 @@ Open your browser and visit localhost:80
 > Suggested changes to your own [Mapbox token](https://www.mapbox.com/)
 
 ```typescript
-const MAPBOX_TOKEN ='pk.eyJ1IjoieWlob25nMDYxOCIsImEiOiJja2J3M28xbG4wYzl0MzJxZm0ya2Fua2p2In0.PNKfkeQwYuyGOTT_x9BJ4Q';
+const MAPBOX_TOKEN =
+  'pk.eyJ1IjoieWlob25nMDYxOCIsImEiOiJja2J3M28xbG4wYzl0MzJxZm0ya2Fua2p2In0.PNKfkeQwYuyGOTT_x9BJ4Q';
 ```
 
 ## Custom your page
@@ -290,7 +293,7 @@ python3(python) run_page/fit_sync.py
 - If you only want `tcx` files add args --tcx
 - If you only want `fit` files add args --fit
 - If you are using Garmin as a data source, it is recommended that you pull the code to your local environment to run and obtain the Garmin secret.
-**The Python version must be >=3.8**
+  **The Python version must be >=3.8**
 
 #### Get Garmin Secret
 
@@ -335,7 +338,7 @@ python3(python) run_page/garmin_sync.py xxxxxxxxxxxxxx(secret_string) --only-run
 - If you only want `tcx` files add args --tcx
 - If you only want `fit` files add args --fit
 - If you are using Garmin as a data source, it is recommended that you pull the code to your local environment to run and obtain the Garmin secret.
-**The Python version must be >=3.10**
+  **The Python version must be >=3.10**
 
 #### Get Garmin CN Secret
 
@@ -851,17 +854,18 @@ Just enjoy it~
 
 - Strava Api limit
 
-    <https://www.strava.com/settings/api>
-    <https://developers.strava.com/docs/#rate-limiting>
+  <https://www.strava.com/settings/api>
+  <https://developers.strava.com/docs/#rate-limiting>
 
-    ```
-    Strava API Rate Limit Exceeded. Retry after 100 seconds
-    Strava API Rate Limit Timeout. Retry in 799.491622 seconds
-    ```
+  ```
+  Strava API Rate Limit Exceeded. Retry after 100 seconds
+  Strava API Rate Limit Timeout. Retry in 799.491622 seconds
+  ```
 
 - vercel git ignpre gh-pages:
 
   you can change settings -> build -> Ignored Build Step -> Custom command
+
   ```bash
   if [ "$VERCEL_GIT_COMMIT_REF" != "gh-pages" ]; then exit 1; else exit 0;
   ```
diff --git a/run_page/gpxtrackposter/github_drawer.py b/run_page/gpxtrackposter/github_drawer.py
@@ -80,7 +80,7 @@ def draw(self, dr: svgwrite.Drawing, size: XY, offset: XY):
                     f"{year}",
                     insert=offset.tuple(),
                     fill=self.poster.colors["text"],
-                    alignment_baseline="hanging",
+                    dominant_baseline="hanging",
                     style=year_style,
                 )
             )
@@ -90,7 +90,7 @@ def draw(self, dr: svgwrite.Drawing, size: XY, offset: XY):
                     f"{year_length} {km_or_mi}",
                     insert=(offset.tuple()[0] + 165, offset.tuple()[1] + 5),
                     fill=self.poster.colors["text"],
-                    alignment_baseline="hanging",
+                    dominant_baseline="hanging",
                     style=year_length_style,
                 )
             )
@@ -137,4 +137,4 @@ def draw(self, dr: svgwrite.Drawing, size: XY, offset: XY):
                     dr.add(rect)
                     github_rect_day += datetime.timedelta(1)
                 rect_x += 3.5
-            offset.y += 3.5 * 9 + year_size + 1.5
+            offset.y += 3.5 * 9 + year_size + 1.0
diff --git a/src/components/RunMap/index.tsx b/src/components/RunMap/index.tsx
@@ -1,6 +1,6 @@
 import MapboxLanguage from '@mapbox/mapbox-gl-language';
 import React, { useRef, useCallback } from 'react';
-import Map, { Layer, Source, FullscreenControl, MapRef } from 'react-map-gl';
+import Map, { Layer, Source, FullscreenControl, NavigationControl, MapRef } from 'react-map-gl';
 import useActivities from '@/hooks/useActivities';
 import {
   MAP_LAYER_LIST,
@@ -141,6 +141,7 @@ const RunMap = ({
       )}
       <span className={styles.runTitle}>{title}</span>
       <FullscreenControl style={fullscreenButton} />
+      <NavigationControl showCompass={false} position={'bottom-right'} style={{ opacity: 0.3 }} />
     </Map>
   );
 };