Forced merge: merge ai-dev into master

new app work

.devcontainer/devcontainer.json

@@ -0,0 +1,5 @@
+{
+  "image": "mcr.microsoft.com/devcontainers/universal:2",
+  "remoteUser": "codespace",
+  "overrideCommand": false
+}

backend/yarn.lock

@@ -766,6 +766,13 @@ chokidar@^3.2.2:
   optionalDependencies:
     fsevents "~2.3.2"
 
+chokidar@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.3.tgz#7be37a4c03c9aee1ecfe862a4a23b2c70c205d30"
+  integrity sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==
+  dependencies:
+    readdirp "^4.0.1"
+
 chownr@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
@@ -3395,6 +3402,11 @@ readable-stream@^4.2.0:
     process "^0.11.10"
     string_decoder "^1.3.0"
 
+readdirp@^4.0.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.1.2.tgz#eb85801435fbf2a7ee58f19e0921b068fc69948d"
+  integrity sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==
+
 readdirp@~3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada"

docker/docker-compose.yml

@@ -15,11 +15,6 @@ services:
         max-size: "10m"
         max-file: "3"
   db:
-    logging:
-      driver: json-file
-      options:
-        max-size: "10m"
-        max-file: "3"
     image: postgres
     volumes:
       - ./data/db:/var/lib/postgresql/data
@@ -33,24 +28,20 @@ services:
       options:
         max-size: "10m"
         max-file: "3"
-
   backend:
-    image: backend
-    volumes:
-    - ./wait-for-it.sh:/usr/src/app/wait-for-it.sh
-    - ./start-backend.sh:/usr/src/app/start-backend.sh
     build: ../backend
+    volumes:
+      - ./wait-for-it.sh:/usr/src/app/wait-for-it.sh
+      - ./start-backend.sh:/usr/src/app/start-backend.sh
     environment:
-     - DB_HOST=db
+      - DB_HOST=db
     ports:
-     - "8080:8080"
+      - "8080:8080"
-     logging:
+    logging:
-       driver: json-file
+      driver: json-file
-       options:
+      options:
-         max-size: "10m"
+        max-size: "10m"
-         max-file: "3"
+        max-file: "3"
     depends_on:
-     - "db"
+      - db
-
+    command: ["bash", "./wait-for-it.sh", "db:5432", "--timeout=0", "--strict", "--", "bash", "./start-
-    command: ["bash", "./wait-for-it.sh", "db:5432", "--timeout=0", "--strict", "--", "bash", "./start-backend.sh"]
-

frontend/src/stores/styleSlice.ts

@@ -31,31 +31,31 @@ interface StyleState {
 }
 
 const initialState: StyleState = {
-  asideStyle: styles.pastelEmeraldTheme.aside,
+  asideStyle: styles.white.aside,
   asideScrollbarsStyle: styles.white.asideScrollbars,
   asideBrandStyle: styles.white.asideBrand,
-  asideMenuItemStyle: styles.pastelEmeraldTheme.asideMenuItem,
+  asideMenuItemStyle: styles.white.asideMenuItem,
-  asideMenuItemActiveStyle: styles.pastelEmeraldTheme.asideMenuItemActive,
+  asideMenuItemActiveStyle: styles.white.asideMenuItemActive,
-  activeLinkColor: styles.pastelEmeraldTheme.activeLinkColor,
+  activeLinkColor: styles.white.activeLinkColor,
   asideMenuDropdownStyle: styles.white.asideMenuDropdown,
-  navBarItemLabelStyle: styles.pastelEmeraldTheme.navBarItemLabel,
+  navBarItemLabelStyle: styles.white.navBarItemLabel,
-  navBarItemLabelHoverStyle: styles.pastelEmeraldTheme.navBarItemLabelHover,
+  navBarItemLabelHoverStyle: styles.white.navBarItemLabelHover,
   navBarItemLabelActiveColorStyle:
-    styles.pastelEmeraldTheme.navBarItemLabelActiveColor,
+    styles.white.navBarItemLabelActiveColor,
-  overlayStyle: styles.pastelEmeraldTheme.overlay,
+  overlayStyle: styles.white.overlay,
   darkMode: false,
-  bgLayoutColor: styles.pastelEmeraldTheme.bgLayoutColor,
+  bgLayoutColor: styles.white.bgLayoutColor,
-  iconsColor: styles.pastelEmeraldTheme.iconsColor,
+  iconsColor: styles.white.iconsColor,
-  cardsColor: styles.pastelEmeraldTheme.cardsColor,
+  cardsColor: styles.white.cardsColor,
-  focusRingColor: styles.pastelEmeraldTheme.focusRingColor,
+  focusRingColor: styles.white.focusRingColor,
-  corners: styles.pastelEmeraldTheme.corners,
+  corners: styles.white.corners,
-  cardsStyle: styles.pastelEmeraldTheme.cardsStyle,
+  cardsStyle: styles.white.cardsStyle,
-  linkColor: styles.pastelEmeraldTheme.linkColor,
+  linkColor: styles.white.linkColor,
-  websiteHeder: styles.pastelEmeraldTheme.websiteHeder,
+  websiteHeder: styles.white.websiteHeder,
-  borders: styles.pastelEmeraldTheme.borders,
+  borders: styles.white.borders,
-  shadow: styles.pastelEmeraldTheme.shadow,
+  shadow: styles.white.shadow,
-  websiteSectionStyle: styles.pastelEmeraldTheme.websiteSectionStyle,
+  websiteSectionStyle: styles.white.websiteSectionStyle,
-  textSecondary: styles.pastelEmeraldTheme.textSecondary,
+  textSecondary: styles.white.textSecondary,
 };
 
 export const styleSlice = createSlice({

package-lock.json

@@ -0,0 +1,12 @@
+{
+  "name": "app",
+  "version": "0.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "app",
+      "version": "0.0.0"
+    }
+  }
+}

yarn.lock

@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+