Skip to content

Commit 93dcf96

Browse files
committed
Merge branch 'release/1.0.0'
2 parents c209ba5 + c07b0a9 commit 93dcf96

File tree

11 files changed

+75
-17
lines changed

11 files changed

+75
-17
lines changed

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ LOG_STACK=single
1818
LOG_DEPRECATIONS_CHANNEL=null
1919
LOG_LEVEL=debug
2020

21-
DB_CONNECTION=mariadb
21+
DB_CONNECTION=mysql
2222
DB_HOST=127.0.0.1
2323
DB_PORT=7655
2424
DB_DATABASE=laravelapibackend

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ Homestead.yaml
2525
Thumbs.db
2626
composer.lock
2727
package-lock.json
28-
mariadb/
28+
mysql/
29+
db/

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"keywords": [
1515
"vuejs",
1616
"laravel",
17-
"octane",
17+
"octane"
1818
],
1919
"version": "1.0.0",
2020
"license": "MIT",

docker-compose.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ networks:
33
driver: bridge
44

55
services:
6-
mariadb:
7-
container_name: "mariadb"
6+
mysql:
7+
container_name: "mysql"
88
image: mariadb:11.6
99
restart: unless-stopped
1010
volumes:
11-
- ../db/mariadb:/var/www/html/db
12-
- ../db/mariadb:/var/lib/mariadb
13-
- ./mariadb/docker-entrypoint-initdb.d/:/docker-entrypoint-initdb.d
11+
- ../laravelbackendapidb/mysql:/var/www/html/laravelbackendapidb
12+
- ../laravelbackendapidb/mysql:/var/lib/mysql
13+
- ./mysql/docker-entrypoint-initdb.d/:/docker-entrypoint-initdb.d
1414
environment:
1515
MYSQL_DATABASE: "${DB_DATABASE}"
1616
MYSQL_USER: "${DB_USERNAME}"
@@ -36,11 +36,11 @@ services:
3636
- UID=${UID:-1000}
3737
- GID=${GID:-1000}
3838
depends_on:
39-
mariadb:
39+
mysql:
4040
condition: service_started
4141
environment:
4242
- DB_DATABASE=laravelapibackend
43-
- DB_HOST=mariadb
43+
- DB_HOST=mysql
4444
- DB_PORT=7655
4545
- DB_USERNAME=root
4646
- DB_PASSWORD=myPassword123

dockerfiles/configs/supervisord.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ user=root
44

55
[program:laravel-octane]
66
process_name=%(program_name)s
7-
command=php /var/www/html/src/artisan octane:start --server=swoole --host=0.0.0.0 --port=7654 --workers=4 --task-workers=6
7+
command=php /var/www/html/src/artisan octane:start --server=swoole --watch --host=0.0.0.0 --port=7654 --workers=4 --task-workers=6
88
autostart=true
99
autorestart=true
1010
redirect_stderr=true

dockerfiles/redis.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
requirepass redisPass123
22
maxmemory 1gb
3+
port 7656

dockerfiles/swoole.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.5.0alpha4-cli-alpine
1+
FROM php:8.4.10-cli-alpine
22

33
RUN apk update && \
44
apk add --update linux-headers && \

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
},
1919
"dependencies": {
2020
"@heroicons/vue": "^2.2.0",
21-
"@pinia-plugin-persistedstate/nuxt": "^1.2.1",
2221
"@vitejs/plugin-vue": "^6.0.0",
2322
"daisyui": "^5.0.43",
2423
"lucide-vue-next": "^0.525.0",

resources/js/app.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@ import {createPinia} from 'pinia';
33
import {createRouter, createWebHistory} from 'vue-router';
44
import App from './App.vue';
55
import {useAuthStore} from "@/stores/auth.js";
6+
import HomePage from "./pages/HomePage.vue";
67

78

89
const routes = [
9-
{path: '/', component: Example},
10-
{path: '/example', component: Example},
10+
{path: '/', component: HomePage},
11+
{path: '/example', component: HomePage},
1112
{
1213
path: '/example/:id/:slug',
13-
component: Example,
14+
component: HomePage,
1415
name: 'example'
1516
},
16-
{ path: '/example', name: 'example', component: Example },
17+
{ path: '/example', name: 'example', component: HomePage },
1718
{
1819
path: '/login',
1920
name: 'login',
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<template>
2+
<transition name="fade">
3+
<div
4+
v-if="isLoading"
5+
class="fixed inset-0 z-[9999] flex items-center justify-center bg-base-100 transition-opacity duration-500"
6+
>
7+
<span class="loading loading-spinner loading-lg text-primary"></span>
8+
</div>
9+
</transition>
10+
</template>
11+
12+
<script setup>
13+
import { ref } from 'vue';
14+
15+
const isLoading = ref(false);
16+
17+
// Expose methods to control loading state
18+
const show = () => isLoading.value = true;
19+
const hide = () => isLoading.value = false;
20+
21+
// Expose methods for other components to use
22+
defineExpose({ show, hide });
23+
</script>
24+
25+
<style scoped>
26+
.fade-leave-active {
27+
transition: opacity 0.3s;
28+
}
29+
.fade-leave-to {
30+
opacity: 0;
31+
}
32+
</style>

0 commit comments

Comments
 (0)