Skip to content

Commit

Permalink
[FE][HOTFIX] Fix missconfigured docker SIT images (#226)
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicklas373 authored Sep 15, 2024
2 parents 9b734b1 + e7b992a commit dc4961a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
16 changes: 6 additions & 10 deletions Dockerfile/Dockerfile.hana-api-services.sit
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ LABEL description="Docker container for https://gw.hana-ci.com"
# Configure ARG
ARG DB_USERNAME
ARG DB_PASSWORD
ARG JWT_SHOW_BLACKLIST_EXCEPTION
ARG JWT_TTL

# Configure work directory
WORKDIR /var/www/html
Expand Down Expand Up @@ -75,17 +73,15 @@ RUN cd hanaci-api && php artisan config:cache
RUN cd hanaci-api && php artisan config:clear

# Configure Laravel Env
RUN cd hanaci-api && echo "JWT_SHOW_BLACKLIST_EXCEPTION=true" >> .env
RUN cd hanaci-api && echo "JWT_TTL=null" >> .env
RUN cd hanaci-api && echo "" >> .env
RUN cd hanaci-api && sed -i 's/APP_NAME=Laravel/APP_NAME="gw.hana-ci"/' .env
RUN cd hanaci-api && sed -i "s#APP_URL=http://localhost#APP_URL=http://sit.gw.hana-ci.com#" .env
RUN cd hanaci-api && sed -i "s/DB_CONNECTION=mysql/DB_CONNECTION=pgsql/" .env
RUN cd hanaci-api && sed -i "s/DB_HOST=127.0.0.1/DB_HOST=hana-db-services/" .env
RUN cd hanaci-api && sed -i "s/DB_PORT=3306/DB_PORT=5432/" .env
RUN cd hanaci-api && sed -i "s/DB_DATABASE=laravel/DB_DATABASE=postgres/" .env
RUN cd hanaci-api && sed -i "s/DB_USERNAME=root/DB_USERNAME=$DB_USERNAME/" .env
RUN cd hanaci-api && sed -i "s/DB_PASSWORD=/DB_PASSWORD=$DB_PASSWORD/" .env
RUN cd hanaci-api && sed -i "s/DB_CONNECTION=sqlite/DB_CONNECTION=pgsql/" .env
RUN cd hanaci-api && sed -i "s/# DB_HOST=127.0.0.1/DB_HOST=hana-db-services/" .env
RUN cd hanaci-api && sed -i "s/# DB_PORT=3306/DB_PORT=5432/" .env
RUN cd hanaci-api && sed -i "s/# DB_DATABASE=laravel/DB_DATABASE=postgres/" .env
RUN cd hanaci-api && sed -i "s/# DB_USERNAME=root/DB_USERNAME=$DB_USERNAME/" .env
RUN cd hanaci-api && sed -i "s/# DB_PASSWORD=/DB_PASSWORD=$DB_PASSWORD/" .env
RUN cd hanaci-api && echo "" >> .env
RUN cd hanaci-api && echo "ASPOSE_CLOUD_CLIENT_ID=xxxx" >> .env
RUN cd hanaci-api && echo "ASPOSE_CLOUD_TOKEN=xxxx" >> .env
Expand Down
2 changes: 1 addition & 1 deletion resources/views/pages/cnvToPDF.blade.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@extends('layouts.alternate-layout') @section('content')<div class="px-4 md:px-12" id="cnvToPDF"><section class="flex flex-wrap items-center justify-start sub-headline-viewport max-w-lg lg:max-w-6xl"><div class="text-start mx-6"><div class="font-magistral font-bold text-pc4 text-3xl lg:text-7xl mb-4 lg:mb-8">Convert</div><div class="font-quicksand font-light text-md lg:text-3xl text-lt1">Convert document or image files into PDF documents.</div></div></section><div class="flex flex-col p-2" id="dropzoneCnvToPDF"><form action="{{ url('api/v1/file/upload') }}" method="post" class="dropzone flex flex-col lg:flex-row xl:flex-row mx-4 items-center justify-center w-6/6 lg:w-4/6 min-h-96 h-fit lg:h-72 max-h-full lg:overflow-y-auto cursor-pointer bg-lt backdrop-filter backdrop-blur-md rounded-[40px] bg-opacity-15 mb-2" id="dropzoneAreaCnv">{{ csrf_field() }}<div class="flex flex-col items-center justify-content p-4" id="dropzoneUiInit"><img class="p-4 h-24 w-24" src="{{ asset('assets/icons/placeholder_pdf.svg') }}"><p class="mb-2 text-md text-lt3 font-quicksand font-medium">Drop PDF files here</p><p class="text-xs text-lt3 font-quicksand">Or</p><button type="button" id="dropzoneUploadInit" class="mx-auto mt-2 p-4 text-xs font-quicksand font-semibold bg-ac text-lt rounded-lg cursor-pointer w-42 h-12 text-center flex items-center justify-center"><svg class="w-6 h-6 text-lt1" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M2 12a10 10 0 1 1 20 0 10 10 0 0 1-20 0Zm11-4.2a1 1 0 1 0-2 0V11H7.8a1 1 0 1 0 0 2H11v3.2a1 1 0 1 0 2 0V13h3.2a1 1 0 1 0 0-2H13V7.8Z" clip-rule="evenodd"></path></svg><span class="ml-4">Choose File</span></button></div><div class="flex flex-col items-center justify-content hidden order-1 border-dashed border-2 border-lt1" id="dropzoneUiExt"><button type="button" id="dropzoneUploadExt" class="mx-auto p-4 bg-transparent text-lt1 rounded-lg cursor-pointer h-48 w-32 text-center flex items-center justify-center"><svg class="w-6 h-6 text-lt1" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M2 12a10 10 0 1 1 20 0 10 10 0 0 1-20 0Zm11-4.2a1 1 0 1 0-2 0V11H7.8a1 1 0 1 0 0 2H11v3.2a1 1 0 1 0 2 0V13h3.2a1 1 0 1 0 0-2H13V7.8Z" clip-rule="evenodd"></path></svg></button></div></form><div class="flex flex-col mx-4 mt-8 lg:w-3/6"><p class="block mb-2 font-quicksand text-xl font-bold text-pc4">Document Format</p><div dir="ltl"><button type="submit" id="submitBtn" name="formAction" class="mx-auto mt-2 lg:mt-4 mb-8 sm:mb-6 font-quicksand font-semibold bg-transparent border-2 border-lt backdrop-filter backdrop-blur-md rounded-lg bg-opacity-50 text-lt1 rounded-lg cursor-pointer w-full lg:w-4/6 h-10" data-ripple-light="true">Convert PDF</button></div><div class="flex flex-col">@include('includes.alert')</div></div></div>@stop</div>
@extends('layouts.alternate-layout') @section('content')<div class="px-4 md:px-12" id="cnvToPDF"><section class="flex flex-wrap items-center justify-start sub-headline-viewport max-w-lg lg:max-w-6xl"><div class="text-start mx-6"><div class="font-magistral font-bold text-pc4 text-3xl lg:text-7xl mb-4 lg:mb-8">Convert to PDF</div><div class="font-quicksand font-light text-md lg:text-3xl text-lt1">Convert document or image files into PDF documents.</div></div></section><div class="flex flex-col p-2" id="dropzoneCnvToPDF"><form action="{{ url('api/v1/file/upload') }}" method="post" class="dropzone flex flex-col lg:flex-row xl:flex-row mx-4 items-center justify-center w-6/6 lg:w-4/6 min-h-96 h-fit lg:h-72 max-h-full lg:overflow-y-auto cursor-pointer bg-lt backdrop-filter backdrop-blur-md rounded-[40px] bg-opacity-15 mb-2" id="dropzoneAreaCnv">{{ csrf_field() }}<div class="flex flex-col items-center justify-content p-4" id="dropzoneUiInit"><img class="p-4 h-24 w-24" src="{{ asset('assets/icons/placeholder_pdf.svg') }}"><p class="mb-2 text-md text-lt3 font-quicksand font-medium">Drop PDF files here</p><p class="text-xs text-lt3 font-quicksand">Or</p><button type="button" id="dropzoneUploadInit" class="mx-auto mt-2 p-4 text-xs font-quicksand font-semibold bg-ac text-lt rounded-lg cursor-pointer w-42 h-12 text-center flex items-center justify-center"><svg class="w-6 h-6 text-lt1" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M2 12a10 10 0 1 1 20 0 10 10 0 0 1-20 0Zm11-4.2a1 1 0 1 0-2 0V11H7.8a1 1 0 1 0 0 2H11v3.2a1 1 0 1 0 2 0V13h3.2a1 1 0 1 0 0-2H13V7.8Z" clip-rule="evenodd"></path></svg><span class="ml-4">Choose File</span></button></div><div class="flex flex-col items-center justify-content hidden order-1 border-dashed border-2 border-lt1" id="dropzoneUiExt"><button type="button" id="dropzoneUploadExt" class="mx-auto p-4 bg-transparent text-lt1 rounded-lg cursor-pointer h-48 w-32 text-center flex items-center justify-center"><svg class="w-6 h-6 text-lt1" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M2 12a10 10 0 1 1 20 0 10 10 0 0 1-20 0Zm11-4.2a1 1 0 1 0-2 0V11H7.8a1 1 0 1 0 0 2H11v3.2a1 1 0 1 0 2 0V13h3.2a1 1 0 1 0 0-2H13V7.8Z" clip-rule="evenodd"></path></svg></button></div></form><div class="flex flex-col mx-4 mt-8 lg:w-3/6"><p class="block mb-2 font-quicksand text-xl font-bold text-pc4">Document Format</p><div dir="ltl"><button type="submit" id="submitBtn" name="formAction" class="mx-auto mt-2 lg:mt-4 mb-8 sm:mb-6 font-quicksand font-semibold bg-transparent border-2 border-lt backdrop-filter backdrop-blur-md rounded-lg bg-opacity-50 text-lt1 rounded-lg cursor-pointer w-full lg:w-4/6 h-10" data-ripple-light="true">Convert</button></div><div class="flex flex-col">@include('includes.alert')</div></div></div>@stop</div>

0 comments on commit dc4961a

Please sign in to comment.