Merge pull request #69 from HusniAbdillah/action-pages

Last

Author: HusniAbdillah

public/sw.js

@@ -1,4 +1,3 @@
-// public/sw.js
 const CACHE_NAME = 'greenactify-v2';
 const STATIC_CACHE = 'static-v2';
 const API_CACHE = 'api-v2';
@@ -17,7 +16,6 @@ const API_ENDPOINTS = [
   '/api/stats',
 ];
 
-// Install event
 self.addEventListener('install', (event) => {
   event.waitUntil(
     Promise.all([
@@ -28,7 +26,6 @@ self.addEventListener('install', (event) => {
   self.skipWaiting();
 });
 
-// Activate event
 self.addEventListener('activate', (event) => {
   event.waitUntil(
     caches.keys().then(cacheNames => {
@@ -44,26 +41,22 @@ self.addEventListener('activate', (event) => {
   self.clients.claim();
 });
 
-// Fetch event
 self.addEventListener('fetch', (event) => {
   const { request } = event;
   const url = new URL(request.url);
 
-  // Handle API requests
   if (url.pathname.startsWith('/api/')) {
     event.respondWith(
       caches.open(API_CACHE).then(cache => {
         return cache.match(request).then(cachedResponse => {
           if (cachedResponse) {
-            // Return cached response and update in background
             fetch(request).then(response => {
               if (response.ok) {
                 cache.put(request, response.clone());
               }
             });
             return cachedResponse;
           }
-          // Fetch and cache new response
           return fetch(request).then(response => {
             if (response.ok) {
               cache.put(request, response.clone());
@@ -76,7 +69,6 @@ self.addEventListener('fetch', (event) => {
     return;
   }
 
-  // Handle static assets
   event.respondWith(
     caches.match(request).then(response => {
       return response || fetch(request);

src/app/(authenticated)/peringkat/page.tsx

@@ -4,9 +4,8 @@ import React, { useState, useEffect } from 'react'
 import { Search, Users, MapPin, Trophy, Medal, Award } from 'lucide-react'
 import { useRouter } from 'next/navigation'
 import { useUser } from '@clerk/nextjs'
-import { useUsers, useProvinceStats } from '@/hooks/useSWRData' // Import SWR hooks
+import { useUsers, useProvinceStats } from '@/hooks/useSWRData' 
 
-// Update interface User dengan properti yang lengkap
 interface User {
   id?: string;
   clerk_id?: string;
@@ -35,14 +34,12 @@ const PeringkatPage = () => {
   const router = useRouter()
   const { isLoaded, isSignedIn } = useUser()
 
-  // SWR hooks - instant loading dari cache!
   const { data: usersResponse, isLoading: usersLoading, error: usersError } = useUsers()
   const { data: provincesResponse, isLoading: provincesLoading, error: provincesError } = useProvinceStats()
 
   const usersData = usersResponse?.data || []
   const provincesData = provincesResponse?.data || []
 
-  // Check authentication
   useEffect(() => {
     if (isLoaded && !isSignedIn) {
       router.push('/')

src/app/(authenticated)/persebaran/page.tsx

@@ -74,7 +74,6 @@ const UnifiedActivitiesPage = () => {
     loading: true
   })
 
-  // Check authentication
   useEffect(() => {
     if (isLoaded && !isSignedIn) {
       router.push('/')

src/app/api/activities/getById/[id]/route.ts

@@ -6,7 +6,7 @@ export async function GET(
   request: Request,
   { params }: { params: { id: string } } 
 ) {
-  const profileId = params.id; // UUID user
+  const profileId = params.id; 
 
   if (!profileId) {
     return NextResponse.json(

src/app/api/daily-challenge/route.ts

@@ -50,7 +50,6 @@ export async function GET(request: NextRequest) {
     const indonesianTime = new Date(now.getTime() + (7 * 60 * 60 * 1000));
     const today = indonesianTime.toISOString().split('T')[0];
 
-    // Check if there are already challenges for today
     const { data: existingChallenges, error } = await supabase
       .from('daily_challenges')
       .select('*')
@@ -59,11 +58,9 @@ export async function GET(request: NextRequest) {
     if (!error && existingChallenges && existingChallenges.length > 0) {
       dbChallenges = existingChallenges;
     } else {
-      // Get 3 random challenges that don't have today's date
       const randomChallenges = await getRandomChallenges(3);
 
       if (randomChallenges.length > 0) {
-        // Update all challenges to today's date
         const updatePromises = randomChallenges.map(async (challenge: any) => {
           const updateSuccess = await updateChallengeDate(challenge.id, today);
 
@@ -83,7 +80,6 @@ export async function GET(request: NextRequest) {
     }
 
     if (dbChallenges.length === 0) {
-      // Return a default challenge if no challenge found and no random challenges available
       const defaultChallenge = {
         id: 0,
         title: '🌱 Kurangi Sampah Plastik',
@@ -117,7 +113,6 @@ export async function GET(request: NextRequest) {
       });
     }
 
-    // Transform all challenges
     const transformedChallenges = dbChallenges
       .map((challenge: any) => transformChallenge(challenge))
       .filter((challenge): challenge is NonNullable<typeof challenge> => challenge !== null);

src/components/aksi/2-SelectActivityStep.tsx

@@ -68,7 +68,6 @@ export default function SelectActivityStep({
       setCategories(categoriesData);
     });
 
-    // Set selectedGroup setelah data dimuat
     if (challengeFilter) {
       setSelectedGroup(challengeFilter);
     } else {
@@ -83,13 +82,11 @@ export default function SelectActivityStep({
     console.log('categories count:', categories.length);
     console.log('groups count:', groups.length);
 
-    // If challenge filter is active, prioritize challenge filtering
     if (challengeFilter && groups.length > 0) {
       const targetGroup = groups.find(g => g.id === challengeFilter);
       console.log('Target group:', targetGroup);
 
       const challengeFiltered = categories.filter((cat) => {
-        // Try both UUID and name matching
         const matchById = cat.group_category === challengeFilter;
         const matchByName = targetGroup && cat.group_category === targetGroup.name;
 
@@ -107,7 +104,6 @@ export default function SelectActivityStep({
 
       console.log('Challenge filtered result:', challengeFiltered.length, 'items');
 
-      // Apply search filter to challenge results
       const searchFiltered = challengeFiltered.filter((cat) => {
         if (!search) return true;
         const searchLower = search.toLowerCase();
@@ -119,14 +115,11 @@ export default function SelectActivityStep({
       return searchFiltered;
     }
 
-    // Normal filtering (non-challenge mode)
     const filtered = categories.filter((cat) => {
-      // Search dalam nama dan deskripsi
       const searchLower = search.toLowerCase();
       const matchSearch = cat.name.toLowerCase().includes(searchLower) ||
                          (cat.description && cat.description.toLowerCase().includes(searchLower));
 
-      // Filter berdasarkan grup
       let matchGroup = true;
       if (selectedGroup !== 'all') {
         const group = groups.find(g => g.id === selectedGroup);
@@ -137,7 +130,6 @@ export default function SelectActivityStep({
       return matchSearch && matchGroup;
     });
 
-    // Shuffle for 'all' group in normal mode
     if (selectedGroup === 'all') {
       const shuffled = [...filtered];
       for (let i = shuffled.length - 1; i > 0; i--) {
@@ -160,7 +152,6 @@ export default function SelectActivityStep({
   return (
     <div className="w-full max-w-4xl mx-auto flex flex-col">
 
-      {/* Show challenge info if in challenge mode */}
       {challengeFilter && (
         <div className="bg-yellowGold/10 border border-yellowGold/30 rounded-lg p-4 mb-4">
           <div className="flex items-center gap-2 mb-2">
@@ -196,7 +187,6 @@ export default function SelectActivityStep({
         )}
       </div>
 
-      {/* Group filters - disable in challenge mode */}
       {!challengeFilter && (
         <div className="flex gap-3 mb-4 overflow-x-auto pb-2 md:flex-wrap md:overflow-x-visible">
           <button
@@ -206,7 +196,7 @@ export default function SelectActivityStep({
                 : 'bg-whiteMint text-greenDark border-gray-200 hover:border-tealLight hover:bg-mintPastel'
               }`}
             onClick={() => setSelectedGroup('all')}
-            disabled={!!challengeFilter} // Convert to boolean using !!
+            disabled={!!challengeFilter} 
           >
             <IconRenderer iconName="layers" className="w-5 h-5" />
             Semua
@@ -302,7 +292,6 @@ export default function SelectActivityStep({
           </button>
         ))}
 
-        {/* Info jumlah aktivitas */}
         {filteredCategories.length > 0 && (
           <div className="text-center text-gray-500 text-sm mt-4">
             Menampilkan {filteredCategories.length} aktivitas

src/components/homepage/AuthenticatedHomepage.tsx

@@ -253,7 +253,7 @@ const AuthenticatedHomepage: React.FC<AuthenticatedHomepageProps> = ({
                                     <div className="bg-white/20 border border-white/30 px-2 py-1 rounded-full flex items-center gap-1">
                                       <Clock className="w-3 h-3 text-white" />
                                       <span className="text-xs font-medium">
-                                        {currentChallenge.hoursRemaining}j
+                                        {currentChallenge.hoursRemaining} jam
                                         tersisa
                                       </span>
                                     </div>