Skip to content

Commit 7ead810

Browse files
ysthakurysthakur
committed
Upload proposal
1 parent 21445bd commit 7ead810

File tree

11 files changed

+75
-84
lines changed

11 files changed

+75
-84
lines changed

‎public/files/Proposal.pdf

279 KB
Binary file not shown.

‎src/components/Footer.astro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ import { CONTACT_EMAIL, CONTACT_NAME, SOCIAL_MEDIA_LINKS } from "../consts";
5353
}
5454

5555
.social-links {
56+
font-size: 1.1rem;
57+
5658
// For phones, Follow us is below Contact. But for laptops, they're side-by-side,
5759
// so the Follow us section needs to be right-aligned
5860
@media (min-width: $tabletMinWidth) {
5961
margin-left: auto;
6062
}
6163

62-
font-size: 1.1rem;
63-
6464
a {
6565
text-decoration: none !important;
6666
}

‎src/components/timeline/Timeline.astro

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
---
3+
<div>
4+
<slot />
5+
</div>
6+
7+
<style>
8+
div {
9+
display: flex;
10+
flex-direction: column;
11+
position: relative;
12+
13+
width: 100%;
14+
}
15+
</style>

‎src/layouts/TimelineLayout.astro renamed to ‎src/components/timeline/TimelineItem.astro

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,19 @@
11
---
2-
import BaseLayout from "./BaseLayout.astro";
3-
4-
const { frontmatter } = Astro.props;
2+
const { title } = Astro.props;
53
---
64

7-
<BaseLayout title={frontmatter.title}><slot /></BaseLayout>
5+
<div>
6+
<h2>{title}</h2>
7+
<slot />
8+
</div>
89

910
<style lang="scss">
1011
$dotSize: 12px;
1112
$row-gap: 1rem;
1213
$col-gap: 1rem;
1314
$borderWidth: 4px;
1415

15-
:global(.timeline) {
16-
display: flex;
17-
flex-direction: column;
18-
position: relative;
19-
20-
width: 100%;
21-
}
22-
23-
:global(.timeline-item) {
16+
div {
2417
display: block;
2518
position: relative;
2619
min-width: 50%;
@@ -44,7 +37,7 @@ const { frontmatter } = Astro.props;
4437
background-color: var(--bg-color);
4538
}
4639

47-
:global(.timeline-item:nth-child(odd)) {
40+
div:nth-child(odd) {
4841
text-align: right;
4942
margin-left: 0;
5043
margin-right: auto;
@@ -58,7 +51,7 @@ const { frontmatter } = Astro.props;
5851
}
5952
}
6053

61-
:global(.timeline-item:nth-child(even)) {
54+
div:nth-child(even) {
6255
text-align: left;
6356
margin-left: auto;
6457
margin-right: 0;
@@ -72,8 +65,8 @@ const { frontmatter } = Astro.props;
7265
}
7366
}
7467

75-
.timeline-item > h2 {
68+
h2 {
7669
font-weight: 600;
77-
font-size: large;
70+
font-size: 1.7rem;
7871
}
7972
</style>

‎src/consts.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ interface SocialMediaLink {
2727
footerText: string;
2828
}
2929

30+
export const RSS_LINK = "/feed.xml";
31+
3032
export const SOCIAL_MEDIA_LINKS: SocialMediaLink[] = [
3133
{
3234
faClass: "fab fa-github",
@@ -42,8 +44,15 @@ export const SOCIAL_MEDIA_LINKS: SocialMediaLink[] = [
4244
},
4345
{
4446
faClass: "fa-solid fa-rss",
45-
link: "/feed.xml",
47+
link: RSS_LINK,
4648
hoverText: "RSS feed for our blog",
4749
footerText: "RSS feed",
4850
},
4951
];
52+
53+
export const Files = {
54+
/**
55+
* The Spring 2023 paper (the one we defended)
56+
*/
57+
Proposal: "/files/Proposal.pdf",
58+
};

‎src/content/blog/2023-07-14-another-test.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎src/content/blog/2023-08-15-test.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/content/config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const blog = defineCollection({
66
schema: z.object({
77
title: z.string(),
88
description: z.string(),
9+
author: z.string(),
910
// Transform string to Date object
1011
pubDate: z.coerce.date(),
1112
updatedDate: z.coerce.date().optional(),

‎src/layouts/BlogPost.astro

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import BaseLayout from "./BaseLayout.astro";
55
66
type Props = CollectionEntry<"blog">["data"];
77
8-
const { title, description, pubDate, updatedDate, heroImage } = Astro.props;
8+
const { title, description, author, pubDate, updatedDate, heroImage } =
9+
Astro.props;
910
---
1011

1112
<BaseLayout title={title} description={description}>
@@ -15,8 +16,10 @@ const { title, description, pubDate, updatedDate, heroImage } = Astro.props;
1516
</div>
1617
<div class="prose">
1718
<div class="title">
19+
<h1>{title}</h1>
20+
Author: {author}
1821
<div class="date">
19-
<FormattedDate date={pubDate} />
22+
Published <FormattedDate date={pubDate} />
2023
{
2124
updatedDate && (
2225
<div class="last-updated-on">
@@ -25,7 +28,6 @@ const { title, description, pubDate, updatedDate, heroImage } = Astro.props;
2528
)
2629
}
2730
</div>
28-
<h1>{title}</h1>
2931
<hr />
3032
</div>
3133
<slot />
@@ -49,26 +51,19 @@ const { title, description, pubDate, updatedDate, heroImage } = Astro.props;
4951
box-shadow: var(--box-shadow);
5052
}
5153
.prose {
52-
width: 720px;
53-
max-width: calc(100% - 2em);
5454
margin: auto;
5555
padding: 1em;
5656
color: rgb(var(--gray-dark));
5757
}
5858
.title {
5959
margin-bottom: 1em;
60-
padding: 1em 0;
60+
padding-top: 1em 0;
6161
text-align: center;
6262
line-height: 1;
6363
}
64-
.title h1 {
65-
margin: 0 0 0.5em 0;
66-
}
6764
.date {
68-
margin-bottom: 0.5em;
65+
margin-top: 0.5em;
6966
color: rgb(var(--gray));
70-
}
71-
.last-updated-on {
7267
font-style: italic;
7368
}
7469
</style>

‎src/pages/blog/index.astro

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import { getCollection } from "astro:content";
33
import FormattedDate from "../../components/FormattedDate.astro";
44
import BaseLayout from "../../layouts/BaseLayout.astro";
5+
import { RSS_LINK } from "../../consts";
56
67
const posts = (await getCollection("blog")).sort(
78
(a, b) => b.data.pubDate.valueOf() - a.data.pubDate.valueOf(),
@@ -10,7 +11,10 @@ const posts = (await getCollection("blog")).sort(
1011

1112
<BaseLayout title="Blog">
1213
<h1>Blog</h1>
13-
<p>This is where we post about our progress and findings. Stay tuned!</p>
14+
<p>
15+
This is where we post about our progress and findings.
16+
If you want updates, you can track our <a href={RSS_LINK}>RSS feed</a>.
17+
</p>
1418
<ul>
1519
{
1620
posts.map((post) => (

‎src/pages/timeline.mdx

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,39 @@
11
---
2-
layout: ../layouts/TimelineLayout.astro
32
title: Timeline
3+
layout: ../layouts/BaseLayout.astro
44
---
5+
import Timeline from "../components/timeline/Timeline.astro"
6+
import TimelineItem from "../components/timeline/TimelineItem.astro"
7+
import { Files } from "../consts"
58

69
Gemstone is a 4-year program, so we plan to finish our research by spring 2026.
710
Below is a rough expected timeline of our research.
811

9-
todo make cards with multiple bullet points per semester instead?
12+
{/* todo make cards with multiple bullet points per semester instead? */}
1013

11-
<div class="timeline">
12-
<div class="timeline-item">
13-
<h2>December 2023</h2>
14-
Proposal draft (todo upload our proposal draft and link to it?)
15-
</div>
16-
<div class="timeline-item">
17-
<h2>February 2024</h2>
18-
Proposal defense
19-
</div>
20-
<div class="timeline-item">
21-
<h2>Fall 2024</h2>
14+
<Timeline>
15+
<TimelineItem title="December 2023">
16+
Proposal draft
17+
</TimelineItem>
18+
<TimelineItem title="February 2024">
19+
Proposal defense. Our proposal is <a href={Files.Proposal}>here</a>.
20+
</TimelineItem>
21+
<TimelineItem title="Fall 2024">
2222
Data collection
23-
</div>
24-
<div class="timeline-item">
25-
<h2>Spring 2025</h2>
23+
</TimelineItem>
24+
<TimelineItem title="Spring 2025">
2625
Data analysis
27-
</div>
28-
<div class="timeline-item">
29-
<h2>Late Spring 2025</h2>
26+
</TimelineItem>
27+
<TimelineItem title="Late Spring 2025">
3028
Start thesis
31-
</div>
32-
<div class="timeline-item">
33-
<h2>Fall 2025</h2>
29+
</TimelineItem>
30+
<TimelineItem title="Fall 2025">
3431
Finish thesis
35-
</div>
36-
<div class="timeline-item">
37-
<h2>Late Fall 2025</h2>
32+
</TimelineItem>
33+
<TimelineItem title="Late Fall 2025">
3834
Publish thesis and apply to conferences
39-
</div>
40-
<div class="timeline-item">
41-
<h2>May 2026</h2>
35+
</TimelineItem>
36+
<TimelineItem title="Spring 2026">
4237
Gemstone thesis conference
43-
</div>
44-
</div>
38+
</TimelineItem>
39+
</Timeline>

0 commit comments

Comments
 (0)