Skip to content

Feature: Added the possibility of choosing more than one filter #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emonrol wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Feature: Added the possibility of choosing more than one filter #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
283a8cc
First version of calender (issue 1)
emonrol Aug 9, 2025
9044bf5
Changed agenda's text color
emonrol Aug 9, 2025
0d71221
Fixies #3: Added more groups
emonrol Aug 9, 2025
88d1887
Merge branch 'Eric' of https://github.com/emonrol/connectbern-1 into …
emonrol Aug 9, 2025
4fa1828
Caledar from 0
emonrol Aug 9, 2025
f03b596
Second version of calender
emonrol Aug 9, 2025
d524334
Added a button to add a new event
emonrol Aug 10, 2025
fb294cd
Merge branch 'Eric' of https://github.com/emonrol/connectbern-1 into …
emonrol Aug 10, 2025
fff7df4
Fixes #5: choose both filters for the groups
emonrol Aug 10, 2025
6a459a1
Fixes #7: Added a link to the github in the group page at the button
emonrol Aug 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
174 changes: 150 additions & 24 deletions src/lib/components/GroupsSection.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script>
import { GroupsData } from "$lib/models/GroupsData.js";
import { searchGroups, filterByGroupType } from "$lib/services/groupsManager.js";
import { searchGroups, filterByGroupType, filterByMultiplePlatforms } from "$lib/services/groupsManager.js";
import { currentLanguage } from '$lib/stores/languageStore';

$: language = $currentLanguage;
Expand All @@ -10,8 +10,11 @@
import { t } from "$lib/locales/translations.js";

let groupType = "All"
let groupTypes = ["All", "WhatsApp", "Telegram", "Multiplatform", "Other"]
let groupTypes = ["WhatsApp", "Telegram", "Other"]

// Change to support multiple selections
let selectedPlatforms = new Set(["WhatsApp", "Telegram", "Other"]) // Default to all remaining platforms

let groups = GroupsData

let searchTerm = ""
Expand All @@ -20,9 +23,27 @@
groups = searchGroups(searchTerm, language)
}

function handleGroupTypeChange() {
groups = filterByGroupType(groupType.toLowerCase())
console.log(groupType)
// New function to handle multiple platform selection
function handlePlatformToggle(platform) {
// Toggle the platform
if (selectedPlatforms.has(platform)) {
selectedPlatforms.delete(platform)
} else {
selectedPlatforms.add(platform)
}

// If no platforms selected, show all groups (select all platforms)
if (selectedPlatforms.size === 0) {
selectedPlatforms = new Set(["WhatsApp", "Telegram", "Other"])
}

// Update the groups display
groups = filterByMultiplePlatforms(Array.from(selectedPlatforms))
}

// Update groups when selectedPlatforms changes
$: {
groups = filterByMultiplePlatforms(Array.from(selectedPlatforms))
}
</script>

Expand All @@ -38,21 +59,20 @@
</div>

<div class="settingsBar">
<div class="groupTypeFilter">
<label
title="Filter groups by type"
for="type">Type</label>
<select
bind:value={groupType}
on:change={handleGroupTypeChange}
title="Filter groups by type"
id="type"
name="type">

{#each groupTypes as type}
<option value={type}>{type}</option>
<div class="platformFilter">
<label class="filter-label">Platform:</label>
<div class="checkbox-group">
{#each groupTypes as platform}
<label class="checkbox-item">
<input
type="checkbox"
checked={selectedPlatforms.has(platform)}
on:change={() => handlePlatformToggle(platform)}
/>
<span class="checkbox-text">{platform}</span>
</label>
{/each}
</select>
</div>
</div>

<div class="searchbar">
Expand Down Expand Up @@ -80,6 +100,14 @@
<GroupCard GroupDataObject={groupDataObject} />
{/each}
</div>

<!-- GitHub Link Footer -->
<div class="github-footer">
<a href="https://github.com/ian-codes/connectbern" target="_blank" rel="noopener" class="github-link">
<span class="github-icon"></span>
View on GitHub
</a>
</div>
</section>


Expand All @@ -95,18 +123,81 @@
.settingsBar {
margin: 0 !important;
padding: 0 !important;
flex-direction: column;
align-items: stretch;
}

.platformFilter {
padding: 0.75rem;
font-size: 0.8rem;
}

.checkbox-group {
justify-content: flex-start;
gap: 0.5rem;
}

.checkbox-item {
padding: 0.2rem 0.4rem;
}

.checkbox-text {
font-size: 0.8rem;
}
}

.groupTypeFilter {
.platformFilter {
color: white;
font-size: 1em;
border: none;
font-size: 0.9rem;
display: flex;
flex-direction: column;
gap: 0.5rem;
padding: 1rem;
background: rgba(255, 255, 255, 0.1);
border-radius: 8px;
box-shadow: 0 2px 2px rgba(50, 50, 50, 0.425);
}

.filter-label {
font-weight: bold;
margin-bottom: 0.5rem;
}

.checkbox-group {
display: flex;
flex-wrap: wrap;
gap: 0.75rem;
}

.checkbox-item {
display: flex;
align-items: center;
gap: 1em;
padding-left: .5em;
gap: 0.5rem;
cursor: pointer;
padding: 0.25rem 0.5rem;
border-radius: 4px;
transition: background-color 0.2s ease;
}

.checkbox-item:hover {
background: rgba(255, 255, 255, 0.1);
}

.checkbox-item input[type="checkbox"] {
width: 16px;
height: 16px;
accent-color: #0066cc;
cursor: pointer;
}

.checkbox-text {
font-size: 0.9rem;
user-select: none;
}

/* Old styles to remove/replace */
.groupTypeFilter {
display: none; /* Hide old filter */
}

select {
Expand Down Expand Up @@ -182,4 +273,39 @@
justify-content: center;
align-items: center;
}

.github-footer {
margin-top: 3rem;
text-align: center;
padding: 2rem 1rem;
border-top: 1px solid rgba(255, 255, 255, 0.2);
}

.github-link {
display: inline-flex;
align-items: center;
gap: 0.5rem;
color: rgba(255, 255, 255, 0.8);
text-decoration: none;
font-size: 0.9rem;
padding: 0.5rem 1rem;
border-radius: 6px;
background: rgba(255, 255, 255, 0.05);
transition: all 0.2s ease;
}

.github-link:hover {
color: white;
background: rgba(255, 255, 255, 0.1);
transform: translateY(-2px);
}

.github-icon {
width: 18px;
height: 18px;
background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 24 24' fill='white' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z'/%3E%3C/svg%3E");
background-size: contain;
background-repeat: no-repeat;
background-position: center;
}
</style>
Loading