Open
Conversation
…ya/emailFrequency
…ya/timeZoneSettings
…ya/emailFrequency
…imeOut into notifications-preferences
Collaborator
Shira-Abrams
left a comment
Shira-Abrams
left a comment
There was a problem hiding this comment.
fiex the commen and inform me please when you finish
client-side/src/App.jsx
Outdated
| const { i18n } = useTranslation(); | ||
|
|
||
| useEffect(()=>{ | ||
| const user={ |
Collaborator
There was a problem hiding this comment.
retreive user from redux
|
|
||
|
|
||
|
|
||
| const Messages = ({ currentUser, onUpdate }) => { |
Collaborator
There was a problem hiding this comment.
retrive current user from redux
| Object.entries(messagesData).forEach(([key, value]) => { | ||
| formData.append(key, value); | ||
| }); | ||
|
|
Collaborator
There was a problem hiding this comment.
where did you send the data to the server ?
oritb488
requested review from
Shira-Abrams
and removed request for
moriya2004
SariGlick
requested changes
Sep 5, 2024
| REACT_APP_BASE_URL='http://localhost:3000' | ||
| REACT_APP_SECRET_CODE_CAPVAL='6Ld5uBoqAAAAAKwPXqo5eanm9ZFSuOoBBSdl00pE' | ||
| REACT_APP_SERVER_URL='http://localhost:5000' | ||
| REACT_APP_SERVER_URL='http://localhost:3000' |
Owner
There was a problem hiding this comment.
you cant use port 3000 both for server url & base url, please return the port 5000
| <RouterProvider router={router} /> | ||
| <SnackbarProvider maxSnack={3}> | ||
| <Provider store={store}> | ||
| <RouterProvider router={router} /> |
| import axios from 'axios'; | ||
|
|
||
| const url = process.env.REACT_APP_SERVER_URL; | ||
| const url = process.env.REACT_APP_BASE_URL; |
| const [sendNotificationTime, setSendNotificationTime] = useState(notificationTime); | ||
| const [displayIncomeMessages, setDisplayIncomeMessages] = useState(showIncomeMessages); | ||
| const [displayBrowsingTimeLimit, setDisplayBrowsingTimeLimit] = useState(showBrowsingTimeLimit); | ||
| const { t } = useTranslation(); |
| displayBrowsingTimeLimit:showBrowsingTimeLimit, emailFrequency: initialEmailFrequency, } = currentUser.preference; | ||
| const [emailFrequency, setEmailFrequency] = useState(initialEmailFrequency); | ||
| const [ringtoneFile, setRingtoneFile] = useState(null); | ||
| const url = process.env.REACT_APP_BASE_URL; |
Owner
There was a problem hiding this comment.
why do you have to save it in variable?
| @@ -62,8 +64,10 @@ export const deletePreference = async (req, res, next) => { | |||
| if (!PreferenceForDelet) | |||
| return next({ message: 'Preferencs not found !!' }) | |||
| export const getAllProfiles = async (req, res) => { | ||
| try { | ||
| const profiles = await Profiles.find().populate('limitedWebsites.websiteId blockedSites').select('-__v'); | ||
| const profiles = await Profiles.find().populate('limitedWebsites.websiteId').select('-__v'); |
Owner
There was a problem hiding this comment.
Is this change related to your task?
| if(!mongoose.Types.ObjectId.isValid(id)) | ||
| return next({message:'id is not valid'}) | ||
| if (!mongoose.Types.ObjectId.isValid(id)) | ||
| return next({ message: 'id is not valid' }); |
Owner
There was a problem hiding this comment.
add status codes to all next usages
| req.body.profileImage = req.file.originalname; | ||
|
|
||
|
|
||
| // שינוי פורמט התאריך, נניח אם יש שדה בשם date |
Owner
There was a problem hiding this comment.
replace to English comment, or remove
|
|
||
| // שינוי פורמט התאריך, נניח אם יש שדה בשם date | ||
| if (req.body.date) { | ||
| req.body.date = moment(req.body.date).format('yyyy-MM-dd'); // החלף בפורמט הרצוי |
Owner
There was a problem hiding this comment.
replace with English comment, or remove
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.