Skip to content

Commit

Permalink
Merge pull request #784 from basedosdados/development
Browse files Browse the repository at this point in the history
update bd edu and triggers
  • Loading branch information
AldemirLucas authored Feb 29, 2024
2 parents 3f6c7b8 + ec72a39 commit 24b4692
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion next/components/molecules/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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-py">
<FooterLink href="https://info.basedosdados.org/bd-edu-python">
BD Edu
</FooterLink>
</SectionCategories>
Expand Down
2 changes: 1 addition & 1 deletion next/components/molecules/Menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,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-py"},
{icon: <BDLogoEduImage widthImage="54px"/>, name: "Curso de dados", href: "https://info.basedosdados.org/bd-edu-python"},
{},
{name: "Serviço", href: "/servicos"},
{},
Expand Down
6 changes: 4 additions & 2 deletions next/pages/dataset/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,10 @@ export default function SearchPage({ pages }) {

if (indice === -1) {
newArray.push(elm)
triggerGAEvent("theme_dataset", elm[1])
triggerGAEvent("theme", elm[1])
if(elm[0] === "theme") {
triggerGAEvent("theme_dataset", elm[1])
triggerGAEvent("theme", elm[1])
}
} else {
newArray.splice(indice, 1)
}
Expand Down
4 changes: 2 additions & 2 deletions next/pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ function Support({ pages }) {
}

function BDEdu () {
const closeDate = new Date(2024, 1, 5)
const closeDate = new Date(2024, 2, 25)
const currentDate = new Date()

if(currentDate > closeDate) return null
Expand Down Expand Up @@ -685,7 +685,7 @@ function BDEdu () {
margin="0 !important"
backgroundColor="#8262D1"
>
<a href="https://info.basedosdados.org/bd-edu-py" target="_blank">
<a href="https://info.basedosdados.org/bd-edu-python" target="_blank">
Aproveite o preço promocional
</a>
</RoundedButton>
Expand Down
6 changes: 3 additions & 3 deletions next/pages/user/register.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default function Register() {
}

const handleSubmit = (e) => {
triggerGAEvent("user", "register_try")
triggerGAEvent("user_register", "register_try")

const regexPassword = {}
const validationErrors = {}
Expand Down Expand Up @@ -95,9 +95,9 @@ export default function Register() {

if (Object.keys(validationErrors).length === 0) {
createRegister(formData)
triggerGAEvent("user", "register_success")
triggerGAEvent("user_register", "register_success")
} else {
triggerGAEvent("user", "register_err")
triggerGAEvent("user_register", "register_err")
}
}

Expand Down

0 comments on commit 24b4692

Please sign in to comment.