refactoring

backend/src/graphql.ts

@@ -56,7 +56,7 @@ export interface IMutation {
     sendMessage(input?: SendMessageInput): Message | Promise<Message>;
     updatePassword(input?: UpdatePasswordInput): string | Promise<string>;
     updateUser(input?: UpdateInput, file?: Upload): string | Promise<string>;
-    signUp(input?: SignUpInput, file?: Upload): string | Promise<string>;
+    signUp(input?: SignUpInput): string | Promise<string>;
     signIn(input?: SignInInput): string | Promise<string>;
 }
 

backend/src/user/user.graphql

@@ -20,7 +20,7 @@ type Query {
 type Mutation {
   updatePassword(input: UpdatePasswordInput): String
   updateUser(input: UpdateInput, file: Upload): String
-  signUp(input: SignUpInput, file: Upload): String
+  signUp(input: SignUpInput): String
   signIn(input: SignInInput): String
 }
 

backend/src/user/user.resolver.ts

@@ -27,8 +27,8 @@ export class UserResolver {
 
   @Query()
   @UseGuards(new AuthGuard())
-  searchUser(@Args('name') name: string) {
-    return this.userService.findByName(name);
+  searchUser(@Args('name') name: string, @CurrentUser() user: UserEntity) {
+    return this.userService.findByName(name, user.id);
   }
 
   @Mutation()
@@ -37,15 +37,8 @@ export class UserResolver {
   }
 
   @Mutation()
-  async signUp(
-    @Args('input') signUpInput: SignUpInput,
-    @Args('file') file: { file: FileUpload },
-  ) {
-    const _file = await file;
-    const user = await this.userService.createUser(
-      { ...signUpInput },
-      _file.file,
-    );
+  async signUp(@Args('input') signUpInput: SignUpInput) {
+    const user = await this.userService.createUser({ ...signUpInput });
     pubsub.publish('userRegistred', { userRegistred: user });
     return this.userService.createToken(user);
   }

backend/src/user/user.service.ts

@@ -5,7 +5,7 @@ import {
 } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { UserEntity } from './user.entity';
-import { ILike, Repository } from 'typeorm';
+import { Repository } from 'typeorm';
 import * as jwt from 'jsonwebtoken';
 import * as bcrypt from 'bcryptjs';
 import { SignInInput, SignUpInput } from './dto/auth.inputs';
@@ -34,28 +34,27 @@ export class UserService {
     );
   }
 
-  async findByName(name: string) {
+  async findByName(name: string, id: string) {
     if (!name) return [];
-    return await this.userRepo.find({
-      relations: ['avatar'],
-      where: [
-        { firstName: ILike(`%${name}%`) },
-        { lastName: ILike(`%${name}%`) },
-      ],
-    });
+
+    return await this.userRepo
+      .createQueryBuilder('user')
+      .innerJoinAndSelect('user.avatar', 'file')
+      .where('user.firstName ILike :name', { name })
+      .orWhere('user.lastName ILike :name', { name })
+      .andWhere('user.id != :id', { id })
+      .getMany();
   }
 
   async findOne(id: string) {
     return await this.userRepo.findOne({ id });
   }
 
-  async createUser(user: SignUpInput, file: FileUpload) {
+  async createUser(user: SignUpInput) {
     const password = await bcrypt.hash(user.password, 10);
 
-    const avatar = await this.fileService.uploadDatabaseFile(file);
-
     return this.userRepo
-      .create({ ...user, email: user.email.toLowerCase(), password, avatar })
+      .create({ ...user, email: user.email.toLowerCase(), password })
       .save()
       .catch((e) => {
         if (/(email)[\s\S]+(already exists)/.test(e.detail)) {

frontend/src/components/chat/chat.tsx

@@ -134,9 +134,9 @@ export const Chat = () => {
               />
             );
           })}
-          <div className={styles.date}>
+          {/* <div className={styles.date}>
             <span>Today</span>
-          </div>
+          </div> */}
         </ScrollList>
       </div>
       <Typing />

frontend/src/components/sidebar/search-list/styles.scss

@@ -12,6 +12,10 @@
     top: calc(100% + 10px);
     z-index: 1;
 
+    & > div > div:last-child {
+      align-self: center;
+    }
+
     &.not-found {
       padding: 16px;
       color: $c_text_primary;

frontend/src/pages/Auth/register-block/register-block.tsx

@@ -1,14 +1,5 @@
 import { BaseForm } from "@components";
-import {
-  Button,
-  ButtonStyle,
-  ButtonType,
-  AlertMessage,
-  IconDirection,
-  Input,
-  InputGroup,
-} from "@ui";
-import GoogleLogoIcon from "@assets/svg/google-logo.svg";
+import { Button, ButtonType, AlertMessage, Input } from "@ui";
 import styles from "./styles.scss";
 import { useForm, UseFormOptions } from "react-hook-form";
 import { registerModel } from "@features/models";
@@ -28,7 +19,7 @@ export const RegisterBlock = () => {
     fetchPolicy: "network-only",
     onCompleted: ({ signUp }) => {
       setItem(AUTH_TOKEN, signUp);
-      history.push(routePath.main.path);
+      history.push(routePath.profile.path);
     },
   });
 
@@ -44,15 +35,10 @@ export const RegisterBlock = () => {
         password: data?.[registerModel.password],
         firstName: data?.[registerModel.firstName],
         lastName: data?.[registerModel.lastName],
-        avatar: data?.[registerModel.avatar].item(0),
       },
     });
   };
 
-  const handleRegisterGoogle = () => {
-    console.log("google");
-  };
-
   return (
     <BaseForm
       formMethods={formMethods}
@@ -61,7 +47,6 @@ export const RegisterBlock = () => {
     >
       <span className={styles.title}>New to the messenger?</span>
       <span className={styles.description}>Instant registration</span>
-      <Input placeholder={"Avatar"} type="file" name={registerModel.avatar} />
       <Input placeholder={"First name"} name={registerModel.firstName} />
       <Input placeholder={"Last name"} name={registerModel.lastName} />
       <Input placeholder={"Email"} name={registerModel.email} />
@@ -75,21 +60,13 @@ export const RegisterBlock = () => {
         className={styles.errorMessage}
         message={error?.message}
       />
-      <InputGroup>
-        <Button
-          text={"Sign Up"}
-          type={ButtonType.SUBMIT}
-          loading={loading}
-          withDisable={true}
-        />
-        <Button
-          text={"Sign Up"}
-          iconDirection={IconDirection.RIGHT}
-          icon={<GoogleLogoIcon />}
-          style={ButtonStyle.OUTLINE}
-          onClick={handleRegisterGoogle}
-        />
-      </InputGroup>
+      <Button
+        className={styles.button}
+        text={"Sign Up"}
+        type={ButtonType.SUBMIT}
+        loading={loading}
+        withDisable={true}
+      />
     </BaseForm>
   );
 };

frontend/src/pages/Auth/register-block/styles.scss

@@ -23,4 +23,8 @@
   .error-message {
     margin-bottom: 30px;
   }
+
+  .button {
+    width: 100%;
+  }
 }

frontend/src/schemas.ts

@@ -146,7 +146,6 @@ export const SEND_REGISTER = gql`
     $password: String!
     $firstName: String!
     $lastName: String!
-    $avatar: Upload
   ) {
     signUp(
       input: {
@@ -155,7 +154,6 @@ export const SEND_REGISTER = gql`
         email: $email
         password: $password
       }
-      file: $avatar
     )
   }
 `;

frontend/src/ui/atoms/alert-message/alert-message.tsx

@@ -22,11 +22,12 @@ export const AlertMessage = ({ message, className, type }: TProps) => {
   }, [message]);
 
   useEffect(() => {
-    setTimeout(() => {
+    const timeout = setTimeout(() => {
       if (seconds !== 0) {
         setSeconds((seconds) => seconds - 1);
       }
     }, 1000);
+    return () => clearTimeout(timeout);
   }, [seconds]);
 
   if (!message || seconds === 0) return null;

frontend/src/ui/atoms/button/button.tsx

@@ -53,11 +53,12 @@ export const Button = ({
   }, [loading, withDisable]);
 
   useEffect(() => {
-    setTimeout(() => {
+    const timeout = setTimeout(() => {
       if (seconds !== 0) {
         setSeconds((seconds) => seconds - 1);
       }
     }, 1000);
+    return () => clearTimeout(timeout);
   }, [seconds]);
 
   return (

frontend/src/ui/atoms/input/input.tsx

@@ -43,6 +43,7 @@ export const Input = ({
         placeholder={placeholder}
         name={name}
         onChange={onChange}
+        autoComplete="off"
         className={cn({ [styles.error]: errors[name] })}
       />
       {hidden && (

frontend/src/ui/templates/main/main.tsx

@@ -30,11 +30,14 @@ export const Main: React.FC = ({ children }) => {
     },
   });
 
-  const isGuest = getItem(AUTH_TOKEN);
+  const isGuest = !getItem(AUTH_TOKEN);
 
   useEffect(() => {
     fetchMe();
-  }, [fetchMe, isGuest]);
+    if (!isGuest) {
+      history.push(routePath.main.path);
+    }
+  }, [fetchMe, isGuest, history]);
 
   return (
     <>
@@ -43,8 +46,8 @@ export const Main: React.FC = ({ children }) => {
         lastName={me?.lastName}
         avatarId={me?.avatar?.id}
       />
-      <div className={cn(styles.flex, { [styles.guest]: !me })}>
-        {me && <Sidebar />}
+      <div className={cn(styles.flex, { [styles.guest]: isGuest })}>
+        {!isGuest && <Sidebar />}
         {children}
       </div>
     </>