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

Release-14-12 #521

Merged
merged 57 commits into from
Dec 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
5292ca9
added subsuper in voice over
sagarika-padmanaban Sep 29, 2023
c1b0199
Merge branch 'develop2' of https://github.com/AI4Bharat/Chitralekha-F…
sagarika-padmanaban Nov 24, 2023
09cd0ec
updated frontend code structure
sagarika-padmanaban Nov 29, 2023
c3db0ff
Merge branch 'develop2' of https://github.com/AI4Bharat/Chitralekha-F…
sagarika-padmanaban Nov 29, 2023
fc0f714
Merge branch 'develop2' into nl-ui
sagarika-padmanaban Nov 29, 2023
1f10b45
improves ui
sagarika-padmanaban Dec 3, 2023
c39b25c
Merge branch 'develop2' of https://github.com/AI4Bharat/Chitralekha-F…
sagarika-padmanaban Dec 3, 2023
bdcbf90
Merge branch 'develop2' into nl-ui
sagarika-padmanaban Dec 3, 2023
cdd4cb5
added text Powered by EkStep Foundation
MrigankTarento Dec 6, 2023
00a06a0
cl-575 fix for last subtitle holding on to the mouse click issue
Chetan-Gudagamanal Dec 7, 2023
d87b610
added new ui to newsletter
sagarika-padmanaban Dec 7, 2023
2db94cb
Merge branch 'develop2' of https://github.com/AI4Bharat/Chitralekha-F…
sagarika-padmanaban Dec 7, 2023
44535fb
added new ui to newsletter
sagarika-padmanaban Dec 7, 2023
c74b99d
added new ui to newsletter
sagarika-padmanaban Dec 7, 2023
ade2c60
updated the mails in profile
sagarika-padmanaban Dec 7, 2023
2131b8e
fixed the error which was showing up while editing the "seconds" part…
Chetan-Gudagamanal Dec 8, 2023
e927c99
Merge pull request #515 from AI4Bharat/cl-575-last-sub-drag-issue-fix
AlpanaMajhi Dec 8, 2023
288567e
resolved issues
sagarika-padmanaban Dec 8, 2023
8a44598
Merge branch 'develop2' of https://github.com/AI4Bharat/Chitralekha-F…
sagarika-padmanaban Dec 8, 2023
a030803
resolved issues
sagarika-padmanaban Dec 8, 2023
f225f24
Merge branch 'develop2' into nl-ui
sagarika-padmanaban Dec 8, 2023
fe7d772
resolved issues
sagarika-padmanaban Dec 11, 2023
0079337
resolved issues
sagarika-padmanaban Dec 11, 2023
540e379
resolved issues
sagarika-padmanaban Dec 11, 2023
deaf063
resolved issues
sagarika-padmanaban Dec 11, 2023
c272a8b
Merge branch 'develop2' into nl-ui
sagarika-padmanaban Dec 11, 2023
c760aab
CL-584 sorted org task list on the based on description, createdAt, u…
harsh12-99 Dec 12, 2023
3eb9ff0
CL-584 -- fixed query endpoints
harsh12-99 Dec 12, 2023
2c59143
Merge pull request #517 from AI4Bharat/resolved_error_while_last_card…
AlpanaMajhi Dec 12, 2023
632d5e4
Merge pull request #519 from AI4Bharat/CL-584
AlpanaMajhi Dec 12, 2023
45c108d
Speaker info
AlpanaMajhi Dec 12, 2023
c91a7f6
Merge branch 'develop2' of https://github.com/AI4Bharat/Chitralekha-F…
AlpanaMajhi Dec 12, 2023
093d17b
sorted project task list and added bg music in VO task export
harsh12-99 Dec 13, 2023
d65c39a
Merge pull request #520 from AI4Bharat/CL-579
harsh12-99 Dec 13, 2023
d806a25
resolved issues
sagarika-padmanaban Dec 13, 2023
731ca54
Merge branch 'develop2' of https://github.com/AI4Bharat/Chitralekha-F…
sagarika-padmanaban Dec 13, 2023
0c93a80
Merge branch 'develop2' into nl-ui
sagarika-padmanaban Dec 13, 2023
9981755
refactor
AlpanaMajhi Dec 13, 2023
903fcbe
remove logs
AlpanaMajhi Dec 13, 2023
14077a8
resolved issues
sagarika-padmanaban Dec 13, 2023
8a722e1
resolved issues
sagarika-padmanaban Dec 13, 2023
05798df
fixed new letter subscription functionality
harsh12-99 Dec 13, 2023
6a139ae
resolved issues
sagarika-padmanaban Dec 13, 2023
f384474
Merge branch 'news-enhancement' into nl-ui
sagarika-padmanaban Dec 13, 2023
54ee1e4
resolved issues
sagarika-padmanaban Dec 13, 2023
128beb5
unsubscribe
AlpanaMajhi Dec 13, 2023
a9417e5
Merge branch 'nl-ui' of https://github.com/AI4Bharat/Chitralekha-Fron…
AlpanaMajhi Dec 13, 2023
ba34199
Merge branch 'news-enhancement' into nl-ui
AlpanaMajhi Dec 13, 2023
3ab26c6
resolved issues
sagarika-padmanaban Dec 13, 2023
ba6e7eb
Merge branch 'nl-ui' of https://github.com/AI4Bharat/Chitralekha-Fron…
AlpanaMajhi Dec 13, 2023
e8922a8
label changed
AlpanaMajhi Dec 13, 2023
6eb236c
resolved issues
sagarika-padmanaban Dec 13, 2023
4724c0a
Merge branch 'develop2' into nl-ui
sagarika-padmanaban Dec 13, 2023
2ddeda9
resolved issues
sagarika-padmanaban Dec 13, 2023
91d3cd9
update email
AlpanaMajhi Dec 14, 2023
4e377d1
release-14-12
AlpanaMajhi Dec 14, 2023
a4a79d3
Merge branch 'master' into release-14-12
AlpanaMajhi Dec 14, 2023
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
15,633 changes: 10,460 additions & 5,173 deletions package-lock.json

