Skip to content
This repository was archived by the owner on Oct 12, 2021. It is now read-only.

renaming gridactions to griddata #40

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

renaming gridactions to griddata #40

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
298d58f
renaming gridactions to griddata
JacquesBorsenberger Apr 19, 2021
20b5ade
renaming github image
JacquesBorsenberger Apr 27, 2021
5a865a6
fix missing renaming and one remaining s
JacquesBorsenberger Apr 27, 2021
cbb95c4
Merge branch 'master' of https://github.com/gridsuite/gridactions-app…
JacquesBorsenberger May 4, 2021
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
if: github.ref == 'refs/heads/master'
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: gridsuite/gridactions-app
name: gridsuite/griddata-app
username: gridsuiteci
password: ${{ secrets.DOCKERHUB_TOKEN }}

Expand All @@ -30,4 +30,4 @@ jobs:
uses: gridsuite/broadcast-event@master
with:
token: ${{ secrets.REPO_ACCESS_TOKEN }}
event-type: gridactions_app_updated
event-type: griddata_app_updated
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ FROM httpd:2.4

RUN echo "Include conf/app-httpd.conf" >> /usr/local/apache2/conf/httpd.conf
COPY app-httpd.conf /usr/local/apache2/conf/
COPY build /usr/local/apache2/htdocs/gridactions
RUN sed -i -e 's;<base href="\./"/>;<base href="<!--#echo var="BASE" -->"/>;' /usr/local/apache2/htdocs/gridactions/index.html
COPY build /usr/local/apache2/htdocs/griddata
RUN sed -i -e 's;<base href="\./"/>;<base href="<!--#echo var="BASE" -->"/>;' /usr/local/apache2/htdocs/griddata/index.html
6 changes: 3 additions & 3 deletions app-httpd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
LoadModule rewrite_module modules/mod_rewrite.so
LoadModule include_module modules/mod_include.so

DocumentRoot /usr/local/apache2/htdocs/gridactions/
DocumentRoot /usr/local/apache2/htdocs/griddata/
AddOutputFilterByType INCLUDES text/html
<Directory /usr/local/apache2/htdocs/gridactions/>
<Directory /usr/local/apache2/htdocs/griddata/>
Options +Includes
</Directory>

RewriteEngine On
RewriteMap remapbase "prg:/bin/sed -u -e 's;[^ ]* ;;' -e 's;[ ?].*;;' -e 's;[^/]*;..;g' -e 's;../..;;' -e 's/.//' -e 's;^$;.;'"

RewriteCond /usr/local/apache2/htdocs/gridactions%{REQUEST_URI} -f [OR]
RewriteCond /usr/local/apache2/htdocs/griddata%{REQUEST_URI} -f [OR]
RewriteCond %{REQUEST_URI} ^/api/.* [OR]
RewriteCond %{REQUEST_URI} ^/ws/.*
RewriteRule ^ - [S=2]
Expand Down
31,658 changes: 15,829 additions & 15,829 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"name": "gridactions-app",
"name": "griddata-app",
"version": "0.1.0",
"homepage": ".",
"private": true,
"dependencies": {
"notistack": "^1.0.1",
"@gridsuite/commons-ui": "0.7.0",
"@material-ui/core": "^4.9.5",
"@material-ui/icons": "^4.5.1",
Expand All @@ -13,8 +12,8 @@
"ace-builds": "^1.4.12",
"http-proxy-middleware": "^1.0.3",
"localized-countries": "^1.0.2",
"notistack": "^1.0.1",
"prop-types": "15.7.2",
"reconnecting-websocket": "^4.4.0",
"react": "^16.13.1",
"react-ace": "^9.1.4",
"react-dom": "^16.13.1",
Expand All @@ -23,6 +22,7 @@
"react-router-dom": "^5.1.2",
"react-scripts": "3.4.1",
"react-window": "^1.8.5",
"reconnecting-websocket": "^4.4.0",
"redux": "^4.0.5",
"typeface-roboto": "0.0.75"
},
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="icon" href="favicon.ico" />
<title>GridActions</title>
<title>GridData</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
10 changes: 5 additions & 5 deletions src/components/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ import ContingencyLists from './contingency-list';
import Box from '@material-ui/core/Box';
import Parameters from './parameters';

import { ReactComponent as GridActionsLogoDark } from '../images/GridActions_logo_dark.svg';
import { ReactComponent as GridActionsLogoLight } from '../images/GridActions_logo_light.svg';
import { ReactComponent as GridDataLogoDark } from '../images/GridData_logo_dark.svg';
import { ReactComponent as GridDataLogoLight } from '../images/GridData_logo_light.svg';
import {
connectNotificationsWsUpdateConfig,
fetchAppsAndUrls,
Expand Down Expand Up @@ -227,13 +227,13 @@ const App = () => {
<React.Fragment>
<CssBaseline />
<TopBar
appName="Actions"
appName="Data"
appColor="#DA0063"
appLogo={
theme === LIGHT_THEME ? (
<GridActionsLogoLight />
<GridDataLogoLight />
) : (
<GridActionsLogoDark />
<GridDataLogoDark />
)
}
onParametersClick={() => showParametersClicked()}
Expand Down
0 src/images/GridActions_logo_dark.svg → src/images/GridData_logo_dark.svg
View file
Open in desktop
File renamed without changes
0 src/images/GridActions_logo_light.svg → src/images/GridData_logo_light.svg
View file
Open in desktop
File renamed without changes