mario-core 2.4.8 → 2.5.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.css CHANGED
@@ -91,17 +91,26 @@
91
91
  letter-spacing: normal;
92
92
  line-height: 1.5; }
93
93
 
94
+ ._38Lo1 {
95
+ width: 826px; }
96
+
97
+ ._1OzGy {
98
+ width: 50%;
99
+ max-width: 826px;
100
+ border-radius: 5px; }
101
+
94
102
  ._wWIyO {
95
- width: 400px;
103
+ width: 100%;
104
+ height: 100%;
96
105
  background-color: #ffffff;
97
- border-radius: 10px;
106
+ border-radius: 0 5px 5px 0;
98
107
  box-shadow: 0 3px 6px #00000029; }
99
108
 
100
109
  ._3nuns {
101
- color: #8b0000;
102
- text-align: center;
103
- font-size: 32px;
104
- font-weight: 500; }
110
+ font-size: 24px;
111
+ font-weight: bold;
112
+ line-height: 28px;
113
+ margin-bottom: 20px; }
105
114
 
106
115
  ._21qb6 {
107
116
  margin-bottom: 5px; }
@@ -117,38 +126,38 @@
117
126
  color: #8b0000; }
118
127
 
119
128
  ._3IL10 {
120
- background-color: #c70000;
129
+ background-color: rgba(0, 0, 0, 0.1);
121
130
  cursor: pointer;
122
131
  color: #ffffff;
123
132
  font-size: 16px;
124
133
  font-weight: 500;
125
134
  text-align: center;
126
- padding: 8px;
127
- border-radius: 5px;
135
+ padding: 13px 27px;
136
+ border-radius: 4px;
128
137
  display: block;
129
138
  border: none;
130
139
  outline: none;
131
140
  width: 100%; }
132
141
 
133
142
  ._Ce3Kg {
134
- color: #c70000;
143
+ color: #2196f3;
135
144
  text-align: center;
136
145
  font-weight: 500; }
137
146
  ._Ce3Kg:hover {
138
- color: #c70000; }
147
+ color: #0a4da2; }
139
148
 
140
149
  ._2t6d9 {
141
- color: #8b0000;
142
- text-align: center;
143
- font-weight: 600; }
150
+ text-align: left;
151
+ font-weight: normal; }
144
152
 
