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

Tup 19 tarea test #36

Merged
merged 57 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
db98a55
hot fix
TobiasMaciel Aug 10, 2024
64ac848
hot fix
TobiasMaciel Aug 10, 2024
445543c
Hot fix
TobiasMaciel Aug 10, 2024
5ba1ae8
Update README.md
carlosferreyra Aug 10, 2024
243e1a1
Merge branch 'dev' of https://github.com/Seminario-Integrador-2024/Ge…
carlosferreyra Aug 10, 2024
45cd7b7
chore: Update README.md formatting and fix typos
carlosferreyra Aug 10, 2024
80a2455
modificacion de boton global, creacion de header
facundomelgarejo Aug 10, 2024
c66b6bd
Merge branch 'dev' of https://github.com/Seminario-Integrador-2024/Ge…
carlosferreyra Aug 10, 2024
cebcbbc
Add layout Admin
samuop Aug 10, 2024
2e542e4
chore: Add media directory for storing files
carlosferreyra Aug 10, 2024
6bc6a0f
Update database model
ulisespallares888 Aug 10, 2024
c0976a7
Update database schema
ulisespallares888 Aug 10, 2024
e1ce4bc
add CardCrga
yoelmarain Aug 11, 2024
f482c06
creacion modal
facundomelgarejo Aug 11, 2024
37f5aaf
creacion modal v2
facundomelgarejo Aug 11, 2024
385d255
Merge pull request #19 from Seminario-Integrador-2024/TUP-11-Actualiz…
ulisespallares888 Aug 11, 2024
f94d131
Merge branch 'main' into TUP-11-Actualizar-Modelo-Inicial-de-BBDD
carlosferreyra Aug 11, 2024
6716a32
Merge pull request #20 from Seminario-Integrador-2024/TUP-11-Actualiz…
ulisespallares888 Aug 11, 2024
ca94d99
aasd
facundomelgarejo Aug 11, 2024
ba5b02a
Merge branch 'TUP-15-Modal-visualizaci-n-documentos' into dev
facundomelgarejo Aug 11, 2024
c5f1fdf
Merge branch 'dev' of https://github.com/Seminario-Integrador-2024/Ge…
yoelmarain Aug 11, 2024
e4636ec
add VerCompromiso
yoelmarain Aug 11, 2024
d58863c
chore: Update README.md formatting and remove unnecessary lines
carlosferreyra Aug 11, 2024
101ee5e
chore: Update SECURITY.md to include support for version 3.0.x
carlosferreyra Aug 11, 2024
2c9e627
chore: Update SECURITY.md to include support for version 3.0.x
carlosferreyra Aug 11, 2024
4217e13
chore: update SECURITY.md to include support for version 3.0.x
carlosferreyra Aug 11, 2024
ac543c5
chore: Update Dockerfile environment variables
carlosferreyra Aug 11, 2024
5f628f9
Pocos cambios
ulisespallares888 Aug 11, 2024
fb250ea
Merge branch 'TUP-2-Carga-de-compromiso-de-pago' into dev
ulisespallares888 Aug 12, 2024
fc120eb
Creacion modal carga de archivos + integracion con cardCarga
facundomelgarejo Aug 12, 2024
da7cb6a
Merge branch 'TUP-16-Modal-carga-de-documentos' of https://github.com…
facundomelgarejo Aug 12, 2024
a3fd239
primera maqueta del componente Montos
samuop Aug 12, 2024
2db062d
Merge pull request #21 from Seminario-Integrador-2024/TUP-16-Modal-ca…
TobiasMaciel Aug 12, 2024
aa9ace4
chore: Update django-allauth to version 0.61.1 & add python cache to …
carlosferreyra Aug 12, 2024
1860b85
chore: Mount GCP Bucket to the container in cloud run
carlosferreyra Aug 12, 2024
1d55014
chore: Update gitignore to exclude Python cache files and match READM…
carlosferreyra Aug 12, 2024
dfe43ac
chore: Update gitignore to exclude schema.yml file & remove imports &…
carlosferreyra Aug 12, 2024
41f8626
Dev (#32)
TobiasMaciel Aug 12, 2024
c08b396
fix: Se arreglan algunos warnings
TobiasMaciel Aug 12, 2024
a227bb6
fix: Se solucionan los dos errores del linter
TobiasMaciel Aug 12, 2024
0a3ee9c
feat: Se agrega nuevas reglas al eslint
TobiasMaciel Aug 12, 2024
800740d
feat: Se agrega prettier al proyecto
TobiasMaciel Aug 12, 2024
2e161ef
feat: Se agrega las reglas de prettier
TobiasMaciel Aug 12, 2024
fb41d6b
feat: Se conecta el eslint con el prettier
TobiasMaciel Aug 12, 2024
d45f90e
Agrego detalles al componente Montos
samuop Aug 12, 2024
cf359ee
feat: Se agrega `npm run format` para formatear el codigo con Prettier
TobiasMaciel Aug 12, 2024
0b198be
chore: Update SECURITY.md to include version 3.0.x as unsupported
carlosferreyra Aug 12, 2024
b41ada8
feat: Se agrega el prettier al workflow
TobiasMaciel Aug 12, 2024
3f6718c
Merge branch 'dev' of https://github.com/Seminario-Integrador-2024/Ge…
TobiasMaciel Aug 12, 2024
35cd632
Merge branch 'dev' into TUP-3-Actualizar-montos-Samu
TobiasMaciel Aug 12, 2024
dc159ad
Actualizar montos samu (#33)
TobiasMaciel Aug 12, 2024
783057a
chore: Add PDF viewer and update dependencies
yoelmarain Aug 12, 2024
8b5a899
fix: Se agrega a todos los push el workflow y se saca en los pull req…
TobiasMaciel Aug 12, 2024
6de761d
Tup 2 carga de compromiso de pago (#34)
yoelmarain Aug 12, 2024
d47b541
Merge branch 'dev' of https://github.com/Seminario-Integrador-2024/Ge…
TobiasMaciel Aug 12, 2024
c0e13cf
chore: Update SECURITY.md to remove support for version 3.0.x
carlosferreyra Aug 12, 2024
14b2f9a
Merge branch 'main' into TUP-19-tarea_test
carlosferreyra Aug 12, 2024
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
35 changes: 30 additions & 5 deletions .github/workflows/FrontCi.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
name: ForntCI Pipeline
name: FrontCI Pipeline

on:
push:
branches:
- main # Es pora que se ejecute en main
pull_request:
branches:
- '**' # Es pora que se ejecute en todas las ramas
- '**' # Se ejecuta en todas las ramas

jobs:
lint:
Expand All @@ -29,3 +26,31 @@ jobs:
run: npm run lint
working-directory: ./FrontAdmin

prettier:
name: Formatear código con Prettier
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/main' # Solo se ejecuta en la rama main
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Setear Node.js
uses: actions/setup-node@v4
with:
node-version: 20

- name: Instalar dependencias
run: npm install
working-directory: ./FrontAdmin

- name: Correr Prettier
run: npm run format
working-directory: ./FrontAdmin

- name: Commit changes
run: |
git config --local user.name "TobiasMaciel"
git config --local user.email "tobiasmaciel03@gmail.com"
git add .
git commit -m "chore: Se formateo el codigo con Prettier" || echo "No hay cambios para comitear"
git push
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,7 @@ __pycache__/

# API Docs

*schema.yml

# sql files
*.sql
*.sql
11 changes: 7 additions & 4 deletions FrontAdmin/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@ module.exports = {
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react-hooks/recommended",
"plugin:prettier/recommended"
],
ignorePatterns: ["dist", ".eslintrc.cjs"],
parser: "@typescript-eslint/parser",
plugins: ["react-refresh"],
plugins: ["react-refresh", "prettier"],
rules: {
"prettier/prettier": "warn", // Se muestra los errores de Prettier como warnings
"react-refresh/only-export-components": [
"warn",
{ allowConstantExport: true },
],
"@typescript-eslint/prefer-as-const": "warn", // Warning de la regla que requiere const en lugar de type assertion
"@typescript-eslint/no-unused-vars": "warn", // Warning de la regla que indica variables no usadas
"no-extra-semi": "warn", // Warning de la regla que prohíbe los puntos y comas innecesarios
"@typescript-eslint/prefer-as-const": "warn",
"@typescript-eslint/no-unused-vars": "warn",
"no-extra-semi": "warn",
"no-mixed-spaces-and-tabs": "warn",
},
};
9 changes: 9 additions & 0 deletions FrontAdmin/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"semi": true,
"singleQuote": true,
"trailingComma": "es5",
"printWidth": 80,
"tabWidth": 2,
"useTabs": false
}

Loading
Loading