From 852f543dfbbcfc9538c5c34fc4cd7e7c864543ca Mon Sep 17 00:00:00 2001 From: Dean Blackborough Date: Tue, 11 Jan 2022 12:38:03 +0000 Subject: [PATCH] Update README - Remove files we aren't using - Tweak the Docker setup - Update the README with Docker changes and correct table layouts --- .docker/mysql/Dockerfile | 2 +- .dockerignore | 2 +- README.md | 295 +++++++++++++++++++-------------------- docker-compose.yml | 3 +- testing.sqlite | 0 webpack.mix.js | 15 -- 6 files changed, 151 insertions(+), 166 deletions(-) delete mode 100644 testing.sqlite delete mode 100644 webpack.mix.js diff --git a/.docker/mysql/Dockerfile b/.docker/mysql/Dockerfile index 70feb0c5..15556add 100644 --- a/.docker/mysql/Dockerfile +++ b/.docker/mysql/Dockerfile @@ -1 +1 @@ -FROM mysql:8 +FROM mysql:8.0 diff --git a/.dockerignore b/.dockerignore index 22d0d82f..48b8bf90 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1 @@ -vendor +vendor/ diff --git a/README.md b/README.md index f7926fd1..5e35cce6 100644 --- a/README.md +++ b/README.md @@ -34,13 +34,13 @@ directory and run the below. ### Environment -* $ `docker network create costs-to-expect-network` * -* $ `docker-compose build` -* $ `docker-compose up` +* $ `docker network create costs.network` * +* $ `docker compose build` +* $ `docker compose up` *We include a network for local development purposes, I need the Costs to Expect Website and App to communicate with a local API. You probably don't need this -so remove the network section from the docker-compose file and don't create the +so remove the network section from the docker compose file and don't create the network.* ### API @@ -50,7 +50,7 @@ Docker services, `api` and `mysql`, we will need to exec into the `api` service set up our app. Firstly, we need to check we are trying to access the right location, -execute `docker-compose exec api ls`. You should see a list of the files and +execute `docker compose exec api ls`. You should see a list of the files and directories at the project root. Next, we need to configure the API by setting out local .ENV file our .env, @@ -58,10 +58,9 @@ installing all dependencies and running our migrations. * Copy the `.env.example` file and name the copy `.env`. Set all the empty values, all drivers have been set to our defaults, sessions, cache, and the queue default to the database driver. -* `docker-compose exec api composer install` -* `docker-compose exec api php artisan key:generate` -* `docker-compose exec api php artisan migrate` -* `docker-compose exec api php artisan queue:work` +* `docker compose exec api php artisan key:generate` +* `docker compose exec api php artisan migrate` +* `docker compose exec api php artisan queue:work` * Run an OPTIONS request on `http://[your.domail.local:8080]/v2/resource_types`, you will see an OPTIONS response, alternatively a GET request to `http://[your.domail.local:8080]/v1` will show all the defined routes. * You can create a user by POSTing to `http://[your.domail.local:8080]/v2/auth/register`. @@ -90,20 +89,20 @@ conditional caching, specifically including an Etag header and returning a 304 r Responses will include multiple headers, the table below details the intention behind each of our custom headers. -| Header | Purpose | -| :--- | :--- | -| X-Total-Count | Pagination: Total number of result | -| X-Count | Pagination: Number of results returned | -| X-Limit | Pagination: Limit value applied to request after validation | -| X-Offset | Pagination: Offset value applied to request after validation | -| X-Offset | Pagination: Offset value applied to request after validation | -| X-Link-Previous | Pagination: URI for previous result set if relevant | -| X-Link-Next | Pagination: URI for next result set if relevant | -| X-Link-Next | Pagination: URI for next result set if relevant | -| X-Last-Updated | The last time the collection was updated | -| X-Sort | Sort options applied to request after validation | -| X-Search | Search options applied to request after validation | -| X-Parameters | Request parameters applied to request after validation | +| Header | Purpose | +|:----------------|:-------------------------------------------------------------| +| X-Total-Count | Pagination: Total number of result | +| X-Count | Pagination: Number of results returned | +| X-Limit | Pagination: Limit value applied to request after validation | +| X-Offset | Pagination: Offset value applied to request after validation | +| X-Offset | Pagination: Offset value applied to request after validation | +| X-Link-Previous | Pagination: URI for previous result set if relevant | +| X-Link-Next | Pagination: URI for next result set if relevant | +| X-Link-Next | Pagination: URI for next result set if relevant | +| X-Last-Updated | The last time the collection was updated | +| X-Sort | Sort options applied to request after validation | +| X-Search | Search options applied to request after validation | +| X-Parameters | Request parameters applied to request after validation | ## Routes @@ -111,103 +110,103 @@ Access to a route will be limited based upon a users permitted resource types. When you create a resource type you have full access to everything below it, additionally, the same is true if you are assigned as a permitted user to a resource type. -| HTTP Verb(s) | Route | -| :--- | :--- | -| GET/HEAD | v2/ | -| OPTIONS | v2/ | -| GET/HEAD | v2/auth/check | -| POST | v2/auth/create-password | -| POST | v2/auth/create-new-password | -| POST | v2/auth/forgot-password | -| POST | v2/auth/login | -| POST | v2/auth/register | -| POST | v2/auth/update-password | -| POST | v2/auth/update-profile | -| GET/HEAD | v2/auth/user | -| GET/HEAD | v2/changelog | -| OPTIONS | v2/changelog | -| GET/HEAD | v2/currencies | -| OPTIONS | v2/currencies | -| GET/HEAD | v2/currencies/{currency_id} | -| OPTIONS | v2/currencies/{currency_id} | -| GET/HEAD | v2/item-types | -| OPTIONS | v2/item-types | -| GET/HEAD | v2/item-types/{item_type_id} | -| OPTIONS | v2/item-types/{item_type_id} | -| GET/HEAD | v2/item-types/{item_type_id}/item-subtypes | -| OPTIONS | v2/item-types/{item_type_id}/item-subtypes | -| GET/HEAD | v2/item-types/{item_type_id}/item-subtypes/{item_subtype_id} | -| OPTIONS | v2/item-types/{item_type_id}/item-subtypes/{item_subtype_id} | -| GET/HEAD | v2/resource-types | -| OPTIONS | v2/resource-types | -| POST | v2/resource-types | -| GET/HEAD | v2/resource-types/{resource_type_id} | -| OPTIONS | v2/resource-types/{resource_type_id} | -| PATCH | v2/resource-types/{resource_type_id} | -| DELETE | v2/resource-types/{resource_type_id} | -| GET/HEAD | v2/resource-types/{resource_type_id}/categories | -| OPTIONS | v2/resource-types/{resource_type_id}/categories | -| POST | v2/resource-types/{resource_type_id}/categories | -| PATCH | v2/resource-types/{resource_type_id}/categories/{category_id} | -| DELETE | v2/resource-types/{resource_type_id}/categories/{category_id} | -| GET/HEAD | v2/resource-types/{resource_type_id}/categories/{category_id} | -| OPTIONS | v2/resource-types/{resource_type_id}/categories/{category_id} | -| GET/HEAD | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories | -| OPTIONS | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories | -| POST | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories | -| GET/HEAD | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories/{subcategory_id} | -| OPTIONS | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories/{subcategory_id} | -| PATCH | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories/{subcategory_id} | -| DELETE | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories/{subcategory_id} | -| GET/HEAD | v2/resource-types/{resource_type_id}/items | -| OPTIONS | v2/resource-types/{resource_type_id}/items | -| GET/HEAD | v2/resource-types/{resource_type_id}/partial-transfers | -| OPTIONS | v2/resource-types/{resource_type_id}/partial-transfers | -| GET/HEAD | v2/resource-types/{resource_type_id}/partial-transfers/{item_partial_transfer_id} | -| OPTIONS | v2/resource-types/{resource_type_id}/partial-transfers/{item_partial_transfer_id} | -| DELETE | v2/resource-types/{resource_type_id}/partial-transfers/{item_partial_transfer_id} | -| GET/HEAD | v2/resource-types/{resource_type_id}/permitted-users | -| OPTIONS | v2/resource-types/{resource_type_id}/permitted-users | -| GET/HEAD | v2/resource-types/{resource_type_id}/resources | -| OPTIONS | v2/resource-types/{resource_type_id}/resources | -| POST | v2/resource-types/{resource_type_id}/resources | -| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id} | -| OPTIONS | v2/resource-types/{resource_type_id}/resources/{resource_id} | -| PATCH | v2/resource-types/{resource_type_id}/resources/{resource_id} | -| DELETE | v2/resource-types/{resource_type_id}/resources/{resource_id} | -| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items | -| OPTIONS | v2/resource-types/{resource_type_id}/resources/{resource_id}/items | -| POST | v2/resource-types/{resource_type_id}/resources/{resource_id}/items | -| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id} | -| OPTIONS | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id} | -| PATCH | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id} | -| DELETE | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id} | -| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories | -| OPTIONS | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories | -| POST | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories | -| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id} | -| OPTIONS | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id} | -| DELETE | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id} | -| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories | -| OPTIONS | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories | -| POST | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories | -| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories/{item_subcategory_id} | -| OPTIONS | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories/{item_subcategory_id} | -| DELETE | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories/{item_subcategory_id} | -| OPTIONS | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/partial-transfer | -| POST | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/partial-transfer | -| OPTIONS | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/transfer | -| POST | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/transfer | -| GET/HEAD | v2/resource-types/{resource_type_id}/transfers | -| OPTIONS | v2/resource-types/{resource_type_id}/transfers | -| GET/HEAD | v2/resource-types/{resource_type_id}/transfers/{item_transfer_id} | -| OPTIONS | v2/resource-types/{resource_type_id}/transfers/{item_transfer_id} | -| GET/HEAD | v2/request/error-log | -| OPTIONS | v2/request/error-log | -| POST | v2/request/error-log | -| GET/HEAD | v2/tools/cache | -| OPTIONS | v2/tools/cache | -| DELETE | v2/tools/cache | +| HTTP Verb(s) | Route | +|:-------------|:-----------------------------------------------------------------------------------------------------------------------------------------------| +| GET/HEAD | v2/ | +| OPTIONS | v2/ | +| GET/HEAD | v2/auth/check | +| POST | v2/auth/create-password | +| POST | v2/auth/create-new-password | +| POST | v2/auth/forgot-password | +| POST | v2/auth/login | +| POST | v2/auth/register | +| POST | v2/auth/update-password | +| POST | v2/auth/update-profile | +| GET/HEAD | v2/auth/user | +| GET/HEAD | v2/changelog | +| OPTIONS | v2/changelog | +| GET/HEAD | v2/currencies | +| OPTIONS | v2/currencies | +| GET/HEAD | v2/currencies/{currency_id} | +| OPTIONS | v2/currencies/{currency_id} | +| GET/HEAD | v2/item-types | +| OPTIONS | v2/item-types | +| GET/HEAD | v2/item-types/{item_type_id} | +| OPTIONS | v2/item-types/{item_type_id} | +| GET/HEAD | v2/item-types/{item_type_id}/item-subtypes | +| OPTIONS | v2/item-types/{item_type_id}/item-subtypes | +| GET/HEAD | v2/item-types/{item_type_id}/item-subtypes/{item_subtype_id} | +| OPTIONS | v2/item-types/{item_type_id}/item-subtypes/{item_subtype_id} | +| GET/HEAD | v2/resource-types | +| OPTIONS | v2/resource-types | +| POST | v2/resource-types | +| GET/HEAD | v2/resource-types/{resource_type_id} | +| OPTIONS | v2/resource-types/{resource_type_id} | +| PATCH | v2/resource-types/{resource_type_id} | +| DELETE | v2/resource-types/{resource_type_id} | +| GET/HEAD | v2/resource-types/{resource_type_id}/categories | +| OPTIONS | v2/resource-types/{resource_type_id}/categories | +| POST | v2/resource-types/{resource_type_id}/categories | +| PATCH | v2/resource-types/{resource_type_id}/categories/{category_id} | +| DELETE | v2/resource-types/{resource_type_id}/categories/{category_id} | +| GET/HEAD | v2/resource-types/{resource_type_id}/categories/{category_id} | +| OPTIONS | v2/resource-types/{resource_type_id}/categories/{category_id} | +| GET/HEAD | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories | +| OPTIONS | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories | +| POST | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories | +| GET/HEAD | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories/{subcategory_id} | +| OPTIONS | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories/{subcategory_id} | +| PATCH | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories/{subcategory_id} | +| DELETE | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories/{subcategory_id} | +| GET/HEAD | v2/resource-types/{resource_type_id}/items | +| OPTIONS | v2/resource-types/{resource_type_id}/items | +| GET/HEAD | v2/resource-types/{resource_type_id}/partial-transfers | +| OPTIONS | v2/resource-types/{resource_type_id}/partial-transfers | +| GET/HEAD | v2/resource-types/{resource_type_id}/partial-transfers/{item_partial_transfer_id} | +| OPTIONS | v2/resource-types/{resource_type_id}/partial-transfers/{item_partial_transfer_id} | +| DELETE | v2/resource-types/{resource_type_id}/partial-transfers/{item_partial_transfer_id} | +| GET/HEAD | v2/resource-types/{resource_type_id}/permitted-users | +| OPTIONS | v2/resource-types/{resource_type_id}/permitted-users | +| GET/HEAD | v2/resource-types/{resource_type_id}/resources | +| OPTIONS | v2/resource-types/{resource_type_id}/resources | +| POST | v2/resource-types/{resource_type_id}/resources | +| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id} | +| OPTIONS | v2/resource-types/{resource_type_id}/resources/{resource_id} | +| PATCH | v2/resource-types/{resource_type_id}/resources/{resource_id} | +| DELETE | v2/resource-types/{resource_type_id}/resources/{resource_id} | +| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items | +| OPTIONS | v2/resource-types/{resource_type_id}/resources/{resource_id}/items | +| POST | v2/resource-types/{resource_type_id}/resources/{resource_id}/items | +| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id} | +| OPTIONS | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id} | +| PATCH | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id} | +| DELETE | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id} | +| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories | +| OPTIONS | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories | +| POST | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories | +| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id} | +| OPTIONS | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id} | +| DELETE | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id} | +| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories | +| OPTIONS | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories | +| POST | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories | +| GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories/{item_subcategory_id} | +| OPTIONS | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories/{item_subcategory_id} | +| DELETE | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/categories/{item_category_id}/subcategories/{item_subcategory_id} | +| OPTIONS | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/partial-transfer | +| POST | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/partial-transfer | +| OPTIONS | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/transfer | +| POST | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/transfer | +| GET/HEAD | v2/resource-types/{resource_type_id}/transfers | +| OPTIONS | v2/resource-types/{resource_type_id}/transfers | +| GET/HEAD | v2/resource-types/{resource_type_id}/transfers/{item_transfer_id} | +| OPTIONS | v2/resource-types/{resource_type_id}/transfers/{item_transfer_id} | +| GET/HEAD | v2/request/error-log | +| OPTIONS | v2/request/error-log | +| POST | v2/request/error-log | +| GET/HEAD | v2/tools/cache | +| OPTIONS | v2/tools/cache | +| DELETE | v2/tools/cache | ## Summary routes @@ -219,20 +218,20 @@ parameters to breakdown the data, one example being Review the OPTIONS request for each summary route to see the supported parameters, these should largely match the matching non-summary route. -| HTTP Verb(s) | Route | -| :--- | :--- | -| GET/HEAD | v2/summary/resource-types | -| OPTIONS | v2/summary/resource-types | -| GET/HEAD | v2/summary/resource-types/{resource_type_id}/categories | -| OPTIONS | v2/summary/resource-types/{resource_type_id}/categories | -| GET/HEAD | v2/summary/resource-types/{resource_type_id}/categories/{category_id}/subcategories | -| OPTIONS | v2/summary/resource-types/{resource_type_id}/categories/{category_id}/subcategories | -| GET/HEAD | v2/summary/resource-types/{resource_type_id}/items | -| OPTIONS | v2/summary/resource-types/{resource_type_id}/items | -| GET/HEAD | v2/summary/resource-types/{resource_type_id}/resources | -| OPTIONS | v2/summary/resource-types/{resource_type_id}/resources | -| GET/HEAD | v2/summary/resource-types/{resource_type_id}/resources/{resource_id}/items | -| OPTIONS | v2/summary/resource-types/{resource_type_id}/resources/{resource_id}/items | +| HTTP Verb(s) | Route | +|:-------------|:------------------------------------------------------------------------------------| +| GET/HEAD | v2/summary/resource-types | +| OPTIONS | v2/summary/resource-types | +| GET/HEAD | v2/summary/resource-types/{resource_type_id}/categories | +| OPTIONS | v2/summary/resource-types/{resource_type_id}/categories | +| GET/HEAD | v2/summary/resource-types/{resource_type_id}/categories/{category_id}/subcategories | +| OPTIONS | v2/summary/resource-types/{resource_type_id}/categories/{category_id}/subcategories | +| GET/HEAD | v2/summary/resource-types/{resource_type_id}/items | +| OPTIONS | v2/summary/resource-types/{resource_type_id}/items | +| GET/HEAD | v2/summary/resource-types/{resource_type_id}/resources | +| OPTIONS | v2/summary/resource-types/{resource_type_id}/resources | +| GET/HEAD | v2/summary/resource-types/{resource_type_id}/resources/{resource_id}/items | +| OPTIONS | v2/summary/resource-types/{resource_type_id}/resources/{resource_id}/items | ## Tests @@ -242,17 +241,17 @@ You can see our progress in the table below. We are hoping to add tests in each not too concerned about missing anything as we still have all our tests in Postman, we won't disable our test monitor until our local test suite is as complete as the Postman request tests. -| Controller | Progress | -| :--- | :--- | -| Authentication | Complete (34 Tests/62 Assertions) | -| CategoryManage | Not started | -| ItemCategoryManage | Not started | -| ItemManage | Not started | -| ItemPartialTransferManage | Not started | -| ItemSubcategoryManage | Not started | -| ItemTransferManage | Not started | -| RequestManage | Not started | -| ResourceManage | In Progress (3 Tests/8 Assertions) | -| ResourceTypeManage | Complete (14 Tests/30 Assertions) | -| SubcategoryManage | Not started | -| ToolManage | Not started | +| Controller | Progress | +|:--------------------------|:-----------------------------------| +| Authentication | Complete (34 Tests/62 Assertions) | +| CategoryManage | Not started | +| ItemCategoryManage | Not started | +| ItemManage | Not started | +| ItemPartialTransferManage | Not started | +| ItemSubcategoryManage | Not started | +| ItemTransferManage | Not started | +| RequestManage | Not started | +| ResourceManage | In Progress (3 Tests/8 Assertions) | +| ResourceTypeManage | Complete (14 Tests/30 Assertions) | +| SubcategoryManage | Not started | +| ToolManage | Not started | diff --git a/docker-compose.yml b/docker-compose.yml index d6880fd5..a2c4fbbf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,9 +10,9 @@ services: - 8080:80 volumes: - .:/var/www/html - # - /.docker/api/php/vendor # Uncomment to use local vendor directory for development env_file: .env environment: + TZ: UTC DB_HOST: ${DB_HOST} DB_DATABASE: ${DB_DATABASE} DB_USERNAME: ${DB_USERNAME} @@ -27,6 +27,7 @@ services: - 3308:3306 env_file: .env environment: + TZ: UTC MYSQL_DATABASE: ${DB_DATABASE} MYSQL_USER: ${DB_USERNAME} MYSQL_PASSWORD: ${DB_PASSWORD} diff --git a/testing.sqlite b/testing.sqlite deleted file mode 100644 index e69de29b..00000000 diff --git a/webpack.mix.js b/webpack.mix.js deleted file mode 100644 index 72fdbb16..00000000 --- a/webpack.mix.js +++ /dev/null @@ -1,15 +0,0 @@ -let mix = require('laravel-mix'); - -/* - |-------------------------------------------------------------------------- - | Mix Asset Management - |-------------------------------------------------------------------------- - | - | Mix provides a clean, fluent API for defining some Webpack build steps - | for your Laravel application. By default, we are compiling the Sass - | file for the application as well as bundling up all the JS files. - | - */ - -mix.js('resources/assets/js/app.js', 'public/js') - .sass('resources/assets/sass/app.scss', 'public/css');