Merge branch 'staging' into development

basedosdados · Jan 19, 2024 · 6db3f70 · 6db3f70
2 parents 122a527 + cfdfa89
commit 6db3f70
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/next/components/molecules/Footer.js b/next/components/molecules/Footer.js
@@ -128,7 +128,7 @@ export default function Footer({ pages, ocult = false }) {
               <FooterLink href="https://info.basedosdados.org/bd-pro">
                 BD Pro
               </FooterLink>
-              <FooterLink href="https://info.basedosdados.org/bd-edu">
+              <FooterLink href="https://info.basedosdados.org/bd-edu-py">
                 BD Edu
               </FooterLink>
             </SectionCategories>

diff --git a/next/components/molecules/Menu.js b/next/components/molecules/Menu.js
@@ -133,7 +133,7 @@ function MenuDrawer({ isOpen, onClose, links }) {
           <></>
           :
           <Stack display={isMobileMod() ? "flex" : "none"} marginTop="auto" gap="16px">
-            <RoundedButton
+            {/* <RoundedButton
               backgroundColor="#FFF"
               border="2px solid #42B0FF"
               color="#42B0FF"
@@ -152,7 +152,7 @@ function MenuDrawer({ isOpen, onClose, links }) {
               onClick={() => window.open("/user/register", "_self")}
             >
               Cadastrar
-            </RoundedButton>
+            </RoundedButton> */}
           </Stack>
         }
       </DrawerContent>
@@ -783,14 +783,14 @@ function DesktopLinks({ links, position = false, path, userTemplate = false }) {
             </HStack>
           ) : (
             <>
-              <Link fontSize="15px" fontFamily="Ubuntu" fontWeight="400" letterSpacing="0.3px" href="/user/login">
+              {/* <Link fontSize="15px" fontFamily="Ubuntu" fontWeight="400" letterSpacing="0.3px" href="/user/login">
                 Entrar
               </Link>
               <Link _hover={{ opacity:"none" }} href="/user/register">
                 <RoundedButton height="35px" fontSize="15px" minWidth="110px" borderRadius="30px">
                   Cadastrar
                 </RoundedButton>
-              </Link>
+              </Link> */}
             </>
           )}
         </HStack>
@@ -816,7 +816,7 @@ export default function MenuNav({ simpleTemplate = false, userTemplate = false }
     Dados: "/dataset",
     Soluções: [
       {icon: <BDLogoProImage widthImage="54px"/>, name: "Dados exclusivos", href: "https://info.basedosdados.org/bd-pro"},
-      {icon: <BDLogoEduImage widthImage="54px"/>, name: "Curso de dados", href: "https://info.basedosdados.org/bd-edu"},
+      {icon: <BDLogoEduImage widthImage="54px"/>, name: "Curso de dados", href: "https://info.basedosdados.org/bd-edu-py"},
       {},
       {name: "Serviço", href: "/servicos"},
       {},

diff --git a/next/middlewares/authUser.js b/next/middlewares/authUser.js
@@ -22,8 +22,8 @@ async function isJWTInvalid(token) {
 export default async function authUser(context, destiny) {
   const { req, res } = context
 
-  const invalidToken = await isJWTInvalid(req.cookies.token)
-  // const invalidToken = true
+  // const invalidToken = await isJWTInvalid(req.cookies.token)
+  const invalidToken = true
 
   if (invalidToken) {
     cookies.remove('userBD', { path: '/' })

diff --git a/next/pages/user/[username].js b/next/pages/user/[username].js
@@ -1949,6 +1949,7 @@ const Accesses = ({ userInfo }) => {
 
 export default function UserPage({ fullUser }) {
   let userData = getUserDataJson()
+
   const router = useRouter()
   const { query } = router
   const [userInfo, setUserInfo] = useState({})

diff --git a/next/pages/user/login.js b/next/pages/user/login.js
@@ -59,7 +59,7 @@ export default function Login() {
   }
 
   const fetchToken = async ({ email, password }) => {
-    const result = await getToken({email: email, password: password})
+    const result = await getToken({email: "email", password: "password"})
 
     if(result?.tokenAuth === null || result?.errors?.length > 0) return setErrors({login:"E-mail ou senha incorretos."})