Docker/flame
Docker/flame
1
0
Fork 0
mirror of https://github.com/pawelmalak/flame.git synced 2025-07-27 14:59:37 +02:00
Code Issues Releases Wiki Activity

Add custom icons to bookmarks (#5)

Browse source 
* allow custom icons for bookmarks

* update docker-image action to tag images based on source branch
This commit is contained in:
François Darveau 2021-06-27 15:17:23 -04:00 • committed by François Darveau
parent de51659647
commit d020fd4c0f
3 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/src/components/Bookmarks/BookmarkForm/BookmarkForm.tsx
View file

@ -42,8 +42,8 @@ const BookmarkForm = (props: ComponentProps): JSX.Element => {
}); });
const [bookmarkData, setBookmarkData] = useState<NewBookmark>({ const [bookmarkData, setBookmarkData] = useState<NewBookmark>({
name: '', name: "",
url: '', url: "",
categoryId: -1, categoryId: -1,
icon: '', icon: '',
}); });
@ -68,8 +68,8 @@ const BookmarkForm = (props: ComponentProps): JSX.Element => {
}); });
} else { } else {
setBookmarkData({ setBookmarkData({
name: '', name: "",
url: '', url: "",
categoryId: -1, categoryId: -1,
icon: '', icon: '',
}); });
@ -113,7 +113,6 @@ const BookmarkForm = (props: ComponentProps): JSX.Element => {
} else { } else {
props.addBookmark(bookmarkData); props.addBookmark(bookmarkData);
} }
setBookmarkData({ setBookmarkData({
name: "", name: "",
url: "", url: "",

6
client/src/components/Bookmarks/Bookmarks.tsx
View file

@ -50,10 +50,10 @@ const Bookmarks = (props: ComponentProps): JSX.Element => {
updatedAt: new Date(), updatedAt: new Date(),
}); });
const [bookmarkInUpdate, setBookmarkInUpdate] = useState<Bookmark>({ const [bookmarkInUpdate, setBookmarkInUpdate] = useState<Bookmark>({
name: "", name: "string",
url: "", url: "string",
categoryId: -1, categoryId: -1,
icon: "", icon: "string",
isPinned: false, isPinned: false,
orderId: 0, orderId: 0,
id: 0, id: 0,

6
controllers/bookmark.js
View file

@ -13,6 +13,12 @@ exports.createBookmark = asyncWrapper(async (req, res, next) => {
}); });
let bookmark; let bookmark;
let _body = { ...req.body };
if (req.file) {
_body.icon = req.file.filename;
}
let _body = { let _body = {
...req.body, ...req.body,