diff --git a/build-docker-image.bat b/build-docker-image.bat new file mode 100644 index 0000000..2b548cf --- /dev/null +++ b/build-docker-image.bat @@ -0,0 +1,2 @@ +cd web +docker-compose up --build graphictoria \ No newline at end of file diff --git a/web/.dockerignore b/web/.dockerignore new file mode 100644 index 0000000..cdb2161 --- /dev/null +++ b/web/.dockerignore @@ -0,0 +1,19 @@ +/node_modules +/public/mix-manifest.json +/public/js +/public/css +/public/fonts +/public/hot +/public/storage +/storage +/bootstrap/cache +/vendor +.env +.env.backup +.phpunit.result.cache +Homestead.json +Homestead.yaml +npm-debug.log +yarn-error.log +/.idea +/.vscode \ No newline at end of file diff --git a/web/Dockerfile b/web/Dockerfile new file mode 100644 index 0000000..ebca3b9 --- /dev/null +++ b/web/Dockerfile @@ -0,0 +1,37 @@ +FROM node:18-alpine AS node +FROM composer:2.3.5 + +COPY --from=node /usr/local/lib/node_modules /usr/local/lib/node_modules +COPY --from=node /usr/local/bin/node /usr/local/bin/node +RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm + +WORKDIR /gtoria + +COPY . . + +RUN mkdir ./bootstrap/cache \ + && mkdir ./storage \ + && mkdir ./storage/logs \ + && mkdir ./storage/framework \ + && mkdir ./storage/framework/cache \ + && mkdir ./storage/framework/sessions \ + && mkdir ./storage/framework/testing \ + && mkdir ./storage/framework/views \ + && mkdir ./storage/app \ + && mkdir ./storage/app/public + +RUN composer install \ + --no-interaction \ + --no-plugins \ + --no-scripts \ + --no-dev \ + --prefer-dist \ + && composer dump-autoload + +RUN npm install && npm run prod + +RUN php artisan optimize:clear + +CMD php artisan serve --host=0.0.0.0 --port=1024 + +EXPOSE 1024 \ No newline at end of file diff --git a/web/docker-compose.yml b/web/docker-compose.yml new file mode 100644 index 0000000..68d7edd --- /dev/null +++ b/web/docker-compose.yml @@ -0,0 +1,16 @@ +version: '3' +services: + website: + build: . + ports: + - '1234:1234' + + database: + image: 'mariadb' + environment: + MYSQL_ROOT_PASSWORD: 'test' + volumes: + - database-data:/graphictoria + +volumes: + database-data: \ No newline at end of file diff --git a/web/resources/js/pages/Dashboard.js b/web/resources/js/pages/Dashboard.js index 8817175..34d8749 100644 --- a/web/resources/js/pages/Dashboard.js +++ b/web/resources/js/pages/Dashboard.js @@ -6,7 +6,7 @@ import $ from 'jquery'; import React from 'react'; import { render } from 'react-dom'; -import Feed from '../Components/Feed'; +import Feed from '../components/Feed'; const feedId = 'gt-dash-feed'; diff --git a/web/resources/sass/Graphictoria.scss b/web/resources/sass/Graphictoria.scss index b2ddc54..bb837ec 100644 --- a/web/resources/sass/Graphictoria.scss +++ b/web/resources/sass/Graphictoria.scss @@ -4,7 +4,7 @@ // Lumen 5.0.1 // Bootswatch -@import "variables"; +@import "Variables"; @import "~bootstrap/scss/bootstrap"; @import "./scss/fontawesome.scss"; @import "./scss/solid.scss"; diff --git a/web/resources/views/layouts/app.blade.php b/web/resources/views/layouts/app.blade.php index cc2b610..aa55c94 100644 --- a/web/resources/views/layouts/app.blade.php +++ b/web/resources/views/layouts/app.blade.php @@ -22,7 +22,7 @@ @once - + @endonce @yield('extra-headers') diff --git a/web/resources/views/web/home/dashboard.blade.php b/web/resources/views/web/home/dashboard.blade.php index 26f8e65..22f6a84 100644 --- a/web/resources/views/web/home/dashboard.blade.php +++ b/web/resources/views/web/home/dashboard.blade.php @@ -3,7 +3,7 @@ @section('title', 'Dashboard') @section('page-specific') - + @endsection @section('content') diff --git a/web/webpack.mix.js b/web/webpack.mix.js index 7792940..5fe9599 100644 --- a/web/webpack.mix.js +++ b/web/webpack.mix.js @@ -13,10 +13,10 @@ require('laravel-mix-banner'); */ mix.js('resources/js/app.js', 'public/js') - .js('resources/js/pages/maintenance.js', 'public/js') - .js('resources/js/pages/dashboard.js', 'public/js') + .js('resources/js/pages/Maintenance.js', 'public/js') + .js('resources/js/pages/Dashboard.js', 'public/js') .react() - .sass('resources/sass/graphictoria.scss', 'public/css') + .sass('resources/sass/Graphictoria.scss', 'public/css') .banner({ banner: (function () { return [