Commit c5df497

authored

Merge branch 'main' into 164-dev---camila/make-my-grants-match-to-the-current-users-email

2 parents 8d29c92 + 8cefcf1 commit c5df497Copy full SHA for c5df497

38 files changed

+1993

-432

lines changed

.github/workflows
- pre-merge.yml
frontend
- package-lock.json
- package.json
- src
  - Register.tsx
  - context/auth
    - authContext.tsx
  - external/bcanSatchel
  - main-page
    - MainPage.tsx
    - dashboard
      - Charts
        SampleChart.tsx
      - CsvExportButton.tsx
      - Dashboard.tsx
      - DateFilter.tsx
      - grantCalculations.ts
      - styles
        Dashboard.css
    - grants
      - GrantPage.tsx
      - filter-bar
        CalendarDropdown.tsx
        FilterBar.tsx
        GrantSearch.tsx
        grantFilters.ts
        processGrantData.ts
      - grant-list
        index.tsx
      - new-grant
        NewGrantModal.tsx
      - styles
        CalendarDropdown.css
        GrantAttributes.css
        GrantButton.css
        GrantDetails.css
        GrantSearch.css
        NewGrantModal.css
    - header
      - Header.tsx
      - styles
        Header.css
  - styles
  - utils
    - csvUtils.ts
- tests
  - GrantCalculations.test.tsx
package-lock.json
package.json

38 files changed

+1993

-432

lines changed

`‎.github/workflows/pre-merge.yml‎`

-Original file line number
+Diff line change
 # Run the workflow on every pull request targeting the 'main' branch
 on:
 +  workflow_dispatch:
   pull_request:
     branches:
       - main

Comments

(0)