Skip to content

Commit

Permalink
Merge pull request #7 from performant-software/RB-astro-site
Browse files Browse the repository at this point in the history 
Updates to project links, footer, favicon, social card
  • Loading branch information
@ajolipa
ajolipa authored Mar 28, 2024
2 parents e1b1409 + 7e9ae09 commit 2f3c6a4
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 24 deletions.
Binary file added astro-web/public/favicon.jpg
View file
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 astro-web/public/social.png
View file
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 astro-web/src/assets/projects/thumbnails/interviste.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 16 additions & 6 deletions astro-web/src/components/Footer.astro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ import Container from "./Container.astro";
import logo from "../assets/footer/editioncrafterlogo.svg";
import gh from "../assets/footer/github.svg";
import twitter from "../assets/footer/twitter.svg";
import lizard from "../assets/footer/MKLizard.png";
import nsf from "../assets/footer/NSF.png";
import pss from "../assets/footer/Performant_Logo.svg";
import { Image } from "astro:assets";
---
Expand All @@ -14,15 +17,22 @@ import { Image } from "astro:assets";
<p class="text-5xl font-serif self-center">EditionCrafter</p>
</div>
<p class="text-center">
Lorem ipsum dolor sit amet consectetur. Nulla auctor a lectus iaculis. Enim pellentesque.
Developed by the Making and Knowing Project at the Center for Science and Society at Columbia University and Performant Software Solutions LLC. Funded by a grant from the National Science Foundation.
</p>
<div class="flex flex-row justify-center gap-6">
<Image src={gh} alt="GitHub" />
<Image src={twitter} alt="Twitter" />
<div class="flex flex-row justify-center gap-4 object-contain">
<a href="https://www.makingandknowing.org/">
<Image src={lizard} alt="Making and Knowing" class="h-16 object-scale-down" />
</a>
<a href="https://www.nsf.gov/">
<Image src={nsf} alt="National Science Foundation" class="h-16 object-scale-down" />
</a>
<a href="https://www.performantsoftware.com/">
<Image src={pss} alt="Performant Software Solutions" class="h-16 object-scale-down" />
</a>
</div>
<div class="h-[2px] bg-neutral-dark rounded-full w-full" />
<p class="text-center">
Lorem ipsum dolor sit amet consectetur. Tellus ultricies purus nibh.
<p class="text-center text-sm">
&copy; 2022 The Making and Knowing Project. This is an open source project licensed under the <a href="https://opensource.org/license/mit" class="underline">MIT License</a>.
</p>
</Container>
</div>
3 changes: 2 additions & 1 deletion astro-web/src/components/ProjectCard.astro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ const { title, img, href = '#', active = true } = Astro.props;
{ img ? (
<Image src={img} alt={title} height={282} width={336} />
) : (
<div class="bg-neutral-gray/30 w-[336px] h-[282px]" />
<div class="bg-neutral-gray/20 w-[336px] h-[282px] flex items-center justify-center">
{ !active && <p class="text-3xl">(Coming Soon)</p> }
) }
<p class="p-8 font-serif">
{title}
Expand Down
30 changes: 26 additions & 4 deletions astro-web/src/layouts/Layout.astro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,43 @@ import '@fontsource/source-code-pro'
interface Props {
title: string;
tab?: string;
transitions?: boolean
transitions?: boolean;
cardText?: string;
}
const { title, tab, transitions = true } = Astro.props;
const { title, tab, transitions = true, cardText = "A simple digital edition publication tool." } = Astro.props;
const siteURL = "https://performant-software.github.io/editioncrafter";
const siteDomain = "performant-software.github.io";
const socialImgURL = `${siteURL}/social.png`;
---

<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="description" content="Astro description" />
<meta name="viewport" content="width=device-width" />
<link rel="icon" type="image/svg+xml" href="/editioncrafter/favicon.svg" />
<meta name="generator" content={Astro.generator} />
<!-- HTML Meta Tags -->
<title>{title}</title>
<meta name="description" content={cardText}>

<!-- Facebook Meta Tags -->
<meta property="og:url" content={siteURL}>
<meta property="og:type" content="website">
<meta property="og:title" content={title}>
<meta property="og:description" content={cardText}>
<meta property="og:image" content={socialImgURL}>