145
- ._2oh2a {
146
- color: #c70000;
147
- text-align: center;
153
+ ._3bDsd {
154
+ color: #2196f3;
148
155
  display: inline-block;
149
156
  font-weight: 500; }
150
- ._2oh2a:hover {
151
- color: #c70000; }
157
+ ._3bDsd:hover {
158
+ color: #0a4da2;
159
+ -webkit-text-decoration: revert;
160
+ text-decoration: revert; }
152
161
 
153
162
  ._11FZt {
154
163
  font-weight: 500; }
@@ -201,7 +210,7 @@
201
210
  width: 70%; }
202
211
 
203
212
  ._wWIyO {
204
- padding: 20px;
213
+ padding: 89px 50px;
205
214
  position: relative; }
206
215
  ._wWIyO label:not(._11FZt) {
207
216
  color: #8f9bb3;
@@ -209,23 +218,22 @@
209
218
  ._wWIyO input[type="text"],
210
219
  ._wWIyO input[type="password"] {
211
220
  width: 100%;
212
- border: 1px #e4e9f2;
213
221
  border-radius: 4px;
214
222
  background-color: #f7f9fc;
215
- height: 40px;
216
- margin-bottom: 5px; }
223
+ height: 50px;
224
+ margin-bottom: 5px;
225
+ padding: 4px; }
217
226
  ._wWIyO ._39BJD {
218
227
  margin-bottom: 30px; }
219
228
  ._wWIyO input[type="checkbox"]._2K9b2 {
220
229
  margin-left: 0; }
221
230
  ._wWIyO ._11FZt {
222
- padding-left: 20px;
223
- margin-bottom: 30px; }
231
+ padding-left: 20px; }
224
232
  ._wWIyO ._3IL10 {
225
- margin-bottom: 20px;
233
+ margin: 30px 0;
226
234
  color: #ffffff; }
227
235
  ._wWIyO ._3IL10:hover {
228
- color: #ffffff; }
236
+ background-color: #2196f3; }
229
237
  ._wWIyO ._3LXoI {
230
238
  position: absolute;
231
239
  margin-left: auto;
@@ -234,11 +242,6 @@
234
242
  right: 0;
235
243
  bottom: 0;
236
244
  text-align: center; }
237
- ._wWIyO ._2oh2a {
238
- margin-bottom: 100px; }
239
-
240
- ._2TucC {
241
- min-height: 40vh; }
242
245
 
243
246
  ._23Sua {
244
247
  min-height: 40vh; }
@@ -264,7 +267,7 @@
264
267
  margin-right: -30px; }
265
268
 
266
269
  ._F-hjL {
267
- background-image: url("/images/home.png");
270
+ background-color: #0a4da2;
268
271
  background-repeat: no-repeat;
269
272
  background-size: cover;
270
273
  width: 100%;
@@ -272,8 +275,7 @@
272
275
  background-position: center; }
273
276
  @media (max-width: 768px) {
274
277
  ._F-hjL {
275
- background-image: url("/images/mobile bg@2x.png");
276
- background-color: #ede9ec;
278
+ background-color: #0a4da2;
277
279
  overflow: hidden; } }
278
280
  ._F-hjL ._1TT1q {
279
281
  padding-top: 40px;
@@ -284,6 +286,14 @@
284
286
  padding-right: 50px;
285
287
  padding-left: 50px; }
286
288
 
289
+ ._2v-L_ {
290
+ padding: 0 !important; }
291
+
292
+ ._3ncTL {
293
+ width: 100%;
294
+ height: 100%;
295
+ border-radius: 5px 0 0 5px; }
296
+
287
297
  ._39l0X {
288
298
  padding: 0; }
289
299
  ._39l0X > ._1BMwK {
@@ -417,12 +427,28 @@
417
427
  background-color: transparent;
418
428
  color: #8b0000; }
419
429
  ._1INnO {
420
- display: none; } }
430
+ display: none; }
431
+ ._38Lo1 {
432
+ width: 358px; }
433
+ ._wWIyO {
434
+ padding: 50px 20px !important; } }
435
+
436
+ @media (max-width: 991px) {
437
+ ._2v-L_ {
438
+ display: none; }
439
+ ._wWIyO {
440
+ border-radius: 5px !important; }
441
+ ._38Lo1 {
442
+ width: 500px !important;
443
+ max-width: 95%; } }
444
+
445
+ @media (min-width: 992px) {
446
+ ._2e7fZ {
447
+ width: 80%; } }
421
448
 
