Skip to content

Batsheva/display settings #140

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.

Sign up for GitHub

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

Open
BatshevaTavger wants to merge 179 commits into
base: mongo/design-settings-page
Choose a base branch
from
Open

Batsheva/display settings #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
179 commits
Select commit Hold shift + click to select a range
4a15b1a
fdfd
Shira-Abrams Jul 16, 2024
12e3dd3
finish including image
Shira-Abrams Jul 16, 2024
dcb6441
Merge branch 'main' of github.com:SariGlick/TimeOut into sa-setting-page
Shira-Abrams Jul 17, 2024
66faa98
commit for pr
Shira-Abrams Jul 17, 2024
b91bf32
update to my task
Shira-Abrams Jul 17, 2024
e8ed283
input button file
Shira-Abrams Jul 17, 2024
62ebca5
change ringtone including input file design
Shira-Abrams Jul 18, 2024
3360f59
change file directory
Shira-Abrams Jul 18, 2024
843c91f
email freq to change
Jul 18, 2024
587c488
change directory mistake
Shira-Abrams Jul 18, 2024
f130d92
settings email freq
Jul 18, 2024
4ac6859
settings email freq
Jul 18, 2024
a89bef6
add user localization
Jul 19, 2024
2896608
copy commit from email freq
Jul 19, 2024
5ded6ab
add localization
Jul 19, 2024
a38298e
add resurce file
Shira-Abrams Jul 21, 2024
1731f4a
add profile Image
BatshevaTavger Jul 21, 2024
c37c47d
change packagejson
Shira-Abrams Jul 21, 2024
7cf3331
add key to resurce file
Shira-Abrams Jul 21, 2024
a6656f9
change user to props
Shira-Abrams Jul 21, 2024
966423e
add i18n
Shira-Abrams Jul 21, 2024
f32ddd4
Merge branch 'sa-setting-page' of github.com:SariGlick/TimeOut into s…
Shira-Abrams Jul 21, 2024
d9d359e
ask For Permission
Jul 21, 2024
c69db44
check email freq comp
Jul 21, 2024
6aabcff
fix updateImage
BatshevaTavger Jul 21, 2024
187373f
Merge remote-tracking branch 'origin/mongo/settings' into Moriya/emai…
Jul 21, 2024
fc641c5
change ready for merge
Shira-Abrams Jul 21, 2024
8c367f1
merge with mongo
BatshevaTavger Jul 21, 2024
d904b28
Merge branch 'sa-setting-page' of github.com:SariGlick/TimeOut into s…
Shira-Abrams Jul 21, 2024
b194936
changes
BatshevaTavger Jul 21, 2024
295afe0
Update preference.model.js
moriya2004 Jul 21, 2024
842942c
update package
Jul 21, 2024
de8e03b
adjust language support
Shira-Abrams Jul 21, 2024
4f7a72d
add select for time zone
Jul 22, 2024
1b58b95
add header resurce file
Shira-Abrams Jul 22, 2024
8808de5
format date
oritb488 Jul 22, 2024
a6519d7
fix after a review
Jul 22, 2024
028c1d1
add the fixing
Jul 22, 2024
ca45f80
Add .gitkeep to keep the uploads directory
Shira-Abrams Jul 22, 2024
3f53dd8
add to git ignore
Shira-Abrams Jul 22, 2024
d1afaea
before over
Shira-Abrams Jul 22, 2024
44d8008
move style to css file
Shira-Abrams Jul 22, 2024
bb0e66f
remove user
Shira-Abrams Jul 22, 2024
9147309
add ask fer premission
Jul 22, 2024
d913e30
changes
BatshevaTavger Jul 22, 2024
cd40516
Merge branch 'main' of https://github.com/SariGlick/TimeOut into bats…
BatshevaTavger Jul 22, 2024
792a59e
pull change
Shira-Abrams Jul 22, 2024
d177ceb
Merge branch 'main' of https://github.com/SariGlick/TimeOut into Mori…
Jul 22, 2024
2b4a968
change select
Shira-Abrams Jul 22, 2024
f6966f9
remove i18n
Shira-Abrams Jul 23, 2024
2eec358
generic upload file
Shira-Abrams Jul 23, 2024
52601ec
delete genericInput
Shira-Abrams Jul 23, 2024
cc7c8e6
delete uploads
Shira-Abrams Jul 23, 2024
890589f
add use effect
Jul 23, 2024
0ae6e0e
Save local changes before pulling remote branch
Jul 23, 2024
f40f872
defualt frpm props
Jul 23, 2024
414fb85
fix export and file
Shira-Abrams Jul 23, 2024
d26fda1
update fomratDate
oritb488 Jul 24, 2024
9d800fa
complete time zone before review
Jul 24, 2024
6261724
add permission to constants
Jul 24, 2024
1279057
delete user from app
Jul 24, 2024
fc3e8d5
change genericDate
oritb488 Jul 24, 2024
c27ab1a
change genericDate
oritb488 Jul 24, 2024
3ac92d7
Merge branch 'main' of https://github.com/SariGlick/TimeOut into Mori…
Jul 24, 2024
d904097
update changes
BatshevaTavger Jul 24, 2024
4f495ad
Merge branch 'main' of https://github.com/SariGlick/TimeOut into bats…
BatshevaTavger Jul 24, 2024
9db4e6d
update
BatshevaTavger Jul 24, 2024
f18c450
Merge branch 'main' of https://github.com/SariGlick/TimeOut into Mori…
Jul 24, 2024
3174829
update changes
BatshevaTavger Jul 24, 2024
f6c00e2
add input
Shira-Abrams Jul 24, 2024
7188da3
fix review changes
Shira-Abrams Jul 24, 2024
47db70c
constants and reqired id
Jul 24, 2024
bfec04e
change app
Shira-Abrams Jul 24, 2024
4b45e24
add the changes from email freq
Jul 24, 2024
a83a295
constant
Shira-Abrams Jul 24, 2024
264b8bc
move branch
Shira-Abrams Jul 24, 2024
f846fc3
pull i18n
Shira-Abrams Jul 24, 2024
ff39dfa
update auto location
Jul 24, 2024
c0280ca
notification for review
Shira-Abrams Jul 25, 2024
fe3c367
ready for review
Shira-Abrams Jul 25, 2024
a439231
update changes
BatshevaTavger Jul 25, 2024
a0ba939
Delete client-side/src/components/settings/Settings.jsx
BatshevaTavger Jul 25, 2024
53b3c3c
Delete client-side/src/stories/themes directory
BatshevaTavger Jul 25, 2024
2252505
Update settings.jsx
BatshevaTavger Jul 25, 2024
b3bdf59
finish change noteTime
Shira-Abrams Jul 25, 2024
74b5c4f
fix again
Shira-Abrams Jul 25, 2024
dc8828b
overview
Shira-Abrams Jul 25, 2024
9f53eae
change genericDate
oritb488 Jul 25, 2024
fd716c4
change genericDate
oritb488 Jul 25, 2024
15472b0
fix resolve
Shira-Abrams Jul 25, 2024
552e69b
change p
Shira-Abrams Jul 25, 2024
7ca2911
change format date
oritb488 Jul 25, 2024
385827d
create uploadFile
Jul 25, 2024
f76bfb7
finish
BatshevaTavger Jul 28, 2024
2236da9
fix changes
BatshevaTavger Jul 28, 2024
aa8dcdb
Rename settings.jsx to Settings.jsx
BatshevaTavger Jul 28, 2024
5ae47d7
Resolved conflict in settings.jsx
BatshevaTavger Jul 28, 2024
6062d48
Deleted Settings.jsx as part of conflict resolution
BatshevaTavger Jul 28, 2024
e0f1c77
Added new Settings.js
BatshevaTavger Jul 28, 2024
f29bb8e
before pull
Shira-Abrams Jul 28, 2024
4cd811b
fix for pending
Shira-Abrams Jul 29, 2024
ae7f290
fix for mergi
Shira-Abrams Jul 29, 2024
97ee80b
fix after first review
Jul 29, 2024
27551ef
change format date
oritb488 Jul 29, 2024
c59f522
change format date
oritb488 Jul 29, 2024
1995293
change format date
oritb488 Jul 29, 2024
459c43b
change format date
oritb488 Jul 29, 2024
e032adc
design button
Shira-Abrams Jul 30, 2024
be32c72
fix
BatshevaTavger Jul 30, 2024
1478a49
fix
BatshevaTavger Jul 30, 2024
8ac58dd
3Dim
Shira-Abrams Jul 30, 2024
b40767e
server change
Shira-Abrams Jul 30, 2024
9e49278
vertical tab ready for friend review
Shira-Abrams Jul 30, 2024
91ae836
fix after review
Jul 30, 2024
89e8724
fix after review
Jul 30, 2024
54d5eab
fixed
BatshevaTavger Jul 31, 2024
8d3649e
ready for push
Shira-Abrams Jul 31, 2024
76947da
before pull settingPage
Shira-Abrams Jul 31, 2024
d17a491
Fix date format
oritb488 Jul 31, 2024
75bd770
ready for review friend
Shira-Abrams Jul 31, 2024
37b5bde
Fix date format
oritb488 Jul 31, 2024
9f5677e
Fix date format
oritb488 Jul 31, 2024
285a866
Fix date format
oritb488 Jul 31, 2024
c2a2939
devide for 2 tab
Shira-Abrams Jul 31, 2024
4ba4b9c
add i18ntab
Shira-Abrams Jul 31, 2024
f171e25
fix again
Shira-Abrams Aug 1, 2024
2bc543f
account tab
Shira-Abrams Aug 1, 2024
d3059ba
env change
Shira-Abrams Aug 1, 2024
f5b4af8
fix generic input
Shira-Abrams Aug 1, 2024
5aba1e1
fix header
Shira-Abrams Aug 1, 2024
7fbf33c
fix header
Shira-Abrams Aug 4, 2024
2ba750d
app
Shira-Abrams Aug 4, 2024
bfd4d06
vertical setting page for review
Shira-Abrams Aug 4, 2024
8c05d2c
fix router
Shira-Abrams Aug 4, 2024
aa5eafc
add i18n footer
Shira-Abrams Aug 4, 2024
19afb63
change width tag
Shira-Abrams Aug 4, 2024
37fed04
fdf
Shira-Abrams Aug 4, 2024
a580153
fdf
Shira-Abrams Aug 4, 2024
d7c1244
merge vertical tab
Shira-Abrams Aug 4, 2024
39cd170
change file name
Shira-Abrams Aug 4, 2024
e527fe4
correct file name
Shira-Abrams Aug 4, 2024
8e988c8
merge Moriya/timeZone branch
Aug 4, 2024
c2d9b03
A small correction to vertical_setting_tab
Aug 4, 2024
659ed3d
Rename Preferences.jsx to tempPreferences.jsx
Aug 4, 2024
c7c1b3c
Rename preferences.jsx to Preferences.jsx
moriya2004 Aug 4, 2024
bb4f2a1
Update Settings.jsx
moriya2004 Aug 4, 2024
6dc2536
Delete client-side/src/components/settings/UserLocalization.jsx
moriya2004 Aug 4, 2024
21982d1
Work in progress on themes
BatshevaTavger Aug 5, 2024
4926158
fix direction
Shira-Abrams Aug 5, 2024
7c46e1f
align
Shira-Abrams Aug 5, 2024
295121b
Work in progress on themes
BatshevaTavger Aug 5, 2024
1738f66
pull moriya changes
Shira-Abrams Aug 5, 2024
da981e9
chagnge opn setting
Shira-Abrams Aug 5, 2024
7ff1707
undo directions
Shira-Abrams Aug 5, 2024
9845e42
fixing
Aug 5, 2024
ee47ec1
fix input props
Shira-Abrams Aug 5, 2024
36839ae
update sound
Aug 5, 2024
40bb67d
Merge branch 'vertical_setting_tab' of https://github.com/SariGlick/T…
Aug 5, 2024
c7b8b6a
chagne click tab
Shira-Abrams Aug 5, 2024
65a63c5
update Notifications & Preferences
Aug 5, 2024
bf92c09
add defualt vertical tab
Shira-Abrams Aug 6, 2024
843cc67
fix direction
Shira-Abrams Aug 6, 2024
3eb6619
merge shira branch and fixed conflicts
BatshevaTavger Aug 6, 2024
8516c4a
merge shira branch and fixed conflicts
BatshevaTavger Aug 6, 2024
7976f7b
merge shira branch and fixed conflicts
BatshevaTavger Aug 6, 2024
5f8c011
add button to settings
Aug 6, 2024
d603379
design nonotifications-preferences
Aug 6, 2024
5496346
pull main
Aug 6, 2024
af41c7f
Merge branch 'vertical_setting_tab' of https://github.com/SariGlick/T…
Aug 6, 2024
e12e705
pull vertical_setting_tab
Aug 6, 2024
34a29d0
working update button
Aug 7, 2024
fcb0774
start doing it
BatshevaTavger Aug 7, 2024
c0f78f8
add preferenceService.js
Aug 7, 2024
04febd6
little fixing
Aug 7, 2024
1545361
Rename accountTab.jsx to AccountTab.jsx
moriya2004 Aug 7, 2024
27c5b0d
Resolved merge conflicts
Aug 7, 2024
0ead5bc
Update router.jsx
moriya2004 Aug 7, 2024
b79ab46
display settings
BatshevaTavger Aug 7, 2024
8757400
merge with Moriya/notifications-preferences
BatshevaTavger Aug 7, 2024
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
3 changes: 1 addition & 2 deletions client-side/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
REACT_APP_BASE_URL='http://localhost:3000'
REACT_APP_SERVER_URL='http://localhost:5000'
REACT_APP_BASE_URL='http://localhost:3000'
Loading