From 38e9df5936cd6df309f0074e7bc04998dc7f804b Mon Sep 17 00:00:00 2001 From: Pablo Moyano Date: Sat, 7 Oct 2023 00:36:52 +0200 Subject: [PATCH] a --- .../assets/gallery}/Logo-invert-192.png | Bin .../assets/gallery}/Logo-invert-192.webp | Bin .../assets/gallery}/Logo-invert-300.png | Bin .../assets/gallery}/Logo-invert-300.webp | Bin .../assets/gallery}/Logo-invert-92.png | Bin .../assets/gallery}/Logo-invert-92.webp | Bin .../assets/gallery}/Logo-invert.png | Bin .../assets/gallery}/Logo-invert.webp | Bin {public/img => src/assets/gallery}/app.JPG | Bin {public/img => src/assets/gallery}/app.jpg | Bin {public/img => src/assets/gallery}/app.webp | Bin .../img => src/assets/gallery}/atresmedia.jpg | Bin .../assets/gallery}/atresmedia.webp | Bin {public/img => src/assets/gallery}/bitup.jpg | Bin {public/img => src/assets/gallery}/bitup.webp | Bin .../img => src/assets/gallery}/coreboot2.jpg | Bin .../img => src/assets/gallery}/coreboot2.webp | Bin .../img => src/assets/gallery}/flp-dark.jpg | Bin .../img => src/assets/gallery}/flp-dark.webp | Bin {public/img => src/assets/gallery}/flp1.jpg | Bin {public/img => src/assets/gallery}/flp1.webp | Bin {public/img => src/assets/gallery}/fosc.jpg | Bin {public/img => src/assets/gallery}/fosc.webp | Bin .../img => src/assets/gallery}/hacking.jpg | Bin .../img => src/assets/gallery}/hacking.webp | Bin .../assets/gallery}/junction2018-1.jpg | Bin .../assets/gallery}/junction2018-1.webp | Bin .../assets/gallery}/junction2018.jpg | Bin .../assets/gallery}/junction2018.webp | Bin .../assets/gallery}/junction2019-1.jpg | Bin .../assets/gallery}/junction2019-1.webp | Bin .../assets/gallery}/junction2019.jpg | Bin .../assets/gallery}/junction2019.webp | Bin {public/img => src/assets/gallery}/kids.jpg | Bin {public/img => src/assets/gallery}/kids.webp | Bin {public/img => src/assets/gallery}/kids1.jpg | Bin {public/img => src/assets/gallery}/kids1.webp | Bin {public/img => src/assets/gallery}/nn.jpg | Bin {public/img => src/assets/gallery}/nn.webp | Bin {public/img => src/assets/gallery}/nn1.jpg | Bin {public/img => src/assets/gallery}/nn1.webp | Bin .../img => src/assets/gallery}/pepemod.jpg | Bin .../img => src/assets/gallery}/pepemod.webp | Bin .../img => src/assets/gallery}/pepemod1.jpg | Bin .../img => src/assets/gallery}/pepemod1.webp | Bin .../img => src/assets/gallery}/printer3d.jpg | Bin .../img => src/assets/gallery}/printer3d.webp | Bin {public/img => src/assets/gallery}/santi.jpg | Bin {public/img => src/assets/gallery}/santi.webp | Bin {public/img => src/assets/gallery}/sec.jpg | Bin {public/img => src/assets/gallery}/sec.webp | Bin .../img => src/assets/gallery}/soldadura.jpg | Bin .../img => src/assets/gallery}/soldadura.webp | Bin .../img => src/assets/gallery}/soldadura1.jpg | Bin .../assets/gallery}/soldadura1.webp | Bin src/components/CodeHello.astro | 8 ++++ src/components/Footer.astro | 22 +++++++++ src/components/Gallery.astro | 43 ++++++++++++++++++ src/components/Navbar.astro | 6 +-- src/pages/index.astro | 23 +++++++++- tailwind.config.cjs | 5 +- 61 files changed, 101 insertions(+), 6 deletions(-) rename {public/img => src/assets/gallery}/Logo-invert-192.png (100%) rename {public/img => src/assets/gallery}/Logo-invert-192.webp (100%) rename {public/img => src/assets/gallery}/Logo-invert-300.png (100%) rename {public/img => src/assets/gallery}/Logo-invert-300.webp (100%) rename {public/img => src/assets/gallery}/Logo-invert-92.png (100%) rename {public/img => src/assets/gallery}/Logo-invert-92.webp (100%) rename {public/img => src/assets/gallery}/Logo-invert.png (100%) rename {public/img => src/assets/gallery}/Logo-invert.webp (100%) rename {public/img => src/assets/gallery}/app.JPG (100%) rename {public/img => src/assets/gallery}/app.jpg (100%) rename {public/img => src/assets/gallery}/app.webp (100%) rename {public/img => src/assets/gallery}/atresmedia.jpg (100%) rename {public/img => src/assets/gallery}/atresmedia.webp (100%) rename {public/img => src/assets/gallery}/bitup.jpg (100%) rename {public/img => src/assets/gallery}/bitup.webp (100%) rename {public/img => src/assets/gallery}/coreboot2.jpg (100%) rename {public/img => src/assets/gallery}/coreboot2.webp (100%) rename {public/img => src/assets/gallery}/flp-dark.jpg (100%) rename {public/img => src/assets/gallery}/flp-dark.webp (100%) rename {public/img => src/assets/gallery}/flp1.jpg (100%) rename {public/img => src/assets/gallery}/flp1.webp (100%) rename {public/img => src/assets/gallery}/fosc.jpg (100%) rename {public/img => src/assets/gallery}/fosc.webp (100%) rename {public/img => src/assets/gallery}/hacking.jpg (100%) rename {public/img => src/assets/gallery}/hacking.webp (100%) rename {public/img => src/assets/gallery}/junction2018-1.jpg (100%) rename {public/img => src/assets/gallery}/junction2018-1.webp (100%) rename {public/img => src/assets/gallery}/junction2018.jpg (100%) rename {public/img => src/assets/gallery}/junction2018.webp (100%) rename {public/img => src/assets/gallery}/junction2019-1.jpg (100%) rename {public/img => src/assets/gallery}/junction2019-1.webp (100%) rename {public/img => src/assets/gallery}/junction2019.jpg (100%) rename {public/img => src/assets/gallery}/junction2019.webp (100%) rename {public/img => src/assets/gallery}/kids.jpg (100%) rename {public/img => src/assets/gallery}/kids.webp (100%) rename {public/img => src/assets/gallery}/kids1.jpg (100%) rename {public/img => src/assets/gallery}/kids1.webp (100%) rename {public/img => src/assets/gallery}/nn.jpg (100%) rename {public/img => src/assets/gallery}/nn.webp (100%) rename {public/img => src/assets/gallery}/nn1.jpg (100%) rename {public/img => src/assets/gallery}/nn1.webp (100%) rename {public/img => src/assets/gallery}/pepemod.jpg (100%) rename {public/img => src/assets/gallery}/pepemod.webp (100%) rename {public/img => src/assets/gallery}/pepemod1.jpg (100%) rename {public/img => src/assets/gallery}/pepemod1.webp (100%) rename {public/img => src/assets/gallery}/printer3d.jpg (100%) rename {public/img => src/assets/gallery}/printer3d.webp (100%) rename {public/img => src/assets/gallery}/santi.jpg (100%) rename {public/img => src/assets/gallery}/santi.webp (100%) rename {public/img => src/assets/gallery}/sec.jpg (100%) rename {public/img => src/assets/gallery}/sec.webp (100%) rename {public/img => src/assets/gallery}/soldadura.jpg (100%) rename {public/img => src/assets/gallery}/soldadura.webp (100%) rename {public/img => src/assets/gallery}/soldadura1.jpg (100%) rename {public/img => src/assets/gallery}/soldadura1.webp (100%) create mode 100644 src/components/CodeHello.astro create mode 100644 src/components/Footer.astro create mode 100644 src/components/Gallery.astro diff --git a/public/img/Logo-invert-192.png b/src/assets/gallery/Logo-invert-192.png similarity index 100% rename from public/img/Logo-invert-192.png rename to src/assets/gallery/Logo-invert-192.png diff --git a/public/img/Logo-invert-192.webp b/src/assets/gallery/Logo-invert-192.webp similarity index 100% rename from public/img/Logo-invert-192.webp rename to src/assets/gallery/Logo-invert-192.webp diff --git a/public/img/Logo-invert-300.png b/src/assets/gallery/Logo-invert-300.png similarity index 100% rename from public/img/Logo-invert-300.png rename to src/assets/gallery/Logo-invert-300.png diff --git a/public/img/Logo-invert-300.webp b/src/assets/gallery/Logo-invert-300.webp similarity index 100% rename from public/img/Logo-invert-300.webp rename to src/assets/gallery/Logo-invert-300.webp diff --git a/public/img/Logo-invert-92.png b/src/assets/gallery/Logo-invert-92.png similarity index 100% rename from public/img/Logo-invert-92.png rename to src/assets/gallery/Logo-invert-92.png diff --git a/public/img/Logo-invert-92.webp b/src/assets/gallery/Logo-invert-92.webp similarity index 100% rename from public/img/Logo-invert-92.webp rename to src/assets/gallery/Logo-invert-92.webp diff --git a/public/img/Logo-invert.png b/src/assets/gallery/Logo-invert.png similarity index 100% rename from public/img/Logo-invert.png rename to src/assets/gallery/Logo-invert.png diff --git a/public/img/Logo-invert.webp b/src/assets/gallery/Logo-invert.webp similarity index 100% rename from public/img/Logo-invert.webp rename to src/assets/gallery/Logo-invert.webp diff --git a/public/img/app.JPG b/src/assets/gallery/app.JPG similarity index 100% rename from public/img/app.JPG rename to src/assets/gallery/app.JPG diff --git a/public/img/app.jpg b/src/assets/gallery/app.jpg similarity index 100% rename from public/img/app.jpg rename to src/assets/gallery/app.jpg diff --git a/public/img/app.webp b/src/assets/gallery/app.webp similarity index 100% rename from public/img/app.webp rename to src/assets/gallery/app.webp diff --git a/public/img/atresmedia.jpg b/src/assets/gallery/atresmedia.jpg similarity index 100% rename from public/img/atresmedia.jpg rename to src/assets/gallery/atresmedia.jpg diff --git a/public/img/atresmedia.webp b/src/assets/gallery/atresmedia.webp similarity index 100% rename from public/img/atresmedia.webp rename to src/assets/gallery/atresmedia.webp diff --git a/public/img/bitup.jpg b/src/assets/gallery/bitup.jpg similarity index 100% rename from public/img/bitup.jpg rename to src/assets/gallery/bitup.jpg diff --git a/public/img/bitup.webp b/src/assets/gallery/bitup.webp similarity index 100% rename from public/img/bitup.webp rename to src/assets/gallery/bitup.webp diff --git a/public/img/coreboot2.jpg b/src/assets/gallery/coreboot2.jpg similarity index 100% rename from public/img/coreboot2.jpg rename to src/assets/gallery/coreboot2.jpg diff --git a/public/img/coreboot2.webp b/src/assets/gallery/coreboot2.webp similarity index 100% rename from public/img/coreboot2.webp rename to src/assets/gallery/coreboot2.webp diff --git a/public/img/flp-dark.jpg b/src/assets/gallery/flp-dark.jpg similarity index 100% rename from public/img/flp-dark.jpg rename to src/assets/gallery/flp-dark.jpg diff --git a/public/img/flp-dark.webp b/src/assets/gallery/flp-dark.webp similarity index 100% rename from public/img/flp-dark.webp rename to src/assets/gallery/flp-dark.webp diff --git a/public/img/flp1.jpg b/src/assets/gallery/flp1.jpg similarity index 100% rename from public/img/flp1.jpg rename to src/assets/gallery/flp1.jpg diff --git a/public/img/flp1.webp b/src/assets/gallery/flp1.webp similarity index 100% rename from public/img/flp1.webp rename to src/assets/gallery/flp1.webp diff --git a/public/img/fosc.jpg b/src/assets/gallery/fosc.jpg similarity index 100% rename from public/img/fosc.jpg rename to src/assets/gallery/fosc.jpg diff --git a/public/img/fosc.webp b/src/assets/gallery/fosc.webp similarity index 100% rename from public/img/fosc.webp rename to src/assets/gallery/fosc.webp diff --git a/public/img/hacking.jpg b/src/assets/gallery/hacking.jpg similarity index 100% rename from public/img/hacking.jpg rename to src/assets/gallery/hacking.jpg diff --git a/public/img/hacking.webp b/src/assets/gallery/hacking.webp similarity index 100% rename from public/img/hacking.webp rename to src/assets/gallery/hacking.webp diff --git a/public/img/junction2018-1.jpg b/src/assets/gallery/junction2018-1.jpg similarity index 100% rename from public/img/junction2018-1.jpg rename to src/assets/gallery/junction2018-1.jpg diff --git a/public/img/junction2018-1.webp b/src/assets/gallery/junction2018-1.webp similarity index 100% rename from public/img/junction2018-1.webp rename to src/assets/gallery/junction2018-1.webp diff --git a/public/img/junction2018.jpg b/src/assets/gallery/junction2018.jpg similarity index 100% rename from public/img/junction2018.jpg rename to src/assets/gallery/junction2018.jpg diff --git a/public/img/junction2018.webp b/src/assets/gallery/junction2018.webp similarity index 100% rename from public/img/junction2018.webp rename to src/assets/gallery/junction2018.webp diff --git a/public/img/junction2019-1.jpg b/src/assets/gallery/junction2019-1.jpg similarity index 100% rename from public/img/junction2019-1.jpg rename to src/assets/gallery/junction2019-1.jpg diff --git a/public/img/junction2019-1.webp b/src/assets/gallery/junction2019-1.webp similarity index 100% rename from public/img/junction2019-1.webp rename to src/assets/gallery/junction2019-1.webp diff --git a/public/img/junction2019.jpg b/src/assets/gallery/junction2019.jpg similarity index 100% rename from public/img/junction2019.jpg rename to src/assets/gallery/junction2019.jpg diff --git a/public/img/junction2019.webp b/src/assets/gallery/junction2019.webp similarity index 100% rename from public/img/junction2019.webp rename to src/assets/gallery/junction2019.webp diff --git a/public/img/kids.jpg b/src/assets/gallery/kids.jpg similarity index 100% rename from public/img/kids.jpg rename to src/assets/gallery/kids.jpg diff --git a/public/img/kids.webp b/src/assets/gallery/kids.webp similarity index 100% rename from public/img/kids.webp rename to src/assets/gallery/kids.webp diff --git a/public/img/kids1.jpg b/src/assets/gallery/kids1.jpg similarity index 100% rename from public/img/kids1.jpg rename to src/assets/gallery/kids1.jpg diff --git a/public/img/kids1.webp b/src/assets/gallery/kids1.webp similarity index 100% rename from public/img/kids1.webp rename to src/assets/gallery/kids1.webp diff --git a/public/img/nn.jpg b/src/assets/gallery/nn.jpg similarity index 100% rename from public/img/nn.jpg rename to src/assets/gallery/nn.jpg diff --git a/public/img/nn.webp b/src/assets/gallery/nn.webp similarity index 100% rename from public/img/nn.webp rename to src/assets/gallery/nn.webp diff --git a/public/img/nn1.jpg b/src/assets/gallery/nn1.jpg similarity index 100% rename from public/img/nn1.jpg rename to src/assets/gallery/nn1.jpg diff --git a/public/img/nn1.webp b/src/assets/gallery/nn1.webp similarity index 100% rename from public/img/nn1.webp rename to src/assets/gallery/nn1.webp diff --git a/public/img/pepemod.jpg b/src/assets/gallery/pepemod.jpg similarity index 100% rename from public/img/pepemod.jpg rename to src/assets/gallery/pepemod.jpg diff --git a/public/img/pepemod.webp b/src/assets/gallery/pepemod.webp similarity index 100% rename from public/img/pepemod.webp rename to src/assets/gallery/pepemod.webp diff --git a/public/img/pepemod1.jpg b/src/assets/gallery/pepemod1.jpg similarity index 100% rename from public/img/pepemod1.jpg rename to src/assets/gallery/pepemod1.jpg diff --git a/public/img/pepemod1.webp b/src/assets/gallery/pepemod1.webp similarity index 100% rename from public/img/pepemod1.webp rename to src/assets/gallery/pepemod1.webp diff --git a/public/img/printer3d.jpg b/src/assets/gallery/printer3d.jpg similarity index 100% rename from public/img/printer3d.jpg rename to src/assets/gallery/printer3d.jpg diff --git a/public/img/printer3d.webp b/src/assets/gallery/printer3d.webp similarity index 100% rename from public/img/printer3d.webp rename to src/assets/gallery/printer3d.webp diff --git a/public/img/santi.jpg b/src/assets/gallery/santi.jpg similarity index 100% rename from public/img/santi.jpg rename to src/assets/gallery/santi.jpg diff --git a/public/img/santi.webp b/src/assets/gallery/santi.webp similarity index 100% rename from public/img/santi.webp rename to src/assets/gallery/santi.webp diff --git a/public/img/sec.jpg b/src/assets/gallery/sec.jpg similarity index 100% rename from public/img/sec.jpg rename to src/assets/gallery/sec.jpg diff --git a/public/img/sec.webp b/src/assets/gallery/sec.webp similarity index 100% rename from public/img/sec.webp rename to src/assets/gallery/sec.webp diff --git a/public/img/soldadura.jpg b/src/assets/gallery/soldadura.jpg similarity index 100% rename from public/img/soldadura.jpg rename to src/assets/gallery/soldadura.jpg diff --git a/public/img/soldadura.webp b/src/assets/gallery/soldadura.webp similarity index 100% rename from public/img/soldadura.webp rename to src/assets/gallery/soldadura.webp diff --git a/public/img/soldadura1.jpg b/src/assets/gallery/soldadura1.jpg similarity index 100% rename from public/img/soldadura1.jpg rename to src/assets/gallery/soldadura1.jpg diff --git a/public/img/soldadura1.webp b/src/assets/gallery/soldadura1.webp similarity index 100% rename from public/img/soldadura1.webp rename to src/assets/gallery/soldadura1.webp diff --git a/src/components/CodeHello.astro b/src/components/CodeHello.astro new file mode 100644 index 0000000..1dd76d3 --- /dev/null +++ b/src/components/CodeHello.astro @@ -0,0 +1,8 @@ +
+ 
#!/usr/bin/env meme
+ 
FOSC was a hackerspace located at Universidad Politécnica de Cartagena
+ 
A student association focused on expanding free software and hacker culture
+ 
The space is no longer active but ideas don't need spaces
+ 
Our spirit lives on during hackathons, conventions and more
+ 
Expect us
+
\ No newline at end of file diff --git a/src/components/Footer.astro b/src/components/Footer.astro new file mode 100644 index 0000000..01e7dab --- /dev/null +++ b/src/components/Footer.astro @@ -0,0 +1,22 @@ +--- +import { Image } from 'astro:assets'; + +import foscLogo from '../assets/img/fosc-logo-old.png' +--- + \ No newline at end of file diff --git a/src/components/Gallery.astro b/src/components/Gallery.astro new file mode 100644 index 0000000..0a57287 --- /dev/null +++ b/src/components/Gallery.astro @@ -0,0 +1,43 @@ +--- +import { Image } from "astro:assets"; + +import junction2018 from "../assets/gallery/junction2018.jpg"; +import santi from "../assets/gallery/santi.jpg"; +import kids from "../assets/gallery/kids.jpg"; +import sec from "../assets/gallery/sec.jpg"; +import junction20181 from "../assets/gallery/junction2018-1.jpg"; +import app from "../assets/gallery/app.jpg"; +import bitup from "../assets/gallery/bitup.jpg"; +import soldadura from "../assets/gallery/soldadura.jpg"; +import hacking from "../assets/gallery/hacking.jpg"; +import junction2019_1 from "../assets/gallery/junction2019-1.jpg"; +import pepemod from "../assets/gallery/pepemod.jpg"; +import atresmedia from "../assets/gallery/atresmedia.jpg"; +import junction2019 from "../assets/gallery/junction2019.jpg"; +import printer3d from "../assets/gallery/printer3d.jpg"; +import flp1 from "../assets/gallery/flp1.jpg"; +import soldadura1 from "../assets/gallery/soldadura1.jpg"; +import nn1 from "../assets/gallery/nn1.jpg"; +import fosc from "../assets/gallery/fosc.jpg"; +--- + +
+ Winners at Junction 2018 + Explaining MCU glitching at Makers Murcia + Showing 3D printing at Semana de la Ciencia + More Semana de la Ciencia + Hacking at Junction 2018 + Speaking for Puertas Violetas app + Giving an ESP32 hacking talk at BITUP 2019 + Learning to solder + Installing Coreboot open firmware into a Thinkpad x230 + Posing at Junction 2019 + Soldering Nitrocaster's adapter board to a Thinkpad x230 + Having fun in Atresmedia + Hacking at Junction 2019 + 3D printer, 3D printing + First FOSC LAN Party + Soldering workshop + Giving an open firmware talk at Navaja Negra 2019 + Showing some stuff during Cable Amarillo +
diff --git a/src/components/Navbar.astro b/src/components/Navbar.astro index 35c468d..1dfd5b4 100644 --- a/src/components/Navbar.astro +++ b/src/components/Navbar.astro @@ -16,9 +16,9 @@ import foscLogo from '../assets/img/fosc-logo-new.png'
diff --git a/src/pages/index.astro b/src/pages/index.astro index 62c4744..9f6aeea 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -4,6 +4,9 @@ import "@/styles/globals.css"; import Navbar from "../components/Navbar.astro"; import HackerText from "../components/HackerText.astro"; import Badge from "../components/Badge.astro" +import Gallery from "../components/Gallery.astro" +import Footer from "../components/Footer.astro" +import CodeHello from "../components/CodeHello.astro" // Image imports import { Image } from "astro:assets"; @@ -42,6 +45,8 @@ import foscLogo from "../assets/img/fosc-logo-old.png"; + +
@@ -57,11 +62,25 @@ import foscLogo from "../assets/img/fosc-logo-old.png";
-
- +
+
+
+ +
+ +
+
+
content
+
+
content
+
+
+ +
+ diff --git a/tailwind.config.cjs b/tailwind.config.cjs index 21b3928..c653d72 100644 --- a/tailwind.config.cjs +++ b/tailwind.config.cjs @@ -2,7 +2,10 @@ const defaultTheme = require("tailwindcss/defaultTheme"); module.exports = { content: ["./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}"], - plugins: [require("daisyui")], + plugins: [ + require("@tailwindcss/typography"), + require("daisyui") + ], daisyui: { themes: [ "light",