Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main into dev #1759

Merged
merged 41 commits into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
d66651f
Update pricing.jsx
tommygonzaleza Dec 9, 2024
d366468
Update pricing.jsx
tommygonzaleza Dec 11, 2024
a853505
Add heading to bootcamp landing
tomasgonzaleza Dec 12, 2024
4b14805
Update syllabus.json
tommygonzaleza Dec 12, 2024
477c569
Merge pull request #1740 from tommygonzaleza/main
tommygonzaleza Dec 12, 2024
c82ead8
Update [course_slug].jsx
tommygonzaleza Dec 12, 2024
3f8ec22
Update [course_slug].jsx
tommygonzaleza Dec 12, 2024
22eae0a
Merge pull request #1730 from breatheco-de/development
tommygonzaleza Dec 12, 2024
d15545f
Update syllabus.json
alesanchezr Dec 12, 2024
08a40d2
change algorithm to find currentTask
lumi-tip Dec 16, 2024
e0c9417
small refactor
lumi-tip Dec 16, 2024
a34ede5
small refactor
lumi-tip Dec 16, 2024
8e832fc
Update signup.json
alesanchezr Dec 16, 2024
2e57cdf
Allow getting the info from landing_variables
tomasgonzaleza Dec 16, 2024
f01c561
Allow getting the info from landing_variables
tomasgonzaleza Dec 16, 2024
3f9b45a
Allow getting the info from landing_variables
tomasgonzaleza Dec 16, 2024
3babb43
Fix deployment issues
tomasgonzaleza Dec 16, 2024
eaef796
Fix deployment issues
tomasgonzaleza Dec 16, 2024
8c70746
Fix deployment issues
tomasgonzaleza Dec 16, 2024
d399194
Merge pull request #1743 from tommygonzaleza/main
tommygonzaleza Dec 16, 2024
104a52d
Students enrolled translation bug
tomasgonzaleza Dec 16, 2024
c8a9fdf
Merge pull request #1744 from tommygonzaleza/main
tommygonzaleza Dec 16, 2024
f57b6a6
Fix amount of exercises per program
tomasgonzaleza Dec 16, 2024
9385f20
Allow changing featured bullets
tomasgonzaleza Dec 16, 2024
4dd90e4
Allow changing featured bullets
tomasgonzaleza Dec 16, 2024
aae8b3b
Remove trailling spaces
tomasgonzaleza Dec 16, 2024
04fe80d
Merge pull request #1745 from tommygonzaleza/main
tommygonzaleza Dec 17, 2024
8de5a1a
Update footer.json
tommygonzaleza Dec 17, 2024
b13e46b
Update footer.json
tommygonzaleza Dec 17, 2024
b78d902
Update footer.json
tommygonzaleza Dec 17, 2024
6a6d64c
Update footer.json
tommygonzaleza Dec 17, 2024
6c9fd4a
refactor
lumi-tip Dec 17, 2024
b49e55a
Merge pull request #1742 from lumi-tip/development-lumi-8111
tommygonzaleza Dec 17, 2024
0b2bc2b
set rigobot context in bootcamp page
gustavomm19 Dec 20, 2024
336373f
Update completion-jobs.json
tommygonzaleza Dec 26, 2024
7f182dd
Merge pull request #1748 from gustavomm19/rigo-context
tommygonzaleza Dec 26, 2024
a0be968
fixes bug with label
gustavomm19 Dec 27, 2024
72bc7fd
Merge pull request #1753 from gustavomm19/fix-bug
tommygonzaleza Dec 27, 2024
3ecaa26
Merge pull request #1754 from breatheco-de/development
tommygonzaleza Dec 27, 2024
3dbf23c
fix bug with syllabus
gustavomm19 Jan 2, 2025
a9246a8
Merge pull request #1756 from gustavomm19/fix-syllabus-bug
tommygonzaleza Jan 2, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified bun.lockb
Binary file not shown.
2 changes: 1 addition & 1 deletion public/alias-redirects.json

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions public/locales/en/course.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,19 +97,16 @@
{
"type": "lesson",
"title": "Readings and videos",
"qty": 45,
"icon": "book"
},
{
"type": "exercise",
"title": "Interactive Exercises",
"qty": 584,
"icon": "strength"
},
{
"type": "project",
"title": "Interactive Projects",
"qty": 28,
"icon": "laptop-code"
},
{
Expand Down
4 changes: 2 additions & 2 deletions public/locales/en/footer.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@
"href": "/bootcamp/full-stack-development"
},
{
"title": "Start coding using Python",
"title": "Deep Dive into Python",
"icon": "python",
"text": "Get started in coding with the world's most popular language. Build your first projects and practice with more than 300 exercises.",
"href": "/bootcamp/start-coding-using-python"
"href": "/bootcamp/deep-dive-into-python"
},
{
"title": "Data Science and ML",
Expand Down
4 changes: 2 additions & 2 deletions public/locales/es/footer.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@
"href": "/es/bootcamp/full-stack-development"
},
{
"title": "Empieza a programar con Python",
"title": "Profundiza con Python",
"icon": "python",
"text": "Empieza a programar utilizando el lenguaje más popular del mundo, Python. Construye tus primeros proyectos y accede a más de 300 ejercicios para practicar.",
"href": "/es/bootcamp/start-coding-using-python"
"href": "/es/bootcamp/deep-dive-into-python"
},
{
"title": "Data Science y Machine Learning",
Expand Down
2 changes: 1 addition & 1 deletion public/locales/es/signup.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
"free-trial-period": "Prueba gratuita por {{qty}} {{period}}",
"trial": "Prueba por 1 mes",
"trial-week": "Prueba por 1 semana",
"monthly": "Mensual",
"monthly": "Un mes",
"one-time-payment": "un solo pago",
"one-time-connector": "Un solo pago de ${{value}} dólares",
"installments": "Cuotas",
Expand Down
4 changes: 2 additions & 2 deletions public/locales/es/syllabus.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"next-page": "Siguiente",
"back-to-top": "Volver arriba",
"back-to-program": "Volver al programa",
"back-to-previous": "volver al módulo anterior",
"start-next": "Comenzar siguiente module:",
"back-to-previous": "Volver al módulo anterior",
"start-next": "Comenzar siguiente modulo:",
"no-traduction-found": "No se encontró traducción",
"no-traduction-found-description": ">Lo sentimos, no se encontró una traducción para este contenido. Estamos trabajando constantemente para ofrecer nuestros módulos en varios idiomas. Apreciamos tu paciencia y si deseas contribuir con traducciones, por favor visita nuestro repositorio en Github. Mientras tanto, puedes intentar acceder al contenido en otro idioma disponible o volver más tarde para verificar si la traducción ha sido agregada.",
"no-content-found": "No se encontró contenido",
Expand Down
2 changes: 1 addition & 1 deletion public/redirects-from-api.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions public/sitemap.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<sitemap>
<loc>https://4geeks.com/pages-sitemap.xml</loc>
<lastmod>2024-11-29T09:15:51.552Z</lastmod>
<lastmod>2024-12-12T14:11:44.258Z</lastmod>
</sitemap>
<sitemap>
<loc>https://4geeks.com/howto-sitemap.xml</loc>
<lastmod>2024-11-29T09:15:51.552Z</lastmod>
<lastmod>2024-12-12T14:11:44.258Z</lastmod>
</sitemap>
<sitemap>
<loc>https://4geeks.com/lessons-sitemap.xml</loc>
<lastmod>2024-11-29T09:15:51.552Z</lastmod>
<lastmod>2024-12-12T14:11:44.258Z</lastmod>
</sitemap>
<sitemap>
<loc>https://4geeks.com/projects-sitemap.xml</loc>
<lastmod>2024-11-29T09:15:51.552Z</lastmod>
<lastmod>2024-12-12T14:11:44.258Z</lastmod>
</sitemap>
<sitemap>
<loc>https://4geeks.com/exercises-sitemap.xml</loc>
<lastmod>2024-11-29T09:15:51.552Z</lastmod>
<lastmod>2024-12-12T14:11:44.258Z</lastmod>
</sitemap>
<sitemap>
<loc>https://4geeks.com/technologies-sitemap.xml</loc>
<lastmod>2024-11-29T09:15:51.552Z</lastmod>
<lastmod>2024-12-12T14:11:44.258Z</lastmod>
</sitemap>
</sitemapindex>
2 changes: 1 addition & 1 deletion public/syllabus.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"[\n {\"label\": \"Web Developer\", \"href\": \"/read/web-development\"},{\"label\": \"Full-Stack Software Developer - 16w\", \"href\": \"/read/full-stack\"}\n ]"
"[\n {\"label\": \"Web Developer\", \"href\": \"/read/web-development\"},{\"label\": \"Full-Stack Software Developer - 16w\", \"href\": \"/read/full-stack\"}\n ]"
9 changes: 0 additions & 9 deletions src/common/components/ShowPrices.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import Heading from './Heading';
import Text from './Text';
import useSignup from '../store/actions/signupAction';
import useStyle from '../hooks/useStyle';
import useRigo from '../hooks/useRigo';

function PlanCard({ item, handleSelect, selectedId, isCouponAvailable }) {
const { hexColor, backgroundColor2 } = useStyle();
Expand Down Expand Up @@ -83,7 +82,6 @@ function ShowPrices({
const { t } = useTranslation('profile');
const { hexColor, fontColor, disabledColor, featuredColor } = useStyle();
const router = useRouter();
const { isRigoInitialized, rigo } = useRigo();
const { getPriceWithDiscount, state } = useSignup();
const { selfAppliedCoupon } = state;

Expand Down Expand Up @@ -133,13 +131,6 @@ function ShowPrices({
if (dataList.length === 1) {
handleSelect(dataList[0]);
}
if (isRigoInitialized) {
const context = document.body.innerText;

rigo.updateOptions({
context,
});
}
}, []);

const handleSelectFinance = (index) => {
Expand Down
Loading