Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Production Release June Week 1 #2612

Merged
merged 151 commits into from
Jun 4, 2022
Merged
Show file tree
Hide file tree
Changes from 163 commits
Commits
Show all changes
151 commits
Select commit Hold shift + click to select a range
7a5d76e
update presets list
Pranshu1902 May 17, 2022
be9f74a
added 404 error
skks1212 May 17, 2022
92eee10
resolved issues
Pranshu1902 May 17, 2022
5121d3a
resolved issues
Pranshu1902 May 17, 2022
167c366
Merge pull request #1 from coronasafe/develop
Pranshu1902 May 17, 2022
8ee81cf
upgraded tailwindcss to v3
aeswibon May 17, 2022
89c57b7
Merge branch 'coronasafe:develop' into develop
Pranshu1902 May 17, 2022
8662b84
error
Pranshu1902 May 17, 2022
4bf3dd9
error resolved
Pranshu1902 May 17, 2022
2221203
extended theme to include fraction padding
aeswibon May 17, 2022
e5223b7
added package-lock
aeswibon May 18, 2022
6847dcf
Fix eslint errors
Ashesh3 May 19, 2022
7bf52c2
Improve sample test page labels
Ashesh3 May 19, 2022
ba3fb4c
Add permission denied message to recorder
Ashesh3 May 19, 2022
dcc60cd
Merge branch 'coronasafe:develop' into develop
Pranshu1902 May 20, 2022
10cf5a9
fix: show the user that has created that particular user
Pragati1610 May 20, 2022
ae3bf1d
fix: codeclimate similar code blocks issue
Pragati1610 May 20, 2022
97ffd06
fix: codeclimate complex logical expression issue
Pragati1610 May 20, 2022
766adda
removed overlap
Pranshu1902 May 21, 2022
3a474cb
Merge branch 'coronasafe:develop' into develop
Pranshu1902 May 22, 2022
fadff54
updated branch
Pranshu1902 May 22, 2022
c3daf98
hints for delete, mark and unmark actions
rithviknishad May 22, 2022
2b55fb1
removed deepscan bugs
Pranshu1902 May 22, 2022
7c14786
refactor
Pranshu1902 May 22, 2022
6386af9
refactor
Pranshu1902 May 22, 2022
bf92d0c
Fix asset qr code id empty string (#2422)
rabilrbl May 22, 2022
d2d223d
fixed the unresponsive modal of sample details page
patelaryan7751 May 22, 2022
6cf61e3
fixed the Ui of sample test page's unresponsive behaviour
patelaryan7751 May 22, 2022
990643b
resolve
Pranshu1902 May 23, 2022
2aca0b5
Merge branch 'develop' into issue#2471
Pranshu1902 May 23, 2022
bf481e8
debug
Pranshu1902 May 23, 2022
9da3089
declared missing variable
Pranshu1902 May 23, 2022
29bba71
Fixed the Ui of Patient page
patelaryan7751 May 23, 2022
b24d804
Merge branch 'coronasafe:develop' into develop
Pranshu1902 May 24, 2022
008c9fb
replace "Doctor Video" to "Doctor Connect"
rithviknishad May 25, 2022
66a59ee
Merge branch 'issue#2375' of https://github.com/cp-Coder/care_fe into…
gigincg May 25, 2022
82bf369
upgraded tailwindcss to v3
aeswibon May 17, 2022
c58fee1
extended theme to include fraction padding
aeswibon May 17, 2022
fd68cce
resolved conflict
aeswibon May 25, 2022
f182bc3
fixed the issue
aeswibon May 25, 2022
6a3f15b
Updated Tailwind Config
gigincg May 25, 2022
791d4ef
added uniformity
Pranshu1902 May 25, 2022
34140c6
Merge branch 'develop' into issue#2522
Pranshu1902 May 25, 2022
0c45c93
Updated Config; Tailwind v2 Migration
gigincg May 25, 2022
7971787
config trial v3
aeswibon May 25, 2022
f3ccc16
Tailwind V3 Migration
gigincg May 25, 2022
7c5b686
Merge branch 'issue#2375' of https://github.com/cp-Coder/care_fe into…
gigincg May 25, 2022
83275c7
Revert PostCSS
gigincg May 25, 2022
790b5d4
Remove PNotify CSS
gigincg May 25, 2022
e2994f3
Update cra to 5.0.0
bodhish May 25, 2022
110bc66
Switch to yarn
bodhish May 25, 2022
e8881bd
Tailwind V3
gigincg May 25, 2022
6b8d940
Yarn Migration
gigincg May 25, 2022
55493e3
Refactor Translation; React 18
gigincg May 25, 2022
b9634f5
React 18.1
gigincg May 25, 2022
1036140
Merge branch 'develop' into fix-2418
Ashesh3 May 25, 2022
e78452c
Clean up webpack
bodhish May 25, 2022
3d22a37
Merge branch 'cra-5' of github.com:coronasafe/care_fe into cra-5
bodhish May 25, 2022
50621e7
Cleanup webpack related assets
bodhish May 25, 2022
4d7a1bb
Add Tailwind Deps
gigincg May 25, 2022
6f17cf5
Merge branch 'cra-5' into issue#2375
gigincg May 25, 2022
8e728d4
Update gitignore
gigincg May 25, 2022
6df89fe
Update tailwind.css; Rever Pnotify changes
gigincg May 25, 2022
79c3f76
Add PostCSS Config
gigincg May 25, 2022
f561c36
Fix Build Comands
gigincg May 25, 2022
7c5399d
Fix start script
gigincg May 25, 2022
b050781
Fix Rescript
gigincg May 25, 2022
bfa4706
Fixed the Ui unresposive behaviour of Shifting page in mobile devices
patelaryan7751 May 26, 2022
7d6c943
Fixed the unresponsive behaviour of Resource(List View) page
patelaryan7751 May 26, 2022
4253f29
minor classname bug
patelaryan7751 May 26, 2022
175f80f
fix: responsive behaviour for external result page
kunatastic May 26, 2022
293848c
restyled
Pranshu1902 May 26, 2022
ec67f46
Changed app title to CARE
skks1212 May 26, 2022
0eee5e0
Prevented sending empty notification to facilities
patelaryan7751 May 26, 2022
0b57cba
fixed DockerFile
aeswibon May 27, 2022
d3c46f9
Merge pull request #2546 from cp-Coder/cra-5
mathew-alex May 27, 2022
971bda5
Fixed Alignment of buttons: Patient Dashboard
GokulramGHV May 27, 2022
a7b29af
minor alignment changes
GokulramGHV May 27, 2022
d53ebff
removed changes done to App.css
GokulramGHV May 27, 2022
b3f80b9
Merge pull request #2527 from coronasafe/cra-5
mathew-alex May 27, 2022
6500190
resolved bug
Pranshu1902 May 27, 2022
235cf14
improved logic
Pranshu1902 May 27, 2022
0a6b63d
made the buttons visible in asset configuration page
patelaryan7751 May 28, 2022
3bf7af5
made the buttons visible in Patient Feed page
patelaryan7751 May 28, 2022
5a630b9
Role based button component added
May 28, 2022
f9fde20
diable props added to handle add doctor button
May 28, 2022
f7c9eaf
readonly user handled in FacilityHome.tsx
May 28, 2022
6344733
readonly user handled for doctor and bed card
May 28, 2022
6762aa7
materialui button option added to roleButton
May 28, 2022
8fea9d8
Inventory management made radonly user compatible
May 28, 2022
12705b5
Update deploy workflow and fix issues in dockerfile (#2573)
sainak May 29, 2022
b193be3
update image name with context
mathew-alex May 29, 2022
5f13df6
Merge pull request #2574 from coronasafe/devops/update-ci
mathew-alex May 29, 2022
df268d2
Merge branch 'develop' into issue#2535
Pranshu1902 May 30, 2022
52b3c01
try to fix netlify (#2578)
sainak May 30, 2022
8329bbd
feat: redesign User management page
Pragati1610 May 30, 2022
ddb626b
fix: merge conflict
Pragati1610 May 30, 2022
b65053f
fix: based on requested changes
Pragati1610 May 31, 2022
4e65402
replaced all occurences of whitespace-no-wrap to whitespace-nowrap to…
skks1212 May 31, 2022
76dfba5
Merge branch 'develop' into error-404
gigincg Jun 1, 2022
7c73368
Patient notes broken link fixed
Jun 1, 2022
2ae8048
Fix: Whatsapp/Alt Phone number field not saving (#2594)
rabilrbl Jun 1, 2022
c8f5081
disabled docker cache
mathew-alex Jun 1, 2022
8707449
enabled docker cache
mathew-alex Jun 1, 2022
647e0ff
Fix Bed actions button style
Ashesh3 Jun 1, 2022
dbc8474
Fix: Hide ring in focused inputs (#2622)
rithviknishad Jun 1, 2022
e8292ec
added padding to notification card (#2619)
Marmik2003 Jun 1, 2022
87ed080
Added spacing between elements to prevent it from looking congested (…
patelaryan7751 Jun 1, 2022
290ead4
Removed white spaces of filters from all eligible pages (#2623)
patelaryan7751 Jun 1, 2022
14d019b
corrected image name
mathew-alex Jun 2, 2022
a875d5b
Fixed the hover effect issue in sample details button (#2620)
patelaryan7751 Jun 2, 2022
8d21f53
Update CODEOWNERS
mathew-alex Jun 2, 2022
84ffd8f
Comments removed
Jun 2, 2022
48506f2
Merge pull request #2615 from Ashesh3/fix-assign-bed
khavinshankar Jun 2, 2022
8f7ddb5
Merge pull request #2607 from ishanExtreme/issue#2605
khavinshankar Jun 2, 2022
271b418
Merge pull request #2518 from rithviknishad/doctor-connect
khavinshankar Jun 2, 2022
b0c8afb
Merge pull request #2523 from cp-Coder/issue#2012
khavinshankar Jun 2, 2022
95f4895
Merge pull request #2531 from patelaryan7751/issue#2529
khavinshankar Jun 2, 2022
8b656e6
Merge pull request #2540 from skks1212/title-change
khavinshankar Jun 2, 2022
32e37ef
Merge pull request #2542 from patelaryan7751/issue#2541
khavinshankar Jun 2, 2022
3370709
Merge pull request #2555 from GokulramGHV/fix-issue-2517
khavinshankar Jun 2, 2022
9537be7
Merge pull request #2556 from Pranshu1902/issue#2553
khavinshankar Jun 2, 2022
b9490a3
Merge pull request #2571 from ishanExtreme/issue#2509
khavinshankar Jun 2, 2022
b9330f6
Merge pull request #2590 from Pragati1610/issue#2435
khavinshankar Jun 2, 2022
57b73b3
Merge pull request #2599 from skks1212/fixed-whitespace-nowrap
khavinshankar Jun 2, 2022
85274ee
Merge pull request #2539 from Pranshu1902/issue#2535
khavinshankar Jun 2, 2022
e046baa
Merge pull request #2533 from kunatastic/fix#2513
khavinshankar Jun 2, 2022
45b4bfd
Merge branch 'develop' into issue#2503
patelaryan7751 Jun 2, 2022
8cdf215
Update src/Router/AppRouter.tsx
skks1212 Jun 2, 2022
46f18ec
Merge branch 'develop' into issue#2530
patelaryan7751 Jun 2, 2022
426d078
Fix row gap and column gap classes (#2570)
rabilrbl Jun 2, 2022
b23e486
Merge branch 'coronasafe:develop' into issue#2530
patelaryan7751 Jun 2, 2022
a47ccd3
Update Netlify Build
gigincg Jun 3, 2022
a4c6abd
Fix netlify.toml
gigincg Jun 3, 2022
0d37c2a
Merge pull request #2558 from patelaryan7751/issue#2530
khavinshankar Jun 3, 2022
619c19a
Merge pull request #2528 from patelaryan7751/issue#2503
khavinshankar Jun 3, 2022
d0858a2
Merge pull request #2524 from Pranshu1902/issue#2522
khavinshankar Jun 3, 2022
84234b9
Merge pull request #2493 from patelaryan7751/issue_2347
khavinshankar Jun 3, 2022
304b379
Merge pull request #2489 from rabilrbl/#2422
khavinshankar Jun 3, 2022
f993509
Merge pull request #2485 from rithviknishad/hint-inventory-transactions
khavinshankar Jun 3, 2022
3bb369e
Removed commented unused variables
patelaryan7751 Jun 3, 2022
4f05948
Removed commented unused variable
patelaryan7751 Jun 3, 2022
8c76993
Merge branch 'develop' into fix-2418
Ashesh3 Jun 3, 2022
c923146
Merge pull request #2490 from patelaryan7751/issue#2482
khavinshankar Jun 3, 2022
4169344
Merge pull request #2386 from skks1212/error-404
khavinshankar Jun 3, 2022
714d2ce
Merge pull request #2472 from Pranshu1902/issue#2471
khavinshankar Jun 3, 2022
34d8a5e
Merge pull request #2442 from Ashesh3/fix-2418
khavinshankar Jun 3, 2022
13e639f
bed management breadcrumb link fixed (#2506)
ishanExtreme Jun 4, 2022
c046e51
fix api calls on safari (#2395)
Ashesh3 Jun 4, 2022
39c9dcc
Made first_name and last_name mandatory in UserAdd (#2447)
khavinshankar Jun 4, 2022
9f92a70
Disallow empty notes and comments (#2525)
Ashesh3 Jun 4, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Whitelabelling envs

REACT_APP_TITLE=Corona Care
REACT_APP_TITLE=CARE
REACT_APP_META_DESCRIPTION=CoronaSafe Network is an open-source public utility designed by a multi-disciplinary team of innovators and volunteers. CoronaSafe Care is a Digital Public Good recognised by United Nations.
REACT_APP_COVER_IMAGE=https://cdn.coronasafe.network/care_logo.svg
REACT_APP_COVER_IMAGE_ALT=https://cdn.coronasafe.network/care_logo.svg
Expand Down
3 changes: 1 addition & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"plugin:prettier/recommended",
"plugin:@typescript-eslint/eslint-recommended",
Expand All @@ -25,7 +24,7 @@
"ecmaVersion": 12,
"sourceType": "module"
},
"plugins": ["react", "@typescript-eslint"],
"plugins": ["@typescript-eslint"],
"rules": {
"quotes": ["error", "double"],
"no-unused-vars": "off",
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @coronasafe/code-reviewers
* @coronasafe/code-reviewers @coronasafe/care-fe-code-reviewers
14 changes: 12 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2
updates:
- package-ecosystem: "npm"
- package-ecosystem: "yarn"
directory: "/"
schedule:
interval: "daily"
Expand All @@ -10,5 +10,15 @@ updates:
assignees:
- "tomahawk_pilot"
labels:
- "npm"
- "yarn"
- "dependencies"

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
assignees:
- "tomahawk_pilot"
labels:
- "ci"
- "dependencies"
Loading