Merge branch 'deploy' into 'main'

Deploy

See merge request flycro/flycro-me!7
merge-requests/9/head
Flycro 2022-01-09 15:49:36 +00:00
commit d3a500e0d4
3 changed files with 9 additions and 11 deletions

View File

@ -13,6 +13,7 @@ building:
- "chown -R octo-deploy:www-data /var/www/html/flycro.me/flycro.me" - "chown -R octo-deploy:www-data /var/www/html/flycro.me/flycro.me"
- "find /var/www/html/flycro.me/flycro.me -type f -exec chmod 664 {} \\;" - "find /var/www/html/flycro.me/flycro.me -type f -exec chmod 664 {} \\;"
- "find /var/www/html/flycro.me/flycro.me -type d -exec chmod 775 {} \\;" - "find /var/www/html/flycro.me/flycro.me -type d -exec chmod 775 {} \\;"
- "rm -r /var/www/html/flycro.me/flycro.me/*"
- "cp -af /var/www/html/flycro.me/deployment-flycro.me/dist/. /var/www/html/flycro.me/flycro.me/" - "cp -af /var/www/html/flycro.me/deployment-flycro.me/dist/. /var/www/html/flycro.me/flycro.me/"
stage: build stage: build
deploying: deploying:

8
public/.htaccess Normal file
View File

@ -0,0 +1,8 @@
<IfModule mod_rewrite.c>
RewriteEngine On
RewriteBase /
RewriteRule ^index\.html$ - [L]
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule . /index.html [L]
</IfModule>

View File

