fix: client lint error

Author: otsairaze

client/src/shared/ui/Skeleton/Skeleton.module.scss

@@ -16,7 +16,7 @@
     background: linear-gradient(
       to right,
       transparent 0%,
-      rgba(129 128 128) 50%,
+      rgb(129 128 128) 50%,
       transparent 100%
     );
     content: "";

client/src/shared/ui/Stack/Flex/Flex.module.scss

@@ -10,6 +10,7 @@
   justify-content: flex-start;
 }
 
+<<<<<<< HEAD
 .justify_center {
   justify-content: center;
 }
@@ -19,18 +20,37 @@
 }
 
 .justify_between {
+=======
+.justifyCenter {
+  justify-content: center;
+}
+
+.justifyEnd {
+  justify-content: flex-end;
+}
+
+.justifyBetween {
+>>>>>>> 49a49fd (fix: client lint error)
   justify-content: space-between;
 }
 
 .align_start {
   align-items: flex-start;
 }
 
+<<<<<<< HEAD
 .align_center {
   align-items: center;
 }
 
 .align_end {
+=======
+.alignCenter {
+  align-items: center;
+}
+
+.alignEnd {
+>>>>>>> 49a49fd (fix: client lint error)
   align-items: flex-end;
 }
 

client/src/widgets/AsideMenu/ui/AsideMenu/AsideMenu.tsx

@@ -62,7 +62,7 @@ export const AsideMenu = memo((props: AsideMenuProps) => {
               alt='avatar'
             />
             <Typography tag='h2' variant='bold_20' type='title'>
-              Alex Hexxx
+              Alex Hex
             </Typography>
             <Typography tag='h4' variant='medium_16' type='title'>
               [email protected]

server/docker/entrypoint.sh

@@ -1 +1,11 @@
- 
+ #!/bin/sh
+ set -e
+
+ echo "[DEBUG] Waiting for postgres (sleeping 5s)..."
+ sleep 5
+
+ echo "[DEBUG] Start prisma migration"
+ npx prisma migrate deploy
+
+ echo "[DEBUG] Starting application..."
+ exec node dist/src/main.js