feat(#289): Readded cardList in gallery

src/def-composables/useGallery.ts

@@ -42,7 +42,8 @@ const galleryFiltersFromPageQuery = (query: PageQuery) => {
   galleryFilters.value.notesContains = query.notesContains;
   galleryFilters.value.sortBy = query.sortBy ? query.sortBy : "Name";
   galleryFilters.value.multiClass = query.multiClassOnly;
-  galleryFilters.value.status = query.statuses.length != 1 ? "playable" :  query.statuses[0]
+  galleryFilters.value.status =
+    query.statuses.length != 1 ? "playable" : query.statuses[0];
 
   if (
     query.classes.length == 0 ||
@@ -57,11 +58,11 @@ const galleryFiltersFromPageQuery = (query: PageQuery) => {
   } else {
     galleryFilters.value.nature = query.classes.includes(CardClass.nature);
     galleryFilters.value.technology = query.classes.includes(
-      CardClass.technology
+      CardClass.technology,
     );
     galleryFilters.value.culture = query.classes.includes(CardClass.culture);
     galleryFilters.value.mysticism = query.classes.includes(
-      CardClass.mysticism
+      CardClass.mysticism,
     );
   }
 
@@ -116,7 +117,7 @@ const pageQueryFromGalleryFilters = (): PageQuery => {
     notesContains: galleryFilters.value.notesContains,
     sortBy: galleryFilters.value.sortBy ? galleryFilters.value.sortBy : "",
     multiClassOnly: galleryFilters.value.multiClass,
-  } as Partial<PageQuery>);
+  } as Partial<QueryQCardsRequest>);
 };
 
 const loadQueryCardList = (query: PageQuery): void => {
@@ -126,11 +127,11 @@ const loadQueryCardList = (query: PageQuery): void => {
     paramsSerializer: constructAssRetardetQueryParams,
   }).then((res: QueryQCardsResponse) => {
     cardList.value = res.cardsList;
-  })
+  });
 };
 
 watch(galleryFilters.value, () =>
-  loadQueryCardList(pageQueryFromGalleryFilters())
+  loadQueryCardList(pageQueryFromGalleryFilters()),
 );
 
 export const useGallery = () => {

src/utils/utils.ts

@@ -11,7 +11,9 @@ export const normalizeCoins = (coins: Coin[]) => {
 };
 
 export const normalizeNumberList = (l: Array<any> | any) =>
-  (Array.isArray(l) ? l.map((v) => Number(v)) : [Number(l)]).filter(w => !Number.isNaN(w));
+  (Array.isArray(l) ? l.map((v) => Number(v)) : [Number(l)]).filter(
+    (w) => !Number.isNaN(w),
+  );
 export const normalizeBoolean = (b: any) => b == "true";
 
 export const normalizeQuery = (query: any): PageQuery => {

src/views/About/CommunityPage.vue

@@ -19,6 +19,9 @@
 </template>
 <script setup lang="ts">
 import logo from "@/assets/figma/CCLogo.png";
+import {useLoggedIn} from "@/def-composables/useLoggedIn2";
+
+const {loggedIn} = useLoggedIn()
 
 const names = [
   "RUSLAN",

src/views/GalleryPage.vue

@@ -235,9 +235,14 @@ const typeOptions: GalleryFilterImageChooserOptions<GalleryFilters> = [
 ];
 
 onMounted(() => {
-  if (!R.isEmpty(route.query)) {
-    galleryFiltersFromPageQuery(normalizeQuery(route.query));
-    loadQueryCardList(pageQueryFromGalleryFilters());
+  const query = route.query
+  if (!R.isEmpty(query)) {
+    if ((query as {cards?: number[]}).cards) {
+      cardList.value = (query as {cards?: number[]}).cards!
+    } else {
+      galleryFiltersFromPageQuery(normalizeQuery(route.query));
+      loadQueryCardList(pageQueryFromGalleryFilters());
+    }
   } else if (cardList.value.length == 0) {
     loadQueryCardList(pageQueryFromGalleryFilters());
   } else {

src/views/UserView/UserView.vue

@@ -88,8 +88,8 @@
             }}</b>
             <div class="pb-6">
               <p class="pb-3">
-                <b>{{ state.user.ownedCardSchemes.length }} {{ "Master Card"
-                }}{{ state.user.ownedCardSchemes.length == 1 ? "" : "s" }}</b>
+                <b>{{ state.user.ownedPrototypes.length }} {{ "Master Card"
+                }}{{ state.user.ownedPrototypes.length == 1 ? "" : "s" }}</b>
               </p>
               <RouterCCButton
                 :type="Color.YELLOW"
@@ -110,7 +110,7 @@
                 :type="Color.YELLOW"
                 :to="{
                   name: 'Gallery',
-                  query: { owner: state.addr, sortBy: 'Name' },
+                  query: { cards: state.user.cards },
                 }"
               >
                 View in gallery
@@ -252,6 +252,7 @@ const init = () => {
   getUser();
   getCoins();
   getMatches();
+  console.log(state.user)
 };
 
 onMounted(init);