@nuxtus/nuxtus 1.1.1 → 1.2.0

package/CHANGELOG.md

@@ -1,8 +1,72 @@
 Changelog
 
+# [1.2.0](https://github.com/nuxtus/nuxtus/compare/v1.1.1...v1.2.0) (2022-07-21)
+
+
+### Features
+
+* :zap: directus and nuxt server and port are now configurable ([96bda8b](https://github.com/nuxtus/nuxtus/commit/96bda8bfdd03f2cdca5994b5814070480121e904))
+
 ## [1.1.1](https://github.com/nuxtus/nuxtus/compare/v1.1.0...v1.1.1) (2022-07-11)
 
 
 ### Bug Fixes
 
 * :bug: update @nuxtus/generator to 1.1.2 ([fa02fba](https://github.com/nuxtus/nuxtus/commit/fa02fbae0e00b4dc6c59f3336cb321b43e0d7227))
+
+
+## 1.1.0
+
+- Automatically generate types from collections
+- Tidy up server end point
+- Automatically open browser window on Nuxt start
+
+## 1.0.6
+
+- Add server api endpoint to be used as Directus webhook
+- Update to Directus 9.13.0
+- Update readme with details on using Collections hook
+
+## 1.0.5
+
+- Update nuxtus-cli to v1.0.3
+
+## 1.0.4
+
+- Hard delete the data.db file
+- Update @nuxtus-cli to 1.0.2
+- Update Nuxt to 3.0.0-rc.4
+- Add client, server and start npm scripts
+
+## 1.0.3
+
+- Add Directus CLI to package.json so `npm run cli` works
+- Update getting started instructions to include database migrations
+- Do not upload the sqlite database, create a new one
+- Add default user/password to Directus .env
+- Add @nuxtus/cli to dev dependencies
+- Update `pages/docs.vue` with details on using @nuxtus/cli
+
+## 1.0.2
+
+- Separate create-nuxt command
+
+## 1.0.1
+
+- Correct create command in readme
+- Add details on using Nuxtus CLI
+- Update feedback when installing dependencies
+
+## 1.0.0
+
+- Add `npx nuxtus-create` command
+
+## 0.0.2
+
+- Move to using [nuxt-directus package](https://nuxt-directus.netlify.app/)
+- Add @nuxtus/cli
+- Add .DS_Store to gitignore
+
+## 0.0.1
+
+Initial alpha release.

package/README.md

@@ -46,10 +46,14 @@ $ cd server
 $ npm run cli bootstrap
 ```
 
+> If using Nuxt is not using `http://localhost:3000` update NUXT_SERVER in the `server/.env` file.
+
 ### Nuxt
 
 No set up for Nuxt is required.
 
+> If Directus is not using `http://localhost:8055` update DIRECTUS_SERVER in the `client/.env` file.
+
 ### Starting Nuxtus
 
 From inside your project folder:
@@ -67,8 +71,10 @@ Nuxtus includes a POST endpoint located /api/directus/collection that will run i
 Collections are also typed automatically, simply prepend "Items" to the collection name as per below:
 
 ```typescript
-import { components } from "../interfaces/nuxtus";
-type Test = components["schemas"]["ItemsTest"];
+<script setup lang="ts">
+  import { components } from "../interfaces/nuxtus";
+  type Test = components["schemas"]["ItemsTest"];
+</script>
 ```
 
 > Because OpenAPI schemas may have invalid TypeScript characters as names, the square brackets are a safe way to access every property.
@@ -94,7 +100,7 @@ If you chose to install, remove the Nuxtus hook extension by deleting the folder
 
 Clone this repo onto your local machine, remove the remote git origin and add a new one. Then follow the [manual install instructions](#directus).
 
-> For further instructions visit `[http://localhost:3000](http://localhost:3000)`
+> For further instructions post install, visit `[http://localhost:3000](http://localhost:3000)`
 
 ## Acknowledgements
 

package/TODO

@@ -14,12 +14,18 @@ Todo:
   ✔ Create Directus flow via Directus API @done(22-07-04 17:46)
   ☐ Add ability to automatically update .env for none SQLite databases
   ☐ Can I HMR when adding new pages/routes? - requires Nuxt to fix bug
-  ☐ Add all questions in create-app to start of process for better user flow
-  ☐ Allow use of different ports/URLs for Directus and Nuxt (currently hard-coded)
-  ☐ Add "types" to cli to update types from Directus when not using hook
-  ☐ Make opening browser window on start optional using npm run start
+  ✔ Add all questions in create-app to start of process for better user flow @done(22-07-13 19:15)
+  ✔ Allow use of different ports/URLs for Directus and Nuxt (currently hard-coded) @done(22-07-13 20:42)
+  ✔ Add "types" to cli to update types from Directus when not using hook - use @directus/sdk for /oas now on all apps @done(22-07-18 17:01)
+  ☐ Make opening browser window on start optional using npm run start (not possible)
+  ☐ Look at moving login and server/api stuff to a Nuxt module
   ☐ Make sure separate packages can be used without Nuxt Boilerplate if required
-  ☐ Console.log messages from directus extension should be formatted like other directus messages
+  ✔ Console.log messages from directus extension should be formatted like other directus messages @done(22-07-19 20:46)
+  ✔ Add default Directus login to end of create-nuxtus script @done(22-07-19 17:30)
   ☐ When adding a new collection the new page triggers a nuxt restart then directus tries to send a field.create which fails. We get around this by getting the create field first but Directus still returns a 404 for the second request.
   ✔ interfaces/nuxtus.ts should not be in .gitignore other than during my development (remove in create-nuxtus?) @done(22-07-11 12:52)
-  ☐ Add test coverage (done: generator, nuxtus-cli) @started(22-07-11 17:19)
+  ✔ Add test coverage (done: generator, nuxtus-cli) @started(22-07-11 17:19) @done(22-07-14 08:03) @lasted(2d14h44m55s)
+  ☐ GraphQL?
+  ☐ Websockets (https://github.com/br41nslug/directus-websocket-subscribe)
+  ✔ Upgrade nuxt-directus @done(22-07-17 11:32)
+  ☐ Add ability to use Directus static token instead of login (once https://github.com/Intevel/nuxt-directus/pull/54#pullrequestreview-1045062132 completed)

package/client/package.json

@@ -9,14 +9,15 @@
   "devDependencies": {
     "@nuxtjs/google-fonts": "^1.3.0",
     "@nuxtjs/tailwindcss": "^5.0.4",
-    "@nuxtus/cli": "^1.0.7",
-    "@nuxtus/generator": "1.1.2",
-    "nuxt": "3.0.0-rc.4",
+    "@nuxtus/cli": "^1.1.0",
+    "@nuxtus/generator": "1.2.0",
+    "nuxt": "^3.0.0-rc.6",
     "openapi-typescript": "^5.4.1"
   },
   "dependencies": {
+    "@directus/sdk": "^10.1.1",
     "@headlessui/vue": "^1.6.1",
     "@heroicons/vue": "^1.0.6",
-    "nuxt-directus": "^2.1.0"
+    "nuxt-directus": "^2.2.0"
   }
 }

package/client/server/api/directus/collection.post.ts

@@ -1,11 +1,12 @@
-import { createPage } from "@nuxtus/generator"
+import Generator from "@nuxtus/generator"
 
 export default defineEventHandler(async (event) => {
 	if (process.env.NODE_ENV !== "production") {
 		const body = await useBody(event)
+		const nuxtus = new Generator()
 		try {
 			const collection = body.collection
-			createPage(collection, body.singleton)
+			nuxtus.createPage(collection, body.singleton)
 		} catch (err) {
 			console.error(err.message)
 			throw new Error("Unable to create page: " + err.message)

package/client/server/api/directus/field.post.ts

@@ -1,30 +1,9 @@
-import axios from "axios"
-import fs from "fs"
-import openapiTS from "openapi-typescript"
+import Generator from "@nuxtus/generator"
 
 export default defineEventHandler(async (event) => {
 	if (process.env.NODE_ENV !== "production") {
-		const config = useRuntimeConfig()
-		// TODO: Can't seem to share login from directusLogin (currently client only plugin)
-		try {
-			const { data } = await axios.post("http://localhost:8055/auth/login", {
-				email: config.public.directusEmail,
-				password: config.public.directusPassword,
-			})
-			axios.defaults.headers.common[
-				"Authorization"
-			] = `Bearer ${data.data.access_token}`
-		} catch (err) {
-			console.error("Failed to login to Directus: " + err.message)
-			throw err
-		}
-		const openapi = await axios.get("http://localhost:8055/server/specs/oas")
-		// console.log(JSON.stringify(openapi.data.components.schemas))
-		const types = await openapiTS(openapi.data)
-		if (!fs.existsSync("interfaces")) {
-			fs.mkdirSync("interfaces")
-		}
-		fs.writeFileSync("interfaces/nuxtus.ts", types)
+		const nuxtus = new Generator()
+		await nuxtus.createTypes()
 		return {
 			api: "ok",
 		}

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@nuxtus/nuxtus",
 	"description": "Directus/Nuxt boilerplate with Tailwind CSS.",
-	"version": "1.1.1",
+	"version": "1.2.0",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/nuxtus/nuxtus.git"

package/server/.env

@@ -69,3 +69,7 @@ EMAIL_SENDMAIL_PATH="/usr/sbin/sendmail"
 ## Default User
 ADMIN_EMAIL="admin@example.com"
 ADMIN_PASSWORD="password"
+
+####################################################################################################
+## NUXT SERVER
+NUXT_SERVER="http://localhost:3000"

package/changelog.md

@@ -1,57 +0,0 @@
-# Changelog
-
-## 1.1.0
-
-- Automatically generate types from collections
-- Tidy up server end point
-- Automatically open browser window on Nuxt start
-
-## 1.0.6
-
-- Add server api endpoint to be used as Directus webhook
-- Update to Directus 9.13.0
-- Update readme with details on using Collections hook
-
-## 1.0.5
-
-- Update nuxtus-cli to v1.0.3
-
-## 1.0.4
-
-- Hard delete the data.db file
-- Update @nuxtus-cli to 1.0.2
-- Update Nuxt to 3.0.0-rc.4
-- Add client, server and start npm scripts
-
-## 1.0.3
-
-- Add Directus CLI to package.json so `npm run cli` works
-- Update getting started instructions to include database migrations
-- Do not upload the sqlite database, create a new one
-- Add default user/password to Directus .env
-- Add @nuxtus/cli to dev dependencies
-- Update `pages/docs.vue` with details on using @nuxtus/cli
-
-## 1.0.2
-
-- Separate create-nuxt command
-
-## 1.0.1
-
-- Correct create command in readme
-- Add details on using Nuxtus CLI
-- Update feedback when installing dependencies
-
-## 1.0.0
-
-- Add `npx nuxtus-create` command
-
-## 0.0.2
-
-- Move to using [nuxt-directus package](https://nuxt-directus.netlify.app/)
-- Add @nuxtus/cli
-- Add .DS_Store to gitignore
-
-## 0.0.1
-
-Initial alpha release.