diff --git a/.gitea/workflows/builder.yaml b/.gitea/workflows/builder.yaml new file mode 100644 index 0000000..7ff7a51 --- /dev/null +++ b/.gitea/workflows/builder.yaml @@ -0,0 +1,68 @@ +name: CodyOps Core Builder + +on: + pull_request: + branches: + - main + +jobs: + build-conteiner: + runs-on: fedora-latest + env: + ASTRO_DIRECTUS_API: ${{ secrets.ASTRO_DIRECTUS_API }} + ASTRO_DIRECTUS_TOKEN: ${{ secrets.ASTRO_DIRECTUS_TOKEN }} + ASTRO_ASSETS: ${{ vars.ASTRO_ASSETS }} + ASTRO_CURRENCY_AR: ${{ vars.ASTRO_CURRENCY_AR }} + ASTRO_SITE_AR: ${{ vars.ASTRO_SITE_AR }} + ASTRO_GTM_AR: ${{ vars.ASTRO_GTM_AR }} + ASTRO_CURRENCY_BR: ${{ vars.ASTRO_CURRENCY_BR }} + ASTRO_SITE_BR: ${{ vars.ASTRO_SITE_BR }} + ASTRO_GTM_BR: ${{ vars.ASTRO_GTM_BR }} + ASTRO_CURRENCY_CL: ${{ vars.ASTRO_CURRENCY_CL }} + ASTRO_SITE_CL: ${{ vars.ASTRO_SITE_CL }} + ASTRO_GTM_CL: ${{ vars.ASTRO_GTM_CL }} + ASTRO_CURRENCY_CO: ${{ vars.ASTRO_CURRENCY_CO }} + ASTRO_SITE_CO: ${{ vars.ASTRO_SITE_CO }} + ASTRO_GTM_CO: ${{ vars.ASTRO_GTM_CO }} + ASTRO_CURRENCY_CR: ${{ vars.ASTRO_CURRENCY_CR }} + ASTRO_SITE_CR: ${{ vars.ASTRO_SITE_CR }} + ASTRO_GTM_CR: ${{ vars.ASTRO_GTM_CR }} + ASTRO_CURRENCY_DO: ${{ vars.ASTRO_CURRENCY_DO }} + ASTRO_SITE_DO: ${{ vars.ASTRO_SITE_DO }} + ASTRO_GTM_DO: ${{ vars.ASTRO_GTM_DO }} + ASTRO_CURRENCY_EC: ${{ vars.ASTRO_CURRENCY_EC }} + ASTRO_SITE_EC: ${{ vars.ASTRO_SITE_EC }} + ASTRO_GTM_EC: ${{ vars.ASTRO_GTM_EC }} + ASTRO_CURRENCY_ES: ${{ vars.ASTRO_CURRENCY_ES }} + ASTRO_SITE_ES: ${{ vars.ASTRO_SITE_ES }} + ASTRO_GTM_ES: ${{ vars.ASTRO_GTM_ES }} + ASTRO_CURRENCY_MX: ${{ vars.ASTRO_CURRENCY_MX }} + ASTRO_SITE_MX: ${{ vars.ASTRO_SITE_MX }} + ASTRO_GTM_MX: ${{ vars.ASTRO_GTM_MX }} + ASTRO_CURRENCY_PA: ${{ vars.ASTRO_CURRENCY_PA }} + ASTRO_SITE_PA: ${{ vars.ASTRO_SITE_PA }} + ASTRO_GTM_PA: ${{ vars.ASTRO_GTM_PA }} + ASTRO_CURRENCY_PE: ${{ vars.ASTRO_CURRENCY_PE }} + ASTRO_SITE_PE: ${{ vars.ASTRO_SITE_PE }} + ASTRO_GTM_PE: ${{ vars.ASTRO_GTM_PE }} + ASTRO_CURRENCY_PR: ${{ vars.ASTRO_CURRENCY_PR }} + ASTRO_SITE_PR: ${{ vars.ASTRO_SITE_PR }} + ASTRO_GTM_PR: ${{ vars.ASTRO_GTM_PR }} + ASTRO_CURRENCY_PY: ${{ vars.ASTRO_CURRENCY_PY }} + ASTRO_SITE_PY: ${{ vars.ASTRO_SITE_PY }} + ASTRO_GTM_PY: ${{ vars.ASTRO_GTM_PY }} + ASTRO_CURRENCY_SV: ${{ vars.ASTRO_CURRENCY_SV }} + ASTRO_SITE_SV: ${{ vars.ASTRO_SITE_SV }} + ASTRO_GTM_SV: ${{ vars.ASTRO_GTM_SV }} + ASTRO_CURRENCY_US: ${{ vars.ASTRO_CURRENCY_US }} + ASTRO_SITE_US: ${{ vars.ASTRO_SITE_US }} + ASTRO_GTM_US: ${{ vars.ASTRO_GTM_US }} + ASTRO_CURRENCY_UY: ${{ vars.ASTRO_CURRENCY_UY }} + ASTRO_SITE_UY: ${{ vars.ASTRO_SITE_UY }} + ASTRO_GTM_UY: ${{ vars.ASTRO_GTM_UY }} + steps: + - name: Check out repository code + uses: actions/checkout@v4 + - name: Make Build + run: make build + \ No newline at end of file diff --git a/.gitignore b/.gitignore index 15fd730..75f7637 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,7 @@ pnpm-debug.log* # environment variables .env -.env.production +.envrc # macOS-specific files .DS_Store diff --git a/Dockerfile b/Dockerfile index f7cde77..32cc3d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM nginxinc/nginx-unprivileged:alpine +FROM docker.io/nginxinc/nginx-unprivileged:alpine COPY dist /usr/share/nginx/html \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..2fb9873 --- /dev/null +++ b/Makefile @@ -0,0 +1,23 @@ +REGISTRY:= gianet.us/codyops +IMAGE:= core +COUNTRIES:= ar br cl co cr do ec es mx pa pe pr py sv us uy + +.PHONY: init build setup $(addprefix step-,$(COUNTRIES)) + +init: + direnv allow . + +setup: + npm install + +build: setup $(addprefix step-,$(COUNTRIES)) + +$(addprefix step-,$(COUNTRIES)): + @echo "Ejecutando step para el paĆ­s: $(shell echo $(patsubst step-%,%,$@) | tr '[:lower:]' '[:upper:]')" + export ASTRO_COUNTRY=$(shell echo $(patsubst step-%,%,$@) | tr '[:lower:]' '[:upper:]') && \ + export ASTRO_CURRENCY=${ASTRO_CURRENCY_$(shell echo $(patsubst step-%,%,$@) | tr '[:lower:]' '[:upper:]')} && \ + export ASTRO_SITE=${ASTRO_SITE_$(shell echo $(patsubst step-%,%,$@) | tr '[:lower:]' '[:upper:]')} && \ + export ASTRO_GTM=${ASTRO_GTM_$(shell echo $(patsubst step-%,%,$@) | tr '[:lower:]' '[:upper:]')} && \ + npx astro build --force + podman build --pull=newer --tag $(REGISTRY)/$(IMAGE):$(patsubst step-%,%,$@) . + podman push $(REGISTRY)/$(IMAGE):$(patsubst step-%,%,$@) diff --git a/astro.config.mjs b/astro.config.mjs index 35dc132..a62c078 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -2,7 +2,6 @@ import { defineConfig } from 'astro/config'; import markdownIntegration from '@astropub/md' import sitemap from '@astrojs/sitemap'; import mdx from '@astrojs/mdx'; -import 'dotenv/config'; export default defineConfig({ diff --git a/package-lock.json b/package-lock.json index dac1955..1457ff3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,9 +18,7 @@ "bootstrap": "^5.1.3", "bootstrap-icons": "^1.10.3", "chart.js": "^2.9.4", - "dotenv": "^16.4.7", - "marked": "^7.0.5", - "swiper": "^7.3.1" + "marked": "^7.0.5" }, "devDependencies": { "@types/marked": "^4.3.2", @@ -2469,26 +2467,6 @@ "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", "license": "MIT" }, - "node_modules/dom7": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.6.tgz", - "integrity": "sha512-emjdpPLhpNubapLFdjNL9tP06Sr+GZkrIHEXLWvOGsytACUrkbeIdjO5g77m00BrHTznnlcNqgmn7pCN192TBA==", - "dependencies": { - "ssr-window": "^4.0.0" - } - }, - "node_modules/dotenv": { - "version": "16.4.7", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", - "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==", - "license": "BSD-2-Clause", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://dotenvx.com" - } - }, "node_modules/dset": { "version": "3.1.4", "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.4.tgz", @@ -5927,11 +5905,6 @@ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" }, - "node_modules/ssr-window": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.2.tgz", - "integrity": "sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==" - }, "node_modules/stream-replace-string": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/stream-replace-string/-/stream-replace-string-2.0.0.tgz", @@ -6026,29 +5999,6 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/swiper": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.4.1.tgz", - "integrity": "sha512-dhbL4tpYFvHug1J7GnKElfTi6EYhlZy/vNZRhHkWFyUsWZ1Vovipxj3la5gqllMogygXJMe3zvVv+f6eppvWiA==", - "funding": [ - { - "type": "patreon", - "url": "https://www.patreon.com/swiperjs" - }, - { - "type": "open_collective", - "url": "http://opencollective.com/swiper" - } - ], - "hasInstallScript": true, - "dependencies": { - "dom7": "^4.0.2", - "ssr-window": "^4.0.2" - }, - "engines": { - "node": ">= 4.7.0" - } - }, "node_modules/sync-child-process": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/sync-child-process/-/sync-child-process-1.0.2.tgz", diff --git a/package.json b/package.json index 5907fd2..ef91c9e 100644 --- a/package.json +++ b/package.json @@ -20,9 +20,7 @@ "bootstrap": "^5.1.3", "bootstrap-icons": "^1.10.3", "chart.js": "^2.9.4", - "dotenv": "^16.4.7", - "marked": "^7.0.5", - "swiper": "^7.3.1" + "marked": "^7.0.5" }, "devDependencies": { "@types/marked": "^4.3.2", diff --git a/src/components/course/course-accordion-list.astro b/src/components/course/course-accordion-list.astro index c6c5fb9..863da66 100644 --- a/src/components/course/course-accordion-list.astro +++ b/src/components/course/course-accordion-list.astro @@ -65,7 +65,7 @@ const totalCourseDuration = sumTimes(courseDurations); controls preload="auto" class="object-fit-fill"> - + diff --git a/src/components/course/course-card-aside.astro b/src/components/course/course-card-aside.astro index 0380635..af3695a 100644 --- a/src/components/course/course-card-aside.astro +++ b/src/components/course/course-card-aside.astro @@ -5,7 +5,6 @@ import MasterCard from '../../assets/svg/mastercard.svg'; import Visa from '../../assets/svg/visa.svg'; import GPay from '../../assets/svg/gpay.svg'; import APay from '../../assets/svg/apple-pay.svg'; -import 'dotenv/config'; import { getPrices } from '../../libs/campaigns';