diff --git a/.vscode/settings.json b/.vscode/settings.json
index dbda57af7d..22f07fabf7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -26,5 +26,8 @@
"**/.turbo": true,
"**/node_modules": true,
"**/pnpm-lock.yaml": true
+ },
+ "[typescript]": {
+ "editor.defaultFormatter": "oxc.oxc-vscode"
}
}
diff --git a/apps/cms/schemas/index.ts b/apps/cms/schemas/index.ts
index 85bc13ea6c..b5552e4223 100644
--- a/apps/cms/schemas/index.ts
+++ b/apps/cms/schemas/index.ts
@@ -12,11 +12,13 @@ import contactProfile from "./objects/contact-profile";
import question from "./objects/question";
import spotRange from "./objects/spot-range";
import time from "./objects/time";
+import trophy from "./objects/trophy";
import post from "./post";
import profile from "./profile";
import repeatingHappening from "./repeating-happening";
import staticInfo from "./static-info";
import studentGroup from "./student-group";
+import trophies from "./trophies";
export const schemaTypes = [
hsApplication,
@@ -38,4 +40,6 @@ export const schemaTypes = [
time,
merch,
hungerGames,
+ trophies,
+ trophy,
];
diff --git a/apps/cms/schemas/objects/trophy.tsx b/apps/cms/schemas/objects/trophy.tsx
new file mode 100644
index 0000000000..9e35def6c3
--- /dev/null
+++ b/apps/cms/schemas/objects/trophy.tsx
@@ -0,0 +1,55 @@
+import { defineField, defineType } from "sanity";
+
+export default defineType({
+ name: "trophy",
+ title: "Trofé",
+ type: "object",
+ fields: [
+ defineField({
+ name: "image",
+ title: "Bilde",
+ type: "image",
+ description: "Last opp et bilde for dette spesifikke trofeet.",
+ options: { hotspot: true },
+ validation: (Rule) => Rule.required(),
+ }),
+ defineField({
+ name: "title",
+ title: "Tittel",
+ type: "string",
+ description: "Fyll inn en spesifikk tittel til dette troféet",
+ placeholder: "F.eks. 'Øvelseskjøring' eller 'Sølv gokart'",
+ validation: (Rule) => Rule.required(),
+ }),
+ defineField({
+ name: "description",
+ title: "Beskrivelse",
+ type: "text",
+ rows: 3,
+ placeholder:
+ "F.eks 'Du har vært med på ett arrangement, bli med ett til for å få gull trofé.'",
+ validation: (Rule) => Rule.required(),
+ }),
+ defineField({
+ name: "level",
+ title: "Nivå",
+ type: "number",
+ description:
+ "Talled du gir til nivå vil ikke ha noe å si. Om du ønske flere nivå, betyr lavere tall lavere nivå.",
+ placeholder: "1",
+ validation: (Rule) => Rule.required().integer().min(1),
+ }),
+ ],
+ preview: {
+ select: { title: "title", media: "image", level: "level" },
+ prepare({ title, media, level }) {
+ return {
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+ title: title ?? "Uten tittel",
+ subtitle: level ? `Nivå ${level}` : "Uten nivå",
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+ media,
+ };
+ },
+ },
+});
diff --git a/apps/cms/schemas/trophies.tsx b/apps/cms/schemas/trophies.tsx
new file mode 100644
index 0000000000..9a5198826f
--- /dev/null
+++ b/apps/cms/schemas/trophies.tsx
@@ -0,0 +1,70 @@
+import { StarIcon } from "@sanity/icons";
+import { defineArrayMember, defineField, defineType } from "sanity";
+
+export default defineType({
+ name: "trophies",
+ title: "Troféer",
+ type: "document",
+ icon: StarIcon,
+ fields: [
+ defineField({
+ name: "title",
+ title: "Tittel",
+ type: "string",
+ description: "Dette blir en felles tittel, uansett om du har oppnådd troféet eller ikke.",
+ placeholder: "F.eks. Gokart",
+ validation: (Rule) => Rule.required(),
+ }),
+ defineField({
+ name: "slug",
+ title: "Slug",
+ type: "slug",
+ description: "Genereres automatisk fra tittel",
+ options: { source: "title", maxLength: 96 },
+ validation: (Rule) => Rule.required(),
+ }),
+ defineField({
+ name: "baseImage",
+ title: "Bilde",
+ type: "image",
+ options: { hotspot: true },
+ description: "Dette bildet vises når en bruker ikke har oppnådd dette troféet",
+ validation: (Rule) => Rule.required(),
+ }),
+ defineField({
+ name: "baseDescription",
+ title: "Beskrivelse",
+ type: "text",
+ rows: 3,
+ description: "Denne teksten vises når en bruker ikke har oppnådd dette troféet",
+ placeholder: "F.eks. 'Bli med på gokart for å få dette troféet'",
+ validation: (Rule) => Rule.required(),
+ }),
+ defineField({
+ name: "trophies",
+ title: "Legg til trofé",
+ type: "array",
+ description:
+ "Dersom du kunn ønsker at det skal være ett nivå, legg til ett objekt. Om du ønsker flere nivå, f.eks. gull, sølv og bronsje, kan du legge til flere objekt.",
+ of: [defineArrayMember({ type: "trophy" })],
+ options: { sortable: true },
+ validation: (Rule) => Rule.min(0),
+ }),
+ ],
+ preview: {
+ select: {
+ title: "title",
+ media: "baseImage",
+ count: "trophies.length",
+ },
+ prepare({ title, media, count }) {
+ return {
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+ title: title ?? "Trofé-side",
+ subtitle: typeof count === "number" ? `${count} trofé(er)` : "Ingen troféer enda",
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+ media,
+ };
+ },
+ },
+});
diff --git a/apps/uno/bootstrap/api.go b/apps/uno/bootstrap/api.go
index 636d302976..2ef8925a16 100644
--- a/apps/uno/bootstrap/api.go
+++ b/apps/uno/bootstrap/api.go
@@ -87,6 +87,7 @@ func RunApi() {
cmsMeetingMinuteRepo := sanityinfra.NewMeetingMinuteRepo(sanityClient, logger, redisClient)
cmsMovieRepo := sanityinfra.NewMovieRepo(sanityClient, logger, redisClient)
cmsHSApplicationRepo := sanityinfra.NewHSApplicationRepo(sanityClient, logger, redisClient)
+ cmsTrophyRepo := sanityinfra.NewTrophyRepo(sanityClient, logger, redisClient)
// Initialize services
feideProvider := providers.NewFeideProvider(providers.FeideConfig{
@@ -130,6 +131,7 @@ func RunApi() {
cmsMeetingMinuteRepo,
cmsMovieRepo,
cmsHSApplicationRepo,
+ cmsTrophyRepo,
cacheInvalidator,
)
diff --git a/apps/uno/domain/model/cms_trophy.go b/apps/uno/domain/model/cms_trophy.go
new file mode 100644
index 0000000000..635bec7217
--- /dev/null
+++ b/apps/uno/domain/model/cms_trophy.go
@@ -0,0 +1,18 @@
+package model
+
+type CMSTrophyCollection struct {
+ ID string `json:"_id"`
+ Title string `json:"title"`
+ Slug string `json:"slug"`
+ BaseImage Image `json:"baseImage"`
+ BaseDescription string `json:"baseDescription"`
+ Trophies []CMSTrophy `json:"trophies"`
+}
+
+type CMSTrophy struct {
+ Key string `json:"_key"`
+ Title string `json:"title"`
+ Description string `json:"description"`
+ Level string `json:"level"`
+ Image Image `json:"image"`
+}
\ No newline at end of file
diff --git a/apps/uno/domain/port/cms.go b/apps/uno/domain/port/cms.go
index 135cac1747..f87c37a75f 100644
--- a/apps/uno/domain/port/cms.go
+++ b/apps/uno/domain/port/cms.go
@@ -64,3 +64,7 @@ type CMSMovieRepo interface {
type CMSHSApplicationRepo interface {
GetAllHSApplications(ctx context.Context) ([]model.CMSHSApplication, error)
}
+
+type CMSTrophyRepo interface {
+ GetAllTrophies(ctx context.Context) ([]model.CMSTrophy, error)
+}
\ No newline at end of file
diff --git a/apps/uno/domain/service/cms.go b/apps/uno/domain/service/cms.go
index eea8569b4d..bb57b4ef4a 100644
--- a/apps/uno/domain/service/cms.go
+++ b/apps/uno/domain/service/cms.go
@@ -22,6 +22,7 @@ var cmsTypeNamespaces = map[string][]string{
"merch": {sanityinfra.CMSMerchNamespaceMerch},
"meetingMinute": {sanityinfra.CMSMeetingMinuteNamespaceMeetingMinutes},
"movie": {sanityinfra.CMSMovieNamespaceMovies},
+ "trophy": {sanityinfra.CMSTrophyNamespaceTrophies},
}
type CMSService struct {
@@ -36,6 +37,7 @@ type CMSService struct {
meetingMinuteRepo port.CMSMeetingMinuteRepo
movieRepo port.CMSMovieRepo
hsApplicationRepo port.CMSHSApplicationRepo
+ trophyRepo port.CMSTrophyRepo
invalidator port.CacheInvalidator
}
@@ -52,6 +54,7 @@ func NewCMSService(
meetingMinuteRepo port.CMSMeetingMinuteRepo,
movieRepo port.CMSMovieRepo,
hsApplicationRepo port.CMSHSApplicationRepo,
+ trophyRepo port.CMSTrophyRepo,
invalidator port.CacheInvalidator,
) *CMSService {
return &CMSService{
@@ -65,6 +68,7 @@ func NewCMSService(
merchRepo: merchRepo,
meetingMinuteRepo: meetingMinuteRepo,
movieRepo: movieRepo,
+ trophyRepo: trophyRepo,
hsApplicationRepo: hsApplicationRepo,
invalidator: invalidator,
@@ -168,6 +172,10 @@ func (s *CMSService) GetUpcomingMovies(ctx context.Context, n int) ([]model.CMSM
return s.movieRepo.GetUpcomingMovies(ctx, n)
}
+func (s *CMSService) GetAllTrophies(ctx context.Context) ([]model.CMSTrophy, error) {
+ return s.trophyRepo.GetAllTrophies(ctx)
+}
+
// CMSHappeningFilter holds filter parameters for GetFilteredHappenings.
type CMSHappeningFilter struct {
Search string
diff --git a/apps/uno/http/routes/api/sanity_cms.go b/apps/uno/http/routes/api/sanity_cms.go
index 6a93891982..2c62909cea 100644
--- a/apps/uno/http/routes/api/sanity_cms.go
+++ b/apps/uno/http/routes/api/sanity_cms.go
@@ -68,6 +68,8 @@ func NewSanityMux(
mux.GET("/hs-applications", s.getAllHSApplications)
+ mux.GET("/trophies", s.getAllTrophies)
+
return mux
}
@@ -433,6 +435,27 @@ func (s *sanityCMS) getAllMovies(ctx *handler.Context) error {
return ctx.JSON(movies)
}
+// getAllTrophies returns all trophies from Sanity CMS
+// @Summary Get all trophies from CMS
+// @Tags sanity
+// @Produce json
+// @Success 200 {array} dto.CMSTrophyDTO "OK"
+// @Failure 500 {string} string "Internal Server Error"
+// @Router /sanity/trophies [get]
+func (s *sanityCMS) getAllTrophies(ctx *handler.Context) error {
+ trophies, err := s.cmsService.GetAllTrophies(ctx.Context())
+ s.logger.Error(ctx.Context(), fmt.Sprintf("error = %s", err.Error()))
+ s.logger.Error(ctx.Context(), fmt.Sprintf("error = %s", err.Error()))
+ s.logger.Error(ctx.Context(), fmt.Sprintf("error = %s", err.Error()))
+ s.logger.Error(ctx.Context(), fmt.Sprintf("error = %s", err.Error()))
+ s.logger.Error(ctx.Context(), fmt.Sprintf("error = %s", err.Error()))
+
+ if err != nil {
+ return ctx.InternalServerError()
+ }
+ return ctx.JSON(trophies)
+}
+
// getAllHSApplications returns all HS applications from Sanity CMS
// @Summary Get all HS applications from CMS
// @Tags sanity
diff --git a/apps/uno/infrastructure/external/sanity/trophy_repo.go b/apps/uno/infrastructure/external/sanity/trophy_repo.go
new file mode 100644
index 0000000000..5b24742ef9
--- /dev/null
+++ b/apps/uno/infrastructure/external/sanity/trophy_repo.go
@@ -0,0 +1,94 @@
+package sanityinfra
+
+import (
+ "context"
+ "uno/domain/model"
+ "uno/domain/port"
+ "uno/infrastructure/cache"
+ "uno/pkg/sanity"
+
+ "github.com/redis/go-redis/v9"
+)
+
+const CMSTrophyNamespaceTrophies = "cms:trophies"
+
+// const trophiesBySlugQuery = `
+// *[_type == "trophies" && slug.current == $slug][0]{
+// _id,
+// title,
+// "slug": slug.current,
+// baseImage,
+// baseDescription,
+// trophies[]{
+// _key,
+// title,
+// description,
+// level,
+// image
+// }
+// `;
+
+const allTrophiesQuery = `
+*[_type == "trophies"] | order(title asc) {
+ _id,
+ title,
+ "slug": slug.current,
+ baseImage,
+ baseDescription,
+ trophies[]{
+ _key,
+ title,
+ description,
+ level,
+ image
+ },
+}
+`;
+
+type TrophyRepo struct {
+ client *sanity.Client
+ logger port.Logger
+ trophyCache port.Cache[[]model.CMSTrophy]
+}
+
+func NewTrophyRepo(client *sanity.Client, logger port.Logger, redisClient *redis.Client) port.CMSTrophyRepo {
+ return &TrophyRepo{
+ client: client,
+ logger: logger,
+ trophyCache: cache.NewCache[[]model.CMSTrophy](redisClient, CMSTrophyNamespaceTrophies),
+ }
+}
+
+// func (r *TrophyRepo) GetTrophiesBySlug(ctx context.Context, groupType string) ([]model.CMSTrophy, error) {
+// r.logger.Info(ctx, "getting trophies by slug from sanity", "type", groupType)
+// trophy, err := r.GetAllTrophies(ctx)
+// if err != nil {
+// return nil, err
+// }
+
+// result := make([]model.CMSTrophy, 0, len(trophy))
+// for _, group := range trophy {
+// if group.GroupType == groupType {
+// result = append(result, group)
+// }
+// }
+// r.logger.Info(ctx, "filtered trophies by slug from all trophies cache", "type", groupType, "count", len(result))
+// return result, nil
+// }
+
+func (r *TrophyRepo) GetAllTrophies(ctx context.Context) ([]model.CMSTrophy, error) {
+ r.logger.Info(ctx, "getting all trophies from sanity")
+ if v, ok := r.trophyCache.Get("all"); ok {
+ r.logger.Info(ctx, "cache hit for all trophies")
+ return v, nil
+ }
+ r.logger.Info(ctx, "cache miss for all trophies")
+ result, err := sanity.Query[[]model.CMSTrophy](ctx, r.client, allTrophiesQuery, nil)
+ if err != nil {
+ r.logger.Error(ctx, "failed to get all Trophies from sanity", "error", err)
+ return nil, err
+ }
+
+ r.trophyCache.Set("all", result, cmsCacheTTL)
+ return result, nil
+}
\ No newline at end of file
diff --git a/apps/web/src/api/uno/client.ts b/apps/web/src/api/uno/client.ts
index 078696dafd..3e07171363 100644
--- a/apps/web/src/api/uno/client.ts
+++ b/apps/web/src/api/uno/client.ts
@@ -618,6 +618,7 @@ export class UnoClient {
quotes: QuotesApi;
sanity: SanityApi;
auth: AuthApi;
+ trophies: TrophiesApi;
constructor(options: UnoClientOptions) {
this.api = ky.create({
@@ -648,6 +649,7 @@ export class UnoClient {
this.quotes = new QuotesApi(this);
this.sanity = new SanityApi(this);
this.auth = new AuthApi(this);
+ this.trophies = new TrophiesApi(this);
}
normalizePath(path: string) {
@@ -1523,3 +1525,20 @@ class AuthApi {
return await this.client.request("GET", `auth/magic-link/verify?${query.toString()}`);
}
}
+
+class TrophiesApi {
+ private client: UnoClient;
+
+ constructor(client: UnoClient) {
+ this.client = client;
+ }
+
+ async all() {
+ const response = await this.client.request("GET", "sanity/trophies");
+ if (!response.ok) {
+ console.log("resp = ", await response.text());
+ return [];
+ }
+ return await response.json();
+ }
+}
diff --git a/apps/web/src/app/(default)/admin/layout.tsx b/apps/web/src/app/(default)/admin/layout.tsx
index f011befe3d..2550ff2d7f 100644
--- a/apps/web/src/app/(default)/admin/layout.tsx
+++ b/apps/web/src/app/(default)/admin/layout.tsx
@@ -53,6 +53,11 @@ const adminRoutes = [
label: "Pizza",
groups: ["webkom", "hovedstyret"],
},
+ {
+ href: "/admin/trofeer",
+ label: "Troféer",
+ groups: ["webkom", "hovedstyret"],
+ },
];
export default async function AdminDashboardLayout({ children }: Props) {
diff --git a/apps/web/src/app/(default)/admin/trofeer/page.tsx b/apps/web/src/app/(default)/admin/trofeer/page.tsx
new file mode 100644
index 0000000000..f317873ec7
--- /dev/null
+++ b/apps/web/src/app/(default)/admin/trofeer/page.tsx
@@ -0,0 +1,53 @@
+import Image from "next/image";
+
+import { Container } from "@/components/container";
+import { Heading } from "@/components/typography/heading";
+import { Text } from "@/components/typography/text";
+import { ensureWebkomOrHovedstyret } from "@/lib/ensure";
+import { UserTrophiesModal } from "./usertrophies-modal";
+import { unoWithAdmin } from "../../../../api/server";
+import { urlFor } from "../../../../lib/sanity";
+
+export default async function TrophyPage() {
+ await ensureWebkomOrHovedstyret();
+
+ const trophies = await Promise.all([unoWithAdmin.trophies.all()]);
+ const [users] = await Promise.all([unoWithAdmin.users.all()]);
+
+ if (!trophies) {
+ return Kunne ikke hente troféer.
;
+ }
+
+ return (
+
+ Troféer
+ Her er det mulig å redigere hvem som fortjener alle troféene.
+
+ {trophies.map((trophy) => (
+
+
{trophy.title}
+
+ {trophy.trophies && (
+
+ {trophy.trophies.map((t) => (
+
+
+
+
+ ))}
+
+ )}
+
+
Kunne ikke hente troféer.
;
+ }
+
+ return (
+
+
+ Dine troféer
+
+
Denne siden er under produksjon ...
+
+ {trophies.map((trophy) => (
+
+
+
+ {trophy.title}
+
+
+
+ {trophy.title}
+ {trophy.baseDescription}
+
+
+ ))}
+
+