fixes for PR

open-schools · Sep 5, 2023 · 3b184f1 · 3b184f1
1 parent 82f8f38
commit 3b184f1
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 14 deletions.
diff --git a/apps/schools/domains/circle/components/createCircleForm/index.tsx b/apps/schools/domains/circle/components/createCircleForm/index.tsx
@@ -125,7 +125,6 @@ export const CreateCircleForm = () => {
                             htmlType='submit'
                             block
                             data-cy='resetcomplete-button'
-                            style={{ width: '30%' }}
                             className={styles.button}
                         >
                             Добавить кружок
@@ -138,7 +137,6 @@ export const CreateCircleForm = () => {
                 <Typography.Title level={3} className={styles.text}>
                     Родители смогут увидеть ваш кружок с помощью карты и узнать информацию о нём!
                 </Typography.Title>
-                {/*<Image src={mobileApp} alt={"Мобильное приложения на странице создания кружка"}/>*/}
             </div>
         </Row>
     )

diff --git a/apps/schools/domains/circle/components/createCircleForm/styles/styles.module.scss b/apps/schools/domains/circle/components/createCircleForm/styles/styles.module.scss
@@ -51,13 +51,14 @@
         .mapButton {
           width: 24%;
           margin-top: 38px;
-          color: #2698FF;
+          color: $main-blue-color;
           padding-left: 1%;
         }
       }
 
 
       .button {
+        width: 30%;
         text-align: center;
         font-family: 'Roboto', sans-serif;
         font-size: 16px;

diff --git a/apps/schools/domains/circle/handlers/circle.ts b/apps/schools/domains/circle/handlers/circle.ts
@@ -1,15 +1,13 @@
 import { FormInstance, message } from 'antd'
-import { SuccessCreateCircleMsg } from '@domains/user/components/auth/constants/message'
+import { LoadingRequestMsg, SuccessCreateCircleMsg } from '@domains/user/components/auth/constants/message'
 import { removeEmpty } from '@domains/common/utils/form'
 import { CIRCLE_NAME, CIRCLE_ADDRESS, ADDRESS_ROOM } from '../components/createCircleForm/constants'
 import { withLoadingMessage } from '@domains/common/utils/loading'
 import { ADDRESS_SEPARATOR } from '@domains/common/utils/geo'
 
 export async function handleSubmitForm(organizationId: string, formComponent: FormInstance, mutation: any) {
-    console.log(formComponent.getFieldValue(CIRCLE_ADDRESS))
-
     const response = await withLoadingMessage(
-        'Выполняется запрос...',
+        LoadingRequestMsg,
         mutation,
         removeEmpty({
             organization: organizationId,

diff --git a/apps/schools/domains/common/components/Logo/styles/styles.module.scss b/apps/schools/domains/common/components/Logo/styles/styles.module.scss
@@ -7,8 +7,8 @@
 }
 
 .logoText {
-  color: var(--unnamed, #2698FF);
-  font-family: "Roboto";
+  color: $main-blue-color;
+  font-family: "Roboto", sans-serif;
   font-size: 20px;
   font-style: normal;
   font-weight: 700;

diff --git a/apps/schools/domains/common/components/styles/abstracts/_colors.scss b/apps/schools/domains/common/components/styles/abstracts/_colors.scss
@@ -19,6 +19,7 @@ $img-shadow: 4px 4px 8px 7px rgba(0, 0, 0, 0.1);
 
 //base colors
 $color-blue: #1890ff;
+$main-blue-color: #2698FF;
 
 //auth layout colors
 $color-auth-layout-default: #DEDEDE;

diff --git a/apps/schools/domains/student/handlers/student.ts b/apps/schools/domains/student/handlers/student.ts
@@ -1,5 +1,5 @@
 import { FormInstance, message } from 'antd'
-import { SuccessInviteEmployeeMsg } from '@domains/user/components/auth/constants/message'
+import { LoadingRequestMsg, SuccessInviteEmployeeMsg } from '@domains/user/components/auth/constants/message'
 import {
     CIRCLES,
     PARENT_EMAIL,
@@ -15,7 +15,7 @@ export async function handleSubmitForm(form: FormInstance, mutation: any) {
     if (form.getFieldValue(STUDENT_PHONE) && !isPhoneValid(form, STUDENT_PHONE)) return false
 
     const isSuccess = await withLoadingMessage(
-        'Выполняется запрос...',
+        LoadingRequestMsg,
         async () => {
             for (let circle_id of form.getFieldValue(CIRCLES)) {
                 let response = await mutation(

diff --git a/apps/schools/domains/user/components/auth/constants/message.ts b/apps/schools/domains/user/components/auth/constants/message.ts
@@ -11,6 +11,7 @@ export const UserAlreadyExitsMsg = 'Пользователь с таким те
 export const SendNewSmsCodeMsg = 'Вам отправлен новый смс-код'
 export const WrongSmsCodeMsg = 'Неверный смс-код'
 export const LoadingMsg = 'Загрузка...'
+export const LoadingRequestMsg = 'Выполняется...'
 export const SuccessSignInMsg = 'Вы успешно вошли в аккаунт'
 export const SuccessResetPasswordMsg = 'Вы успешно сменили пароль'
 export const SuccessRegistrationMsg = 'Вы успешно зарегистрировались'

diff --git a/apps/schools/domains/user/components/auth/containers/styles/styles.module.scss b/apps/schools/domains/user/components/auth/containers/styles/styles.module.scss
@@ -17,8 +17,8 @@
             gap: 10px;
 
             .logoText {
-                color: var(--unnamed, #2698FF);
-                font-family: "Roboto";
+                color: $main-blue-color;
+                font-family: "Roboto", sans-serif;
                 font-size: 20px;
                 font-style: normal;
                 font-weight: 700;
@@ -37,7 +37,7 @@
 
         .emailText {
             color: var(--unnamed, #434343);
-            font-family: "Roboto";
+            font-family: "Roboto", sans-serif;
             font-size: 20px;
             font-style: normal;
             font-weight: 600;