Fixes workflow and moves package.json to root directory

4 files changed, 21 insertions, 24 deletions

diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index 8b5add3..d2b1374 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -30,11 +30,11 @@ jobs:
       - name: Install dependencies
         run: npm ci
       - name: Build with Astro
-        run: npx astro build
+        run: npm run build
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
-          aws-region: eu-west-2
+          aws-region: us-east-1
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       - name: Sync S3 bucket
@@ -42,4 +42,5 @@ jobs:
           aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
           aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
           aws configure set region eu-west-2
-          aws s3 sync ./dist/ "s3://joeac.net-$S3_BUCKET_SUFFIX" --delete
+          aws s3 sync ./website/dist/ "s3://joeac.net-$S3_BUCKET_SUFFIX" --delete
+
diff --git a/website/package-lock.json b/package-lock.json
index 50ad631..2c1fde7 100644
--- a/website/package-lock.json
+++ b/package-lock.json
@@ -5,8 +5,6 @@
   "requires": true,
   "packages": {
     "": {
-      "name": "joeac.net",
-      "version": "0.0.1",
       "dependencies": {
         "@astrojs/check": "^0.5.10",
         "@astrojs/rss": "^4.0.5",
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..b97a6ba
--- /dev/null
+++ b/package.json
@@ -0,0 +1,17 @@
+{
+  "private": "true",
+  "scripts": {
+    "dev": "cd website && astro dev",
+    "start": "cd website && astro dev",
+    "build": "cd website && astro check && astro build",
+    "preview": "cd cd website && webiste && astro preview",
+    "astro": "cd website && astro"
+  },
+  "dependencies": {
+    "@astrojs/check": "^0.5.10",
+    "@astrojs/rss": "^4.0.5",
+    "@astrojs/sitemap": "^3.1.2",
+    "astro": "^4.5.12",
+    "typescript": "^5.4.3"
+  }
+}
diff --git a/website/package.json b/website/package.json
deleted file mode 100644
index ec8cb15..0000000
--- a/website/package.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "joeac.net",
-  "type": "module",
-  "version": "0.0.1",
-  "scripts": {
-	"dev": "astro dev",
-	"start": "astro dev",
-	"build": "astro check && astro build",
-	"preview": "astro preview",
-	"astro": "astro"
-  },
-  "dependencies": {
-	"@astrojs/check": "^0.5.10",
-	"@astrojs/rss": "^4.0.5",
-	"@astrojs/sitemap": "^3.1.2",
-	"astro": "^4.5.12",
-	"typescript": "^5.4.3"
-  }
-}