diff --git a/.gitignore b/.gitignore index 0cc2124..dbee276 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.iml .idea/ +/environment/infra/docker-compose/yogastic/.env diff --git a/environment/dev/docker/strapi/readme.md b/environment/dev/docker/app/readme.md similarity index 100% rename from environment/dev/docker/strapi/readme.md rename to environment/dev/docker/app/readme.md diff --git a/environment/dev/docker/strapi/scripts/build.docker.build.sh b/environment/dev/docker/app/scripts/build.docker.build.sh similarity index 100% rename from environment/dev/docker/strapi/scripts/build.docker.build.sh rename to environment/dev/docker/app/scripts/build.docker.build.sh diff --git a/environment/dev/docker/strapi/scripts/build.docker.build.step.build.sh b/environment/dev/docker/app/scripts/build.docker.build.step.build.sh similarity index 76% rename from environment/dev/docker/strapi/scripts/build.docker.build.step.build.sh rename to environment/dev/docker/app/scripts/build.docker.build.step.build.sh index 321fef0..397802e 100755 --- a/environment/dev/docker/strapi/scripts/build.docker.build.step.build.sh +++ b/environment/dev/docker/app/scripts/build.docker.build.step.build.sh @@ -3,7 +3,7 @@ CURRENT_DIR=$(dirname "$0") # build docker image source "${CURRENT_DIR}/build.docker.env.sh" -PROJECT_ROOT=$(readlink -f "${CURRENT_DIR}/../../../../../strapi-yoga") +PROJECT_ROOT=$(readlink -f "${CURRENT_DIR}/../../../../../yoga-app") echo "build image ${TAG} from folder ${PROJECT_ROOT}" diff --git a/environment/dev/docker/strapi/scripts/build.docker.build.step.inc.version.sh b/environment/dev/docker/app/scripts/build.docker.build.step.inc.version.sh similarity index 100% rename from environment/dev/docker/strapi/scripts/build.docker.build.step.inc.version.sh rename to environment/dev/docker/app/scripts/build.docker.build.step.inc.version.sh diff --git a/environment/dev/docker/strapi/scripts/build.docker.env.sh b/environment/dev/docker/app/scripts/build.docker.env.sh similarity index 75% rename from environment/dev/docker/strapi/scripts/build.docker.env.sh rename to environment/dev/docker/app/scripts/build.docker.env.sh index ffc3644..b611fcf 100755 --- a/environment/dev/docker/strapi/scripts/build.docker.env.sh +++ b/environment/dev/docker/app/scripts/build.docker.env.sh @@ -6,4 +6,4 @@ echo "Reading version file: ${VERSION_FILE}" export VERSION=$(cat "${VERSION_FILE}") -export TAG=docker.rschneider.hu/infra/yoga-strapi:$VERSION +export TAG=docker.rschneider.hu/infra/yoga-app:$VERSION diff --git a/environment/dev/docker/strapi/scripts/build.docker.push.sh b/environment/dev/docker/app/scripts/build.docker.push.sh similarity index 100% rename from environment/dev/docker/strapi/scripts/build.docker.push.sh rename to environment/dev/docker/app/scripts/build.docker.push.sh diff --git a/environment/dev/docker/app/scripts/version.txt b/environment/dev/docker/app/scripts/version.txt new file mode 100644 index 0000000..59b789f --- /dev/null +++ b/environment/dev/docker/app/scripts/version.txt @@ -0,0 +1 @@ +202501071722.a8b144f diff --git a/environment/dev/docker/cms/readme.md b/environment/dev/docker/cms/readme.md new file mode 100644 index 0000000..5302ba3 --- /dev/null +++ b/environment/dev/docker/cms/readme.md @@ -0,0 +1,54 @@ +# Building the docker image + +## Dockerfile + +The Dockerfile can be found in the root folder of the project. + +## Available Environment Variables + + +| property name | description | values | +|----------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------| +| DB_TYPE | type of the db enginge. | mysql, h2 | +| DB_URL | jdbc url of the db | "jdbc:mysql://ucs-intranet-db-author:3306/magnolia" | +| DB_USER | username for the db | root | +| DB_PASSWORD | password for the db | root | +| CATALINA_OPTS_APPEND | Java options form tomcat | "-Xms512M -Xmx2048M " | +| JAVA_OPTS | addition java options for application | "-agentlib:jdwp=transport=dt_socket,address=*:54455,server=y,suspend=n" | +| MAGNOLIA_UPDATE_AUTO | set the property 'magnolia.update.auto' in magnolia.properties | ${MAGNOLIA_UPDATE_AUTO} | +| MAGNOLIA_AUTHORINSTANCE_URL | public accessible url of the author instance | http://author.ucsintranet.at | +| MAGNOLIA_UCSWEBSITE_AUTHORINSTANCE_URL | public accessible url of the author instance of the UCS website | http://author.ucsintranet.at | +| MAGNOLIA_PUBLICINSTANCE_URL | public accessible url of the public instance | http://public.ucsintranet.at | +| MAGNOLIA_PROFILE | the magnolia profile to use (see: https://docs.magnolia-cms.com/product-docs/6.2/releases/release-notes-for-magnolia-cms-6.2.2/#_profile_based_configuration_of_property_files) | magnoliaAuthor, magnoliaPublic | +| KEYCLOAK_REALM | the keycloak realm to use | magnolia | +| KEYCLOAK_CLIENT_ID_AUTHOR | the author keycloak client id | author.ucsintranet | +| KEYCLOAK_CLIENT_ID_PUBLIC | the author keycloak client id | author.ucsintranet | +| KEYCLOAK_AUTH_URL | | ${KEYCLOAK_AUTH_URL} | +| KEYCLOAK_SSL_REQUIRED | | external | +| KEYCLOAK_CREDENTIALS_SECRET_AUTHOR | author keycloak secret | | +| KEYCLOAK_CREDENTIALS_SECRET_PUBLIC | public keycloak secret | | + +## About the image + +The image is based on the cli provided by magnolia ( a.k.a mgnl). +To get more information about the mgnl cli tool, please visit the [mgnl documentation](https://docs.magnolia-cms.com/magnolia-cli/4.x/) + +The project generated by the mgnl tool, already includes the author and public instances! +Be sure, that in production you restrict the access to the author instance, and to the admin components + +The image is set up so, that it uses the folder "/magnolia/light-modules" as resources dir. +While build the image, the /magnolia/modules will be copied in to the image as "/magnolia/light-modules". +For development, the /magnolia/modules can be mounted, so the changes in the lightmodules are "live/instant" + +## Building & pushing the image + +The easiest way to build and pusht the image is, to run the next commands +```bash + npm run docker:build +``` + +```bash + npm run docker:push +``` + +For more details, pls examine the package.json file, and the scripts in docker/magnolia/scripts folder diff --git a/environment/dev/docker/cms/scripts/build.docker.build.sh b/environment/dev/docker/cms/scripts/build.docker.build.sh new file mode 100755 index 0000000..d918160 --- /dev/null +++ b/environment/dev/docker/cms/scripts/build.docker.build.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +CURRENT_DIR=$(dirname "$0") +source "${CURRENT_DIR}/build.docker.build.step.inc.version.sh" +source "${CURRENT_DIR}/build.docker.build.step.build.sh" diff --git a/environment/dev/docker/cms/scripts/build.docker.build.step.build.sh b/environment/dev/docker/cms/scripts/build.docker.build.step.build.sh new file mode 100755 index 0000000..282cf81 --- /dev/null +++ b/environment/dev/docker/cms/scripts/build.docker.build.step.build.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +CURRENT_DIR=$(dirname "$0") +# build docker image +source "${CURRENT_DIR}/build.docker.env.sh" +PROJECT_ROOT=$(readlink -f "${CURRENT_DIR}/../../../../../yoga-cms") + +echo "build image ${TAG} from folder ${PROJECT_ROOT}" + +cd $PROJECT_ROOT + +docker build --platform linux/amd64 -t $TAG . diff --git a/environment/dev/docker/cms/scripts/build.docker.build.step.inc.version.sh b/environment/dev/docker/cms/scripts/build.docker.build.step.inc.version.sh new file mode 100755 index 0000000..8d32d71 --- /dev/null +++ b/environment/dev/docker/cms/scripts/build.docker.build.step.inc.version.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash +# set the actual commit date and commit hash in version.txt +GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD) +GIT_BRANCH_SHORT=$(echo $GIT_BRANCH | cut -d "/" -f 1) +GIT_COMMIT_DATE=$(git log -1 --format=%cd --date=format:%Y%m%d%H%M) +GIT_COMMIT_ID_SHORT=$(git rev-parse --short HEAD) + +VERSION=$GIT_COMMIT_DATE.$GIT_COMMIT_ID_SHORT + +CURRENT_DIR=$(dirname "$0") +VERSION_FILE="${CURRENT_DIR}/version.txt" + +echo "Saving version ${VERSION} to file ${VERSION_FILE}" + +echo $VERSION +echo $VERSION > $VERSION_FILE + diff --git a/environment/dev/docker/cms/scripts/build.docker.env.sh b/environment/dev/docker/cms/scripts/build.docker.env.sh new file mode 100755 index 0000000..90e9c16 --- /dev/null +++ b/environment/dev/docker/cms/scripts/build.docker.env.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +CURRENT_DIR=$(dirname "$0") +VERSION_FILE="${CURRENT_DIR}/version.txt" +echo "Reading version file: ${VERSION_FILE}" + +export VERSION=$(cat "${VERSION_FILE}") + +export TAG=docker.rschneider.hu/infra/yoga-cms:$VERSION diff --git a/environment/dev/docker/cms/scripts/build.docker.push.sh b/environment/dev/docker/cms/scripts/build.docker.push.sh new file mode 100755 index 0000000..81f3486 --- /dev/null +++ b/environment/dev/docker/cms/scripts/build.docker.push.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +CURRENT_DIR=$(dirname "$0") +# push docker image +source "${CURRENT_DIR}/build.docker.env.sh" +echo "push image ${TAG}" +docker push $TAG diff --git a/environment/dev/docker/strapi/scripts/destroy.docker.sh b/environment/dev/docker/cms/scripts/destroy.docker.sh similarity index 100% rename from environment/dev/docker/strapi/scripts/destroy.docker.sh rename to environment/dev/docker/cms/scripts/destroy.docker.sh diff --git a/environment/dev/docker/strapi/scripts/start.docker.compose.env.sh b/environment/dev/docker/cms/scripts/start.docker.compose.env.sh similarity index 100% rename from environment/dev/docker/strapi/scripts/start.docker.compose.env.sh rename to environment/dev/docker/cms/scripts/start.docker.compose.env.sh diff --git a/environment/dev/docker/strapi/scripts/start.docker.compose.start.sh b/environment/dev/docker/cms/scripts/start.docker.compose.start.sh similarity index 100% rename from environment/dev/docker/strapi/scripts/start.docker.compose.start.sh rename to environment/dev/docker/cms/scripts/start.docker.compose.start.sh diff --git a/environment/dev/docker/strapi/scripts/start.docker.compose.update.version.sh b/environment/dev/docker/cms/scripts/start.docker.compose.update.version.sh similarity index 100% rename from environment/dev/docker/strapi/scripts/start.docker.compose.update.version.sh rename to environment/dev/docker/cms/scripts/start.docker.compose.update.version.sh diff --git a/environment/dev/docker/strapi/scripts/stop.docker.compose.destroy.sh b/environment/dev/docker/cms/scripts/stop.docker.compose.destroy.sh similarity index 100% rename from environment/dev/docker/strapi/scripts/stop.docker.compose.destroy.sh rename to environment/dev/docker/cms/scripts/stop.docker.compose.destroy.sh diff --git a/environment/dev/docker/strapi/scripts/stop.docker.compose.stop.sh b/environment/dev/docker/cms/scripts/stop.docker.compose.stop.sh similarity index 100% rename from environment/dev/docker/strapi/scripts/stop.docker.compose.stop.sh rename to environment/dev/docker/cms/scripts/stop.docker.compose.stop.sh diff --git a/environment/dev/docker/cms/scripts/version.txt b/environment/dev/docker/cms/scripts/version.txt new file mode 100644 index 0000000..59b789f --- /dev/null +++ b/environment/dev/docker/cms/scripts/version.txt @@ -0,0 +1 @@ +202501071722.a8b144f diff --git a/environment/dev/docker/strapi/scripts/version.txt b/environment/dev/docker/strapi/scripts/version.txt deleted file mode 100644 index 4c8a339..0000000 --- a/environment/dev/docker/strapi/scripts/version.txt +++ /dev/null @@ -1 +0,0 @@ -202501062213.bed409f diff --git a/environment/infra/docker-compose/yogastic/docker-compose.yaml b/environment/infra/docker-compose/yogastic/docker-compose.yaml index 7769c7e..57d1ae8 100644 --- a/environment/infra/docker-compose/yogastic/docker-compose.yaml +++ b/environment/infra/docker-compose/yogastic/docker-compose.yaml @@ -1,22 +1,69 @@ services: - vaultwarden: - labels: - - traefik.http.routers.yoga.rule=Host(`yoga.rschneider.net`) - - traefik.http.routers.yoga.tls=true - - traefik.http.routers.yoga.service=yoga - - traefik.http.services.yoga.loadbalancer.server.port=80 - - traefik.http.routers.yoga-public.rule=Host(`yoga.rschneider.hu`) - - traefik.http.routers.yoga-public.tls=true - - traefik.http.routers.yoga-public.service=yoga-public - - traefik.http.services.yoga-public.loadbalancer.server.port=80 -# - traefik.http.middlewares.test-redirectscheme.redirectscheme.scheme=https -# - traefik.http.middlewares.test-redirectscheme.redirectscheme.permanent=true - image: docker.rschneider.hu/infra/yogastic:202412282019.ae4bba3 - container_name: yogastic - restart: always - networks: - traefik_traefik: +# yogastic: +# labels: +# - traefik.http.routers.yoga.rule=Host(`yoga.rschneider.net`) +# - traefik.http.routers.yoga.tls=true +# - traefik.http.routers.yoga.service=yoga +# - traefik.http.services.yoga.loadbalancer.server.port=80 +# - traefik.http.routers.yoga-public.rule=Host(`yoga.rschneider.hu`) +# - traefik.http.routers.yoga-public.tls=true +# - traefik.http.routers.yoga-public.service=yoga-public +# - traefik.http.services.yoga-public.loadbalancer.server.port=80 +## - traefik.http.middlewares.test-redirectscheme.redirectscheme.scheme=https +## - traefik.http.middlewares.test-redirectscheme.redirectscheme.permanent=true +# image: docker.rschneider.hu/infra/yogastic:202412282019.ae4bba3 +# container_name: yogastic +# restart: always +# networks: +# traefik_traefik: -networks: - traefik_traefik: - external: true + strapi-db: + image: mariadb:11.6.2 + environment: + MARIADB_ROOT_PASSWORD: strapi + MARIADB_DATABASE: strapi + MARIADB_USER: strapi + MARIADB_PASSWORD: strapi + volumes: + - strapi-db:/var/lib/mysql + ports: + - "4011:3306" + + nextjs-db: + image: postgres:17 + environment: + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + POSTGRES_DB: ${POSTGRES_DATABASE} + POSTGRES_USER: ${POSTGRES_USER} + volumes: + - next-db:/var/lib/postgresql/data + ports: + - "4012:5432" + + app: + image: docker.rschneider.hu/infra/yoga-app:202501071722.a8b144f + ports: + - "4081:3000" + environment: + POSTGRES_URL: ${POSTGRES_URL} + POSTGRES_URL_NON_POOLING: ${POSTGRES_URL_NON_POOLING} + POSTGRES_USER: ${POSTGRES_USER} + POSTGRES_HOST: ${POSTGRES_HOST} + POSTGRES_PORT: ${POSTGRES_PORT} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + POSTGRES_DATABASE: ${POSTGRES_DATABASE} + + cms: + image: docker.rschneider.hu/infra/yoga-cms:202501071722.a8b144f + ports: + - "4082:1337" + +volumes: + next-db: {} + strapi-db: {} + + + +#networks: +# traefik_traefik: +# external: true diff --git a/yoga-app/Dockerfile b/yoga-app/Dockerfile index b70d7e7..183c2c7 100644 --- a/yoga-app/Dockerfile +++ b/yoga-app/Dockerfile @@ -10,6 +10,7 @@ WORKDIR /app # Install dependencies based on the preferred package manager COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* .npmrc* ./ +RUN echo "" RUN \ if [ -f yarn.lock ]; then yarn --frozen-lockfile; \ elif [ -f package-lock.json ]; then npm ci; \ @@ -27,7 +28,7 @@ COPY . . # Next.js collects completely anonymous telemetry data about general usage. # Learn more here: https://nextjs.org/telemetry # Uncomment the following line in case you want to disable telemetry during the build. -# ENV NEXT_TELEMETRY_DISABLED=1 +ENV NEXT_TELEMETRY_DISABLED=1 RUN \ if [ -f yarn.lock ]; then yarn run build; \ diff --git a/yoga-app/package-lock.json b/yoga-app/package-lock.json index b08938b..90cc168 100644 --- a/yoga-app/package-lock.json +++ b/yoga-app/package-lock.json @@ -11,6 +11,7 @@ "@fortawesome/fontawesome-free": "^6.7.2", "@types/aos": "^3.0.7", "@types/bcrypt": "^5.0.2", + "@types/pg": "^8.11.10", "aos": "^2.3.4", "bcrypt": "^5.1.1", "bootstrap": "^4.6.2", @@ -1156,6 +1157,68 @@ "undici-types": "~6.19.2" } }, + "node_modules/@types/pg": { + "version": "8.11.10", + "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.11.10.tgz", + "integrity": "sha512-LczQUW4dbOQzsH2RQ5qoeJ6qJPdrcM/DcMLoqWQkMLMsq83J5lAX3LXjdkWdpscFy67JSOWDnh7Ny/sPFykmkg==", + "dependencies": { + "@types/node": "*", + "pg-protocol": "*", + "pg-types": "^4.0.1" + } + }, + "node_modules/@types/pg/node_modules/pg-types": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-4.0.2.tgz", + "integrity": "sha512-cRL3JpS3lKMGsKaWndugWQoLOCoP+Cic8oseVcbr0qhPzYD5DWXK+RZ9LY9wxRf7RQia4SCwQlXk0q6FCPrVng==", + "dependencies": { + "pg-int8": "1.0.1", + "pg-numeric": "1.0.2", + "postgres-array": "~3.0.1", + "postgres-bytea": "~3.0.0", + "postgres-date": "~2.1.0", + "postgres-interval": "^3.0.0", + "postgres-range": "^1.1.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@types/pg/node_modules/postgres-array": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-3.0.2.tgz", + "integrity": "sha512-6faShkdFugNQCLwucjPcY5ARoW1SlbnrZjmGl0IrrqewpvxvhSLHimCVzqeuULCbG0fQv7Dtk1yDbG3xv7Veog==", + "engines": { + "node": ">=12" + } + }, + "node_modules/@types/pg/node_modules/postgres-bytea": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-3.0.0.tgz", + "integrity": "sha512-CNd4jim9RFPkObHSjVHlVrxoVQXz7quwNFpz7RY1okNNme49+sVyiTvTRobiLV548Hx/hb1BG+iE7h9493WzFw==", + "dependencies": { + "obuf": "~1.1.2" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@types/pg/node_modules/postgres-date": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-2.1.0.tgz", + "integrity": "sha512-K7Juri8gtgXVcDfZttFKVmhglp7epKb1K4pgrkLxehjqkrgPhfG6OO8LHLkfaqkbpjNRnra018XwAr1yQFWGcA==", + "engines": { + "node": ">=12" + } + }, + "node_modules/@types/pg/node_modules/postgres-interval": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-3.0.0.tgz", + "integrity": "sha512-BSNDnbyZCXSxgA+1f5UU2GmwhoI0aU5yMxRGO8CdFEcY2BQF9xm/7MqKnYoM1nJDk8nONNWDk9WeSmePFhQdlw==", + "engines": { + "node": ">=12" + } + }, "node_modules/@types/react": { "version": "19.0.2", "resolved": "https://registry.npmjs.org/@types/react/-/react-19.0.2.tgz", @@ -4207,6 +4270,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/obuf": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", + "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==" + }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -4368,6 +4436,14 @@ "node": ">=4.0.0" } }, + "node_modules/pg-numeric": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pg-numeric/-/pg-numeric-1.0.2.tgz", + "integrity": "sha512-BM/Thnrw5jm2kKLE5uJkXqqExRUY/toLHda65XgFTBTFYZyopbKjBe29Ii3RbkvlsMoFwD+tHeGaCjjv0gHlyw==", + "engines": { + "node": ">=4" + } + }, "node_modules/pg-pool": { "version": "3.7.0", "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.7.0.tgz", @@ -4504,6 +4580,11 @@ "node": ">=0.10.0" } }, + "node_modules/postgres-range": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/postgres-range/-/postgres-range-1.1.4.tgz", + "integrity": "sha512-i/hbxIE9803Alj/6ytL7UHQxRvZkI9O4Sy+J3HGc4F4oo/2eQAjTSNJ0bfxyse3bH0nuVesCk+3IRLaMtG3H6w==" + }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", diff --git a/yoga-app/package.json b/yoga-app/package.json index 996c9e1..431dd2c 100644 --- a/yoga-app/package.json +++ b/yoga-app/package.json @@ -12,6 +12,7 @@ "@fortawesome/fontawesome-free": "^6.7.2", "@types/aos": "^3.0.7", "@types/bcrypt": "^5.0.2", + "@types/pg": "^8.11.10", "aos": "^2.3.4", "bcrypt": "^5.1.1", "bootstrap": "^4.6.2", diff --git a/yoga-app/src/app/api/strapi/strapi-api.ts b/yoga-app/src/app/api/strapi/strapi-api.ts index 38db043..52a97f5 100644 --- a/yoga-app/src/app/api/strapi/strapi-api.ts +++ b/yoga-app/src/app/api/strapi/strapi-api.ts @@ -5,7 +5,10 @@ class StrapiApi{ } public getHomePage(){ - + console.info('Get Home Page'); } } + +const api = new StrapiApi(); +export default api; \ No newline at end of file diff --git a/yoga-app/src/app/seed/placeholder-data.ts b/yoga-app/src/app/seed/placeholder-data.ts index 7630e8e..3c3b932 100644 --- a/yoga-app/src/app/seed/placeholder-data.ts +++ b/yoga-app/src/app/seed/placeholder-data.ts @@ -48,85 +48,85 @@ const customers = [ }, ]; -const invoices: any[] = [ - // { - // customer_id: customers[0].id, - // amount: 15795, - // status: 'pending', - // date: '2022-12-06', - // }, - // { - // customer_id: customers[1].id, - // amount: 20348, - // status: 'pending', - // date: '2022-11-14', - // }, - // { - // customer_id: customers[4].id, - // amount: 3040, - // status: 'paid', - // date: '2022-10-29', - // }, - // { - // customer_id: customers[3].id, - // amount: 44800, - // status: 'paid', - // date: '2023-09-10', - // }, - // { - // customer_id: customers[5].id, - // amount: 34577, - // status: 'pending', - // date: '2023-08-05', - // }, - // { - // customer_id: customers[2].id, - // amount: 54246, - // status: 'pending', - // date: '2023-07-16', - // }, - // { - // customer_id: customers[0].id, - // amount: 666, - // status: 'pending', - // date: '2023-06-27', - // }, - // { - // customer_id: customers[3].id, - // amount: 32545, - // status: 'paid', - // date: '2023-06-09', - // }, - // { - // customer_id: customers[4].id, - // amount: 1250, - // status: 'paid', - // date: '2023-06-17', - // }, - // { - // customer_id: customers[5].id, - // amount: 8546, - // status: 'paid', - // date: '2023-06-07', - // }, - // { - // customer_id: customers[1].id, - // amount: 500, - // status: 'paid', - // date: '2023-08-19', - // }, - // { - // customer_id: customers[5].id, - // amount: 8945, - // status: 'paid', - // date: '2023-06-03', - // }, - // { - // customer_id: customers[2].id, - // amount: 1000, - // status: 'paid', - // date: '2022-06-05', - // }, +const invoices = [ + { + customer_id: customers[0].id, + amount: 15795, + status: 'pending', + date: '2022-12-06', + }, + { + customer_id: customers[1].id, + amount: 20348, + status: 'pending', + date: '2022-11-14', + }, + { + customer_id: customers[4].id, + amount: 3040, + status: 'paid', + date: '2022-10-29', + }, + { + customer_id: customers[3].id, + amount: 44800, + status: 'paid', + date: '2023-09-10', + }, + { + customer_id: customers[5].id, + amount: 34577, + status: 'pending', + date: '2023-08-05', + }, + { + customer_id: customers[2].id, + amount: 54246, + status: 'pending', + date: '2023-07-16', + }, + { + customer_id: customers[0].id, + amount: 666, + status: 'pending', + date: '2023-06-27', + }, + { + customer_id: customers[3].id, + amount: 32545, + status: 'paid', + date: '2023-06-09', + }, + { + customer_id: customers[4].id, + amount: 1250, + status: 'paid', + date: '2023-06-17', + }, + { + customer_id: customers[5].id, + amount: 8546, + status: 'paid', + date: '2023-06-07', + }, + { + customer_id: customers[1].id, + amount: 500, + status: 'paid', + date: '2023-08-19', + }, + { + customer_id: customers[5].id, + amount: 8945, + status: 'paid', + date: '2023-06-03', + }, + { + customer_id: customers[2].id, + amount: 1000, + status: 'paid', + date: '2022-06-05', + }, ]; const revenue = [ diff --git a/yoga-app/src/app/seed/route.ts b/yoga-app/src/app/seed/route.ts index 2a01953..05a4fab 100644 --- a/yoga-app/src/app/seed/route.ts +++ b/yoga-app/src/app/seed/route.ts @@ -1,6 +1,8 @@ import bcrypt from 'bcrypt'; import { invoices, customers, revenue, users } from './placeholder-data'; +import strapiApi from "@/app/api/strapi/strapi-api"; + // const client = await connectionPool.connect(); import connectionPool from "../../db/db"; @@ -108,16 +110,23 @@ export async function GET() { // 'Uncomment this file and remove this line. You can delete this file when you are finished.', // }); try { + console.info("get request") + strapiApi.getHomePage(); + + console.info("begin") await connectionPool.query(`BEGIN`); await seedUsers(); await seedCustomers(); - // await seedInvoices(); - // await seedRevenue(); + await seedInvoices(); + await seedRevenue(); await connectionPool.query(`COMMIT`); + console.info('Database seeded successfully') return Response.json({ message: 'Database seeded successfully' }); } catch (error) { await connectionPool.query(`ROLLBACK`); + console.info("error in seed") + return Response.json({ error }, { status: 500 }); } } diff --git a/yoga-app/src/components/about.us.component.tsx b/yoga-app/src/components/about.us.component.tsx index f7e8dbe..5877cc6 100644 --- a/yoga-app/src/components/about.us.component.tsx +++ b/yoga-app/src/components/about.us.component.tsx @@ -1,3 +1,4 @@ +import Image from "next/image"; const AboutUsComponent = () =>{ return ( @@ -6,13 +7,13 @@ const AboutUsComponent = () =>{
-
+
- +
- +
@@ -22,7 +23,7 @@ const AboutUsComponent = () =>{

Quis autem vel eum iure reprehenderit qui in eao voluptate velit esse quam nihil molestiae consequatur vel illum.

Modi tempora incidunt ut labore dolore magnam aliquam auerat volutaem.
-
+
Get Started diff --git a/yoga-app/src/components/blog.posts.component.tsx b/yoga-app/src/components/blog.posts.component.tsx index ad09f93..01999d9 100644 --- a/yoga-app/src/components/blog.posts.component.tsx +++ b/yoga-app/src/components/blog.posts.component.tsx @@ -1,3 +1,4 @@ +import Image from "next/image"; const BlogPostsComponent = () => { @@ -16,7 +17,7 @@ const BlogPostsComponent = () => {
-
YOGA @@ -30,7 +31,7 @@ const BlogPostsComponent = () => {
-
FITNESS @@ -47,10 +48,10 @@ const BlogPostsComponent = () => { View All Blogs
- +
- +
diff --git a/yoga-app/src/components/contact.us.component.tsx b/yoga-app/src/components/contact.us.component.tsx index e0136af..3ec518e 100644 --- a/yoga-app/src/components/contact.us.component.tsx +++ b/yoga-app/src/components/contact.us.component.tsx @@ -1,3 +1,4 @@ +import Image from "next/image"; const ContactUsComponent = () => { @@ -39,7 +40,7 @@ const ContactUsComponent = () => {
-
@@ -56,7 +57,7 @@ const ContactUsComponent = () => {
-
@@ -64,7 +65,7 @@ const ContactUsComponent = () => {
- +
diff --git a/yoga-app/src/components/footer.component.tsx b/yoga-app/src/components/footer.component.tsx index fd2e369..458f448 100644 --- a/yoga-app/src/components/footer.component.tsx +++ b/yoga-app/src/components/footer.component.tsx @@ -1,3 +1,5 @@ +import Link from "next/link"; +import Image from "next/image"; const FooterComponent = () => { @@ -7,10 +9,10 @@ const FooterComponent = () => {
@@ -35,19 +37,19 @@ const FooterComponent = () => {

Quick Links

@@ -81,7 +83,7 @@ const FooterComponent = () => {
-
+
diff --git a/yoga-app/src/components/header.component.tsx b/yoga-app/src/components/header.component.tsx index 77cd39a..752a00b 100644 --- a/yoga-app/src/components/header.component.tsx +++ b/yoga-app/src/components/header.component.tsx @@ -1,3 +1,4 @@ +import Image from "next/image"; const HeaderComponent = () => { return ( @@ -6,7 +7,7 @@ const HeaderComponent = () => {
- +
- +
- +
- +
diff --git a/yoga-app/src/components/our.services.component.tsx b/yoga-app/src/components/our.services.component.tsx index b6a4804..92ca836 100644 --- a/yoga-app/src/components/our.services.component.tsx +++ b/yoga-app/src/components/our.services.component.tsx @@ -1,3 +1,5 @@ +import Image from "next/image"; + const OurServiceComponent = () => { return (
@@ -16,7 +18,7 @@ const OurServiceComponent = () => {
-
@@ -32,7 +34,7 @@ const OurServiceComponent = () => {
-
@@ -48,7 +50,7 @@ const OurServiceComponent = () => {
-
@@ -64,7 +66,7 @@ const OurServiceComponent = () => {
-
@@ -79,11 +81,10 @@ const OurServiceComponent = () => {
- +
- ); } diff --git a/yoga-app/src/components/our.specialities.component.tsx b/yoga-app/src/components/our.specialities.component.tsx index e376f69..394fa24 100644 --- a/yoga-app/src/components/our.specialities.component.tsx +++ b/yoga-app/src/components/our.specialities.component.tsx @@ -1,3 +1,4 @@ +import Image from "next/image"; const OurSpecialitiesComponent = () => { @@ -34,13 +35,13 @@ const OurSpecialitiesComponent = () => {

Neque orro quisquam est raui dolorem

- +
- +
@@ -62,13 +63,13 @@ const OurSpecialitiesComponent = () => {

Neque orro quisquam est raui dolorem

- +
- +
diff --git a/yoga-app/src/components/pricing.component.tsx b/yoga-app/src/components/pricing.component.tsx index 4c01451..6a7f4b1 100644 --- a/yoga-app/src/components/pricing.component.tsx +++ b/yoga-app/src/components/pricing.component.tsx @@ -1,3 +1,4 @@ +import Image from "next/image"; const PricingComponent = () => { @@ -19,11 +20,11 @@ const PricingComponent = () => {
- +
- +
@@ -53,11 +54,11 @@ const PricingComponent = () => {
- +
- +
@@ -86,11 +87,11 @@ const PricingComponent = () => {
- +
- +
diff --git a/yoga-app/src/components/quotes.component.tsx b/yoga-app/src/components/quotes.component.tsx index c048999..2ebffe3 100644 --- a/yoga-app/src/components/quotes.component.tsx +++ b/yoga-app/src/components/quotes.component.tsx @@ -1,3 +1,4 @@ +import Image from "next/image"; const QuotesComponent = () => { @@ -18,7 +19,7 @@ const QuotesComponent = () => { exercita ionem ullam corporis suscitnis officiis debitis aut rerum necessitatibus saepe evenietut aer voluptates”

-

Himala Joerge

Happy client @@ -34,7 +35,7 @@ const QuotesComponent = () => { exercita ionem ullam corporis suscitnis officiis debitis aut rerum necessitatibus saepe evenietut aer voluptates”

-

Himala Joerge

Happy client @@ -55,10 +56,10 @@ const QuotesComponent = () => {
- +
- +
diff --git a/yoga-app/src/components/subscribe.component.tsx b/yoga-app/src/components/subscribe.component.tsx index f961c37..5b1bafc 100644 --- a/yoga-app/src/components/subscribe.component.tsx +++ b/yoga-app/src/components/subscribe.component.tsx @@ -1,3 +1,4 @@ +import Image from "next/image"; const SubscribeComponent = () => { return ( @@ -22,7 +23,7 @@ const SubscribeComponent = () => {
- +
diff --git a/yoga-app/src/db/db.ts b/yoga-app/src/db/db.ts index a5338d4..8e2e21d 100644 --- a/yoga-app/src/db/db.ts +++ b/yoga-app/src/db/db.ts @@ -1,5 +1,17 @@ -const { Pool } = require('pg'); -require ('dotenv').config(); +import {Pool} from 'pg'; +import dotenv from 'dotenv'; + +if (process.env.NODE_ENV !== 'production') { + console.info('loading dotenv db config') + dotenv.config(); +}else{ + console.info('DB config environment variable'); + console.info('process.env.POSTGRES_HOST',process.env.POSTGRES_HOST); + console.info('process.env.POSTGRES_PORT',process.env.POSTGRES_PORT); + console.info('process.env.POSTGRES_USER',process.env.POSTGRES_USER); + console.info('process.env.POSTGRES_DATABASE',process.env.POSTGRES_DATABASE); + +} const connectionPool = new Pool({ connectionString: process.env.POSTGRES_URL, @@ -7,7 +19,10 @@ const connectionPool = new Pool({ host: process.env.POSTGRES_HOST, database: process.env.POSTGRES_DATABASE, password: process.env.POSTGRES_PASSWORD, - port: process.env.POSTGRES_PORT, + port: parseInt(process.env.POSTGRES_PORT as string, 10), + max: 10, + connectionTimeoutMillis: 2000, + idleTimeoutMillis: 10000, }); export default connectionPool; \ No newline at end of file diff --git a/strapi-yoga/.env.example b/yoga-cms/.env.example similarity index 100% rename from strapi-yoga/.env.example rename to yoga-cms/.env.example diff --git a/strapi-yoga/.gitignore b/yoga-cms/.gitignore similarity index 100% rename from strapi-yoga/.gitignore rename to yoga-cms/.gitignore diff --git a/strapi-yoga/Dockerfile b/yoga-cms/Dockerfile similarity index 100% rename from strapi-yoga/Dockerfile rename to yoga-cms/Dockerfile diff --git a/strapi-yoga/Dockerfile.dev b/yoga-cms/Dockerfile.dev similarity index 100% rename from strapi-yoga/Dockerfile.dev rename to yoga-cms/Dockerfile.dev diff --git a/strapi-yoga/README.md b/yoga-cms/README.md similarity index 100% rename from strapi-yoga/README.md rename to yoga-cms/README.md diff --git a/strapi-yoga/config/admin.ts b/yoga-cms/config/admin.ts similarity index 100% rename from strapi-yoga/config/admin.ts rename to yoga-cms/config/admin.ts diff --git a/strapi-yoga/config/api.ts b/yoga-cms/config/api.ts similarity index 100% rename from strapi-yoga/config/api.ts rename to yoga-cms/config/api.ts diff --git a/strapi-yoga/config/database.ts b/yoga-cms/config/database.ts similarity index 100% rename from strapi-yoga/config/database.ts rename to yoga-cms/config/database.ts diff --git a/strapi-yoga/config/middlewares.ts b/yoga-cms/config/middlewares.ts similarity index 100% rename from strapi-yoga/config/middlewares.ts rename to yoga-cms/config/middlewares.ts diff --git a/strapi-yoga/config/plugins.ts b/yoga-cms/config/plugins.ts similarity index 100% rename from strapi-yoga/config/plugins.ts rename to yoga-cms/config/plugins.ts diff --git a/strapi-yoga/config/server.ts b/yoga-cms/config/server.ts similarity index 100% rename from strapi-yoga/config/server.ts rename to yoga-cms/config/server.ts diff --git a/strapi-yoga/data/data.json b/yoga-cms/data/data.json similarity index 100% rename from strapi-yoga/data/data.json rename to yoga-cms/data/data.json diff --git a/strapi-yoga/data/uploads/a-bug-is-becoming-a-meme-on-the-internet.jpg b/yoga-cms/data/uploads/a-bug-is-becoming-a-meme-on-the-internet.jpg similarity index 100% rename from strapi-yoga/data/uploads/a-bug-is-becoming-a-meme-on-the-internet.jpg rename to yoga-cms/data/uploads/a-bug-is-becoming-a-meme-on-the-internet.jpg diff --git a/strapi-yoga/data/uploads/beautiful-picture.jpg b/yoga-cms/data/uploads/beautiful-picture.jpg similarity index 100% rename from strapi-yoga/data/uploads/beautiful-picture.jpg rename to yoga-cms/data/uploads/beautiful-picture.jpg diff --git a/strapi-yoga/data/uploads/coffee-art.jpg b/yoga-cms/data/uploads/coffee-art.jpg similarity index 100% rename from strapi-yoga/data/uploads/coffee-art.jpg rename to yoga-cms/data/uploads/coffee-art.jpg diff --git a/strapi-yoga/data/uploads/coffee-beans.jpg b/yoga-cms/data/uploads/coffee-beans.jpg similarity index 100% rename from strapi-yoga/data/uploads/coffee-beans.jpg rename to yoga-cms/data/uploads/coffee-beans.jpg diff --git a/strapi-yoga/data/uploads/coffee-shadow.jpg b/yoga-cms/data/uploads/coffee-shadow.jpg similarity index 100% rename from strapi-yoga/data/uploads/coffee-shadow.jpg rename to yoga-cms/data/uploads/coffee-shadow.jpg diff --git a/strapi-yoga/data/uploads/daviddoe@strapi.io.jpg b/yoga-cms/data/uploads/daviddoe@strapi.io.jpg similarity index 100% rename from strapi-yoga/data/uploads/daviddoe@strapi.io.jpg rename to yoga-cms/data/uploads/daviddoe@strapi.io.jpg diff --git a/strapi-yoga/data/uploads/default-image.png b/yoga-cms/data/uploads/default-image.png similarity index 100% rename from strapi-yoga/data/uploads/default-image.png rename to yoga-cms/data/uploads/default-image.png diff --git a/strapi-yoga/data/uploads/favicon.png b/yoga-cms/data/uploads/favicon.png similarity index 100% rename from strapi-yoga/data/uploads/favicon.png rename to yoga-cms/data/uploads/favicon.png diff --git a/strapi-yoga/data/uploads/sarahbaker@strapi.io.jpg b/yoga-cms/data/uploads/sarahbaker@strapi.io.jpg similarity index 100% rename from strapi-yoga/data/uploads/sarahbaker@strapi.io.jpg rename to yoga-cms/data/uploads/sarahbaker@strapi.io.jpg diff --git a/strapi-yoga/data/uploads/the-internet-s-own-boy.jpg b/yoga-cms/data/uploads/the-internet-s-own-boy.jpg similarity index 100% rename from strapi-yoga/data/uploads/the-internet-s-own-boy.jpg rename to yoga-cms/data/uploads/the-internet-s-own-boy.jpg diff --git a/strapi-yoga/data/uploads/this-shrimp-is-awesome.jpg b/yoga-cms/data/uploads/this-shrimp-is-awesome.jpg similarity index 100% rename from strapi-yoga/data/uploads/this-shrimp-is-awesome.jpg rename to yoga-cms/data/uploads/this-shrimp-is-awesome.jpg diff --git a/strapi-yoga/data/uploads/we-love-pizza.jpg b/yoga-cms/data/uploads/we-love-pizza.jpg similarity index 100% rename from strapi-yoga/data/uploads/we-love-pizza.jpg rename to yoga-cms/data/uploads/we-love-pizza.jpg diff --git a/strapi-yoga/data/uploads/what-s-inside-a-black-hole.jpg b/yoga-cms/data/uploads/what-s-inside-a-black-hole.jpg similarity index 100% rename from strapi-yoga/data/uploads/what-s-inside-a-black-hole.jpg rename to yoga-cms/data/uploads/what-s-inside-a-black-hole.jpg diff --git a/strapi-yoga/database/migrations/.gitkeep b/yoga-cms/database/migrations/.gitkeep similarity index 100% rename from strapi-yoga/database/migrations/.gitkeep rename to yoga-cms/database/migrations/.gitkeep diff --git a/strapi-yoga/favicon.png b/yoga-cms/favicon.png similarity index 100% rename from strapi-yoga/favicon.png rename to yoga-cms/favicon.png diff --git a/strapi-yoga/package-lock.json b/yoga-cms/package-lock.json similarity index 99% rename from strapi-yoga/package-lock.json rename to yoga-cms/package-lock.json index 93f664e..668835e 100644 --- a/strapi-yoga/package-lock.json +++ b/yoga-cms/package-lock.json @@ -1,11 +1,11 @@ { - "name": "strapi-yoga", + "name": "yoga-cms", "version": "0.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "strapi-yoga", + "name": "yoga-cms", "version": "0.1.0", "dependencies": { "@strapi/plugin-cloud": "5.6.0", diff --git a/strapi-yoga/package.json b/yoga-cms/package.json similarity index 97% rename from strapi-yoga/package.json rename to yoga-cms/package.json index 59ad64b..223466e 100644 --- a/strapi-yoga/package.json +++ b/yoga-cms/package.json @@ -1,5 +1,5 @@ { - "name": "strapi-yoga", + "name": "yoga-cms", "version": "0.1.0", "private": true, "description": "A Strapi application", diff --git a/strapi-yoga/public/robots.txt b/yoga-cms/public/robots.txt similarity index 100% rename from strapi-yoga/public/robots.txt rename to yoga-cms/public/robots.txt diff --git a/strapi-yoga/public/uploads/.gitkeep b/yoga-cms/public/uploads/.gitkeep similarity index 100% rename from strapi-yoga/public/uploads/.gitkeep rename to yoga-cms/public/uploads/.gitkeep diff --git a/strapi-yoga/scripts/seed.js b/yoga-cms/scripts/seed.js similarity index 100% rename from strapi-yoga/scripts/seed.js rename to yoga-cms/scripts/seed.js diff --git a/strapi-yoga/src/admin/app.example.tsx b/yoga-cms/src/admin/app.example.tsx similarity index 100% rename from strapi-yoga/src/admin/app.example.tsx rename to yoga-cms/src/admin/app.example.tsx diff --git a/strapi-yoga/src/admin/tsconfig.json b/yoga-cms/src/admin/tsconfig.json similarity index 100% rename from strapi-yoga/src/admin/tsconfig.json rename to yoga-cms/src/admin/tsconfig.json diff --git a/strapi-yoga/src/admin/vite.config.example.ts b/yoga-cms/src/admin/vite.config.example.ts similarity index 100% rename from strapi-yoga/src/admin/vite.config.example.ts rename to yoga-cms/src/admin/vite.config.example.ts diff --git a/strapi-yoga/src/api/.gitkeep b/yoga-cms/src/api/.gitkeep similarity index 100% rename from strapi-yoga/src/api/.gitkeep rename to yoga-cms/src/api/.gitkeep diff --git a/strapi-yoga/src/api/about/content-types/about/schema.json b/yoga-cms/src/api/about/content-types/about/schema.json similarity index 100% rename from strapi-yoga/src/api/about/content-types/about/schema.json rename to yoga-cms/src/api/about/content-types/about/schema.json diff --git a/strapi-yoga/src/api/about/controllers/about.ts b/yoga-cms/src/api/about/controllers/about.ts similarity index 100% rename from strapi-yoga/src/api/about/controllers/about.ts rename to yoga-cms/src/api/about/controllers/about.ts diff --git a/strapi-yoga/src/api/about/routes/about.ts b/yoga-cms/src/api/about/routes/about.ts similarity index 100% rename from strapi-yoga/src/api/about/routes/about.ts rename to yoga-cms/src/api/about/routes/about.ts diff --git a/strapi-yoga/src/api/about/services/about.ts b/yoga-cms/src/api/about/services/about.ts similarity index 100% rename from strapi-yoga/src/api/about/services/about.ts rename to yoga-cms/src/api/about/services/about.ts diff --git a/strapi-yoga/src/api/article/content-types/article/schema.json b/yoga-cms/src/api/article/content-types/article/schema.json similarity index 100% rename from strapi-yoga/src/api/article/content-types/article/schema.json rename to yoga-cms/src/api/article/content-types/article/schema.json diff --git a/strapi-yoga/src/api/article/controllers/article.ts b/yoga-cms/src/api/article/controllers/article.ts similarity index 100% rename from strapi-yoga/src/api/article/controllers/article.ts rename to yoga-cms/src/api/article/controllers/article.ts diff --git a/strapi-yoga/src/api/article/routes/article.ts b/yoga-cms/src/api/article/routes/article.ts similarity index 100% rename from strapi-yoga/src/api/article/routes/article.ts rename to yoga-cms/src/api/article/routes/article.ts diff --git a/strapi-yoga/src/api/article/services/article.ts b/yoga-cms/src/api/article/services/article.ts similarity index 100% rename from strapi-yoga/src/api/article/services/article.ts rename to yoga-cms/src/api/article/services/article.ts diff --git a/strapi-yoga/src/api/author/content-types/author/schema.json b/yoga-cms/src/api/author/content-types/author/schema.json similarity index 100% rename from strapi-yoga/src/api/author/content-types/author/schema.json rename to yoga-cms/src/api/author/content-types/author/schema.json diff --git a/strapi-yoga/src/api/author/controllers/author.ts b/yoga-cms/src/api/author/controllers/author.ts similarity index 100% rename from strapi-yoga/src/api/author/controllers/author.ts rename to yoga-cms/src/api/author/controllers/author.ts diff --git a/strapi-yoga/src/api/author/routes/author.ts b/yoga-cms/src/api/author/routes/author.ts similarity index 100% rename from strapi-yoga/src/api/author/routes/author.ts rename to yoga-cms/src/api/author/routes/author.ts diff --git a/strapi-yoga/src/api/author/services/author.ts b/yoga-cms/src/api/author/services/author.ts similarity index 100% rename from strapi-yoga/src/api/author/services/author.ts rename to yoga-cms/src/api/author/services/author.ts diff --git a/strapi-yoga/src/api/car/content-types/car/schema.json b/yoga-cms/src/api/car/content-types/car/schema.json similarity index 100% rename from strapi-yoga/src/api/car/content-types/car/schema.json rename to yoga-cms/src/api/car/content-types/car/schema.json diff --git a/strapi-yoga/src/api/car/controllers/car.ts b/yoga-cms/src/api/car/controllers/car.ts similarity index 100% rename from strapi-yoga/src/api/car/controllers/car.ts rename to yoga-cms/src/api/car/controllers/car.ts diff --git a/strapi-yoga/src/api/car/routes/car.ts b/yoga-cms/src/api/car/routes/car.ts similarity index 100% rename from strapi-yoga/src/api/car/routes/car.ts rename to yoga-cms/src/api/car/routes/car.ts diff --git a/strapi-yoga/src/api/car/services/car.ts b/yoga-cms/src/api/car/services/car.ts similarity index 100% rename from strapi-yoga/src/api/car/services/car.ts rename to yoga-cms/src/api/car/services/car.ts diff --git a/strapi-yoga/src/api/category/content-types/category/schema.json b/yoga-cms/src/api/category/content-types/category/schema.json similarity index 100% rename from strapi-yoga/src/api/category/content-types/category/schema.json rename to yoga-cms/src/api/category/content-types/category/schema.json diff --git a/strapi-yoga/src/api/category/controllers/category.ts b/yoga-cms/src/api/category/controllers/category.ts similarity index 100% rename from strapi-yoga/src/api/category/controllers/category.ts rename to yoga-cms/src/api/category/controllers/category.ts diff --git a/strapi-yoga/src/api/category/routes/category.ts b/yoga-cms/src/api/category/routes/category.ts similarity index 100% rename from strapi-yoga/src/api/category/routes/category.ts rename to yoga-cms/src/api/category/routes/category.ts diff --git a/strapi-yoga/src/api/category/services/category.ts b/yoga-cms/src/api/category/services/category.ts similarity index 100% rename from strapi-yoga/src/api/category/services/category.ts rename to yoga-cms/src/api/category/services/category.ts diff --git a/strapi-yoga/src/api/global/content-types/global/schema.json b/yoga-cms/src/api/global/content-types/global/schema.json similarity index 100% rename from strapi-yoga/src/api/global/content-types/global/schema.json rename to yoga-cms/src/api/global/content-types/global/schema.json diff --git a/strapi-yoga/src/api/global/controllers/global.ts b/yoga-cms/src/api/global/controllers/global.ts similarity index 100% rename from strapi-yoga/src/api/global/controllers/global.ts rename to yoga-cms/src/api/global/controllers/global.ts diff --git a/strapi-yoga/src/api/global/routes/global.ts b/yoga-cms/src/api/global/routes/global.ts similarity index 100% rename from strapi-yoga/src/api/global/routes/global.ts rename to yoga-cms/src/api/global/routes/global.ts diff --git a/strapi-yoga/src/api/global/services/global.ts b/yoga-cms/src/api/global/services/global.ts similarity index 100% rename from strapi-yoga/src/api/global/services/global.ts rename to yoga-cms/src/api/global/services/global.ts diff --git a/strapi-yoga/src/api/page/content-types/page/schema.json b/yoga-cms/src/api/page/content-types/page/schema.json similarity index 100% rename from strapi-yoga/src/api/page/content-types/page/schema.json rename to yoga-cms/src/api/page/content-types/page/schema.json diff --git a/strapi-yoga/src/api/page/controllers/page.ts b/yoga-cms/src/api/page/controllers/page.ts similarity index 100% rename from strapi-yoga/src/api/page/controllers/page.ts rename to yoga-cms/src/api/page/controllers/page.ts diff --git a/strapi-yoga/src/api/page/routes/page.ts b/yoga-cms/src/api/page/routes/page.ts similarity index 100% rename from strapi-yoga/src/api/page/routes/page.ts rename to yoga-cms/src/api/page/routes/page.ts diff --git a/strapi-yoga/src/api/page/services/page.ts b/yoga-cms/src/api/page/services/page.ts similarity index 100% rename from strapi-yoga/src/api/page/services/page.ts rename to yoga-cms/src/api/page/services/page.ts diff --git a/strapi-yoga/src/api/person/content-types/person/schema.json b/yoga-cms/src/api/person/content-types/person/schema.json similarity index 100% rename from strapi-yoga/src/api/person/content-types/person/schema.json rename to yoga-cms/src/api/person/content-types/person/schema.json diff --git a/strapi-yoga/src/api/person/controllers/person.ts b/yoga-cms/src/api/person/controllers/person.ts similarity index 100% rename from strapi-yoga/src/api/person/controllers/person.ts rename to yoga-cms/src/api/person/controllers/person.ts diff --git a/strapi-yoga/src/api/person/routes/person.ts b/yoga-cms/src/api/person/routes/person.ts similarity index 100% rename from strapi-yoga/src/api/person/routes/person.ts rename to yoga-cms/src/api/person/routes/person.ts diff --git a/strapi-yoga/src/api/person/services/person.ts b/yoga-cms/src/api/person/services/person.ts similarity index 100% rename from strapi-yoga/src/api/person/services/person.ts rename to yoga-cms/src/api/person/services/person.ts diff --git a/strapi-yoga/src/components/shared/media.json b/yoga-cms/src/components/shared/media.json similarity index 100% rename from strapi-yoga/src/components/shared/media.json rename to yoga-cms/src/components/shared/media.json diff --git a/strapi-yoga/src/components/shared/my-component.json b/yoga-cms/src/components/shared/my-component.json similarity index 100% rename from strapi-yoga/src/components/shared/my-component.json rename to yoga-cms/src/components/shared/my-component.json diff --git a/strapi-yoga/src/components/shared/quote.json b/yoga-cms/src/components/shared/quote.json similarity index 100% rename from strapi-yoga/src/components/shared/quote.json rename to yoga-cms/src/components/shared/quote.json diff --git a/strapi-yoga/src/components/shared/rich-text.json b/yoga-cms/src/components/shared/rich-text.json similarity index 100% rename from strapi-yoga/src/components/shared/rich-text.json rename to yoga-cms/src/components/shared/rich-text.json diff --git a/strapi-yoga/src/components/shared/seo.json b/yoga-cms/src/components/shared/seo.json similarity index 100% rename from strapi-yoga/src/components/shared/seo.json rename to yoga-cms/src/components/shared/seo.json diff --git a/strapi-yoga/src/components/shared/slider.json b/yoga-cms/src/components/shared/slider.json similarity index 100% rename from strapi-yoga/src/components/shared/slider.json rename to yoga-cms/src/components/shared/slider.json diff --git a/strapi-yoga/src/extensions/.gitkeep b/yoga-cms/src/extensions/.gitkeep similarity index 100% rename from strapi-yoga/src/extensions/.gitkeep rename to yoga-cms/src/extensions/.gitkeep diff --git a/strapi-yoga/src/index.ts b/yoga-cms/src/index.ts similarity index 100% rename from strapi-yoga/src/index.ts rename to yoga-cms/src/index.ts diff --git a/strapi-yoga/tsconfig.json b/yoga-cms/tsconfig.json similarity index 100% rename from strapi-yoga/tsconfig.json rename to yoga-cms/tsconfig.json diff --git a/strapi-yoga/types/generated/components.d.ts b/yoga-cms/types/generated/components.d.ts similarity index 100% rename from strapi-yoga/types/generated/components.d.ts rename to yoga-cms/types/generated/components.d.ts diff --git a/strapi-yoga/types/generated/contentTypes.d.ts b/yoga-cms/types/generated/contentTypes.d.ts similarity index 100% rename from strapi-yoga/types/generated/contentTypes.d.ts rename to yoga-cms/types/generated/contentTypes.d.ts