Merge branch 'stage' into prod

.github/workflows/deploy-audio.yml

@@ -37,7 +37,7 @@ jobs:
         working-directory: ops/deploy/creds
       - run: mkdir media
       - name: Sync from cloud
-        run: aws s3 sync s3://sabbath-school-resources-media`[[ "${{ steps.extract_branch.outputs.branch }}" = "stage" ]] && echo '-stage'`.adventech.io media --region us-east-1 --no-progress --exclude "*" --include "audio/*/ss/`node --input-type=module -e 'import {getPreviousQuarter} from "./ops/helpers/helpers.js"; console.log(getPreviousQuarter())'`*/*.keep" --include "audio/*/ss/`node --input-type=module -e 'import {getCurrentQuarter} from "./ops/helpers/helpers.js"; console.log(getCurrentQuarter())'`*/*.keep" --include "audio/*/ss/`node --input-type=module -e 'import {getNextQuarter} from "./ops/helpers/helpers.js"; console.log(getNextQuarter())'`*/*.keep" --include "audio/*/aij/*/*.keep" --include "audio/*/devo/*/*.keep" --include "audio/*/pm/*/*.keep"
+        run: aws s3 sync s3://sabbath-school-resources-media`[[ "${{ steps.extract_branch.outputs.branch }}" = "stage" ]] && echo '-stage'`.adventech.io media --region us-east-1 --no-progress --exclude "*" --include "audio/*/ss/`node --input-type=module -e 'import {getPreviousQuarter} from "./ops/helpers/helpers.js"; console.log(getPreviousQuarter())'`*/*.keep" --include "audio/*/ss/`node --input-type=module -e 'import {getCurrentQuarter} from "./ops/helpers/helpers.js"; console.log(getCurrentQuarter())'`*/*.keep" --include "audio/*/ss/`node --input-type=module -e 'import {getNextQuarter} from "./ops/helpers/helpers.js"; console.log(getNextQuarter())'`*/*.keep" --include "audio/*/aij/*/*.keep" --include "audio/*/devo/*/*.keep" --include "audio/*/pm/*/*.keep" --include "audio/*/explore/*/*.keep"
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/deploy-pdf.yml

@@ -37,7 +37,7 @@ jobs:
         working-directory: ops/deploy/creds
       - run: mkdir media
       - name: Sync from cloud
-        run: aws s3 sync s3://sabbath-school-resources-media`[[ "${{ steps.extract_branch.outputs.branch }}" = "stage" ]] && echo '-stage'`.adventech.io media --region us-east-1 --no-progress --exclude "*" --include "pdf/*/ss/`node --input-type=module -e 'import {getPreviousQuarter} from "./ops/helpers/helpers.js"; console.log(getPreviousQuarter())'`*/*.keep" --include "pdf/*/ss/`node --input-type=module -e 'import {getCurrentQuarter} from "./ops/helpers/helpers.js"; console.log(getCurrentQuarter())'`*/*.keep" --include "pdf/*/ss/`node --input-type=module -e 'import {getNextQuarter} from "./ops/helpers/helpers.js"; console.log(getNextQuarter())'`*/*.keep" --include "pdf/*/aij/*/*.keep" --include "pdf/*/devo/*/*.keep" --include "pdf/*/pm/*/*.keep"
+        run: aws s3 sync s3://sabbath-school-resources-media`[[ "${{ steps.extract_branch.outputs.branch }}" = "stage" ]] && echo '-stage'`.adventech.io media --region us-east-1 --no-progress --exclude "*" --include "pdf/*/ss/`node --input-type=module -e 'import {getPreviousQuarter} from "./ops/helpers/helpers.js"; console.log(getPreviousQuarter())'`*/*.keep" --include "pdf/*/ss/`node --input-type=module -e 'import {getCurrentQuarter} from "./ops/helpers/helpers.js"; console.log(getCurrentQuarter())'`*/*.keep" --include "pdf/*/ss/`node --input-type=module -e 'import {getNextQuarter} from "./ops/helpers/helpers.js"; console.log(getNextQuarter())'`*/*.keep" --include "pdf/*/aij/*/*.keep" --include "pdf/*/devo/*/*.keep" --include "pdf/*/pm/*/*.keep" --include "pdf/*/explore/*/*.keep"
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/deploy-video.yml

