diff --git a/.circleci/config.yml b/.circleci/config.yml index 99bd8bd3..da91245d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,10 +1,10 @@ version: 2.1 orbs: - browser-tools: circleci/browser-tools@1.4.2 + browser-tools: circleci/browser-tools@1.4.6 jobs: build: docker: - - image: cimg/node:16.19.1-browsers + - image: cimg/node:18.17.1-browsers working_directory: ~/doc-it-dev environment: - MASTER_BRANCH: master diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml index 09f1cc0f..dc6b452c 100644 --- a/.github/workflows/firebase-hosting-pull-request.yml +++ b/.github/workflows/firebase-hosting-pull-request.yml @@ -7,20 +7,10 @@ jobs: build_and_preview: if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}' runs-on: ubuntu-latest - strategy: - matrix: - node-version: [14.19.0] steps: - uses: actions/checkout@v2 - - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 - - with: - node-version: ${{ matrix.node-version }} - - run: yarn && yarn build - - uses: FirebaseExtended/action-hosting-deploy@v0 + - uses: emclaug2/action-hosting-deploy@main with: repoToken: '${{ secrets.GITHUB_TOKEN }}' firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_BLUI_DOC_IT }}' diff --git a/src/__configuration__/themes/_schedule.ts b/src/__configuration__/themes/_schedule.ts index ceaf43df..fc44c997 100644 --- a/src/__configuration__/themes/_schedule.ts +++ b/src/__configuration__/themes/_schedule.ts @@ -22,21 +22,21 @@ import { ValentineSchedule } from './valentine-s-day'; * Add more holiday themes here. * * Current schedules: - * * Feb 9 - Feb 13 2023: Spring Festival (changes each year) ** Feb 9 - Feb 15 2024 ** + * * Feb 6 - Feb 12: Spring Festival (changes each year) * * Feb 13 - Feb 15: Valentine's Day * * Mar 7 - Mar 9: Women's Day * * Mar 16 - Mar 18: St. Patrick's Day * * Apr 1: April Fool's Day * * Apr 20 - Apr 24: Earth Day * * May 3 - May 5: May the Fourth Day - * * July 2 - July 7: Independence Day - * * Sept 29 - Oct 6 2023: Mid Autumn Festival (changes each year) - * * Oct 25 - Nov 1: Halloween - * * Nov 12 - Nov 16 2023: Diwali (changes each year) - * * Nov 21 - Nov 27: Thanksgiving (changes each year) - * * Dec 7 - Dec 15: Hanukkah (changes each year) - * * Dec 23 - Dec 26: Christmas - * * Dec 26 - Dec 30: Kwanzaa (Kwanzaa runs until Jan 1. Cutting this short to account for New Years.) + * * July 1 - July 7: Independence Day + * * Sept 12 - Sept 18: Mid Autumn Festival (changes each year) + * * Oct 24 - Oct 30: Halloween + * * Nov 1 - Nov 7: Diwali (changes each year) + * * Nov 22 - Nov 29: Thanksgiving (changes each year) + * * Dec 19 - Dec 25: Christmas + * * Dec 26 - Dec 28: Hanukkah (changes each year) + * * Dec 29 - Dec 30: Kwanzaa (Kwanzaa runs until Jan 1. Cutting this short to account for New Years.) * * Dec 31 - Jan 6: New Years */ export const schedule: Schedule[] = [ diff --git a/src/__configuration__/themes/christmas.ts b/src/__configuration__/themes/christmas.ts index 79a6df0e..a2a12304 100644 --- a/src/__configuration__/themes/christmas.ts +++ b/src/__configuration__/themes/christmas.ts @@ -6,8 +6,8 @@ import AppBarTile from '../../app/assets/themes/christmas/christmas-appbar-tile. import { Schedule } from './_types'; export const ChristmasSchedule: Schedule = { - start: new Date(0, 11, 23), // Dec 23 - end: new Date(0, 11, 26), // Dec 26 + start: new Date(0, 11, 19), // Dec 19 + end: new Date(0, 11, 26), // Dec 25 config: { theme: { ...BLUIThemes.blue, diff --git a/src/__configuration__/themes/diwali.ts b/src/__configuration__/themes/diwali.ts index 12e58fb0..f5f7082f 100644 --- a/src/__configuration__/themes/diwali.ts +++ b/src/__configuration__/themes/diwali.ts @@ -7,8 +7,8 @@ import AppBarTile from '../../app/assets/themes/diwali/diwali-appbar-tile.png'; import { Schedule } from './_types'; export const DiwaliSchedule: Schedule = { - start: new Date(0, 10, 12), // Nov 12 - end: new Date(0, 10, 17), // Nov 16 + start: new Date(0, 10, 1), // Nov 1 + end: new Date(0, 10, 8), // Nov 7 config: { theme: { ...BLUIThemes.blue, diff --git a/src/__configuration__/themes/halloween.ts b/src/__configuration__/themes/halloween.ts index 929415be..e7c8c16d 100644 --- a/src/__configuration__/themes/halloween.ts +++ b/src/__configuration__/themes/halloween.ts @@ -90,8 +90,8 @@ const HalloweenTheme: ThemeOptions = { }; export const HalloweenSchedule: Schedule = { - start: new Date(0, 9, 25), // Oct 25 - end: new Date(0, 10, 2), // Nov 1 + start: new Date(0, 9, 24), // Oct 24 + end: new Date(0, 10, 1), // Oct 30 config: { theme: HalloweenTheme, landingPageBanner: { diff --git a/src/__configuration__/themes/hanukkah.ts b/src/__configuration__/themes/hanukkah.ts index 8be80b2c..068c4106 100644 --- a/src/__configuration__/themes/hanukkah.ts +++ b/src/__configuration__/themes/hanukkah.ts @@ -7,8 +7,8 @@ import AppBarTile from '../../app/assets/themes/hanukkah/hanukkah-appbar-tile.pn import { Schedule } from './_types'; export const HanukkahSchedule: Schedule = { - start: new Date(0, 11, 7), // Dec 7 - end: new Date(0, 11, 16), // Dec 15 + start: new Date(0, 11, 26), // Dec 26 + end: new Date(0, 11, 29), // Dec 28 config: { theme: { ...BLUIThemes.blue, diff --git a/src/__configuration__/themes/independence-day.ts b/src/__configuration__/themes/independence-day.ts index 44304726..887ae7ca 100644 --- a/src/__configuration__/themes/independence-day.ts +++ b/src/__configuration__/themes/independence-day.ts @@ -7,7 +7,7 @@ import AppBarTile from '../../app/assets/themes/independence-day/independence-da import { Schedule } from './_types'; export const IndependenceDaySchedule: Schedule = { - start: new Date(0, 6, 2), // July 2 + start: new Date(0, 6, 1), // July 1 end: new Date(0, 6, 8), // July 7 config: { theme: { diff --git a/src/__configuration__/themes/kwanzaa.ts b/src/__configuration__/themes/kwanzaa.ts index 357264c4..78d12296 100644 --- a/src/__configuration__/themes/kwanzaa.ts +++ b/src/__configuration__/themes/kwanzaa.ts @@ -8,7 +8,7 @@ import AppBarTile from '../../app/assets/themes/kwanzaa/kwanzaa-appbar-tile.png' import { Schedule } from './_types'; export const KwanzaaSchedule: Schedule = { - start: new Date(0, 11, 26), // Dec 26 + start: new Date(0, 11, 29), // Dec 29 end: new Date(0, 11, 31), // Dec 30 - festival should run until Jan 1, but we cut this off on early to account for New Years theme config: { theme: { diff --git a/src/__configuration__/themes/mid-autumn-festival.ts b/src/__configuration__/themes/mid-autumn-festival.ts index 90fad3df..3d0da46a 100644 --- a/src/__configuration__/themes/mid-autumn-festival.ts +++ b/src/__configuration__/themes/mid-autumn-festival.ts @@ -8,8 +8,8 @@ import AppBarTile from '../../app/assets/themes/mid-autumn-festival/app-bar.png' import { Schedule } from './_types'; export const MidAutumnSchedule: Schedule = { - start: new Date(0, 8, 29), // Sept 29 - end: new Date(0, 9, 7), // Oct 6 + start: new Date(0, 8, 12), // Sept 12 + end: new Date(0, 8, 19), // Sept 18 config: { theme: { ...BLUIThemes.blueDark, diff --git a/src/__configuration__/themes/spring-festival.ts b/src/__configuration__/themes/spring-festival.ts index 568d3c1d..3be22d3d 100644 --- a/src/__configuration__/themes/spring-festival.ts +++ b/src/__configuration__/themes/spring-festival.ts @@ -7,7 +7,7 @@ import AppBarTile from '../../app/assets/themes/spring-festival/tile.svg'; import { Schedule } from './_types'; export const SpringFestivalSchedule: Schedule = { - start: new Date(0, 1, 9), // Feb 9 + start: new Date(0, 1, 6), // Feb 6 end: new Date(0, 1, 13), // Feb 12 config: { theme: { diff --git a/src/__configuration__/themes/thanksgiving.ts b/src/__configuration__/themes/thanksgiving.ts index 4c3da851..a1097ff7 100644 --- a/src/__configuration__/themes/thanksgiving.ts +++ b/src/__configuration__/themes/thanksgiving.ts @@ -7,8 +7,8 @@ import AppBarTile from '../../app/assets/themes/thanksgiving/thanksgiving-appbar import { Schedule } from './_types'; export const ThanksgivingSchedule: Schedule = { - start: new Date(0, 10, 21), // Nov 21 - end: new Date(0, 10, 28), // Nov 27 + start: new Date(0, 10, 22), // Nov 22 + end: new Date(0, 10, 30), // Nov 29 config: { theme: { ...BLUIThemes.blue,