Merge branch 'master' into 'feat/filter-by-tags'

# Conflicts:
#   src/lib/index.ts

src/lib/components/CompulsoryTags.svelte

@@ -33,7 +33,7 @@
         background-color: #eaffeb;
         color: #2e4653;
         cursor: pointer;
-        padding: 0.2rem 0.6rem;
+        padding: 0.2rem 0.2rem;
     }
     .compulsoryTagYellow {
         display: flex;
@@ -45,7 +45,7 @@
         background-color: #ffffd4;
         color: #534b2e;
         cursor: pointer;
-        padding: 0.2rem 0.6rem;
+        padding: 0.2rem 0.2rem;
     }
     .compulsoryTagRed {
         display: flex;
@@ -57,6 +57,6 @@
         background-color: #ffcece;
         color: #532e2e;
         cursor: pointer;
-        padding: 0.2rem 0.6rem;
+        padding: 0.2rem 0.2rem;
     }
 </style>

src/lib/components/Report.svelte

@@ -0,0 +1,140 @@
+<script lang="ts">
+    import { reportTypes } from "$lib";
+    import crossUrl from "$lib/assets/cross.svg";
+    import Textarea from "./inputs/Textarea.svelte";
+    import type { Table } from "$lib";
+    import type { SupabaseClient } from "@supabase/supabase-js";
+    import type { Database } from "$lib/database.d.ts";
+
+    interface Props {
+        data: { supabase: SupabaseClient<Database> };
+        studySpaceId: string;
+        hideFunc: () => void;
+    }
+
+    const { data, studySpaceId, hideFunc }: Props = $props();
+    const { supabase } = $derived(data);
+
+    let uploading = $state(false);
+    let reportData = $state<Omit<Table<"reports">, "id" | "created_at" | "updated_at">>({
+        study_space_id: studySpaceId,
+        type: "",
+        content: ""
+    });
+
+    async function uploadReport() {
+        const { error: reportUploadError } = await supabase
+            .from("reports")
+            .insert(reportData)
+            .select()
+            .single();
+
+        if (reportUploadError)
+            return alert(`Error submitting report: ${reportUploadError.message}`);
+        else alert("Report submitted successfully!");
+    }
+</script>
+
+<div class="overlay">
+    <form
+        onsubmit={async (event) => {
+            event.preventDefault();
+            uploading = true;
+            await uploadReport();
+            uploading = false;
+            hideFunc();
+        }}
+        class="reportContainer"
+    >
+        <h1 class="submitHeader">Submit a Report</h1>
+        <p>What's the reason?</p>
+        <select name="reportType" class="reportType" required bind:value={reportData.type}>
+            <option value="" disabled selected>Report type</option>
+            {#each reportTypes as reportType (reportType)}
+                <option value={reportType}>{reportType}</option>
+            {/each}
+        </select>
+        <label for="description">Briefly describe the problem:</label>
+        <Textarea
+            name="description"
+            placeholder="Image is inappropriate..."
+            rows={2}
+            bind:value={reportData.content}
+        />
+        <button
+            disabled={!reportData.type || reportData.content?.length === 0 || uploading}
+            class="submit">Submit</button
+        >
+        <button type="button" class="exit" aria-label="exit" onclick={hideFunc}
+            ><img src={crossUrl} alt="exit" /></button
+        >
+    </form>
+</div>
+
+<style>
+    .overlay {
+        display: flex;
+        width: 100%;
+        height: 100%;
+        position: fixed;
+        justify-content: center;
+        align-items: center;
+        background-color: rgba(8, 15, 18, 0.9);
+        z-index: 100;
+    }
+
+    .reportContainer {
+        display: flex;
+        flex-direction: column;
+        width: 80%;
+        gap: 0.5rem;
+        padding: 1rem;
+        background-color: #182125;
+        border-radius: 0.5rem;
+        box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.1);
+        color: #eaffeb;
+        position: absolute;
+        translate: 0 -3.5rem;
+        border: 2px solid #eaffeb;
+    }
+
+    .submitHeader {
+        width: 80%;
+    }
+    .reportType {
+        width: 100%;
+        height: 100%;
+        padding: 0.5rem;
+        border-radius: 0.5rem;
+        border: 2px solid #eaffeb;
+        background: none;
+        color: #eaffeb;
+        font-size: 0.9rem;
+        text-align: left;
+    }
+
+    .reportType option {
+        background-color: #2e4653;
+        color: #eaffeb;
+    }
+
+    .submit {
+        width: 100%;
+        padding: 0.5rem;
+        border-radius: 0.5rem;
+        border: none;
+        background-color: #49bd85;
+        color: #ffffff;
+        font-size: 1rem;
+        cursor: pointer;
+    }
+
+    .exit {
+        position: absolute;
+        top: 0.1rem;
+        right: 0.1rem;
+        background: none;
+        border: none;
+        cursor: pointer;
+    }
+</style>

