diff --git a/.github/workflows/deploy-prod.yaml b/.github/workflows/deploy-prod.yaml index 4ec2b23..65aeb20 100644 --- a/.github/workflows/deploy-prod.yaml +++ b/.github/workflows/deploy-prod.yaml @@ -22,7 +22,7 @@ jobs: - uses: superfly/flyctl-actions/setup-flyctl@master - name: Fly Deploy working-directory: ./next - run: flyctl deploy --remote-only --config fly.production.toml --dockerfile Dockerfile + run: flyctl deploy --remote-only --config fly.production.toml --dockerfile Dockerfile --build-arg STRAPI_KEY=${{ secrets.PRODUCTION_STRAPI_KEY }} --build-arg STRAPI_URL=https://younite-strapi.fly.dev env: FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN_FRONTEND }} deploy-storage: diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml index 06d8e0c..26a4025 100644 --- a/.github/workflows/deploy-staging.yaml +++ b/.github/workflows/deploy-staging.yaml @@ -26,7 +26,7 @@ jobs: - uses: superfly/flyctl-actions/setup-flyctl@master - name: Fly Deploy working-directory: ./next - run: flyctl deploy --remote-only --config fly.staging.toml --dockerfile Dockerfile + run: flyctl deploy --remote-only --config fly.staging.toml --dockerfile Dockerfile --build-arg STRAPI_KEY=${{ secrets.STAGING_STRAPI_KEY }} --build-arg STRAPI_URL=https://younite-strapi-staging.fly.dev env: FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN_FRONTEND_STAGING }} deploy-storage: diff --git a/.gitignore b/.gitignore index 9921559..c97c009 100644 --- a/.gitignore +++ b/.gitignore @@ -110,7 +110,7 @@ # Logs and databases ############################ -# /strapi/.tmp # Dev only: allow shared database +/strapi/.tmp /strapi/*.log /strapi/*.sql /strapi/*.sqlite @@ -125,7 +125,7 @@ /strapi/ssl /strapi/.idea /strapi/nbproject -# /strapi/public/uploads/* # Dev only: allow shared images +/strapi/public/uploads/* !/strapi/public/uploads/.gitkeep ############################ diff --git a/next/.dockerignore b/next/.dockerignore index b69106b..0b5d6dd 100644 --- a/next/.dockerignore +++ b/next/.dockerignore @@ -2,3 +2,4 @@ dist node_modules .env +.next diff --git a/next/Dockerfile b/next/Dockerfile index de72e5e..3a98ec8 100644 --- a/next/Dockerfile +++ b/next/Dockerfile @@ -9,9 +9,6 @@ LABEL fly_launch_runtime="Next.js" # Next.js app lives here WORKDIR /app -# Set production environment -ENV NODE_ENV="production" - # Install pnpm # ARG PNPM_VERSION=8.3.1 # RUN npm install -g pnpm@$PNPM_VERSION @@ -32,6 +29,12 @@ RUN npm install COPY --link . . # Build application +ARG STRAPI_KEY +ARG STRAPI_URL +ENV STRAPI_KEY=${STRAPI_KEY} +ENV STRAPI_URL=${STRAPI_URL} +ENV NODE_ENV="production" + RUN npm run build # Remove development dependencies diff --git a/next/app/about/page.tsx b/next/app/about/page.tsx index 19c07d0..dbb7a80 100644 --- a/next/app/about/page.tsx +++ b/next/app/about/page.tsx @@ -21,15 +21,15 @@ export default async function AboutPage() { <>
-

+

Our Values

{data.Subtitle}

Click Below!

-
+
{data.Values.map((value, i) => (
-

+

{value.Name}

{value.ValueDescription}

@@ -45,7 +45,7 @@ export default async function AboutPage() {
-

+

Our History

diff --git a/next/app/about/styles.module.css b/next/app/about/styles.module.css index 6c3f7b7..ca6764a 100644 --- a/next/app/about/styles.module.css +++ b/next/app/about/styles.module.css @@ -1,3 +1,43 @@ +@media (width >= 500px) { + .valueCard { + position: relative; + border-radius: 0.8125rem; + border: 2px solid #000; + box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); + padding: 2rem; + aspect-ratio: 1; + } + + .valueCard:nth-of-type(1) { + background: linear-gradient(180deg, #faab36 45.83%, #ffc9c9 100%); + transform: rotate(-3.259deg); + z-index: 2; + } + + .valueCard:nth-of-type(2) { + background: linear-gradient( + 180deg, + #6cc3e5 0%, + #75c5e2 59.9%, + #ffdead 100% + ); + transform: rotate(3.414deg) translateY(1.5rem); + z-index: 1; + } + + .valueCard:nth-of-type(3) { + background: linear-gradient(180deg, #c8f2ff 0%, #ffc062 68.75%); + transform: rotate(-1.517deg) translateY(6rem) translateX(-1.5rem); + } + + .valueCard:nth-of-type(4) { + background: linear-gradient(0deg, #ace8ff 0%, #ace8ff 100%); + transform: rotate(-9.745deg) translateY(-1rem) translateX(-2rem); + grid-column-start: 2; + z-index: 2; + } +} + .valueCard { position: relative; border-radius: 0.8125rem; @@ -15,18 +55,18 @@ .valueCard:nth-of-type(2) { background: linear-gradient(180deg, #6cc3e5 0%, #75c5e2 59.9%, #ffdead 100%); - transform: rotate(3.414deg) translateY(1.5rem); + transform: rotate(3.414deg); z-index: 1; } .valueCard:nth-of-type(3) { background: linear-gradient(180deg, #c8f2ff 0%, #ffc062 68.75%); - transform: rotate(-1.517deg) translateY(6rem) translateX(-1.5rem); + transform: rotate(-1.517deg); } .valueCard:nth-of-type(4) { background: linear-gradient(0deg, #ace8ff 0%, #ace8ff 100%); - transform: rotate(-9.745deg) translateY(-2rem) translateX(-2rem); + transform: rotate(-6deg); grid-column-start: 2; z-index: 2; } diff --git a/next/app/layout.tsx b/next/app/layout.tsx index 4de7dcb..5bda8f9 100644 --- a/next/app/layout.tsx +++ b/next/app/layout.tsx @@ -10,7 +10,7 @@ export const metadata = { }, }; -export default function RootLayout({ +export default async function RootLayout({ children, }: { children: React.ReactNode; @@ -18,8 +18,11 @@ export default function RootLayout({ return ( + {/* @ts-ignore */}
-
{children}
+
+ {children} +