From 7835e595e8dbc27fb7924cc14557fb248774c7c5 Mon Sep 17 00:00:00 2001
From: Harsh Verma <87369868+hv2308@users.noreply.github.com>
Date: Mon, 13 Jan 2025 20:37:35 +0530
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=A9=F0=9F=8F=BF=E2=80=8D=E2=9A=96?=
 =?UTF-8?q?=EF=B8=8F=20Fix=20Login=20Issue=20(#1159)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix Login Issue
---
 frontend/src/components/LoginForm.js | 129 +++++++++++++++------------
 1 file changed, 71 insertions(+), 58 deletions(-)

diff --git a/frontend/src/components/LoginForm.js b/frontend/src/components/LoginForm.js
index 9f3f9d9d..39ab97ee 100644
--- a/frontend/src/components/LoginForm.js
+++ b/frontend/src/components/LoginForm.js
@@ -189,23 +189,32 @@ function LoginForm({ role, defaultEmail, n50_flag, location }) {
         >
           <Input prefix={<UserOutlined />} autoFocus />
         </Form.Item>
-        <Form.Item
-          name="password"
-          label={t("common.password")}
-          rules={[
-            {
-              required: true,
-              message: t("loginErrors.passwordError"),
-            },
-          ]}
-        >
-          <Input.Password prefix={<LockOutlined />} />
-          <div style={{ width: "100%", textAlign: "end" }}>
+        <div style={{ position: "relative" }}>
+          <Form.Item
+            name="password"
+            label={t("common.password")}
+            rules={[
+              {
+                required: true,
+                message: t("loginErrors.passwordError"),
+              },
+            ]}
+          >
+            <Input.Password prefix={<LockOutlined />} />
+          </Form.Item>
+          <div
+            style={{
+              width: "100%",
+              textAlign: "end",
+              position: "absolute",
+              top: "70px",
+            }}
+          >
             <Link to={{ pathname: "/forgot-password", state: { role } }}>
               {t("login.forgotPassword")}
             </Link>
           </div>
-        </Form.Item>
+        </div>
         <Form.Item>
           <Button
             type="primary"
@@ -216,55 +225,59 @@ function LoginForm({ role, defaultEmail, n50_flag, location }) {
           >
             {t("common.login")}
           </Button>
-          <p
-            className={css`
-              width: 100%;
-              text-align: center;
-              line-height: 0.1em;
-              position: relative;
-              padding-top: 8px;
+          {role !== ACCOUNT_TYPE.ADMIN && (
+            <div>
+              <p
+                className={css`
+                  width: 100%;
+                  text-align: center;
+                  line-height: 0.1em;
+                  position: relative;
+                  padding-top: 8px;
 
-              &::before,
-              &::after {
-                content: "";
-                position: absolute;
-                top: 90%;
-                width: 40%;
-                height: 1px;
-                background: #000;
-                padding: 0 8px;
-              }
+                  &::before,
+                  &::after {
+                    content: "";
+                    position: absolute;
+                    top: 90%;
+                    width: 40%;
+                    height: 1px;
+                    background: #000;
+                    padding: 0 8px;
+                  }
 
-              &::before {
-                left: 0;
-                margin-left: 4px;
-              }
+                  &::before {
+                    left: 0;
+                    margin-left: 4px;
+                  }
 
-              &::after {
-                right: 0;
-                margin-right: 4px;
-              }
-            `}
-          >
-            <span
-              className={css`
-                padding: 0 10px;
-              `}
-            >
-              OR
-            </span>
-          </p>
-          <div style={{ paddingTop: "4px", textAlign: "end" }}>
-            <Link to={{ pathname: "/apply" }}>
-              <Button
-                style={{ width: "100%" }}
-                type="primary"
-                htmlType="button"
+                  &::after {
+                    right: 0;
+                    margin-right: 4px;
+                  }
+                `}
               >
-                {t("login.registerUser")}
-              </Button>
-            </Link>
-          </div>
+                <span
+                  className={css`
+                    padding: 0 10px;
+                  `}
+                >
+                  OR
+                </span>
+              </p>
+              <div style={{ paddingTop: "4px", textAlign: "end" }}>
+                <Link to={{ pathname: "/apply" }}>
+                  <Button
+                    style={{ width: "100%" }}
+                    type="primary"
+                    htmlType="button"
+                  >
+                    {t("login.registerUser")}
+                  </Button>
+                </Link>
+              </div>
+            </div>
+          )}
         </Form.Item>
       </Form>
     </div>