Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: yihong0618/running_page
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: s1smart/running_page
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on Sep 22, 2023

  1. update

    s1smart committed Sep 22, 2023
    Copy the full SHA
    e5e1617 View commit details

Commits on Sep 28, 2023

  1. Sync

    s1smart committed Sep 28, 2023
    Copy the full SHA
    28196af View commit details
  2. Custom my page

    s1smart committed Sep 28, 2023
    Copy the full SHA
    fcb5a3a View commit details
  3. merge

    s1smart committed Sep 28, 2023
    Copy the full SHA
    568b9cb View commit details
  4. Merge

    s1smart committed Sep 28, 2023
    Copy the full SHA
    288dc69 View commit details
  5. update

    s1smart committed Sep 28, 2023
    Copy the full SHA
    47a6d2a View commit details

Commits on Oct 19, 2023

  1. Copy the full SHA
    d87547d View commit details

Commits on Nov 8, 2023

  1. Copy the full SHA
    ef14b69 View commit details

Commits on Nov 20, 2023

  1. Copy the full SHA
    37bd6e3 View commit details

Commits on Feb 5, 2024

  1. Copy the full SHA
    9829ac5 View commit details

Commits on Apr 26, 2024

  1. Copy the full SHA
    f231853 View commit details

Commits on May 2, 2024

  1. Update run_data_sync.yml

    s1smart committed May 2, 2024
    Copy the full SHA
    f3778c5 View commit details
  2. update new runs

    s1smart committed May 2, 2024
    Copy the full SHA
    e744560 View commit details
  3. Update gh-pages.yml

    s1smart committed May 2, 2024
    Copy the full SHA
    0997ce6 View commit details
  4. update

    s1smart committed May 2, 2024
    Copy the full SHA
    bb4e01a View commit details
  5. update

    s1smart committed May 2, 2024
    Copy the full SHA
    c13ab9a View commit details
  6. Update gh-pages.yml

    s1smart committed May 2, 2024
    Copy the full SHA
    ba4598b View commit details
  7. Update gh-pages.yml

    s1smart committed May 2, 2024
    Copy the full SHA
    0a3e8a8 View commit details

Commits on Jun 3, 2024

  1. Copy the full SHA
    801d869 View commit details
  2. Revert "update"

    This reverts commit bb4e01a.
    s1smart committed Jun 3, 2024
    Copy the full SHA
    97ec8a2 View commit details
  3. Update gh-pages.yml

    s1smart committed Jun 3, 2024
    Copy the full SHA
    b727e7b View commit details
  4. Update gh-pages.yml

    s1smart committed Jun 3, 2024
    Copy the full SHA
    7b03e0e View commit details
  5. Update run_data_sync.yml

    s1smart committed Jun 3, 2024
    Copy the full SHA
    ff8743d View commit details
  6. Update README.md

    s1smart committed Jun 3, 2024
    Copy the full SHA
    50c6412 View commit details
  7. Update index.tsx

    s1smart committed Jun 3, 2024
    Copy the full SHA
    9561955 View commit details
  8. Update const.ts

    s1smart committed Jun 3, 2024
    Copy the full SHA
    6364c02 View commit details
  9. Update gatsby-config.js

    s1smart committed Jun 3, 2024
    Copy the full SHA
    09f3970 View commit details
4 changes: 4 additions & 0 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
@@ -78,6 +78,7 @@ jobs:
- uses: pnpm/action-setup@v3
name: Install pnpm
with:

version: 8
run_install: false

@@ -101,9 +102,12 @@ jobs:

- name: Upload artifact
uses: actions/upload-pages-artifact@v3

with:
# Upload dist repository
path: './dist'
- name: Deploy to GitHub Pages
id: deployment

uses: actions/deploy-pages@v4

16 changes: 8 additions & 8 deletions .github/workflows/run_data_sync.yml
Original file line number Diff line number Diff line change
@@ -25,20 +25,20 @@ on:

env:
# please change to your own config.
RUN_TYPE: pass # support strava/nike/garmin/coros/garmin_cn/garmin_sync_cn_global/keep/only_gpx/only_fit/nike_to_strava/strava_to_garmin/tcx_to_garmin/strava_to_garmin_cn/garmin_to_strava/garmin_to_strava_cn/codoon/oppo, Please change the 'pass' it to your own
ATHLETE: yihong0618
TITLE: Yihong0618 Running
RUN_TYPE: strava # support strava/nike/garmin/garmin_cn/keep/only_gpx/only_fit/nike_to_strava/strava_to_garmin/strava_to_garmin_cn/garmin_to_strava/garmin_to_strava_cn/codoon, Please change the 'pass' it to your own
ATHLETE: 太空战士
TITLE: 太空战士
MIN_GRID_DISTANCE: 10 # change min distance here
TITLE_GRID: Over 10km Runs # also here
GITHUB_NAME: yihong0618 # change to yours
GITHUB_EMAIL: zouzou0208@gmail.com # change to yours
TITLE_GRID: 跑10公里以上 #Over 10km Runs
GITHUB_NAME: s1smart # change to yours
GITHUB_EMAIL: yishenhk@gmail.com # change to yours

