Merge pull request 'Main' (#6) from main into production

Reviewed-on: admin/step3#6

project.godot

@@ -18,7 +18,7 @@ config/icon="res://assets/branding/ranaze-app-icon.png"
 config/use_custom_user_dir=true
 config/custom_user_dir_name="MedMind"
 boot_splash/bg_color=Color(0.019607844, 0.02745098, 0.05882353, 1)
-boot_splash/image="res://web/ranaze-loader-icon-v1.png"
+boot_splash/image="res://assets/branding/ranaze-mark.png"
 boot_splash/fullsize=false
 boot_splash/use_filter=true
 
@@ -64,7 +64,7 @@ textures/vram_compression/import_etc2_astc=true
 
 [step3]
 
-deployment_environment="development"
+deployment_environment="uat"
 questions_api_url="https://us3q.ranaze.com/api/questions/search"
 question_reports_api_url="https://us3q.ranaze.com/api/question-reports"
 app_feedback_api_url="https://us3q.ranaze.com/api/app-feedback"

scripts/ui/dashboard_screen.gd

@@ -249,10 +249,11 @@ func _render_review(data: Dictionary) -> void:
 		review_list.add_child(_review_action(
 			"%d dynamic concepts due" % dynamic_due if dynamic_due > 0 else "Dynamic concepts up to date",
 			"activity", Brand.PURPLE if dynamic_due > 0 else Brand.ROYAL_BLUE, "dynamic_questions"))
-	var flashcards_due := int(data.get("flashcardsDue", 0))
+	if Brand.is_uat_environment():
-	review_list.add_child(_review_action(
+		var flashcards_due := int(data.get("flashcardsDue", 0))
-		"%d flashcards due" % flashcards_due if flashcards_due > 0 else "Flashcards up to date",
+		review_list.add_child(_review_action(
-		"clipboard-plus", Brand.TEAL if flashcards_due > 0 else Brand.ROYAL_BLUE, "flashcards"))
+			"%d flashcards due" % flashcards_due if flashcards_due > 0 else "Flashcards up to date",
+			"clipboard-plus", Brand.TEAL if flashcards_due > 0 else Brand.ROYAL_BLUE, "flashcards"))
 	review_list.add_child(_review_action("%d bookmarks" % int(data.get("bookmarkCount", 0)), "bookmark", Brand.ROYAL_BLUE, "bookmarks"))
 	review_list.add_child(_review_action("%d notes" % int(data.get("noteCount", 0)), "notebook-pen", Brand.AMBER, "notes"))
 

scripts/ui/main.gd

@@ -419,7 +419,7 @@ func _populate_navigation(container: VBoxContainer, include_brand: bool) -> void
 	_add_nav_button(container, "dynamic_questions", "Dynamic Questions", "activity", true, Brand.is_uat_environment())
 	_add_nav_button(container, "ccs", "CCS Cases", "stethoscope", true, Brand.is_uat_environment())
 	_add_nav_button(container, "exams", "Exam Simulations", "clipboard-list", true)
-	_add_nav_button(container, "flashcards", "Flashcards", "clipboard-plus", true)
+	_add_nav_button(container, "flashcards", "Flashcards", "clipboard-plus", true, Brand.is_uat_environment())
 	_add_nav_button(container, "bookmarks", "Bookmarks", "bookmark", true)
 	_add_nav_button(container, "notes", "Notes", "notebook-pen", true)
 

tools/export_steam_release.sh

@@ -24,7 +24,7 @@ cp "${PROJECT_FILE}" "${BACKUP_FILE}"
 
 BUILD_REVISION="$(git -C "${REPO_ROOT}" rev-parse HEAD)"
 sed -i \
-  -e "s|deployment_environment=\"development\"|deployment_environment=\"prd\"|" \
+  -e "s|deployment_environment=\"uat\"|deployment_environment=\"prd\"|" \
   -e "s|build_revision=\"development\"|build_revision=\"${BUILD_REVISION}\"|" \
   -e "s|https://us3q.ranaze.com|https://s3q.ranaze.com|g" \
   "${PROJECT_FILE}"

web/Dockerfile

@@ -32,7 +32,7 @@ WORKDIR /src
 COPY . .
 RUN mkdir -p /build \
     && sed -i "s|build_revision=\"development\"|build_revision=\"${BUILD_REVISION}\"|" project.godot \
-    && sed -i "s|deployment_environment=\"development\"|deployment_environment=\"${DEPLOYMENT_ENVIRONMENT}\"|" project.godot \
+    && sed -i "s|deployment_environment=\"uat\"|deployment_environment=\"${DEPLOYMENT_ENVIRONMENT}\"|" project.godot \
     && sed -i "s|https://us3q.ranaze.com|${PUBLIC_API_ORIGIN}|g" project.godot \
     && sed -i "s|custom_template/release=\"\"|custom_template/release=\"/root/.local/share/godot/export_templates/${GODOT_TEMPLATE_DIR}/web_nothreads_release.zip\"|" export_presets.cfg \
     && godot --headless --editor --path /src --quit \