Skip to content

Commit

Permalink
Fix Navigate Realmroots phase, bump dependencies, bump package.json v…
Browse files Browse the repository at this point in the history
…ersion
  • Loading branch information
daviseford committed Apr 7, 2022
1 parent d6f18af commit 3868950
Show file tree
Hide file tree
Showing 4 changed files with 109 additions and 104 deletions.
36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "aos-reminders",
"version": "5.1.9",
"version": "5.1.10",
"private": true,
"homepage": "./",
"dependencies": {
"@auth0/auth0-react": "1.9.0",
"@reduxjs/toolkit": "1.8.0",
"@stripe/react-stripe-js": "1.7.0",
"@stripe/stripe-js": "1.24.0",
"@reduxjs/toolkit": "1.8.1",
"@stripe/react-stripe-js": "1.7.1",
"@stripe/stripe-js": "1.27.0",
"bootstrap": "4.6.0",
"core-js": "3.21.1",
"deepmerge": "4.2.2",
Expand All @@ -27,15 +27,15 @@
"react-ga": "3.3.0",
"react-icons": "4.3.1",
"react-modal": "3.14.4",
"react-redux": "7.2.6",
"react-redux": "7.2.8",
"react-router-dom": "5.3.0",
"react-scripts": "4.0.3",
"react-select": "5.2.2",
"react-switch": "6.0.0",
"redux": "4.1.2",
"redux-persist": "6.0.0",
"string.prototype.matchall": "4.0.6",
"superagent": "7.1.1"
"string.prototype.matchall": "4.0.7",
"superagent": "7.1.2"
},
"scripts": {
"analyze": "source-map-explorer 'build/static/js/*.js'",
Expand Down Expand Up @@ -84,37 +84,37 @@
"devDependencies": {
"@types/jest": "26.0.23",
"@types/jspdf": "1.3.3",
"@types/lodash": "4.14.179",
"@types/luxon": "2.3.0",
"@types/lodash": "4.14.181",
"@types/luxon": "2.3.1",
"@types/node": "17.0.21",
"@types/parse5": "6.0.3",
"@types/pdfjs-dist": "2.7.1",
"@types/qs": "6.9.7",
"@types/react": "17.0.40",
"@types/react": "17.0.43",
"@types/react-beautiful-dnd": "13.1.2",
"@types/react-copy-to-clipboard": "5.0.2",
"@types/react-dom": "17.0.13",
"@types/react-dom": "17.0.14",
"@types/react-modal": "3.13.1",
"@types/react-redux": "7.1.23",
"@types/react-router-dom": "5.3.2",
"@types/superagent": "4.1.15",
"@types/webpack-env": "1.16.3",
"babel-jest": "26.6.3",
"husky": "4.3.8",
"prettier": "2.5.1",
"prettier": "2.6.2",
"prettier-plugin-organize-imports": "2.3.4",
"pretty-quick": "3.1.3",
"react-app-rewired": "2.1.11",
"replace-in-file": "6.3.2",
"source-map-explorer": "2.5.2",
"ts-node-dev": "1.1.8",
"tsconfig-paths": "3.13.0",
"typescript": "4.6.2",
"workbox-core": "6.5.1",
"workbox-expiration": "6.5.1",
"workbox-precaching": "6.5.1",
"workbox-routing": "6.5.1",
"workbox-strategies": "6.5.1",
"typescript": "4.6.3",
"workbox-core": "6.5.2",
"workbox-expiration": "6.5.2",
"workbox-precaching": "6.5.2",
"workbox-routing": "6.5.2",
"workbox-strategies": "6.5.2",
"xlsx": "0.17.5"
}
}
6 changes: 3 additions & 3 deletions src/components/routes/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import React, { lazy, Suspense, useEffect } from 'react'
import { logPageView } from 'utils/analytics'

const AlliedArmies = lazy(() => import('components/input/ally_armies'))
const AppBanner = lazy(() => import('components/info/banners/app_banner'))
// const AppBanner = lazy(() => import('components/info/banners/app_banner'))
const ArmyBuilder = lazy(() => import('components/input/army_builder'))
const FooterComponent = lazy(() => import('components/page/footer'))
const LoadedArmyHeader = lazy(() => import('components/input/savedArmies/loaded_army_header'))
Expand All @@ -34,9 +34,9 @@ const Home = () => {
<div className={theme.bgColor}>
<Header />

<Suspense fallback={<></>}>
{/* <Suspense fallback={<></>}>
<AppBanner />
</Suspense>
</Suspense> */}

<Suspense fallback={<></>}>
<UpdateBanner />
Expand Down
6 changes: 3 additions & 3 deletions src/factions/sylvaneth/battle_traits.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { tagAs } from 'factions/metatagger'
import { SYLVANETH } from 'meta/factions'
import { BATTLESHOCK_PHASE, DURING_SETUP, END_OF_MOVEMENT_PHASE } from 'types/phases'
import { BATTLESHOCK_PHASE, DURING_SETUP, END_OF_MOVEMENT_PHASE, MOVEMENT_PHASE } from 'types/phases'
import rule_sources from './rule_sources'

const BattleTraits = {
Expand Down Expand Up @@ -28,8 +28,8 @@ const BattleTraits = {
},
{
name: `Navigate Realmroots`,
desc: `Instead of making a normal move in your movement phase, 1 friendly SYLVANETH unit wholly within 6" of an Awakened Wyldwood can navigate the realmroots. If it does so, remove that unit from the battlefield and then set it up again wholly within 6" of another Awakened Wyldwood and more than 9" from any enemy units.`,
when: [END_OF_MOVEMENT_PHASE],
desc: `Instead of making a normal move in your movement phase, 1 friendly SYLVANETH unit wholly within 6" of an AWAKENED WYLDWOOD can navigate the realmroots. If it does so, remove that unit from the battlefield and then set it up again wholly within 6" of another AWAKENED WYLDWOOD and more than 9" from any enemy units.`,
when: [MOVEMENT_PHASE],
rule_sources: [rule_sources.ERRATA_SEPTEMBER_2021],
},
],
Expand Down
Loading

0 comments on commit 3868950

Please sign in to comment.