merge: Integrate v2.1 progress into public repository

This pull request integrates the changes planned for the v2.1 release of
OpenDC into the public Github repository in order to sync the progress
of both repositories.

6 files changed, 0 insertions, 154 deletions

diff --git a/opendc-web/opendc-web-ui/src/actions/modals/portfolios.js b/opendc-web/opendc-web-ui/src/actions/modals/portfolios.js
deleted file mode 100644
index f6dce2e3..00000000
--- a/opendc-web/opendc-web-ui/src/actions/modals/portfolios.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export const OPEN_NEW_PORTFOLIO_MODAL = 'OPEN_NEW_PORTFOLIO_MODAL'
-export const CLOSE_NEW_PORTFOLIO_MODAL = 'CLOSE_PORTFOLIO_MODAL'
-
-export function openNewPortfolioModal() {
-    return {
-        type: OPEN_NEW_PORTFOLIO_MODAL,
-    }
-}
-
-export function closeNewPortfolioModal() {
-    return {
-        type: CLOSE_NEW_PORTFOLIO_MODAL,
-    }
-}
diff --git a/opendc-web/opendc-web-ui/src/actions/modals/prefabs.js b/opendc-web/opendc-web-ui/src/actions/modals/prefabs.js
deleted file mode 100644
index 826565d2..00000000
--- a/opendc-web/opendc-web-ui/src/actions/modals/prefabs.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export const OPEN_NEW_PREFAB_MODAL = 'OPEN_NEW_PREFAB_MODAL'
-export const CLOSE_NEW_PREFAB_MODAL = 'CLOSE_PREFAB_MODAL'
-
-export function openNewPrefabModal() {
-    return {
-        type: OPEN_NEW_PREFAB_MODAL,
-    }
-}
-
-export function closeNewPrefabModal() {
-    return {
-        type: CLOSE_NEW_PREFAB_MODAL,
-    }
-}
diff --git a/opendc-web/opendc-web-ui/src/actions/modals/profile.js b/opendc-web/opendc-web-ui/src/actions/modals/profile.js
deleted file mode 100644
index 39c72c03..00000000
--- a/opendc-web/opendc-web-ui/src/actions/modals/profile.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export const OPEN_DELETE_PROFILE_MODAL = 'OPEN_DELETE_PROFILE_MODAL'
-export const CLOSE_DELETE_PROFILE_MODAL = 'CLOSE_DELETE_PROFILE_MODAL'
-
-export function openDeleteProfileModal() {
-    return {
-        type: OPEN_DELETE_PROFILE_MODAL,
-    }
-}
-
-export function closeDeleteProfileModal() {
-    return {
-        type: CLOSE_DELETE_PROFILE_MODAL,
-    }
-}
diff --git a/opendc-web/opendc-web-ui/src/actions/modals/projects.js b/opendc-web/opendc-web-ui/src/actions/modals/projects.js
deleted file mode 100644
index d1043cbb..00000000
--- a/opendc-web/opendc-web-ui/src/actions/modals/projects.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export const OPEN_NEW_PROJECT_MODAL = 'OPEN_NEW_PROJECT_MODAL'
-export const CLOSE_NEW_PROJECT_MODAL = 'CLOSE_PROJECT_MODAL'
-
-export function openNewProjectModal() {
-    return {
-        type: OPEN_NEW_PROJECT_MODAL,
-    }
-}
-
-export function closeNewProjectModal() {
-    return {
-        type: CLOSE_NEW_PROJECT_MODAL,
-    }
-}
diff --git a/opendc-web/opendc-web-ui/src/actions/modals/scenarios.js b/opendc-web/opendc-web-ui/src/actions/modals/scenarios.js
deleted file mode 100644
index b71cb27b..00000000
--- a/opendc-web/opendc-web-ui/src/actions/modals/scenarios.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export const OPEN_NEW_SCENARIO_MODAL = 'OPEN_NEW_SCENARIO_MODAL'
-export const CLOSE_NEW_SCENARIO_MODAL = 'CLOSE_SCENARIO_MODAL'
-
-export function openNewScenarioModal() {
-    return {
-        type: OPEN_NEW_SCENARIO_MODAL,
-    }
-}
-
-export function closeNewScenarioModal() {
-    return {
-        type: CLOSE_NEW_SCENARIO_MODAL,
-    }
-}
diff --git a/opendc-web/opendc-web-ui/src/actions/modals/topology.js b/opendc-web/opendc-web-ui/src/actions/modals/topology.js
deleted file mode 100644
index b5fecac1..00000000
--- a/opendc-web/opendc-web-ui/src/actions/modals/topology.js
+++ /dev/null
@@ -1,84 +0,0 @@
-export const OPEN_NEW_TOPOLOGY_MODAL = 'OPEN_NEW_TOPOLOGY_MODAL'
-export const CLOSE_NEW_TOPOLOGY_MODAL = 'CLOSE_NEW_TOPOLOGY_MODAL'
-export const OPEN_EDIT_ROOM_NAME_MODAL = 'OPEN_EDIT_ROOM_NAME_MODAL'
-export const CLOSE_EDIT_ROOM_NAME_MODAL = 'CLOSE_EDIT_ROOM_NAME_MODAL'
-export const OPEN_DELETE_ROOM_MODAL = 'OPEN_DELETE_ROOM_MODAL'
-export const CLOSE_DELETE_ROOM_MODAL = 'CLOSE_DELETE_ROOM_MODAL'
-export const OPEN_EDIT_RACK_NAME_MODAL = 'OPEN_EDIT_RACK_NAME_MODAL'
-export const CLOSE_EDIT_RACK_NAME_MODAL = 'CLOSE_EDIT_RACK_NAME_MODAL'
-export const OPEN_DELETE_RACK_MODAL = 'OPEN_DELETE_RACK_MODAL'
-export const CLOSE_DELETE_RACK_MODAL = 'CLOSE_DELETE_RACK_MODAL'
-export const OPEN_DELETE_MACHINE_MODAL = 'OPEN_DELETE_MACHINE_MODAL'
-export const CLOSE_DELETE_MACHINE_MODAL = 'CLOSE_DELETE_MACHINE_MODAL'
-
-export function openNewTopologyModal() {
-    return {
-        type: OPEN_NEW_TOPOLOGY_MODAL,
-    }
-}
-
-export function closeNewTopologyModal() {
-    return {
-        type: CLOSE_NEW_TOPOLOGY_MODAL,
-    }
-}
-
-export function openEditRoomNameModal() {
-    return {
-        type: OPEN_EDIT_ROOM_NAME_MODAL,
-    }
-}
-
-export function closeEditRoomNameModal() {
-    return {
-        type: CLOSE_EDIT_ROOM_NAME_MODAL,
-    }
-}
-
-export function openDeleteRoomModal() {
-    return {
-        type: OPEN_DELETE_ROOM_MODAL,
-    }
-}
-
-export function closeDeleteRoomModal() {
-    return {
-        type: CLOSE_DELETE_ROOM_MODAL,
-    }
-}
-
-export function openEditRackNameModal() {
-    return {
-        type: OPEN_EDIT_RACK_NAME_MODAL,
-    }
-}
-
-export function closeEditRackNameModal() {
-    return {
-        type: CLOSE_EDIT_RACK_NAME_MODAL,
-    }
-}
-
-export function openDeleteRackModal() {
-    return {
-        type: OPEN_DELETE_RACK_MODAL,
-    }
-}
-
-export function closeDeleteRackModal() {
-    return {
-        type: CLOSE_DELETE_RACK_MODAL,
-    }
-}
-
-export function openDeleteMachineModal() {
-    return {
-        type: OPEN_DELETE_MACHINE_MODAL,
-    }
-}
-
-export function closeDeleteMachineModal() {
-    return {
-        type: CLOSE_DELETE_MACHINE_MODAL,
-    }
-}