Fix dockerfile + polish landing copy

This commit is contained in:
Julien Nahum 2023-09-09 13:10:49 +02:00
parent 6e48cf6d4c
commit 7ab9cfaca7
4 changed files with 13 additions and 13 deletions

View File

@ -1,6 +1,6 @@
ARG PHP_PACKAGES="php8.2 composer php8.2-common php8.2-pgsql php8.2-redis php8.2-mbstring\ ARG PHP_PACKAGES="php8.1 composer php8.1-common php8.1-pgsql php8.1-redis php8.1-mbstring\
php8.2-simplexml php8.2-bcmath php8.2-gd php8.2-curl php8.2-zip\ php8.1-simplexml php8.1-bcmath php8.1-gd php8.1-curl php8.1-zip\
php8.2-imagick php8.2-bz2 php8.2-gmp php8.2-int php8.2-pcov php8.2-soap php8.2-xsl" php8.1-imagick php8.1-bz2 php8.1-gmp php8.1-int php8.1-pcov php8.1-soap php8.1-xsl"
FROM node:16 AS javascript-builder FROM node:16 AS javascript-builder
WORKDIR /app WORKDIR /app
@ -33,7 +33,7 @@ ADD composer.json composer.lock artisan ./
# post-autoload command from the composer file if we want to run composer without # post-autoload command from the composer file if we want to run composer without
# adding a dependency to all the php files. # adding a dependency to all the php files.
RUN sed 's_@php artisan package:discover_/bin/true_;' -i composer.json RUN sed 's_@php artisan package:discover_/bin/true_;' -i composer.json
RUN composer install RUN composer install --ignore-platform-req=php
ADD app /app/app ADD app /app/app
ADD bootstrap /app/bootstrap ADD bootstrap /app/bootstrap
@ -61,11 +61,11 @@ ARG PHP_PACKAGES
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y \ && apt-get install -y \
supervisor nginx sudo postgresql-15 redis\ supervisor nginx sudo postgresql-15 redis\
$PHP_PACKAGES php8.2-fpm\ $PHP_PACKAGES php8.1-fpm\
&& apt-get clean && apt-get clean
ADD docker/postgres-wrapper.sh docker/php-fpm-wrapper.sh docker/redis-wrapper.sh /usr/local/bin/ ADD docker/postgres-wrapper.sh docker/php-fpm-wrapper.sh docker/redis-wrapper.sh /usr/local/bin/
ADD docker/php-fpm.conf /etc/php/8.2/fpm/pool.d/ ADD docker/php-fpm.conf /etc/php/8.1/fpm/pool.d/
ADD docker/nginx.conf /etc/nginx/sites-enabled/default ADD docker/nginx.conf /etc/nginx/sites-enabled/default
ADD docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf ADD docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
ADD .env.docker .env ADD .env.docker .env

View File

@ -13,14 +13,14 @@
<workspace-dropdown class="ml-6"/> <workspace-dropdown class="ml-6"/>
</div> </div>
<div class="hidden md:block ml-auto relative"> <div class="hidden md:block ml-auto relative">
<router-link :to="{name:'aiformbuilder'}" v-if="$route.name !== 'aiformbuilder'"
class="text-sm text-gray-600 dark:text-white hidden lg:inline hover:text-gray-800 cursor-pointer mt-1 mr-8">
AI Form Builder
</router-link>
<router-link :to="{name:'templates'}" v-if="$route.name !== 'templates'" <router-link :to="{name:'templates'}" v-if="$route.name !== 'templates'"
class="text-sm text-gray-600 dark:text-white hover:text-gray-800 cursor-pointer mt-1 mr-8"> class="text-sm text-gray-600 dark:text-white hover:text-gray-800 cursor-pointer mt-1 mr-8">
Templates Templates
</router-link> </router-link>
<router-link :to="{name:'aiformbuilder'}" v-if="$route.name !== 'aiformbuilder'"
class="text-sm text-gray-600 dark:text-white hidden lg:inline hover:text-gray-800 cursor-pointer mt-1 mr-8">
AI Form Builder
</router-link>
<router-link :to="{name:'pricing'}" v-if="paidPlansEnabled && (user===null || (user && workspace && !workspace.is_pro)) && $route.name !== 'pricing'" <router-link :to="{name:'pricing'}" v-if="paidPlansEnabled && (user===null || (user && workspace && !workspace.is_pro)) && $route.name !== 'pricing'"
class="text-sm text-gray-600 dark:text-white hover:text-gray-800 cursor-pointer mt-1 mr-8"> class="text-sm text-gray-600 dark:text-white hover:text-gray-800 cursor-pointer mt-1 mr-8">
<span v-if="user">Upgrade</span> <span v-if="user">Upgrade</span>

View File

@ -5,7 +5,7 @@
<h2 <h2
class="mb-6 font-sans text-4xl font-semibold leading-none tracking-tight text-gray-900 dark:text-gray-100 sm:text-4xl md:mx-auto"> class="mb-6 font-sans text-4xl font-semibold leading-none tracking-tight text-gray-900 dark:text-gray-100 sm:text-4xl md:mx-auto">
The easiest way to create forms. <br/> The easiest way to create forms. <br/>
And it's <span class="text-nt-blue">100% free!</span> Generous unlimited <span class="text-nt-blue">free plan.</span>
</h2> </h2>
<p class="text-base text-gray-700 dark:text-gray-300 md:text-lg"> <p class="text-base text-gray-700 dark:text-gray-300 md:text-lg">
Need a contact form? Doing a survey? Create a form in 2 minutes and start receiving submissions. Need a contact form? Doing a survey? Create a form in 2 minutes and start receiving submissions.

View File

@ -12,8 +12,8 @@
<span class="bg-clip-text text-transparent bg-gradient-to-r from-blue-600 to-blue-400">form builder</span> <span class="bg-clip-text text-transparent bg-gradient-to-r from-blue-600 to-blue-400">form builder</span>
</h1> </h1>
<p class="mt-4 sm:mt-5 text-base leading-7 sm:text-xl sm:leading-9 font-medium text-gray-500"> <p class="mt-4 sm:mt-5 text-base leading-7 sm:text-xl sm:leading-9 font-medium text-gray-500">
Create beautiful forms and share them anywhere. It takes seconds, you don't need to know how to code Create beautiful forms and share them anywhere. It takes seconds, you don't need to know how to code. Get started
and <span class="font-bold">it's free</span> <span class="font-bold">for free</span>!
</p> </p>
<div class="mt-8 flex justify-center"> <div class="mt-8 flex justify-center">