Skip to content

feat:Merge branch 'viswam/frontend'" into 'dev'

Praveena Veeranki requested to merge viswam/frontend into dev

📌 What does this MR do?

This MR merges the viswam/frontend branch into the dev branch, bringing in all frontend-related updates, improvements, and structural changes made for the VISWAM website.

✅ Key Contributions:

  • Integrated latest frontend components and pages

  • Included UI/UX improvements and wireframe-based structure

  • Added/refactored:

    • Components (Navbar, Footer, ProjectCard, etc.)
    • Pages and layouts

  • Improved project structure and organization

  • Synced frontend changes with development branch

❗ Why is this change needed?

  • To synchronize frontend development with the main development branch

  • To ensure all new UI updates are available for:

    • Testing
    • Integration
    • Further feature development

  • Prevents branch divergence and conflicts later

🔄 Changes Included

  • Component restructuring (src/components/)
  • Page organization (src/pages/)
  • Services & context setup
  • Styling and layout improvements
  • Wireframe-based UI updates

🔴 Before (dev branch)

  • Older frontend structure
  • Missing latest UI improvements

👉 Attach screenshot of old UI

🟢 After (viswam/frontend merged)

  • Updated UI with improved layout
  • Better structured components
  • New/updated pages and features

👉 Attach screenshot of updated UI

🧪 Test Cases

✅ 1. Application Build

Command:

npm install
npm run dev

Expected:

  • App runs without errors

✅ 2. Navigation

Action:

  • Navigate through pages

Expected:

  • All routes work correctly
  • No broken links

✅ 3. UI Rendering

Input:

  • Load homepage and other pages

Expected:

  • Components render correctly
  • No layout issues

✅ 4. Component Integrity

Check:

  • Navbar, Footer, Cards

Expected:

  • Display consistently across pages

✅ 5. Console Errors

Check:

  • Open browser console

Expected:

  • No critical errors

✅ 6. Responsiveness

Check:

  • Mobile / Tablet / Desktop

Expected:

  • UI adapts correctly

⚠️ Notes

  • Resolved merge conflicts (if any) during rebase/merge
  • Branch is up-to-date with dev
  • No breaking changes introduced

🔗 Related Work

  • UI improvements
  • Wireframe implementation
  • Project restructuring

🎯 Expected Outcome

  • dev branch now contains latest frontend updates

  • Ready for:

    • QA testing
    • Further feature development
    • Deployment pipeline

Merge request reports