Skip to content
This repository was archived by the owner on Oct 12, 2021. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
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
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
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "gridactions-app",
"name": "griddata-app",
"version": "0.1.0",
"homepage": ".",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
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
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,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 @@ -244,13 +244,13 @@ const App = () => {
<React.Fragment>
<CssBaseline />
<TopBar
appName="Actions"
appName="Data"
appColor="#DA0063"
appLogo={
theme === LIGHT_THEME ? (
<GridActionsLogoLight />
<GridDataLogoLight />
) : (
<GridActionsLogoDark />
<GridDataLogoDark />
)
}
onLogoutClick={() =>
Expand Down