Update app.py

app.py

@@ -25,7 +25,7 @@ REPO_ID = os.getenv("HF_REPO_ID", "Kgshop/tontalent2")
 HF_TOKEN_WRITE = os.getenv("HF_TOKEN_WRITE")
 HF_TOKEN_READ = os.getenv("HF_TOKEN_READ")
 
-TELEGRAM_BOT_TOKEN = os.getenv("TELEGRAM_BOT_TOKEN", "YOUR_TELEGRAM_BOT_TOKEN") # Replace with your actual bot token
+TELEGRAM_BOT_TOKEN = "7549355625:AAGhdbf6x1JEzpH0mUtuxTF83Soi7MFVNZ8"
 
 DOWNLOAD_RETRIES = 3
 DOWNLOAD_DELAY = 5
@@ -66,7 +66,7 @@ def download_db_from_hf(specific_file=None, retries=DOWNLOAD_RETRIES, delay=DOWN
                                 logging.info(f"Created empty local file {file_name} because it was not found on HF.")
                         except Exception as create_e:
                             logging.error(f"Failed to create empty local file {file_name}: {create_e}")
-                    success = True # Consider it successful if 404 and we handle it (e.g. create empty)
+                    success = True
                     break
                 else:
                     logging.error(f"HTTP error downloading {file_name} (Attempt {attempt + 1}): {e}. Retrying in {delay}s...")
@@ -121,8 +121,8 @@ def load_data():
         logging.info(f"Local data loaded successfully from {DATA_FILE}")
         if not isinstance(data, dict):
              logging.warning(f"Local {DATA_FILE} is not a dictionary. Attempting download.")
-             raise FileNotFoundError # Trigger download if structure is wrong
-        for key in default_data: # Ensure all top-level keys exist
+             raise FileNotFoundError
+        for key in default_data:
             if key not in data: data[key] = default_data[key]
         return data
     except (FileNotFoundError, json.JSONDecodeError) as e:
@@ -136,7 +136,7 @@ def load_data():
             if not isinstance(data, dict):
                  logging.error(f"Downloaded {DATA_FILE} is not a dictionary. Using default.")
                  return default_data
-            for key in default_data: # Ensure all top-level keys exist
+            for key in default_data:
                 if key not in data: data[key] = default_data[key]
             return data
         except Exception as load_e:
@@ -144,7 +144,7 @@ def load_data():
             return default_data
     else:
         logging.error(f"Failed to download {DATA_FILE} from HF. Using empty default data structure.")
-        if not os.path.exists(DATA_FILE): # Ensure a file exists even if download fails
+        if not os.path.exists(DATA_FILE):
             try:
                 with open(DATA_FILE, 'w', encoding='utf-8') as f: json.dump(default_data, f)
                 logging.info(f"Created empty local file {DATA_FILE} after failed download.")
@@ -157,16 +157,14 @@ def save_data(data):
         if not isinstance(data, dict):
             logging.error("Attempted to save invalid data structure (not a dict). Aborting save.")
             return
-        # Ensure essential keys are present before saving
         default_keys = {'resumes': [], 'vacancies': [], 'freelance_offers': [], 'users': {}}
         for key in default_keys:
-            if key not in data:
-                data[key] = default_keys[key]
+            if key not in data: data[key] = default_keys[key]
 
         with open(DATA_FILE, 'w', encoding='utf-8') as file:
             json.dump(data, file, ensure_ascii=False, indent=4)
         logging.info(f"Data successfully saved to {DATA_FILE}")
-        upload_db_to_hf(specific_file=DATA_FILE) # Sync after every save
+        upload_db_to_hf(specific_file=DATA_FILE)
     except Exception as e:
         logging.error(f"Error saving data to {DATA_FILE}: {e}", exc_info=True)
 
@@ -195,7 +193,7 @@ def verify_telegram_auth_data(auth_data_str, bot_token):
             user_data = json.loads(params.get('user', '{}'))
             return True, user_data
         except json.JSONDecodeError:
-            return False, None # User string malformed
+            return False, None
     return False, None
 
 
@@ -265,7 +263,7 @@ MAIN_APP_TEMPLATE = '''
             border-radius: 50%;
             margin-right: 12px;
             object-fit: cover;
-            background-color: var(--tg-theme-secondary-bg-color); /* Placeholder bg */
+            background-color: var(--tg-theme-secondary-bg-color);
         }
         .user-info-bar span {
             font-size: 15px;
@@ -303,7 +301,6 @@ MAIN_APP_TEMPLATE = '''
         .list-item p { margin: 0 0 4px 0; font-size: 14px; color: var(--tg-theme-hint-color); }
         .list-item .meta { font-size: 13px; color: var(--tg-theme-hint-color); margin-top: 8px; }
         .form-container, .detail-view { padding: 20px 15px; background-color: var(--tg-theme-section-bg-color); min-height: calc(100vh - 180px); /* Adjust based on header/tabs/userbar height */ }
-        .form-container h2 { margin-top:0; margin-bottom: 20px; font-size: 20px; font-weight: 600;}
         .form-group { margin-bottom: 18px; }
         .form-group label { display: block; font-size: 14px; color: var(--tg-theme-section-header-text-color); margin-bottom: 6px; font-weight: 500; }
         .form-group input, .form-group textarea {
@@ -341,7 +338,7 @@ MAIN_APP_TEMPLATE = '''
         }
         .fab:active { transform: scale(0.92); }
         .detail-view h2 { margin-top: 0; font-size: 22px; font-weight: 600; color: var(--tg-theme-text-color); margin-bottom: 15px; }
-        .detail-view p { margin-bottom: 10px; line-height: 1.6; font-size: 16px; word-wrap: break-word; }
+        .detail-view p { margin-bottom: 10px; line-height: 1.6; font-size: 16px; }
         .detail-view strong { font-weight: 500; color: var(--tg-theme-text-color); }
         .detail-view .meta-detail { font-size: 13px; color: var(--tg-theme-hint-color); margin-top: 20px; }
         .detail-view a { color: var(--tg-theme-link-color); text-decoration: none; }
@@ -359,7 +356,6 @@ MAIN_APP_TEMPLATE = '''
             font-weight: 500;
             cursor: pointer;
             text-align: center;
-            box-sizing: border-box;
             transition: background-color 0.2s ease;
         }
         .button-destructive {
@@ -374,8 +370,8 @@ MAIN_APP_TEMPLATE = '''
 </head>
 <body>
     <div class="app-container">
-        <div class="header">TonTalent</div>
-        <div class="user-info-bar">
+        <div class="header" id="appHeader">TonTalent</div>
+        <div class="user-info-bar" id="userInfoBar">
             <img id="userAvatar" src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" alt="Avatar">
             <span id="userInfoText">Loading user...</span>
         </div>
@@ -393,12 +389,18 @@ MAIN_APP_TEMPLATE = '''
     <script>
         const tg = window.Telegram.WebApp;
         let currentUser = null;
-        let currentView = 'resumes'; // Active main tab
-        let currentItem = null;
-        let previousViewContext = null; // For form back navigation: { type: 'tab'/'detail'/'myPosts', name: string, id?: string }
+        let currentView = 'resumes';
+        let currentItem = null; 
+        let previousViewBeforeMyPosts = 'resumes';
         const mainContent = document.getElementById('mainContent');
+        const fabButton = document.getElementById('fabButton');
+        const appHeader = document.getElementById('appHeader');
         const tabOrder = ['resumes', 'vacancies', 'freelance_offers'];
 
+        function capitalizeFirstLetter(string) {
+            return string.charAt(0).toUpperCase() + string.slice(1);
+        }
+
         function applyThemeParams() {
             const rootStyle = document.documentElement.style;
             rootStyle.setProperty('--tg-theme-bg-color', tg.themeParams.bg_color || '#ffffff');
@@ -437,33 +439,6 @@ MAIN_APP_TEMPLATE = '''
             }
         }
 
-        function formatContactLink(contactValue, username) {
-            let displayValue = contactValue;
-            let linkUrl = '#';
-
-            if (!contactValue && username) {
-                displayValue = `@${username}`;
-                linkUrl = `https://t.me/${username}`;
-                return `<a href="${linkUrl}" target="_blank" rel="noopener noreferrer" style="color: var(--tg-theme-link-color);">${displayValue}</a>`;
-            }
-
-            if (contactValue) {
-                if (contactValue.startsWith('@')) {
-                    const tgUsername = contactValue.substring(1);
-                    linkUrl = `https://t.me/${tgUsername}`;
-                    return `<a href="${linkUrl}" target="_blank" rel="noopener noreferrer" style="color: var(--tg-theme-link-color);">${displayValue}</a>`;
-                } else if (contactValue.startsWith('http://') || contactValue.startsWith('https://')) {
-                    linkUrl = contactValue;
-                    return `<a href="${linkUrl}" target="_blank" rel="noopener noreferrer" style="color: var(--tg-theme-link-color);">${displayValue}</a>`;
-                } else if (contactValue.includes('@') && contactValue.includes('.') && !contactValue.includes(' ')) { // Basic email check
-                    linkUrl = `mailto:${contactValue}`;
-                     return `<a href="${linkUrl}" style="color: var(--tg-theme-link-color);">${displayValue}</a>`;
-                }
-                return displayValue; // Plain text
-            }
-            return `@${username}` ? `<a href="https://t.me/${username}" target="_blank" rel="noopener noreferrer" style="color: var(--tg-theme-link-color);">@${username}</a>` : 'N/A';
-        }
-
         function renderList(items, type) {
             mainContent.style.opacity = 0;
             if (!items || items.length === 0) {
@@ -474,7 +449,7 @@ MAIN_APP_TEMPLATE = '''
                         <h3>${item.title || item.name || 'Untitled'}</h3>
                         ${type === 'vacancies' && item.company_name ? `<p><strong>Company:</strong> ${item.company_name}</p>` : ''}
                         ${type === 'freelance_offers' && item.budget ? `<p><strong>Budget:</strong> ${item.budget}</p>` : ''}
-                        <p class="meta">Posted by: ${formatContactLink(null, item.user_telegram_username)} on ${new Date(item.timestamp).toLocaleDateString()}</p>
+                        <p class="meta">Posted by: @${item.user_telegram_username || 'anonymous'} on ${new Date(item.timestamp).toLocaleDateString()}</p>
                     </div>
                 `).join('');
             }
@@ -486,27 +461,55 @@ MAIN_APP_TEMPLATE = '''
             showDetailView(type, id);
         }
 
+        function formatContactField(contactValue, userTelegramUsername) {
+            let displayContact = contactValue;
+            if (!displayContact && userTelegramUsername) {
+                return `<a href="tg://resolve?domain=${userTelegramUsername}" target="_blank" rel="noopener noreferrer">@${userTelegramUsername}</a>`;
+            }
+            if (displayContact) {
+                if (displayContact.startsWith('@')) {
+                    const username = displayContact.substring(1);
+                    return `<a href="tg://resolve?domain=${username}" target="_blank" rel="noopener noreferrer">${displayContact}</a>`;
+                } else if (displayContact.startsWith('http://') || displayContact.startsWith('https://')) {
+                    return `<a href="${displayContact}" target="_blank" rel="noopener noreferrer">${displayContact}</a>`;
+                } else if (displayContact.includes('@') && displayContact.includes('.') && !displayContact.startsWith('http')) {
+                    return `<a href="mailto:${displayContact}">${displayContact}</a>`;
+                }
+            }
+            return displayContact || 'N/A';
+        }
+
         function showDetailView(type, id) {
             mainContent.style.opacity = 0;
             tg.BackButton.show();
             tg.BackButton.onClick(() => {
                 tg.HapticFeedback.impactOccurred('light');
-                loadView(type); // Always go back to the tab view of this item's type
+                if (currentView === 'my_posts') {
+                    showMyPostsView();
+                } else {
+                    loadView(type);
+                }
             });
             tg.MainButton.hide();
-            document.getElementById('fabButton').style.display = 'none';
+            fabButton.style.display = 'none';
 
             apiCall(`/api/${type}/${id}`)
                 .then(item => {
                     currentItem = item;
                     let detailsHtml = `<div class="detail-view"><h2>${item.title || item.name}</h2>`;
+                    
+                    const itemContact = formatContactField(item.contact, item.user_telegram_username);
+                    const postedByLink = item.user_telegram_username 
+                        ? `<a href="tg://resolve?domain=${item.user_telegram_username}" target="_blank" rel="noopener noreferrer">@${item.user_telegram_username}</a>`
+                        : 'anonymous';
+
                     if (type === 'resumes') {
                         detailsHtml += `
                             <p><strong>Skills:</strong> ${item.skills || 'N/A'}</p>
                             <p><strong>Experience:</strong><br>${item.experience ? item.experience.replace(/\\n/g, '<br>') : 'N/A'}</p>
                             <p><strong>Education:</strong><br>${item.education ? item.education.replace(/\\n/g, '<br>') : 'N/A'}</p>
-                            <p><strong>Contact:</strong> ${formatContactLink(item.contact, item.user_telegram_username)}</p>
-                            ${item.portfolio_link ? `<p><strong>Portfolio:</strong> <a href="${item.portfolio_link}" target="_blank" rel="noopener noreferrer" style="color: var(--tg-theme-link-color);">${item.portfolio_link}</a></p>` : ''}
+                            <p><strong>Contact:</strong> ${itemContact}</p>
+                            ${item.portfolio_link ? `<p><strong>Portfolio:</strong> <a href="${item.portfolio_link}" target="_blank" rel="noopener noreferrer">${item.portfolio_link}</a></p>` : ''}
                         `;
                     } else if (type === 'vacancies') {
                         detailsHtml += `
@@ -515,7 +518,7 @@ MAIN_APP_TEMPLATE = '''
                             <p><strong>Requirements:</strong><br>${item.requirements ? item.requirements.replace(/\\n/g, '<br>') : 'N/A'}</p>
                             <p><strong>Salary:</strong> ${item.salary || 'N/A'}</p>
                             <p><strong>Location:</strong> ${item.location || 'N/A'}</p>
-                            <p><strong>Contact/Apply:</strong> ${formatContactLink(item.contact, item.user_telegram_username)}</p>
+                            <p><strong>Contact/Apply:</strong> ${itemContact}</p>
                         `;
                     } else if (type === 'freelance_offers') {
                         detailsHtml += `
@@ -523,10 +526,10 @@ MAIN_APP_TEMPLATE = '''
                             <p><strong>Budget:</strong> ${item.budget || 'N/A'}</p>
                             <p><strong>Deadline:</strong> ${item.deadline || 'N/A'}</p>
                             <p><strong>Skills Needed:</strong> ${item.skills_needed || 'N/A'}</p>
-                            <p><strong>Contact:</strong> ${formatContactLink(item.contact, item.user_telegram_username)}</p>
+                            <p><strong>Contact:</strong> ${itemContact}</p>
                         `;
                     }
-                    detailsHtml += `<p class="meta-detail">Posted by: ${formatContactLink(null, item.user_telegram_username)} on ${new Date(item.timestamp).toLocaleDateString()}</p>`;
+                    detailsHtml += `<p class="meta-detail">Posted by: ${postedByLink} on ${new Date(item.timestamp).toLocaleDateString()}</p>`;
                     
                     if (currentUser && item.user_id === String(currentUser.id)) {
                         detailsHtml += `<button id="editItemButton" class="action-button" style="background-color: var(--tg-theme-button-color); color: var(--tg-theme-button-text-color); margin-top: 25px;">Edit Post</button>`;
@@ -538,7 +541,7 @@ MAIN_APP_TEMPLATE = '''
                     if (currentUser && item.user_id === String(currentUser.id)) {
                         document.getElementById('editItemButton')?.addEventListener('click', () => {
                             tg.HapticFeedback.impactOccurred('light');
-                            showForm(type, item, { type: 'detail', name: type, id: item.id });
+                            showForm(type, item);
                         });
                         document.getElementById('deleteItemButton')?.addEventListener('click', () => {
                             tg.HapticFeedback.impactOccurred('light');
@@ -553,32 +556,17 @@ MAIN_APP_TEMPLATE = '''
                 });
         }
         
-        function showForm(type, itemToEdit = null, callingContext = null) {
+        function showForm(type, itemToEdit = null) {
             mainContent.style.opacity = 0;
             currentItem = itemToEdit;
-            // If callingContext is not provided, default to current tab for back navigation
-            previousViewContext = callingContext || { type: 'tab', name: currentView }; 
-
             tg.BackButton.show();
             tg.BackButton.onClick(() => {
                 tg.HapticFeedback.impactOccurred('light');
-                if (previousViewContext) {
-                    if (previousViewContext.type === 'tab') {
-                        loadView(previousViewContext.name);
-                    } else if (previousViewContext.type === 'detail') {
-                        showDetailView(previousViewContext.name, previousViewContext.id);
-                    } else if (previousViewContext.type === 'myPosts') {
-                        showMyPostsView();
-                    } else { 
-                         if (itemToEdit) showDetailView(type, itemToEdit.id);
-                         else loadView(type); // Fallback to type of form
-                    }
-                } else { 
-                    if (itemToEdit) showDetailView(type, itemToEdit.id);
-                    else loadView(type); // Fallback
-                }
+                if (itemToEdit) showDetailView(type, itemToEdit.id);
+                else if (currentView === 'my_posts') showMyPostsView();
+                else loadView(type);
             });
-            document.getElementById('fabButton').style.display = 'none';
+            fabButton.style.display = 'none';
 
             let formHtml = `<div class="form-container"><h2>${itemToEdit ? 'Edit' : 'New'} ${type.slice(0, -1)}</h2>`;
             if (type === 'resumes') {
@@ -588,7 +576,7 @@ MAIN_APP_TEMPLATE = '''
                     <div class="form-group"><label for="skills">Skills (comma separated)</label><textarea id="skills">${itemToEdit?.skills || ''}</textarea></div>
                     <div class="form-group"><label for="experience">Experience</label><textarea id="experience">${itemToEdit?.experience || ''}</textarea></div>
                     <div class="form-group"><label for="education">Education</label><textarea id="education">${itemToEdit?.education || ''}</textarea></div>
-                    <div class="form-group"><label for="contact">Contact Info (e.g., email, link, or @username)</label><input type="text" id="contact" value="${itemToEdit?.contact || ''}"></div>
+                    <div class="form-group"><label for="contact">Contact Info (e.g., email, or leave blank to use Telegram)</label><input type="text" id="contact" value="${itemToEdit?.contact || ''}"></div>
                     <div class="form-group"><label for="portfolio_link">Portfolio Link (optional)</label><input type="url" id="portfolio_link" value="${itemToEdit?.portfolio_link || ''}"></div>
                 `;
             } else if (type === 'vacancies') {
@@ -608,7 +596,7 @@ MAIN_APP_TEMPLATE = '''
                     <div class="form-group"><label for="budget">Budget</label><input type="text" id="budget" value="${itemToEdit?.budget || ''}"></div>
                     <div class="form-group"><label for="deadline">Expected Deadline</label><input type="text" id="deadline" value="${itemToEdit?.deadline || ''}"></div>
                     <div class="form-group"><label for="skills_needed">Skills Needed (comma separated)</label><textarea id="skills_needed">${itemToEdit?.skills_needed || ''}</textarea></div>
-                    <div class="form-group"><label for="contact">Contact Info (e.g. email, link, or @username)</label><input type="text" id="contact" value="${itemToEdit?.contact || ''}"></div>
+                    <div class="form-group"><label for="contact">Contact Info (or leave blank to use Telegram)</label><input type="text" id="contact" value="${itemToEdit?.contact || ''}"></div>
                 `;
             }
             formHtml += `<div id="formError" class="error-message"></div></div>`;
@@ -670,11 +658,8 @@ MAIN_APP_TEMPLATE = '''
                     tg.HapticFeedback.notificationOccurred('success');
                     tg.MainButton.hideProgress();
                     tg.MainButton.hide();
-                    if (previousViewContext && previousViewContext.type === 'myPosts') {
-                        showMyPostsView();
-                    } else {
-                        loadView(type); 
-                    }
+                    if (currentView === 'my_posts') showMyPostsView();
+                    else loadView(type); 
                 })
                 .catch(err => {
                     tg.HapticFeedback.notificationOccurred('error');
@@ -683,7 +668,7 @@ MAIN_APP_TEMPLATE = '''
                 });
         }
 
-        function handleDeleteItem(type, itemId, successCallback = null) {
+        function handleDeleteItem(type, itemId) {
             tg.showConfirm('Are you sure you want to delete this post?', (confirmed) => {
                 if (confirmed) {
                     tg.HapticFeedback.impactOccurred('medium');
@@ -691,11 +676,8 @@ MAIN_APP_TEMPLATE = '''
                         .then(() => {
                             tg.HapticFeedback.notificationOccurred('success');
                             tg.showAlert('Post deleted successfully.');
-                            if (successCallback) {
-                                successCallback();
-                            } else {
-                                loadView(type); // Default: reload current tab view
-                            }
+                            if (currentView === 'my_posts') showMyPostsView();
+                            else loadView(type); 
                         })
                         .catch(err => {
                             tg.HapticFeedback.notificationOccurred('error');
@@ -708,24 +690,22 @@ MAIN_APP_TEMPLATE = '''
         }
 
         function loadView(tabName, fromSwipe = false) {
-            if (!fromSwipe) tg.HapticFeedback.impactOccurred('light');
-            currentView = tabName; // This tracks the active main tab
+            if (!fromSwipe && currentView !== tabName) tg.HapticFeedback.impactOccurred('light');
             
-            // If navigating to a main tab, this becomes the primary context for new forms
-            if (tabOrder.includes(tabName)) {
-                 previousViewContext = { type: 'tab', name: tabName };
+            if (currentView === 'my_posts' && tabName !== 'my_posts') {
+                appHeader.textContent = 'TonTalent';
             }
+            currentView = tabName;
 
             document.querySelectorAll('.tab-button').forEach(btn => btn.classList.remove('active'));
-            const activeTabButton = document.querySelector(`.tab-button[data-tab="${tabName}"]`);
-            if (activeTabButton) activeTabButton.classList.add('active');
+            document.querySelector(`.tab-button[data-tab="${tabName}"]`).classList.add('active');
             
             mainContent.style.opacity = 0;
             mainContent.innerHTML = `<div class="loading">Loading ${tabName}...</div>`;
             
             tg.BackButton.hide();
             tg.MainButton.hide();
-            document.getElementById('fabButton').style.display = 'block';
+            fabButton.style.display = 'block';
 
             apiCall(`/api/${tabName}`)
                 .then(data => renderList(data, tabName))
@@ -735,70 +715,64 @@ MAIN_APP_TEMPLATE = '''
                 });
         }
 
-        function showMyPostsView() {
+        function renderMyPostsList(items) {
             mainContent.style.opacity = 0;
+            if (!items || items.length === 0) {
+                mainContent.innerHTML = `<div class="empty-state">You haven't posted anything yet.</div>`;
+            } else {
+                mainContent.innerHTML = items.map(item => `
+                    <div class="list-item" onclick="handleItemClick('${item.type}', '${item.id}')">
+                        <h3>${item.title || item.name || 'Untitled'} <span style="font-weight:normal; font-size: 0.8em; color: var(--tg-theme-hint-color);">(${capitalizeFirstLetter(item.type.slice(0,-1))})</span></h3>
+                        ${item.type === 'vacancies' && item.company_name ? `<p><strong>Company:</strong> ${item.company_name}</p>` : ''}
+                        ${item.type === 'freelance_offers' && item.budget ? `<p><strong>Budget:</strong> ${item.budget}</p>` : ''}
+                        <p class="meta">Posted on ${new Date(item.timestamp).toLocaleDateString()}${item.updated_timestamp ? ' (Edited: ' + new Date(item.updated_timestamp).toLocaleDateString() + ')' : ''}</p>
+                    </div>
+                `).join('');
+            }
+            setTimeout(() => { mainContent.style.opacity = 1; }, 50);
+        }
+
+        function showMyPostsView() {
+            tg.HapticFeedback.impactOccurred('light');
+            if (currentView !== 'my_posts') { // Store the view only if we are not already in my_posts
+                previousViewBeforeMyPosts = currentView;
+            }
+            currentView = 'my_posts';
+            appHeader.textContent = 'My Posts';
+
+            document.querySelectorAll('.tab-button').forEach(btn => btn.classList.remove('active'));
+            fabButton.style.display = 'none';
+            tg.MainButton.hide();
+            
             tg.BackButton.show();
             tg.BackButton.onClick(() => {
                 tg.HapticFeedback.impactOccurred('light');
-                loadView(currentView || tabOrder[0]); // Go back to the last active tab or default
+                appHeader.textContent = 'TonTalent';
+                loadView(previousViewBeforeMyPosts);
             });
-            tg.MainButton.hide();
-            document.getElementById('fabButton').style.display = 'none';
-            document.querySelectorAll('.tab-button').forEach(btn => btn.classList.remove('active')); // Deactivate tabs visually
-
-            mainContent.innerHTML = `<div class="form-container"><h2>My Publications</h2><div class="loading">Loading your posts...</div></div>`;
-
-            apiCall(`/api/my_posts`)
-                .then(posts => {
-                    if (!posts || posts.length === 0) {
-                        mainContent.innerHTML = `<div class="form-container" style="text-align:center;"><h2>My Publications</h2><div class="empty-state" style="padding:20px 0;">You haven't posted anything yet.</div></div>`;
-                    } else {
-                        let postsHtml = `<div class="form-container"><h2>My Publications</h2>`;
-                        postsHtml += posts.map(item => {
-                            let itemTypeDisplay = 'Item';
-                            if (item.item_type === 'resumes') itemTypeDisplay = 'Resume';
-                            else if (item.item_type === 'vacancies') itemTypeDisplay = 'Vacancy';
-                            else if (item.item_type === 'freelance_offers') itemTypeDisplay = 'Freelance Offer';
-                            
-                            return \`
-                                <div class="list-item" style="margin-left:0; margin-right:0; cursor:default;">
-                                    <h3 style="margin-bottom:3px;">\${item.title || item.name || 'Untitled'}</h3>
-                                    <p style="font-size:13px; color: var(--tg-theme-hint-color); margin-bottom:8px;">Type: \${itemTypeDisplay}</p>
-                                    <p class="meta">Posted on \${new Date(item.timestamp).toLocaleDateString()}</p>
-                                    <div style="margin-top:10px; display:flex; gap:10px;">
-                                        <button class="action-button" style="background-color: var(--tg-theme-button-color); color: var(--tg-theme-button-text-color); margin:0; padding: 8px 12px; font-size: 14px; flex:1;"
-                                                onclick="handleEditMyPost('\${item.item_type}', '\${item.id}')">Edit</button>
-                                        <button class="action-button button-destructive" style="margin:0; padding: 8px 12px; font-size: 14px; flex:1;"
-                                                onclick="handleDeleteMyPost('\${item.item_type}', '\${item.id}')">Delete</button>
-                                    </div>
-                                </div>\`;
-                        }).join('');
-                        postsHtml += `</div>`;
-                        mainContent.innerHTML = postsHtml;
-                    }
-                    setTimeout(() => { mainContent.style.opacity = 1; }, 50);
-                })
-                .catch(err => {
-                    mainContent.innerHTML = `<div class="form-container"><h2>My Publications</h2><div class="empty-state">Error loading your posts.</div></div>`;
-                    setTimeout(() => { mainContent.style.opacity = 1; }, 50);
-                });
-        }
 
-        function handleEditMyPost(type, id) {
-            tg.HapticFeedback.impactOccurred('light');
-            apiCall(`/api/\${type}/\${id}`) // Fetch full item data
-                .then(item => {
-                    showForm(type, item, { type: 'myPosts' }); // Pass 'myPosts' context
-                })
-                .catch(err => {
-                    tg.showAlert("Could not load item for editing.");
-                });
-        }
-
-        function handleDeleteMyPost(type, id) {
-            tg.HapticFeedback.impactOccurred('light');
-            handleDeleteItem(type, id, () => {
-                showMyPostsView(); // Refresh My Posts view after deletion
+            mainContent.style.opacity = 0;
+            mainContent.innerHTML = '<div class="loading">Loading your posts...</div>';
+
+            Promise.all([
+                apiCall('/api/resumes'),
+                apiCall('/api/vacancies'),
+                apiCall('/api/freelance_offers')
+            ]).then(([resumes, vacancies, freelanceOffers]) => {
+                const myResumes = resumes.filter(item => String(item.user_id) === String(currentUser.id));
+                const myVacancies = vacancies.filter(item => String(item.user_id) === String(currentUser.id));
+                const myFreelanceOffers = freelanceOffers.filter(item => String(item.user_id) === String(currentUser.id));
+                
+                const allMyPosts = [
+                    ...myResumes.map(item => ({ ...item, type: 'resumes' })),
+                    ...myVacancies.map(item => ({ ...item, type: 'vacancies' })),
+                    ...myFreelanceOffers.map(item => ({ ...item, type: 'freelance_offers' }))
+                ].sort((a, b) => new Date(b.timestamp) - new Date(a.timestamp));
+
+                renderMyPostsList(allMyPosts);
+            }).catch(err => {
+                mainContent.innerHTML = '<div class="empty-state">Error loading your posts.</div>';
+                setTimeout(() => { mainContent.style.opacity = 1; }, 50);
             });
         }
         
@@ -807,19 +781,14 @@ MAIN_APP_TEMPLATE = '''
         const swipeThreshold = 70; 
 
         mainContent.addEventListener('touchstart', e => {
-            // Only allow swipe on main tab views, not in forms or detail views
-            if (tabOrder.includes(currentView) && document.getElementById('fabButton').style.display !== 'none') {
-                touchstartX = e.changedTouches[0].screenX;
-            } else {
-                touchstartX = 0; // Reset if not on a swipable view
-            }
+            if (currentView === 'my_posts') return; // Disable swipe on "My Posts" view
+            touchstartX = e.changedTouches[0].screenX;
         }, { passive: true });
 
         mainContent.addEventListener('touchend', e => {
-            if (touchstartX === 0) return; // Swipe not initiated on a valid view
+            if (currentView === 'my_posts') return; // Disable swipe on "My Posts" view
             touchendX = e.changedTouches[0].screenX;
             handleSwipeGesture();
-            touchstartX = 0; // Reset for next touch
         });
 
         function handleSwipeGesture() {
@@ -827,13 +796,12 @@ MAIN_APP_TEMPLATE = '''
             if (Math.abs(swipeLength) < swipeThreshold) return;
 
             let currentIndex = tabOrder.indexOf(currentView);
-            if (currentIndex === -1) return; // Not on a main tab view
-
+            if (currentIndex === -1) return; // Should not happen if currentView is one of the tabs
             let newIndex;
 
-            if (touchendX < touchstartX) { // Swiped left
+            if (touchendX < touchstartX) { 
                 newIndex = (currentIndex + 1) % tabOrder.length;
-            } else { // Swiped right
+            } else { 
                 newIndex = (currentIndex - 1 + tabOrder.length) % tabOrder.length;
             }
             
@@ -853,51 +821,46 @@ MAIN_APP_TEMPLATE = '''
             
             const userInfoText = document.getElementById('userInfoText');
             const userAvatar = document.getElementById('userAvatar');
-            const userInfoBar = document.querySelector('.user-info-bar');
+            const userInfoBar = document.getElementById('userInfoBar');
             
-            // Basic info from unsafe data first
-            userInfoText.textContent = `Welcome, \${tg.initDataUnsafe.user?.first_name || 'User'}!`;
+            userInfoText.textContent = `Welcome, ${tg.initDataUnsafe.user?.first_name || 'User'}!`;
             if (tg.initDataUnsafe.user?.username) {
-                userInfoText.textContent += ` (@\${tg.initDataUnsafe.user.username})`;
+                userInfoText.textContent += ` (@${tg.initDataUnsafe.user.username})`;
             }
             
             try {
                 const authResponse = await apiCall('/api/auth_user', 'POST', { init_data: tg.initData });
-                currentUser = authResponse.user; // Stored user data from our DB
+                currentUser = authResponse.user;
                 if (currentUser) {
-                     userInfoText.textContent = `\${currentUser.first_name || ''} \${currentUser.last_name || ''}`.trim();
-                     if (currentUser.username) userInfoText.textContent += ` (@\${currentUser.username})`;
+                     userInfoText.textContent = `${currentUser.first_name || ''} ${currentUser.last_name || ''}`.trim();
+                     if (currentUser.username) userInfoText.textContent += ` (@${currentUser.username})`;
+                     else userInfoText.textContent += ` (ID: ${currentUser.id})`;
+                     
                      if (currentUser.photo_url) {
                         userAvatar.src = currentUser.photo_url;
                      } else {
-                        userAvatar.style.display = 'none'; // Or set a default placeholder image
+                        // Keep default placeholder or hide
                      }
                      userInfoBar.classList.add('clickable');
                      userInfoBar.addEventListener('click', () => {
-                        if (currentUser) { 
-                            tg.HapticFeedback.impactOccurred('light');
-                            showMyPostsView();
-                        }
-                    });
-                } else {
-                     userInfoText.textContent = "Welcome! Tap to see your posts."; // Or other message
+                        if(currentUser) showMyPostsView();
+                     });
                 }
             } catch (error) {
                 console.error("Auth error:", error);
                 userInfoText.textContent = `Auth failed. Using basic info.`;
-                // Potentially tg.showAlert("Authentication with the server failed...");
+                // tg.showAlert("Authentication with the server failed. Some features might be limited.");
             }
 
             document.querySelectorAll('.tab-button').forEach(button => {
                 button.addEventListener('click', () => loadView(button.dataset.tab));
             });
-            document.getElementById('fabButton').addEventListener('click', () => {
+            fabButton.addEventListener('click', () => {
                 tg.HapticFeedback.impactOccurred('medium');
-                // Pass the current tab context for back navigation from the new form
-                showForm(currentView, null, { type: 'tab', name: currentView });
+                showForm(currentView); // currentView should be one of the main tabs here
             });
             
-            loadView('resumes'); // Load initial view
+            loadView('resumes');
         }
 
         init();
@@ -1024,7 +987,7 @@ def main_app_view():
 @app.route('/api/auth_user', methods=['POST'])
 def auth_user():
     auth_data_str = request.headers.get('X-Telegram-Auth')
-    if not auth_data_str: # Fallback for testing if not sent in header
+    if not auth_data_str:
         init_data_payload = request.json.get('init_data')
         if init_data_payload:
             auth_data_str = init_data_payload
@@ -1034,16 +997,15 @@ def auth_user():
     is_valid, user_data_from_auth = verify_telegram_auth_data(auth_data_str, TELEGRAM_BOT_TOKEN)
 
     if not is_valid or not user_data_from_auth:
-        logging.warning(f"Invalid auth data received. Valid: {is_valid}, UserData: {user_data_from_auth is not None}")
         return jsonify({"error": "Invalid authentication data"}), 403
 
     data = load_data()
-    users = data.get('users', {}) # Ensure 'users' key exists
+    users = data.get('users', {})
     user_id_str = str(user_data_from_auth.get('id'))
 
     if user_id_str not in users:
         users[user_id_str] = {
-            'id': user_data_from_auth.get('id'), # Store as integer if possible, but keep consistent as string if ID from TG is string
+            'id': user_data_from_auth.get('id'),
             'first_name': user_data_from_auth.get('first_name'),
             'last_name': user_data_from_auth.get('last_name'),
             'username': user_data_from_auth.get('username'),
@@ -1051,16 +1013,9 @@ def auth_user():
             'photo_url': user_data_from_auth.get('photo_url'),
             'first_seen': datetime.now().isoformat()
         }
-    # Always update last_seen and potentially other fields like photo_url or name
     users[user_id_str]['last_seen'] = datetime.now().isoformat()
-    if user_data_from_auth.get('photo_url') and users[user_id_str].get('photo_url') != user_data_from_auth.get('photo_url'):
+    if user_data_from_auth.get('photo_url'):
         users[user_id_str]['photo_url'] = user_data_from_auth.get('photo_url')
-    if user_data_from_auth.get('first_name') and users[user_id_str].get('first_name') != user_data_from_auth.get('first_name'):
-        users[user_id_str]['first_name'] = user_data_from_auth.get('first_name')
-    if user_data_from_auth.get('last_name') and users[user_id_str].get('last_name') != user_data_from_auth.get('last_name'):
-        users[user_id_str]['last_name'] = user_data_from_auth.get('last_name')
-    if user_data_from_auth.get('username') and users[user_id_str].get('username') != user_data_from_auth.get('username'):
-        users[user_id_str]['username'] = user_data_from_auth.get('username')
     
     data['users'] = users
     save_data(data)
@@ -1073,9 +1028,9 @@ def get_authenticated_user_details(request_headers):
         return None
     is_valid, user_data_from_auth = verify_telegram_auth_data(auth_data_str, TELEGRAM_BOT_TOKEN)
     if is_valid and user_data_from_auth:
-        data = load_data() # Load fresh data
+        data = load_data()
         user_id_str = str(user_data_from_auth.get('id'))
-        return data.get('users', {}).get(user_id_str) # Return our stored user data
+        return data.get('users', {}).get(user_id_str)
     return None
 
 @app.route('/api/<item_type>', methods=['GET'])
@@ -1096,36 +1051,10 @@ def get_item(item_type, item_id):
         return jsonify(item), 200
     return jsonify({"error": "Item not found"}), 404
 
-@app.route('/api/my_posts', methods=['GET'])
-def get_my_posts():
-    user = get_authenticated_user_details(request.headers)
-    if not user:
-        return jsonify({"error": "Authentication required or user not found in DB"}), 401
-
-    user_id_str = str(user.get('id'))
-    data = load_data()
-    my_posts = []
-
-    for resume in data.get('resumes', []):
-        if str(resume.get('user_id')) == user_id_str:
-            my_posts.append({**resume, 'item_type': 'resumes'})
-
-    for vacancy in data.get('vacancies', []):
-        if str(vacancy.get('user_id')) == user_id_str:
-            my_posts.append({**vacancy, 'item_type': 'vacancies'})
-
-    for offer in data.get('freelance_offers', []):
-        if str(offer.get('user_id')) == user_id_str:
-            my_posts.append({**offer, 'item_type': 'freelance_offers'})
-
-    my_posts_sorted = sorted(my_posts, key=lambda x: x.get('timestamp', ''), reverse=True)
-    return jsonify(my_posts_sorted), 200
-
-
 @app.route('/api/<item_type>', methods=['POST'])
 def create_item(item_type):
     user = get_authenticated_user_details(request.headers)
-    if not user: # Make sure user is found in our DB
+    if not user:
         return jsonify({"error": "Authentication required or user not found in DB"}), 401
 
     if item_type not in ['resumes', 'vacancies', 'freelance_offers']:
@@ -1137,8 +1066,8 @@ def create_item(item_type):
 
     new_item = {
         "id": str(uuid.uuid4()),
-        "user_id": str(user.get('id')), # Use ID from our DB user object
-        "user_telegram_username": user.get('username', 'unknown'), # Use username from our DB user object
+        "user_id": str(user.get('id')),
+        "user_telegram_username": user.get('username', 'unknown'),
         "timestamp": datetime.now().isoformat(),
     }
 
@@ -1199,30 +1128,23 @@ def update_item(item_type, item_id):
     if item_index == -1: return jsonify({"error": "Item not found"}), 404
     
     original_item = items_list[item_index]
-    # Critical check: user can only edit their own items
     if str(original_item.get('user_id')) != str(user.get('id')):
         return jsonify({"error": "Forbidden: You can only edit your own items"}), 403
 
-    updated_item = original_item.copy() # Keep original timestamp, user_id, etc.
-    updated_item['updated_timestamp'] = datetime.now().isoformat() # Add/update 'updated_timestamp'
+    updated_item = original_item.copy()
+    updated_item['updated_timestamp'] = datetime.now().isoformat()
 
-    # Update fields based on item_type
     if item_type == 'resumes':
-        # Check for required fields if they are being changed from empty
-        if 'name' in req_data and not req_data.get('name'): return jsonify({"error": "Missing field: name"}), 400
-        if 'title' in req_data and not req_data.get('title'): return jsonify({"error": "Missing field: title"}), 400
         updated_item.update({
             "name": req_data.get('name', original_item.get('name')), 
             "title": req_data.get('title', original_item.get('title')),
             "skills": req_data.get('skills', original_item.get('skills')), 
             "experience": req_data.get('experience', original_item.get('experience')),
             "education": req_data.get('education', original_item.get('education')), 
-            "contact": req_data.get('contact', original_item.get('contact')), # Allow clearing contact
+            "contact": req_data.get('contact', original_item.get('contact')),
             "portfolio_link": req_data.get('portfolio_link', original_item.get('portfolio_link'))
         })
     elif item_type == 'vacancies':
-        if 'company_name' in req_data and not req_data.get('company_name'): return jsonify({"error": "Missing field: company_name"}), 400
-        if 'title' in req_data and not req_data.get('title'): return jsonify({"error": "Missing field: title"}), 400
         updated_item.update({
             "company_name": req_data.get('company_name', original_item.get('company_name')), 
             "title": req_data.get('title', original_item.get('title')),
@@ -1233,7 +1155,6 @@ def update_item(item_type, item_id):
             "contact": req_data.get('contact', original_item.get('contact'))
         })
     elif item_type == 'freelance_offers':
-         if 'title' in req_data and not req_data.get('title'): return jsonify({"error": "Missing field: title"}), 400
          updated_item.update({
             "title": req_data.get('title', original_item.get('title')), 
             "description": req_data.get('description', original_item.get('description')),
@@ -1262,7 +1183,6 @@ def delete_item(item_type, item_id):
     item_to_delete = next((i for i in items_list if i['id'] == item_id), None)
     if not item_to_delete: return jsonify({"error": "Item not found"}), 404
 
-    # Critical check: user can only delete their own items
     if str(item_to_delete.get('user_id')) != str(user.get('id')):
         return jsonify({"error": "Forbidden: You can only delete your own items"}), 403
 
@@ -1271,14 +1191,11 @@ def delete_item(item_type, item_id):
     if len(data[item_type]) < original_length:
         save_data(data)
         return jsonify({"message": "Item deleted successfully"}), 200
-    # This case should ideally not be reached if item_to_delete was found
     return jsonify({"error": "Item not found or deletion failed"}), 404
 
 
 @app.route('/admin', methods=['GET'])
 def admin_panel():
-    # Basic auth for admin for now, replace with something more secure for production
-    # For simplicity, this example doesn't have admin auth. Add it if needed.
     data = load_data()
     return render_template_string(ADMIN_TEMPLATE,
                                   resumes=sorted(data.get('resumes', []), key=lambda x: x.get('timestamp', ''), reverse=True),
@@ -1287,7 +1204,6 @@ def admin_panel():
 
 @app.route('/admin/delete', methods=['POST'])
 def admin_delete_item():
-    # Add admin authentication here
     item_type = request.form.get('item_type')
     item_id = request.form.get('item_id')
 
@@ -1302,17 +1218,16 @@ def admin_delete_item():
 
     if len(data[item_type]) < original_length:
         save_data(data)
-        flash(f'{item_type.capitalize()[:-1]} deleted successfully.', 'success') # e.g. Resume deleted
+        flash(f'{item_type.capitalize()[:-1]} deleted successfully.', 'success')
     else:
         flash('Item not found or already deleted.', 'warning')
     return redirect(url_for('admin_panel'))
 
 @app.route('/admin/force_upload', methods=['POST'])
 def force_upload_admin():
-    # Add admin authentication here
     logging.info("Admin forcing upload to Hugging Face...")
     try:
-        upload_db_to_hf() # Upload all SYNC_FILES
+        upload_db_to_hf()
         flash("Data successfully uploaded to Hugging Face.", 'success')
     except Exception as e:
         logging.error(f"Error during forced upload: {e}", exc_info=True)
@@ -1321,12 +1236,11 @@ def force_upload_admin():
 
 @app.route('/admin/force_download', methods=['POST'])
 def force_download_admin():
-    # Add admin authentication here
     logging.info("Admin forcing download from Hugging Face...")
     try:
-        if download_db_from_hf(): # Download all SYNC_FILES
+        if download_db_from_hf():
             flash("Data successfully downloaded from Hugging Face. Local files updated.", 'success')
-            load_data() # Reload data into memory after download
+            load_data() 
         else:
             flash("Failed to download data from Hugging Face. Check logs.", 'error')
     except Exception as e:
@@ -1337,11 +1251,8 @@ def force_download_admin():
 
 if __name__ == '__main__':
     logging.info("Application starting up. Performing initial data load/download...")
-    # Attempt to download all sync files first. If DATA_FILE doesn't exist, download_db_from_hf
-    # will attempt to create an empty one if it's a 404.
-    # Then load_data will either load the downloaded file or the newly created empty one.
     download_db_from_hf() 
-    load_data() # This loads data into memory, using defaults if file is new/empty
+    load_data()
     logging.info("Initial data load complete.")
 
     if HF_TOKEN_WRITE: