Skip to content

Commit

Permalink
added changes in design
Browse files Browse the repository at this point in the history
  • Loading branch information
DashDeipayan committed Feb 21, 2023
1 parent cd1ac0d commit 7903b6f
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 26 deletions.
3 changes: 1 addition & 2 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@ function App() {
getUser();
}, []);

console.log(user);
return (
<div className="App">
<Header name={user?.displayName} imagesrc={user?.photos[0]?.value} />
<Header name={user?.displayName} />
<Routes>
<Route
path="/"
Expand Down
24 changes: 13 additions & 11 deletions src/components/cards/cards.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,34 @@ import apple from "./apple.png";

const Cards = () => {
return (
<div class="card hover:shadow-lg">
<div className="card hover:shadow-lg">
<img
src={apple}
alt="stew"
class="w-1/4 h-1/4 m-auto sm:h-48 object-contain"
className="w-1/4 h-1/4 m-auto sm:h-48 object-contain"
/>
<div class="px-4 py-6 w-full">
<span class="block font-bold text-2xl text-center">Apple Inc.</span>
<span class="block text-gray-500 text-xl text-center">Price: $100</span>
<div className="px-4 py-6 w-full">
<span className="block font-bold text-2xl text-center">Apple Inc.</span>
<span className="block text-gray-500 text-xl text-center">
Price: $100
</span>
</div>
<div class="time-badge">
<div className="time-badge">
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
stroke-width="1.5"
strokeWidth="1.5"
stroke="currentColor"
class="w-4 h-4 inline-block mr-2"
className="w-4 h-4 inline-block mr-2"
>
<path
stroke-linecap="round"
stroke-linejoin="round"
strokeLinecap="round"
strokeLinejoin="round"
d="M15.75 10.5V6a3.75 3.75 0 10-7.5 0v4.5m11.356-1.993l1.263 12c.07.665-.45 1.243-1.119 1.243H4.25a1.125 1.125 0 01-1.12-1.243l1.264-12A1.125 1.125 0 015.513 7.5h12.974c.576 0 1.059.435 1.119 1.007zM8.625 10.5a.375.375 0 11-.75 0 .375.375 0 01.75 0zm7.5 0a.375.375 0 11-.75 0 .375.375 0 01.75 0z"
/>
</svg>
<span class="">Quantity: 100000</span>
<span className="">Quantity: 100000</span>
</div>
</div>
);
Expand Down
11 changes: 3 additions & 8 deletions src/components/header/header.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,22 @@
import React from "react";
import "./header.css";

const Header = ({ name, imagesrc }) => {
const Header = ({ name }) => {
const logout = () => {
window.open("http://localhost:8090/auth/logout", "_self");
};
return (
<div
className={`header flex ${
name && imagesrc ? "justify-between" : "justify-center"
name ? "justify-between" : "justify-center"
} p-10`}
>
<div className="header-name ml-14 flex items-center">
Dash Stock Market
</div>
{name && imagesrc && (
{name && (
<div className="m-5 flex">
<div className="flex mr-10">
<img
src={imagesrc}
alt="user"
className="w-14 h-14 rounded-full"
></img>
<div className="flex items-center ml-5 text-xl font-bold text-blue-900">
{name}
</div>
Expand Down
13 changes: 8 additions & 5 deletions src/screens/LandingPage/LandingPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,21 @@ const LandingPage = () => {
return (
<div className="login-image">
<div className="rds-image"></div>
<div class="flex gap-5 flex-col items-center justify-self-stretch">
<div class="w-80 h-20 bg-black rounded-sm flex items-center justify-center ">
<button class="p-0 text-2xl text-center text-white" onClick={github}>
<div className="flex gap-5 flex-col items-center justify-self-stretch">
<div className="w-80 h-20 bg-black rounded-sm flex items-center justify-center ">
<button
className="p-0 text-2xl text-center text-white"
onClick={github}
>
<img
alt="github logo"
class="inline w-1/6 mr-4 ml-0"
className="inline w-1/6 mr-4 ml-0"
src="assets/images/github-mark-white.png"
></img>
Sign in with GitHub
</button>
</div>
<div class="h-20 w-80 flex-1 flex-grow fill-current">
<div className="h-20 w-80 flex-1 flex-grow fill-current">
<img
onClick={google}
alt="google logo"
Expand Down

0 comments on commit 7903b6f

Please sign in to comment.