Skip to content

Commit

Permalink
major UI change and color updating
Browse files Browse the repository at this point in the history
  • Loading branch information
@devomid
devomid committed Jul 20, 2024
1 parent d9d3b8c commit b58ae96
Show file tree
Hide file tree
Showing 17 changed files with 220 additions and 65 deletions.
4 changes: 2 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"author": "Omid Azad",
"main": "src/start.js",
"name": "frontend",
"version": "2.2.3",
"version": "2.3.0",
"private": false,
"dependencies": {
"@emotion/react": "^11.11.4",
Expand Down
3 changes: 2 additions & 1 deletion src/App.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

.App {
position: fixed;
background-image: url('./assets/background/green/pngtree-green-watercolor-background-and-abstract-texture-background-picture-image_1230214.jpg');
/* background-image: url('./assets/background/green/pngtree-green-watercolor-background-and-abstract-texture-background-picture-image_1230214.jpg'); */
background-image: url('./assets/background/green/green-and-black-background-gradient-illustration-free-photo.jpg');
margin-top: 15px;
padding: 10px ;
height: 993px;
Expand Down
Binary file added ...ackground/green/green-and-black-background-gradient-illustration-free-photo.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/dialogs/MenuDrawer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const MenuDrawer = ({ open, setOpen }) => {

return (
<>
<Drawer anchor="bottom" open={open} onClose={() => closeDrawer(false)}>
<Drawer sx={{ backgroundColor: 'rgba(255, 255, 255, 0.1)', backdropFilter: 'blur(10px) saturate(280%)' }} anchor="bottom" open={open} onClose={() => closeDrawer(false)}>

<Box role="presentation">
<List>
Expand Down
4 changes: 2 additions & 2 deletions src/dialogs/about.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const About = ({ open, setOpen }) => {

return (
<Box >
<Dialog open={open} keepMounted onClose={handleClose} scroll="paper">
<Dialog sx={{ backgroundColor: 'rgba(255, 255, 255, 0.1)', backdropFilter: 'blur(10px) saturate(280%)' }} open={open} keepMounted onClose={handleClose} scroll="paper">
<DialogTitle sx={{ display: 'flex', justifyContent: 'center' }}>درباره نرم افزار</DialogTitle>
<DialogContent dividers>
<Box sx={{ height: 200, mt: 2 }}>
Expand All @@ -28,7 +28,7 @@ const About = ({ open, setOpen }) => {
SSP Price Calculation Utility{'\n'}
created and developed by: Omid Azad{'\n'}
Date created: May 5th 2024{'\n'}
Ver 2.2.3
Ver 2.3.0
</Typography>
</Box>
</Box>
Expand Down
2 changes: 1 addition & 1 deletion src/dialogs/bargashti.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const BargashtiDialog = ({ open, setOpen }) => {

return (
<Box>
<Dialog open={open} keepMounted onClose={() => setOpen(false)} scroll="paper">
<Dialog sx={{ backgroundColor: 'rgba(255, 255, 255, 0.1)', backdropFilter: 'blur(10px) saturate(280%)' }} open={open} keepMounted onClose={() => setOpen(false)} scroll="paper">
<DialogContent sx={{ height: 78, width: 500, backgroundColor: 'white' }}>
<Box sx={{ width: '52vh', display: 'flex', alignItems: 'flex-end', position: 'fixed' }}>
<SearchOutlinedIcon sx={{ color: 'action.active', mr: 1, my: 0.5 }} />
Expand Down
2 changes: 1 addition & 1 deletion src/dialogs/help.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const HelpDialog = ({ open, setOpen }) => {

return (
<Box >
<Dialog open={open} onClose={handleClose}>
<Dialog sx={{ backgroundColor: 'rgba(255, 255, 255, 0.1)', backdropFilter: 'blur(10px) saturate(280%)' }} open={open} onClose={handleClose}>
<DialogTitle sx={{ display: 'flex', justifyContent: 'center' }}>درباره نرم افزار</DialogTitle>
<DialogContent sx={{ height: 600 }} dividers>
{renderHelpPage()}
Expand Down
2 changes: 1 addition & 1 deletion src/dialogs/khadamat.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const KhadamatDialog = ({ open, setOpen }) => {
return (
<Box>

<Dialog sx={{ backgroundColor: 'rgba(252, 243, 224, 0.6)', backdropFilter: 'blur(12px) saturate(180%)' }} open={open} keepMounted onClose={() => setOpen(false)} scroll="paper">
<Dialog sx={{ backgroundColor: 'rgba(255, 255, 255, 0.1)', backdropFilter: 'blur(10px) saturate(280%)' }} open={open} keepMounted onClose={() => setOpen(false)} scroll="paper">
<DialogContent sx={{ height: 78, width: 500, backgroundColor: 'white' }}>
<Box sx={{ width: '52vh', display: 'flex', alignItems: 'flex-end', position: 'fixed' }}>
<SearchOutlinedIcon sx={{ color: 'action.active', mr: 1, my: 0.5 }} />
Expand Down
4 changes: 2 additions & 2 deletions src/dialogs/modules.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ const ModulesDialog = ({ open, setOpen }) => {

return (
<Box>
<Dialog sx={{ backgroundColor: 'rgba(252, 243, 224, 0.6)', backdropFilter: 'blur(12px) saturate(180%)' }} open={open} keepMounted onClose={() => setOpen(false)} scroll="paper">
<DialogContent sx={{ height: 78, width: 500, backgroundColor: 'white' }}>
<Dialog sx={{ backgroundColor: 'rgba(255, 255, 255, 0.1)', backdropFilter: 'blur(10px) saturate(280%)' }} open={open} keepMounted onClose={() => setOpen(false)} scroll="paper">
<DialogContent sx={{ height: 78, width: 500 }}>
<Box sx={{ width: '52vh', display: 'flex', alignItems: 'flex-end', position: 'fixed' }}>
<SearchOutlinedIcon sx={{ color: 'action.active', mr: 1, my: 0.5 }} />
<TextField color="primary" sx={{ ml: 2 }} fullWidth onChange={handleSearchTermChange} id="input-with-sx" label="افزودن کیت و ماژول" variant="standard" style={{ direction: "rtl" }} />
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Buttons.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const ButtonsSection = () => {

return (

<Box sx={{ width: '100%', backgroundColor: 'rgba(255, 255, 255, 0.5)', backdropFilter: 'blur(5px) saturate(180%)', border: '1px solid rgba(38, 66, 50, 0.5)', borderRadius: 5, boxShadow: 3, p: 1.5, display: 'flex', flexDirection: 'row', mt:1 }}>
<Box sx={{ width: '100%', backgroundColor: 'rgba(255, 255, 255, 0.1)', backdropFilter: 'blur(5px) saturate(180%)', border: '1px solid rgba(38, 66, 50, 0.5)', borderRadius: 5, boxShadow: 3, p: 1.5, display: 'flex', flexDirection: 'row', mt: 1 }}>

<Button onClick={() => {
{ ipcRenderer.send('reset', []) }
Expand Down
152 changes: 118 additions & 34 deletions src/pages/Discount.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,59 +11,143 @@ const DiscountSection = () => {


return (
<Box sx={{ width: '20%', backgroundColor: 'rgba(255, 255, 255, 0.5)', backdropFilter: 'blur(5px) saturate(180%)', border: '1px solid rgba(38, 66, 50, 0.5)', borderRadius: 5, boxShadow: 3, padding: '1rem 1rem 0.5rem 1rem', justifyContent: 'center', alignItems: 'center', mt: '1rem', mr:1, ml:1 }}>
<Box sx={{ width: '20%', backgroundColor: 'rgba(255, 255, 255, 0.1)', backdropFilter: 'blur(5px) saturate(180%)', border: '1px solid rgba(38, 66, 50, 0.5)', borderRadius: 5, boxShadow: 3, padding: '1rem 1rem 0.5rem 1rem', justifyContent: 'center', alignItems: 'center', mt: '1rem', mr: 1, ml: 1 }}>

<Stack sx={{mb:5.5}} spacing={3}>
<Stack sx={{ mb: 5.5 }} spacing={3}>

<FormControl>
<TextField onKeyDown={(event) => {
if (event.key === 'Enter') {
handleKeyDown()
}
}} onChange={(e) => setSaleTakhfif(e.target.value)} InputLabelProps={{ style: { fontSize: '12px' } }} sx={{ backgroundColor: 'rgba(252, 243, 224, 0.1)', backdropFilter: 'blur(5px) saturate(180%)' }} type="text" label="تخفیف فروش " variant="outlined" size="small" />
}} onChange={(e) => setSaleTakhfif(e.target.value)} InputLabelProps={{ style: { fontSize: '12px' } }} sx={{// Root class for the input field
"& .MuiOutlinedInput-root": {
color: "#fff",
// Class for the border around the input field
"& .MuiOutlinedInput-notchedOutline": {
borderColor: "#fff",
borderWidth: "0.7px",
borderRadius: 3
},
},
// Class for the label of the input field
"& .MuiInputLabel-outlined": {
color: "rgb(197, 222, 199)",
}, backgroundColor: 'rgba(255, 255, 255, 0.3)', backdropFilter: 'blur(5px) saturate(180%)', borderRadius: 3
}} type="text" label="تخفیف فروش " variant="outlined" size="small" />
</FormControl>

<FormControl >
<TextField onKeyDown={(event) => {
if (event.key === 'Enter') {
handleKeyDown()
}
}} onChange={(e) => setChandSherkatiTakhfif(e.target.value)} InputLabelProps={{ style: { fontSize: '10px' } }} sx={{ backgroundColor: 'rgba(252, 243, 224, 0.1)', backdropFilter: 'blur(5px) saturate(180%)' }} type="text" label="تخفیف چند شرکتی" variant="outlined" size="small" />
}} onChange={(e) => setChandSherkatiTakhfif(e.target.value)} InputLabelProps={{ style: { fontSize: '10px' } }} sx={{// Root class for the input field
"& .MuiOutlinedInput-root": {
color: "#fff",
// Class for the border around the input field
"& .MuiOutlinedInput-notchedOutline": {
borderColor: "#fff",
borderWidth: "0.7px",
borderRadius: 3
},
},
// Class for the label of the input field
"& .MuiInputLabel-outlined": {
color: "rgb(197, 222, 199)",
}, backgroundColor: 'rgba(255, 255, 255, 0.3)', backdropFilter: 'blur(5px) saturate(180%)', borderRadius: 3
}} type="text" label="تخفیف چند شرکتی" variant="outlined" size="small" />
</FormControl>

</Stack>
</Stack>

<FormControl>
<TextField onKeyDown={(event) => {
if (event.key === 'Enter') {
handleKeyDown()
}
}} onChange={(e) => setTamdidTakhfif(e.target.value)} InputLabelProps={{ style: { fontSize: '12px' } }} sx={{ backgroundColor: 'rgba(252, 243, 224, 0.1)', backdropFilter: 'blur(5px) saturate(180%)' }} type="text" label="تخفیف تمدید" variant="outlined" size="small" />
</FormControl>
<FormControl>
<TextField onKeyDown={(event) => {
if (event.key === 'Enter') {
handleKeyDown()
}
}} onChange={(e) => setTamdidTakhfif(e.target.value)} InputLabelProps={{ style: { fontSize: '12px' } }} sx={{// Root class for the input field
"& .MuiOutlinedInput-root": {
color: "#fff",
// Class for the border around the input field
"& .MuiOutlinedInput-notchedOutline": {
borderColor: "#fff",
borderWidth: "0.7px",
borderRadius: 3
},
},
// Class for the label of the input field
"& .MuiInputLabel-outlined": {
color: "rgb(197, 222, 199)",
}, backgroundColor: 'rgba(255, 255, 255, 0.3)', backdropFilter: 'blur(5px) saturate(180%)', borderRadius: 3
}} type="text" label="تخفیف تمدید" variant="outlined" size="small" />
</FormControl>

<FormControl sx={{mt:16}}>
<TextField onKeyDown={(event) => {
if (event.key === 'Enter') {
handleKeyDown()
}
}} onChange={(e) => setKarbarEzafeTakhfif(e.target.value)} InputLabelProps={{ style: { fontSize: '12px' } }} sx={{ backgroundColor: 'rgba(252, 243, 224, 0.1)', backdropFilter: 'blur(5px) saturate(180%)' }} type="text" label="تخفیف کاربر " variant="outlined" size="small" />
</FormControl>

<FormControl sx={{mt:16}}>
<TextField onKeyDown={(event) => {
if (event.key === 'Enter') {
handleKeyDown()
}
}} onChange={(e) => setModulesTakhfif(e.target.value)} InputLabelProps={{ style: { fontSize: '12px' } }} sx={{ backgroundColor: 'rgba(252, 243, 224, 0.1)', backdropFilter: 'blur(5px) saturate(180%)' }} type="text" label="تخفیف ماژول" variant="outlined" size="small" />
</FormControl>
<FormControl sx={{ mt: 16 }}>
<TextField onKeyDown={(event) => {
if (event.key === 'Enter') {
handleKeyDown()
}
}} onChange={(e) => setKarbarEzafeTakhfif(e.target.value)} InputLabelProps={{ style: { fontSize: '12px' } }} sx={{// Root class for the input field
"& .MuiOutlinedInput-root": {
color: "#fff",
// Class for the border around the input field
"& .MuiOutlinedInput-notchedOutline": {
borderColor: "#fff",
borderWidth: "0.7px",
borderRadius: 3
},
},
// Class for the label of the input field
"& .MuiInputLabel-outlined": {
color: "rgb(197, 222, 199)",
}, backgroundColor: 'rgba(255, 255, 255, 0.3)', backdropFilter: 'blur(5px) saturate(180%)', borderRadius: 3
}} type="text" label="تخفیف کاربر " variant="outlined" size="small" />
</FormControl>

<FormControl sx={{mt:5}}>
<TextField onKeyDown={(event) => {
if (event.key === 'Enter') {
handleKeyDown()
}
}} onChange={(e) => setKhadamatTakhfif(e.target.value)} InputLabelProps={{ style: { fontSize: '12px' } }} sx={{ backgroundColor: 'rgba(252, 243, 224, 0.1)', backdropFilter: 'blur(5px) saturate(180%)' }} type="text" label="تخفیف خدمات" variant="outlined" size="small" />
</FormControl>
<FormControl sx={{ mt: 16 }}>
<TextField onKeyDown={(event) => {
if (event.key === 'Enter') {
handleKeyDown()
}
}} onChange={(e) => setModulesTakhfif(e.target.value)} InputLabelProps={{ style: { fontSize: '12px' } }} sx={{// Root class for the input field
"& .MuiOutlinedInput-root": {
color: "#fff",
// Class for the border around the input field
"& .MuiOutlinedInput-notchedOutline": {
borderColor: "#fff",
borderWidth: "0.7px",
borderRadius: 3
},
},
// Class for the label of the input field
"& .MuiInputLabel-outlined": {
color: "rgb(197, 222, 199)",
}, backgroundColor: 'rgba(255, 255, 255, 0.3)', backdropFilter: 'blur(5px) saturate(180%)', borderRadius: 3
}} type="text" label="تخفیف ماژول" variant="outlined" size="small" />
</FormControl>

<FormControl sx={{ mt: 5 }}>
<TextField onKeyDown={(event) => {
if (event.key === 'Enter') {
handleKeyDown()
}
}} onChange={(e) => setKhadamatTakhfif(e.target.value)} InputLabelProps={{ style: { fontSize: '12px' } }} sx={{// Root class for the input field
"& .MuiOutlinedInput-root": {
color: "#fff",
// Class for the border around the input field
"& .MuiOutlinedInput-notchedOutline": {
borderColor: "#fff",
borderWidth: "0.7px",
borderRadius: 3
},
},
// Class for the label of the input field
"& .MuiInputLabel-outlined": {
color: "rgb(197, 222, 199)",
}, backgroundColor: 'rgba(255, 255, 255, 0.3)', backdropFilter: 'blur(5px) saturate(180%)', borderRadius: 3
}} type="text" label="تخفیف خدمات" variant="outlined" size="small" />
</FormControl>

</Box>
);
Expand Down
Loading

0 comments on commit b58ae96

Please sign in to comment.