diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2256313..9b41c06 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 }} @@ -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 diff --git a/Dockerfile b/Dockerfile index 8928622..96c89a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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;;"/>;' /usr/local/apache2/htdocs/gridactions/index.html +COPY build /usr/local/apache2/htdocs/griddata +RUN sed -i -e 's;;"/>;' /usr/local/apache2/htdocs/griddata/index.html diff --git a/app-httpd.conf b/app-httpd.conf index 7148a5a..cfc18b6 100644 --- a/app-httpd.conf +++ b/app-httpd.conf @@ -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 - + Options +Includes 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] diff --git a/package-lock.json b/package-lock.json index d70efb1..9d25941 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "gridactions-app", + "name": "griddata-app", "version": "0.1.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index 6652519..8cf2ee4 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "gridactions-app", + "name": "griddata-app", "version": "0.1.0", "homepage": ".", "private": true, diff --git a/public/index.html b/public/index.html index 9e9c29b..db2d9b9 100644 --- a/public/index.html +++ b/public/index.html @@ -11,7 +11,7 @@ - GridActions + GridData diff --git a/src/components/app.js b/src/components/app.js index af3f629..cde5e72 100644 --- a/src/components/app.js +++ b/src/components/app.js @@ -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, @@ -244,13 +244,13 @@ const App = () => { + ) : ( - + ) } onLogoutClick={() => diff --git a/src/images/GridActions_logo_dark.svg b/src/images/GridData_logo_dark.svg similarity index 100% rename from src/images/GridActions_logo_dark.svg rename to src/images/GridData_logo_dark.svg diff --git a/src/images/GridActions_logo_light.svg b/src/images/GridData_logo_light.svg similarity index 100% rename from src/images/GridActions_logo_light.svg rename to src/images/GridData_logo_light.svg