@@ -37,7 +37,7 @@ jobs:
         working-directory: ops/deploy/creds
       - run: mkdir media
       - name: Sync from cloud
-        run: aws s3 sync s3://sabbath-school-resources-media`[[ "${{ steps.extract_branch.outputs.branch }}" = "stage" ]] && echo '-stage'`.adventech.io media --region us-east-1 --no-progress --exclude "*" --include "video/*/ss/`node --input-type=module -e 'import {getPreviousQuarter} from "./ops/helpers/helpers.js"; console.log(getPreviousQuarter())'`*/*.keep" --include "video/*/ss/`node --input-type=module -e 'import {getCurrentQuarter} from "./ops/helpers/helpers.js"; console.log(getCurrentQuarter())'`*/*.keep" --include "video/*/ss/`node --input-type=module -e 'import {getNextQuarter} from "./ops/helpers/helpers.js"; console.log(getNextQuarter())'`*/*.keep" --include "video/*/aij/*/*.keep" --include "video/*/devo/*/*.keep" --include "video/*/pm/*/*.keep"
+        run: aws s3 sync s3://sabbath-school-resources-media`[[ "${{ steps.extract_branch.outputs.branch }}" = "stage" ]] && echo '-stage'`.adventech.io media --region us-east-1 --no-progress --exclude "*" --include "video/*/ss/`node --input-type=module -e 'import {getPreviousQuarter} from "./ops/helpers/helpers.js"; console.log(getPreviousQuarter())'`*/*.keep" --include "video/*/ss/`node --input-type=module -e 'import {getCurrentQuarter} from "./ops/helpers/helpers.js"; console.log(getCurrentQuarter())'`*/*.keep" --include "video/*/ss/`node --input-type=module -e 'import {getNextQuarter} from "./ops/helpers/helpers.js"; console.log(getNextQuarter())'`*/*.keep" --include "video/*/aij/*/*.keep" --include "video/*/devo/*/*.keep" --include "video/*/pm/*/*.keep" --include "video/*/explore/*/*.keep"
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

ops/deploy/deploy-resources.js

@@ -228,6 +228,19 @@ let getResourceFeed = async function (resource) {
     return yaml.load(fs.readFileSync(resource, "utf8"))
 }
 
+let sortResourcesByPattern = function (resources, resourceIds) {
+    return resources.sort((a, b) => {
+        const indexA = resourceIds.findIndex((pattern) =>
+            picomatch(pattern)(a.id)
+        );
+        const indexB = resourceIds.findIndex((pattern) =>
+            picomatch(pattern)(b.id)
+        );
+        return indexA - indexB;
+    });
+}
+
+
 let processResources = async function (languageGlob, resourceType, resourceGlob) {
     const languages = new fdir()
         .withBasePath()
@@ -309,22 +322,16 @@ let processResources = async function (languageGlob, resourceType, resourceGlob)
 
                 if (groupByName) {
                     groupByName.resources.push(resourceInfo)
-
-                    groupByName.resources.sort((a, b) => {
-                        const indexA = groupByName.resourceIds.findIndex((pattern) =>
-                            picomatch(pattern)(a.id)
-                        )
-                        const indexB = groupByName.resourceIds.findIndex((pattern) =>
-                            picomatch(pattern)(b.id)
-                        );
-                        return indexA - indexB
-                    });
+                    groupByName.resources = sortResourcesByPattern(groupByName.resources, groupByName.resourceIds)
                 } else if (groupByAuthor) {
                     groupByAuthor.resources.push(resourceInfo)
+                    groupByAuthor.resources = sortResourcesByPattern(groupByAuthor.resources, groupByAuthor.resourceIds)
                 } else if (groupByKind) {
                     groupByKind.resources.push(resourceInfo)
+                    groupByKind.resources = sortResourcesByPattern(groupByKind.resources, groupByKind.resourceIds)
                 } else if (groupByType) {
                     groupByType.resources.push(resourceInfo)
+                    groupByType.resources = sortResourcesByPattern(groupByType.resources, groupByType.resourceIds)
                 }
 
                 await database.collection(FIREBASE_DATABASE_RESOURCES).doc(resourceInfo.id).set(resourceInfo);

ops/deploy/deploy-sections.js

@@ -84,7 +84,7 @@ let processSections = async function (language, resourceType, resourceGlob) {
                 name: SECTION_DEFAULT_NAME,
                 title: languageInfo.sections?.default || SECTION_DEFAULT_NAME,
                 isRoot: true,
-                displaySequence: resourcePathInfo.type === RESOURCE_TYPE.SS,
+                displaySequence: resourceInfo.displaySequence ?? (resourcePathInfo.type === RESOURCE_TYPE.SS),
                 documents: await processSection(resourceInfo, `${resourceContentPath}`)
             }
         }
