Merge remote-tracking branch 'origin/develop'

backend/project/api/teams/migrations/0001_initial.py

@@ -0,0 +1,45 @@
+# Generated by Django 4.2.11 on 2024-03-31 19:06
+
+from django.conf import settings
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('users', '0002_rename_technologies_user_skills'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Vacancy',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255, verbose_name='название вакансии')),
+                ('start_date', models.DateField(blank=True, null=True, verbose_name='дата начала диапазона возраста участников')),
+                ('end_date', models.DateField(blank=True, null=True, verbose_name='дата конец диапазона возраста участников')),
+                ('skills', models.ManyToManyField(blank=True, to='users.skill', verbose_name='Технологии')),
+                ('specialization', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='users.specialization', verbose_name='специализация')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Team',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('description', models.TextField(verbose_name='описание команды')),
+                ('name', models.CharField(max_length=255, verbose_name='название команды')),
+                ('avatar', models.ImageField(blank=True, upload_to='teams_avatars', verbose_name='аватарка')),
+                ('count_of_members', models.IntegerField(null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxLengthValidator(5)], verbose_name='количество участников')),
+                ('country', models.CharField(blank=True, max_length=255, verbose_name='страна')),
+                ('city', models.CharField(blank=True, max_length=255, verbose_name='город')),
+                ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='teams', to=settings.AUTH_USER_MODEL)),
+                ('members', models.ManyToManyField(to=settings.AUTH_USER_MODEL, verbose_name='участники')),
+                ('vacancies', models.ManyToManyField(to='teams.vacancy', verbose_name='вакансии')),
+            ],
+        ),
+    ]

backend/project/config/settings.py

@@ -44,6 +44,7 @@ INSTALLED_APPS = [
     # Third-party apps
     "rest_framework",
     "rest_framework_simplejwt",
+    "corsheaders",
     "drf_yasg",
     # Developed apps
     "api.ping.apps.PingConfig",
@@ -58,6 +59,8 @@ MIDDLEWARE = [
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
+    "corsheaders.middleware.CorsMiddleware",
+    "django.middleware.common.CommonMiddleware",
 ]
 
 ROOT_URLCONF = "config.urls"

backend/project/notifications/migrations/0002_alter_notification_content.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2024-03-31 19:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('notifications', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='notification',
+            name='content',
+            field=models.TextField(verbose_name='содержание'),
+        ),
+    ]

backend/requirements/lint.txt

@@ -0,0 +1,2 @@
+sort-requirements
+ruff

backend/requirements/prod.txt

@@ -8,5 +8,6 @@ djangorestframework-simplejwt==5.3.1
 django-filter==24.2
 Pillow==10.2.0
 drf-yasg==1.21.7
+django-cors-headers
 setuptools
 bcrypt==4.1.2

frontend/package-lock.json

