Skip to content

Commit

Permalink
Merge pull request #102 from IERoboticsClub/main
Browse files Browse the repository at this point in the history
Fair Hot Features
  • Loading branch information
velocitatem authored Nov 27, 2023
2 parents 88c9662 + 2e40b76 commit 69d6000
Show file tree
Hide file tree
Showing 9 changed files with 117 additions and 36 deletions.
30 changes: 0 additions & 30 deletions fe-public/src/components/Footer.astro
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
import socials from '../scripts/socials.json'
const resources = [
{email: "presi"},
{email: "vice-presi"},
{email: "idk"}
]
---

<footer class="flex justify-center text-center my-5">
Expand All @@ -28,27 +22,3 @@ import socials from '../scripts/socials.json'
}
</ul>
</footer>
<!--
<footer class="grid grid-cols-1 h-48">
<div>
<h2 class="text-3xl flex justify-center dark:text-slate-200 pb-10">Contact Us At</h2>
<div class="flex items-center justify-center">
{
socials.map((current) => {
return (
<div class="flex flex-col items-center px-10 w-fit">
<a href={current.link} class="block">
<svg xmlns={current.xmlns} x="0px" y="0px" width="50" height="50" viewBox="0 0 24 24">
<path d={current.d} class="dark:fill-slate-300"></path>
</svg>
</a>
<h3 class="text-sm pt-2">{current.name}</h3>
</div>
)
})
}
</div>
</div>
</footer> -->
3 changes: 2 additions & 1 deletion fe-public/src/components/NavBar.astro
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ l-95 5 -3 121 -3 121 44 17 c23 9 75 20 114 25 85 11 91 14 109 57 16 38 8 68
<div>
<ul id = "navBarUL" class="navBar bg-[#d5d5d5] dark:bg-[#2D4356]" style="display: none">
<li><a href="">Home</a></li>
<li><a href="/projects">Projects</a></li>
<!-- <li><a href="../blog">Blog</a></li> -->
<hr style="border: 1px solid darkgray; margin-top:10px; margin-bottom: 10px;">
{
Expand Down Expand Up @@ -132,7 +133,7 @@ l-95 5 -3 121 -3 121 44 17 c23 9 75 20 114 25 85 11 91 14 109 57 16 38 8 68
}
ul {
list-style-type: decimal;
margin: 0;
margin: 0;
padding-top: 70px;
/* background-color: #d5d5d5; */
position: fixed;
Expand Down
4 changes: 2 additions & 2 deletions fe-public/src/components/Scoreboard.astro
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ users.sort(compareUsers);
{users.map((user) => (
<tr>
<td>
<div style="text-align: center; margin-left: 20px; margin-right: 20px; margin-top:10px;">
<div style="text-align: center; margin-left: 15px; margin-right: 15px; margin-top:10px;">
<a href={"https://github.com/" + user.username} target="_blank">
<img src={"https://avatars.githubusercontent.com/u/" + user.id} alt={user.username + " icon"} id="user-icon" class="center" width="50">
{user.username}
Expand Down Expand Up @@ -169,4 +169,4 @@ users.sort(compareUsers);
toggleInfo();
});
})
</script>
</script>
2 changes: 2 additions & 0 deletions fe-public/src/components/WordCloud.astro
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
---

<pre class="center" id="word_cloud">
<a href="/projects">
<center>
<div id="wordCloudWords"></div>
<div id="wordCloudDE" class="dark:text-gray-500 text-gray-300"></div>
</center>
</a>
</pre>
<style>
#wordCloudWords{
Expand Down
2 changes: 2 additions & 0 deletions fe-public/src/layouts/Layout.astro
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
import { SEO } from "astro-seo";
import DarkMode from "../components/DarkMode.astro";
interface Props {
title: string;
}
Expand Down Expand Up @@ -74,6 +75,7 @@ const url = "https://www.ieroboticsclub.com/"
</script>
<!-- End Matomo Tag Manager --> <!-- Maybe import footer in layout instead -->
<body class="dark:bg-slate-900">
<DarkMode />
<slot />
</body>
</html>
Expand Down
22 changes: 19 additions & 3 deletions fe-public/src/pages/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import Scoreboard from "../components/Scoreboard.astro";
import AboutInfo from "../components/AboutInfo.astro";
import NavBar from "../components/NavBar.astro";
import SidewaysHeader from "../components/SidewaysHeader.astro";
import DarkMode from "../components/DarkMode.astro";
import Calendar from "../components/Calendar.astro";
import Footer from "../components/Footer.astro";
import loadLocale from '../scripts/locale.js';
Expand All @@ -20,14 +19,13 @@ const navBarLength = 10;
<NavBar width={navBarLength}></NavBar>
</div>
<div id="main-body" class="p-0 m-0">
<DarkMode />
<div id="container">
<div id="matrix-bg" class="absolute align-top text-gray-300 top-0 left-0">
<MatrixBackground length=17 amplitude=5 period=40 falloff=2 flip="false"></MatrixBackground>
</div>
<h1 id="header" class="text-5xl text-center h-200 top-16">Robotics<br>and AI<br>Club</h1>
<h2 id="header-join" class="text-3xl text-center top-32">
<a href="https://ieconnects.ie.edu/feeds?type=club&type_id=300003041&tab=home" target="_blank">
<a class="hover-3 dark:text-white" href="https://ieconnects.ie.edu/feeds?type=club&type_id=300003041&tab=home" target="_blank">
{l("index:action")}
</a>
</h2>
Expand Down Expand Up @@ -69,4 +67,22 @@ const navBarLength = 10;
}
}