@@ -116,7 +116,7 @@ let processSections = async function (language, resourceType, resourceGlob) {
                 name: SECTION_DEFAULT_NAME,
                 title: languageInfo.sections?.default || SECTION_DEFAULT_NAME,
                 isRoot: true,
-                displaySequence: resourcePathInfo.type === RESOURCE_TYPE.SS,
+                displaySequence: resourceInfo.displaySequence ?? (resourcePathInfo.type === RESOURCE_TYPE.SS),
                 documents,
             }]
         }

ops/helpers/constants.js

@@ -24,6 +24,7 @@ export const RESOURCE_TYPE = {
     PM: "pm",
     AIJ: "aij",
     SS: "ss",
+    EXPLORE: "explore",
 }
 export const RESOURCE_COLOR_PRIMARY = "#d8d8d8"
 export const RESOURCE_COLOR_PRIMARY_DARK = "#949494"

src/en/aij/2025-00-bb-pb/00-introduction/00-introduction.md

@@ -19,7 +19,7 @@ What a great responsibility it is to raise a child! In both the joyful and exhau
 _(Isaiah 41:10)_.
 
 {"style": {"text": {"align": "center"}}}
-This is a journey that you don’t walk alone. The days can feel long, but the years are indeed short. “More than human wisdom is needed by parents at every step, that they may understand how best to educate their children for a useful, happy life here, and for higher service and greater joy hereafter” (Ellen G. White, _Child Guidance_, p. 21). May this small resource give you some personal and practical tools to help build your baby into a man or woman of God. May you establish good routines in your home—a “good ground” (Matthew 13:8) so that the seeds from God’s Word that you plant may eventually flourish. As a child, may they have deep roots because they are planted by the river of water (Psalm 1:3), and as they grow older, wings that can soar to where God calls them (Isaiah 40:31).
+This is a journey that you don’t walk alone. The days can feel long, but the years are indeed short. “More than human wisdom is needed by parents at every step, that they may understand how best to educate their children for a useful, happy life here, and for higher service and greater joy hereafter” (Ellen G. White, ^[Child Guidance]({"style": {"text": {"typeface": "PTSans-Italic"}}}), p. 21). May this small resource give you some personal and practical tools to help build your baby into a man or woman of God. May you establish good routines in your home—a “good ground” (Matthew 13:8) so that the seeds from God’s Word that you plant may eventually flourish. As a child, may they have deep roots because they are planted by the river of water (Psalm 1:3), and as they grow older, wings that can soar to where God calls them (Isaiah 40:31).
 
 `For now, take a moment to pause to pray over your baby. You might like to write your prayer here . . .`
 

src/en/aij/2025-00-bb-pb/02-your-baby/02-your-baby.md

