Update logo around the website

updated the favicon with a webpack plugin, as will as on the MainLayout
Plus some other tweaks to the main layout while I was there

resolves #107
This commit is contained in:
Kurt Hutten
2020-11-18 07:56:09 +11:00
parent a7dac73116
commit 4fefee073c
10 changed files with 194 additions and 43 deletions

File diff suppressed because one or more lines are too long

34
web/src/favicon.svg Normal file

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 25 KiB

View File

@@ -4,9 +4,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="icon" type="image/png" href="/favi2.jpg" />
<title><%= htmlWebpackPlugin.options.title %></title>
<title>CadHub</title> <!-- to be replaced by react helmet -->
<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.

View File

@@ -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">
<img src={logo} />
<div className="rounded-full overflow-hidden ml-8">
<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">
<div aria-describedby={popoverId} onMouseOver={togglePopover}>
{!loading && (
<ImageUploader
className="rounded-full object-cover"
onImageUpload={() => {}}
aspectRatio={1}
imageUrl={data?.user?.image}
width={80}
/>
)}
</div>
</li>
{isAuthenticated ? (
<li
className="h-10 w-10 border-2 rounded-full border-indigo-300 text-indigo-200"
aria-describedby={popoverId}
>
<button className="w-full h-full" onClick={togglePopover}>
{!loading && (
<ImageUploader
className="rounded-full object-cover"
onImageUpload={() => {}}
aspectRatio={1}
imageUrl={data?.user?.image}
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}