nurev 0.0.7 → 0.0.9

package/templates/base/frontend/package.json

@@ -13,7 +13,7 @@
     "jsonwebtoken": "^9.0.3",
     "nuxt": "^4.4.2",
     "pocketbase": "^0.26.8",
-    "vue": "^3.5.30",
+    "vue": "^3.5.31",
     "vue-router": "^5.0.4"
   },
   "devDependencies": {

package/templates/pocketbase/README.md

@@ -47,33 +47,23 @@ Tech stack:
   NUXT_JWT_SECRET=secretjwt
   ```
 
-2. Create symbolic links for the environment variables with
-
-```bash
-make setup
-```
-
-3. Start backend dev mode
+2. Start backend dev mode
 
 ```bash
 make backend-dev
 ```
 
-4. Open [http://localhost:8090](`http://localhost:8090/_/) and create a superuser
-
-5. Create a user inside `users` collection with the same values inside `NUXT_POCKETBASE_USER` and `NUXT_POCKETBASE_PASSWORD`
-
-6. Create a collection named `posts` and change API Rules for give permissions with `@request.auth.id != ""`
+3. Create a collection named `posts` and change API Rules for give permissions with `@request.auth.id != ""`
 
-7. Create a new post
+4. Create a new post
 
-8. Start frontend dev mode
+5. Start frontend dev mode
 
 ```bash
 make frontend-dev
 ```
 
-8. Open `http://localhost:3000/posts/[id]` and replace `[id]` with the post id created in the 6. step
+6. Open `http://localhost:3000/posts/[id]` and replace `[id]` with the post id created in the 6. step
 
 ## Build
 

package/templates/pocketbase/backend/go.mod

@@ -5,7 +5,7 @@ go 1.25.0
 require (
 	github.com/golang-jwt/jwt/v5 v5.3.1
 	github.com/joho/godotenv v1.5.1
-	github.com/pocketbase/pocketbase v0.36.7
+	github.com/pocketbase/pocketbase v0.36.8
 )
 
 require (
@@ -13,7 +13,7 @@ require (
 	github.com/disintegration/imaging v1.6.2 // indirect
 	github.com/domodwyer/mailyak/v3 v3.6.2 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/fatih/color v1.18.0 // indirect
+	github.com/fatih/color v1.19.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.13 // indirect
 	github.com/ganigeorgiev/fexpr v0.5.0 // indirect
 	github.com/go-ozzo/ozzo-validation/v4 v4.3.0 // indirect
@@ -29,7 +29,7 @@ require (
 	github.com/spf13/cobra v1.10.2 // indirect
 	github.com/spf13/pflag v1.0.10 // indirect
 	golang.org/x/crypto v0.49.0 // indirect
-	golang.org/x/image v0.37.0 // indirect
+	golang.org/x/image v0.38.0 // indirect
 	golang.org/x/net v0.52.0 // indirect
 	golang.org/x/oauth2 v0.36.0 // indirect
 	golang.org/x/sync v0.20.0 // indirect
@@ -38,5 +38,5 @@ require (
 	modernc.org/libc v1.70.0 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect
-	modernc.org/sqlite v1.46.2 // indirect
+	modernc.org/sqlite v1.48.0 // indirect
 )

package/templates/pocketbase/backend/go.sum

@@ -12,6 +12,8 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
+github.com/fatih/color v1.19.0 h1:Zp3PiM21/9Ld6FzSKyL5c/BULoe/ONr9KlbYVOfG8+w=
+github.com/fatih/color v1.19.0/go.mod h1:zNk67I0ZUT1bEGsSGyCZYZNrHuTkJJB+r6Q9VuMi0LE=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/gabriel-vasile/mimetype v1.4.13 h1:46nXokslUBsAJE/wMsp5gtO500a4F3Nkz9Ufpk2AcUM=
@@ -53,6 +55,8 @@ github.com/pocketbase/dbx v1.12.0 h1:/oLErM+A0b4xI0PWTGPqSDVjzix48PqI/bng2l0PzoA
 github.com/pocketbase/dbx v1.12.0/go.mod h1:xXRCIAKTHMgUCyCKZm55pUOdvFziJjQfXaWKhu2vhMs=
 github.com/pocketbase/pocketbase v0.36.7 h1:MrViB7BptPYrf2Nt25pJEYBqUdFjuhRKu1p5GTrkvPA=
 github.com/pocketbase/pocketbase v0.36.7/go.mod h1:qX4HuVjoKXtEg41fSJVM0JLfGWXbBmHxVv/FaE446r4=
+github.com/pocketbase/pocketbase v0.36.8 h1:gCNqoesZ44saYOD3J7edhi5nDwUWKyQG7boM/kVwz2c=
+github.com/pocketbase/pocketbase v0.36.8/go.mod h1:OY4WaXbP0WnF/EXoBbboWJK+ZSZ1A85tiA0sjrTKxTA=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
@@ -75,6 +79,8 @@ golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtC
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.37.0 h1:ZiRjArKI8GwxZOoEtUfhrBtaCN+4b/7709dlT6SSnQA=
 golang.org/x/image v0.37.0/go.mod h1:/3f6vaXC+6CEanU4KJxbcUZyEePbyKbaLoDOe4ehFYY=
+golang.org/x/image v0.38.0 h1:5l+q+Y9JDC7mBOMjo4/aPhMDcxEptsX+Tt3GgRQRPuE=
+golang.org/x/image v0.38.0/go.mod h1:/3f6vaXC+6CEanU4KJxbcUZyEePbyKbaLoDOe4ehFYY=
 golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
 golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
@@ -124,6 +130,8 @@ modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
 modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
 modernc.org/sqlite v1.46.2 h1:gkXQ6R0+AjxFC/fTDaeIVLbNLNrRoOK7YYVz5BKhTcE=
 modernc.org/sqlite v1.46.2/go.mod h1:hWjRO6Tj/5Ik8ieqxQybiEOUXy0NJFNp2tpvVpKlvig=
+modernc.org/sqlite v1.48.0 h1:ElZyLop3Q2mHYk5IFPPXADejZrlHu7APbpB0sF78bq4=
+modernc.org/sqlite v1.48.0/go.mod h1:hWjRO6Tj/5Ik8ieqxQybiEOUXy0NJFNp2tpvVpKlvig=
 modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
 modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=

package/templates/pocketbase-bun/Makefile

@@ -1,4 +1,4 @@
-.PHONY: all backend-build backend-update backend-dev backend-run backend-setup \
+.PHONY: all backend-build backend-update backend-dev backend-run backend-setup backend-superuser \
         frontend-install frontend-dev frontend-build frontend-preview frontend-setup\
         help setup build install
         
@@ -26,6 +26,10 @@ backend-dev:  backend-update
 backend-run: backend-build
 	@echo "Running backend..."
 	cd backend && ./backend serve
+	
+backend-superuser: backend-update
+	@echo "Adding superuser..."
+	cd backend && go run . superuser create $(email) $(password)
 
 # Frontend targets
 frontend-setup:
@@ -64,6 +68,7 @@ help:
 	@echo "  make backend-dev      - Run the backend development only"
 	@echo "  make backend-run      - Run the backend only"
 	@echo "  make backend-update   - Update backend dependencies"
+	@echo "  make backend-superuser email=test@test.com password=123  - Add a new superuser"
 	@echo "  make frontend-setup   - Create a symbolic link for frontend"
 	@echo "  make frontend-install - Install frontend dependencies"
 	@echo "  make frontend-dev     - Start frontend development server"

package/templates/pocketbase-npm/Makefile

@@ -1,4 +1,4 @@
-.PHONY: all backend-build backend-update backend-dev backend-run backend-setup \
+.PHONY: all backend-build backend-update backend-dev backend-run backend-setup backend-superuser \
         frontend-install frontend-dev frontend-build frontend-preview frontend-setup\
         help setup build install
         
@@ -27,6 +27,9 @@ backend-run: backend-build
 	@echo "Running backend..."
 	cd backend && ./backend serve
 
+backend-superuser: backend-update
+	@echo "Adding superuser..."
+	cd backend && go run . superuser create $(email) $(password)
 # Frontend targets
 frontend-setup:
 	@echo "Preparing frontend..."
@@ -64,6 +67,7 @@ help:
 	@echo "  make backend-dev      - Run the backend development only"
 	@echo "  make backend-run      - Run the backend only"
 	@echo "  make backend-update   - Update backend dependencies"
+	@echo "  make backend-superuser email=test@test.com password=123  - Add a new superuser"
 	@echo "  make frontend-setup   - Create a symbolic link for frontend"
 	@echo "  make frontend-install - Install frontend dependencies"
 	@echo "  make frontend-dev     - Start frontend development server"

package/templates/pocketbase-pnpm/Makefile

@@ -1,4 +1,4 @@
-.PHONY: all backend-build backend-update backend-dev backend-run backend-setup \
+.PHONY: all backend-build backend-update backend-dev backend-run backend-setup backend-superuser \
         frontend-install frontend-dev frontend-build frontend-preview frontend-setup\
         help setup build install
         
@@ -27,6 +27,10 @@ backend-run: backend-build
 	@echo "Running backend..."
 	cd backend && ./backend serve
 
+backend-superuser: backend-update
+	@echo "Adding superuser..."
+	cd backend && go run . superuser create $(email) $(password)
+	
 # Frontend targets
 frontend-setup:
 	@echo "Preparing frontend..."
@@ -64,6 +68,7 @@ help:
 	@echo "  make backend-dev      - Run the backend development only"
 	@echo "  make backend-run      - Run the backend only"
 	@echo "  make backend-update   - Update backend dependencies"
+	@echo "  make backend-superuser email=test@test.com password=123  - Add a new superuser"
 	@echo "  make frontend-setup   - Create a symbolic link for frontend"
 	@echo "  make frontend-install - Install frontend dependencies"
 	@echo "  make frontend-dev     - Start frontend development server"

package/utils/sqlite.js

@@ -0,0 +1,33 @@
+import Database from "better-sqlite3";
+
+export class SQLiteManager {
+  constructor(filePath) {
+    this.db = new Database(filePath);
+  }
+
+  create(name, params) {
+    return new Promise(async (resolve, reject) => {
+      try {
+        this.db.exec(
+          `CREATE TABLE IF NOT EXIST ${name} (${params.toString()})`,
+        );
+        resolve();
+      } catch (error) {
+        reject(error);
+      }
+    });
+  }
+
+  insert(name, values) {
+    return new Promise(async (resolve, reject) => {
+      try {
+        this.db.exec(
+          `INSERT INTO ${name} (${Object.keys(values).toString()}) VALUES (${Object.values(values).toString()})`,
+        );
+        resolve();
+      } catch (error) {
+        reject(error);
+      }
+    });
+  }
+}

package/workflows/pocketbase/index.js

@@ -0,0 +1,86 @@
+import { default as prompts } from "prompts";
+import { writeEnvFile } from "../../utils/file.js";
+import { spawnPromise } from "../../utils/cmd.js";
+import { SQLiteManager } from "../../utils/sqlite.js";
+import { default as bcrypt } from "bcrypt";
+
+const questions = [
+  {
+    type: "text",
+    name: "admin",
+    message: "Email address to assign to the Pocketbase superuser",
+  },
+  {
+    type: "text",
+    style: "password",
+    name: "adminpassword",
+    message: "Password for superuser",
+    validate: (password) =>
+      password.length > 7 ? true : `8 characters needed or more`,
+  },
+  {
+    type: "text",
+    name: "user",
+    message: "Email for the API user",
+  },
+  {
+    type: "text",
+    style: "password",
+    name: "userpassword",
+    message: "Password for API user",
+    validate: (userpassword) =>
+      userpassword.length > 7 ? true : `8 characters needed or more`,
+  },
+];
+
+export function setup(paths) {
+  return new Promise(async (resolve, reject) => {
+    try {
+      console.log(`\n Pocketbase selected \n`);
+      const responsePocketbase = await prompts(questions);
+
+      if (
+        Object.keys(questions).length !== Object.keys(responsePocketbase).length
+      ) {
+        reject(new Error("Questions not completed"));
+      }
+
+      await writeEnvFile(paths.destination.env, {
+        NUXT_POCKETBASE_USER: responsePocketbase.user,
+        NUXT_POCKETBASE_PASSWORD: responsePocketbase.userpassword,
+        NUXT_JWT_SECRET: Buffer.from(
+          crypto.getRandomValues(new Uint8Array(32)),
+        ).toString("hex"),
+      });
+
+      await spawnPromise("make", [
+        "-s",
+        "backend-superuser",
+        `email=${responsePocketbase.admin}`,
+        `password=${responsePocketbase.adminpassword}`,
+      ]);
+
+      const hash = bcrypt.hashSync(responsePocketbase.userpassword, 12);
+      const db = new SQLiteManager(
+        paths.destination.base + "/backend/pb_data/data.db",
+      );
+      const date = new Date().toISOString().replace("T", " ");
+
+      await db.insert("users", {
+        created: `'${date}'`,
+        email: `'${responsePocketbase.user}'`,
+        emailVisibility: false,
+        password: `'${hash}'`,
+        updated: `'${date}'`,
+        verified: false,
+      });
+
+      console.log(`\nUser API created\n`);
+
+      //TODO: POSTS TABLE
+      resolve();
+    } catch (error) {
+      reject(error);
+    }
+  });
+}