Skip to content

Commit d6fac8a

Browse files
authored
Merge pull request #2 from SeongilHeo/main
Update publications linking and minor UI updates
2 parents e99a346 + d21942a commit d6fac8a

File tree

9 files changed

+99
-23
lines changed

9 files changed

+99
-23
lines changed

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,8 @@ dist-ssr
2121
*.ntvs*
2222
*.njsproj
2323
*.sln
24-
*.sw?
24+
*.sw?
25+
26+
# Docker
27+
docker-compose.yml
28+
Dockerfile

index.css

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,11 @@
3939
}
4040

4141
@layer components {
42+
.outlet-container {
43+
@apply mt-14 sm:mt-18 md:mt-21 lg:mt-26 py-10 px-5 sm:px-10 md:px-20 lg:px-40 2xl:px-80 flex-1 flex bg-body;
44+
}
4245
.pages {
43-
@apply mt-14 sm:mt-18 md:mt-21 lg:mt-26 py-10 px-5 sm:px-10 md:px-20 lg:px-40 2xl:px-80 flex-1 space-y-4 md:space-y-8 bg-body;
46+
@apply max-w-7xl w-full mx-auto space-y-4 md:space-y-8 flex-1;
4447
}
4548
}
4649

package-lock.json

Lines changed: 59 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "app",
33
"homepage": "https://aria-lab.cs.utah.edu/",
4-
"version": "0.0.0",
4+
"version": "1.0.0",
55
"type": "module",
66
"scripts": {
77
"dev": "vite --host",
@@ -25,6 +25,6 @@
2525
"@types/react": "^19.1.6",
2626
"@types/react-dom": "^19.1.6",
2727
"@vitejs/plugin-react": "^4.5.1",
28-
"vite": "^6.3.5"
28+
"vite": "^6.3.6"
2929
}
3030
}

src/App.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ const AppContent = () => {
2323
const matchedRoute = routes.find(r => r.path === `/${path}`);
2424
const title = matchedRoute?.title ? `${matchedRoute.title}` : 'ARIA Lab';
2525
document.title = `${title} | Align Robust Interactive Autonomy Lab`;
26+
window.scrollTo(0, 0);
2627
}, [location]);
2728

2829
return (

src/components/Button.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const Button = ({title, link }) => {
55
return (
66
<button
77
onClick={() => window.open(link, '_blank')}
8-
className={`text-ured text-xl`}
8+
className={`text-ured text-xl hover:scale-110 transition-all cursor-pointer`}
99
>
1010
<FontAwesomeIcon icon={iconMap[title]} />
1111
</button>

src/components/ButtonR.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const ButtonR = ({title, link }) => {
55
return (
66
<button
77
onClick={() => window.open(link, '_blank')}
8-
className={`bg-ured rounded-md py-1 px-2 text-white text-sm flex justify-center items-center gap-xs`}
8+
className={`bg-ured rounded-md py-1 px-2 text-white text-sm flex justify-center items-center gap-xs hover:bg-white hover:text-ured border-ured border transition-colors cursor-pointer`}
99
>
1010
<FontAwesomeIcon icon={iconMap[title]} />
1111
{title}

src/layout/Layout.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ const Layout = () => {
66
return (
77
<main className={`min-h-screen w-screen flex flex-col`} >
88
<Header />
9-
<Outlet />
9+
<div className="outlet-container">
10+
<Outlet />
11+
</div>
1012
<Footer />
1113
</main>
1214
);

src/pages/Research.jsx

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
import { Title } from '@/components';
2-
import { research } from '@/data';
2+
import { research, publications } from '@/data';
33

44
const Research = () => {
55
const data = research.data;
6-
6+
const pubIndex = new Map(
7+
publications.map(p => [p.Id, { title: p.Title, arxiv: p.ArXiv }])
8+
);
9+
710
return (
811
<div className="pages">
912
<Title name="Research" />
@@ -46,15 +49,24 @@ const Research = () => {
4649
<span className="font-bold">{'Publications: '}</span>
4750
<span>
4851
{item.Publication.length > 0
49-
? <ul>
50-
{Object.entries(item['Publication']).map(([key, value], index) =>
51-
<li key={`publication-${index}`} className="list-[circle] ml-8">
52-
<span className="font-bold">{`${key}: `}</span>
53-
<span >{value}</span>
54-
</li>
55-
)}
56-
</ul>
57-
: <span className="text-ugray italic">It will be updated soon.</span>
52+
? (
53+
<ul>
54+
{item.Publication.map((id) => {
55+
const pub = pubIndex.get(id);
56+
if (!pub) return null;
57+
return (
58+
<li key={`publication-${id}`} className="list-[circle] ml-8">
59+
{
60+
pub.arxiv
61+
? (<a href={pub.arxiv} target="_blank" rel="noreferrer" className="italichover:text-blue-500">{pub.title}</a>)
62+
: (<span>{pub.title}</span>)
63+
}
64+
</li>
65+
);
66+
})}
67+
</ul>
68+
)
69+
: (<span className="text-ugray italic">It will be updated soon.</span>)
5870
}
5971
</span>
6072
</li>

0 commit comments

Comments
 (0)