Skip to content

Commit

Permalink
Merge pull request #201 from Rishab87/edit-share
Browse files Browse the repository at this point in the history
Added Edit and Share
  • Loading branch information
Pranav0-0Aggarwal authored Jan 7, 2025
2 parents 75682a0 + d0ae719 commit 6784f5a
Show file tree
Hide file tree
Showing 15 changed files with 735 additions and 26 deletions.
5 changes: 3 additions & 2 deletions frontend/api/api-functions/images.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const parseAndSortImageData = (data: APIResponse['data']): Image[] => {
extractThumbnailPath(data.folder_path, src),
);
return {
imagePath:src,
imagePath: src,
title: src.substring(src.lastIndexOf('\\') + 1),
thumbnailUrl,
url,
Expand All @@ -53,7 +53,8 @@ export const getAllImageObjects = async () => {
const newObj = {
data: parsedAndSortedImages,
success: data.success,
error: data.error,
error: data?.error,
message: data?.message,
};

return newObj;
Expand Down
1 change: 1 addition & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1",
"react-dom": "^18.2.0",
"react-image-crop": "^11.0.7",
"react-icons": "^5.4.0",
"react-router-dom": "^6.24.1",
"tailwind-merge": "^2.3.0",
Expand Down
190 changes: 186 additions & 4 deletions frontend/src-tauri/Cargo.lock

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

1 change: 1 addition & 0 deletions frontend/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ tauri-plugin-shell = "2.0.0-beta.5"
tauri-plugin-dialog = "2.0.0-beta.9"
tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
chrono = "0.4"
image = "0.24.6"

[features]
# This feature is used for production builds or when a dev server is not specified, DO NOT REMOVE!!
Expand Down
Loading

0 comments on commit 6784f5a

Please sign in to comment.