422
449
  @media (min-width: 768px) and (max-width: 991px) {
423
450
  ._F-hjL {
424
- background-image: url("/images/mobile bg@2x.png");
425
- background-color: #ede9ec;
451
+ background-color: #0a4da2;
426
452
  overflow: hidden; }
427
453
  ._F-hjL ._1TT1q {
428
454
  padding: 0;
package/dist/index.js CHANGED
@@ -46,7 +46,7 @@ function _catch(body, recover) {
46
46
  return result;
47
47
  }
48
48
 
49
- var styles = {"notification-count":"_2sew7","text-introduction":"_3OgWF","btn-trans-border":"_r9cAh","contact":"_NszFe","learn-more":"_MDjzH","title-quote":"_1Swkw","descriptions-quote":"_gi8vj","descriptions-icon":"_3SOdX","block-login":"_wWIyO","title-login":"_3nuns","title-forgot-password":"_21qb6","btn-close":"_NhW9l","btn-login":"_3IL10","return-to-login":"_Ce3Kg","recover-account":"_2t6d9","forgot-password":"_2oh2a","remember":"_11FZt","term-and-conditions":"_3LXoI","descriptions-forgot-pass":"_PMcjT","content-icon":"_2rZY6","title-icon":"_y9lM2","nav-home":"_1TT1q","box-introduction":"_32V6L","icon":"_20YJX","form-user-name":"_39BJD","checkbox-remember":"_2K9b2","block-forgot-password":"_2TucC","block-reset-password":"_23Sua","block-forgot-pass":"_3CWP6","page-not-login":"_3Wmco","content-quote":"_13Rk0","home-page":"_o6HKW","login":"_F-hjL","c-main":"_39l0X","container-fluid":"_1BMwK","input-file-label":"_1XNpH","delete-avatar-button":"_1z5h9","header-logo":"_Gewcf","sidebar-logo":"_1hXpy","nav-mobile":"_1qjbW","filter-media-file":"_1I62C","div":"_3cLcM","dropdown-menu":"_1krbH","header-avatar":"_RQaHE","dropdown-content":"_3ys4W","dropdown-change":"_ToOW_","item-address":"_3sQlR","item-logout":"_3bqSM","title-address":"_1jgSI","img-avatar":"_35Ttz","item-contact":"_1wc7o","logout":"_1_9tV","content-text":"_3S4f2","hide-in-mobile":"_1INnO","hide-in-tablet":"_2uvkV","hide-in-desktop":"_2LIqK","control-input":"_2Zz97","custom-control":"_3-yp5"};
49
+ var styles = {"notification-count":"_2sew7","text-introduction":"_3OgWF","btn-trans-border":"_r9cAh","contact":"_NszFe","learn-more":"_MDjzH","title-quote":"_1Swkw","descriptions-quote":"_gi8vj","descriptions-icon":"_3SOdX","box-login":"_38Lo1","block-verification":"_1OzGy","block-login":"_wWIyO","title-login":"_3nuns","title-forgot-password":"_21qb6","btn-close":"_NhW9l","btn-login":"_3IL10","return-to-login":"_Ce3Kg","recover-account":"_2t6d9","link-to-login":"_3bDsd","remember":"_11FZt","term-and-conditions":"_3LXoI","descriptions-forgot-pass":"_PMcjT","content-icon":"_2rZY6","title-icon":"_y9lM2","nav-home":"_1TT1q","box-introduction":"_32V6L","icon":"_20YJX","form-user-name":"_39BJD","checkbox-remember":"_2K9b2","block-reset-password":"_23Sua","block-forgot-pass":"_3CWP6","page-not-login":"_3Wmco","content-quote":"_13Rk0","home-page":"_o6HKW","login":"_F-hjL","img-box":"_2v-L_","img-login":"_3ncTL","c-main":"_39l0X","container-fluid":"_1BMwK","input-file-label":"_1XNpH","delete-avatar-button":"_1z5h9","header-logo":"_Gewcf","sidebar-logo":"_1hXpy","nav-mobile":"_1qjbW","filter-media-file":"_1I62C","div":"_3cLcM","dropdown-menu":"_1krbH","header-avatar":"_RQaHE","dropdown-content":"_3ys4W","dropdown-change":"_ToOW_","item-address":"_3sQlR","item-logout":"_3bqSM","title-address":"_1jgSI","img-avatar":"_35Ttz","item-contact":"_1wc7o","logout":"_1_9tV","content-text":"_3S4f2","hide-in-mobile":"_1INnO","block-form":"_2e7fZ","hide-in-tablet":"_2uvkV","hide-in-desktop":"_2LIqK","control-input":"_2Zz97","custom-control":"_3-yp5"};
50
50
 
51
51
  var style = {
52
52
  fontSize: "0.85rem"
@@ -60,14 +60,6 @@ var ErrorHandler = function ErrorHandler(_ref) {
60
60
  }, text);
61
61
  };
62
62
 
63
- var CloseBlock = function CloseBlock(_ref) {
64
- var to = _ref.to;
65
- return React__default.createElement(reactRouterDom.Link, {
66
- to: to,
67
- className: "" + styles["btn-close"]
68
- }, "\xD7");
69
- };
70
-
71
63
  var containerStyle = {
72
64
  height: "40px",
73
65
  backgroundColor: "#f7f9fc",
@@ -93,7 +85,7 @@ var PasswordInput = function PasswordInput(_ref) {
93
85
  className: "d-flex align-items-center w-100",
94
86
  style: containerStyle
95
87
  }, React__default.createElement(reactstrap.Input, {
96
- className: "border border-0 password-input",
88
+ className: "border password-input",
97
89
  style: inputStyle,
98
90
  type: isShowPassword ? "text" : "password",
99
91
  name: "password",
@@ -218,7 +210,7 @@ var CHAT_CHANNEL = "chat-channel";
218
210
  var NOTIFICATION_CHANNEL = "NOTIFICATION_CHANNEL";
219
211
  var NEW_NOTIFICATION = "NEW_NOTIFICATION";
220
212
  var DEFAULT_IMAGE_URL = "https://tleliteracy.com/wp-content/uploads/2017/02/default-avatar.png";
221
- var EMOTIONS = ["Excited", "Happy", "Satisfied", "Bored", "Nervous", "Stressed", "Tired", "Sad", "Mad", "Sick"];
213
+ var EMOTIONS = ["Unwell", "Mad", "Stressed", "Easygoing", "Proud", "Inspired"];
222
214
  var TAB_COLORS = {
223
215
  reflect: "#c08497",
224
216
  goal: "#00979b"
@@ -293,10 +285,10 @@ var apiUpload = axios.create({
293
285
  }, function (error) {
294
286
  if (error.response.status === 401) {
295
287
  localStorage.clear();
296
- window.location.href = "/";
288
+ window.location.href = "/login";
297
289
  }
298
290
 
299
- return Promise.reject(error.message);
291
+ return Promise.reject(error);
300
292
  });
301
293
  });
302
294
 
@@ -333,8 +325,8 @@ var defaultInfo = {
333
325
  captcha: "",
334
326
  rememberMe: false
335
327
  };
336
- var HOMEPAGE_TEACHER = "/home";
337
- var HOMEPAGE_STUDENT = "/studenthome";
328
+ var HOMEPAGE_TEACHER = "/my-one-to-one/up-coming";
329
+ var HOMEPAGE_STUDENT = "/my-one-to-one/up-coming";
338
330
  var HOMEPAGE_ADMIN = "/admin/dashboard";
339
331
  var HOMEPAGE_PARENT = "/parent";
340
332
  var HOMEPAGE_DISTRICT = "/admin/schools";
@@ -502,30 +494,39 @@ var BlockLogin = function BlockLogin(_ref) {
502
494
  setFieldValue = formikProps.setFieldValue;
503
495
  var emailError = touched.email && errors.email;
504
496
  var passwordError = touched.password && errors.password;
505
- return React__default.createElement(reactstrap.Form, {
497
+ return React__default.createElement(reactstrap.Row, {
498
+ className: "" + styles["box-login"]
499
+ }, React__default.createElement(reactstrap.Col, {
500
+ lg: 4,
501
+ md: 4,
502
+ className: "" + styles["img-box"]
503
+ }, React__default.createElement("img", {
504
+ src: "/images/img-login.png",
505
+ className: "" + styles["img-login"]
506
+ })), React__default.createElement(reactstrap.Col, {
507
+ className: "p-0"
508
+ }, React__default.createElement(reactstrap.Form, {
506
509
  className: "" + styles["block-login"],
507
510
  onSubmit: handleSubmit
508
- }, React__default.createElement(CloseBlock, {
509
- to: "/"
510
- }), React__default.createElement("p", {
511
+ }, React__default.createElement("div", {
512
+ className: "" + styles["block-form"]
513
+ }, React__default.createElement("p", {
511
514
  className: "" + styles["title-login"]
512
- }, "Login"), React__default.createElement(reactstrap.FormGroup, {
515
+ }, "Sign in"), React__default.createElement("p", {
516
+ className: "recover-account"
517
+ }, "Lorem ipsum dolor sit amet, consectetur adipiscing elit."), React__default.createElement(reactstrap.FormGroup, {
513
518
  className: "" + styles["form-user-name"]
514
- }, React__default.createElement(reactstrap.Label, {
515
- "for": "userName"
516
- }, "user name"), React__default.createElement(reactstrap.Input, {
519
+ }, React__default.createElement(reactstrap.Input, {
517
520
  type: "text",
518
521
  name: "email",
519
- placeholder: "User name",
522
+ placeholder: "Email",
520
523
  value: values.email,
521
524
  onChange: handleChange,
522
525
  onBlur: handleBlur("email"),
523
526
  required: true
524
527
  }), emailError && React__default.createElement(ErrorHandler, {
525
528
  text: errors.email
526
- })), React__default.createElement(reactstrap.FormGroup, null, React__default.createElement(reactstrap.Label, {
527
- "for": "password"
528
- }, "Password"), React__default.createElement(PasswordInput, {
529
+ })), React__default.createElement(reactstrap.FormGroup, null, React__default.createElement(PasswordInput, {
529
530
  isShowPassword: isShowPassword,
530
531
  togglePasswordVisible: togglePasswordVisible,
531
532
  onChange: function onChange(e) {
@@ -536,19 +537,17 @@ var BlockLogin = function BlockLogin(_ref) {
536
537
  })), React__default.createElement(reactstrap.FormGroup, null, React__default.createElement(reactGoogleRecaptchaV3.GoogleReCaptcha, {
537
538
  action: "login",
538
539
  onVerify: handleVerify
539
- })), React__default.createElement(reactstrap.Col, null, React__default.createElement("button", {
540
+ })), React__default.createElement(reactstrap.Col, {
541
+ className: "p-0 mt-5"
542
+ }, React__default.createElement("button", {
540
543
  className: "" + styles["btn-login"],
541
544
  type: "submit"
542
- }, "Login")), React__default.createElement("div", {
543
- className: "d-flex justify-content-center"
545
+ }, "LOGIN")), React__default.createElement("div", {
546
+ className: "d-flex justify-content-end"
544
547
  }, React__default.createElement(reactRouterDom.Link, {
545
548
  to: "/forgot-password",
546
- className: "" + styles["forgot-password"]
547
- }, "Forgot password or username?")), React__default.createElement("p", {
548
- className: "" + styles["term-and-conditions"]
549
- }, "Check out our ", React__default.createElement("a", {
550
- href: ""
551
- }, "Terms and Conditions")));
549
+ className: "" + styles["link-to-login"]
550
+ }, "Forgot password ?"))))));
552
551
  });
553
552
  };
554
553
 
@@ -738,16 +737,25 @@ var BlockForgetPassword = function BlockForgetPassword() {
738
737
  values = formikProps.values,
739
738
  touched = formikProps.touched,
740
739
  errors = formikProps.errors;
741
- return React__default.createElement("div", {
742
- className: styles["block-forgot-password"] + " " + styles["block-login"] + " d-flex flex-column align-items-center"
740
+ return React__default.createElement(reactstrap.Row, {
741
+ className: "" + styles["box-login"]
742
+ }, React__default.createElement(reactstrap.Col, {
743
+ lg: 4,
744
+ md: 4,
745
+ className: "" + styles["img-box"]
746
+ }, React__default.createElement("img", {
747
+ src: "/images/img-login.png",
748
+ className: "" + styles["img-login"]
749
+ })), React__default.createElement(reactstrap.Col, {
750
+ className: "p-0"
743
751
  }, React__default.createElement("div", {
744
- className: "w-100"
745
- }, React__default.createElement(CloseBlock, {
746
- to: "/"
747
- })), React__default.createElement("p", {
748
- className: styles["title-login"] + " " + styles["title-forgot-password"]
752
+ className: "" + styles["block-login"]
753
+ }, React__default.createElement("div", {
754
+ className: "" + styles["block-form"]
755
+ }, React__default.createElement("p", {
756
+ className: styles["title-login"] + " "
749
757
  }, "Forgot password"), React__default.createElement("p", {
750
- className: "" + styles["recover-account"]
758
+ className: styles["recover-account"] + " mb-5"
751
759
  }, "Enter email to recover your account"), React__default.createElement("div", {
752
760
  className: "w-100"
753
761
  }, React__default.createElement(reactstrap.Label, {
@@ -764,28 +772,22 @@ var BlockForgetPassword = function BlockForgetPassword() {
764
772
  })), React__default.createElement(reactGoogleRecaptchaV3.GoogleReCaptcha, {
765
773
  action: "forgetPass",
766
774
  onVerify: handleVerify
767
- }), React__default.createElement(reactstrap.Col, null, React__default.createElement("button", {
768
- className: styles["btn-login"] + " mt-4",
775
+ }), React__default.createElement(reactstrap.Col, {
776
+ className: "p-0"
777
+ }, React__default.createElement("button", {
778
+ className: styles["btn-login"] + " mt-5",
769
779
  onClick: function onClick() {
770
780
  return handleSubmit();
771
781
  }
772
782
  }, "Continue")), React__default.createElement("p", {
773
- className: styles[""] + " w-100 d-flex justify-content-center align-items-end flex-grow-1"
783
+ className: "d-flex justify-content-end"
774
784
  }, React__default.createElement(reactRouterDom.Link, {
775
785
  to: "/login",
776
- className: styles[""] + " " + styles["return-to-login"]
777
- }, "Return to login")));
786
+ className: "" + styles["link-to-login"]
787
+ }, "Return to login"))))));
778
788
  });
779
789
  };
