diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index 45e8f870..e2077d77 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -47,9 +47,9 @@ jobs:
- name: Compile assets for production
run: npm run production
+ # TODO Запускать только на релизах
deploy:
runs-on: ubuntu-latest
- # TODO Manual action
needs: laravel_tests
steps:
- name: Checkout
@@ -58,9 +58,12 @@ jobs:
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.SSH_HOST }}
- key: ${{ secrets.SSH_PRIVATE_KEY }}
- username: ${{ secrets.SSH_USERNAME }}
+ # key: ${{ secrets.SSH_PRIVATE_KEY }}
+ username: web
+ password: ${{ secrets.SSH_PASSWORD }}
# TODO composer install --allow-root --no-interaction
script: |
+ whoami
cd /var/www/web/sites/secretnotes.ru
git pull origin main
+ git show --summary
diff --git a/.htaccess b/.htaccess
index 8623e2d5..8d8d4fbb 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,5 +1,6 @@
+# Это файл .htaccess необходим для корректной работы на VDS NetAndels
- RewriteEngine on
- RewriteCond %{REQUEST_URI} !^public
- RewriteRule ^(.*)$ public/$1 [L]
-
+ RewriteEngine on
+ RewriteCond %{REQUEST_URI} !^public
+ RewriteRule ^(.*)$ public/$1 [L]
+
diff --git a/README.md b/README.md
index 0eb7536d..95e774f0 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ sudo apt install software-properties-common
sudo apt update
sudo add-apt-repository ppa:ondrej/php
sudo apt update
-sudo apt install php8.0-common php8.0-cli -y
+sudo apt install php8.0-common php8.0-cli php8.0-mysql php8.0-mbstring -y
```
Если необходимо, доустанавливаем PHP-расширения на виртуалке:
@@ -79,13 +79,36 @@ php -r "file_exists('.env') || copy('.env.example', '.env');"
composer install
+chmod -R 777 storage bootstrap/cache
+
php artisan key:generate
-chmod -R 777 storage bootstrap/cache
+Вносим корректные реквизиты в `.env` файл:
+
+Создаём БД `secretnotes` через phpMyAdmin
+
+php artisan migrate:fresh --seed
+
+
+
+## Front
+
+На виртуалке:
+
+cd ~
+curl -sL https://deb.nodesource.com/setup_16.x -o /tmp/nodesource_setup.sh
+sudo bash /tmp/nodesource_setup.sh
+sudo apt install nodejs
+При вводе `node -v` видим:
+v16.6.1
+sudo apt install npm
+После этого билдим непосредственно фронтовые зависимости:
+npm install
+npm run production
diff --git a/composer.json b/composer.json
index 1de11125..6a14cbf4 100644
--- a/composer.json
+++ b/composer.json
@@ -55,7 +55,8 @@
"config": {
"optimize-autoloader": true,
"preferred-install": "dist",
- "sort-packages": true
+ "sort-packages": true,
+ "platform-check": false
},
"minimum-stability": "dev",
"prefer-stable": true
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index dd6a45db..0c8f8c06 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -50,7 +50,7 @@