diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 3e92a5c..17f0a21 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -14,6 +14,8 @@ jobs: build: name: Build and Deploy runs-on: ubuntu-latest + container: + options: --volume "nginx_static:/usr/share/nginx/static:rw" steps: - name: Checkout @@ -21,8 +23,6 @@ jobs: - name: Setup pnpm uses: pnpm/action-setup@v4.0.0 - # with: - # version: 9.2.0 - name: Install dependencies run: pnpm install @@ -31,4 +31,4 @@ jobs: run: pnpm run build - name: Copy files to public folder - run: rm -rdf ${{ vars.PUBLIC_DIR }}; mkdir -p ${{ vars.PUBLIC_DIR }}; cp -rf public/* ${{ vars.PUBLIC_DIR }} + run: mkdir -p /usr/share/nginx/static/fpv; cp -rf public/* /usr/share/nginx/static/fpv diff --git a/.gitignore b/.gitignore index 136583f..8070b7a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.work/ + # Logs logs *.log diff --git a/.volumes/nginx/conf/conf.d/default.conf b/.volumes/nginx/conf/conf.d/default.conf index d26be5c..7ce585b 100644 --- a/.volumes/nginx/conf/conf.d/default.conf +++ b/.volumes/nginx/conf/conf.d/default.conf @@ -5,18 +5,21 @@ server { #access_log /var/log/nginx/host.access.log main; + root /usr/share/nginx/public; + location / { - root /usr/share/nginx/public; - index index.html; - ssi on; - try_files $uri $uri/ $uri.html =404; + index index.html; + try_files $uri $uri/ $uri.html =404; + ssi on; + } + + location /includes/ { + try_files $uri $uri/ $uri.html =404; + ssi on; + add_header X-Robots-Tag "noindex, nofollow"; } error_page 404 /404.html; - location = /404.html { - root /usr/share/nginx/public; - } - error_page 500 502 503 504 /50x.html; location = /50x.html { root /usr/share/nginx/html; diff --git a/public/assets/font/ERASDEMI.TTF b/public/assets/font/ERASDEMI.TTF new file mode 100644 index 0000000..4e6bfd1 Binary files /dev/null and b/public/assets/font/ERASDEMI.TTF differ diff --git a/public/assets/font/ERASMD.TTF b/public/assets/font/ERASMD.TTF new file mode 100644 index 0000000..bfb1b66 Binary files /dev/null and b/public/assets/font/ERASMD.TTF differ diff --git a/public/assets/font/GOTHICB.TTF b/public/assets/font/GOTHICB.TTF new file mode 100644 index 0000000..d3577b9 Binary files /dev/null and b/public/assets/font/GOTHICB.TTF differ diff --git a/public/assets/static/DSC_4615.png b/public/assets/static/DSC_4615.png new file mode 100644 index 0000000..9a67798 Binary files /dev/null and b/public/assets/static/DSC_4615.png differ diff --git a/public/assets/static/GX010078_1703521535190.MP4_snapshot_01.11.jpg b/public/assets/static/GX010078_1703521535190.MP4_snapshot_01.11.jpg new file mode 100644 index 0000000..b3c7a39 Binary files /dev/null and b/public/assets/static/GX010078_1703521535190.MP4_snapshot_01.11.jpg differ diff --git a/public/assets/static/logo-aerialshots-v1-w.png b/public/assets/static/logo-aerialshots-v1-w.png new file mode 100644 index 0000000..d510292 Binary files /dev/null and b/public/assets/static/logo-aerialshots-v1-w.png differ diff --git a/public/assets/static/sa-rapita-2483668_640.jpg b/public/assets/static/sa-rapita-2483668_640.jpg new file mode 100644 index 0000000..9842b73 Binary files /dev/null and b/public/assets/static/sa-rapita-2483668_640.jpg differ diff --git a/public/assets/static/showreel-sketch.mp4 b/public/assets/static/showreel-sketch.mp4 new file mode 100644 index 0000000..5d78de6 --- /dev/null +++ b/public/assets/static/showreel-sketch.mp4 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c6b4245d063cb1b6dca0989aa2574600e3f5be78d600a4d20590ae0f897f76d +size 133765212 diff --git a/public/includes/footer.html b/public/includes/footer.html index b861ead..672a1f9 100644 --- a/public/includes/footer.html +++ b/public/includes/footer.html @@ -1,30 +1,30 @@ \ No newline at end of file diff --git a/public/includes/nav.html b/public/includes/nav.html index 188f27d..9102c6d 100644 --- a/public/includes/nav.html +++ b/public/includes/nav.html @@ -1,7 +1,7 @@