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.

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

Jump to bottom

[WIP] Dialog addapiapp & addopdsfeed #2028

Closed
wants to merge 37 commits into from
Closed

[WIP] Dialog addapiapp & addopdsfeed #2028

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
c5d0d2a
test implementation Sass sur Settings.tsx
arthur-lemeur Sep 25, 2023
f9b1574
test theme-mode from user system
arthur-lemeur Oct 11, 2023
afb163a
fix CI lint
arthur-lemeur Oct 11, 2023
7ed6c2b
WIP refactor apiApp modal
arthur-lemeur Oct 18, 2023
1b4b213
WIP dialog template
arthur-lemeur Oct 23, 2023
720d6a9
apiApp okay
panaC Oct 23, 2023
0ac91d7
up opds feed add form
panaC Oct 23, 2023
fdd6b1c
update color variables for themes
arthur-lemeur Oct 23, 2023
178fb92
fix: DialogWithRadix typing and context
panaC Oct 25, 2023
c49946b
edit dialogwithradix css
arthur-lemeur Oct 25, 2023
15a1b26
Merge remote-tracking branch 'refs/remotes/origin/arthur/ui/dialog' i…
arthur-lemeur Oct 25, 2023
2fbdb7e
fix css for adding opds modal
arthur-lemeur Oct 25, 2023
ae359be
fix: DialogWithRadix common import
panaC Oct 26, 2023
82bbacc
fix: form end tag in opdsAddFeed
panaC Oct 26, 2023
ce731fa
Merge branch 'develop' into arthur/ui/dialog
panaC Oct 30, 2023
a60ed6d
add color buttons variable
arthur-lemeur Nov 6, 2023
0cdf88d
update sass variables
arthur-lemeur Nov 6, 2023
2c6a08f
Merge branch 'arthur/ui/sass1' into arthur/ui/dialog
arthur-lemeur Nov 6, 2023
5278936
up
arthur-lemeur Nov 6, 2023
7d67fb5
Merge branch 'develop' into arthur/ui/sass1
arthur-lemeur Nov 6, 2023
f281659
package-lock update
arthur-lemeur Nov 6, 2023
9881fc8
Merge branch 'arthur/ui/sass1' into arthur/ui/dialog
arthur-lemeur Nov 6, 2023
8aa3cb0
up CSS pubInfo dialog
arthur-lemeur Nov 7, 2023
416f2e0
update UI publicationInfo dialog
arthur-lemeur Nov 7, 2023
a517b0e
update UI catalog dialogs
arthur-lemeur Nov 8, 2023
e028961
WIP update all dialogs design
arthur-lemeur Nov 13, 2023
8913c15
update buttons disable style
arthur-lemeur Nov 13, 2023
d4e638a
fix lint
arthur-lemeur Nov 13, 2023
67f18bd
Merge branch 'develop' into arthur/ui/dialog
arthur-lemeur Nov 16, 2023
acb8ed9
Merge branch 'develop' into arthur/ui/dialog
panaC Nov 27, 2023
48f4e51
WIP convert opds update to radix
arthur-lemeur Nov 30, 2023
55ac877
Revert "WIP convert opds update to radix"
panaC Nov 30, 2023
b0f77f7
merge from develop
panaC Nov 30, 2023
c225129
Merge branch 'develop' into arthur/ui/dialog
panaC Jan 5, 2024
1582df2
Merge branch 'develop' into arthur/ui/dialog
panaC Jan 10, 2024
d20c1a9
install
panaC Jan 10, 2024
c469b41
up
panaC Jan 10, 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
1 change: 0 additions & 1 deletion src/renderer/assets/styles/components/modals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
color: #3b3b3b;
position: absolute;
box-sizing: border-box;
padding: 0 20px;

@media screen and (width <= 960px) {
width: 100vw;
Expand Down
3 changes: 2 additions & 1 deletion src/renderer/library/components/dialog/ApiappAddForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import * as React from "react";
import * as stylesButtons from "readium-desktop/renderer/assets/styles/components/buttons.css";
import * as stylesInputs from "readium-desktop/renderer/assets/styles/components/inputs.css";
import * as stylesModals from "readium-desktop/renderer/assets/styles/components/modals.css";
import * as magnifyingGlass from "readium-desktop/renderer/assets/icons/magnifying_glass.svg";
import SVG from "readium-desktop/renderer/common/components/SVG";
import { IApiappSearchResultView } from "readium-desktop/common/api/interface/apiappApi.interface";
Expand Down Expand Up @@ -89,7 +90,7 @@ const ApiappAddForm = () => {
const searchResultView = resultApiAppSearchAction?.data?.result || [];

return (
<div style={{display:"flex", flexDirection: "column", width: "100%"}}>
<div className={stylesModals.modal_dialog_body}>
<div
style={{ marginBottom: "0" }}
className={stylesInputs.form_group}>
Expand Down
7 changes: 4 additions & 3 deletions src/renderer/library/components/dialog/OpdsFeedAddForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import * as AddIcon from "readium-desktop/renderer/assets/icons/add-alone.svg";
import { useApi } from "readium-desktop/renderer/common/hooks/useApi";
import { useTranslator } from "readium-desktop/renderer/common/hooks/useTranslator";
import * as stylesInputs from "readium-desktop/renderer/assets/styles/components/inputs.css";
import * as stylesModals from "readium-desktop/renderer/assets/styles/components/modals.css";

export const ApiappAddFormDialog = () => {
const [__] = useTranslator();
Expand Down Expand Up @@ -45,7 +46,7 @@ export const ApiappAddFormDialog = () => {
<DialogCloseButton />
</div>
</DialogHeader>
<form>
<form className={stylesModals.modal_dialog_body}>
<div className={stylesInputs.form_group}>
<label htmlFor="title">{__("opds.addForm.name")}</label>
<input
Expand Down Expand Up @@ -73,15 +74,15 @@ export const ApiappAddFormDialog = () => {
required
/>
</div>
<DialogFooter>
</form>
<DialogFooter>
<DialogClose asChild>
<button className={stylesButtons.button_primary}>{__("dialog.cancel")}</button>
</DialogClose>
<DialogClose asChild>
<button type="submit" disabled={!title || !url} className={stylesButtons.button_secondary} onClick={() => addAction()}>{__("opds.addForm.addButton")}</button>
</DialogClose>
</DialogFooter>
</form>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why move the form end tag : here !!

the submit button is not covered

</DialogWithRadixContent>
</DialogWithRadix>;
};
Expand Down