<!-- Twitter Meta Tags -->
<meta name="twitter:card" content="summary_large_image">
<meta property="twitter:domain" content={siteDomain}>
<meta property="twitter:url" content={siteURL}>
<meta name="twitter:title" content={title}>
<meta name="twitter:description" content={cardText}>
<meta name="twitter:image" content={socialImgURL}>

<link rel="icon" type="image/svg+xml" href="/editioncrafter/favicon.jpg" />
{ transitions && <ViewTransitions /> }
</head>
<body class='flex h-full flex-col bg-white 3xl:bg-neutral-dark text-neutral-dark 3xl:max-w-screen-3xl mx-auto' transition:animate="initial">
Expand Down
23 changes: 10 additions & 13 deletions astro-web/src/pages/index.astro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,11 @@ import Container from "../components/Container.astro";
import FeatureTabs from "../components/FeatureTabs";
import ProjectCard from "../components/ProjectCard.astro";
import Button from "../components/Button.astro";
import lizard from "../assets/footer/MKLizard.png";
import nsf from "../assets/footer/NSF.png";
import pss from "../assets/footer/Performant_Logo.svg";
import { Image } from "astro:assets";
import bitc from '../assets/projects/thumbnails/bitc.png';
import bnf from '../assets/projects/thumbnails/bnfmsfr640.png';
import dyngley from '../assets/projects/thumbnails/dyngley.png';
import nbu from '../assets/projects/thumbnails/nbu.png';
import interviste from '../assets/projects/thumbnails/interviste.png';
---

Expand Down Expand Up @@ -81,16 +78,16 @@ import nbu from '../assets/projects/thumbnails/nbu.png';
Explore Projects
</h2>
<div class="grid gap-12 grid-cols-1 sm:grid-cols-2 xl:grid-cols-3 py-12 mx-auto">
<ProjectCard title="BnF Ms. Fr. 640" href="/editioncrafter/projects/bnf-ms-fr-640" img={bnf} />
<ProjectCard title="Native Bound Unbound" href="/editioncrafter/projects/native-bound-unbound" img={nbu} />
<ProjectCard title="Dyngley Family" href="/editioncrafter/projects/dyngley-family" img={dyngley} />
<ProjectCard title="Bow in the Cloud" href="/editioncrafter/projects/bow-in-the-cloud" img={bitc} />
<ProjectCard title="Interviste Pescatori" href="/editioncrafter/projects/interviste-pescatori" />
<ProjectCard title="BnF Ms. Fr. 640" href="/editioncrafter/projects/bnf-ms-fr-640/#/ec/f010/f/f010/tl/-1/g" img={bnf} />
<ProjectCard title="Native Bound Unbound" href="/editioncrafter/projects/native-bound-unbound/#/ec/FHL_007548733_IMG_220/f/FHL_007548733_IMG_220/translation" img={nbu} />
<ProjectCard title="Dyngley Family" href="/editioncrafter/projects/dyngley-family/#/ec/f016/f/f016/transcription" img={dyngley} />
<ProjectCard title="Bow in the Cloud" href="/editioncrafter/projects/bow-in-the-cloud/#/ec/f000/f/f000/eng-415-145a" img={bitc} />
<ProjectCard title="Interviste Pescatori" href="/editioncrafter/projects/interviste-pescatori/#/ec/f002/f/f002/transcription" img={interviste} />
<ProjectCard title="Ely Green Variorum" active={false} />
</div>
</Container>
</div>
<div class="bg-neutral w-full">
<!-- <div class="bg-neutral w-full">
<Container className="py-20 md:flex flex-row gap-16 justify-between">
<div class="flex flex-col gap-6 md:w-1/2 pb-6 md:pb-0">
<h2 class="text-4xl font-serif">
Expand Down Expand Up @@ -138,8 +135,8 @@ import nbu from '../assets/projects/thumbnails/nbu.png';
</div>
</div>
</Container>
</div>
<div class="bg-white w-full">
</div> -->
<!-- <div class="bg-white w-full">
<Container className="py-20 flex flex-col gap-16 text-center items-center">
<h1 class="text-5xl font-bold font-serif">
Brought to you by
Expand All @@ -150,5 +147,5 @@ import nbu from '../assets/projects/thumbnails/nbu.png';
<Image src={pss} alt="Performant Software Solutions" />
</div>
</Container>
</div>
</div> -->
</Layout>

0 comments on commit 2f3c6a4

Please sign in to comment.