Ordering support: position field, append new items, admin position endpoints, sort by position+createdAt

models/SourceText.js

@@ -32,6 +32,8 @@ const sourceTextSchema = new mongoose.Schema({
   imageSize: { type: Number, default: 200 },
   // Add 'portrait-split' for week 4–6 advanced layout (non-breaking, additive)
   imageAlignment: { type: String, enum: ['left', 'center', 'right', 'portrait-split'], default: 'center' },
+  // Optional display ordering within a week/category (ascending). If absent, fallback to createdAt.
+  position: { type: Number },
   culturalElements: [culturalElementSchema],
   difficulty: { 
     type: String, 

routes/auth.js

@@ -160,7 +160,7 @@ router.delete('/admin/practice-examples/:id', authenticateToken, async (req, res
 router.get('/admin/tutorial-tasks', authenticateToken, async (req, res) => {
   try {
     const SourceText = require('../models/SourceText');
-    const tutorialTasks = await SourceText.find({ category: 'tutorial' }).sort({ weekNumber: 1, createdAt: -1 });
+    const tutorialTasks = await SourceText.find({ category: 'tutorial' }).sort({ weekNumber: 1, position: 1, createdAt: 1 });
     res.json({ success: true, tutorialTasks });
   } catch (error) {
     console.error('Get tutorial tasks error:', error);
@@ -180,6 +180,19 @@ router.post('/admin/tutorial-tasks', authenticateToken, requireAdmin, async (req
       if (!content || content.trim() === '') return res.status(400).json({ error: 'Content is required' });
     }
 
+    // Determine optional position for weeks 4-6 so newly added items append to the end
+    let position;
+    if (parseInt(weekNumber) >= 4) {
+      try {
+        const last = await SourceText.find({ category: 'tutorial', weekNumber: parseInt(weekNumber) })
+          .sort({ position: -1 })
+          .limit(1);
+        position = ((last[0] && typeof last[0].position === 'number') ? last[0].position : 0) + 1;
+      } catch (e) {
+        position = undefined;
+      }
+    }
+
     const newTask = new SourceText({
       content: content || (imageUrl ? 'Image-based task' : ''),
       weekNumber: parseInt(weekNumber),
@@ -189,6 +202,7 @@ router.post('/admin/tutorial-tasks', authenticateToken, requireAdmin, async (req
       sourceType: 'tutorial',
       imageUrl,
       imageAlt,
+      ...(position !== undefined ? { position } : {}),
       ...(imageUrl && (!content || content.trim() === '') && { imageSize: imageSize || 200 }),
       ...(imageUrl && (!content || content.trim() === '') && { imageAlignment: imageAlignment || 'center' }),
       translationBrief
@@ -202,6 +216,20 @@ router.post('/admin/tutorial-tasks', authenticateToken, requireAdmin, async (req
   }
 });
 
+// Update position for a tutorial task (admin)
+router.put('/admin/tutorial-tasks/:id/position', authenticateToken, requireAdmin, async (req, res) => {
+  try {
+    const SourceText = require('../models/SourceText');
+    const { position } = req.body;
+    const updated = await SourceText.findByIdAndUpdate(req.params.id, { position }, { new: true, runValidators: true });
+    if (!updated) return res.status(404).json({ error: 'Tutorial task not found' });
+    res.json({ success: true, message: 'Position updated', task: updated });
+  } catch (error) {
+    console.error('Update tutorial task position error:', error);
+    res.status(500).json({ error: 'Failed to update tutorial task position' });
+  }
+});
+
 router.put('/admin/tutorial-tasks/:id', authenticateToken, requireAdmin, async (req, res) => {
   try {
     const SourceText = require('../models/SourceText');
@@ -236,7 +264,7 @@ router.delete('/admin/tutorial-tasks/:id', authenticateToken, requireAdmin, asyn
 router.get('/admin/weekly-practice', authenticateToken, async (req, res) => {
   try {
     const SourceText = require('../models/SourceText');
-    const weeklyPractice = await SourceText.find({ category: 'weekly-practice' }).sort({ weekNumber: 1, createdAt: -1 });
+    const weeklyPractice = await SourceText.find({ category: 'weekly-practice' }).sort({ weekNumber: 1, position: 1, createdAt: 1 });
     res.json({ success: true, weeklyPractice });
   } catch (error) {
     console.error('Get weekly practice error:', error);
@@ -256,6 +284,19 @@ router.post('/admin/weekly-practice', authenticateToken, requireAdmin, async (re
       if (!content || content.trim() === '') return res.status(400).json({ error: 'Content is required' });
     }
 
+    // Determine optional position for weeks 4-6 so newly added items append to the end
+    let position;
+    if (parseInt(weekNumber) >= 4) {
+      try {
+        const last = await SourceText.find({ category: 'weekly-practice', weekNumber: parseInt(weekNumber) })
+          .sort({ position: -1 })
+          .limit(1);
+        position = ((last[0] && typeof last[0].position === 'number') ? last[0].position : 0) + 1;
+      } catch (e) {
+        position = undefined;
+      }
+    }
+
     const newPractice = new SourceText({
       content: content || (imageUrl ? 'Image-based practice' : ''),
       weekNumber: parseInt(weekNumber),
@@ -265,6 +306,7 @@ router.post('/admin/weekly-practice', authenticateToken, requireAdmin, async (re
       sourceType: 'weekly-practice',
       imageUrl,
       imageAlt,
+      ...(position !== undefined ? { position } : {}),
       ...(imageUrl && (!content || content.trim() === '') && { imageSize: imageSize || 200 }),
       ...(imageUrl && (!content || content.trim() === '') && { imageAlignment: imageAlignment || 'center' }),
       translationBrief
@@ -278,6 +320,20 @@ router.post('/admin/weekly-practice', authenticateToken, requireAdmin, async (re
   }
 });
 
+// Update position for a weekly practice task (admin)
+router.put('/admin/weekly-practice/:id/position', authenticateToken, requireAdmin, async (req, res) => {
+  try {
+    const SourceText = require('../models/SourceText');
+    const { position } = req.body;
+    const updated = await SourceText.findByIdAndUpdate(req.params.id, { position }, { new: true, runValidators: true });
+    if (!updated) return res.status(404).json({ error: 'Weekly practice not found' });
+    res.json({ success: true, message: 'Position updated', practice: updated });
+  } catch (error) {
+    console.error('Update weekly practice position error:', error);
+    res.status(500).json({ error: 'Failed to update weekly practice position' });
+  }
+});
+
 router.put('/admin/weekly-practice/:id', authenticateToken, requireAdmin, async (req, res) => {
   try {
     const SourceText = require('../models/SourceText');