diff --git a/README.md b/README.md index db6c06d..20469bb 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ The objective is to have a self-hosted place to keep useful links in one place, ### Using Docker Compose (Recommended) -1. Make sure Docker docker is installed. +1. Make sure docker is installed. 2. Clone this repository. diff --git a/package-lock.json b/package-lock.json index 73a7899..182ff6b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "@testing-library/user-event": "^13.5.0", "nanoid": "^3.3.4", "react": "^18.0.0", + "react-awesome-button": "^6.5.1", "react-dom": "^18.0.0", "react-lazyload": "^3.2.0", "react-loader-spinner": "^6.0.0-0", @@ -13265,6 +13266,14 @@ "node": ">=14" } }, + "node_modules/react-awesome-button": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/react-awesome-button/-/react-awesome-button-6.5.1.tgz", + "integrity": "sha512-94AS4BSIgRCMSHq8wcy3ztostjLK8cqjUX6DT5oWiYNs3uxLv5uk4yFMlzXBjo0I4TERLOZGn66q0xwb+xw5qw==", + "dependencies": { + "web-animation-club": "^0.6.0" + } + }, "node_modules/react-dev-utils": { "version": "12.0.0", "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.0.tgz", @@ -15536,6 +15545,11 @@ "minimalistic-assert": "^1.0.0" } }, + "node_modules/web-animation-club": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/web-animation-club/-/web-animation-club-0.6.0.tgz", + "integrity": "sha512-9W+EQu1HiaPLe/7WZlhJ2ULqQ4VL80RPDYW+ZcjfTKp6ayOuT1k3SVO6+tu0VBRmOqueJ/mrG+rjjInIv8Aglg==" + }, "node_modules/web-vitals": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-2.1.4.tgz", @@ -25762,6 +25776,14 @@ "whatwg-fetch": "^3.6.2" } }, + "react-awesome-button": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/react-awesome-button/-/react-awesome-button-6.5.1.tgz", + "integrity": "sha512-94AS4BSIgRCMSHq8wcy3ztostjLK8cqjUX6DT5oWiYNs3uxLv5uk4yFMlzXBjo0I4TERLOZGn66q0xwb+xw5qw==", + "requires": { + "web-animation-club": "^0.6.0" + } + }, "react-dev-utils": { "version": "12.0.0", "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.0.tgz", @@ -27444,6 +27466,11 @@ "minimalistic-assert": "^1.0.0" } }, + "web-animation-club": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/web-animation-club/-/web-animation-club-0.6.0.tgz", + "integrity": "sha512-9W+EQu1HiaPLe/7WZlhJ2ULqQ4VL80RPDYW+ZcjfTKp6ayOuT1k3SVO6+tu0VBRmOqueJ/mrG+rjjInIv8Aglg==" + }, "web-vitals": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-2.1.4.tgz", diff --git a/package.json b/package.json index 4e18806..9a384f6 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "@testing-library/user-event": "^13.5.0", "nanoid": "^3.3.4", "react": "^18.0.0", + "react-awesome-button": "^6.5.1", "react-dom": "^18.0.0", "react-lazyload": "^3.2.0", "react-loader-spinner": "^6.0.0-0", diff --git a/src/App.js b/src/App.js index dcc5e5f..3734df8 100644 --- a/src/App.js +++ b/src/App.js @@ -13,6 +13,8 @@ import SideBar from "./componets/SideBar"; import Tags from "./routes/Tags.js"; import Collections from "./routes/Collections.js"; import { Route, Routes } from "react-router-dom"; +import { AwesomeButton } from "react-awesome-button"; +import "react-awesome-button/dist/themes/theme-blue.css"; function App() { const [data, setData] = useState([]), @@ -58,7 +60,6 @@ function App() { function SetPath(pathname) { setPath(pathname); - console.log(path) } const filteredData = filter(data, searchQuery, filterCheckbox); @@ -80,7 +81,7 @@ function App() { useEffect(() => { const currentURL = new URL(window.location.href); SetPath(currentURL.pathname); - }, [path]) + }, [path]); useEffect(() => { fetchData(); @@ -108,13 +109,17 @@ function App() {
- +
+ +  + +
+ - - - + + + setLightMode(!lightMode)} + style={{ marginLeft: "10px" }} + > +
+
{filterBox ? ( @@ -159,8 +176,6 @@ function App() { /> ) : null} - - {loader ? : null}
diff --git a/src/componets/AddItem.js b/src/componets/AddItem.js index 848549c..b3019e6 100644 --- a/src/componets/AddItem.js +++ b/src/componets/AddItem.js @@ -3,6 +3,8 @@ import "../styles/SendItem.css"; import TagSelection from "./TagSelection"; import addItem from "../modules/send"; import CollectionSelection from "./CollectionSelection"; +import { AwesomeButton } from "react-awesome-button"; +import "react-awesome-button/dist/themes/theme-blue.css"; const AddItem = ({ onExit, @@ -81,9 +83,20 @@ const AddItem = ({ collections={collections} lightMode={lightMode} /> - +
+ + Add  + +
diff --git a/src/componets/CollectionSelection.js b/src/componets/CollectionSelection.js index a20999a..148aeb7 100644 --- a/src/componets/CollectionSelection.js +++ b/src/componets/CollectionSelection.js @@ -33,7 +33,7 @@ export default function CollectionSelection({ borderColor: "rgb(141, 141, 141)", opacity: "90%", color: "gray", - background: lightMode ? "lightyellow" : "#273949", + background: lightMode ? "#e0e0e0" : "#273949", boxShadow: "rgba(0, 0, 0, 0.16) 0px 3px 6px, rgba(0, 0, 0, 0.23) 0px 3px 6px", }), @@ -55,7 +55,7 @@ export default function CollectionSelection({ control: (provided, state) => ({ ...provided, - background: lightMode ? "lightyellow" : "#273949", + background: lightMode ? "#e0e0e0" : "#273949", border: "none", borderRadius: "0px", boxShadow: state.isFocused diff --git a/src/componets/EditItem.js b/src/componets/EditItem.js index 26f637e..09ab412 100644 --- a/src/componets/EditItem.js +++ b/src/componets/EditItem.js @@ -4,6 +4,8 @@ import "../styles/SendItem.css"; import TagSelection from "./TagSelection"; import editItem from "../modules/send"; import CollectionSelection from "./CollectionSelection"; +import { AwesomeButton } from "react-awesome-button"; +import "react-awesome-button/dist/themes/theme-blue.css"; const EditItem = ({ tags, @@ -66,10 +68,15 @@ const EditItem = ({
-

Edit Link

- +

Edit Link

+ +  +

@@ -107,7 +114,7 @@ const EditItem = ({ lightMode={lightMode} />

- Collection: (Optional) + Collection: (Optional)

- +
diff --git a/src/componets/Filters.js b/src/componets/Filters.js index cf97580..588bc4c 100644 --- a/src/componets/Filters.js +++ b/src/componets/Filters.js @@ -1,5 +1,7 @@ import "../styles/Filters.css"; import { useState } from "react"; +import { AwesomeButton } from "react-awesome-button"; +import "react-awesome-button/dist/themes/theme-blue.css"; const Filters = ({ filterCheckbox, @@ -41,7 +43,7 @@ const Filters = ({