Commit e06406c

Vinay Vk

authored and

Vinay Vk

committed

Resolved merge conflicts

2 parents 33160f3 + db55395 commit e06406cCopy full SHA for e06406c

118 files changed

package.json
pnpm-lock.yaml
public
- index.css
src
- actions
  - allTeamsAction.js
- components
  - ApplicantsChart
    - ApplicantsChart.module.css
  - BMDashboard
    - AddMaterial
      - AddMaterial.jsx
      - AddMaterial.module.css
    - ConsumableList
      - ConsumableListView.jsx
    - Equipment/DailyActivityLog
      - EDailyActivityLog.jsx
    - ItemList
    - MaterialList
      - MaterialListView.jsx
      - MaterialSummaryCards.jsx
    - Projects/ProjectDetails
      - ProjectDetails.jsx
      - ProjectLog.jsx
  - Collaboration
    - FormPreviewModal.jsx
    - FormPreviewModal.module.css
    - JobFormBuilder.module.css
    - JobFormbuilder.jsx
    - QuestionSetManager.jsx
  - CommunityPortal
    - Activities
    - CPDashboard.jsx
    - CPDashboard.module.css
    - EventPersonalization
      - EventStats.jsx
      - EventStats.module.css
      - __tests__
        EventStats.test.jsx
    - ResourceUsage
      - ResourceUsage.jsx
      - ResourceUsage.module.css
      - __tests__
        ResourceUsage.test.jsx
  - EducationExperienceDonutChart
    - EducationExperienceDonutChart.data.js
    - EducationExperienceDonutChart.jsx
    - EducationExperienceDonutChart.module.css
  - HGNForm
    - pages
    - questionpages
      - QuestionnaireInfo.jsx
    - styles
      - QuestionnaireInfo.module.css
  - HGNSkillsDashboard/SkillsProfilePage
    - components
    - styles
  - Header
    - Header.jsx
  - KitchenandInventory/OrchardManagement
    - OrchardManagement.jsx
    - OrchardManagement.module.css
    - __tests__
      - OrchardManagement.test.jsx
  - LBDashboard/BiddingHomepage
    - BiddingHomepage.module.css
  - OwnerMessage
    - OwnerMessage.module.css
  - PRAnalyticsDashboard/ReviewsInsight
    - ActionDoneGraph.jsx
    - PRQualityGraph.jsx
    - ReviewsInsight.jsx
    - ReviewsInsight.module.css
  - PRDashboard
    - PRDashboard.jsx
    - PRDashboard.module.css
  - PRGradingDashboard
    - GradingTable.jsx
    - PRGradingDashboard.jsx
    - ReviewerRow.jsx
    - ReviewerRow.module.css
  - PRGradingScreen
    - PRGradingScreen.jsx
    - PRGradingScreen.module.css
  - Projects/WBS
    - wbs.jsx
  - QuestionnaireDashboard
    - PromotionTable.jsx
  - Reports
    - Reports.jsx
    - TeamReport/components/__tests__
      - PieChartInfoDetail.test.jsx
  - TeamMemberTasks
    - TeamMemberTask.jsx
    - TeamMemberTasks.jsx
    - style.module.css
  - Teams
    - Team.jsx
    - Team.module.css
    - TeamMembersPopup.jsx
    - TeamMembersPopup.module.css
    - TeamTableHeader.jsx
    - TeamTableSearchPanel.jsx
    - TeamTableSearchPanel.module.css
    - Teams.jsx
    - TeamsOverview.module.css
    - __tests__
      - TeamTableHeader.test.jsx
    - teamMembersCache.jsx
  - Timelog
    - Timelog.jsx
    - Timelog.module.css
  - TotalOrgSummary
    - TotalOrgSummary.jsx
  - UserProfile
    - TeamsAndProjects
      - AddProjectPopup.jsx
      - AddTeamPopup.jsx
      - __tests__
        UserTeamsTable.test.jsx
    - UserProfile.jsx
    - UserProfileModal
      - UserProfileModal.jsx
      - UserProfileModal.module.css
  - UserState
    - UserStateDisplay.jsx
  - WeeklySummariesReport
    - WeeklySummariesReport.jsx
    - WeeklySummariesReport.module.css
  - common/Checkbox/__tests__
    - Checkbox.test.jsx
- constants
  - allTeamsConstants.js
- languages/en
  - ui.js
- reducers
  - teamsTeamMembersReducer.js
- routes.jsx
- utils
  - URL.js
yarn.lock

`‎package.json‎`

-Original file line number
+Diff line change
     "html2canvas": "^1.4.1",
     "jest": "^30.2.0",
     "jquery": "^3.7.1",
 -    "jspdf": "^4.2.0",
 +    "jspdf": "^4.2.1",
     "jwt-decode": "^2.2.0",
     "leaflet": "^1.9.4",
     "leaflet.heat": "^0.2.0",

Comments

(0)