@@ -1,10 +1,12 @@
 {
+  "name": "skill-hub",
   "name": "skill-hub",
   "version": "0.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
+      "name": "skill-hub",
       "name": "skill-hub",
       "version": "0.0.0",
       "dependencies": {
@@ -19,6 +21,8 @@
         "@radix-ui/react-tabs": "^1.0.4",
         "@vitejs/plugin-react-swc": "^3.5.0",
         "autoprefixer": "^10.4.19",
+        "@vitejs/plugin-react-swc": "^3.5.0",
+        "autoprefixer": "^10.4.19",
         "class-variance-authority": "^0.7.0",
         "clsx": "^2.1.0",
         "cn-decorator": "^2.1.0",
@@ -26,8 +30,10 @@
         "eslint-plugin-react": "^7.34.1",
         "i18next": "^23.10.1",
         "less": "^4.2.0",
+        "less": "^4.2.0",
         "lucide-react": "^0.363.0",
         "postcss": "^8.4.38",
+        "postcss": "^8.4.38",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-hook-form": "^7.51.2",
@@ -36,9 +42,12 @@
         "react-router-dom": "^6.22.3",
         "tailwind-merge": "^2.2.2",
         "tailwindcss": "^3.4.3",
+        "tailwindcss": "^3.4.3",
         "tailwindcss-animate": "^1.0.7",
         "typescript": "^5.2.2",
         "vite": "^5.2.0",
+        "typescript": "^5.2.2",
+        "vite": "^5.2.0",
         "zod": "^3.22.4"
       },
       "devDependencies": {
@@ -54,6 +63,7 @@
         "eslint-plugin-react-hooks": "^4.6.0",
         "eslint-plugin-react-refresh": "^0.4.6",
         "prettier": "^3.2.5"
+        "prettier": "^3.2.5"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -1792,6 +1802,7 @@
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
       "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ=="
+      "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ=="
     },
     "node_modules/@swc/types": {
       "version": "0.1.6",
@@ -1805,6 +1816,7 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
       "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
     },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
@@ -1824,6 +1836,7 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz",
       "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==",
       "devOptional": true,
+      "devOptional": true,
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -2625,6 +2638,11 @@
       "resolved": "https://registry.npmjs.org/cross/-/cross-1.0.0.tgz",
       "integrity": "sha512-p6hXbCnjuIB4bhKWFeztQd7VwffgQP9zOBzUoiA8Lvi01RzQY0e7PbPFU/uqVPTM2stY7uCpVck1UTPpxhinMQ=="
     },
+    "node_modules/cross": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cross/-/cross-1.0.0.tgz",
+      "integrity": "sha512-p6hXbCnjuIB4bhKWFeztQd7VwffgQP9zOBzUoiA8Lvi01RzQY0e7PbPFU/uqVPTM2stY7uCpVck1UTPpxhinMQ=="
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -2811,6 +2829,7 @@
       "version": "1.4.721",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.721.tgz",
       "integrity": "sha512-k1x2r6foI8iJOp+1qTxbbrrWMsOiHkzGBYwYigaq+apO1FSqtn44KTo3Sy69qt7CRr7149zTcsDvH7MUKsOuIQ=="
