Skip to content

Commit

Permalink
Merge pull request #28 from IntelligentBeaver/sfd-2024
Browse files Browse the repository at this point in the history
Added Our Team Page and Minor Improvements to other pages.
  • Loading branch information
SatyaRajAwasth1 authored Sep 12, 2024
2 parents ed15e3d + 7186d63 commit 6cfc2ce
Show file tree
Hide file tree
Showing 12 changed files with 253 additions and 28 deletions.
Binary file added assets/members/Rishav.jpg
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 assets/members/Sujal_Bikram_Thapa.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions assets/socialmedia/github.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions css/input.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@tailwind components;
@tailwind utilities;


@layer components {
.bg-grid {
background-color: #f6f6ff;
Expand All @@ -21,6 +22,18 @@
grid-template-columns: repeat(2, minmax(0, 45%));
grid-template-rows: repeat(1, (0, 55%));
}


/* For FAQ page */
.faq-item{
@apply border bg-white border-gray-300 shadow-md rounded-md pt-4 px-4 my-5;
}
.faq-question{
@apply w-full text-left flex justify-between gap-4 items-center;
}
.faq-answer{
@apply my-2 text-gray-500 overflow-hidden transition-all duration-500 max-h-0;
}
}

@font-face {
Expand Down
2 changes: 1 addition & 1 deletion css/output.css
Original file line number Diff line number Diff line change
Expand Up @@ -1976,4 +1976,4 @@ video {
font-size: 3rem;
line-height: 1;
}
}
}
26 changes: 26 additions & 0 deletions data/members.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[
{
"name": "Sujal Bikram Thapa",
"designation": "Graphics/Web Designer",
"image": "../assets/members/Sujal_Bikram_Thapa.jpeg",
"socialLinks": {
"facebook": "https://www.facebook.com/sujalbikramthapa",
"instagram": "https://www.instagram.com/sujalbthapa/",
"linkedin": "https://www.linkedin.com/in/sujalbthapa/",
"github": "https://github.com/sujalbthapa",
"website": "https://sujalbthapa.com.np/"
}
},
{
"name": "Rishav Chapagain",
"designation": "Web Developer",
"image": "../assets/members/Rishav.jpg",
"socialLinks": {
"facebook": "https://www.facebook.com/rishavosaurus",
"instagram": "https://www.instagram.com/rishavosaurus/",
"linkedin": "https://www.linkedin.com/in/rishav-chapagain/",
"github": "https://github.com/RishavOsaurus/",
"website": "#"
}
}
]
4 changes: 2 additions & 2 deletions js/faqs.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ document.addEventListener('DOMContentLoaded', () => {
question.addEventListener('click', () => {
if (answer.style.maxHeight && answer.style.maxHeight !== "0px") {
answer.style.maxHeight = "0px";
question.querySelector('span.text-purple-600').textContent = '+';
question.querySelector('span.text-gray-900').textContent = '+';
} else {
answer.style.maxHeight = answer.scrollHeight + "px";
question.querySelector('span.text-purple-600').textContent = '-';
question.querySelector('span.text-gray-900').textContent = '-';
}
});
});
Expand Down
2 changes: 1 addition & 1 deletion js/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const footerCode = `<section
<li><a href="" target="_blank" class="text-white font-semibold text-xl hover:text-red-600">Home</a></li>
<li><a href="" target="_blank" class="text-white font-semibold text-xl hover:text-red-600">About</a></li>
<li><a href="" target="_blank" class="text-white font-semibold text-xl hover:text-red-600">Itinerary</a></li>
<li><a href="" target="_blank" class="text-white font-semibold text-xl hover:text-red-600">Team</a></li>
<li><a href="/pages/ourteam.html" target="_blank" class="text-white font-semibold text-xl hover:text-red-600">Team</a></li>
<li><a href="" target="_blank" class="text-white font-semibold text-xl hover:text-red-600">Highlights</a></li>
<li><a href="/pages/faqs.html" target="_blank" class="text-white font-semibold text-xl hover:text-red-600">FAQs</a></li>
<li><a href="" target="_blank" class="text-white font-semibold text-xl hover:text-red-600">Contact</a></li>
Expand Down
55 changes: 55 additions & 0 deletions js/members.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
// Function to create cards
function createCard(member) {
return `
<div id="members-card" class="relative w-80 rounded-3xl shadow-lg overflow-hidden">
<!-- Background Image -->
<img id="profile" src="${member.image}" alt="${member.name}" class="w-full rounded-3xl h-96 object-cover border-8 border-white">
<!-- Overlay with text -->
<div class="absolute text-center bottom-0 left-0 w-full bg-black bg-opacity-60 text-white p-4">
<h2 class="text-xl font-semibold">${member.name}</h2>
<p class="text-sm">${member.designation}</p>
<!-- Icons -->
<div class="flex justify-center gap-4 mt-4">
<a href="${member.socialLinks.instagram}" class="bg-white rounded-full border-4 flex items-center justify-center w-8 h-8">
<img src="../assets/socialmedia/instagram.svg" class="">
</a>
<a href="${member.socialLinks.facebook}" class="bg-white rounded-full border-4 flex items-center justify-center w-8 h-8">
<img src="../assets/socialmedia/facebook.svg" class="">
</a>
<a href="${member.socialLinks.linkedin}" class="bg-white rounded-full border-4 flex items-center justify-center w-8 h-8">
<img src="../assets/socialmedia/linkedin.svg" class="">
</a>
<a href="${member.socialLinks.github}" class="bg-white rounded-full border-4 flex items-center justify-center w-8 h-8">
<img src="../assets/socialmedia/github.svg" class="">
</a>
<a href="${member.socialLinks.website}" class="bg-white rounded-full border-4 flex items-center justify-center w-8 h-8">
<img src="../assets/socialmedia/website.svg" class="">
</a>
</div>
</div>
</div>
`;
}

// Function to render all cards here
// Gets elemnt by id (members-container) and insert inside the tag...
async function fetchCards() {
try {
const response = await fetch('../data/members.json');
const members = await response.json();

const container = document.getElementById('members-container');
members.forEach(member => {
container.innerHTML += createCard(member);
});
} catch (error) {
console.error('Error fetching the JSON data', error);
}
}

// Call the function to render cards...
window.onload = fetchCards;
35 changes: 17 additions & 18 deletions pages/faqs.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
/* Animation for the FAQ Dropdown */
.faq-item {
transition: border-color 0.3s ease-in-out;
background-color: white;
}

.faq-item:hover {
Expand Down Expand Up @@ -87,67 +86,67 @@ <h1 class="text-4xl font-bold">Frequently Asked Questions</h1>
<!-- FAQ Section -->
<div class="max-w-3xl mx-auto p-6">
<!-- FAQ Item 1 -->
<div class="faq-item border border-gray-300 shadow-md rounded-md pt-4 px-4 my-5">
<div class="faq-item">
<!-- Question Section -->
<button class="faq-question w-full text-left flex justify-between gap-4 items-center">
<button class="faq-question">
<span class="text-xl font-bold text-gray-700">What is SFD?</span>
<span class="text-gray-700 text-3xl font-medium">+</span>
<span class="text-gray-900 text-3xl font-medium">+</span>
</button>

<!-- Answer Section -->
<div class="faq-answer my-2 text-gray-500 overflow-hidden transition-all duration-500 max-h-0">
<div class="faq-answer">
Software Freedom Day (SFD) is a global event held annually by the Digital Freedom Foundation (DFF) to promote
and raise awareness about Free Software. The goal of SFD is to educate the public on the benefits of Free
Software and to encourage its widespread adoption
</div>
</div>

<!-- FAQ Item 2 -->
<div class="faq-item border border-gray-300 shadow-md rounded-md pt-4 px-4 my-5">
<div class="faq-item border">
<!-- Question Section -->
<button class="faq-question w-full text-left flex justify-between gap-4 items-center">
<button class="faq-question">
<span class="text-xl font-bold text-gray-700">When is SFD celebrated?</span>
<span class="text-gray-700 text-3xl font-medium">+</span>
<span class="text-gray-900 text-3xl font-medium">+</span>
</button>

<!-- Answer Section -->
<div class="faq-answer my-2 text-gray-500 overflow-hidden transition-all duration-500 max-h-0">
<div class="faq-answer">
Software Freedom Day is typically celebrated on the third Saturday of September each year.
</div>
</div>

<!-- FAQ Item 3 -->
<div class="faq-item border border-gray-300 shadow-md rounded-md pt-4 px-4 my-5">
<div class="faq-item border">
<!-- Question Section -->
<button class="faq-question w-full text-left flex justify-between gap-4 items-center">
<button class="faq-question">
<span class="text-xl font-bold text-gray-700">Who can join?</span>
<span class="text-gray-700 text-3xl font-medium">+</span>
<span class="text-gray-900 text-3xl font-medium">+</span>
</button>

<!-- Answer Section -->
<div class="faq-answer my-2 text-gray-500 overflow-hidden transition-all duration-500 max-h-0">
<div class="faq-answer">
EVERYONE!!!!
</div>
</div>

<!-- FAQ Item 4 -->
<div class="faq-item border border-gray-300 shadow-md rounded-md pt-4 px-4 my-5">
<div class="faq-item">
<!-- Question Section -->
<button class="faq-question w-full text-left flex justify-between gap-4 items-center">
<button class="faq-question">
<span class="text-xl font-bold text-gray-700">Is it free to join?</span>
<span class="text-gray-700 text-3xl font-medium">+</span>
<span class="text-gray-900 text-3xl font-medium">+</span>
</button>

<!-- Answer Section -->
<div class="faq-answer my-2 text-gray-500 overflow-hidden transition-all duration-500 max-h-0">
<div class="faq-answer">
Yes totally, also you can donte if you are intrested.
</div>
</div>
</div>


<div class="max-w-6xl mx-auto p-8">
<!-- Frequently Asked Questions Header for small screens -->
<!-- Code of Conduct Header -->
<section id="intro" class="py-10">
<div class="text-center">
<h1 class="text-4xl font-bold">Code of Conduct</h1>
Expand Down
8 changes: 2 additions & 6 deletions pages/itinerary.html
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@

<section id="intro" class="py-10">
<div class="text-center">
<h1 class="text-4xl font-bold">Event Activities</h1>
<h1 class="text-4xl font-bold">Itinerary</h1>
<div class="lines-container">
<span class="line first"></span>
<span class="line middle"></span>
Expand All @@ -204,11 +204,7 @@ <h1 class="text-4xl font-bold">Event Activities</h1>
<section id="schedule" class="relative">
<!-- Event entries will be dynamically inserted here -->
</section>


<div class="text-center mb-8">
<a href="#" class="btn btn-register-now">Register Now</a>
</div>


<!-- Footer Section (from js/footer.js) -->
<footer class="h-5"></footer>
Expand Down
129 changes: 129 additions & 0 deletions pages/ourteam.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Our Team</title>
<link rel="stylesheet" href="/css/output.css">

<style>
#intro {
padding: 2rem 0;
text-align: center;
position: relative;
}

#intro h1 {
font-size: 2.5rem;
font-weight: bold;
margin-bottom: 0.5rem;
position: relative;
}

#intro .lines-container {
position: relative;
display: flex;
flex-direction: column;
align-items: center;
}

#intro .line {
position: absolute;
height: 4px;
transition: width 0.3s;
}

#intro .line.first {
background-color: #FFCD29;
width: 180px;
top: 0;
}

#intro .line.middle {
background-color: #208820;
width: 220px;
top: 8px;
}

#intro .line.last {
background-color: #E4554E;
width: 180px;
top: 16px;
}

#profile {
filter: grayscale(100%);
transition: all 0.3s ease-in-out;
}

#profile:hover {
filter: grayscale(0%);
}
</style>
</head>

<body class="bg-grid font-bahnschrift max-w-screen max-h-screen" id="body">

<section id="intro" class="py-10">
<div class="text-center">
<h1 class="text-4xl font-bold">Our Team</h1>
<div class="lines-container">
<span class="line first"></span>
<span class="line middle"></span>
<span class="line last"></span>
</div>
</div>
</section>


<div class="container max-w-5xl mx-auto p-6">
<div id="members-container"
class="grid justify-items-center grid-cols-1 sm:grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
<!-- Members insterted -->
</div>
</div>


<!-- Footer -->
<footer></footer>

<script src="/js/members.js"></script>
<script src="/js/navbar.js"></script>
<script src="/js/footer.js"></script>
</body>

</html>

<!--
<div id="members-card" class="relative w-80 rounded-3xl shadow-lg overflow-hidden">
<img id="profile" src="/assets/members/Sujal_Bikram_Thapa.jpeg" alt="Profile Image" class="w-full rounded-3xl h-96 object-cover border-8 border-white">
<div class="absolute text-center bottom-0 left-0 w-full bg-black bg-opacity-60 text-white p-4">
<h2 class="text-xl font-semibold">Sujal Bikram Thapa</h2>
<p class="text-sm">Graphics/Web Designer</p>
<div class="flex justify-center gap-4 mt-4">
<a href="#" class="bg-white rounded-full border-4 flex items-center justify-center w-8 h-8">
<img src="../assets/socialmedia/instagram.svg" class="">
</a>
<a href="#" class="bg-white rounded-full border-4 flex items-center justify-center w-8 h-8">
<img src="../assets/socialmedia/facebook.svg" class="">
</a>
<a href="#" class="bg-white rounded-full border-4 flex items-center justify-center w-8 h-8">
<img src="../assets/socialmedia/linkedin.svg" class="">
</a>
<a href="#" class="bg-white rounded-full border-4 flex items-center justify-center w-8 h-8">
<img src="../assets/socialmedia/website.svg" class="">
</a>
<a href="#" class="bg-white rounded-full border-4 flex items-center justify-center w-8 h-8">
<img src="../assets/socialmedia/website.svg" class="">
</a>
</div>
</div>
</div>
-->

0 comments on commit 6cfc2ce

Please sign in to comment.