Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Header branch #15

Merged
merged 2 commits into from
Jan 17, 2024
Merged

Header branch #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2526756
Added transparent PNG for logo, changed daisyUI theme
SevLG Jan 17, 2024
0a5fddf
Ignore DS_Store
SevLG Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

*DS_Store
.vscode/

# dependencies
Expand Down
Binary file added react-app/public/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added react-app/public/images/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added react-app/public/images/SciLifeLab logo/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added react-app/public/images/SciLifeLab logo/Green_NEG/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added react-app/public/images/SciLifeLab logo/Green_NEG/Digital/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added ...blic/images/SciLifeLab logo/Green_NEG/Digital/SciLifeLab_Logotype_Green_NEG.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added react-app/public/images/SciLifeLab logo/Green_POS/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added react-app/public/images/SciLifeLab logo/Green_POS/Digital/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added ...blic/images/SciLifeLab logo/Green_POS/Digital/SciLifeLab_Logotype_Green_POS.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added react-app/public/images/SciLifeLab logo/NEG/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added react-app/public/images/SciLifeLab logo/NEG/Digital/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added react-app/public/images/SciLifeLab logo/NEG/Digital/SciLifeLab_Logotype_NEG.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added react-app/public/images/SciLifeLab logo/POS/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added react-app/public/images/SciLifeLab logo/POS/Digital/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added react-app/public/images/SciLifeLab logo/POS/Digital/SciLifeLab_Logotype_POS.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed react-app/public/images/scilifelogo.jpg
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion react-app/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default function App() {
</h1>
)
return (
<html data-theme="light" className="min-h-screen bg-white">
<html data-theme="dark" className="min-h-screen bg-white">
{HeaderComponent()}
{body}
{ArticleComponent()}
Expand Down
17 changes: 10 additions & 7 deletions react-app/src/components/HeaderComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
import {ILink} from '../interfaces/types';

export default function HeaderComponent() {

var linkClasses: string = 'link link-hover';
var links: { [id: string] : ILink; } = {
'l1': { text: 'Random text for now', classes: 'pointer-events-none', href: '/#' },
'l2': { text: 'Data', classes: 'link link-hover', href: '/#' },
'l3': { text: 'Events & News', classes: 'link link-hover', href: '/#' },
'l4': { text: 'Contact', classes: 'link link-hover', href: '/#' },
'l5': { text: 'About', classes: 'link link-hover', href: '/#' },
'l2': { text: 'Data', classes: linkClasses, href: '/#' },
'l3': { text: 'Events & News', classes: linkClasses, href: '/#' },
'l4': { text: 'Contact', classes: linkClasses, href: '/#' },
'l5': { text: 'About', classes: linkClasses, href: '/#' },
};

var buttonClasses: string = 'btn bg-fuchsia-950 text-white hover:bg-fuchsia-800 active:bg-fuchsia-900 focus:outline-none focus:ring focus:ring-fuchsia-300';
var buttons: { [id: string] : ILink; } = {
'b1': { text: 'Sign In', classes: 'btn bg-fuchsia-950 text-white', href: '/#' },
'b1': { text: 'Sign In', classes: buttonClasses, href: '/#' },
};

return (
// use bg-zinc-200 instead? similar to daisyUI light-theme footer
<div className="navbar h-[8rem] bg-black text-white">
<div className="navbar h-[8rem] bg-base-100">
<div className="navbar-start">
<a href="/">
<img className="w-[340px] h-[82px] border border-black" src="/images/scilifelogo.jpg" alt="SciLifeLab Logo" />
<img className="w-[340px] h-[82px]" src="/images/SciLifeLab logo/Green_NEG/Digital/SciLifeLab_Logotype_Green_NEG.png" alt="SciLifeLab Logo" />
</a>
</div>
<div className="navbar-center hidden lg:flex">
Expand Down