feat: show points in achievements

Author: sifferhans

frontend/app/api/generated.ts

@@ -18,6 +18,7 @@ export type Scalars = {
   Date: { input: any; output: any; }
   DateTime: { input: any; output: any; }
   HTML: { input: any; output: any; }
+  Markdown: { input: any; output: any; }
   Upload: { input: any; output: any; }
 };
 
@@ -209,6 +210,22 @@ export type ColorsInput = {
   light: ColorSetInput;
 };
 
+export type Consent = {
+  __typename?: 'Consent';
+  body: MarkdownText;
+  id: Scalars['ID']['output'];
+  key: Scalars['String']['output'];
+  publishedAt?: Maybe<Scalars['DateTime']['output']>;
+  title: Scalars['String']['output'];
+  version: Scalars['Int']['output'];
+};
+
+export type ConsentStatus = {
+  __typename?: 'ConsentStatus';
+  acceptedConsents: Array<UserConsent>;
+  pendingConsents: Array<Consent>;
+};
+
 export type CreateChallengeInput = {
   buttonText: Scalars['String']['input'];
   description?: InputMaybe<Scalars['HTML']['input']>;
@@ -466,6 +483,7 @@ export type MarkdownText = {
 export type Mutation = {
   __typename?: 'Mutation';
   _empty?: Maybe<Scalars['Boolean']['output']>;
+  acceptConsent: UserConsent;
   addTeamMembers: Team;
   archiveProject: Scalars['Boolean']['output'];
   assignChallengeToEvent: Challenge;
@@ -483,6 +501,7 @@ export type Mutation = {
   bulkPublishChallenges: Array<Challenge>;
   completeChallenge: Challenge;
   createChallenge: Challenge;
+  createConsent: Consent;
   createEvent: Event;
   createListeningAchievement: ListeningAchievement;
   createProject: Project;
@@ -522,6 +541,7 @@ export type Mutation = {
   updateAchievement: Achievement;
   updateAvatar: User;
   updateChallenge: Challenge;
+  updateConsent: Consent;
   updateEvent: Event;
   updateListeningAchievement: ListeningAchievement;
   updateProject: Project;
@@ -533,6 +553,11 @@ export type Mutation = {
 };
 
 
+export type MutationAcceptConsentArgs = {
+  consentId: Scalars['ID']['input'];
+};
+
+
 export type MutationAddTeamMembersArgs = {
   force?: InputMaybe<Scalars['Boolean']['input']>;
   teamId: Scalars['ID']['input'];
@@ -638,6 +663,14 @@ export type MutationCreateChallengeArgs = {
 };
 
 
+export type MutationCreateConsentArgs = {
+  body: Scalars['String']['input'];
+  key: Scalars['String']['input'];
+  publishedAt?: InputMaybe<Scalars['DateTime']['input']>;
+  title: Scalars['String']['input'];
+};
+
+
 export type MutationCreateEventArgs = {
   input: CreateEventInput;
   projectId: Scalars['ID']['input'];
@@ -857,6 +890,14 @@ export type MutationUpdateChallengeArgs = {
 };
 
 
+export type MutationUpdateConsentArgs = {
+  body?: InputMaybe<Scalars['String']['input']>;
+  id: Scalars['ID']['input'];
+  publishedAt?: InputMaybe<Scalars['DateTime']['input']>;
+  title?: InputMaybe<Scalars['String']['input']>;
+};
+
+
 export type MutationUpdateEventArgs = {
   id: Scalars['ID']['input'];
   input: UpdateEventInput;
@@ -981,6 +1022,8 @@ export type Query = {
   challenges: ChallengeConnection;
   church: Church;
   churches: ChurchConnection;
+  consent: Consent;
+  consents: Array<Consent>;
   currentEvent: Event;
   currentProject: Project;
   event: Event;
@@ -990,6 +1033,7 @@ export type Query = {
   myCurrentProject: Project;
   myEvents: Array<Event>;
   myProjects: Array<Project>;
+  pendingConsents: Array<Consent>;
   project: Project;
   projects: ProjectConnection;
   scoreJournal: ScoreJournalConnection;
@@ -1048,6 +1092,11 @@ export type QueryChurchesArgs = {
 };
 
 
+export type QueryConsentArgs = {
+  id: Scalars['ID']['input'];
+};
+
+
 export type QueryEventArgs = {
   id: Scalars['ID']['input'];
 };
@@ -1518,6 +1567,7 @@ export type User = {
   birthdate: Scalars['String']['output'];
   church: Church;
   churchId: Scalars['ID']['output'];
+  consentStatus: ConsentStatus;
   email: Scalars['String']['output'];
   events: Array<Event>;
   gender: Gender;
@@ -1538,6 +1588,13 @@ export type UserConnection = {
   totalCount: Scalars['Int']['output'];
 };
 
+export type UserConsent = {
+  __typename?: 'UserConsent';
+  acceptedAt: Scalars['DateTime']['output'];
+  consent: Consent;
+  id: Scalars['ID']['output'];
+};
+
 export type UserEdge = {
   __typename?: 'UserEdge';
   cursor: Scalars['String']['output'];

frontend/app/components/achievements/AchievementBadge.vue

@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import { DevOnly } from '#components'
-
 defineProps<{
   achievement: Partial<Achievement>
 }>()
@@ -11,7 +9,6 @@ const open = ref(false)
 <template>
   <div>
     <button
-      v-if="!achievement.hidden"
       class="grid aspect-square place-items-center overflow-hidden rounded-full"
       @click="open = true"
     >
@@ -68,11 +65,18 @@ const open = ref(false)
               <p class="text-label">
                 {{ achievement.description }}
               </p>
-              <DevOnly>
-                <p class="text-caption text-muted mt-default">
-                  {{ achievement.id }}
-                </p>
-              </DevOnly>
+            </div>
+            <div
+              v-if="achievement.achievedAt"
+              class="rounded-full bg-background-indent py-2 px-3 text-label text-accent-contrast"
+            >
+              +{{ achievement.points }} {{ $t('points') }}
+            </div>
+            <div
+              v-else-if="achievement.points"
+              class="rounded-full bg-background-indent py-2 px-3 text-label text-text-muted"
+            >
+              {{ $t('givesYouXPoints', { points: achievement.points }) }}
             </div>
           </div>
         </PageLayout>

frontend/i18n/locales/en.json

@@ -43,5 +43,6 @@
     "selectUnitLeader": "Select unit leader"
   },
   "points": "points",
-  "place": "place"
+  "place": "place",
+  "givesYouXPoints": "Gives you {points} points"
 }

frontend/i18n/locales/nb.json

@@ -43,5 +43,6 @@
     "selectUnitLeader": "Velg unitleder"
   },
   "place": "plass",
-  "points": "poeng"
+  "points": "poeng",
+  "givesYouXPoints": "Gir deg {points} poeng"
 }