Skip to content

Commit

Permalink
Merge branch 'main' into GM-working
Browse files Browse the repository at this point in the history
  • Loading branch information
liminalfever authored May 6, 2024
2 parents fefb425 + b617d75 commit 7d3735b
Show file tree
Hide file tree
Showing 9 changed files with 2,071 additions and 382 deletions.
1,201 changes: 856 additions & 345 deletions terra-backend/json-server/package-lock.json

Large diffs are not rendered by default.

1,178 changes: 1,178 additions & 0 deletions terra-backend/python-server/graph-analysis.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion terra-frontend/src/assets/icons/coreui.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ export const iconsSet = Object.assign(
cilInfo,
cilSpeech
}
)
)
62 changes: 31 additions & 31 deletions terra-frontend/src/services/countries/countries.service.js
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
import { axiosHack } from "@/http"
export const countriesService = {
findAll,
getDataSeries
}

function findAll(jsonDataName) {
return axiosHack
.get("/" + jsonDataName)
.then((res) => {
var data = res.data ? res.data : {}
//console.log(data);
return data
})
.catch((err) => {
throw err
})
}

function getDataSeries(name) {
return axiosHack
.get("/" + name)
.then((res) => {
var data = res.data ? res.data : {}
//console.log(data);
return data
})
.catch((err) => {
throw err
})
}
import { axiosHack } from "@/http"
export const countriesService = {
findAll,
getDataSeries
}

function findAll(jsonDataName) {
return axiosHack
.get("/" + jsonDataName)
.then((res) => {
var data = res.data ? res.data : {}
//console.log(data);
return data
})
.catch((err) => {
throw err
})
}

function getDataSeries(name) {
return axiosHack
.get("/" + name)
.then((res) => {
var data = res.data ? res.data : {}
//console.log(data);
return data
})
.catch((err) => {
throw err
})
}
2 changes: 1 addition & 1 deletion terra-frontend/src/services/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ export * from "./timeseries/timeseries.service"
export * from "./trade/trade.service"
export * from "./countries/countries.service"
export * from "./news/news.service"
export * from "./metadata/metadata.service"
export * from "./metadata/metadata.service"
2 changes: 1 addition & 1 deletion terra-frontend/src/services/news/news.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ function findAll() {
.catch((err) => {
throw err
})
}
}
2 changes: 1 addition & 1 deletion terra-frontend/src/store/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ export default new Vuex.Store({
metadata,
news
}
})
})
2 changes: 1 addition & 1 deletion terra-frontend/src/store/modules/coreui.js
Original file line number Diff line number Diff line change
Expand Up @@ -201,4 +201,4 @@ export const coreui = {
mutations,
actions,
getters
}
}
2 changes: 1 addition & 1 deletion terra-frontend/src/store/modules/news/news.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ export const news = {
mutations,
actions,
getters
}
}

0 comments on commit 7d3735b

Please sign in to comment.