diff --git a/README.md b/README.md index 5075c39..cdc1693 100644 --- a/README.md +++ b/README.md @@ -13,3 +13,27 @@ $ php artisan serve ``` published to http://127.0.0.1:8000 + +### RUN using docker +On the first time we're running the project, we must install the dependencies. + +To install the dependencies, run on project folder: +```bash +$ docker run --rm \ + -u "$(id -u):$(id -g)" \ + -v "$(pwd):/var/www/html" \ + -w /var/www/html \ + laravelsail/php82-composer:latest \ + composer install --ignore-platform-reqs +``` + +To run the docker machine, run: +```bash +$ ./vendor/bin/sail up -d +$ ./vendor/bin/sail npm run build +``` + +tp stop the docker machine: +```bash +$ ./vendor/bin/sail stop +``` diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..8663abe --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,26 @@ +services: + laravel.test: + build: + context: ./vendor/laravel/sail/runtimes/8.2 + dockerfile: Dockerfile + args: + WWWGROUP: '${WWWGROUP}' + image: sail-8.2/app + extra_hosts: + - 'host.docker.internal:host-gateway' + ports: + - '${APP_PORT:-80}:80' + - '${VITE_PORT:-5173}:${VITE_PORT:-5173}' + environment: + WWWUSER: '${WWWUSER}' + LARAVEL_SAIL: 1 + XDEBUG_MODE: '${SAIL_XDEBUG_MODE:-off}' + XDEBUG_CONFIG: '${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}' + IGNITION_LOCAL_SITES_PATH: '${PWD}' + volumes: + - '.:/var/www/html' + networks: + - sail +networks: + sail: + driver: bridge diff --git a/package-lock.json b/package-lock.json index 9229e39..227eb39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "2am-qrcode-site-generator", + "name": "html", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/phpunit.xml b/phpunit.xml index 7dbbc7c..52f3fb6 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -29,8 +29,7 @@ - - + diff --git a/resources/css/app.css b/resources/css/app.css index ab9ee5a..7596410 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -13,3 +13,7 @@ h1, h2, h3, h5, h6, span { h4 { color: #1c74f8; } + +span, p { + font-size: 14px; +} diff --git a/resources/views/components/box.blade.php b/resources/views/components/box.blade.php index a5ae5a0..0165224 100644 --- a/resources/views/components/box.blade.php +++ b/resources/views/components/box.blade.php @@ -1,3 +1,3 @@ -
merge(['class' => 'rounded-sm shadow-md shadow-black-900 p-5']) !!}> +
merge(['class' => 'bg-tbg-100 border border-tbg-50 rounded-md p-5']) !!}> {{ $slot }}
diff --git a/resources/views/components/icons/set.blade.php b/resources/views/components/icons/set.blade.php index f8bf0e1..0d7ff48 100644 --- a/resources/views/components/icons/set.blade.php +++ b/resources/views/components/icons/set.blade.php @@ -1,7 +1,7 @@
@if($icon == \App\Enum\FormatEnum::Text->value) - - + + @endif @if($icon == \App\Enum\FormatEnum::BookMark->value) @@ -39,10 +39,10 @@ @endif @if($icon == \App\Enum\FormatEnum::Mms->value) - - + + - @endif + @endif @if($icon == \App\Enum\FormatEnum::Phone->value) diff --git a/resources/views/components/inputs/color-picker.blade.php b/resources/views/components/inputs/color-picker.blade.php index 0162b1e..da1224b 100644 --- a/resources/views/components/inputs/color-picker.blade.php +++ b/resources/views/components/inputs/color-picker.blade.php @@ -42,10 +42,10 @@ })" >
-
+
{{ $this->{$model} }}
-
+
+ diff --git a/resources/views/components/inputs/date-time.blade.php b/resources/views/components/inputs/date-time.blade.php index 90f5c72..4377415 100644 --- a/resources/views/components/inputs/date-time.blade.php +++ b/resources/views/components/inputs/date-time.blade.php @@ -17,9 +17,10 @@ class="rounded-r-none" />
-
- - +
+ + diff --git a/resources/views/components/inputs/secondary-button.blade.php b/resources/views/components/inputs/secondary-button.blade.php index 74c8e03..da85934 100644 --- a/resources/views/components/inputs/secondary-button.blade.php +++ b/resources/views/components/inputs/secondary-button.blade.php @@ -1,3 +1,4 @@ -
- merge(['class' => 'px-3 py-3 placeholder-slate-300 text-slate-600 relative bg-white bg-white rounded text-sm border-0 shadow outline-none focus:outline-none focus:ring w-full']) !!}/> +
+ merge([ + 'class' => 'px-3 py-3 placeholder-slate-300 text-slate-600 + relative bg-white bg-white rounded text-sm border-0 shadow + outline-none focus:outline-none focus:ring w-full h-8' + ]) + !!}/>
diff --git a/resources/views/components/inputs/upload.blade.php b/resources/views/components/inputs/upload.blade.php index 2d75906..a45f27e 100644 --- a/resources/views/components/inputs/upload.blade.php +++ b/resources/views/components/inputs/upload.blade.php @@ -1,3 +1,7 @@
- merge(['class' => 'px-3 py-3 placeholder-slate-300 text-slate-600 relative bg-white bg-white rounded text-sm border-0 shadow outline-none focus:outline-none focus:ring w-full']) !!}/> + merge([ + 'class' => 'px-3 py-2 placeholder-slate-300 text-slate-600 relative + bg-white bg-white rounded text-sm border-0 shadow outline-none + focus:outline-none focus:ring w-full h-10' + ]) !!}/>
diff --git a/resources/views/components/layout.blade.php b/resources/views/components/layout.blade.php index b98a0ec..211524f 100644 --- a/resources/views/components/layout.blade.php +++ b/resources/views/components/layout.blade.php @@ -237,6 +237,7 @@ function gtag() {
+
{{$slot}} +