diff --git a/composer.json b/composer.json index b51253a..2e31e81 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "guzzlehttp/guzzle": "^7.5.1", "inertiajs/inertia-laravel": "^0.6.9", "laravel/framework": "^10.9.0", - "laravel/sanctum": "^3.2.4", + "laravel/sanctum": "^3.2.5", "laravel/tinker": "^2.8.1", "react/async": "^4", "tightenco/ziggy": "^1.5.1" diff --git a/composer.lock b/composer.lock index 1bb169e..167c23e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "edfd2bcc284c35c9d6e2fb8eaf9894f2", + "content-hash": "d7c81afc3567f64c0673aae9693f06da", "packages": [ { "name": "brick/math", @@ -1251,16 +1251,16 @@ }, { "name": "laravel/sanctum", - "version": "v3.2.4", + "version": "v3.2.5", "source": { "type": "git", "url": "https://github.com/laravel/sanctum.git", - "reference": "c8269dcff3cda261ce113ab9548a0253d709aa91" + "reference": "8ebda85d59d3c414863a7f4d816ef8302faad876" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sanctum/zipball/c8269dcff3cda261ce113ab9548a0253d709aa91", - "reference": "c8269dcff3cda261ce113ab9548a0253d709aa91", + "url": "https://api.github.com/repos/laravel/sanctum/zipball/8ebda85d59d3c414863a7f4d816ef8302faad876", + "reference": "8ebda85d59d3c414863a7f4d816ef8302faad876", "shasum": "" }, "require": { @@ -1313,7 +1313,7 @@ "issues": "https://github.com/laravel/sanctum/issues", "source": "https://github.com/laravel/sanctum" }, - "time": "2023-04-26T18:55:47+00:00" + "time": "2023-05-01T19:39:51+00:00" }, { "name": "laravel/serializable-closure", @@ -3166,23 +3166,23 @@ }, { "name": "react/promise", - "version": "v2.9.0", + "version": "v2.10.0", "source": { "type": "git", "url": "https://github.com/reactphp/promise.git", - "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910" + "reference": "f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/234f8fd1023c9158e2314fa9d7d0e6a83db42910", - "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910", + "url": "https://api.github.com/repos/reactphp/promise/zipball/f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38", + "reference": "f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38", "shasum": "" }, "require": { "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36" + "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.36" }, "type": "library", "autoload": { @@ -3226,19 +3226,15 @@ ], "support": { "issues": "https://github.com/reactphp/promise/issues", - "source": "https://github.com/reactphp/promise/tree/v2.9.0" + "source": "https://github.com/reactphp/promise/tree/v2.10.0" }, "funding": [ { - "url": "https://github.com/WyriHaximus", - "type": "github" - }, - { - "url": "https://github.com/clue", - "type": "github" + "url": "https://opencollective.com/reactphp", + "type": "open_collective" } ], - "time": "2022-02-11T10:27:51+00:00" + "time": "2023-05-02T15:15:43+00:00" }, { "name": "symfony/console", diff --git a/docker-compose.yml b/docker-compose.yml index b3128c5..c40e656 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,8 +7,8 @@ services: uid: 1000 context: ./ dockerfile: ./Dockerfile - image: template - container_name: template-app + image: simplepos + container_name: simplepos-app working_dir: /var/www/ volumes: - ./:/var/www @@ -19,10 +19,10 @@ services: mem_reservation: 128M cpus: 0.5 networks: - - template + - simplepos nginx: image: nginx:1.17-alpine - container_name: template-nginx + container_name: simplepos-nginx ports: - 8000:80 volumes: @@ -32,59 +32,10 @@ services: mem_reservation: 128M cpus: 0.5 networks: - - template - mariadb: - image: mariadb:latest - container_name: template-mariadb - ports: - - 3306:3306 - volumes: - - mariadb:/var/lib/mysql - - ./database:/database - environment: - MARIADB_DATABASE: app - MARIADB_USER: app - MARIADB_PASSWORD: password - MARIADB_ROOT_PASSWORD: password - mem_limit: 512m - mem_reservation: 128M - cpus: 0.5 - networks: - template: - ipv4_address: 10.8.0.99 - postgresql: - # image: postgres:latest - image: postgres:14-alpine3.17 - container_name: template-postgres - restart: always - ports: - - 5432:5432 - volumes: - - postgres:/var/lib/postgresql/data - - ./database:/database - environment: - POSTGRES_DB: app - POSTGRES_USER: app - POSTGRES_PASSWORD: password - mem_limit: 512m - mem_reservation: 128M - cpus: 0.5 - networks: - template: - ipv4_address: 10.8.0.96 - redis: - image: redis - container_name: template-redis - ports: - - 6379:6379 - mem_limit: 512m - mem_reservation: 128M - cpus: 0.5 - networks: - - template + - simplepos nodejs: image: node:16-alpine - container_name: template-node + container_name: simplepos-node ports: - 5173:5173 volumes: @@ -95,7 +46,7 @@ services: mem_reservation: 128M cpus: 0.5 networks: - - template + - simplepos volumes: mariadb: @@ -104,10 +55,10 @@ volumes: driver: local networks: - template: + simplepos: driver: bridge ipam: driver: default config: - - subnet: 10.8.0.0/24 - gateway: 10.8.0.1 + - subnet: 10.18.0.0/24 + gateway: 10.18.0.1 diff --git a/package-lock.json b/package-lock.json index cca5854..9ef15f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "laravel-template", + "name": "simple-pos", "lockfileVersion": 3, "requires": true, "packages": { @@ -80,9 +80,9 @@ } }, "node_modules/@babel/core": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.5.tgz", - "integrity": "sha512-9M398B/QH5DlfCOTKDZT1ozXr0x8uBEeFd+dJraGUZGiaNpGCDVGCc14hZexsMblw3XxltJ+6kSvogp9J+5a9g==", + "version": "7.21.8", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.8.tgz", + "integrity": "sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", @@ -91,7 +91,7 @@ "@babel/helper-compilation-targets": "^7.21.5", "@babel/helper-module-transforms": "^7.21.5", "@babel/helpers": "^7.21.5", - "@babel/parser": "^7.21.5", + "@babel/parser": "^7.21.8", "@babel/template": "^7.20.7", "@babel/traverse": "^7.21.5", "@babel/types": "^7.21.5", @@ -297,9 +297,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.5.tgz", - "integrity": "sha512-J+IxH2IsxV4HbnTrSWgMAQj0UEo61hDA4Ny8h8PCX0MLXiibqHbqIOVneqdocemSBc22VpBKxt4J6FQzy9HarQ==", + "version": "7.21.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz", + "integrity": "sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -1137,9 +1137,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001481", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001481.tgz", - "integrity": "sha512-KCqHwRnaa1InZBtqXzP98LPg0ajCVujMKjqKDhZEthIpAsJl/YEIa3YvXjGXPVqzZVguccuu7ga9KOE1J9rKPQ==", + "version": "1.0.30001482", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001482.tgz", + "integrity": "sha512-F1ZInsg53cegyjroxLNW9DmrEQ1SuGRTO1QlpA0o2/6OpQ0gFeDRoq1yFmnr8Sakn9qwwt9DmbxHB6w167OSuQ==", "dev": true, "funding": [ { @@ -1387,9 +1387,9 @@ "integrity": "sha512-GJRqdiy2h+EXy6a8E6R+ubmqUM08BK0FWNq41k24fup6045biQ8NXxoXimiwegMQvFFV3t1emADdGNL1TlS61A==" }, "node_modules/electron-to-chromium": { - "version": "1.4.377", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.377.tgz", - "integrity": "sha512-H3BYG6DW5Z+l0xcfXaicJGxrpA4kMlCxnN71+iNX+dBLkRMOdVJqFJiAmbNZZKA1zISpRg17JR03qGifXNsJtw==", + "version": "1.4.380", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.380.tgz", + "integrity": "sha512-XKGdI4pWM78eLH2cbXJHiBnWUwFSzZM7XujsB6stDiGu9AeSqziedP6amNLpJzE3i0rLTcfAwdCTs5ecP5yeSg==", "dev": true }, "node_modules/error-stack-parser": { @@ -2542,9 +2542,9 @@ } }, "node_modules/rollup": { - "version": "3.21.2", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.21.2.tgz", - "integrity": "sha512-c4vC+JZ3bbF4Kqq2TtM7zSKtSyMybFOjqmomFax3xpfYaPZDZ4iz8NMIuBRMjnXOcKYozw7bC6vhJjiWD6JpzQ==", + "version": "3.21.3", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.21.3.tgz", + "integrity": "sha512-VnPfEG51nIv2xPLnZaekkuN06q9ZbnyDcLkaBdJa/W7UddyhOfMP2yOPziYQfeY7k++fZM8FdQIummFN5y14kA==", "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -2892,9 +2892,9 @@ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, "node_modules/vite": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.3.3.tgz", - "integrity": "sha512-MwFlLBO4udZXd+VBcezo3u8mC77YQk+ik+fbc0GZWGgzfbPP+8Kf0fldhARqvSYmtIWoAJ5BXPClUbMTlqFxrA==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.3.4.tgz", + "integrity": "sha512-f90aqGBoxSFxWph2b39ae2uHAxm5jFBBdnfueNxZAT1FTpM13ccFQExCaKbR2xFW5atowjleRniQ7onjJ22QEg==", "dev": true, "dependencies": { "esbuild": "^0.17.5", diff --git a/resources/js/Components/Defaults/ApplicationLogo.jsx b/resources/js/Components/Defaults/ApplicationLogo.jsx index 2ded4a8..08b4984 100644 --- a/resources/js/Components/Defaults/ApplicationLogo.jsx +++ b/resources/js/Components/Defaults/ApplicationLogo.jsx @@ -1,5 +1,4 @@ import React from 'react'; -import logo from '@/Assets/logo.png'; export default function ApplicationLogo({ className }) { return (