Merge remote-tracking branch 'origin/master' into yuqiang/new-dashboard-customized-license-modal

Author: smallst_wsl

app/assets/images/pages/junior/CodeCombat-Home-Small.png

@@ -445,7 +445,10 @@ export default {
           await new Promise((resolve, reject) =>
             prepaid.revoke(student, {
               success: resolve,
-              error: reject,
+              error: (_p, e) => {
+                noty({ text: e?.responseJSON?.message || 'The revocation of the license failed', type: 'error' })
+                return reject(e)
+              },
               data: { sharedClassroomId },
             }),
           )

app/assets/images/pages/junior/CodeCombat-Junior-Small.png

@@ -1345,11 +1345,11 @@ const arenas = [
   { season: 12, slug: 'system-shock', type: 'regular', start: new Date('2024-09-01T00:00:00.000-07:00'), end: new Date('2025-01-01T00:00:00.000-08:00'), results: new Date('2025-01-18T07:00:00.000-08:00'), levelOriginal: '66ba09c7c34ab945ba4f52a2', tournament: '66d0b7f11c8954cacec98d47', image: '/file/db/level/66ba09c7c34ab945ba4f52a2/SystemShockBanner2.png' },
   { season: 12, slug: 'supercharged', type: 'championship', start: new Date('2024-12-01T00:00:00.000-08:00'), end: new Date('2025-01-01T00:00:00.000-08:00'), results: new Date('2025-01-14T07:00:00.000-08:00'), levelOriginal: '66f545e57e91e7168c3e463c', tournament: '6756bac52bfcb2c7059f3cb3', image: '/file/db/level/66f545e57e91e7168c3e463c/superchargedbanner2.jpg' },
   { season: 13, slug: 'pawns-passage', type: 'regular', start: new Date('2025-01-01T00:00:00.000-08:00'), end: new Date('2025-06-01T00:00:00.000-07:00'), results: new Date('2025-06-14T07:00:00.000-07:00'), levelOriginal: '675a76867ea2b689e0f86e87', image: '/file/db/level/675a76867ea2b689e0f86e87/PawnsPassageBanner.jpg' },
-  { season: 13, slug: 'kings-gambit', type: 'championship', start: new Date('2025-05-01T00:00:00.000-07:00'), end: new Date('2025-06-01T00:00:00.000-07:00'), results: new Date('2025-06-10T07:00:00.000-07:00'), levelOriginal: '', image: '' },
-  { season: 14, slug: 'strikers-stadium', type: 'regular', start: new Date('2025-05-01T00:00:00.000-07:00'), end: new Date('2025-09-01T00:00:00.000-07:00'), results: new Date('2025-09-14T07:00:00.000-07:00'), levelOriginal: '', image: '' },
-  { season: 14, slug: 'golden-goal', type: 'championship', start: new Date('2025-07-01T00:00:00.000-07:00'), end: new Date('2025-09-01T00:00:00.000-07:00'), results: new Date('2025-09-10T07:00:00.000-07:00'), levelOriginal: '', image: '' },
-  { season: 15, slug: 'turbo-track', type: 'regular', start: new Date('2025-09-01T00:00:00.000-07:00'), end: new Date('2026-01-01T00:00:00.000-08:00'), results: new Date('2026-01-14T07:00:00.000-08:00'), levelOriginal: '', image: '' },
-  { season: 15, slug: 'grand-prix', type: 'championship', start: new Date('2025-12-01T00:00:00.000-08:00'), end: new Date('2026-01-01T00:00:00.000-08:00'), results: new Date('2026-01-10T07:00:00.000-08:00'), levelOriginal: '', image: '' },
+  { season: 13, slug: 'kings-gambit', type: 'championship', start: new Date('2025-05-01T00:00:00.000-07:00'), end: new Date('2025-06-01T00:00:00.000-07:00'), results: new Date('2025-06-10T07:00:00.000-07:00'), levelOriginal: '679b1495454eb6d46f27e050', image: '/file/db/level/679b1495454eb6d46f27e050/KingsGambit.jpg' },
+  { season: 14, slug: 'strikers-stadium', type: 'regular', start: new Date('2025-06-01T00:00:00.000-07:00'), end: new Date('2025-08-01T00:00:00.000-07:00'), results: new Date('2025-09-14T07:00:00.000-07:00'), levelOriginal: '', image: '' },
+  { season: 14, slug: 'golden-goal', type: 'championship', start: new Date('2025-06-01T00:00:00.000-07:00'), end: new Date('2025-08-01T00:00:00.000-07:00'), results: new Date('2025-09-14T07:00:00.000-07:00'), levelOriginal: '', image: '' },
+  { season: 15, slug: 'turbo-track', type: 'regular', start: new Date('2025-08-01T00:00:00.000-08:00'), end: new Date('2026-01-01T00:00:00.000-08:00'), results: new Date('2026-01-10T07:00:00.000-08:00'), levelOriginal: '', image: '' },
+  { season: 15, slug: 'grand-prix', type: 'championship', start: new Date('2025-08-01T00:00:00.000-08:00'), end: new Date('2026-01-01T00:00:00.000-08:00'), results: new Date('2026-01-10T07:00:00.000-08:00'), levelOriginal: '', image: '' },
 ]
 
 // AI League seasons

app/core/store/modules/prepaids.js

@@ -342,6 +342,9 @@ module.exports = {
       coco_worlds_header: 'CodeCombat Worlds',
       coco_worlds_description: 'Embark on a 3D coding adventure in Roblox, where you can program pets, play with friends, and develop games all while playing one. Join the CodeCombat community and unleash your creativity in the metaverse!',
       coco_worlds_button: 'Explore CodeCombat Worlds',
+      promo_modal_title: 'CodeCombat Home',
+      promo_modal_subtitle: 'Learn Real Coding Through Epic Gameplay',
+      promo_modal_text: 'Dive into real‑world coding with **Python** and **JavaScript**, solving epic puzzles, battling foes, and building a strong coding foundation. Along the way, you’ll learn the skills to **create your own games** and **websites** — all in their browser, no downloads needed.',
     },
 
     nav: {
@@ -551,6 +554,11 @@ module.exports = {
       locked: 'Locked',
       locked_by_teacher: 'Locked By Teacher',
       locked_campaign: 'Complete previous world to unlock',
+      locked_campaign_forest: 'Complete Kithgard Dungeon to unlock',
+      locked_campaign_desert: 'Complete Backwoods Forest to unlock',
+      locked_campaign_mountain: 'Complete Sarven Desert to unlock',
+      locked_campaign_glacier: 'Complete Cloudrip Mountain to unlock',
+      locked_campaign_volcano: 'Complete Kelvintaph Mountain to unlock',
       available: 'Available',
       skills_granted: 'Skills Granted', // Property documentation details
       heroes: 'Heroes', // Tooltip on hero shop button from /play
@@ -597,10 +605,18 @@ module.exports = {
       age_codecombat_junior: 'Ages 5-8',
       age_description_codecombat: 'Real Python or JavaScript coding for everyone',
       age_description_codecombat_junior: 'Blocks or simple text coding for beginners',
+      campaign_about_dungeon: 'Real text programming for brave adventurers!',
+      campaign_about_junior: 'Blocks or simple text coding for young heroes!',
       want_more_hints: 'Want more hints?',
       choose_your_adventure: 'Choose Your Adventure',
       junior: 'Junior',
       original: 'Original',
+      roblox_button_hover: 'Play, Code and Create on Roblox',
+      ai_league_button_hover: 'Compete in AI League Esports',
+      hackstack_button_hover: 'Code and Create with AI HackStack',
+      junior_button_hover: 'Blocks coding for beginners',
+      cchome_button_hover: 'Original CodeCombat Adventure',
+
     },
 
     code: {
@@ -5808,6 +5824,9 @@ module.exports = {
       faq_7_question: 'Recommended browser and operating system',
       faq_7_answer: 'TBA',
       learn_more: 'Learn More',
+      promo_modal_title: 'Explore AI HackStack',
+      promo_modal_subtitle: 'Unlock the Full Potential of Generative AI',
+      promo_modal_text: '**New to AI? Explore CodeCombat AI HackStack** — the easiest way to dive into AI literacy. Unlock the power of top models like **ChatGPT-4**, **Claude**, **Stable Diffusion**, and **DALL-E**. With hands-on tools, creating games, art, websites, code, and more has never been simpler. It’s the perfect companion for any creative project, no experience required!',
     },
 
     standards_page: {
@@ -6410,6 +6429,8 @@ module.exports = {
       faq_4_answer: "Yes. All players can sign-up for free at roblox.com. Don't forget to link your CodeCombat account and Roblox account to access all the features and rewards.",
       faq_5_question: 'Will it work on my Chromebook or mobile device?',
       faq_5_answer: 'Yes. CodeCombat Worlds allows you to play, type real code and create games on PC, Mac, Chromebooks, tablets, phones, and consoles.',
+      promo_modal_title: 'Discover CodeCombat Worlds',
+      promo_modal_text: '**Want to build a Roblox game but can’t code?** Jump into **CodeCombat Worlds** — where you’ll learn by playing! Start in Rift Village, coding your pets to harvest, and battle. Then tackle Lua (the coding language of Roblox) in the Learning Levels, and finally unleash your ideas in Creative Mode to craft immersive Roblox games. The power to create is in your hands!',
     },
     pd_page: {
       implementation_training_title: 'Implementation Training',
@@ -6474,6 +6495,8 @@ module.exports = {
       get_a_headstart: 'Get a Headstart from Home',
       parents_junior_perfect: 'Parents, CodeCombat Junior is the perfect way to start introducing your child not only to computer science but all the benefits, including problem solving, logic and reasoning, persistence, computational thinking and creative exploration.',
       explore_learning_options: 'Explore Learning Options',
+      promo_modal_subtitle: 'Play, Learn, and Grow with Game‑Based Coding',
+      promo_modal_text: '**Kickstart their coding adventure with scaffolded levels designed for ages 5–8—no reading or typing needed!** They’ll learn with icon blocks, word blocks, or simple text side by side, and tackle adaptive challenges that keep them engaged. Works seamlessly on **Chromebooks**, **tablets**, and **iPads**.',
     },
     paywall: {
       badge_free: 'Free',

app/core/utils.js

@@ -300,7 +300,7 @@ module.exports = (User = (function () {
     }
 
     hasAiJuniorAccess () {
-      return this.isAdmin() || this.isBetaTester()
+      return this.isAdmin() || this.isBetaTester() || this.isOnlineTeacher() || !this.isAnonymous()
     }
 
     getHocCourseInstanceId () {
@@ -1229,51 +1229,6 @@ module.exports = (User = (function () {
       return value
     }
 
-    getHackStackExperimentValue () {
-      let value = { true: 'beta', false: 'control', control: 'control', beta: 'beta' }[utils.getQueryVariable('hackstack')]
-      if (value == null) { value = me.getExperimentValue('hackstack', null, 'beta') }
-      if ((value == null) && utils.isOzaria) {
-        // Don't include Ozaria for now
-        value = 'control'
-      }
-      if ((value == null) && features?.china) {
-        // Don't include China players for now
-        value = 'control'
-      }
-      if (userUtils.isInLibraryNetwork()) {
-        value = 'control'
-      }
-      if ((value == null) && !/^en/.test(me.get('preferredLanguage', true))) {
-        // Don't include non-English-speaking users before we fine-tune for other languages
-        value = 'control'
-      }
-      if ((value == null) && me.get('hourOfCode')) {
-        // Don't include users coming in through Hour of Code
-        value = 'control'
-      }
-      if ((value == null) && me.get('role')) {
-        // Don't include users other than home users
-        value = 'control'
-      }
-      if (me.isAdmin()) {
-        value = 'beta'
-      }
-      if ((!value)) {
-        let valueProbability
-        const probability = window.serverConfig?.experimentProbabilities?.hackstack?.beta != null ? window.serverConfig.experimentProbabilities.hackstack.beta : 0.05
-        if (Math.random() < probability) {
-          value = 'beta'
-          valueProbability = probability
-        } else {
-          value = 'control'
-          valueProbability = 1 - probability
-        }
-        console.log('starting hackstack experiment with value', value, 'prob', valueProbability)
-        me.startExperiment('hackstack', value, valueProbability)
-      }
-      return value
-    }
-
     getJuniorExperimentValue () {
       let value = { true: 'beta', false: 'control', control: 'control', beta: 'beta' }[utils.getQueryVariable('junior')]
       if (value == null) { value = me.getExperimentValue('junior', null, 'beta') }

app/locale/en.js

@@ -50,7 +50,8 @@ const PrepaidSchema = c.object({ title: 'Prepaid', required: ['type'] }, {
   removedJoiners: c.array({ title: 'Teachers this Prepaid was shared with' },
     c.object({ required: ['userID'] },
       { userID: c.objectId({ links: [{ rel: 'extra', href: '/db/user/{($)}' }] }) })
-  )
+  ),
+  irrevocable: { type: 'boolean' },
 })
 
 c.extendBasicProperties(PrepaidSchema, 'prepaid')

app/models/User.js

@@ -0,0 +1,131 @@
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"
+
+.classic-promotion-modal
+
+  //- Clear modal defaults
+  .modal-dialog
+    margin: 60px auto 0 auto
+    padding: 0
+    width: 746px
+    height: 520px
+    background: none
+
+
+  .modal-background
+    position: absolute
+    top: -61px
+    left: 0px
+
+  //- Header
+  h1
+    position: absolute
+    left: 170px
+    top: 25px
+    margin: 0
+    width: 410px
+    text-align: center
+    color: rgb(254,188,68)
+    font-size: 32px
+    text-shadow: black 4px 4px 0, black -4px -4px 0, black 4px -4px 0, black -4px 4px 0, black 4px 0px 0, black 0px -4px 0, black -4px 0px 0, black 0px 4px 0, black 6px 6px 6px
+    font-variant: normal
+    text-transform: uppercase
+    margin-left: -30px
+
+  //- Close modal button
+
+  .close-modal
+    position: absolute
+    left: 568px
+    top: 17px
+    width: 60px
+    height: 60px
+    color: white
+    text-align: center
+    font-size: 30px
+    padding-top: 15px
+    cursor: pointer
+    @include rotate(-3deg)
+
+    &:hover
+      color: yellow
+
+  //- Paper area
+
+  .paper-area
+    position: absolute
+    top: 114px
+    left: 31px
+    min-height: 370px
+    width: 684px
+    background: #d4c9b1
+    border: 3px solid black
+    display: flex
+    flex-direction: column
+    justify-content: space-between
+    padding: 10px
+
+
+    .modal-image-container
+      margin-left: auto
+      margin-right: auto
+      display: flex
+      justify-content: center
+      img
+        width: auto
+        height: 100%
+        max-width: 100%
+        object-fit: contain
+    
+    .modal-video-container
+      margin-left: auto
+      margin-right: auto
+      width: 70%
+      position: relative
+      
+      .video-aspect-ratio
+        position: relative
+        padding-top: 56.25% // 16:9 aspect ratio (9/16 = 0.5625)
+        height: 0
+        overflow: hidden
+        
+        iframe
+          position: absolute
+          top: 0
+          left: 0
+          width: 100%
+          height: 100%
+          border: none
+
+    .big-text
+      font-weight: bold
+      font-size: 20px
+      margin: 2px auto
+
+    .med-text
+      font-size: 16px
+    
+    .modal-text
+      width: 90%
+      margin: 0 auto
+    hr
+      border-top: 1px solid gray
+      margin: 10px 40px
+
+  .actions
+    display: flex
+    justify-content: center
+    margin-top: 10px
+
+  .play-button
+    padding: 0 10px
+    font-size: 24px
+    line-height: 30px
+    border-style: solid
+    border-image: url(/images/common/button-background-success-active.png) 14 20 20 20 fill round
+    &:hover
+      border-image: url(/images/common/button-background-success-inactive.png) 14 20 20 20 fill round
+    &:active
+      border-image: url(/images/common/button-background-success-pressed.png) 14 20 20 20 fill round
+    border-width: 14px 20px 20px 20px
+    color: darken(white, 5%)