Skip to content

Commit

Permalink
Merge branch 'index_page_branch' into sebbe-pre-dev_branch
Browse files Browse the repository at this point in the history
Adding some more minor edits from the index page branch before merging to dev.
  • Loading branch information
SevLG committed Jan 23, 2024
2 parents 844d5a1 + 028ee92 commit 91b1416
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
13 changes: 3 additions & 10 deletions react-app/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,18 @@ export default function App() {
React.useEffect(() => {
trackPageView()
}, [])

let body = (
<h1 className="text-3xl text-black font-bold underline">
Under Construction
</h1>
)

var headerOne: string = "text-left text-black text-[40px] font-semibold";
var whiteTextCardClasses: string = "w-[580px] h-20 bg-white text-black bg-opacity-95 shadow-xl border-2 border-zinc-300";
var blackCardClasses: string = "w-[700px] h-[253px] bg-base-100 bg-opacity-95 rounded-[10px] shadow border-2";
var textBarClasses: string = "bg-gradient-to-b from-base-100 from-90% to-white text-justify text-[48px] font-bold py-12";
var textBarContent: string = "Quisque urna enim, placerat non fermentum sed, pharetra sit amet quam. Ut rhoncus ante in metus lobortis, eu euismod magna dignissim. Duis nec condimentum purus.";
var textBarClasses: string = "bg-gradient-to-b from-base-100 from-90% to-white text-justify text-[48px] font-bold py-8";
var textBarContent: string = "UNDER CONSTRUCTION - Web portal by DDLS Data Science Node";

return (
<div data-theme="dark">
<HeaderComponent />
<TextBarComponent classes={textBarClasses} text={textBarContent} />
<div className="bg-white space-y-14">
{body}
<div className="bg-white space-y-14">
<ImageCarouselComponent />
<div className="grid grid-cols-2 gap4">
<div className="flex flex-col space-y-1.5 ...">
Expand Down
2 changes: 1 addition & 1 deletion react-app/src/components/ImageCarouselComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ReactElement } from "react";

export default function ImageCarouselComponent(): ReactElement {
return (
<div className="carousel carousel-center rounded-box">
<div className="carousel carousel-center rounded-box py-10">
<div className="carousel-item">
<img src="https://daisyui.com/images/stock/photo-1559703248-dcaaec9fab78.jpg" alt="Pizza" />
</div>
Expand Down

0 comments on commit 91b1416

Please sign in to comment.