Merge branch 'main' into edit-share

AOSSIE-Org · Jan 7, 2025 · d0ae719 · d0ae719
2 parents 1e70092 + 75682a0
commit d0ae719
Show file tree

Hide file tree

Showing 24 changed files with 713 additions and 293 deletions.
diff --git a/backend/images/PictoPy.thumbnails/PictoPy_Logo.png b/backend/images/PictoPy.thumbnails/PictoPy_Logo.png
diff --git a/frontend/.prettierrc b/frontend/.prettierrc
@@ -1,7 +1,7 @@
 {
-    "semi": true,
-    "singleQuote": true,
-    "tabWidth": 2,
-    "trailingComma": "all",
-    "plugins": ["prettier-plugin-tailwindcss"]
-  }
+  "semi": true,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "trailingComma": "all",
+  "plugins": ["prettier-plugin-tailwindcss"]
+}
diff --git a/frontend/index.html b/frontend/index.html
@@ -5,6 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Tauri + React + Typescript</title>
+
   </head>
 
   <body>

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -30,6 +30,9 @@
     "ldrs": "^1.0.2",
     "lucide-react": "^0.400.0",
     "react": "^18.2.0",
+    "react-colorful": "^5.6.1",
+    "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",

diff --git a/frontend/postcss.config.js b/frontend/postcss.config.js
@@ -1,7 +1,7 @@
-const postcssConfig =  {
+const postcssConfig = {
   plugins: {
     tailwindcss: {},
     autoprefixer: {},
   },
-}
-export default postcssConfig
+};
+export default postcssConfig;
diff --git a/frontend/src/App.css b/frontend/src/App.css
@@ -2,10 +2,10 @@
 @tailwind components;
 @tailwind utilities;
 
-  @layer base {
-    :root {
-      --background: 0 0% 100%;
-      --foreground: 0 0% 0%;
+@layer base {
+  :root {
+    --background: 0 0% 100%;
+    --foreground: 0 0% 0%;
 
     --card: 0 0% 100%;
     --card-foreground: 222.2 84% 4.9%;
@@ -32,39 +32,38 @@
     --input: 214.3 31.8% 91.4%;
     --ring: 222.2 84% 4.9%;
 
-      --radius: 0.5rem;
-    }
+    --radius: 0.5rem;
+  }
 
-    .dark {
-      --background: 221, 39%, 11%;
-      --foreground: 0 0% 100%;
+  .dark {
+    --background: 221, 39%, 11%;
+    --foreground: 0 0% 100%;
 
-      --card: 222.2 84% 4.9%;
-      --card-foreground: 210 40% 98%;
+    --card: 222.2 84% 4.9%;
+    --card-foreground: 210 40% 98%;
 
-      --popover: 222.2 84% 4.9%;
-      --popover-foreground: 210 40% 98%;
+    --popover: 222.2 84% 4.9%;
+    --popover-foreground: 210 40% 98%;
 
-      --primary: 210 40% 98%;
-      --primary-foreground: 222.2 47.4% 11.2%;
+    --primary: 210 40% 98%;
+    --primary-foreground: 222.2 47.4% 11.2%;
 
-      --secondary: 217.2 32.6% 17.5%;
-      --secondary-foreground: 210 40% 98%;
+    --secondary: 217.2 32.6% 17.5%;
+    --secondary-foreground: 210 40% 98%;
 
-      --muted: 217.2 32.6% 17.5%;
-      --muted-foreground: 215 20.2% 65.1%;
+    --muted: 217.2 32.6% 17.5%;
+    --muted-foreground: 215 20.2% 65.1%;
 
-      --accent: 217.2 32.6% 17.5%;
-      --accent-foreground: 210 40% 98%;
+    --accent: 217.2 32.6% 17.5%;
+    --accent-foreground: 210 40% 98%;
 
-      --destructive: 0 62.8% 30.6%;
-      --destructive-foreground: 210 40% 98%;
+    --destructive: 0 62.8% 30.6%;
+    --destructive-foreground: 210 40% 98%;
 
-      --border: 217.2 32.6% 17.5%;
-      --input: 217.2 32.6% 17.5%;
-      --ring: 212.7 26.8% 83.9%;
-    }
-
+    --border: 217.2 32.6% 17.5%;
+    --input: 217.2 32.6% 17.5%;
+    --ring: 212.7 26.8% 83.9%;
+  }
 }
 
 @layer base {
@@ -83,4 +82,3 @@
   -ms-overflow-style: none;
   scrollbar-width: none;
 }
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ @@
         <link rel="icon" type="image/svg+xml" href="/vite.svg" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <title>Tauri + React + Typescript</title>
       </head>
       <body>
@@ Expand Down @@