Skip to content

Commit

Permalink
Merge branch 'master' of github.com:nmelhado/league-page into legends…
Browse files Browse the repository at this point in the history
…-league
  • Loading branch information
nmelhado committed Aug 17, 2021
2 parents 02653ac + b326a9a commit 30014bc
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 6 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ All notable changes to this project will be documented in this file.

### Fixed

- Sleepr API increments the week value during preseason which created bugs in the rankings, managers, and matchup pages
- Sleepr API increments the week value during preseason which created bugs in the homepage, rankings, managers, and matchup pages
- Added a fix to only honor the Sleeper week during regular season
- Transactions were sometimes out of order (if a trade was recently accepted long after the original offer was sent)
- League Page now sorts the trnsaction by update time
- League Page now sorts the transaction by update time

<!-- ### Added -->
<!-- ### Fixed -->
Expand Down
19 changes: 16 additions & 3 deletions TRAINING_WHEELS.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,22 @@ Generate a custom league page for your Sleeper fantasy football league in just a
## III. Updates

- League Page is constantly being updated and improved. Check back on your repo periodically and whenever you see the `fetch update` button, click `fetch update` and commit the changes to get the upgrades
- If you first created your league before August 7th, 2021, you may encounter `merge conflicts` when trying to fetch upstream.
- In that situation, copy the contents of your managers page and your homepage text and delete your repo. Re-follow this guide and re-deploy your page.
- There should be **NO merge conflicts going forward**.
> ![fetch upstream](https://storage.googleapis.com/nfl-player-data/fetchUpstream.jpg)
<br />

- Another way to know there's an update available is if you see the following notification on your League Page:
> ![update notification](https://storage.googleapis.com/nfl-player-data/updateNotification.jpg)
<br />

- To see what's changed in the newest updates (bugs fixed, features added, etc.), check the [CHANGELOG](https://github.com/nmelhado/league-page/blob/master/CHANGELOG.md)

<br />

- **If you first created your league before August 7th, 2021**, you may encounter `merge conflicts` when trying to fetch upstream.
- In that situation (if you are new to coding), copy the contents of your managers page and your homepage text and delete your repo. Re-follow this guide and re-deploy your page.
- There should be **NO merge conflicts going forward**.


## IV. Wrapping up
Expand Down
10 changes: 9 additions & 1 deletion src/routes/index.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,15 @@
<p class="center">Retrieving NFL state...</p>
<LinearProgress indeterminate />
{:then nflStateData}
<p class="center">NFL {nflStateData.season} {nflStateData.week > 0 ? `Week ${nflStateData.week}` : "Preseason"}</p>
<p class="center">NFL {nflStateData.season}
{#if nflStateData.season_type == 'pre'}
Preseason
{:else if nflStateData.season_type == 'post'}
Postseason
{:else}
{nflStateData.week > 0 ? `Week ${nflStateData.week}` : "Preseason"}
{/if}
</p>
{:catch error}
<p class="center">Something went wrong: {error.message}</p>
{/await}
Expand Down

1 comment on commit 30014bc

@vercel
Copy link

@vercel vercel bot commented on 30014bc Aug 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.