.hover-3 {
--b: 0.1em; /* the thickness of the line */
--c: #1095c1; /* the color */

/* color: #0000; */
padding-block: var(--b);
background:
linear-gradient(var(--c) 50%,#000 0) 0% calc(100% - var(--_p,0%))/100% 200%,
linear-gradient(var(--c) 0 0) 0% var(--_p,0%)/var(--_p,0%) var(--b) no-repeat;
-webkit-background-clip: text,padding-box;
background-clip: text,padding-box;
transition: .3s var(--_s,0s) linear,background-size .3s calc(.3s - var(--_s,0s));
}
.hover-3:hover {
--_p: 100%;
--_s: .3s;
color: var(--c);
}
</style>
41 changes: 41 additions & 0 deletions fe-public/src/pages/projects/index.astro
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
---
// Import your layout and scripts
import Layout from '../../layouts/Layout.astro';
import getProject from '../../scripts/load-projects.js';
// Function to extract the ID from a Google Drive link
function extractID(driveLink) {
const match = /[-\w]{25,}/.exec(driveLink);
return match ? match[0] : null;
}
// Fetch the list of projects. Assuming getProject is an async function that returns project data.
let projects;
try {
projects = await getProject();
} catch (error) {
console.error('Error fetching projects:', error);
projects = [];
}
---

<Layout title="Projects | AI and Robotics Club" class="dark">
<div class="min-h-screen bg-white dark:bg-gray-800 text-black dark:text-white">
<header class="text-center py-12">
<h1 class="text-4xl font-bold">Our Projects</h1>
</header>

<section class="container mx-auto px-4 py-8">
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
{projects.map((project, index) => (
<div class="bg-white dark:bg-gray-700 rounded-lg shadow-md p-6 border border-gray-200 dark:border-gray-600" key={index}>
<h2 class="text-2xl font-bold mb-2">{project.project_name}</h2>
<p class="mb-4">{project.description}</p>
<p class="mt-4 font-semibold">Status: {project.progress_status}/10</p>
<a class="text-blue-800 dark:text-blue-400 hover:underline" href={project.video_demo_link} target="_blank">Video Demo</a>
</div>
))}
</div>
</section>
</div>
</Layout>
43 changes: 43 additions & 0 deletions fe-public/src/scripts/load-projects.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
function loadProjects() {
return [
{
"timestamp": "23/11/2023 13:09:08",
"email_address": "[email protected]",
"project_name": "Club website",
"description": "Connecting the club to the world",
"video_demo_link": "https://drive.google.com/open?id=1WP4LyVJGjp7lRTioPf46nocHS2lWM1Iv",
"cover_image_link": "https://drive.google.com/open?id=1v325wY3lo1Il4YIY4b04xBA0YN_JjM4U",
"progress_status": "8"
},
{
"timestamp": "23/11/2023 13:39:19",
"email_address": "[email protected]",
"project_name": "Luna: Dawn to Dusk",
"description": "Luna is a virtual assistant that will help your start or end your day the best way! Create tailored playlists, keep track of your schedule, get the latest news and weather updates, and more - all with Luna!",
"video_demo_link": "https://drive.google.com/file/d/1-ksU-Bu3IytEB8I9qDtpCF_aMzRSURYo/view?usp=drive_link",
"cover_image_link": "",
"progress_status": "5"
},
{
"timestamp": "23/11/2023 15:18:35",
"email_address": "[email protected]",
"project_name": "Orgone",
"description": "Autonomous Self Navigating Vehicle",
"video_demo_link": "https://drive.google.com/open?id=1nCmf0CfEOHd2CfYGxoTJ6Y49friH-0E1",
"cover_image_link": "https://drive.google.com/open?id=1jwZi-8uYFv0fh70ptPtxbtn86qRHc_tk",
"progress_status": "4"
},
{
"timestamp": "23/11/2023 15:34:18",
"email_address": "[email protected]",
"project_name": "Pepper & Emoji",
"description": "I'm developing a project to improve communication between individuals with and without autism, shifting from speech transcription to a Computer Vision approach. It features a prototype using a webcam to recognize facial expressions and translate them into simple emojis, aiding those with autism in understanding social cues. Using OpenCV and DeepFace for real-time emotion detection, the plan is to integrate this into Pepper, our lab's robot, for enhanced emotional communication via its display. Challenges include ensuring real-time accuracy, privacy, emotional sensitivity, minimizing biases, and incorporating feedback from the autism community.",
"video_demo_link": "https://drive.google.com/open?id=1wkDMy-8X-P8q4pSMpdqBLtJPGK7O7L40",
"cover_image_link": "https://drive.google.com/open?id=1ko6O0M2D7lbYYpbJCf9L_v9rngV16M5q",
"progress_status": "6"
}
]

}

export default loadProjects;
6 changes: 6 additions & 0 deletions fe-public/src/scripts/socials.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@
"link": "https://ieconnects.ie.edu/feeds?type=club&type_id=300003041&tab=home",
"xmlns": "http://www.w3.org/2000/svg",
"d": "M3,0c1.6,0,3,1.3,3,3S4.6,6,3,6C1.3,6,0,4.7,0,3S1.3,0,3,0 M0.6,7.8v15.6h4.8V7.8H0.6z M14.7,13.5h-3.1 c0.3-1.2,1.3-2.3,3.1-2.3s2.8,1.1,3.1,2.3H14.7z M22.5,15.6L22.5,15.6c0-4.6-3-8.3-8-8.3s-8,3.7-8,8.2v0.1c0,5,3.8,8.2,8.6,8.2 c2.5,0,5-1.1,6.6-3.1l-3.3-2.4c-0.9,1-2,1.8-3.5,1.8c-1.9,0-3.2-1.2-3.6-3h11C22.5,16.7,22.5,16.2,22.5,15.6L22.5,15.6L22.5,15.6z"
},
{
"name": "Discord",
"link": "https://discord.gg/3RBZ37KYFa",
"xmlns": "http://www.w3.org/2000/svg",
"d": "M19.98,5.69c-1.68-1.34-4.08-1.71-5.12-1.82h-0.04c-0.16,0-0.31,0.09-0.36,0.24c-0.09,0.23,0.05,0.48,0.28,0.52 c1.17,0.24,2.52,0.66,3.75,1.43c0.25,0.15,0.31,0.49,0.11,0.72c-0.16,0.18-0.43,0.2-0.64,0.08C15.56,5.38,12.58,5.3,12,5.3 S8.44,5.38,6.04,6.86C5.83,6.98,5.56,6.96,5.4,6.78C5.2,6.55,5.26,6.21,5.51,6.06c1.23-0.77,2.58-1.19,3.75-1.43 c0.23-0.04,0.37-0.29,0.28-0.52c-0.05-0.15-0.2-0.24-0.36-0.24H9.14C8.1,3.98,5.7,4.35,4.02,5.69C3.04,6.6,1.09,11.83,1,16.46 c0,0.31,0.08,0.62,0.26,0.87c1.17,1.65,3.71,2.64,5.63,2.78c0.29,0.02,0.57-0.11,0.74-0.35c0.01,0,0.01-0.01,0.02-0.02 c0.35-0.48,0.14-1.16-0.42-1.37c-1.6-0.59-2.42-1.29-2.47-1.34c-0.2-0.18-0.22-0.48-0.05-0.68c0.18-0.2,0.48-0.22,0.68-0.04 c0.03,0.02,2.25,1.91,6.61,1.91s6.58-1.89,6.61-1.91c0.2-0.18,0.5-0.16,0.68,0.04c0.17,0.2,0.15,0.5-0.05,0.68 c-0.05,0.05-0.87,0.75-2.47,1.34c-0.56,0.21-0.77,0.89-0.42,1.37c0.01,0.01,0.01,0.02,0.02,0.02c0.17,0.24,0.45,0.37,0.74,0.35 c1.92-0.14,4.46-1.13,5.63-2.78c0.18-0.25,0.26-0.56,0.26-0.87C22.91,11.83,20.96,6.6,19.98,5.69z M8.89,14.87 c-0.92,0-1.67-0.86-1.67-1.91c0-1.06,0.75-1.92,1.67-1.92c0.93,0,1.67,0.86,1.67,1.92C10.56,14.01,9.82,14.87,8.89,14.87z M15.11,14.87c-0.93,0-1.67-0.86-1.67-1.91c0-1.06,0.74-1.92,1.67-1.92c0.92,0,1.67,0.86,1.67,1.92 C16.78,14.01,16.03,14.87,15.11,14.87z"
}
]

0 comments on commit 69d6000

Please sign in to comment.