From 4917a45c4197ed54b7a5074c02d9edb0657a5781 Mon Sep 17 00:00:00 2001 From: Anata Arisa Date: Tue, 7 Nov 2023 14:32:06 +0700 Subject: [PATCH 01/36] vinh/fix course content completion count process done --- .../repository/CourseContentCompletionRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/drawingcouseselling/src/main/java/com/group1/drawingcouseselling/repository/CourseContentCompletionRepository.java b/api/drawingcouseselling/src/main/java/com/group1/drawingcouseselling/repository/CourseContentCompletionRepository.java index 1a333fb2..aec0fe67 100644 --- a/api/drawingcouseselling/src/main/java/com/group1/drawingcouseselling/repository/CourseContentCompletionRepository.java +++ b/api/drawingcouseselling/src/main/java/com/group1/drawingcouseselling/repository/CourseContentCompletionRepository.java @@ -19,7 +19,7 @@ public interface CourseContentCompletionRepository extends JpaRepository getCourseContentCompletionByCustomerID(@Param(value = "customerID") BigDecimal customerID, @Param(value = "courseID") BigDecimal courseID); @Query("SELECT COUNT(c3) FROM course_content_completion c3 WHERE c3.courseContent.id = :courseSectionID") From 5627f19feebb25dd3b0a19017febc771f89d7e3e Mon Sep 17 00:00:00 2001 From: Anata Arisa Date: Tue, 7 Nov 2023 19:56:04 +0700 Subject: [PATCH 02/36] vinh/change name to qa --- docker-compose.dev.yaml | 62 ----------------------------------------- 1 file changed, 62 deletions(-) delete mode 100644 docker-compose.dev.yaml diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml deleted file mode 100644 index 4c175096..00000000 --- a/docker-compose.dev.yaml +++ /dev/null @@ -1,62 +0,0 @@ -version: '3.8' -services: - database: - container_name: database - image: "mariadb:latest" - volumes: - - ./resources/ademydev.sql:/docker-entrypoint-initdb.d/ademydev.sql - ports: - - "3307:3307" - restart: always - networks: - - dev-network - environment: - MYSQL_ROOT_PASSWORD: Vinh12345. - MYSQL_DATABASE: ademy - MYSQL_USER: pim - MYSQL_PASSWORD: Vinh12345. - MYSQL_TCP_PORT: 3307 - MYSQL_UNIX_PORT: 3307 - healthcheck: - test: healthcheck.sh --su-mysql --connect --innodb_initialized - timeout: 20s - retries: 3 - api-backend: - container_name: api-backend-server - build: - context: "./api/drawingcouseselling/" - dockerfile: Dockerfile - ports: - - "7070:9090" - networks: - - dev-network - environment: - DB_HOST: database - DB_PORT: 3307 - DB_USERNAME: pim - DB_PASSWORD: Vinh12345. - restart: always - depends_on: - database: - condition: service_healthy - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:9090/api/v1/courses"] - interval: 30s - timeout: 10s - retries: 3 - - front-end: - container_name: svelte-frontend-server - build: - context: "./frontend/my-app/" - dockerfile: Dockerfile - ports: - - "3000:3000" - networks: - - dev-network - restart: always - depends_on: - api-backend: - condition: service_healthy -networks: - dev-network: \ No newline at end of file From e6a0b7af1d09feaccc35a438a42c85231eb4df09 Mon Sep 17 00:00:00 2001 From: Anata Arisa Date: Tue, 7 Nov 2023 19:56:26 +0700 Subject: [PATCH 03/36] vinh/change name to qa --- docker-compose.qa.yaml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 docker-compose.qa.yaml diff --git a/docker-compose.qa.yaml b/docker-compose.qa.yaml new file mode 100644 index 00000000..82d1d547 --- /dev/null +++ b/docker-compose.qa.yaml @@ -0,0 +1,42 @@ +version: '3.8' +services: + api-backend: + container_name: api-backend-server-qa + build: + context: "./api/drawingcouseselling/" + dockerfile: Dockerfile + args: + - API_ENV=qa + ports: + - "7070:9090" + networks: + - dev-network + environment: + DB_HOST: anataarisa.hopto.org + DB_PORT: 3306 + DB_USERNAME: pim + DB_PASSWORD: Vinh12345. + restart: always + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:9090/api/v1/courses"] + interval: 30s + timeout: 10s + retries: 3 + + front-end: + container_name: svelte-frontend-server-qa + build: + context: "./frontend/my-app/" + dockerfile: Dockerfile + args: + - ENV_DP=testing + ports: + - "3000:3000" + networks: + - dev-network + restart: always + depends_on: + api-backend: + condition: service_healthy +networks: + dev-network: From 2f70f0b5f58068925b1b62dea9de00285a6a9ce5 Mon Sep 17 00:00:00 2001 From: Anata Arisa Date: Tue, 7 Nov 2023 19:56:44 +0700 Subject: [PATCH 04/36] vinh/add docker compose dev --- docker-compose.local.yaml | 67 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 docker-compose.local.yaml diff --git a/docker-compose.local.yaml b/docker-compose.local.yaml new file mode 100644 index 00000000..7345a1d4 --- /dev/null +++ b/docker-compose.local.yaml @@ -0,0 +1,67 @@ +version: '3.8' +services: + database: + container_name: database + image: "mariadb:latest" + volumes: + - ./resources/ademydev.sql:/docker-entrypoint-initdb.d/ademydev.sql + ports: + - "3307:3307" + restart: always + networks: + - dev-network + environment: + MYSQL_ROOT_PASSWORD: Vinh12345. + MYSQL_DATABASE: ademy + MYSQL_USER: pim + MYSQL_PASSWORD: Vinh12345. + MYSQL_TCP_PORT: 3307 + MYSQL_UNIX_PORT: 3307 + healthcheck: + test: healthcheck.sh --su-mysql --connect --innodb_initialized + timeout: 20s + retries: 3 + api-backend: + container_name: api-backend-server + build: + context: "./api/drawingcouseselling/" + dockerfile: Dockerfile + args: + - API_ENV=dev + ports: + - "7070:9090" + networks: + - dev-network + environment: + DB_HOST: database + DB_PORT: 3307 + DB_USERNAME: pim + DB_PASSWORD: Vinh12345. + restart: always + depends_on: + database: + condition: service_healthy + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:9090/api/v1/courses"] + interval: 30s + timeout: 10s + retries: 3 + + front-end: + container_name: svelte-frontend-server + build: + context: "./frontend/my-app/" + dockerfile: Dockerfile + args: + - ENV_DP=development + ports: + - "3000:3000" + networks: + - dev-network + restart: always + depends_on: + api-backend: + condition: service_healthy + +networks: + dev-network: From 1267f7952cf49d6dcb2aa9b74e754865f3ee2fd0 Mon Sep 17 00:00:00 2001 From: Anata Arisa Date: Tue, 7 Nov 2023 19:57:12 +0700 Subject: [PATCH 05/36] vinh/fix docker compose --- api/drawingcouseselling/Dockerfile | 3 ++- frontend/my-app/Dockerfile | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/api/drawingcouseselling/Dockerfile b/api/drawingcouseselling/Dockerfile index 26aa9a38..dda3d2b6 100644 --- a/api/drawingcouseselling/Dockerfile +++ b/api/drawingcouseselling/Dockerfile @@ -1,6 +1,7 @@ FROM maven:3.8.5-openjdk-17 LABEL authors="AnataArisa" WORKDIR /api-backend +ARG API_ENV COPY . . -RUN mvn clean install -Pdev +RUN mvn clean install -P${API_ENV} ENTRYPOINT ["java", "-jar", "./target/drawingcouseselling-0.1.jar"] \ No newline at end of file diff --git a/frontend/my-app/Dockerfile b/frontend/my-app/Dockerfile index 58bb5c48..408c56f8 100644 --- a/frontend/my-app/Dockerfile +++ b/frontend/my-app/Dockerfile @@ -1,5 +1,7 @@ FROM node:latest WORKDIR /svelte-frontend +ARG ENV_DP +ENV NODE_ENV=${ENV_DP} RUN npm install -g pnpm RUN npm i vite COPY package*.json . @@ -7,4 +9,5 @@ RUN pnpm i COPY . . EXPOSE 3000 EXPOSE 24678 -ENTRYPOINT [ "pnpm", "dev" ] \ No newline at end of file +RUN pnpm build +ENTRYPOINT [ "node", "build" ] \ No newline at end of file From 2df14518c8f04360daee316b3099256731f54ac1 Mon Sep 17 00:00:00 2001 From: Anata Arisa Date: Tue, 7 Nov 2023 19:57:26 +0700 Subject: [PATCH 06/36] vinh/update jenkin --- Jenkinsfile | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 86b5b49a..9f1c8b86 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,10 @@ pipeline { environment { DOCKER_IMAGE = 'anataarisa/ademy' DOCKER_COMPOSE_NAME = 'ademy-dev-application' - DOCKER_COMPOSE_DEV_FILE = 'docker-compose.dev.yaml' + DOCKER_COMPOSE_QA_FILE = 'docker-compose.qa.yaml' + DOCKER_COMPOSE_PROD_FILE = 'docker-compose.prod.yaml' + DOCKER_IMAGE_BACKEND_API = 'api-backend-server' + DOCKER_IMAGE_FRONTEND_SERVER = 'svelte-frontend-server' } tools { maven 'Arisa CI/CD Maven' @@ -17,28 +20,32 @@ pipeline { } stage('Clean Docker Enviroments'){ steps{ - sh 'docker compose -f ' + DOCKER_COMPOSE_DEV_FILE + ' -p ' + DOCKER_COMPOSE_NAME + ' down --rmi all -v' + sh 'docker compose -f ' + DOCKER_COMPOSE_QA_FILE + ' -p ' + DOCKER_COMPOSE_NAME + ' down --rmi all -v' } } - // stage('Source Testing'){ - // steps{ - // dir('./api/drawingcouseselling'){ - // sh 'mvn test -Pdev' - // } - // // dir('./frontend/my-app'){ - // // sh 'pnpm i' - // // sh 'pnpm dev' - // // } - // } - // } stage('Build docker-compose dev and push images'){ steps{ withDockerRegistry(credentialsId: 'Arisa Docker Hub Account', url: 'https://index.docker.io/v1/'){ - sh 'docker compose -f ' + DOCKER_COMPOSE_DEV_FILE + ' -p ' + DOCKER_COMPOSE_NAME + ' build' - sh 'docker compose -f ' + DOCKER_COMPOSE_DEV_FILE + ' -p ' + DOCKER_COMPOSE_NAME + ' up -d' + sh 'docker compose -f ' + DOCKER_COMPOSE_QA_FILE + ' -p ' + DOCKER_COMPOSE_NAME + ' build' + sh 'docker compose -f ' + DOCKER_COMPOSE_QA_FILE + ' -p ' + DOCKER_COMPOSE_NAME + ' up -d' } } } + // stage('Build docker-compose prod and push images for prod deployment'){ + // steps{ + // withDockerRegistry(credentialsId: 'Arisa Docker Hub Account', url: 'https://index.docker.io/v1/'){ + // sh 'docker compose -f ' + DOCKER_COMPOSE_PROD_FILE + ' -p ' + DOCKER_COMPOSE_NAME + ' build' + // sh 'docker compose -f ' + DOCKER_COMPOSE_PROD_FILE + ' -p ' + DOCKER_COMPOSE_NAME + ' push' + // // Tag the images with 'latest' before pushing + // sh 'docker tag ' + DOCKER_IMAGE_BACKEND_API + ':latest ' + DOCKER_IMAGE_BACKEND_API + ':latest' + // sh 'docker tag ' + DOCKER_IMAGE_FRONTEND_SERVER + ':latest ' + DOCKER_IMAGE_FRONTEND_SERVER + ':latest' + + // // Push the images with the 'latest' tag + // sh 'docker push ' + DOCKER_IMAGE_BACKEND_API + ':latest' + // sh 'docker push ' + DOCKER_IMAGE_FRONTEND_SERVER + ':latest' + // } + // } + // } } post { From 586ccb15ecab4cdd4998e595b1746ebd565fcb6c Mon Sep 17 00:00:00 2001 From: Anata Arisa Date: Tue, 7 Nov 2023 19:57:50 +0700 Subject: [PATCH 07/36] vinh/config env --- frontend/my-app/src/service.ts | 17 ++++++++++++++++- frontend/my-app/tsconfig.json | 31 ++++++++++++++++--------------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/frontend/my-app/src/service.ts b/frontend/my-app/src/service.ts index 921f83df..ddd32293 100644 --- a/frontend/my-app/src/service.ts +++ b/frontend/my-app/src/service.ts @@ -1,4 +1,19 @@ -export const apiBaseUrl: string = "http://localhost:7070/api/v1/" +import { PUBLIC_API_BASE_URL_DEV, PUBLIC_API_BASE_URL_PROD, PUBLIC_API_BASE_URL_QA } from "$env/static/public"; +let apiBaseUrl: string; + +if (process.env.NODE_ENV === 'production') { + apiBaseUrl = PUBLIC_API_BASE_URL_PROD; +} else if (process.env.NODE_ENV === 'development') { + apiBaseUrl = PUBLIC_API_BASE_URL_DEV; +} else if (process.env.NODE_ENV === 'testing') { + apiBaseUrl = PUBLIC_API_BASE_URL_QA; +} else { + apiBaseUrl = "http://localhost:9090/api/v1/"; +} +console.log(process.env.NODE_ENV) +export { apiBaseUrl }; + + export const BaseUrl: string = "http://localhost:3000/" export const apiCurrencyExchange: string = "https://api.exchangerate-api.com/v4/latest/USD" import axios, { type AxiosResponse } from 'axios'; diff --git a/frontend/my-app/tsconfig.json b/frontend/my-app/tsconfig.json index 6ae0c8c4..7af4aa41 100644 --- a/frontend/my-app/tsconfig.json +++ b/frontend/my-app/tsconfig.json @@ -1,17 +1,18 @@ { - "extends": "./.svelte-kit/tsconfig.json", - "compilerOptions": { - "allowJs": true, - "checkJs": true, - "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, - "resolveJsonModule": true, - "skipLibCheck": true, - "sourceMap": true, - "strict": true - } - // Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias - // - // If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes - // from the referenced tsconfig.json - TypeScript does not merge them in + "extends": "./.svelte-kit/tsconfig.json", + "compilerOptions": { + "allowJs": true, + "checkJs": true, + "target": "ESNext", + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "sourceMap": true, + "strict": true + } + // Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias + // + // If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes + // from the referenced tsconfig.json - TypeScript does not merge them in } From 1a6a1abe16b29bbbc3d8107d80afd6b956902dfc Mon Sep 17 00:00:00 2001 From: Anata Arisa Date: Tue, 7 Nov 2023 20:00:22 +0700 Subject: [PATCH 08/36] vinh/allow env --- .gitignore | 3 +-- frontend/.gitignore | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index eda632f6..8639c812 100644 --- a/.gitignore +++ b/.gitignore @@ -34,5 +34,4 @@ build/ ## Node JS -package-lock.json -.env \ No newline at end of file +package-lock.json \ No newline at end of file diff --git a/frontend/.gitignore b/frontend/.gitignore index c80e912f..99e5ad1b 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -3,8 +3,6 @@ node_modules /build /.svelte-kit /package -.env -.env.* !.env.example vite.config.js.timestamp-* vite.config.ts.timestamp-* From 7ffa80aad5f8a8cc7197bc3ad4adb3b1a5070c44 Mon Sep 17 00:00:00 2001 From: Anata Arisa Date: Tue, 7 Nov 2023 20:02:30 +0700 Subject: [PATCH 09/36] vinh/allow env --- frontend/.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/.gitignore b/frontend/.gitignore index 99e5ad1b..965aac71 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -3,7 +3,6 @@ node_modules /build /.svelte-kit /package -!.env.example vite.config.js.timestamp-* vite.config.ts.timestamp-* .vscode/ From b979aed04a0b773cc2a379a269c068f2abfaa2fb Mon Sep 17 00:00:00 2001 From: Anata Arisa Date: Tue, 7 Nov 2023 20:04:37 +0700 Subject: [PATCH 10/36] vinh/add env file --- frontend/my-app/.env | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 frontend/my-app/.env diff --git a/frontend/my-app/.env b/frontend/my-app/.env new file mode 100644 index 00000000..d735d919 --- /dev/null +++ b/frontend/my-app/.env @@ -0,0 +1,4 @@ +# Public +PUBLIC_API_BASE_URL_DEV=http://localhost:7070/api/v1/ +PUBLIC_API_BASE_URL_PROD=http://anataarisa.hopto.org:7070/api/v1/ +PUBLIC_API_BASE_URL_QA=http://anataarisa.hopto.org:7070/api/v1/ \ No newline at end of file From 91315de7b1558d05baadef0c0bd96f19e0b24eaf Mon Sep 17 00:00:00 2001 From: Anata Arisa Date: Tue, 7 Nov 2023 20:05:17 +0700 Subject: [PATCH 11/36] vinh/add qa spring boot setting --- .../src/main/resources/application.qa.yml | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/api/drawingcouseselling/src/main/resources/application.qa.yml b/api/drawingcouseselling/src/main/resources/application.qa.yml index e69de29b..0b6c0897 100644 --- a/api/drawingcouseselling/src/main/resources/application.qa.yml +++ b/api/drawingcouseselling/src/main/resources/application.qa.yml @@ -0,0 +1,81 @@ +aws: + access: + key: + id: AKIA2EWSF45CBHDRXQJK + s3: + region: ap-southeast-1 + bucket: + name: ademyimage + secret: + access: + key: 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 + +spring: + datasource: + url: jdbc:mariadb://${DB_HOST:anataarisa.hopto.org}:${DB_PORT:3306}/ademy + # url: jdbc:mariadb://localhost:3307/ademy + username: ${DB_USERNAME:pim} + password: ${DB_PASSWORD:Vinh12345.} + driver-class-name: org.mariadb.jdbc.Driver + jpa: + hibernate: + ddl-auto: update + sql: + init: + encoding: utf-8 + # session: + # store-type=jdbc: + mail: + host: smtp.gmail.com + port: 587 + username: no.reply.ademy@gmail.com + password: ztgzeyizzyicozuc + properties: + mail: + smtp: + auth: true + starttls: + enable: true + security: + oauth2: + client: + registration: + google: + client-id: 509336143279-ng2g9fdpg8pkt1j3jlj24au6l96hk0qn.apps.googleusercontent.com + client-secret: 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 + +server: + servlet: + context-path: /api/v1 + port: 9090 + error: + include-message: always + + +logging: + level: + org: + springframework: + security: TRACE + hibernate: + type: trace + orm: + jdbc: + bind: trace + +jwt-key: + secret-key: ${JWT_KEY:49906c40c2bd2ce2a35571ebf991e74573d0e5cc5db9e032a7b1c5af42c8b038} + +paypal: + client: + secret: EHGsrSIQG-aODbOaHmd5YnhCLNS3Zq3x3einniprXjRkABpA-U0UEXy9w_hp-YElLEwsQv6tmQNJ4ZVS + app: AWbOtZPREQ6DxSCza2yGZT82kQTW9T17r8xezCuKARBoBM5jli0FdOPrdRVkytKLdeaaFaiM6k-tHlr6 + mode: sandbox + + +frontend: + url: http://localhost:3000/ + +api: + base: + url: http://localhost:9090/api/v1/ From a17aa820d842af42dc7b56483492759081164d4e Mon Sep 17 00:00:00 2001 From: Anata Arisa Date: Tue, 7 Nov 2023 20:19:48 +0700 Subject: [PATCH 12/36] vinh/add config for svelte kit --- frontend/my-app/svelte.config.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/my-app/svelte.config.js b/frontend/my-app/svelte.config.js index 87f1a415..84ddb3e4 100644 --- a/frontend/my-app/svelte.config.js +++ b/frontend/my-app/svelte.config.js @@ -1,4 +1,4 @@ -import adapter from "@sveltejs/adapter-auto"; +import adapter from "@sveltejs/adapter-node"; import { vitePreprocess } from "@sveltejs/kit/vite"; /** @type {import('@sveltejs/kit').Config} */ @@ -7,6 +7,9 @@ const config = { // for more information about preprocessors preprocess: [vitePreprocess({})], kit: { + env: { + dir: "./", + }, // adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list. // If your environment is not supported or you settled on a specific environment, switch out the adapter. // See https://kit.svelte.dev/docs/adapters for more information about adapters. From 3cfe3449e3e8a31308e26a16d3a550a90fbbf304 Mon Sep 17 00:00:00 2001 From: Anata Arisa Date: Tue, 7 Nov 2023 20:31:23 +0700 Subject: [PATCH 13/36] vinh/add domain for cors --- .../com/group1/drawingcouseselling/ApplicationWebConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/drawingcouseselling/src/main/java/com/group1/drawingcouseselling/ApplicationWebConfig.java b/api/drawingcouseselling/src/main/java/com/group1/drawingcouseselling/ApplicationWebConfig.java index 5943e44c..0b891cd9 100644 --- a/api/drawingcouseselling/src/main/java/com/group1/drawingcouseselling/ApplicationWebConfig.java +++ b/api/drawingcouseselling/src/main/java/com/group1/drawingcouseselling/ApplicationWebConfig.java @@ -21,7 +21,7 @@ protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { public CorsFilter corsFilter() { CorsConfiguration corsConfiguration = new CorsConfiguration(); corsConfiguration.setAllowCredentials(true); - corsConfiguration.setAllowedOrigins(Arrays.asList("http://localhost:3000")); + corsConfiguration.setAllowedOrigins(Arrays.asList("http://localhost:3000", "http://anataarisa.hopto.org:3000")); corsConfiguration.setAllowedHeaders(Arrays.asList("Origin", "Access-Control-Allow-Origin", "Content-Type", "Accept", "Authorization", "Origin, Accept", "X-Requested-With", "Access-Control-Request-Method", "Access-Control-Request-Headers")); From fe6f30ebc5523a283a2fb2b29824a0936cf59fd0 Mon Sep 17 00:00:00 2001 From: Anata Arisa Date: Tue, 7 Nov 2023 21:54:31 +0700 Subject: [PATCH 14/36] vinh/fix redirect link --- api/drawingcouseselling/src/main/resources/application.qa.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/drawingcouseselling/src/main/resources/application.qa.yml b/api/drawingcouseselling/src/main/resources/application.qa.yml index 0b6c0897..08534f67 100644 --- a/api/drawingcouseselling/src/main/resources/application.qa.yml +++ b/api/drawingcouseselling/src/main/resources/application.qa.yml @@ -74,8 +74,8 @@ paypal: frontend: - url: http://localhost:3000/ + url: http://anataarisa.hopto.org:3000/ api: base: - url: http://localhost:9090/api/v1/ + url: http://anataarisa.hopto.org:7070/api/v1/ From 78388117711ee92b44603a7c8fe9eed778394ba0 Mon Sep 17 00:00:00 2001 From: Anata Arisa Date: Tue, 7 Nov 2023 23:38:19 +0700 Subject: [PATCH 15/36] vinh/rename to application-qa.yml --- .../src/main/resources/{application.qa.yml => application-qa.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename api/drawingcouseselling/src/main/resources/{application.qa.yml => application-qa.yml} (100%) diff --git a/api/drawingcouseselling/src/main/resources/application.qa.yml b/api/drawingcouseselling/src/main/resources/application-qa.yml similarity index 100% rename from api/drawingcouseselling/src/main/resources/application.qa.yml rename to api/drawingcouseselling/src/main/resources/application-qa.yml From d35461bba411d1d802b7af1cc958350e2e189dac Mon Sep 17 00:00:00 2001 From: Anata Arisa Date: Tue, 7 Nov 2023 23:54:00 +0700 Subject: [PATCH 16/36] vinh/change from form to div --- .../my-app/src/routes/CreateCourse.svelte | 429 +++++++++--------- 1 file changed, 212 insertions(+), 217 deletions(-) diff --git a/frontend/my-app/src/routes/CreateCourse.svelte b/frontend/my-app/src/routes/CreateCourse.svelte index 82b2cc38..cf214a76 100644 --- a/frontend/my-app/src/routes/CreateCourse.svelte +++ b/frontend/my-app/src/routes/CreateCourse.svelte @@ -1,229 +1,224 @@
- +
-
-
- - -
-
- -