From 0887ff84bf3eec6d1b04965229f93b42dbeeee22 Mon Sep 17 00:00:00 2001 From: MohammadTaha Basiri Date: Sat, 5 Feb 2022 12:22:14 +0000 Subject: [PATCH 1/6] font name updated --- lib/assets/fonts/{dana.ttf => Dana.ttf} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename lib/assets/fonts/{dana.ttf => Dana.ttf} (100%) diff --git a/lib/assets/fonts/dana.ttf b/lib/assets/fonts/Dana.ttf similarity index 100% rename from lib/assets/fonts/dana.ttf rename to lib/assets/fonts/Dana.ttf From 87ab66ff692fafa36dca5f12b81663b23f74816f Mon Sep 17 00:00:00 2001 From: MohammadTaha Basiri Date: Sat, 5 Feb 2022 12:30:21 +0000 Subject: [PATCH 2/6] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 32d7267..a5b9d56 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ FROM nginx:latest -COPY ./build/web /usr/share/nginx/html/ -ENTRYPOINT ["nginx", "-g", "daemon off;"] \ No newline at end of file +COPY /build/web /usr/share/nginx/html/ +ENTRYPOINT ["nginx", "-g", "daemon off;"] From 2c858ee87e166b844fc3392e580fcb5ec1403207 Mon Sep 17 00:00:00 2001 From: MohammadTaha Basiri Date: Sat, 5 Feb 2022 12:53:18 +0000 Subject: [PATCH 3/6] Update .gitlab-ci.yml, Dockerfile --- .gitlab-ci.yml | 5 ++++- Dockerfile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2265157..bc0a4d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,6 @@ +cache: + paths: + - build/web stages: - build - push @@ -34,4 +37,4 @@ deploy: - fandogh login --username=$FAN_USR --password=$FAN_PASS - fandogh service apply -f ./deployment/config.yaml -p SEC_NAME only: - - test \ No newline at end of file + - test diff --git a/Dockerfile b/Dockerfile index a5b9d56..f75af4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ FROM nginx:latest -COPY /build/web /usr/share/nginx/html/ +COPY ./build/web /usr/share/nginx/html/ ENTRYPOINT ["nginx", "-g", "daemon off;"] From 4e9e476a9fb3c7bf579e3fb6d17649927d373139 Mon Sep 17 00:00:00 2001 From: MohammadTaha Basiri Date: Sat, 5 Feb 2022 13:00:25 +0000 Subject: [PATCH 4/6] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc0a4d1..34e5ed5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,8 +22,8 @@ push: - docker:dind script: - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY - - docker build --pull -t registry.gitlab.com/didvan/didvan-panel-server/api:latest . - - docker push registry.gitlab.com/didvan/didvan-panel-server/api:latest + - docker build --pull -t registry.gitlab.com/didvan/didvan-app/api:latest . + - docker push registry.gitlab.com/didvan/didvan-app/api:latest only: - test From bfb6d9dc1835e62e3808d734ae265a66eafe55d1 Mon Sep 17 00:00:00 2001 From: MohammadTaha Basiri Date: Sat, 5 Feb 2022 13:25:08 +0000 Subject: [PATCH 5/6] test --- lib/services/network/request_helper.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/services/network/request_helper.dart b/lib/services/network/request_helper.dart index b9f2876..c5f7296 100644 --- a/lib/services/network/request_helper.dart +++ b/lib/services/network/request_helper.dart @@ -2,7 +2,7 @@ import 'package:didvan/models/requests/news.dart'; import 'package:didvan/models/requests/radar.dart'; class RequestHelper { - static const String baseUrl = 'https://api.didvan.app'; + static const String baseUrl = 'https://test.api.didvan.app'; static const String _baseUserUrl = baseUrl + '/user'; static const String _baseRadarUrl = baseUrl + '/radar'; static const String _baseNewsUrl = baseUrl + '/news'; From c10ee395d00f077607f92b9a0564a9a943a4f5ab Mon Sep 17 00:00:00 2001 From: MohammadTaha Basiri Date: Sat, 5 Feb 2022 13:42:13 +0000 Subject: [PATCH 6/6] test --- lib/services/network/request_helper.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/services/network/request_helper.dart b/lib/services/network/request_helper.dart index c5f7296..b9f2876 100644 --- a/lib/services/network/request_helper.dart +++ b/lib/services/network/request_helper.dart @@ -2,7 +2,7 @@ import 'package:didvan/models/requests/news.dart'; import 'package:didvan/models/requests/radar.dart'; class RequestHelper { - static const String baseUrl = 'https://test.api.didvan.app'; + static const String baseUrl = 'https://api.didvan.app'; static const String _baseUserUrl = baseUrl + '/user'; static const String _baseRadarUrl = baseUrl + '/radar'; static const String _baseNewsUrl = baseUrl + '/news';