src/lib/components/SpaceCard.svelte

@@ -77,8 +77,8 @@
 
     .compulsoryContainer {
         display: grid;
-        grid-template-columns: repeat(3, 1fr);
-        gap: 0.5rem;
-        font-size: 0.875rem;
+        grid-template-columns: repeat(auto-fit, minmax(3.75rem, 1fr));
+        gap: 0.3rem;
+        font-size: 0.8rem;
     }
 </style>

src/lib/components/inputs/Text.svelte

@@ -1,15 +1,16 @@
 <script lang="ts">
     interface Props {
+        inputElem?: HTMLInputElement;
         name: string;
         value?: string | null;
         placeholder?: string;
         required?: boolean;
     }
 
-    let { value = $bindable(), name, ...rest }: Props = $props();
+    let { inputElem = $bindable(), value = $bindable(), name, ...rest }: Props = $props();
 </script>
 
-<input type="text" id={name} {name} bind:value {...rest} />
+<input type="text" id={name} {name} bind:value bind:this={inputElem} {...rest} />
 
 <style>
     input {

src/lib/database.d.ts

@@ -34,6 +34,41 @@ export type Database = {
   }
   public: {
     Tables: {
+      reports: {
+        Row: {
+          content: string | null
+          created_at: string | null
+          id: string
+          study_space_id: string | null
+          type: string
+          updated_at: string | null
+        }
+        Insert: {
+          content?: string | null
+          created_at?: string | null
+          id?: string
+          study_space_id?: string | null
+          type: string
+          updated_at?: string | null
+        }
+        Update: {
+          content?: string | null
+          created_at?: string | null
+          id?: string
+          study_space_id?: string | null
+          type?: string
+          updated_at?: string | null
+        }
+        Relationships: [
+          {
+            foreignKeyName: "reports_study_space_id_fkey"
+            columns: ["study_space_id"]
+            isOneToOne: false
+            referencedRelation: "study_spaces"
+            referencedColumns: ["id"]
+          },
+        ]
+      }
       study_space_images: {
         Row: {
           created_at: string | null
@@ -65,7 +100,8 @@ export type Database = {
       }
       study_spaces: {
         Row: {
-          building_location: string | null
+          building_location: Json | null
+          building_location_old: string | null
           created_at: string | null
           description: string | null
           id: string
@@ -77,7 +113,8 @@ export type Database = {
           wifi: string
         }
         Insert: {
-          building_location?: string | null
+          building_location?: Json | null
+          building_location_old?: string | null
           created_at?: string | null
           description?: string | null
           id?: string
@@ -89,7 +126,8 @@ export type Database = {
           wifi: string
         }
         Update: {
-          building_location?: string | null
+          building_location?: Json | null
+          building_location_old?: string | null
           created_at?: string | null
           description?: string | null
           id?: string

src/lib/index.ts

@@ -1,3 +1,4 @@
+import { PUBLIC_GMAPS_API_KEY } from "$env/static/public";
 import type { Database } from "./database.d.ts";
 
 export type Table<T extends keyof Database["public"]["Tables"]> =
@@ -26,3 +27,19 @@ export const wifiTags = ["Good WiFi", "Moderate WiFi", "Bad WiFi", "No WiFi"];
 export const powerOutletTags = ["Many Outlets", "Some Outlets", "No Outlets"];
 
 export const allTags = [...availableStudySpaceTags, ...volumeTags, ...wifiTags, ...powerOutletTags];
+
+export const reportTypes = [
+    "Inappropriate content",
+    "Duplicate content",
+    "Incorrect content",
+    "Other"
+];
+
+export async function gmapsLoader() {
+    const { Loader } = await import("@googlemaps/js-api-loader");
+    return new Loader({
+        apiKey: PUBLIC_GMAPS_API_KEY,
+        version: "weekly",
+        libraries: ["places"]
+    });
+}