Add a link on main logo (#495)

antoinejaussoin · Mar 9, 2023 · b30aaa0 · b30aaa0
1 parent 84f1228
commit b30aaa0
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,3 +35,16 @@ jobs:
       - run: yarn ci-test
       - run: yarn lint
       - run: yarn build
+  test-marketing:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./marketing
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - run: yarn
+      - run: yarn lint
+      - run: yarn build
diff --git a/README.md b/README.md
@@ -92,9 +92,15 @@ This will run a demo version, which you can turn into a fully licenced version b
 
 ## Versions History
 
+### Version 5.0.2
+
+- Simplify management of environment variables on the frontend
+- Add an error 404 page on the marketing site
+- Add Ad-Words tracking on the landing page
+
 ### Version 5.0.1
 
-- Add Google Ad-Words tracking
+- Add Google Ad-Words tracking on the frontend
 - Fix self-hosted licence checking URL
 
 ### Version 5.0.0

diff --git a/backend/package.json b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@retrospected/backend",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "license": "GNU GPLv3",
   "private": true,
   "type": "module",

diff --git a/docs/package.json b/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docs",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@retrospected/frontend",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "license": "GNU GPLv3",
   "private": true,
   "dependencies": {

diff --git a/integration/package.json b/integration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "retro-board-integration",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "Integrations tests",
   "main": "index.js",
   "directories": {

diff --git a/marketing/package.json b/marketing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "marketing",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "private": true,
   "scripts": {
     "dev": "next dev -p 3001",

diff --git a/marketing/src/common/components/ScrollSpyMenu/index.tsx b/marketing/src/common/components/ScrollSpyMenu/index.tsx
@@ -111,13 +111,19 @@ const ScrollSpyMenu = ({
             ) : (
               <>
                 {drawer ? (
-                  <AnchorLink
-                    href={menu.path}
-                    offset={menu.offset}
-                    onClick={toggleDrawer}
-                  >
-                    {t(menu.label)}
-                  </AnchorLink>
+                  <>
+                    {isAnchor ? (
+                      <AnchorLink
+                        href={menu.path}
+                        offset={menu.offset}
+                        onClick={toggleDrawer}
+                      >
+                        {t(menu.label)}
+                      </AnchorLink>
+                    ) : (
+                      <Link href={menu.path}>{t(menu.label)}</Link>
+                    )}
+                  </>
                 ) : (
                   <>
                     {isAnchor ? (

diff --git a/marketing/src/containers/Navbar/index.tsx b/marketing/src/containers/Navbar/index.tsx
@@ -2,19 +2,18 @@ import React, { useContext } from 'react';
 import NavbarWrapper from '@/common/components/Navbar';
 import Drawer from '@/common/components/Drawer';
 import Button from '@/common/components/Button';
-// import Logo from '@/common/components/UIElements/Logo';
 import Box from '@/common/components/Box';
 import HamburgMenu from '@/common/components/HamburgMenu';
 import Container from '@/common/components/UI/Container';
 import { DrawerContext } from '@/common/contexts/DrawerContext';
 import ScrollSpyMenu from '@/common/components/ScrollSpyMenu';
-import logoImage from './logo.png';
 import { MenuItem } from '@/types';
 import { useTranslation } from 'next-i18next';
 import { useConfig } from '@/common/hooks/useConfig';
 import { LanguagePicker } from './LanguagePicker';
 import styled from 'styled-components';
 import { Logo } from '@/common/components/Logo/Logo';
+import Link from 'next/link';
 
 type NavbarProps = {
   navbarStyle?: any;
@@ -70,7 +69,9 @@ const Navbar = ({
             width={32}
             height={32}
           /> */}
-          <Logo size={32} style={{ position: 'relative', top: 1 }} />
+          <Link href="/">
+            <Logo size={32} style={{ position: 'relative', top: 1 }} />
+          </Link>
           <Box {...menuWrapper} className="mainMenuWrapper">
             <ScrollSpyMenu
               className="main_menu"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "retrospected",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "An agile retrospective board - Powering www.retrospected.com",
   "private": true,
   "scripts": {