Merge branch 'main' into dev

.vscode/settings.json

@@ -19,6 +19,7 @@
   "cSpell.words": [
     "Initialised",
     "Uploader",
+    "describedby",
     "initialise",
     "redwoodjs"
   ]

web/config/webpack.config.js

@@ -1,5 +1,12 @@
 const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin')
 
-module.exports = {
+module.exports = (config, { env }) => {
-  plugins: [new MonacoWebpackPlugin()],
+  config.plugins.forEach((plugin) => {
+    if (plugin.constructor.name === 'HtmlWebpackPlugin') {
+      plugin.options.favicon = './src/favicon.svg'
+    }
+  })
+  config.plugins.push(new MonacoWebpackPlugin())
+
+  return config
 }

web/package.json

@@ -39,6 +39,7 @@
   },
   "devDependencies": {
     "autoprefixer": "9.8.6",
+    "html-webpack-plugin": "^4.5.0",
     "postcss-loader": "4.0.2",
     "tailwindcss": "^1.9.1"
   }

web/src/Routes.js

@@ -6,10 +6,30 @@
 //
 // 'src/pages/HomePage/HomePage.js'         -> HomePage
 // 'src/pages/Admin/BooksPage/BooksPage.js' -> AdminBooksPage
-
+import { useEffect } from 'react'
 import { Router, Route, Private } from '@redwoodjs/router'
 
+const welcomeMessage = `
+%cHey, 👋.
+%c______________________________________________________________________________
+
+%cCadHub is in active development - Want to lend a hand?
+%chttps://github.com/Irev-Dev/cadhub
+
+`
+
 const Routes = () => {
+  useEffect(
+    () =>
+      console.log(
+        welcomeMessage,
+        'font-family: Georgia, serif; font-weight:bold; line-height: 2rem; font-size: 32px; color: #3c366b; padding-left: 5rem;',
+        'font-size: 10px; color:#D3D3D3; padding-left: 5rem;',
+        'font-family: "Ropa Sans",Georgia, serif; font-size: 16px;line-height:3rem; padding-left: 5rem;',
+        'font-family: Helvetica Neue, sans-serif; font-size: 16px; line-height: 1.5rem; color:#gray;padding-left: 5rem'
+      ),
+    []
+  )
   return (
     <Router>
       <Route path="/" page={PartsPage} name="home" />

web/src/index.html

@@ -8,7 +8,6 @@
     <meta name="robots" content="index, follow" />
     <link rel="icon" type="image/png" href="/favi2.jpg" />
     <title><%= htmlWebpackPlugin.options.title %></title>
-
     <script>
       // Install Cascade Studio as a Progressive Web App for Offline Access
       // This needs to be put before ANY HTTP Requests are made, so it can cache them.

web/src/layouts/MainLayout/MainLayout.js

@@ -19,7 +19,6 @@ export const QUERY = gql`
 `
 import Svg from 'src/components/Svg'
 import ImageUploader from 'src/components/ImageUploader'
-import logo from 'src/layouts/MainLayout/Logo_2.jpg'
 
 const MainLayout = ({ children }) => {
   const { logIn, logOut, isAuthenticated, currentUser } = useAuth()
@@ -56,8 +55,8 @@ const MainLayout = ({ children }) => {
           <ul className="flex items-center">
             <li>
               <Link to={routes.home()}>
-                <div className="rounded-full overflow-hidden ml-12">
+                <div className="rounded-full overflow-hidden ml-8">
-                  <img src={logo} />
+                  <Svg className="w-16" name="favicon" />
                 </div>
               </Link>
             </li>
@@ -99,19 +98,34 @@ const MainLayout = ({ children }) => {
                 <Svg name="plus" className="text-gray-700 w-full h-full" />
               )}
             </li>
-            <li className="h-10 w-10 border-1 rounded-full border-indigo-300 text-indigo-200">
+            {isAuthenticated ? (
-              <div aria-describedby={popoverId} onMouseOver={togglePopover}>
+              <li
-                {!loading && (
+                className="h-10 w-10 border-2 rounded-full border-indigo-300 text-indigo-200"
-                  <ImageUploader
+                aria-describedby={popoverId}
-                    className="rounded-full object-cover"
+              >
-                    onImageUpload={() => {}}
+                <button className="w-full h-full" onClick={togglePopover}>
-                    aspectRatio={1}
+                  {!loading && (
-                    imageUrl={data?.user?.image}
+                    <ImageUploader
-                    width={80}
+                      className="rounded-full object-cover"
-                  />
+                      onImageUpload={() => {}}
-                )}
+                      aspectRatio={1}
-              </div>
+                      imageUrl={data?.user?.image}
-            </li>
+                      width={80}
+                    />
+                  )}
+                </button>
+              </li>
+            ) : (
+              <li>
+                <a
+                  href="#"
+                  className="text-indigo-200 font-semibold underline"
+                  onClick={logIn}
+                >
+                  Sign in/up
+                </a>
+              </li>
+            )}
           </ul>
           <Popover
             id={popoverId}

yarn.lock

@@ -8908,6 +8908,21 @@ html-webpack-plugin@^4.0.0-beta.2, html-webpack-plugin@^4.0.2:
     tapable "^1.1.3"
     util.promisify "1.0.0"
 
+html-webpack-plugin@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.5.0.tgz#625097650886b97ea5dae331c320e3238f6c121c"
+  integrity sha512-MouoXEYSjTzCrjIxWwg8gxL5fE2X2WZJLmBYXlaJhQUH5K/b5OrqmV7T4dB7iu0xkmJ6JlUuV6fFVtnqbPopZw==
+  dependencies:
+    "@types/html-minifier-terser" "^5.0.0"
+    "@types/tapable" "^1.0.5"
+    "@types/webpack" "^4.41.8"
+    html-minifier-terser "^5.0.1"
+    loader-utils "^1.2.3"
+    lodash "^4.17.15"
+    pretty-error "^2.1.1"
+    tapable "^1.1.3"
+    util.promisify "1.0.0"
+
 htmlparser2@^3.3.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"