@@ -31,13 +31,13 @@ If you ever thought that babies are too young to learn about Jesus, these stagge
 
 What an honor to be able to share God’s love with your precious baby. Now is also the time to establish spiritual routines and habits that will help form their character. We are told, “Train up a child in the way he should go, and when he is old he will not depart from it” (Proverbs 22:6). The training and nurture you provide, both when your baby is at home and when you’re out and about, will have eternal implications. Your child will have the opportunity to choose God as their forever friend and be part of His plans for their lives. There could be no greater work.
 
-An important message is this: **It is never too early to begin this work**. “John the Baptist was filled with the Holy Spirit from his birth. If we live in communion with God, we too may expect the divine Spirit to mold our little ones, even from their earliest moments” (Ellen G. White, _The Adventist Home_, p. 274).
+An important message is this: **It is never too early to begin this work**. “John the Baptist was filled with the Holy Spirit from his birth. If we live in communion with God, we too may expect the divine Spirit to mold our little ones, even from their earliest moments” (Ellen G. White, ^[The Adventist Home]({"style": {"text": {"typeface": "PTSans-Italic"}}}), p. 274).
 
 You have been given one of the highest and noblest duties—to lead your baby into a loving relationship with Jesus. This can start now.
 
 Whether you’re feeling relaxed about parenting or if you’re overwhelmed by the responsibility, the _Baby Steps_ Curriculum is created to provide you with information, ideas, resources, and prayer prompts to help you.
 
-But perhaps most important, remember that you are not alone in this journey. Jesus shares the love and burden of raising your baby. In fact, your baby is actually on loan from Him. He wants to equip and guide you in this special responsibility of parenthood. He wants to see your family happy and fulfilled. He is ready to help you. Speak to Him, ask Him for wisdom, and let Him guide you each day. Remember: “The God of heaven marks your solicitude, your earnest work, your constant watchfulness. He hears your prayers. With patience and tenderness train your children for the Lord. All heaven is interested in your work. . . . God will unite with you, crowning your efforts with success” (Ellen G. White, _The Adventist Home_, p. 205).
+But perhaps most important, remember that you are not alone in this journey. Jesus shares the love and burden of raising your baby. In fact, your baby is actually on loan from Him. He wants to equip and guide you in this special responsibility of parenthood. He wants to see your family happy and fulfilled. He is ready to help you. Speak to Him, ask Him for wisdom, and let Him guide you each day. Remember: “The God of heaven marks your solicitude, your earnest work, your constant watchfulness. He hears your prayers. With patience and tenderness train your children for the Lord. All heaven is interested in your work. . . . God will unite with you, crowning your efforts with success” (Ellen G. White, ^[The Adventist Home]({"style": {"text": {"typeface": "PTSans-Italic"}}}), p. 205).
 
 {"style":{"text":{"color":"#bf9648", "typeface": "BaskervilleBT-Roman"}}}
 ^[“After [you] have done the best [you] can do for the good of [your] children, [you] may bring them to Jesus. Even the babes in the mother’s arms are precious in His sight”]({"style": {"text": {"typeface": "BaskervilleBT-BoldItalic"}}}) _(Ellen G. White_, The Adventist Home, _p. 274)_.

src/en/aij/2025-00-bb-pb/03-how-to-use-this-parent-book/03-how-to-use-this-parent-book.md

@@ -34,7 +34,7 @@ There is godly wisdom, interesting facts, and well-researched information to con
 {"style":{"text":{"color":"#bf9648", "typeface": "PTSans-Bold"}}}
 **Tips**
 
