From cd0b45627f0d8da8c8dc4edde223f3c36e9bcfbf Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Sun, 25 Apr 2021 16:01:14 +0200 Subject: build: Migrate to flat project structure This change updates the project structure to become flattened. Previously, the simulator, frontend and API each lived into their own directory. With this change, all modules of the project live in the top-level directory of the repository. This should improve discoverability of modules of the project. --- .../opendc-web-ui/src/api/routes/portfolios.js | 42 +++++++++++++++++++ opendc-web/opendc-web-ui/src/api/routes/prefabs.js | 40 ++++++++++++++++++ .../opendc-web-ui/src/api/routes/projects.js | 40 ++++++++++++++++++ .../opendc-web-ui/src/api/routes/scenarios.js | 42 +++++++++++++++++++ .../opendc-web-ui/src/api/routes/schedulers.js | 5 +++ .../opendc-web-ui/src/api/routes/token-signin.js | 10 +++++ .../opendc-web-ui/src/api/routes/topologies.js | 42 +++++++++++++++++++ opendc-web/opendc-web-ui/src/api/routes/traces.js | 5 +++ opendc-web/opendc-web-ui/src/api/routes/users.js | 48 ++++++++++++++++++++++ opendc-web/opendc-web-ui/src/api/routes/util.js | 37 +++++++++++++++++ 10 files changed, 311 insertions(+) create mode 100644 opendc-web/opendc-web-ui/src/api/routes/portfolios.js create mode 100644 opendc-web/opendc-web-ui/src/api/routes/prefabs.js create mode 100644 opendc-web/opendc-web-ui/src/api/routes/projects.js create mode 100644 opendc-web/opendc-web-ui/src/api/routes/scenarios.js create mode 100644 opendc-web/opendc-web-ui/src/api/routes/schedulers.js create mode 100644 opendc-web/opendc-web-ui/src/api/routes/token-signin.js create mode 100644 opendc-web/opendc-web-ui/src/api/routes/topologies.js create mode 100644 opendc-web/opendc-web-ui/src/api/routes/traces.js create mode 100644 opendc-web/opendc-web-ui/src/api/routes/users.js create mode 100644 opendc-web/opendc-web-ui/src/api/routes/util.js (limited to 'opendc-web/opendc-web-ui/src/api/routes') diff --git a/opendc-web/opendc-web-ui/src/api/routes/portfolios.js b/opendc-web/opendc-web-ui/src/api/routes/portfolios.js new file mode 100644 index 00000000..7c9ea02a --- /dev/null +++ b/opendc-web/opendc-web-ui/src/api/routes/portfolios.js @@ -0,0 +1,42 @@ +import { deleteById, getById } from './util' +import { sendRequest } from '../index' + +export function addPortfolio(projectId, portfolio) { + return sendRequest({ + path: '/projects/{projectId}/portfolios', + method: 'POST', + parameters: { + body: { + portfolio, + }, + path: { + projectId, + }, + query: {}, + }, + }) +} + +export function getPortfolio(portfolioId) { + return getById('/portfolios/{portfolioId}', { portfolioId }) +} + +export function updatePortfolio(portfolioId, portfolio) { + return sendRequest({ + path: '/portfolios/{projectId}', + method: 'POST', + parameters: { + body: { + portfolio, + }, + path: { + portfolioId, + }, + query: {}, + }, + }) +} + +export function deletePortfolio(portfolioId) { + return deleteById('/portfolios/{portfolioId}', { portfolioId }) +} diff --git a/opendc-web/opendc-web-ui/src/api/routes/prefabs.js b/opendc-web/opendc-web-ui/src/api/routes/prefabs.js new file mode 100644 index 00000000..8a1debfa --- /dev/null +++ b/opendc-web/opendc-web-ui/src/api/routes/prefabs.js @@ -0,0 +1,40 @@ +import { sendRequest } from '../index' +import { deleteById, getById } from './util' + +export function getPrefab(prefabId) { + return getById('/prefabs/{prefabId}', { prefabId }) +} + +export function addPrefab(prefab) { + return sendRequest({ + path: '/prefabs', + method: 'POST', + parameters: { + body: { + prefab, + }, + path: {}, + query: {}, + }, + }) +} + +export function updatePrefab(prefab) { + return sendRequest({ + path: '/prefabs/{prefabId}', + method: 'PUT', + parameters: { + body: { + prefab, + }, + path: { + prefabId: prefab._id, + }, + query: {}, + }, + }) +} + +export function deletePrefab(prefabId) { + return deleteById('/prefabs/{prefabId}', { prefabId }) +} diff --git a/opendc-web/opendc-web-ui/src/api/routes/projects.js b/opendc-web/opendc-web-ui/src/api/routes/projects.js new file mode 100644 index 00000000..4109079c --- /dev/null +++ b/opendc-web/opendc-web-ui/src/api/routes/projects.js @@ -0,0 +1,40 @@ +import { sendRequest } from '../index' +import { deleteById, getById } from './util' + +export function getProject(projectId) { + return getById('/projects/{projectId}', { projectId }) +} + +export function addProject(project) { + return sendRequest({ + path: '/projects', + method: 'POST', + parameters: { + body: { + project, + }, + path: {}, + query: {}, + }, + }) +} + +export function updateProject(project) { + return sendRequest({ + path: '/projects/{projectId}', + method: 'PUT', + parameters: { + body: { + project, + }, + path: { + projectId: project._id, + }, + query: {}, + }, + }) +} + +export function deleteProject(projectId) { + return deleteById('/projects/{projectId}', { projectId }) +} diff --git a/opendc-web/opendc-web-ui/src/api/routes/scenarios.js b/opendc-web/opendc-web-ui/src/api/routes/scenarios.js new file mode 100644 index 00000000..ab2e8b86 --- /dev/null +++ b/opendc-web/opendc-web-ui/src/api/routes/scenarios.js @@ -0,0 +1,42 @@ +import { deleteById, getById } from './util' +import { sendRequest } from '../index' + +export function addScenario(portfolioId, scenario) { + return sendRequest({ + path: '/portfolios/{portfolioId}/scenarios', + method: 'POST', + parameters: { + body: { + scenario, + }, + path: { + portfolioId, + }, + query: {}, + }, + }) +} + +export function getScenario(scenarioId) { + return getById('/scenarios/{scenarioId}', { scenarioId }) +} + +export function updateScenario(scenarioId, scenario) { + return sendRequest({ + path: '/scenarios/{projectId}', + method: 'POST', + parameters: { + body: { + scenario, + }, + path: { + scenarioId, + }, + query: {}, + }, + }) +} + +export function deleteScenario(scenarioId) { + return deleteById('/scenarios/{scenarioId}', { scenarioId }) +} diff --git a/opendc-web/opendc-web-ui/src/api/routes/schedulers.js b/opendc-web/opendc-web-ui/src/api/routes/schedulers.js new file mode 100644 index 00000000..4481fb2a --- /dev/null +++ b/opendc-web/opendc-web-ui/src/api/routes/schedulers.js @@ -0,0 +1,5 @@ +import { getAll } from './util' + +export function getAllSchedulers() { + return getAll('/schedulers') +} diff --git a/opendc-web/opendc-web-ui/src/api/routes/token-signin.js b/opendc-web/opendc-web-ui/src/api/routes/token-signin.js new file mode 100644 index 00000000..d6cff570 --- /dev/null +++ b/opendc-web/opendc-web-ui/src/api/routes/token-signin.js @@ -0,0 +1,10 @@ +export function performTokenSignIn(token) { + const apiUrl = process.env.REACT_APP_API_BASE_URL || '' + + return fetch(`${apiUrl}/tokensignin`, { + method: 'POST', + body: new URLSearchParams({ + idtoken: token, + }), + }).then((res) => res.json()) +} diff --git a/opendc-web/opendc-web-ui/src/api/routes/topologies.js b/opendc-web/opendc-web-ui/src/api/routes/topologies.js new file mode 100644 index 00000000..a8f0d6b1 --- /dev/null +++ b/opendc-web/opendc-web-ui/src/api/routes/topologies.js @@ -0,0 +1,42 @@ +import { deleteById, getById } from './util' +import { sendRequest } from '../index' + +export function addTopology(topology) { + return sendRequest({ + path: '/projects/{projectId}/topologies', + method: 'POST', + parameters: { + body: { + topology, + }, + path: { + projectId: topology.projectId, + }, + query: {}, + }, + }) +} + +export function getTopology(topologyId) { + return getById('/topologies/{topologyId}', { topologyId }) +} + +export function updateTopology(topology) { + return sendRequest({ + path: '/topologies/{topologyId}', + method: 'PUT', + parameters: { + body: { + topology, + }, + path: { + topologyId: topology._id, + }, + query: {}, + }, + }) +} + +export function deleteTopology(topologyId) { + return deleteById('/topologies/{topologyId}', { topologyId }) +} diff --git a/opendc-web/opendc-web-ui/src/api/routes/traces.js b/opendc-web/opendc-web-ui/src/api/routes/traces.js new file mode 100644 index 00000000..67895a87 --- /dev/null +++ b/opendc-web/opendc-web-ui/src/api/routes/traces.js @@ -0,0 +1,5 @@ +import { getAll } from './util' + +export function getAllTraces() { + return getAll('/traces') +} diff --git a/opendc-web/opendc-web-ui/src/api/routes/users.js b/opendc-web/opendc-web-ui/src/api/routes/users.js new file mode 100644 index 00000000..3028f3f7 --- /dev/null +++ b/opendc-web/opendc-web-ui/src/api/routes/users.js @@ -0,0 +1,48 @@ +import { sendRequest } from '../index' +import { deleteById } from './util' + +export function getUserByEmail(email) { + return sendRequest({ + path: '/users', + method: 'GET', + parameters: { + body: {}, + path: {}, + query: { + email, + }, + }, + }) +} + +export function addUser(user) { + return sendRequest({ + path: '/users', + method: 'POST', + parameters: { + body: { + user, + }, + path: {}, + query: {}, + }, + }) +} + +export function getUser(userId) { + return sendRequest({ + path: '/users/{userId}', + method: 'GET', + parameters: { + body: {}, + path: { + userId, + }, + query: {}, + }, + }) +} + +export function deleteUser(userId) { + return deleteById('/users/{userId}', { userId }) +} diff --git a/opendc-web/opendc-web-ui/src/api/routes/util.js b/opendc-web/opendc-web-ui/src/api/routes/util.js new file mode 100644 index 00000000..67e7173b --- /dev/null +++ b/opendc-web/opendc-web-ui/src/api/routes/util.js @@ -0,0 +1,37 @@ +import { sendRequest } from '../index' + +export function getAll(path) { + return sendRequest({ + path, + method: 'GET', + parameters: { + body: {}, + path: {}, + query: {}, + }, + }) +} + +export function getById(path, pathObject) { + return sendRequest({ + path, + method: 'GET', + parameters: { + body: {}, + path: pathObject, + query: {}, + }, + }) +} + +export function deleteById(path, pathObject) { + return sendRequest({ + path, + method: 'DELETE', + parameters: { + body: {}, + path: pathObject, + query: {}, + }, + }) +} -- cgit v1.2.3