Skip to content

Commit

Permalink
Merge pull request #47 from gti-sos/45-crear-un-front-end-con-svelte-EGO
Browse files Browse the repository at this point in the history
45 crear un front end con svelte ego
  • Loading branch information
enrgaroli authored Mar 21, 2024
2 parents bf6cb41 + 7063f05 commit ed7286a
Show file tree
Hide file tree
Showing 36 changed files with 4,111 additions and 66 deletions.
3 changes: 2 additions & 1 deletion .gcloudignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@
.gitignore

# Node.js dependencies:
node_modules/
node_modules/
front/node_modules
5 changes: 5 additions & 0 deletions .github/workflows/ci-cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: cd front; npm install; cd ..
- run: cd front; npm run build; cd ..
- run: npm install
- run: npm start &
- run: npm test
Expand All @@ -26,6 +28,9 @@ jobs:

- name: 'Use gcloud CLI'
run: 'gcloud info'

- run: cd front; npm install; cd ..
- run: cd front; npm run build; cd ..

- name: Deploy
run: gcloud app deploy
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -131,3 +131,5 @@ dist


gc-sa-key.json

front/node_modules
24 changes: 0 additions & 24 deletions Enrique/package-lock.json

This file was deleted.

5 changes: 0 additions & 5 deletions Enrique/package.json

This file was deleted.

10 changes: 6 additions & 4 deletions Nico/index-NRM.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const fs = require('fs');
//const fs = require('fs');

// const data2 = fs.readFileSync('ufc_dataset_copy.csv', 'utf8');

Expand Down Expand Up @@ -38,6 +38,8 @@ function calcularMediaTiempoPelea(){
};
}*/

module.exports = {
ufc_data: ufc_data
};
// module.exports = {
// ufc_data: ufc_data
// };

export { ufc_data };
6 changes: 4 additions & 2 deletions Nico/index-api.js → Nico/index-api-v1.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const {ufc_data} = require("./index-NRM");
import {ufc_data} from "./index-NRM.js";
const API_BASE = "/api/v1";



module.exports = (app, dbUfc) => {
function api_NRM(app, dbUfc) {

let dataset = [];

Expand Down Expand Up @@ -315,3 +315,5 @@ app.get(API_BASE+"/ufc-events-data", (req, res) => {


}

export { api_NRM };
Loading

0 comments on commit ed7286a

Please sign in to comment.