Merge pull request #241 from JR-prog/pre-demo-fixes

Various bug fixes
jay-roe · Apr 26, 2023 · f80b50a · f80b50a
2 parents 3656d81 + d382b45
commit f80b50a
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 44 deletions.
diff --git a/app/[locale]/account-required/page.tsx b/app/[locale]/account-required/page.tsx
@@ -2,10 +2,11 @@
 
 import Button from '@/components/Buttons/Button';
 import Link from 'next/link';
-import { useTranslations } from 'next-intl';
+import { useLocale, useTranslations } from 'next-intl';
 
 export default function AccountRequired() {
   const t = useTranslations('AccountRequired');
+  const locale = useLocale();
 
   return (
     <div>
@@ -19,10 +20,10 @@ export default function AccountRequired() {
         {t('should-login')}
       </p>
       <div className="flex space-x-1.5">
-        <Link href="/login">
+        <Link href={`/${locale}/login`}>
           <Button>{t('sign-in')}</Button>
         </Link>
-        <Link href="/register">
+        <Link href={`/${locale}/register`}>
           <Button>{t('register')}</Button>
         </Link>
       </div>

diff --git a/app/[locale]/admin/lockedList/page.tsx b/app/[locale]/admin/lockedList/page.tsx
@@ -46,10 +46,10 @@ export default function LockedList() {
 
   async function unlockAccount(uid: string) {
     // get account of the person reported and set accountLocked to false
-    updateDoc(doc(db.users, uid), {
+    await updateDoc(doc(db.users, uid), {
       accountLocked: false,
     });
-    window.location.reload();
+    setBanned((curr) => curr.filter((bannedUser) => bannedUser.userId !== uid));
   }
 
   return (
@@ -67,16 +67,6 @@ export default function LockedList() {
                   <div className="flex items-center justify-center">
                     <p>{user.name}</p>
                   </div>
-                  <Button
-                    data-testid="unban-account-btn"
-                    onClick={() => {
-                      unlockAccount(user.userId);
-                    }}
-                  >
-                    Unban account
-                  </Button>
-                </div>
-                <div>
                   <Button
                     data-testid="unban-account-btn"
                     onClick={() => {

diff --git a/app/[locale]/job-feed/page.tsx b/app/[locale]/job-feed/page.tsx
@@ -73,14 +73,15 @@ export default function Feeds() {
   useEffect(() => {
     setFilteredJobs([]);
     jobs
-      .filter((job) =>
-        checkIfJobIsInFilter({
-          fullTime: fullTime,
-          partTime: partTime,
-          internship: internship,
-          job: job,
-          searchKey: searchKey,
-        })
+      .filter(
+        (job) =>
+          checkIfJobIsInFilter({
+            fullTime: fullTime,
+            partTime: partTime,
+            internship: internship,
+            job: job,
+            searchKey: searchKey,
+          }) && job.deadline.toMillis() > new Date().getTime()
       )
       .forEach((job) => {
         setFilteredJobs((cur) => [...cur, job]);

diff --git a/app/[locale]/login/page.tsx b/app/[locale]/login/page.tsx
@@ -37,6 +37,7 @@ export default function Login() {
     try {
       setLoading(true);
       await login(email, password);
+      router.push('/' + locale + '/');
     } catch (err) {
       console.error(err);
       alert(t('alert-failed'));

diff --git a/app/[locale]/profile/[uid]/links/page.tsx b/app/[locale]/profile/[uid]/links/page.tsx
@@ -51,7 +51,7 @@ export default function Links({ params }) {
     let links: UserWithId[] = [];
     for (
       let i = linkedIndex.current;
-      i < linkedIndex.current + PAGE_SIZE && i < linkedIds.current.length;
+      i < linkedIndex.current + PAGE_SIZE && i < linkedIds?.current?.length;
       i++
     ) {
       const linkedUser = await getDoc(doc(db.users, linkedIds.current[i]));
@@ -101,8 +101,10 @@ export default function Links({ params }) {
     <>
       <p data-testid="welcome-msg" className="mb-3 text-left text-2xl">
         {myPage
-          ? `Let's see who your links are.`
-          : `Let's see who ${user.name}'s links are.`}
+          ? t('view-your-links')
+          : `${t('view-other-links-start')} ${user.name}${t(
+              'view-other-links-end'
+            )}`}
       </p>
       <CardGrid className="gap-y-4">
         {links?.map((link, index) => {
@@ -144,11 +146,6 @@ export default function Links({ params }) {
         data-testid="load-more-button-container"
       >
         {!allLinksFound ? (
-          // <LoadMoreButton onClick={() =>
-          //   getLinkInfo().then((links) => {
-          //   setLinks((current) => [...current, ...links]);
-          // })
-          // }/>
           <Button
             className="mx-auto"
             data-testid="load-more"

diff --git a/app/[locale]/profile/[uid]/page.tsx b/app/[locale]/profile/[uid]/page.tsx
@@ -116,7 +116,9 @@ export default function ViewProfile({ params }) {
           href={`/profile/${params.uid}/links`}
           linkedUserIds={user?.linkedUserIds}
         />
-        {!currentAdmin && <LinkButton profileOwnerUID={params.uid} />}
+        {!currentAdmin && !currentUser.isCompany && (
+          <LinkButton profileOwnerUID={params.uid} />
+        )}
       </div>
 
       <ProfileContact email={user.email} phone={user.phone} />

diff --git a/components/Buttons/LinkButton/LinkButtonNoNumber.tsx b/components/Buttons/LinkButton/LinkButtonNoNumber.tsx
@@ -17,7 +17,8 @@ const LinkButtonNoNumber = ({
   const { currentUser, authUser } = useAuth(); // User sending out the request
   const [linkIds, setLinkIds] = useState(currentUser.linkedUserIds);
   return (
-    posterUID !== authUser.uid && (
+    posterUID !== authUser.uid &&
+    !currentUser.isCompany && (
       <button
         data-testid="link-btn-no-number"
         className="z-50 flex max-w-fit items-center gap-1 rounded-md bg-white bg-opacity-0 p-2 transition-all hover:bg-opacity-10 active:bg-opacity-20"

diff --git a/components/Buttons/LinkButton/ViewLinkButton.tsx b/components/Buttons/LinkButton/ViewLinkButton.tsx
@@ -11,19 +11,34 @@ export default function ViewLinkButton({
   href?: string;
 }) {
   const t = useTranslations('Button.Link');
+
+  if (href) {
+    return (
+      <button
+        data-testid="view-link-button"
+        className="mb-3 max-w-fit rounded-xl bg-white bg-opacity-[0.12] p-3 font-semibold transition-all hover:bg-opacity-[0.18]"
+      >
+        <Link href={href || ''}>
+          <span className="flex items-center gap-2">
+            <LinkIcon />
+            <p>
+              {linkedUserIds?.length || 0} {t('links')}
+            </p>
+          </span>
+        </Link>
+      </button>
+    );
+  }
+
   return (
     <button
       data-testid="view-link-button"
-      className="mb-3 max-w-fit rounded-xl bg-white bg-opacity-[0.12] p-3 font-semibold transition-all hover:bg-opacity-[0.18]"
+      className="mb-3 flex max-w-fit cursor-default items-center gap-2 rounded-xl bg-white bg-opacity-[0.12] p-3 font-semibold"
     >
-      <Link href={href || ''}>
-        <span className="flex items-center gap-2">
-          <LinkIcon />
-          <p>
-            {linkedUserIds?.length || 0} {t('links')}
-          </p>
-        </span>
-      </Link>
+      <LinkIcon />
+      <p>
+        {linkedUserIds?.length || 0} {t('links')}
+      </p>
     </button>
   );
 }
diff --git a/contexts/AuthContext.tsx b/contexts/AuthContext.tsx
@@ -20,6 +20,8 @@ import { deleteDoc, doc, getDoc, setDoc } from 'firebase/firestore';
 import md5 from 'md5';
 import { useRouter } from 'next/navigation';
 import { useLocale } from 'next-intl';
+import LoadingScreen from '@/components/Loading/Loading';
+import NavBar from '@/components/NavBar/NavBar';
 
 interface AuthContextType {
   currentUser: User;
@@ -254,9 +256,17 @@ export function AuthProvider({ children }) {
     [currentUser, currentAdmin, authUser]
   );
 
+  // Render loading screen instead of page content while authentication loading
   return (
     <AuthContext.Provider value={value}>
-      {!loading && children}
+      {loading ? (
+        <main className="flex min-h-screen flex-col bg-purple-background">
+          <NavBar />
+          <LoadingScreen />
+        </main>
+      ) : (
+        children
+      )}
     </AuthContext.Provider>
   );
 }
diff --git a/translations/de.json b/translations/de.json
@@ -370,6 +370,9 @@
       "loading": "Wird geladen...",
       "invalid": "Ungültiger Benutzer.",
       "links": {
+        "view-your-links": "Mal sehen, wer Ihre Links sind.",
+        "view-other-links-start": "Mal sehen, wer",
+        "view-other-links-end": "s Links sind.",
         "login-first": "Sie sollten sich zuerst anmelden.",
         "sign-in": "Anmelden",
         "register": "Registrieren",

diff --git a/translations/en.json b/translations/en.json
@@ -370,6 +370,9 @@
       "loading": "Loading...",
       "invalid": "Invalid User.",
       "links": {
+        "view-your-links": "Let's see who your links are.",
+        "view-other-links-start": "Let's see who",
+        "view-other-links-end": "'s links are.",
         "login-first": "You should login first.",
         "sign-in": "Sign In",
         "register": "Register",
@@ -450,7 +453,7 @@
     "should-login": "You should login first.",
     "login": "Login",
     "register": "Register",
-    "confirm-unsaved": "Unsaved changes will be lost. Conitnue?",
+    "confirm-unsaved": "Unsaved changes will be lost. Continue?",
     "alert-success": "Successfully updated your profile!",
     "edit-profile": "Edit Profile",
     "save": "Save Changes",