780
790
 
781
- var CloseButton = function CloseButton(_ref) {
782
- var toggle = _ref.toggle;
783
- return React__default.createElement("a", {
784
- onClick: toggle,
785
- className: "" + styles["btn-close"]
786
- }, "\xD7");
787
- };
788
-
789
791
  var initialValues$1 = {
790
792
  token: "",
791
793
  password: "",
@@ -811,12 +813,6 @@ var BlockResetPassword = function BlockResetPassword() {
811
813
  isShowReTypePassword = _useForgotPassword.isShowReTypePassword,
812
814
  setIsShowReTypePassword = _useForgotPassword.setIsShowReTypePassword;
813
815
 
814
- var history = reactRouterDom.useHistory();
815
-
816
- var close = function close() {
817
- history.push("/login");
818
- };
819
-
820
816
  React.useEffect(function () {
821
817
  checkResetTokenRequest(token);
822
818
  }, []);
@@ -835,15 +831,22 @@ var BlockResetPassword = function BlockResetPassword() {
835
831
  React.useEffect(function () {
836
832
  setFieldValue("token", token);
837
833
  }, []);
838
- return React__default.createElement("div", {
839
- className: styles["block-login"] + " " + styles["block-reset-password"] + " d-flex flex-column align-items-center"
834
+ return React__default.createElement(reactstrap.Row, {
835
+ className: "" + styles["box-login"]
836
+ }, React__default.createElement(reactstrap.Col, {
837
+ lg: 4,
838
+ md: 4,
839
+ className: "" + styles["img-box"]
840
+ }, React__default.createElement("img", {
841
+ src: "/images/img-login.png",
842
+ className: "" + styles["img-login"]
843
+ })), React__default.createElement(reactstrap.Col, {
844
+ className: "p-0"
840
845
  }, React__default.createElement("div", {
841
- className: "w-100"
842
- }, React__default.createElement(CloseButton, {
843
- toggle: function toggle() {
844
- return close();
845
- }
846
- })), React__default.createElement("p", {
846
+ className: "" + styles["block-login"]
847
+ }, React__default.createElement("div", {
848
+ className: "" + styles["block-form"]
849
+ }, React__default.createElement("p", {
847
850
  className: "" + styles["title-login"]
848
851
  }, "Reset Password"), React__default.createElement("div", {
849
852
  className: "w-100"
@@ -872,20 +875,22 @@ var BlockResetPassword = function BlockResetPassword() {
872
875
  }), touched.reEnterPassword && errors.reEnterPassword && React__default.createElement(ErrorHandler, {
873
876
  text: errors.reEnterPassword
874
877
  })) : React__default.createElement(React__default.Fragment, null, React__default.createElement("p", {
875
- className: "w-100 text-center"
878
+ className: styles["recover-account"] + " mb-5"
876
879
  }, "Invalid reset password link"), React__default.createElement("p", {
877
880
  className: "w-100"
878
- }, "It may have been accessed before or expired or you have just tried to reset another account's password"))), validLink && React__default.createElement(reactstrap.Col, null, React__default.createElement("button", {
881
+ }, "It may have been accessed before or expired or you have just tried to reset another account's password"))), validLink && React__default.createElement(reactstrap.Col, {
882
+ className: "p-0"
883
+ }, React__default.createElement("button", {
879
884
  className: styles["btn-login"] + " mt-4",
880
885
  onClick: function onClick() {
881
886
  return handleSubmit();
882
887
  }
883
888
  }, "Confirm")), React__default.createElement("p", {
884
- className: "w-100 d-flex justify-content-center align-items-end flex-grow-1"
889
+ className: "d-flex justify-content-end"
885
890
  }, React__default.createElement(reactRouterDom.Link, {
886
891
  to: "/login",
887
- className: "" + styles["return-to-login"]
888
- }, "Return to login")));
892
+ className: "" + styles["link-to-login"]
893
+ }, "Return to login"))))));
889
894
  });