@ -70,7 +70,6 @@ html.dark {
font-weight: 200; font-weight: 200;
src: url('/assets/fonts/titillium-web-v10-latin-200.eot'); /* IE9 Compat Modes */ src: url('/assets/fonts/titillium-web-v10-latin-200.eot'); /* IE9 Compat Modes */
src: local(''), src: local(''),
url('/assets/fonts/titillium-web-v10-latin-200.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('/assets/fonts/titillium-web-v10-latin-200.woff2') format('woff2'), /* Super Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-200.woff2') format('woff2'), /* Super Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-200.woff') format('woff'), /* Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-200.woff') format('woff'), /* Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-200.ttf') format('truetype'), /* Safari, Android, iOS */ url('/assets/fonts/titillium-web-v10-latin-200.ttf') format('truetype'), /* Safari, Android, iOS */
@ -85,7 +84,6 @@ html.dark {
font-weight: 200; font-weight: 200;
src: url('/assets/fonts/titillium-web-v10-latin-200italic.eot'); /* IE9 Compat Modes */ src: url('/assets/fonts/titillium-web-v10-latin-200italic.eot'); /* IE9 Compat Modes */
src: local(''), src: local(''),
url('/assets/fonts/titillium-web-v10-latin-200italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('/assets/fonts/titillium-web-v10-latin-200italic.woff2') format('woff2'), /* Super Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-200italic.woff2') format('woff2'), /* Super Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-200italic.woff') format('woff'), /* Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-200italic.woff') format('woff'), /* Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-200italic.ttf') format('truetype'), /* Safari, Android, iOS */ url('/assets/fonts/titillium-web-v10-latin-200italic.ttf') format('truetype'), /* Safari, Android, iOS */
@ -100,7 +98,6 @@ html.dark {
font-weight: 300; font-weight: 300;
src: url('/assets/fonts/titillium-web-v10-latin-300.eot'); /* IE9 Compat Modes */ src: url('/assets/fonts/titillium-web-v10-latin-300.eot'); /* IE9 Compat Modes */
src: local(''), src: local(''),
url('/assets/fonts/titillium-web-v10-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('/assets/fonts/titillium-web-v10-latin-300.woff2') format('woff2'), /* Super Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-300.woff2') format('woff2'), /* Super Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-300.woff') format('woff'), /* Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-300.woff') format('woff'), /* Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-300.ttf') format('truetype'), /* Safari, Android, iOS */ url('/assets/fonts/titillium-web-v10-latin-300.ttf') format('truetype'), /* Safari, Android, iOS */
@ -115,7 +112,6 @@ html.dark {
font-weight: 300; font-weight: 300;
src: url('/assets/fonts/titillium-web-v10-latin-300italic.eot'); /* IE9 Compat Modes */ src: url('/assets/fonts/titillium-web-v10-latin-300italic.eot'); /* IE9 Compat Modes */
src: local(''), src: local(''),
url('/assets/fonts/titillium-web-v10-latin-300italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('/assets/fonts/titillium-web-v10-latin-300italic.woff2') format('woff2'), /* Super Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-300italic.woff2') format('woff2'), /* Super Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-300italic.woff') format('woff'), /* Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-300italic.woff') format('woff'), /* Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-300italic.ttf') format('truetype'), /* Safari, Android, iOS */ url('/assets/fonts/titillium-web-v10-latin-300italic.ttf') format('truetype'), /* Safari, Android, iOS */
@ -130,7 +126,6 @@ html.dark {
font-weight: 400; font-weight: 400;
src: url('/assets/fonts/titillium-web-v10-latin-regular.eot'); /* IE9 Compat Modes */ src: url('/assets/fonts/titillium-web-v10-latin-regular.eot'); /* IE9 Compat Modes */
src: local(''), src: local(''),
url('/assets/fonts/titillium-web-v10-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('/assets/fonts/titillium-web-v10-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-regular.woff') format('woff'), /* Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-regular.woff') format('woff'), /* Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('/assets/fonts/titillium-web-v10-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
@ -145,7 +140,6 @@ html.dark {
font-weight: 400; font-weight: 400;
src: url('/assets/fonts/titillium-web-v10-latin-italic.eot'); /* IE9 Compat Modes */ src: url('/assets/fonts/titillium-web-v10-latin-italic.eot'); /* IE9 Compat Modes */
src: local(''), src: local(''),
url('/assets/fonts/titillium-web-v10-latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('/assets/fonts/titillium-web-v10-latin-italic.woff2') format('woff2'), /* Super Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-italic.woff2') format('woff2'), /* Super Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-italic.woff') format('woff'), /* Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-italic.woff') format('woff'), /* Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */ url('/assets/fonts/titillium-web-v10-latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */
@ -160,7 +154,6 @@ html.dark {
font-weight: 600; font-weight: 600;
src: url('/assets/fonts/titillium-web-v10-latin-600.eot'); /* IE9 Compat Modes */ src: url('/assets/fonts/titillium-web-v10-latin-600.eot'); /* IE9 Compat Modes */
src: local(''), src: local(''),
url('/assets/fonts/titillium-web-v10-latin-600.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('/assets/fonts/titillium-web-v10-latin-600.woff2') format('woff2'), /* Super Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-600.woff2') format('woff2'), /* Super Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-600.woff') format('woff'), /* Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-600.woff') format('woff'), /* Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-600.ttf') format('truetype'), /* Safari, Android, iOS */ url('/assets/fonts/titillium-web-v10-latin-600.ttf') format('truetype'), /* Safari, Android, iOS */
@ -175,7 +168,6 @@ html.dark {
font-weight: 600; font-weight: 600;
src: url('/assets/fonts/titillium-web-v10-latin-600italic.eot'); /* IE9 Compat Modes */ src: url('/assets/fonts/titillium-web-v10-latin-600italic.eot'); /* IE9 Compat Modes */
src: local(''), src: local(''),
url('/assets/fonts/titillium-web-v10-latin-600italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('/assets/fonts/titillium-web-v10-latin-600italic.woff2') format('woff2'), /* Super Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-600italic.woff2') format('woff2'), /* Super Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-600italic.woff') format('woff'), /* Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-600italic.woff') format('woff'), /* Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-600italic.ttf') format('truetype'), /* Safari, Android, iOS */ url('/assets/fonts/titillium-web-v10-latin-600italic.ttf') format('truetype'), /* Safari, Android, iOS */
@ -190,7 +182,6 @@ html.dark {
font-weight: 700; font-weight: 700;
src: url('/assets/fonts/titillium-web-v10-latin-700.eot'); /* IE9 Compat Modes */ src: url('/assets/fonts/titillium-web-v10-latin-700.eot'); /* IE9 Compat Modes */
src: local(''), src: local(''),
url('/assets/fonts/titillium-web-v10-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('/assets/fonts/titillium-web-v10-latin-700.woff2') format('woff2'), /* Super Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-700.woff') format('woff'), /* Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-700.woff') format('woff'), /* Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */ url('/assets/fonts/titillium-web-v10-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
@ -205,7 +196,6 @@ html.dark {
font-weight: 700; font-weight: 700;
src: url('/assets/fonts/titillium-web-v10-latin-700italic.eot'); /* IE9 Compat Modes */ src: url('/assets/fonts/titillium-web-v10-latin-700italic.eot'); /* IE9 Compat Modes */
src: local(''), src: local(''),
url('/assets/fonts/titillium-web-v10-latin-700italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('/assets/fonts/titillium-web-v10-latin-700italic.woff2') format('woff2'), /* Super Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-700italic.woff2') format('woff2'), /* Super Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-700italic.woff') format('woff'), /* Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-700italic.woff') format('woff'), /* Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-700italic.ttf') format('truetype'), /* Safari, Android, iOS */ url('/assets/fonts/titillium-web-v10-latin-700italic.ttf') format('truetype'), /* Safari, Android, iOS */
@ -220,7 +210,6 @@ html.dark {
font-weight: 900; font-weight: 900;
src: url('/assets/fonts/titillium-web-v10-latin-900.eot'); /* IE9 Compat Modes */ src: url('/assets/fonts/titillium-web-v10-latin-900.eot'); /* IE9 Compat Modes */
src: local(''), src: local(''),
url('/assets/fonts/titillium-web-v10-latin-900.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('/assets/fonts/titillium-web-v10-latin-900.woff2') format('woff2'), /* Super Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-900.woff2') format('woff2'), /* Super Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-900.woff') format('woff'), /* Modern Browsers */ url('/assets/fonts/titillium-web-v10-latin-900.woff') format('woff'), /* Modern Browsers */
url('/assets/fonts/titillium-web-v10-latin-900.ttf') format('truetype'), /* Safari, Android, iOS */ url('/assets/fonts/titillium-web-v10-latin-900.ttf') format('truetype'), /* Safari, Android, iOS */