Merge pull request #9 from Tobbe/tobbe-v028-set

RW 0.28 `<Set>`

.env.defaults

@@ -11,3 +11,8 @@ DATABASE_URL=file:./dev.db
 
 # disables Prisma CLI update notifier
 PRISMA_HIDE_UPDATE_MESSAGE=true
+
+# Option to override the current environment's default api-side log level
+# See: https://redwoodjs.com/docs/logger for level options:
+# trace | info | debug | warn | error | silent
+# LOG_LEVEL=debug

.env.example

@@ -1,2 +1,3 @@
 # DATABASE_URL=file:./dev.db
-# BINARY_TARGET=native
+# BINARY_TARGET=native
+# LOG_LEVEL=debug

api/package.json

@@ -3,6 +3,6 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "^0.27.0"
+    "@redwoodjs/api": "^0.28.0"
   }
 }

api/src/lib/db.js

@@ -3,4 +3,19 @@
 
 import { PrismaClient } from '@prisma/client'
 
-export const db = new PrismaClient()
+import { emitLogLevels, handlePrismaLogging } from '@redwoodjs/api/logger'
+
+import { logger } from './logger'
+
+/*
+ * Instance of the Prisma Client
+ */
+export const db = new PrismaClient({
+  log: emitLogLevels(['info', 'warn', 'error']),
+})
+
+handlePrismaLogging({
+  db,
+  logger,
+  logLevels: ['info', 'warn', 'error'],
+})

api/src/lib/logger.js

@@ -0,0 +1,17 @@
+import { createLogger } from '@redwoodjs/api/logger'
+
+/**
+ * Creates a logger with RedwoodLoggerOptions
+ *
+ * These extend and override default LoggerOptions,
+ * can define a destination like a file or other supported pin log transport stream,
+ * and sets where or not to show the logger configuration settings (defaults to false)
+ *
+ * @param RedwoodLoggerOptions
+ *
+ * RedwoodLoggerOptions have
+ * @param {options} LoggerOptions - defines how to log, such as pretty printing, redaction, and format
+ * @param {string | DestinationStream} destination - defines where to log, such as a transport stream or file
+ * @param {boolean} showConfig - whether to display logger configuration on initialization
+ */
+export const logger = createLogger({})

package.json

@@ -7,7 +7,7 @@
     ]
   },
   "devDependencies": {
-    "@redwoodjs/core": "^0.27.0"
+    "@redwoodjs/core": "^0.28.0"
   },
   "eslintConfig": {
     "extends": "@redwoodjs/eslint-config"

web/package.json

@@ -13,10 +13,10 @@
     ]
   },
   "dependencies": {
-    "@redwoodjs/auth": "^0.27.0",
-    "@redwoodjs/forms": "^0.27.0",
-    "@redwoodjs/router": "^0.27.0",
-    "@redwoodjs/web": "^0.27.0",
+    "@redwoodjs/auth": "^0.28.0",
+    "@redwoodjs/forms": "^0.28.0",
+    "@redwoodjs/router": "^0.28.0",
+    "@redwoodjs/web": "^0.28.0",
     "netlify-identity-widget": "^1.9.1",
     "prop-types": "^15.7.2",
     "react": "^17.0.1",

web/src/Routes.js

@@ -7,15 +7,18 @@
 // 'src/pages/HomePage/HomePage.js'         -> HomePage
 // 'src/pages/Admin/BooksPage/BooksPage.js' -> AdminBooksPage
 
-import { Router, Route, Private } from '@redwoodjs/router'
+import { Router, Route, Private, Set } from '@redwoodjs/router'
+import BlogLayout from 'src/layouts/BlogLayout'
 
 const Routes = () => {
   return (
     <Router>
-      <Route path="/contact" page={ContactPage} name="contact" />
-      <Route path="/blog-post/{id:Int}" page={BlogPostPage} name="blogPost" />
-      <Route path="/about" page={AboutPage} name="about" />
-      <Route path="/" page={HomePage} name="home" />
+      <Set wrap={BlogLayout}>
+        <Route path="/contact" page={ContactPage} name="contact" />
+        <Route path="/blog-post/{id:Int}" page={BlogPostPage} name="blogPost" />
+        <Route path="/about" page={AboutPage} name="about" />
+        <Route path="/" page={HomePage} name="home" />
+      </Set>
       <Private unauthenticated="home">
         <Route path="/admin/posts/new" page={NewPostPage} name="newPost" />
         <Route path="/admin/posts/{id:Int}/edit" page={EditPostPage} name="editPost" />

web/src/pages/AboutPage/AboutPage.js

@@ -1,14 +1,11 @@
 import { Link, routes } from '@redwoodjs/router'
-import BlogLayout from 'src/layouts/BlogLayout'
 
 const AboutPage = () => {
   return (
-    <BlogLayout>
-      <p className="font-light">
-        This site was created to demonstrate my mastery of Redwood: Look on my
-        works, ye mighty, and despair!
-      </p>
-    </BlogLayout>
+    <p className="font-light">
+      This site was created to demonstrate my mastery of Redwood: Look on my
+      works, ye mighty, and despair!
+    </p>
   )
 }
 

web/src/pages/BlogPostPage/BlogPostPage.js

@@ -1,11 +1,8 @@
-import BlogLayout from 'src/layouts/BlogLayout'
 import BlogPostCell from 'src/components/BlogPostCell'
 
 const BlogPostPage = ({ id }) => {
   return (
-    <BlogLayout>
-      <BlogPostCell id={id} />
-    </BlogLayout>
+    <BlogPostCell id={id} />
   )
 }
 

web/src/pages/ContactPage/ContactPage.js

@@ -9,7 +9,6 @@ import {
 } from '@redwoodjs/forms'
 import { Flash, useFlash, useMutation } from '@redwoodjs/web'
 import { useForm } from 'react-hook-form'
-import BlogLayout from 'src/layouts/BlogLayout'
 
 const CREATE_CONTACT = gql`
   mutation CreateContactMutation($input: CreateContactInput!) {
@@ -38,7 +37,7 @@ const ContactPage = () => {
   }
 
   return (
-    <BlogLayout>
+    <>
       <Flash timeout={1000} className="bg-green-100 text-green-700" />
       <Form
         onSubmit={onSubmit}
@@ -106,7 +105,7 @@ const ContactPage = () => {
           Save
         </Submit>
       </Form>
-    </BlogLayout>
+    </>
   )
 }
 

web/src/pages/HomePage/HomePage.js

@@ -1,11 +1,8 @@
-import BlogLayout from 'src/layouts/BlogLayout'
 import BlogPostsCell from 'src/components/BlogPostsCell'
 
 const HomePage = () => {
   return (
-    <BlogLayout>
-      <BlogPostsCell />
-    </BlogLayout>
+    <BlogPostsCell />
   )
 }