Large diffs are not rendered by default.

15 changes: 10 additions & 5 deletions src/common/ExportDialog.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
Typography,
} from "@mui/material";
import CloseIcon from "@mui/icons-material/Close";
import { speakerInfoOptions } from "config";
import { speakerInfoOptions, bgMusicOptions } from "config";

const ExportDialog = ({
open,
Expand All @@ -27,7 +27,8 @@ const ExportDialog = ({
handleExportSubmitClick,
handleExportRadioButtonChange,
}) => {
const { transcription, translation, voiceover, speakerInfo } = exportTypes;
const { transcription, translation, voiceover, speakerInfo, bgMusic } =
exportTypes;

const transcriptExportTypes = useSelector(
(state) => state.getTranscriptExportTypes.data.export_types
Expand Down Expand Up @@ -119,7 +120,7 @@ const ExportDialog = ({
{!taskType?.includes("VOICEOVER") ? (
<>
<DialogContentText id="select-speaker-info" sx={{ mt: 2 }}>
Select Speaker Info
Speaker Info
</DialogContentText>
<DialogActions sx={{ my: 1, justifyContent: "flex-start" }}>
<FormControl>
Expand All @@ -140,8 +141,12 @@ const ExportDialog = ({
</DialogActions>
</>
) : (
<></>
)}

{taskType?.includes("VOICEOVER") && (
<>
{/* <DialogContentText id="select-speaker-info" sx={{ mt: 2 }}>
<DialogContentText id="select-speaker-info" sx={{ mt: 2 }}>
Background Music
</DialogContentText>
<DialogActions sx={{ my: 1, justifyContent: "flex-start" }}>
Expand All @@ -160,7 +165,7 @@ const ExportDialog = ({
))}
</RadioGroup>
</FormControl>
</DialogActions> */}
</DialogActions>
</>
)}

Expand Down
7 changes: 6 additions & 1 deletion src/common/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,12 @@ const Footer = () => {
lg={7}
xl={7}
className={classes.footerGrid}
></Grid>
>
<Typography variant="caption" sx={{ color: "white" }}>
{" "}
Powered by EkStep Foundation{" "}
</Typography>{" "}
</Grid>

<Grid
item
Expand Down
10 changes: 9 additions & 1 deletion src/common/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,12 @@ const Header = () => {
<Toolbar disableGutters className={classes.toolbar}>
<Box
display="flex"
flexDirection="row"
flexWrap={"wrap"}
alignItems="center"
justifyContent="space-evenly" // Add justifyContent to distribute space between items
onClick={() => navigate("/login")}
style={{cursor: "pointer"}}
style={{ cursor: "pointer" }}
>
<img
src={"Chitralekha_Logo_Transparent.png"}
Expand All @@ -168,8 +171,13 @@ const Header = () => {
<Typography variant="h4" sx={{ color: "black" }}>
Chitralekha
</Typography>
<Typography sx={{ fontSize: "0.7rem", fontWeight: "500", color: "#000000", margin: "auto" }}>
Powered by EkStep Foundation
</Typography>
</Box>



<Grid
container
direction="row"
Expand Down
5 changes: 5 additions & 0 deletions src/common/IntroHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
Toolbar,
IconButton,
Button,
Typography,
} from "@mui/material";

const drawerWidth = 240;
Expand Down Expand Up @@ -100,6 +101,10 @@ function IntroHeader(props) {
Use Cases
</Button>
</Grid>
<Grid><Typography sx={{position: "absolute", bottom: 50, right: 1, left: 1, fontSize: "0.7rem", fontWeight: "500", color: "#000000", marginTop: "auto" }}>
Powered by EkStep Foundation
</Typography></Grid>

</Grid>
</Box>
);
Expand Down
47 changes: 25 additions & 22 deletions src/common/MobileNavbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,17 @@ function MobileNavbar({ UserMenu, SettingsMenu }) {
<Box >
<List>
{tabs.map((tab, index) => (
<ListItem key={index} onClick={() => setOpenDrawer(false)}>
<Typography variant="body1">
<NavLink
to=""
className={classes.headerMenu}
activeClassName={classes.highlightedMenu}
>
{tab.name}
</NavLink>
</Typography>
</ListItem>
<ListItem key={index} onClick={() => setOpenDrawer(false)}>
<Typography variant="body1">
<NavLink
to=""
className={classes.headerMenu}
activeClassName={classes.highlightedMenu}
>
{tab.name}
</NavLink>
</Typography>
</ListItem>
))}
</List>
</Box>
Expand Down Expand Up @@ -197,19 +197,22 @@ function MobileNavbar({ UserMenu, SettingsMenu }) {
padding: "0 5%",
}}
>
<Box display="flex" alignItems="center">
<img
src={"Chitralekha_Logo_Transparent.png"}
alt="logo"
className={classes.headerLogo}
/>
<Typography
variant="h3"
sx={{ color: "black", marginLeft: "10px" }}
>
Chitralekha
<Box display="flex" flexDirection="column" alignItems="center">
<Box display="flex" alignItems="center">
<img
src={"Chitralekha_Logo_Transparent.png"}
alt="logo"
className={classes.headerLogo}
/>
<Typography variant="h3" sx={{ color: "black", marginLeft: "10px" }}>
Chitralekha
</Typography>
</Box>
<Typography sx={{ fontSize: "0.7rem", fontWeight: "500", color: "#000000", marginTop: "auto" }}>
Powered by EkStep Foundation
</Typography>
</Box>

<Grid item>
<IconButton onClick={() => setOpenDrawer(!openDrawer)}>
<MenuIcon />
Expand Down
1 change: 1 addition & 0 deletions src/config/apiendpoint.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const endpoints = {
getUserDetails: "/users/account/",
addOrganizationMember: "/users/invite/generate/",
updateEmail: "/users/account/update_email/",
updateNewsLetterEmail: "/newsletter/update_email/",
verifyUpdateEmail: "/users/account/verify_email_updation/",
updateProfile: "/users/account/update/",
changePassword: "/users/auth/users/set_password/",
Expand Down
87 changes: 0 additions & 87 deletions src/config/tableColumns.js
Original file line number Diff line number Diff line change
Expand Up @@ -270,51 +270,6 @@ export const taskListColumns = [
customBodyRender: renderTaskListColumnCell,
},
},
{
name: "created_at",
label: "Created At",
options: {
display: false,
customBodyRender: (value, tableMeta) => {
const { tableData: data, rowIndex } = tableMeta;
const selectedTask = data[rowIndex];

return (
<Box
style={{
color: selectedTask.is_active ? "" : "grey",
}}
>
{moment(value).format("DD/MM/YYYY HH:mm:ss")}
</Box>
);
},
},
},

{
name: "updated_at",
label: "Updated At",
options: {
display: false,
customBodyRender: (value, tableMeta) => {
const { tableData: data, rowIndex } = tableMeta;
const selectedTask = data[rowIndex];

return (
<Box
style={{
color: selectedTask.is_active ? "" : "grey",
}}
>
{moment(value).format("DD/MM/YYYY HH:mm:ss")}
</Box>
);
},
},
},


{
name: "src_language_label",
label: "Source Language",
Expand Down Expand Up @@ -375,48 +330,6 @@ export const orgTaskListColumns = [
customBodyRender: renderTaskListColumnCell,
},
},
{
name: "created_at",
label: "Created At",
options: {
display: false,
customBodyRender: (value, tableMeta) => {
const { tableData: data, rowIndex } = tableMeta;
const selectedTask = data[rowIndex];

return (
<Box
style={{
color: selectedTask.is_active ? "" : "grey",
}}
>
{moment(value).format("DD/MM/YYYY HH:mm:ss")}
</Box>
);
},
},
},
{
name: "updated_at",
label: "Updated At",
options: {
display: false,
customBodyRender: (value, tableMeta) => {
const { tableData: data, rowIndex } = tableMeta;
const selectedTask = data[rowIndex];

return (
<Box
style={{
color: selectedTask.is_active ? "" : "grey",
}}
>
{moment(value).format("DD/MM/YYYY HH:mm:ss")}
</Box>
);
},
},
},
{
name: "src_language_label",
label: "Source Language",
Expand Down
Loading
Loading