+      "integrity": "sha512-k1x2r6foI8iJOp+1qTxbbrrWMsOiHkzGBYwYigaq+apO1FSqtn44KTo3Sy69qt7CRr7149zTcsDvH7MUKsOuIQ=="
     },
     "node_modules/emoji-regex": {
       "version": "9.2.2",
@@ -5020,6 +5039,7 @@
       "version": "2.0.14",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
       "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
@@ -6586,6 +6606,7 @@
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
       "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
       "devOptional": true
+      "devOptional": true
     },
     "node_modules/update-browserslist-db": {
       "version": "1.0.13",

frontend/src/components/app/APIurl.ts

@@ -0,0 +1,6 @@
+// export const API_BASE = "http://158.160.56.239:8080/api/"
+// export const API_BASE = "http://212.22.79.188:9090/api/" //2 сервер
+export const API_BASE = "http://localhost:8080/api/" //3 сервер
+
+export const API_REG = "registration/"
+export const API_CREATE_TOKEN = "token/"

frontend/src/components/features/SearchBar/SearchBar.module.less

@@ -13,7 +13,6 @@
 font-weight: 900;
 font-size: 16px;
 line-height: 100%;
-color: #000;
 }
 .input-search{
     border: 0;

frontend/src/components/features/UserProfile/UserProfile.module.less

@@ -0,0 +1,39 @@
+@icon-size: 256px;
+
+.user-icon{
+    margin: 20px;
+
+    width: @icon-size;
+    height: @icon-size;
+
+    border-radius: 200px;
+
+   background-color: #222222;
+   border: 2px #3c3c3c solid;
+}   
+.username{
+    
+    color: #828282;
+    font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+    font-weight: lighter;
+    font-weight: 200;
+    font-size: 24px;
+}
+.card{
+    margin: 20px;
+    padding: 10px;
+    width: calc(100% - 20px);
+
+}
+.info-line{
+    display: flex;
+}
+
+.h1{
+    font-size: 36px;
+}
+.p{
+    font-size: 16px;
+    color: #d3d3d3;
+}
+

frontend/src/components/features/UserProfile/UserProfile.tsx

@@ -0,0 +1,41 @@
+
+import { Separator } from "../../shared/ui/separator";
+import { Card } from "../../shared/ui/card";
+import less from "./UserProfile.module.less"
+import { PanelRightDashedIcon, Pointer, PointerOff } from "lucide-react";
+
+const UserProfile = () => {
+    return (
+        <section className="flex flex-row">
+            <div className="fle flex-clow">
+                <div><img className={less["user-icon"]} src="./" alt="user-icon" /></div>
+                <h2 className={less["username"]}>username</h2>
+                <Separator />
+                <div className={less["info-line"]}><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" className="w-6 h-6">
+  <path fillRule="evenodd" d="M3 2.25a.75.75 0 0 0 0 1.5v16.5h-.75a.75.75 0 0 0 0 1.5H15v-18a.75.75 0 0 0 0-1.5H3ZM6.75 19.5v-2.25a.75.75 0 0 1 .75-.75h3a.75.75 0 0 1 .75.75v2.25a.75.75 0 0 1-.75.75h-3a.75.75 0 0 1-.75-.75ZM6 6.75A.75.75 0 0 1 6.75 6h.75a.75.75 0 0 1 0 1.5h-.75A.75.75 0 0 1 6 6.75ZM6.75 9a.75.75 0 0 0 0 1.5h.75a.75.75 0 0 0 0-1.5h-.75ZM6 12.75a.75.75 0 0 1 .75-.75h.75a.75.75 0 0 1 0 1.5h-.75a.75.75 0 0 1-.75-.75ZM10.5 6a.75.75 0 0 0 0 1.5h.75a.75.75 0 0 0 0-1.5h-.75Zm-.75 3.75A.75.75 0 0 1 10.5 9h.75a.75.75 0 0 1 0 1.5h-.75a.75.75 0 0 1-.75-.75ZM10.5 12a.75.75 0 0 0 0 1.5h.75a.75.75 0 0 0 0-1.5h-.75ZM16.5 6.75v15h5.25a.75.75 0 0 0 0-1.5H21v-12a.75.75 0 0 0 0-1.5h-4.5Zm1.5 4.5a.75.75 0 0 1 .75-.75h.008a.75.75 0 0 1 .75.75v.008a.75.75 0 0 1-.75.75h-.008a.75.75 0 0 1-.75-.75v-.008Zm.75 2.25a.75.75 0 0 0-.75.75v.008c0 .414.336.75.75.75h.008a.75.75 0 0 0 .75-.75v-.008a.75.75 0 0 0-.75-.75h-.008ZM18 17.25a.75.75 0 0 1 .75-.75h.008a.75.75 0 0 1 .75.75v.008a.75.75 0 0 1-.75.75h-.008a.75.75 0 0 1-.75-.75v-.008Z" clipRule="evenodd" />
+</svg>
+<p>Город</p> <p>Москва</p></div>
+                <div className={less["info-line"]}><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" className="w-6 h-6">
+  <path fillRule="evenodd" d="m11.54 22.351.07.04.028.016a.76.76 0 0 0 .723 0l.028-.015.071-.041a16.975 16.975 0 0 0 1.144-.742 19.58 19.58 0 0 0 2.683-2.282c1.944-1.99 3.963-4.98 3.963-8.827a8.25 8.25 0 0 0-16.5 0c0 3.846 2.02 6.837 3.963 8.827a19.58 19.58 0 0 0 2.682 2.282 16.975 16.975 0 0 0 1.145.742ZM12 13.5a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z" clipRule="evenodd" />
+</svg>
+<p>Город</p> <p>Москва</p></div>
+                <div className={less["info-line"]}><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" className="w-6 h-6">
+  <path d="M4.913 2.658c2.075-.27 4.19-.408 6.337-.408 2.147 0 4.262.139 6.337.408 1.922.25 3.291 1.861 3.405 3.727a4.403 4.403 0 0 0-1.032-.211 50.89 50.89 0 0 0-8.42 0c-2.358.196-4.04 2.19-4.04 4.434v4.286a4.47 4.47 0 0 0 2.433 3.984L7.28 21.53A.75.75 0 0 1 6 21v-4.03a48.527 48.527 0 0 1-1.087-.128C2.905 16.58 1.5 14.833 1.5 12.862V6.638c0-1.97 1.405-3.718 3.413-3.979Z" />
+  <path d="M15.75 7.5c-1.376 0-2.739.057-4.086.169C10.124 7.797 9 9.103 9 10.609v4.285c0 1.507 1.128 2.814 2.67 2.94 1.243.102 2.5.157 3.768.165l2.782 2.781a.75.75 0 0 0 1.28-.53v-2.39l.33-.026c1.542-.125 2.67-1.433 2.67-2.94v-4.286c0-1.505-1.125-2.811-2.664-2.94A49.392 49.392 0 0 0 15.75 7.5Z" />
+</svg>
+<p>telegram</p> <p>@wolf</p></div>
+                <div className={less["info-line"]}></div>
+
+            </div>
+            <div className="fle flex-clow">
+            </div>
+            <Card className={less.card}>
+                <h1 className={less.h1}>Имя Фамилия</h1>
+                <Separator />
+                <p className={less.p}></p>
+
+            </Card>
+        </section>
+    )
+}
+export default UserProfile;

frontend/src/components/pages/MyTeams/MyTeams.tsx

@@ -1,9 +1,16 @@
+import TeamCard from "../../widgets/TeamCard/TeamCard";
+import UserProfile from "../../features/UserProfile/UserProfile";
 import less from "./MyTeams.module.less"
+import CreateTeam from "../../widgets/CreateTeam/CreateTeam";
 
 
 const MyTeams = () => {
     return (
-        <p>My teams</p>
+        <>
+        <UserProfile />
+        <TeamCard/>
+        <CreateTeam/>
+        </>
     )
 }
 export default MyTeams;

frontend/src/components/shared/ui/sheet.tsx

@@ -0,0 +1,140 @@
+"use client"
+
+import * as React from "react"
+import * as SheetPrimitive from "@radix-ui/react-dialog"
+import { Cross2Icon } from "@radix-ui/react-icons"
+import { cva, type VariantProps } from "class-variance-authority"
+
+import { cn } from "../../../../lib/utils"
+
+const Sheet = SheetPrimitive.Root
+
+const SheetTrigger = SheetPrimitive.Trigger
+
+const SheetClose = SheetPrimitive.Close
+
+const SheetPortal = SheetPrimitive.Portal
+
+const SheetOverlay = React.forwardRef<
+  React.ElementRef<typeof SheetPrimitive.Overlay>,
+  React.ComponentPropsWithoutRef<typeof SheetPrimitive.Overlay>
+>(({ className, ...props }, ref) => (
+  <SheetPrimitive.Overlay
+    className={cn(
+      "fixed inset-0 z-50 bg-black/80  data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
+      className
+    )}
+    {...props}
+    ref={ref}
+  />
+))
+SheetOverlay.displayName = SheetPrimitive.Overlay.displayName
+
+const sheetVariants = cva(
+  "fixed z-50 gap-4 bg-background p-6 shadow-lg transition ease-in-out data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:duration-300 data-[state=open]:duration-500",
+  {
+    variants: {
+      side: {
+        top: "inset-x-0 top-0 border-b data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top",
+        bottom:
+          "inset-x-0 bottom-0 border-t data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom",
+        left: "inset-y-0 left-0 h-full w-3/4 border-r data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left sm:max-w-sm",
+        right:
+          "inset-y-0 right-0 h-full w-3/4 border-l data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right sm:max-w-sm",
+      },
+    },
+    defaultVariants: {
+      side: "right",
+    },
+  }
+)
+
+interface SheetContentProps
+  extends React.ComponentPropsWithoutRef<typeof SheetPrimitive.Content>,
+    VariantProps<typeof sheetVariants> {}
+
+const SheetContent = React.forwardRef<
+  React.ElementRef<typeof SheetPrimitive.Content>,
+  SheetContentProps
+>(({ side = "right", className, children, ...props }, ref) => (
+  <SheetPortal>
+    <SheetOverlay />
+    <SheetPrimitive.Content
+      ref={ref}
+      className={cn(sheetVariants({ side }), className)}
+      {...props}
+    >
+      {children}
+      <SheetPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-secondary">
+        <Cross2Icon className="h-4 w-4" />
+        <span className="sr-only">Close</span>
+      </SheetPrimitive.Close>
+    </SheetPrimitive.Content>
+  </SheetPortal>
+))
+SheetContent.displayName = SheetPrimitive.Content.displayName
+
+const SheetHeader = ({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+  <div
+    className={cn(
+      "flex flex-col space-y-2 text-center sm:text-left",
+      className
+    )}
+    {...props}
+  />
+)
+SheetHeader.displayName = "SheetHeader"
+
+const SheetFooter = ({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+  <div
+    className={cn(
+      "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
+      className
+    )}
+    {...props}
+  />
+)
+SheetFooter.displayName = "SheetFooter"
+
+const SheetTitle = React.forwardRef<
+  React.ElementRef<typeof SheetPrimitive.Title>,
+  React.ComponentPropsWithoutRef<typeof SheetPrimitive.Title>
+>(({ className, ...props }, ref) => (
+  <SheetPrimitive.Title
+    ref={ref}
+    className={cn("text-lg font-semibold text-foreground", className)}
+    {...props}
+  />
+))
+SheetTitle.displayName = SheetPrimitive.Title.displayName
+
+const SheetDescription = React.forwardRef<
+  React.ElementRef<typeof SheetPrimitive.Description>,
+  React.ComponentPropsWithoutRef<typeof SheetPrimitive.Description>
+>(({ className, ...props }, ref) => (
+  <SheetPrimitive.Description
+    ref={ref}
+    className={cn("text-sm text-muted-foreground", className)}
+    {...props}
+  />
+))
+SheetDescription.displayName = SheetPrimitive.Description.displayName
+
+export {
+  Sheet,
+  SheetPortal,
+  SheetOverlay,
+  SheetTrigger,
+  SheetClose,
+  SheetContent,
+  SheetHeader,
+  SheetFooter,
+  SheetTitle,
+  SheetDescription,
+}

frontend/src/components/shared/ui/textarea.tsx

@@ -0,0 +1,24 @@
+import * as React from "react"
+
+import { cn } from "../../../../lib/utils"
+
+export interface TextareaProps
+  extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}
+
+const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
+  ({ className, ...props }, ref) => {
+    return (
+      <textarea
+        className={cn(
+          "flex min-h-[60px] w-full rounded-md border border-input bg-transparent px-3 py-2 text-sm shadow-sm placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
+          className
+        )}
+        ref={ref}
+        {...props}
+      />
+    )
+  }
+)
+Textarea.displayName = "Textarea"
+
+export { Textarea }

frontend/src/components/widgets/CreateTeam/CreateTeam.tsx

@@ -0,0 +1,28 @@
+import { Textarea } from "../../shared/ui/textarea";
+import { Input } from "../../shared/ui/input";
+import { SheetTrigger, SheetContent, SheetHeader, SheetTitle, SheetDescription, Sheet } from "../../shared/ui/sheet";
+import less from "./CreateTeam.module.less"
+import { Button } from "../../shared/ui/button";
+
+const CreateTeam = () =>{
+    return(
+<Sheet>
+  <SheetTrigger>Open</SheetTrigger>
+  <SheetContent className="w-[400px] sm:w-[540px]">
+    <SheetHeader>
+      <SheetTitle>Создание команды</SheetTitle>
+      <SheetDescription>
+        Тут вы можете создать свою команду для участия, к примеру.... в хакатонах
+        <Input placeholder="Название"></Input>
+        <Input type="number" placeholder="Возрастное ограничение"></Input>
+        <Textarea placeholder="Описание"></Textarea>
+        <Button>Создать команду</Button>
+
+      </SheetDescription>
+    </SheetHeader>
+  </SheetContent>
+</Sheet>
+
+    )
+}
+export default CreateTeam;

frontend/src/components/widgets/Header/AuthAPI.ts

@@ -1,15 +1,67 @@
 import { FormEvent } from "react";
+import { API_BASE, API_CREATE_TOKEN, API_REG } from "../../app/APIurl";
 
-
+//логин
 export const submitLogin = (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault();
     const formData = new FormData(e.currentTarget);
     const formProps = Object.fromEntries(formData);
     console.log(formProps)
+
+
+    fetch(`${API_BASE}${API_CREATE_TOKEN}`, {
+      method: "POST",
+      headers: {
+          "Content-Type": "application/json"
+      },
+      body: JSON.stringify(formProps) 
+  })
+  .then(response => {
+      console.log(response.status);
+      if (response.ok) { 
+          console.log('Создан:', response.headers.get('Location'));
+          return response.json(); 
+      } else {
+          throw new Error('Код ошибки: ' + response.status);
+      }
+  })
+  .then(data => {
+      console.log('Успешно:', data);
+  })
+  .catch(error => {
+      console.error('Возникла ошибка с логином4:', error);
+  });
 }
+
+//регистрация
 export const submitRegister = (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault();
     const formData = new FormData(e.currentTarget);
     const formProps = Object.fromEntries(formData);
-    console.log(formProps)
+
+
+    fetch(`${API_BASE}${API_REG}`, {
+        method: "POST",
+        headers: {
+            "Content-Type": "application/json"
+        },
+        body: JSON.stringify(formProps) 
+    })
+    .then(response => {
+        console.log(response.status);
+        if (response.ok) { 
+            console.log('Создан:', response.headers.get('Location'));
+            return response.json(); 
+        } else {
+            throw new Error('Код ошибки: ' + response.status);
+        }
+    })
+    .then(data => {
+        console.log('Успешно:', data);
+    })
+    .catch(error => {
+        console.error('Возникла ошибка с регой:', error);
+    });
 }
+
+ 

frontend/src/components/widgets/Header/AuthForm.tsx

@@ -1,16 +1,17 @@
-import { DialogContent, DialogTitle, DialogDescription } from "../../shared/ui/dialog";
+import { DialogContent, DialogTitle, DialogDescription, Dialog, DialogTrigger } from "../../shared/ui/dialog";
 import { Tabs, TabsList, TabsTrigger, TabsContent } from "../../shared/ui/tabs";
 import { t } from "i18next";
 import { Button } from "../../shared/ui/button";
 import { DialogHeader } from "../../shared/ui/dialog";
 import { Input } from "../../shared/ui/input";
 import { submitLogin, submitRegister } from "./AuthAPI";
+import { Textarea } from "../../shared/ui/textarea";
 
 const AuthForm = () => {
 
 
     return (
-<DialogContent>
+        <DialogContent>
             <DialogHeader>
                 <DialogTitle>{t("entrance")}</DialogTitle>
                 <Tabs defaultValue="account" className="w-[400px]">
@@ -20,19 +21,41 @@ const AuthForm = () => {
                     </TabsList>
                     <TabsContent value="account" >
                         <form className="flex flex-col gap-y-1" onSubmit={submitLogin}>
-                                        <Input type="email" name="email" placeholder="Email" />
+                        <Input type="text" name="username" placeholder="Username" />
                             <Input type="password" name="password" placeholder="Password" />
                             <Button className="mt-3">{t("buttonLoginInSystem")}</Button>
                         </form>
                     </TabsContent>
                     <TabsContent value="password">
                         <form className="flex flex-col gap-y-1 mb-2" onSubmit={submitRegister}>
-                                        <Input type="text" className="m-to-2" name="username" placeholder="Username" />
+                            <Input type="text" name="username" placeholder="Username" />
-                                        <Input type="email" name="email" placeholder="Email"/>
+                            <Input type="email" name="email" placeholder="Email" />
-                                        <Input type="password" name="password" placeholder="Password"/>
+                            <Input type="password" name="password" placeholder="Password" />
-                                        <Input type="password" name="repPassword" placeholder="Password"/>
+                            <Input type="password" placeholder="Password" />
-                                        <Button className="mt-3">{t("buttonRegInSystemStep1")}</Button>
+                            <Button> qrefqwfqw</Button>
+                            <Dialog>
+                                <DialogTrigger className="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 bg-primary text-primary-foreground shadow hover:bg-primary/90 h-9 px-4 py-2">{t("buttonRegInSystemStep1")}
+                                </DialogTrigger>
+                                <DialogContent>
+                                    <DialogHeader>
+                                        <DialogTitle>Еще немного!</DialogTitle>
+                                        <Tabs defaultValue="account" className="w-[400px]">
+                                            <DialogDescription>
+                                            <Input type="text" name="first_name" placeholder="first name" />
+                                            <Input type="text" name="last_name" placeholder="last name" />
+                                            <Input type="number" name="experience" placeholder="experience" />
+                                                <Input type="text" name="country" placeholder="country" />
+                                                <Input type="text" name="city" placeholder="city" />
+                                                <Input type="date" name="birthday" placeholder="birthday" />
+                                                <Textarea name="bio" placeholder="bio" />
+
+                                            </DialogDescription>
+                                        </Tabs>
+                                    </DialogHeader>
+                                </DialogContent>
+                            </Dialog>
                         </form>
+
                     </TabsContent>
                 </Tabs>
             </DialogHeader>

frontend/src/components/widgets/TeamCard/TeamCard.module.less

@@ -0,0 +1,39 @@
+@icon-size: 256px;
+
+.user-icon{
+    margin: 20px;
+
+    width: @icon-size;
+    height: @icon-size;
+
+    border-radius: 0px;
+
+   background-color: #222222;
+   border: 2px #3c3c3c solid;
+}   
+.username{
+    
+    color: #828282;
+    font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+    font-weight: lighter;
+    font-weight: 200;
+    font-size: 24px;
+}
+.card{
+    margin: 20px;
+    padding: 10px;
+    width: calc(100% - 20px);
+
+}
+.info-line{
+    display: flex;
+}
+
+.h1{
+    font-size: 36px;
+}
+.p{
+    font-size: 16px;
+    color: #d3d3d3;
+}
+

frontend/src/components/widgets/TeamCard/TeamCard.tsx

@@ -0,0 +1,40 @@
+import { Card } from "../../shared/ui/card";
+import less from "./TeamCard.module.less"
+import { Separator } from "../../shared/ui/separator";
+import { Button } from "../../shared/ui/button";
+
+const TeamCard = () => {
+    return(
+    <section className="flex flex-row">
+    <div className="fle flex-clow">
+        <div><img className={less["user-icon"]} src="./" alt="user-icon" /></div>
+
+        <div className={less["info-line"]}><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" className="w-6 h-6">
+<path fillRule="evenodd" d="M3 2.25a.75.75 0 0 0 0 1.5v16.5h-.75a.75.75 0 0 0 0 1.5H15v-18a.75.75 0 0 0 0-1.5H3ZM6.75 19.5v-2.25a.75.75 0 0 1 .75-.75h3a.75.75 0 0 1 .75.75v2.25a.75.75 0 0 1-.75.75h-3a.75.75 0 0 1-.75-.75ZM6 6.75A.75.75 0 0 1 6.75 6h.75a.75.75 0 0 1 0 1.5h-.75A.75.75 0 0 1 6 6.75ZM6.75 9a.75.75 0 0 0 0 1.5h.75a.75.75 0 0 0 0-1.5h-.75ZM6 12.75a.75.75 0 0 1 .75-.75h.75a.75.75 0 0 1 0 1.5h-.75a.75.75 0 0 1-.75-.75ZM10.5 6a.75.75 0 0 0 0 1.5h.75a.75.75 0 0 0 0-1.5h-.75Zm-.75 3.75A.75.75 0 0 1 10.5 9h.75a.75.75 0 0 1 0 1.5h-.75a.75.75 0 0 1-.75-.75ZM10.5 12a.75.75 0 0 0 0 1.5h.75a.75.75 0 0 0 0-1.5h-.75ZM16.5 6.75v15h5.25a.75.75 0 0 0 0-1.5H21v-12a.75.75 0 0 0 0-1.5h-4.5Zm1.5 4.5a.75.75 0 0 1 .75-.75h.008a.75.75 0 0 1 .75.75v.008a.75.75 0 0 1-.75.75h-.008a.75.75 0 0 1-.75-.75v-.008Zm.75 2.25a.75.75 0 0 0-.75.75v.008c0 .414.336.75.75.75h.008a.75.75 0 0 0 .75-.75v-.008a.75.75 0 0 0-.75-.75h-.008ZM18 17.25a.75.75 0 0 1 .75-.75h.008a.75.75 0 0 1 .75.75v.008a.75.75 0 0 1-.75.75h-.008a.75.75 0 0 1-.75-.75v-.008Z" clipRule="evenodd" />
+</svg>
+<p>Город</p> <p>Москва</p></div>
+        <div className={less["info-line"]}><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" className="w-6 h-6">
+<path fillRule="evenodd" d="m11.54 22.351.07.04.028.016a.76.76 0 0 0 .723 0l.028-.015.071-.041a16.975 16.975 0 0 0 1.144-.742 19.58 19.58 0 0 0 2.683-2.282c1.944-1.99 3.963-4.98 3.963-8.827a8.25 8.25 0 0 0-16.5 0c0 3.846 2.02 6.837 3.963 8.827a19.58 19.58 0 0 0 2.682 2.282 16.975 16.975 0 0 0 1.145.742ZM12 13.5a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z" clipRule="evenodd" />
+</svg>
+<p>Город</p> <p>Москва</p></div>
+        <div className={less["info-line"]}>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" className="w-6 h-6">
+  <path fillRule="evenodd" d="M10.5 3.798v5.02a3 3 0 0 1-.879 2.121l-2.377 2.377a9.845 9.845 0 0 1 5.091 1.013 8.315 8.315 0 0 0 5.713.636l.285-.071-3.954-3.955a3 3 0 0 1-.879-2.121v-5.02a23.614 23.614 0 0 0-3 0Zm4.5.138a.75.75 0 0 0 .093-1.495A24.837 24.837 0 0 0 12 2.25a25.048 25.048 0 0 0-3.093.191A.75.75 0 0 0 9 3.936v4.882a1.5 1.5 0 0 1-.44 1.06l-6.293 6.294c-1.62 1.621-.903 4.475 1.471 4.88 2.686.46 5.447.698 8.262.698 2.816 0 5.576-.239 8.262-.697 2.373-.406 3.092-3.26 1.47-4.881L15.44 9.879A1.5 1.5 0 0 1 15 8.818V3.936Z" clipRule="evenodd" />
+</svg>
+
+        
+<p>18+</p> </div>
+        <div className={less["info-line"]}></div>
+
+    </div>
+    <div className="fle flex-clow">
+    </div>
+    <Card className={less.card}>
+        <h1 className={less.h1}>Организация</h1>
+        <Separator />
+<Button>Запросить членство</Button>
+    </Card>
+</section>)
+}
+
+export default TeamCard;