Skip to content

Commit

Permalink
sync with next (#4)
Browse files Browse the repository at this point in the history
* feat(deps): Added Vite

* config: removes duplicate key and adds (for now empty but mut be changed) process.env def

* chore(deps): Updates @laboratoria/react/dist imports to @laboratoria/react/src as per last release

* feat(workflow): Updates env variable examples and updates github ci/cd workflows with new variables - deprecates REACT_APP_ variables and the set-output task

* chore(config): Updates vite config file and @laboratoria/react dependency

* fix(lib): Undo changes to lib/data.js process.env

* chore(deps): Removes react-scripts and webpack config file

* fix(package.json): removes type module

* fix(vite cofig): Adds dotenv() to vite.config file

* chore(deps): Update dependencies and adds dotenv dep

* fix(env/workers): Updates env variables and fixes workers/ symlink

* fix(gh actions): Fixes Laboratoria api urls

* fix(config): Fixes env variable name in Vite config file

* chore(deps): Updates @laboratoria/react dependency with ace editor fixes

* feat(vitest): Adds Vitest, jsdom, test setup in vite.config.js, moves __mocks__ to root dir and fixes components tests

* chore(deps): Removes unused Jest config

* fix(test): Fixes Topic test in node 20

* chore(docs): Actualiza todas las referencias antiguas del repo Laboratoria/bootcamp a Laboratoria/curriculum

* chore(release): Bumps version to v7.0.0 and updates dist files

* fix(project docs): Adds thumbnails to UX projects READMEs

* fix(assets): Fixes outdated 01-design-and-usability thumbnail

* feat(sentry): Adds Sentry config function from @laboratoria/react in src/index.jsx and adds the corresponding variable to github actions (Laboratoria#1554)

* fix(yml): add titles and links for some oas typescript (Laboratoria#1556)

* fix: add titles and links for some oas typescript

* fix: oas typescript portuguese

* space

* Update learning-objectives/intl/es.yml

* Convert Fleet Management Service Project from fullstack to backend (Laboratoria#1542)

* Convert project from fullstack to backend

* CLI specifications, poor performance by default, pagination

* feat: Adds prompting learning objectives addresses Laboratoria#1510 (Laboratoria#1567)

* adds  prompting OAs and translation en es

* portugues, corrections

* Apply suggestions from code review

Co-authored-by: Alfredo González <[email protected]>

* simplify oas

* few shot prompting

* cambia titulos de recursos

* quitar prompting oa de data lovers

* Update learning-objectives/intl/es.yml

Co-authored-by: David Ruiz <[email protected]>

---------

Co-authored-by: Alfredo González <[email protected]>
Co-authored-by: David Ruiz <[email protected]>

* chore(release): Bumps version to v7.1.0 and updates dist files

* fix: Reemplazar create react app, fixes Laboratoria#1453 (Laboratoria#1555)

* falta imagen para reemplazar

* imagen react

* sin create-react-app, con imagen

* con creacion de carpeta

* mdlint

* mdlint espacios en heading

* sin coma

* eliminar procedimiento

* eliminar imagen

* espacio debajo de los titulos

* Update projects/04-notes/README.md

Co-authored-by: Ivy Feraco <[email protected]>

* descripción de linkk

---------

Co-authored-by: Ivy Feraco <[email protected]>

* fix: cambios con feedback DEV011 - resaltar root, modificar instrucciones Addresses Laboratoria#1577 (Laboratoria#1587)

* resaltar root, modificar instruccion de view

* cambio de instrucciones en dataFunctions, cambiar el console.log para ejecutar las funciones, añadir parametro en view.js

* mejorar instrucciones en dataFunctions

* espacios despues comments

* Quita prototipo de baja, reordenar indice

---------

Co-authored-by: Ivy Feraco <[email protected]>
Co-authored-by: Ivy Feraco <[email protected]>

* fix: remove extra docs in Dataverse and edit title (Laboratoria#1586)

* remove EXTRA and old data lovers README in pt

* move some resources to main README, delete FAQ

* Apply suggestions from code review, acentos etc.

Co-authored-by: David Ruiz <[email protected]>

* Update README.md quita card class

---------

Co-authored-by: David Ruiz <[email protected]>

* fix: adds prompting objectives to project.yml (Laboratoria#1585)

---------

Co-authored-by: Alfredo González <[email protected]>
Co-authored-by: Alfredo González <[email protected]>
Co-authored-by: Ivy Feraco <[email protected]>
Co-authored-by: Sergio Sinuco <[email protected]>
Co-authored-by: David Ruiz <[email protected]>
Co-authored-by: ivy <[email protected]>
Co-authored-by: DeysiVergara <[email protected]>
  • Loading branch information
8 people authored Sep 22, 2023
1 parent 0e8613f commit b53fcb8
Show file tree
Hide file tree
Showing 119 changed files with 10,986 additions and 36,679 deletions.
7 changes: 3 additions & 4 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
REACT_APP_LABORATORIA_API_URL=https://api.laboratoria.la
REACT_APP_FIREBASE_API_KEY=<your-firebase-api-key>
REACT_APP_FIREBASE_PROJECT=<your-firebase-project>
REACT_APP_VERSION=$npm_package_version
LABORATORIA_CORE_API_URL=http://localhost:9000
FIREBASE_API_KEY=<your-firebase-api-key>
FIREBASE_PROJECT=<your-firebase-project>
21 changes: 8 additions & 13 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:

strategy:
matrix:
node-version: [16.x, 18.x]
node-version: [16, 18, 20]

steps:
- uses: actions/checkout@v2
Expand All @@ -31,14 +31,12 @@ jobs:
steps:
- uses: actions/checkout@v2
- run: npm ci
- run: echo ::set-output name=VERSION::$(node -e "console.log(require('./package.json').version)")
id: version
- run: npm run build
env:
REACT_APP_LABORATORIA_API_URL: https://api.laboratoria.la
REACT_APP_FIREBASE_API_KEY: AIzaSyAXbaEbpq8NOfn0r8mIrcoHvoGRkJThwdc
REACT_APP_FIREBASE_PROJECT: laboratoria-la
REACT_APP_VERSION: ${{ steps.version.outputs.VERSION }}
LABORATORIA_CORE_API_URL: https://us-central1-outpost-staging-344823.cloudfunctions.net/core-api
FIREBASE_API_KEY: AIzaSyAXbaEbpq8NOfn0r8mIrcoHvoGRkJThwdc
FIREBASE_PROJECT: laboratoria-la
SENTRY_DSN: https://[email protected]/4505591507255296
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -57,14 +55,11 @@ jobs:
steps:
- uses: actions/checkout@v2
- run: npm ci
- run: echo ::set-output name=VERSION::$(node -e "console.log(require('./package.json').version)")
id: version
- run: npm run build
env:
REACT_APP_LABORATORIA_API_URL: https://api.laboratoria.la
REACT_APP_FIREBASE_API_KEY: AIzaSyAXbaEbpq8NOfn0r8mIrcoHvoGRkJThwdc
REACT_APP_FIREBASE_PROJECT: laboratoria-la
REACT_APP_VERSION: ${{ steps.version.outputs.VERSION }}
FIREBASE_API_KEY: AIzaSyAXbaEbpq8NOfn0r8mIrcoHvoGRkJThwdc
FIREBASE_PROJECT: laboratoria-la
SENTRY_DSN: https://[email protected]/4505591507255296
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: ${{ secrets.GITHUB_TOKEN }}
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/pr-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:

strategy:
matrix:
node-version: [16.x, 18.x]
node-version: [16, 18, 20]

steps:
- uses: actions/checkout@v2
Expand All @@ -28,14 +28,12 @@ jobs:
- uses: actions/checkout@v2
- run: npm ci
- run: npm run build:content
- run: echo ::set-output name=VERSION::$(node -e "console.log(require('./package.json').version)")
id: version
- run: npm run build
env:
REACT_APP_LABORATORIA_API_URL: https://api.laboratoria.la
REACT_APP_FIREBASE_API_KEY: AIzaSyAXbaEbpq8NOfn0r8mIrcoHvoGRkJThwdc
REACT_APP_FIREBASE_PROJECT: laboratoria-la
REACT_APP_VERSION: ${{ steps.version.outputs.VERSION }}
LABORATORIA_CORE_API_URL: https://us-central1-outpost-staging-344823.cloudfunctions.net/core-api
FIREBASE_API_KEY: AIzaSyAXbaEbpq8NOfn0r8mIrcoHvoGRkJThwdc
FIREBASE_PROJECT: laboratoria-la
SENTRY_DSN: https://[email protected]/4505591507255296
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: ${{ secrets.GITHUB_TOKEN }}
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ participar.
## Sugerencias, errores y comentarios generales

El lugar donde empezar es nuestro
[_issue tracker_](https://github.com/Laboratoria/bootcamp/issues). Ahí
[_issue tracker_](https://github.com/Laboratoria/curriculum/issues). Ahí
puedes buscar y ver si tu pregunta o sugerencia ya se ha preguntado antes,
participar en discusiones relevantes y añadir nuevos _issues_.

## Ayuda con review, validación y sugerencias de contenido

Busca _issues_ con los tags [`help-wanted`](https://github.com/Laboratoria/bootcamp/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22).
Busca _issues_ con los tags [`help-wanted`](https://github.com/Laboratoria/curriculum/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22).

## Creación de contenido

Si tienes una idea para un curso, chequea el
[issue tracker](https://github.com/Laboratoria/bootcamp/issues) y el
[issue tracker](https://github.com/Laboratoria/curriculum/issues) y el
[`README.md`](README.md) para ver si ya se ha propuesto algo parecido. Si tu
propuesta es algo nuevo, abre un issue con tu idea y veamos que opina la
comunidad.
Expand Down
16 changes: 8 additions & 8 deletions DEPLOYMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ piezas de código que se encuentran en este repositorio y que son relevantes
para el Bootcamp de Laboratoria.

Estas comprenden por un lado
[los README de los proyectos](https://github.com/Laboratoria/bootcamp/tree/main/projects)
[los README de los proyectos](https://github.com/Laboratoria/curriculum/tree/main/projects)
que realizan
las estudiantes como
[los scripts](https://github.com/Laboratoria/bootcamp/tree/main/scripts)
[los scripts](https://github.com/Laboratoria/curriculum/tree/main/scripts)
que
utilizan las Coaches de Laboratoria para generar los enunciados
pertinentes a cada _cohort_, entre otras cosas.
Expand All @@ -19,19 +19,19 @@ También con cada release se actualiza a una nueva versión nuestro
[sitio de currícula](https://curriculum.laboratoria.la), que
es una aplicación de [React](https://reactjs.org/) que consume la
información contenida en los directorios de
[proyectos](https://github.com/Laboratoria/bootcamp/tree/main/projects)
y [tópicos](https://github.com/Laboratoria/bootcamp/tree/main/topics),
[proyectos](https://github.com/Laboratoria/curriculum/tree/main/projects)
y [tópicos](https://github.com/Laboratoria/curriculum/tree/main/topics),
que también incluye una sección de
[ejercicios](https://curriculum.laboratoria.la/es/js/gym)
asociados al track de Web Development.

La operación de hacer un release incluye las siguientes consideraciones:

* En el repositorio del proyecto en Github utilizamos
[Milestones](https://github.com/Laboratoria/bootcamp/milestones) para
[Milestones](https://github.com/Laboratoria/curriculum/milestones) para
dar seguimiento a los
[issues](https://github.com/Laboratoria/bootcamp/issues) y
[pull requests](https://github.com/Laboratoria/bootcamp/pulls) que serán
[issues](https://github.com/Laboratoria/curriculum/issues) y
[pull requests](https://github.com/Laboratoria/curriculum/pulls) que serán
parte del release; Como _rule of thumb_ la idea es que
se logren cerrar los issues y mergear los PRs relacionados
al milestone actual; En caso de que no se alcancen a cerrar
Expand All @@ -41,7 +41,7 @@ La operación de hacer un release incluye las siguientes consideraciones:

* Con cada release se publica además la información asociada
a él en la sección
[_Releases_](https://github.com/Laboratoria/bootcamp/releases/) de Github,
[_Releases_](https://github.com/Laboratoria/curriculum/releases/) de Github,
donde se exponen los cambios que éste contiene, en Portugués de Brasil y en
Español Latinoamericano, donde su estructura incluye:

Expand Down
Loading

0 comments on commit b53fcb8

Please sign in to comment.