From 8ee9f6e5ddb63350fc077efa2e2015ef61a6e373 Mon Sep 17 00:00:00 2001 From: sergiosja Date: Fri, 17 Nov 2023 16:48:01 +0100 Subject: [PATCH] PB-48f --- application/next-frontend/pages/index.tsx | 5 +-- .../next-frontend/src/Landing/assets/Line.svg | 3 ++ .../assets/illustrations/PizzaBotLogo.svg | 3 ++ .../assets/illustrations/PizzaBotTitle.svg | 3 -- .../assets/illustrations/SlackLogo.svg | 15 +++++++ .../assets/illustrations/SlackLogoBlack.svg | 3 -- .../Landing/components/AddToSlackButton.tsx | 17 ++++++++ .../src/Landing/scenarios/FirstPage.tsx | 42 +++++++++---------- .../Header/components/AddToSlackButton.tsx | 17 -------- .../src/Landing/scenarios/Header/index.tsx | 29 ++++--------- .../src/Shared/components/LoginButton.tsx | 9 +--- application/next-frontend/tailwind.config.ts | 4 +- 12 files changed, 71 insertions(+), 79 deletions(-) create mode 100644 application/next-frontend/src/Landing/assets/Line.svg create mode 100644 application/next-frontend/src/Landing/assets/illustrations/PizzaBotLogo.svg delete mode 100644 application/next-frontend/src/Landing/assets/illustrations/PizzaBotTitle.svg create mode 100644 application/next-frontend/src/Landing/assets/illustrations/SlackLogo.svg delete mode 100644 application/next-frontend/src/Landing/assets/illustrations/SlackLogoBlack.svg create mode 100644 application/next-frontend/src/Landing/components/AddToSlackButton.tsx delete mode 100644 application/next-frontend/src/Landing/scenarios/Header/components/AddToSlackButton.tsx diff --git a/application/next-frontend/pages/index.tsx b/application/next-frontend/pages/index.tsx index 3717e430..4ffa949a 100644 --- a/application/next-frontend/pages/index.tsx +++ b/application/next-frontend/pages/index.tsx @@ -1,12 +1,11 @@ -/* import { Landing } from '@/Landing' */ +import { Landing } from '@/Landing' import { Header } from '@/Landing/scenarios/Header' export default function Home() { return (
-

COMING SOON

- {/* */} +
) } diff --git a/application/next-frontend/src/Landing/assets/Line.svg b/application/next-frontend/src/Landing/assets/Line.svg new file mode 100644 index 00000000..a8ed263c --- /dev/null +++ b/application/next-frontend/src/Landing/assets/Line.svg @@ -0,0 +1,3 @@ + + + diff --git a/application/next-frontend/src/Landing/assets/illustrations/PizzaBotLogo.svg b/application/next-frontend/src/Landing/assets/illustrations/PizzaBotLogo.svg new file mode 100644 index 00000000..d1a76690 --- /dev/null +++ b/application/next-frontend/src/Landing/assets/illustrations/PizzaBotLogo.svg @@ -0,0 +1,3 @@ + + + diff --git a/application/next-frontend/src/Landing/assets/illustrations/PizzaBotTitle.svg b/application/next-frontend/src/Landing/assets/illustrations/PizzaBotTitle.svg deleted file mode 100644 index cac3dafa..00000000 --- a/application/next-frontend/src/Landing/assets/illustrations/PizzaBotTitle.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/application/next-frontend/src/Landing/assets/illustrations/SlackLogo.svg b/application/next-frontend/src/Landing/assets/illustrations/SlackLogo.svg new file mode 100644 index 00000000..cff8f3ba --- /dev/null +++ b/application/next-frontend/src/Landing/assets/illustrations/SlackLogo.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/application/next-frontend/src/Landing/assets/illustrations/SlackLogoBlack.svg b/application/next-frontend/src/Landing/assets/illustrations/SlackLogoBlack.svg deleted file mode 100644 index 37afd4d2..00000000 --- a/application/next-frontend/src/Landing/assets/illustrations/SlackLogoBlack.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/application/next-frontend/src/Landing/components/AddToSlackButton.tsx b/application/next-frontend/src/Landing/components/AddToSlackButton.tsx new file mode 100644 index 00000000..4e6c7a25 --- /dev/null +++ b/application/next-frontend/src/Landing/components/AddToSlackButton.tsx @@ -0,0 +1,17 @@ +import Image from 'next/image' +import SlackLogo from '@/Landing/assets/illustrations/SlackLogo.svg' + +const AddToSlackButton = ({ onClick }: { onClick: () => void }) => { + return ( + + ) +} + +export { AddToSlackButton } diff --git a/application/next-frontend/src/Landing/scenarios/FirstPage.tsx b/application/next-frontend/src/Landing/scenarios/FirstPage.tsx index f3241d4b..10fbaa8a 100644 --- a/application/next-frontend/src/Landing/scenarios/FirstPage.tsx +++ b/application/next-frontend/src/Landing/scenarios/FirstPage.tsx @@ -1,29 +1,27 @@ import Image from 'next/image' -import Hello from '@/Landing/assets/illustrations/hello.svg' +import Line from 'Landing/assets/Line.svg' -const FirstPage = () => { - return ( -
-
-
-
- The sexiest bot for socialising teams on slack through Pizza.. -
+import { AddToSlackButton } from '@/Landing/components/AddToSlackButton' +import { clientsideApiUri } from '@/api/endpoints' + +const addToSlack = async () => { + const res = await fetch(clientsideApiUri + '/slack/install', { method: 'GET' }).then((res) => res.json()) + const redirectURL = res.redirect_url -
- Once upon a time, in a land where disco balls still reigned supreme, there strutted a human - tornado of coolness named Max Chillington. Legend has it that Max could make ice cubes shiver in - envy just by winking.

- His hair, a perfectly coiffed monument to follicular fortitude, once caused a gust of wind to - bow in admiration. -
-
+ if (redirectURL) window.location.assign(redirectURL) +} - {/* problem: my-auto doesnt care about padding on bottom */} -
- bot saying hello -
-
+const FirstPage = () => { + return ( +
+ + A slice to socialise + + dotted line + + Download the PizzaBot to build better work environments. + +
) } diff --git a/application/next-frontend/src/Landing/scenarios/Header/components/AddToSlackButton.tsx b/application/next-frontend/src/Landing/scenarios/Header/components/AddToSlackButton.tsx deleted file mode 100644 index 6b2c1b0b..00000000 --- a/application/next-frontend/src/Landing/scenarios/Header/components/AddToSlackButton.tsx +++ /dev/null @@ -1,17 +0,0 @@ -import Image from 'next/image' -import SlackLogoBlack from '@/Landing/assets/illustrations/SlackLogoBlack.svg' - -const AddToSlackButton = ({ onClick }: { onClick: () => void }) => { - return ( - - ) -} - -export { AddToSlackButton } diff --git a/application/next-frontend/src/Landing/scenarios/Header/index.tsx b/application/next-frontend/src/Landing/scenarios/Header/index.tsx index 6397196e..271ce53b 100644 --- a/application/next-frontend/src/Landing/scenarios/Header/index.tsx +++ b/application/next-frontend/src/Landing/scenarios/Header/index.tsx @@ -1,30 +1,15 @@ import Image from 'next/image' -import PizzaBotTitle from '@/Landing/assets/illustrations/PizzaBotTitle.svg' -import { AddToSlackButton } from './components/AddToSlackButton' -import { clientsideApiUri } from '@/api/endpoints' +import PizzaBotLogo from '@/Landing/assets/illustrations/PizzaBotLogo.svg' import { LoginButton } from '@/Shared/components/LoginButton' const Header = () => { - const addToSlack = async () => { - const res = await fetch(clientsideApiUri + '/slack/install', { method: 'GET' }).then((res) => res.json()) - const redirectURL = res.redirect_url - - if (redirectURL) window.location.assign(redirectURL) - } return ( - <> -
- - +
+
+ pizza bot logo +
+ +
) } diff --git a/application/next-frontend/src/Shared/components/LoginButton.tsx b/application/next-frontend/src/Shared/components/LoginButton.tsx index 791f542f..f563c141 100644 --- a/application/next-frontend/src/Shared/components/LoginButton.tsx +++ b/application/next-frontend/src/Shared/components/LoginButton.tsx @@ -16,13 +16,8 @@ const LoginButton = () => { } return ( - ) } diff --git a/application/next-frontend/tailwind.config.ts b/application/next-frontend/tailwind.config.ts index 26fae98c..7e8138b9 100644 --- a/application/next-frontend/tailwind.config.ts +++ b/application/next-frontend/tailwind.config.ts @@ -27,11 +27,11 @@ const config: Config = { fuger: '#C1C1C1', dark: '#303030', green: { - secondary: '#5FE09D', primary: '#05793C', + secondary: '#5FE09D', tertiary: '#003F1E', quaternary: '#004B24', - light: '#EDFFF6', + light: '#CFF6E2', }, yellow: '#FFF8C1', shade: '#6A5412',