-As you talk to other parents, read, and learn new ideas and strategies, you’ll discover there’s an endless sea of parenting advice out there! How do you choose what to implement and what to disregard? This curriculum seeks to offer ideas from a biblical worldview, with a special focus on character development. We’re told, “Character building is the most important work ever entrusted to human beings; and never before was its diligent study so important as now” (Ellen G. White, _Education_, p. 225). This curriculum can’t cover everything, but it can be a place for you to start.
+As you talk to other parents, read, and learn new ideas and strategies, you’ll discover there’s an endless sea of parenting advice out there! How do you choose what to implement and what to disregard? This curriculum seeks to offer ideas from a biblical worldview, with a special focus on character development. We’re told, “Character building is the most important work ever entrusted to human beings; and never before was its diligent study so important as now” (Ellen G. White, ^[Education]({"style": {"text": {"typeface": "PTSans-Italic"}}}), p. 225). This curriculum can’t cover everything, but it can be a place for you to start.
 
 ### ^[Part 2—The Sabbath School Program]({"style": {"text": {"color": "#a65726", "size": "xl", "typeface": "BaskervilleBT-Bold"}}})
 

src/en/aij/2025-00-bb-pb/part-1/03-the-foundation-for-spiritual-growth/04-trust.md

@@ -12,7 +12,7 @@ style:
 
 The love you express to your baby also serves to teach trust. Unlike many baby animals, your baby has many needs and cannot survive unless they are cared for. As your baby grows, they need to trust that they will receive what they need. As with love, your little one will learn to trust you as you keep them clean and fed, and when you listen to them. As your baby grows, they will need to be reassured through your actions that you say what you mean and you mean what you say; that you will honor promises and follow through with consequences for behavior. Your little one needs to know that you can be counted on.
 
-As parents, we sometimes fail, and we often fall short. We forget, and sometimes things don’t turn out the way we hoped or planned. When love exists, our children will forgive us. When your children can trust you, you “are building trust in them about God, who truly never fails His children” (Donna Habenicht, _How to Help Your Child Really Love Jesus_, p. 17).
+As parents, we sometimes fail, and we often fall short. We forget, and sometimes things don’t turn out the way we hoped or planned. When love exists, our children will forgive us. When your children can trust you, you “are building trust in them about God, who truly never fails His children” (Donna Habenicht, ^[How to Help Your Child Really Love Jesus]({"style": {"text": {"typeface": "PTSans-Italic"}}}), p. 17).
 
 {"style":{"text":{"color": "#bf9648", "typeface": "BaskervilleBT-Roman"}, "block":{"backgroundColor": "#f9f5ed", "padding": {"top":"base","bottom":"base","start":"base","end":"base"}}}}
 ^[“Love and trust go hand in hand. Without one we cannot have the other. Love sent the Savior. Trust accepts His sacrifice. Love provided a way to deal with sin. Trust accepts His grace and His perfect life in place of our sinfulness. Love yearns to show us a better life. Trust accepts Him as the Lord of our life—a guide we can follow with certainty. The trust learned in childhood translates into trust in God in later life”]({"style":{"text":{"typeface": "BaskervilleBT-BoldItalic"}}})\
@@ -29,4 +29,4 @@ Here are some things you can start doing right now to help your little one learn
 - **Follow through on what you say you are going to do**. If you tell them they can’t have dessert unless they finish their vegetables, keep your word.
 - **Show a high level of support for your baby**. Respect their feelings, and help them when they are struggling, sad, afraid, or overwhelmed.
 - **Communicate that you trust your baby**. Trust goes two ways. When you show they can trust you, you model how you want your child to act. Your baby, in turn, learns how to be trustworthy. Assume your child will want to do the right thing and tell them you believe they will make a good choice.
-- **Teach your baby when not to trust**. “Teach personal safety skills and how to get help when they need it. . . . [But] in your efforts to protect them from evil, don’t crush the beautiful bud of trust” (Donna Habenicht, _How to Help Your Child Really Love Jesus_, pp. 18–20).
+- **Teach your baby when not to trust**. “Teach personal safety skills and how to get help when they need it. . . . [But] in your efforts to protect them from evil, don’t crush the beautiful bud of trust” (Donna Habenicht, ^[How to Help Your Child Really Love Jesus]({"style": {"text": {"typeface": "PTSans-Italic"}}}), pp. 18–20).