Orit/settings page #153
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,13 @@ | ||
| <<<<<<< HEAD | ||
| PORT=3000 | ||
| password=EuACQK5n92JI3vn4 | ||
| DB_URL=mongodb+srv://sh3000444:EuACQK5n92JI3vn4@cluster0.2ttcjcg.mongodb.net/?retryWrites=true&w=majority&appName=Cluster0 | ||
| BCRYPT_SALT=10 | ||
| JWT_SECRET=aetvbkiy | ||
| ======= | ||
| PORT=5000 | ||
| password=EuACQK5n92JI3vn4 | ||
| DB_URL=mongodb+srv://sh3000444:EuACQK5n92JI3vn4@cluster0.2ttcjcg.mongodb.net/?retryWrites=true&w=majority&appName=Cluster0 | ||
| BCRYPT_SALT=10 | ||
| JWT_SECRET=aetvbkiy | ||
| >>>>>>> bfbcc67dc1c843746542105d3d6332eedff71e83 |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,8 @@ | ||
| <<<<<<< HEAD | ||
| .vscode/settings.json | ||
| package-lock.json | ||
| node_modules | ||
| ======= | ||
| .vscode/settings.json | ||
| package-lock.json | ||
| >>>>>>> bfbcc67dc1c843746542105d3d6332eedff71e83 |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| REACT_APP_BASE_URL='http://localhost:3000' | ||
| REACT_APP_APOLLO_SERVER_URL='http://localhost:4000' | ||
| REACT_APP_SECRET_CODE_CAPVAL='6Ld5uBoqAAAAAKwPXqo5eanm9ZFSuOoBBSdl00pE' | ||
| REACT_APP_SERVER_URL='http://localhost:3000' | ||
|
|
||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,47 @@ | ||
| { | ||
| "welcome": "bienvenida {{user-name}}", | ||
| "send preferences": " change setting ", | ||
| "change-ringtone": "change ringtoe", | ||
| "select language":"select language", | ||
| "home": "Home", | ||
| "settings": "Settings", | ||
| "reports": "reports", | ||
| "statistics": "statistic", | ||
| "profiles": "profiles", | ||
| "timeout": "TimeOut", | ||
| "sleect-language": "sleect language", | ||
| "change-notification-time": "change notification time", | ||
| "Acount": "Acount", | ||
| "Notifications": "Notifications", | ||
| "Preference": "Preference", | ||
| "Display-Setting": "Display Setting", | ||
| "Message": "Message", | ||
| "account": "Account", | ||
| "display-setting": "Display Setting", | ||
| "fotter": "© Developed by ExtraTech team. visit us:", | ||
| "open-settings": "Open settings", | ||
| "Select Email Frequency": "Select Email Frequency", | ||
| "never": "never", | ||
| "daily": "daily", | ||
| "weekly": "weekly", | ||
| "monthly": "monthly", | ||
| "yearly": "yearly", | ||
| "Select Time Zone": "Select Time Zone", | ||
| "Update": "Update", | ||
| "select date format": "select date format", | ||
| "MM-DD-YYYY": "MM-DD-YYYY", | ||
| "DD-MM-YYYY": "DD-MM-YYYY", | ||
| "YYYY-MM-DD": "YYYY-MM-DD", | ||
| "Display notification for income messages": "Display notification for income messages", | ||
| "Display browsing time limit notification": "Display browsing time limit notification", | ||
| "Message Box":"Message Box", | ||
| "Messages Inbox":"Messages Inbox", | ||
| "Messages Count":"Messages Count", | ||
| "title only":"title only", | ||
| "abbreviated message":"abbreviated message", | ||
| "full messages":"full messages", | ||
| "group by date":"group by date", | ||
| "group by read":"group by read", | ||
| "group by unread":"group by unread" | ||
|
|
||
| } |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,44 @@ | ||
| { "welcome": " {{user-name}} ברוכה הבאה !!", | ||
| "send preferences": "שינוי העדפות", | ||
| "change-ringtone": "שנה צליל", | ||
| "home": "בית", | ||
| "reports": "דוחות", | ||
| "statistics": "סטטיסטיקות", | ||
| "profiles": "פרופילים", | ||
| "timeout": "פסק-זמן", | ||
| "select language": "בחר שפה", | ||
| "change-notification-time": "שנה זמן קבלת התראות", | ||
| "Account": "Cuenta", | ||
| "Notifications": "התראות", | ||
| "Preference": "הגדרות אישיות", | ||
| "Display-Setting": " הגדרות תצוגה", | ||
| "Message": "הודעות", | ||
| "account": "חשבון", | ||
| "display-setting": "הגדרות תצוגה", | ||
| "fotter": "בקרו אותנו ExtraTech פותח עי צות", | ||
| "settings": "הגדרות", | ||
| "open-settings": "פתח הגדרות", | ||
| "Select Email Frequency": "בחר תדירות אימייל", | ||
| "never": "אף פעם", | ||
| "daily": "יומי", | ||
| "weekly": "שבועי", | ||
| "monthly": "חודשי", | ||
| "yearly": "שנתי", | ||
| "Select Time Zone": "בחר אזור זמן", | ||
| "Update": "עדכן", | ||
| "select date format": "בחר פורמט תאריך", | ||
| "MM-DD-YYYY": "חודש / יום / שנה", | ||
| "DD-MM-YYYY": "שנה / חודש / יום", | ||
| "YYYY-MM-DD": "יום / חודש / שנה", | ||
| "Display notification for income messages":"הצג התראה עבור הודעות נכנסות", | ||
| "Display browsing time limit notification":"הצג הודעת מגבלת זמן גלישה", | ||
| "Message Box":"תיבת הודעות", | ||
| "Messages Inbox":"הודעות דואר נכנס", | ||
| "Messages Count":"מספר הודעות", | ||
| "title only":"כותרת בלבד", | ||
| "abbreviated message":"הודעה מקוצרת", | ||
| "full messages":"הודעות מלאות", | ||
| "group by date":"קבץ לפי תאריך", | ||
| "group by read":"קבץ לפי נקרא" | ||
|
|
||
| } |
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| module.exports = { | ||
| presets: [ | ||
| 'react-app', | ||
|
|
||
| ], | ||
| plugins: [ | ||
| '@babel/plugin-proposal-private-property-in-object', | ||
|
|
||
| ], | ||
| }; | ||
|
|
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| import React, { useState,useEffect } from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import { useTranslation } from 'react-i18next' | ||
| import Select from '../../stories/Select/Select.jsx'; | ||
| import GenericInput from '../../stories/GenericInput/genericInput.jsx' | ||
| import CONSTANTS from './constantSetting.js' | ||
| import './Notifications.scss'; | ||
|
|
||
| const Notifications = ({ currentUser , onUpdate}) => { | ||
| const { EMAIL_FREQUENCY_ENUM, TITLES, LABELS } = CONSTANTS; | ||
| const { sendNotificationTime:notificationTime, soundVoice:initialSoundVoice,displayIncomeMessages:showIncomeMessages, | ||
| 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? |
||
| const [soundVoice, setSoundVoice] = useState(`${url}/uploads/${initialSoundVoice}`); | ||
| const [sendNotificationTime, setSendNotificationTime] = useState(notificationTime); | ||
| const [displayIncomeMessages, setDisplayIncomeMessages] = useState(showIncomeMessages); | ||
| const [displayBrowsingTimeLimit, setDisplayBrowsingTimeLimit] = useState(showBrowsingTimeLimit); | ||
| const { t } = useTranslation(); | ||
|
|
||
|
|
||
| useEffect(() => { | ||
| onUpdate({ | ||
| emailFrequency, | ||
| ringtoneFile, | ||
| sendNotificationTime, | ||
| displayIncomeMessages, | ||
| displayBrowsingTimeLimit | ||
| }); | ||
| }, [emailFrequency, ringtoneFile, sendNotificationTime, displayIncomeMessages, displayBrowsingTimeLimit, onUpdate]); | ||
|
|
||
| const handleFileChange = (e) => { | ||
| if (e.target.files[0]) { | ||
| setRingtoneFile(e.target.files[0]); | ||
| setSoundVoice(URL.createObjectURL(e.target.files[0])); | ||
| } | ||
|
|
||
| }; | ||
| const handleChangeEmailFreq = (selectedFrequency) => { | ||
| if (!Object.keys(EMAIL_FREQUENCY_ENUM).includes(selectedFrequency.toUpperCase())) { | ||
| return; | ||
| } | ||
| setEmailFrequency(selectedFrequency); | ||
| }; | ||
|
|
||
| const changeNotificationTime = (event) => { | ||
| setSendNotificationTime(event); | ||
| } | ||
|
|
||
|
|
||
| return ( | ||
| <div className="notifications-container"> | ||
| <div className="notifications-settings"> | ||
| <GenericInput | ||
| label={t(LABELS.DISPLAY_INCOME_MESSAGES)} | ||
| type="checkbox" | ||
| checked={displayIncomeMessages} | ||
| onChange={(e) => setDisplayIncomeMessages(e)} | ||
| /> | ||
| <GenericInput | ||
| label={t(LABELS.DISPLAY_BROWSING_TIME_LIMIT)} | ||
| type="checkbox" | ||
| checked={displayBrowsingTimeLimit} | ||
| onChange={(e) => setDisplayBrowsingTimeLimit(e)} | ||
| /> | ||
| </div> | ||
| <div className="select-container"> | ||
| <Select | ||
| className='select-email-frequency' | ||
| options={Object.keys(EMAIL_FREQUENCY_ENUM).map(key => ({ | ||
| text: t(key.toLowerCase()), | ||
| value: EMAIL_FREQUENCY_ENUM[key] | ||
| }))} | ||
| title={t(TITLES.SELECT_EMAIL_FREQUENCY)} | ||
| onChange={handleChangeEmailFreq} | ||
| value={emailFrequency} | ||
| size='medium' | ||
| widthOfSelect='210px' | ||
| /> | ||
| </div> | ||
| <div className="input-container"> | ||
| <GenericInput | ||
| size='medium' | ||
| width='210px' | ||
|
Owner
There was a problem hiding this comment. please use only % without pixels |
||
| label={t(LABELS.CHANGE_NOTIFICATION_TIME)} | ||
| onChange={changeNotificationTime} | ||
| value={sendNotificationTime} | ||
| type='number' | ||
| className='gInput' | ||
| min={0} max={60} | ||
| /> | ||
| </div> | ||
| <div className="file-container"> | ||
| <GenericInput | ||
| type='file' | ||
| label={t(LABELS.CHANGE_RINGTONE)} | ||
| onChange={handleFileChange} | ||
| size='medium' | ||
| width='210px' | ||
| accept='audio/mp3' | ||
| /> | ||
| <audio controls className="audio-player"> | ||
| <source src={soundVoice} /> | ||
| </audio> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
| Notifications.propTypes = { | ||
| currentUser: PropTypes.object.isRequired, | ||
| onUpdate: PropTypes.func.isRequired | ||
| } | ||
| export default Notifications; | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you cant use port 3000 both for server url & base url, please return the port 5000