# IGNORE_BEFORE_SAVING: True # if you want to ignore some data before saving, set this to True
IGNORE_START_END_RANGE: 10 # Unit meter
# Dont making this huge, just picking points you needing. https://developers.google.com/maps/documentation/utilities/polylineutility using this tool to making your polyline
IGNORE_POLYLINE: 'ktjrFoemeU~IorGq}DeB'
IGNORE_RANGE: 10 # Unit meter
SAVE_DATA_IN_GITHUB_CACHE: false # if you deploy in the vercal, check the README
SAVE_DATA_IN_GITHUB_CACHE: true # if you deploy in the vercal, check the README
DATA_CACHE_PREFIX: 'track_data'
BUILD_GH_PAGES: true # If you do not need GitHub Page please set it to `false`

@@ -234,4 +234,4 @@ jobs:
save_data_in_github_cache: ${{needs.sync.outputs.SAVE_DATA_IN_GITHUB_CACHE == 'true'}}
data_cache_prefix: ${{needs.sync.outputs.DATA_CACHE_PREFIX}}
needs:
- sync
- sync
2 changes: 1 addition & 1 deletion assets/github.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/github_2024.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/grid.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/year_2019.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/year_2020.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/year_2021.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/year_2022.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/year_2023.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/year_2024.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file added gatsby-config.js
Empty file.
Empty file modified run_page/codoon_sync.py
100755 → 100644
Empty file.
Binary file added run_page/data.db
Binary file not shown.
Empty file modified run_page/fit_sync.py
100755 → 100644
Empty file.
Empty file modified run_page/garmin_sync.py
100755 → 100644
Empty file.
Empty file modified run_page/gen_svg.py
100755 → 100644
Empty file.
Empty file modified run_page/gpx_sync.py
100755 → 100644
Empty file.
Empty file modified run_page/joyrun_sync.py
100755 → 100644
Empty file.
Empty file modified run_page/keep_sync.py
100755 → 100644
Empty file.
Empty file modified run_page/nike_to_strava_sync.py
100755 → 100644
Empty file.
Empty file modified run_page/strava_sync.py
100755 → 100644
Empty file.
Empty file modified run_page/tcx_sync.py
100755 → 100644
Empty file.
Empty file modified run_page/tcx_to_strava_sync.py
100755 → 100644
Empty file.
Empty file modified run_page/tulipsport_sync.py
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion src/static/activities.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/static/site-metadata.ts
Original file line number Diff line number Diff line change
@@ -10,18 +10,18 @@ interface ISiteMetadataResult {
}

const data: ISiteMetadataResult = {
siteTitle: 'Running Page',
siteUrl: 'https://yihong.run',
logo: 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQTtc69JxHNcmN1ETpMUX4dozAgAN6iPjWalQ&usqp=CAU',
siteTitle: '太空战士',
siteUrl: 'https://s1smart.github.io/running_page',
logo: 'https://dgalywyr863hv.cloudfront.net/pictures/clubs/1115150/26570966/1/medium.jpg',
description: 'Personal site and blog',
navLinks: [
{
name: 'Blog',
url: 'https://github.com/yihong0618/gitblog',
url: 'https://github.com/s1smart',
},
{
name: 'About',
url: 'https://github.com/yihong0618/running_page/blob/master/README-CN.md',
url: 'https://github.com/s1smart/running_page',
},
],
};
8 changes: 3 additions & 5 deletions src/utils/const.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
// const
const MAPBOX_TOKEN =
// For security reasons, please avoid using the default public token provided by Mapbox as much as possible.
// Instead, manually add a new token and apply URL restrictions.
// (please refer to https://github.com/yihong0618/running_page/issues/643#issuecomment-2042668580)
'pk.eyJ1IjoieWlob25nMDYxOCIsImEiOiJja2J3M28xbG4wYzl0MzJxZm0ya2Fua2p2In0.PNKfkeQwYuyGOTT_x9BJ4Q';
'pk.eyJ1Ijoic2FtaGswMDkiLCJhIjoiY2xtZm9iZm5qMjNlYjNkbzVxang2YWtuNyJ9.CEuWiutcW26sf68TTN_rTA';
//'pk.eyJ1Ijoic2FtaGswMDkiLCJhIjoiY2xtazNzZ2F4MDl1dzJzbXB3cGh1NXVwMCJ9.xWcdqUYiIxZT6E9o7CM07w';

const MUNICIPALITY_CITIES_ARR = [
'北京市',
'上海市',
@@ -97,7 +96,6 @@ export {
LIGHTS_ON,
};

const nike = 'rgb(224,237,94)'; // if you want change the main color change here src/styles/variables.scss
const dark_vanilla = 'rgb(228,212,220)';

// If your map has an offset please change this line