diff --git a/README.md b/README.md index b24bf3f..05691c4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# weather_site +# jsonrpc-weather-frontend -Front for a weather_history project +Front for a jsonrpc-weather-backend project ### Requirements diff --git a/config/services.yaml b/config/services.yaml index d67917d..5d7a871 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -1,5 +1,5 @@ parameters: - weather_history_server: '%env(string:WEATHER_HISTORY_SERVER)%' + weather_backend_server: '%env(string:WEATHER_BACKEND_SERVER)%' services: _defaults: diff --git a/devops/dist/.env-dist b/devops/dist/.env-dist index e3300e5..9393575 100644 --- a/devops/dist/.env-dist +++ b/devops/dist/.env-dist @@ -1,4 +1,4 @@ APP_ENV=dev APP_SECRET=a1def1573d162b7d97ed994df9d37949 -WEATHER_HISTORY_SERVER=http://weather_history_nginx_1:80 +WEATHER_BACKEND_SERVER=http://jsonrpc-weather-backend_nginx_1:80 diff --git a/devops/docker/.env b/devops/docker/.env index 10b43eb..a7bb045 100644 --- a/devops/docker/.env +++ b/devops/docker/.env @@ -1,4 +1,4 @@ -COMPOSE_PROJECT_NAME=weather_site +COMPOSE_PROJECT_NAME=jsonrpc-weather-frontend PROJECT_ID=003 COMPOSE_DOCKER_CLI_BUILD=1 diff --git a/docker-compose.yaml b/docker-compose.yaml index 669d809..1923012 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,7 +1,7 @@ version: "3" networks: - weather_history_gate: + jsonrpc-weather-backend_gate: external: true services: @@ -26,7 +26,7 @@ services: expose: - "9000" networks: - - weather_history_gate + - jsonrpc-weather-backend_gate nginx: image: nginx:1.19 restart: unless-stopped @@ -38,4 +38,4 @@ services: ports: - "8$PROJECT_ID:80" networks: - - weather_history_gate \ No newline at end of file + - jsonrpc-weather-backend_gate \ No newline at end of file diff --git a/src/Service/Endpoint/WeatherHistory.php b/src/Service/Endpoint/WeatherHistory.php index 1f20938..fbbeaa4 100644 --- a/src/Service/Endpoint/WeatherHistory.php +++ b/src/Service/Endpoint/WeatherHistory.php @@ -18,7 +18,7 @@ class WeatherHistory implements WeatherHistoryInterface { $this->client = new Client(); - $this->weatherHistoryServer = $parameterBag->get('weather_history_server'); + $this->weatherHistoryServer = $parameterBag->get('weather_backend_server'); } public function getByDate(DateTime $date): array diff --git a/tests/acceptance.suite.yml b/tests/acceptance.suite.yml index 2cbabcc..106ae92 100644 --- a/tests/acceptance.suite.yml +++ b/tests/acceptance.suite.yml @@ -6,7 +6,7 @@ modules: config: PhpBrowser: - url: http://weather_site_nginx_1/ + url: http://jsonrpc-weather-frontend_nginx_1/ proxy: '' curl: CURLOPT_TIMEOUT: 10