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

[WIP] Dialog addapiapp & addopdsfeed #2028

Closed
wants to merge 37 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
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
418 changes: 418 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@
}
},
"dependencies": {
"@radix-ui/react-dialog": "^1.0.5",
"@xmldom/xmldom": "^0.8.10",
"classnames": "^2.5.1",
"commonmark": "^0.30.0",
Expand Down
10 changes: 10 additions & 0 deletions src/renderer/assets/icons/SaveAs-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/renderer/assets/icons/addTag-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions src/renderer/assets/icons/chevron-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/renderer/assets/icons/chevron-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/renderer/assets/icons/followLink-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/renderer/assets/icons/link-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/renderer/assets/icons/ongoingBook-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/renderer/assets/icons/pen-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/renderer/assets/icons/readBook-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/renderer/assets/icons/trash-icon.svg
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/renderer/assets/styles/bookDetailsDialog.css
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@
left: 0;
right: 0;
background: linear-gradient(rgba(255, 255, 255, 0), rgba(255, 255, 255, 1));
height: 2rem;
height: 5rem;
}
}

Expand Down
1 change: 0 additions & 1 deletion src/renderer/assets/styles/components/breadcrumb.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
font-size: 16px;
display: flex;
align-items: center;

/* color: rgb(59, 59, 59); */
color: var(--color-accent);
position: fixed;
Expand Down
78 changes: 62 additions & 16 deletions src/renderer/assets/styles/components/buttons.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@

/* button */

button,
/* button,
.button_primary,
.button_primary_small {
&:not(:last-child) {
margin-right: 10px;
}
}
} */

button {
padding: 0;
Expand All @@ -51,9 +51,25 @@ button {
height: 30px;
fill: var(--color-primary);
cursor: pointer;
display: flex;
align-items: center;
justify-content: center;
gap: 5px;

&:hover {
opacity: 1;
background: transparent;
}

&[type=submit] svg {
width: 13px;
}

&.disabled,
&[disabled] {
opacity: 0.5;
cursor: default;
pointer-events: none;
}
}

Expand Down Expand Up @@ -86,7 +102,6 @@ button {
vertical-align: -2px;
width: auto;
height: 14px;
margin-right: 8px;
transition: all 0.2s;
fill: var(--color-primary);
}
Expand All @@ -97,17 +112,6 @@ button {
margin-left: 8px;
}
}

&.disabled,
&[disabled] {
opacity: 0.5;
cursor: default;
pointer-events: none;

&:hover {
background: transparent;
}
}
}

.button_primary_small,
Expand Down Expand Up @@ -193,7 +197,6 @@ button {
fill: var(--color-accent-contrast);
width: auto;
height: 14px;
margin-right: 8px;
transition: all 0.2s;
}

Expand Down Expand Up @@ -240,7 +243,6 @@ button {

& svg {
width: 18px;
margin-right: 8px;
vertical-align: -3px;
color: var(--color-disabled);
}
Expand Down Expand Up @@ -283,6 +285,50 @@ button {
display: inline-block;
}

.button_primary_blue {
border: 1px solid var(--color-button-primary);
height: 30px;
border-radius: 4px;
padding: 5px;
min-width: 100px;
background-color: var(--color-button-primary);
color: white;

svg {
width: 10px;
fill: white;
}
}

.button_secondary_blue {
border: 1px solid var(--color-button-primary);
height: 30px;
border-radius: 4px;
padding: 5px;
min-width: 100px;
background-color: var(--color-button-secondary);
color: var(--color-button-primary);

svg {
width: 15px;
fill: var(--color-button-primary);
}
}

.button_catalog_infos {
color: var(--color-button-primary);
height: 30px;
border-radius: 4px;
padding: 20px 5px;
background-color: var(--color-button-secondary);
margin: 30px 0;

svg {
width: 20px;
fill: var(--color-button-primary);
}
}

/*

6. .button_keyboard
Expand Down
3 changes: 3 additions & 0 deletions src/renderer/assets/styles/components/buttons.css.d.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
declare const styles: {
readonly "___DEBUG___COMPONENTS_BUTTONS_CSS": string;
readonly "block_line": string;
readonly "button_catalog_infos": string;
readonly "button_icon": string;
readonly "button_keyboard": string;
readonly "button_link": string;
readonly "button_outline_accessibility": string;
readonly "button_primary": string;
readonly "button_primary_blue": string;
readonly "button_primary_form_default": string;
readonly "button_primary_icon": string;
readonly "button_primary_small": string;
readonly "button_refresh": string;
readonly "button_secondary": string;
readonly "button_secondary_blue": string;
readonly "button_see_more": string;
readonly "button_small": string;
readonly "button_transparency": string;
Expand Down
14 changes: 14 additions & 0 deletions src/renderer/assets/styles/components/catalog.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.catalog_infos_text {
margin-bottom: 30px;
font-size: 14px;
max-width: 750px;
a {
color: var(--color-button-primary);
display: flex;
align-items: center;
gap: 5px;
svg {
width: 14px;
}
}
}
Loading
Loading