Merge pull request #327 from Open-Science-Community-Saudi-Arabia/gene…

…ral_fixs

fixed styling and Arabic view

.github/workflows/merge_crowdin.yml

@@ -4,11 +4,11 @@ on:
     types:
       - closed
     branches:
-      - "frontend-ui"
+      - "main"
 
 jobs:
   if_merged:
-    if: github.event.pull_request.head.ref == 'l10n_frontend-ui' && github.event.pull_request.merged == true
+    if: github.event.pull_request.head.ref == 'l10n_main' && github.event.pull_request.merged == true
     name: Enter client directory
     runs-on: ubuntu-latest
     defaults:

client/.gitignore

@@ -27,3 +27,4 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+todo

client/src/App.tsx

@@ -46,14 +46,3 @@ function App() {
 }
 
 export default App;
-
-// Todo
-// install elint husky and pretty
-// Run for performances and accesibility checks
-// review the auth provider // learn what is happing in the context
-// work on the types- request and response
-// look at the naming patterns: ensure every variable an component name clearing states it's purpose
-// make a separate page for sucess sign/ check email for verification
-// Email verification shows false
-// Tell richie to set differnt response status for Token expired in verifyEmail to prevent redirecting to login...Verification link expired
-// Work on the font for the arabic

client/src/components/Footer/index.tsx

@@ -17,7 +17,7 @@ import { Trans } from "@lingui/macro";
  *  <Footer />
  */
 
-const index=()=> {
+const index = () => {
   return (
     <section className="footer-container">
       <div className="footer">
@@ -65,23 +65,32 @@ const index=()=> {
             >
               <Trans>Documentation </Trans>
             </Link>
+            <Link className="nav-link" to="">
+              <Trans>FAQ </Trans>
+            </Link>
           </div>
           <div className="footer__content-sociallinks">
             <h3 className="heading ">
               {" "}
               <Trans>Follow Us</Trans>
             </h3>
-            <Link className="nav-link"  target="_blank" to="https://twitter.com/OpenSciSaudi">
+            <Link
+              className="nav-link"
+              target="_blank"
+              to="https://twitter.com/OpenSciSaudi"
+            >
               <img className="nav-link__image" src={Twitter} alt="twitter" />
             </Link>
             <Link
-              className="nav-link"  target="_blank"
+              className="nav-link"
+              target="_blank"
               to="https://www.linkedin.com/company/open-science-community-saudi-arabia/mycompany/"
             >
               <img className="nav-link__image" src={LinkedIn} alt="linkedin" />
             </Link>
             <Link
-              className="nav-link"  target="_blank"
+              className="nav-link"
+              target="_blank"
               to="https://github.com/Open-Science-Community-Saudi-Arabia"
             >
               <img className="nav-link__image" src={Github} alt="github" />
@@ -101,10 +110,9 @@ const index=()=> {
       </div>
       <p className="footer-container__copyright">
         <Trans>Copyright © OSCSA MOOCS</Trans> {new Date().getFullYear()}{" "}
-
-          {" "}
-          <span><Trans>Designed by Sandy Goodnews</Trans></span>
-
+        <span>
+          <Trans>Designed by Sandy Goodnews</Trans>
+        </span>
       </p>
     </section>
   );

client/src/pages/auth/login/index.tsx

@@ -81,8 +81,9 @@ const Login = () => {
               className="login-signup__google__login-btn"
               onClick={() => googlelogin()}
             >
+              <FcGoogle />
               <Trans>
-                Sign in with Google </Trans><FcGoogle />
+                Sign in with Google </Trans>
 
             </button>
           </div>

client/src/pages/auth/signup/index.tsx

@@ -95,7 +95,8 @@ const Signup = () => {
               className="login-signup__google__login-btn"
               onClick={() => googlelogin()}
             >
-              <Trans> Sign in with Google</Trans> <FcGoogle />
+              <FcGoogle />
+              <Trans> Sign in with Google</Trans> 
             </button>
           </div>
           <div className="login-signup__hr-line">

client/src/pages/auth/style.scss

@@ -51,6 +51,7 @@
     @include flex(center, center);
     gap: 10px;
     &__or {
+      font-weight: 400;
       font-size: 14px;
       color: #46404082;
     }
@@ -105,7 +106,7 @@
     }
     .eye-icon {
       position: absolute;
-      top: 57px;
+      top:40px;
       right: 10px;
       transform: translateY(-50%);
       font-size: 20px;
@@ -129,7 +130,7 @@
     }
     &-content {
       font-size: 14px;
-      font-weight: 500;
+      font-weight: 400;
       &__link {
         color: var(--green) !important;
         text-align: center;
@@ -153,7 +154,7 @@
   &__content {
     text-align: center;
     &__title {
-      font-weight: bold;
+      font-weight:400;
       font-size: 18px;
       @include ipad {
         font-size: 26px;
@@ -167,14 +168,14 @@
       }
       &-link{
 
-        font-weight: 600;
+        font-weight: 400;
         color: var(--green);
       }
     }
     &__checkmail{
       margin-top: 2em;
       font-size: 15px;
-      font-weight: 600;
+      font-weight: 400;
     }
   }
 }
@@ -193,7 +194,7 @@ html[dir="rtl"] {
     left: 10px;
   }
   .login-signup__languageToggle {
-    left: 60px;
+    left: 120px;
     right: unset;
   }
 }