Skip to content

Commit

Permalink
config(app): updated config files
Browse files Browse the repository at this point in the history
  • Loading branch information
jonasfroeller committed Jan 29, 2024
1 parent 0abf102 commit c85f04f
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 19 deletions.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"build": "vite build"
},
"devDependencies": {
"@tailwindcss/forms": "^0.5.2",
"@tailwindcss/typography": "^0.5.10",
"alpinejs": "^3.4.2",
"autoprefixer": "^10.4.2",
Expand Down
2 changes: 1 addition & 1 deletion postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
container_name: propromo-postgres
environment:
POSTGRES_DB: propromo
POSTGRES_USER: propromo
POSTGRES_USER: postgres
POSTGRES_PASSWORD: propromo
ports:
- "5432:5432"
4 changes: 3 additions & 1 deletion redis.yaml → redis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
version: '3.8'

services:
cache:
redis:
image: redis:6.2-alpine
restart: always
ports:
Expand Down
4 changes: 2 additions & 2 deletions resources/views/livewire/includes/project-card.blade.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div wire:key="{{$project->id}}" class="p-5 border-4 rounded-lg border-blue-900 m-3">
<div wire:key="{{$project->id}}" class="p-5 m-3 prose border-4 border-blue-900 rounded-lg">

<a href="/projects/{{ $project->id }}" class="btn btn-info delete-header m-1 btn-sm" title="Show User">
<a href="/projects/{{ $project->id }}" class="m-1 btn btn-info delete-header btn-sm" title="Show User">
{{$project->organisation_name}}
</a>
</div>
31 changes: 20 additions & 11 deletions start.cmd
Original file line number Diff line number Diff line change
@@ -1,19 +1,28 @@
@echo off

REM Install composer dependencies
composer install --ignore-platform-req=ext-fileinfo
rem install composer dependencies
call composer install

REM Rename .env.example to .env
ren .env.example .env
rem rename .env.example .env
copy .env.example .env

REM Install node dependencies
npm install

REM Generate application key
rem generate application key
php artisan key:generate

REM Drop and create tables
rem start redis
docker-compose -f redis.yml up -d

rem start postgres
docker-compose -f postgres.yml up -d

rem drop create tables
php artisan migrate:fresh

REM Start Vite dev-server
npm run dev
rem install node dependencies
call npm install

rem start vite dev-server
start npm run dev

rem start laravel dev-server
start php artisan serve
2 changes: 1 addition & 1 deletion start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ php artisan migrate:fresh
npm run dev &

# start redis
docker-compose -f redis.yaml up
docker-compose -f redis.yml up
4 changes: 2 additions & 2 deletions tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import defaultTheme from 'tailwindcss/defaultTheme';
import forms from '@tailwindcss/forms';
import typography from '@tailwindcss/typography';

/** @type {import('tailwindcss').Config} */
export default {
Expand All @@ -17,5 +17,5 @@ export default {
},
},

plugins: [forms],
plugins: [typography],
};

0 comments on commit c85f04f

Please sign in to comment.