From b15e5d0570d77b3b904389c30c254c54eae144ea Mon Sep 17 00:00:00 2001 From: Michal Kawka Date: Fri, 15 Nov 2024 21:11:50 +0100 Subject: [PATCH 1/3] add login page --- frontend/src/App.tsx | 4 +- frontend/src/components/ui/login.tsx | 127 +++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 frontend/src/components/ui/login.tsx diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 5079eb2..e67d65c 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import { BrowserRouter as Router, Route, Routes } from 'react-router-dom'; +import {BrowserRouter as Router, Route, Routes} from 'react-router-dom'; import Home from './components/ui/home'; +import Login from './components/ui/login'; import NotFound from './components/ui/not-found'; import SeedDetails from './components/ui/seed-details'; import SettingsPage from './components/ui/settings'; @@ -11,6 +12,7 @@ function App() { return ( + }> } /> + + +
+ Logo +
+
+

Welcome

+

+ Log in to Narrative to continue to Narrative. +

+
+
+ + +
+
+
+ +
+
+ + OR + +
+
+
+
+ +
+
+
+ + +
+
+ + Forgot password? + + +
+
+ Don't have an account?{' '} + + Sign up + +
+
+
+ + ); +} From d3f8fc151c617aa2cfe48cf0daecda554d076793 Mon Sep 17 00:00:00 2001 From: Michal Kawka Date: Fri, 15 Nov 2024 21:12:45 +0100 Subject: [PATCH 2/3] change description --- frontend/src/components/ui/login.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/ui/login.tsx b/frontend/src/components/ui/login.tsx index 3ea63c6..de9df19 100644 --- a/frontend/src/components/ui/login.tsx +++ b/frontend/src/components/ui/login.tsx @@ -24,7 +24,7 @@ export default function Login() {

Welcome

- Log in to Narrative to continue to Narrative. + Log in to InstantMock to start mocking.

From f9dbb06de5584fbf4cee0b66f8b1ea5a9e0218c6 Mon Sep 17 00:00:00 2001 From: Michal Kawka Date: Fri, 15 Nov 2024 21:24:01 +0100 Subject: [PATCH 3/3] remove google login --- frontend/src/components/ui/login.tsx | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/frontend/src/components/ui/login.tsx b/frontend/src/components/ui/login.tsx index de9df19..986874a 100644 --- a/frontend/src/components/ui/login.tsx +++ b/frontend/src/components/ui/login.tsx @@ -1,6 +1,6 @@ 'use client'; -import {Github, Globe} from 'lucide-react'; +import {MarkGithubIcon} from '@primer/octicons-react'; import * as React from 'react'; import logo from '../../assets/xolvio_logo.png'; import {Button} from './button'; @@ -33,15 +33,7 @@ export default function Login() { className="relative w-full justify-center gap-2" type="button" > - - Continue with Google - -