diff --git a/assets/icons/128x128.png b/assets/icons/128x128.png deleted file mode 100644 index 490a6e5..0000000 Binary files a/assets/icons/128x128.png and /dev/null differ diff --git a/assets/icons/16x16.png b/assets/icons/16x16.png deleted file mode 100644 index bb2a806..0000000 Binary files a/assets/icons/16x16.png and /dev/null differ diff --git a/assets/icons/24x24.png b/assets/icons/24x24.png deleted file mode 100644 index bb2a806..0000000 Binary files a/assets/icons/24x24.png and /dev/null differ diff --git a/assets/icons/256x256.png b/assets/icons/256x256.png deleted file mode 100644 index c8c9590..0000000 Binary files a/assets/icons/256x256.png and /dev/null differ diff --git a/assets/icons/32x32.png b/assets/icons/32x32.png deleted file mode 100644 index bb2a806..0000000 Binary files a/assets/icons/32x32.png and /dev/null differ diff --git a/assets/icons/48x48.png b/assets/icons/48x48.png deleted file mode 100644 index 04578be..0000000 Binary files a/assets/icons/48x48.png and /dev/null differ diff --git a/assets/icons/512x512.png b/assets/icons/512x512.png deleted file mode 100644 index 725cff4..0000000 Binary files a/assets/icons/512x512.png and /dev/null differ diff --git a/assets/icons/64x64.png b/assets/icons/64x64.png deleted file mode 100644 index f81c5f0..0000000 Binary files a/assets/icons/64x64.png and /dev/null differ diff --git a/assets/icons/96x96.png b/assets/icons/96x96.png deleted file mode 100644 index 252719d..0000000 Binary files a/assets/icons/96x96.png and /dev/null differ diff --git a/assets/porpora/Hosting for Web.txt b/assets/porpora/Hosting for Web.txt deleted file mode 100644 index bb2c33d..0000000 --- a/assets/porpora/Hosting for Web.txt +++ /dev/null @@ -1,21 +0,0 @@ -In order to use Collletttivo typefaces on your website, you will need to: - -#1 Upload the .woff and .woff2 files to your web server (or .ttf and .woff2 in case of a variable version of the typeface) - -#2 In your site's CSS file, add an @font-face rule, similar to this: - -@font-face { - font-family: "FONT NAME"; - src: url("[directory_folder]/FILE_NAME.woff2") format("woff2"), - url("[directory_folder]/FILE_NAME.woff") format("woff"); -} - -#3 Now that you have defined a font-face rule, you can call it anywhere else in your stylesheet like so: - -h1 { - font-family: "FONT NAME"; -} - - - -PLEASE NOTE: we DO NOT offer a webfoot hosting service, please do not reference the font files on our server when declaring font-face rules on your website. Files might change name and directory over time, breaking your font-face rules. \ No newline at end of file diff --git a/package.json b/package.json index d664f71..ccfc5a0 100644 --- a/package.json +++ b/package.json @@ -93,8 +93,6 @@ "@radix-ui/react-dropdown-menu": "^2.0.5", "@tiptap/extension-character-count": "^2.0.3", "@tiptap/extension-placeholder": "^2.0.3", - "@tiptap/extension-task-item": "^2.0.3", - "@tiptap/extension-task-list": "^2.0.3", "@tiptap/extension-typography": "^2.0.4", "@tiptap/pm": "^2.0.3", "@tiptap/react": "^2.0.3", @@ -111,7 +109,6 @@ "openai": "4.0.0-beta.6", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-dropzone": "^14.2.3", "react-router-dom": "^6.11.2", "use-count-up": "^3.0.1" }, @@ -265,4 +262,4 @@ ], "logLevel": "quiet" } -} \ No newline at end of file +} diff --git a/src/renderer/context/PilesContext.js b/src/renderer/context/PilesContext.js index 60db46d..cb3dbde 100644 --- a/src/renderer/context/PilesContext.js +++ b/src/renderer/context/PilesContext.js @@ -12,6 +12,7 @@ export const availableThemes = { light: { primary: '#4d80e6', secondary: '#fff' }, purple: { primary: '#d014e1', secondary: '#fff' }, yellow: { primary: '#ff9634', secondary: '#fff' }, + green: { primary: '#22ff00', secondary: '#fff' }, }; export const PilesContext = createContext(); diff --git a/src/renderer/pages/Pile/Editor/index.jsx b/src/renderer/pages/Pile/Editor/index.jsx index 95a2373..d79fd08 100644 --- a/src/renderer/pages/Pile/Editor/index.jsx +++ b/src/renderer/pages/Pile/Editor/index.jsx @@ -5,15 +5,12 @@ import { Extension } from '@tiptap/core'; import { useEditor, EditorContent } from '@tiptap/react'; import StarterKit from '@tiptap/starter-kit'; import CharacterCount from '@tiptap/extension-character-count'; -import TaskItem from '@tiptap/extension-task-item'; -import TaskList from '@tiptap/extension-task-list'; import Typography from '@tiptap/extension-typography'; import Placeholder from '@tiptap/extension-placeholder'; import { DiscIcon, PhotoIcon, TrashIcon, TagIcon } from 'renderer/icons'; import { motion, AnimatePresence } from 'framer-motion'; import { postFormat } from 'renderer/utils/fileOperations'; import { useParams } from 'react-router-dom'; -import { useDropzone } from 'react-dropzone'; import TagButton from './TagButton'; import TagList from './TagList'; import Attachments from './Attachments'; diff --git a/src/renderer/pages/Pile/Layout.tsx b/src/renderer/pages/Pile/Layout.tsx index f759eb0..9324510 100644 --- a/src/renderer/pages/Pile/Layout.tsx +++ b/src/renderer/pages/Pile/Layout.tsx @@ -26,6 +26,8 @@ export default function PileLayout({ children }) { return styles.purpleTheme; case 'yellow': return styles.yellowTheme; + case 'green': + return styles.greenTheme; default: break; } diff --git a/src/renderer/pages/Pile/PileLayout.module.scss b/src/renderer/pages/Pile/PileLayout.module.scss index 3a6439f..ffa71bb 100644 --- a/src/renderer/pages/Pile/PileLayout.module.scss +++ b/src/renderer/pages/Pile/PileLayout.module.scss @@ -11,18 +11,18 @@ --nav-height: 52px; --primary: #57168c; --secondary: #794d92; - --base: #d014e1; - --base-hover: #df38e5; + --base: #b846ff; + --base-hover: #c66aff; --base-yellow: #e6e04d; --base-green: #4de64d; --base-red: #ff2a2a; --base-red-light: #ffdbdb; - --active: #e1ff8e; - --active-hover: #946d00; + --active: #ff5e00; + --active-hover: #ff712a; --active-text: #fff; --border: #be84dd; --bg: #f9eeff; - --bg-secondary: rgb(195, 129, 226); + --bg-secondary: rgb(229, 174, 255); --bg-tertiary: rgb(207, 178, 225); --bg-color-secondary-hover: rgb(226, 226, 226); @@ -96,6 +96,52 @@ } } +.greenTheme { + --brand: #00ff29; + --translucent: rgba(173, 138, 193, 0.5); + --sidebar-width: 250px; + --nav-height: 52px; + --primary: #1b4109; + --secondary: #40881e; + --base: #22ff00; + --base-hover: #c5751f; + --base-yellow: #e6e04d; + --base-green: #4de64d; + --base-red: #ff3512; + --base-red-light: #ffdbdb; + --active: #193bff; + --active-hover: #001e94; + --active-text: #fff; + --border: #81f646; + --bg: #eeffee; + --bg-secondary: rgb(75, 196, 69); + --bg-tertiary: rgb(178, 225, 180); + --bg-color-secondary-hover: rgb(226, 226, 226); + + @media (prefers-color-scheme: dark) { + --translucent: rgba(13, 10, 35, 0.5); + --sidebar-width: 250px; + --nav-height: 52px; + --primary: #f5fff0; + --secondary: #95ae92; + --base: #149800; + --base-hover: #10c500; + --base-yellow: #776b0e; + --base-green: #128212; + --base-red: rgb(255, 71, 71); + --base-red-light: #3d2323; + --active: #ffaa00; + --active-hover: #df7000; + --active-text: #fff; + --border: #3e7138; + --bg: #212621; + --bg-secondary: #20381e; + --bg-tertiary: #2d3d29; + --bg-color-secondary-hover: rgb(97, 122, 95); + --bg-translucent: rgba(32, 10, 35, 0.45); + } +} + .bg { position: fixed; top: 0; diff --git a/yarn.lock b/yarn.lock index ceae0ad..6043448 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2241,16 +2241,6 @@ resolved "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-2.1.12.tgz#2b049aedf2985e9c9e3c3f1cc0b203a574c85bd8" integrity sha512-HlhrzIjYUT8oCH9nYzEL2QTTn8d1ECnVhKvzAe6x41xk31PjLMHTUy8aYjeQEkWZOWZ34tiTmslV1ce6R3Dt8g== -"@tiptap/extension-task-item@^2.0.3": - version "2.1.12" - resolved "https://registry.yarnpkg.com/@tiptap/extension-task-item/-/extension-task-item-2.1.12.tgz#944eacf6f0ed1a430d807217d62b49ccef3956e1" - integrity sha512-uqrDTO4JwukZUt40GQdvB6S+oDhdp4cKNPMi0sbteWziQugkSMLlkYvxU0Hfb/YeziaWWwFI7ssPu/hahyk6dQ== - -"@tiptap/extension-task-list@^2.0.3": - version "2.1.12" - resolved "https://registry.yarnpkg.com/@tiptap/extension-task-list/-/extension-task-list-2.1.12.tgz#adbfb5a5b990d6f189c776b45de2d2c5bb77e963" - integrity sha512-BUpYlEWK+Q3kw9KIiOqvhd0tUPhMcOf1+fJmCkluJok+okAxMbP1umAtCEQ3QkoCwLr+vpHJov7h3yi9+dwgeQ== - "@tiptap/extension-text@^2.1.12": version "2.1.12" resolved "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-2.1.12.tgz#466e3244bdd9b2db2304c0c9a1d51ce59f5327d0" @@ -3526,11 +3516,6 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -attr-accept@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.2.2.tgz#646613809660110749e92f2c10833b70968d929b" - integrity sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg== - available-typed-arrays@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" @@ -5832,13 +5817,6 @@ file-loader@^6.2.0: loader-utils "^2.0.0" schema-utils "^3.0.0" -file-selector@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.6.0.tgz#fa0a8d9007b829504db4d07dd4de0310b65287dc" - integrity sha512-QlZ5yJC0VxHxQQsQhXvBaC7VRJ2uaxTf+Tfpu4Z/OcVQJVpZO+DGU0rkoVW5ce2SccxugvpBJoMvUs59iILYdw== - dependencies: - tslib "^2.4.0" - filelist@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" @@ -9273,15 +9251,6 @@ react-dom@^18.2.0: loose-envify "^1.1.0" scheduler "^0.23.0" -react-dropzone@^14.2.3: - version "14.2.3" - resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-14.2.3.tgz#0acab68308fda2d54d1273a1e626264e13d4e84b" - integrity sha512-O3om8I+PkFKbxCukfIR3QAGftYXDZfOE2N1mr/7qebQJHs7U+/RSL/9xomJNpRg9kM5h9soQSdf0Gc7OHF5Fug== - dependencies: - attr-accept "^2.2.2" - file-selector "^0.6.0" - prop-types "^15.8.1" - "react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.0.0, react-is@^18.2.0: version "18.2.0" resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"