890
895
  };
891
896
 
@@ -968,8 +973,8 @@ function _createForOfIteratorHelperLoose(o, allowArrayLike) {
968
973
  return it.next.bind(it);
969
974
  }
970
975
 
971
- var HOMEPAGE_TEACHER$1 = "/home";
972
- var HOMEPAGE_STUDENT$1 = "/studenthome";
976
+ var HOMEPAGE_TEACHER$1 = "/my-one-to-one/up-coming";
977
+ var HOMEPAGE_STUDENT$1 = "/my-one-to-one/up-coming";
973
978
  var HOMEPAGE_ADMIN$1 = "/admin/dashboard";
974
979
  var HOMEPAGE_PARENT$1 = "/parent";
975
980
  var HOMEPAGE_DISTRICT$1 = "/admin/schools";
@@ -1059,12 +1064,6 @@ var BlockTwoFactorLogin = function BlockTwoFactorLogin() {
1059
1064
  var _useLoginTwoFactor = useLoginTwoFactor(),
1060
1065
  userLoginTwoFactor = _useLoginTwoFactor.userLoginTwoFactor;
1061
1066
 
1062
- var history = reactRouterDom.useHistory();
1063
-
1064
- var close = function close() {
1065
- history.push("/login");
1066
- };
1067
-
1068
1067
  return React__default.createElement(formik.Formik, {
1069
1068
  initialValues: _extends({}, initialValues$2, {
1070
1069
  id: id
@@ -1081,21 +1080,26 @@ var BlockTwoFactorLogin = function BlockTwoFactorLogin() {
1081
1080
  handleSubmit = formikProps.handleSubmit,
1082
1081
  touched = formikProps.touched,
1083
1082
  errors = formikProps.errors;
1084
- return React__default.createElement("div", {
1085
- className: styles["block-login"] + " " + styles["block-reset-password"] + " d-flex flex-column align-items-center"
1083
+ return React__default.createElement(reactstrap.Row, {
1084
+ className: "" + styles["box-login"]
1085
+ }, React__default.createElement(reactstrap.Col, {
1086
+ lg: 4,
1087
+ md: 4,
1088
+ className: "" + styles["img-box"]
1089
+ }, React__default.createElement("img", {
1090
+ src: "/images/img-login.png",
1091
+ className: "" + styles["img-login"]
1092
+ })), React__default.createElement(reactstrap.Col, {
1093
+ className: "p-0"
1086
1094
  }, React__default.createElement("div", {
1087
- className: "w-100"
1088
- }, React__default.createElement(CloseButton, {
1089
- toggle: function toggle() {
1090
- return close();
1091
- }
1092
- })), React__default.createElement("p", {
1095
+ className: "" + styles["block-login"]
1096
+ }, React__default.createElement("div", {
1097
+ className: "" + styles["block-form"]
1098
+ }, React__default.createElement("p", {
1093
1099
  className: "" + styles["title-login"]
1094
1100
  }, "Additional Verification"), React__default.createElement("p", {
1095
- className: "text-small text-secondary"
1096
- }, React__default.createElement("i", null, "Check your email to get Additional Verification. This code will be expired in 5 minutes")), React__default.createElement("div", {
1097
- className: "w-100"
1098
- }, React__default.createElement(reactstrap.FormGroup, null, React__default.createElement(reactstrap.Label, null, "Additional Verification"), React__default.createElement(reactstrap.Input, {
1101
+ className: "recover-account"
1102
+ }, "Check your email to get Additional Verification. This code will be expired in 5 minutes"), React__default.createElement("div", null, React__default.createElement(reactstrap.FormGroup, null, React__default.createElement(reactstrap.Label, null, "Additional Verification"), React__default.createElement(reactstrap.Input, {
1099
1103
  name: "twoFactorCode",
1100
1104
  value: values.twoFactorCode,
1101
1105
  onChange: handleChange
@@ -1111,17 +1115,19 @@ var BlockTwoFactorLogin = function BlockTwoFactorLogin() {
1111
1115
  }), React__default.createElement(reactstrap.Label, {
1112
1116
  "for": "rememberMe",
1113
1117
  className: "" + styles["remember"]
1114
- }, "Remember my browser & IP"))), React__default.createElement(reactstrap.Col, null, React__default.createElement("button", {
1115
- className: styles["btn-login"] + " mt-4",
1118
+ }, "Remember my browser & IP"))), React__default.createElement(reactstrap.Col, {
1119
+ className: "p-0 mt-5"
1120
+ }, React__default.createElement("button", {
1121
+ className: styles["btn-login"] + " ",
1116
1122
  onClick: function onClick() {
1117
1123
  return handleSubmit();
1118
1124
  }
1119
1125
  }, "Confirm")), React__default.createElement("p", {
1120
- className: "w-100 d-flex justify-content-center align-items-end flex-grow-1"
1126
+ className: "d-flex justify-content-end"
1121
1127
  }, React__default.createElement(reactRouterDom.Link, {
1122
1128
  to: "/login",
1123
- className: "" + styles["return-to-login"]
1124
- }, "Return to login")));
1129
+ className: "" + styles["link-to-login"]
1130
+ }, "Return to login"))))));
1125
1131
  });
1126
1132
  };
1127
1133
 
@@ -1149,10 +1155,10 @@ var Login = function Login(props) {
1149
1155
  }, React__default.createElement(reactstrap.Row, {
1150
1156
  className: "h-100"
1151
1157
  }, React__default.createElement(reactstrap.Col, {
1152
- lg: 6,
1158
+ lg: 12,
1153
1159
  md: 12,
1154
1160
  xs: 12,
1155
- className: "offset-lg-6 d-flex justify-content-center h-100 align-items-center"
1161
+ className: "d-flex justify-content-center h-100 align-items-center"
1156
1162
  }, React__default.createElement(reactGoogleRecaptchaV3.GoogleReCaptchaProvider, {
1157
1163
  useRecaptchaNet: true,
1158
1164
  reCaptchaKey: GOOGLE_RECAPTCHA_KEY,
@@ -1920,7 +1926,7 @@ var useFilters = function useFilters() {
1920
1926
  var changeFilters = function changeFilters(updatedFilters) {
1921
1927
  var newFilters = _extends({}, filters, updatedFilters);
1922
1928
 
1923
- if (!!newFilters.searchString) {
1929
+ if (!!newFilters.searchString && !!updatedFilters.searchString && updatedFilters.searchString != filters.searchString) {
1924
1930
  newFilters.currentPage = 1;
1925
1931
  }
1926
1932