Merge pull request #291 from DecentralCardGame/287-voting

287 voting

.fleet/settings.json

@@ -2,5 +2,6 @@
     "backend.maxHeapSizeMb": 1568,
     "editor.formatOnSave": true,
     "nodejs.editor.formatOnSave.stylelint.mode": "Auto",
-    "nodejs.editor.formatOnSave.eslint.glob": "{**/*,*}.{js,ts,jsx,tsx,vue}"
+    "nodejs.editor.formatOnSave.eslint.glob": "{**/*,*}.{js,ts,jsx,tsx,vue}",
+    "nodejs.editor.formatOnSave.eslint.mode": "Enabled"
 }

.github/workflows/test_deployment.yml

@@ -17,19 +17,11 @@ jobs:
         }}
 
     steps:
-      - name: exit
-        if: ${{ env.LABEL == 'none' }}
+      - name: install liefer
+        if: ${{ env.LABEL != 'none' }}
         run: |
-          exit 1
-      - name: install ssh keys
-      # check this thread to understand why its needed:
-      # https://stackoverflow.com/a/70447517
+          go install github.com/lxgr-linux/liefer@latest
+      - name: deploy
+        if: ${{ env.LABEL != 'none' }}
         run: |
-          echo env.tag_name
-          install -m 600 -D /dev/null ~/.ssh/id_rsa
-          echo "${{ secrets.LXGR_DEPLOY_PRIV }}" > ~/.ssh/id_rsa
-          ssh-keyscan -H ${{ secrets.LXGR_HOST }} > ~/.ssh/known_hosts
-      - name: connect and pull
-        run: ssh ${{ secrets.LXGR_USER }}@${{ secrets.LXGR_HOST }} "cd ~/$LABEL && git checkout . && git fetch && git checkout ${{ github.event.pull_request.head.ref }} && git pull && npm i && npm run build && chgrp -R www-data ~/$LABEL && exit"
-      - name: cleanup
-        run: rm -rf ~/.ssh
+          ~/go/bin/liefer deliver $LABEL ${{ github.event.pull_request.head.ref }} ${{ secrets.LIEFER_PRIVKEY }} --address ${{ secrets.LXGR_HOST }}:8080

src/components/elements/BulletList.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
     <ul>
-      <li       
+      <li
         v-for="(line, index) in text"
         :key="index"
-        :class="{ 'filled': type[index]==='filled' }"
+        :class="{ filled: type[index] === 'filled' }"
       >
         {{ line }}
       </li>
@@ -13,30 +13,26 @@
 </template>
 
 <script>
-
 export default {
-  name: 'BulletList',
+  name: "BulletList",
   props: {
     text: {
       type: Array,
       default() {
-        return []
-      }
+        return [];
+      },
     },
     type: {
       type: Array,
       default() {
-        return []
-      }
-    }
-  },
-  data () {
-    return {
-    }
+        return [];
+      },
+    },
   },
-  mounted () {
+  data() {
+    return {};
   },
-  methods: {
-  }
-}
-</script>
+  mounted() {},
+  methods: {},
+};
+</script>

src/components/elements/CCButton/BaseCCButton.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
     <button
-      class="w-72 h-12 rounded shadow-xl shadow-black/25 text-center text-base font-bold font-[roboto] uppercase active:bg-[#552026] active:text-white active:border-0 hover:text-black hover:bg-white hover:border-black hover:border-4"
-      :class="[getTextColor(type), getButtonColor(type)]"
+      class="rounded shadow-xl shadow-black/25 text-center text-base font-bold font-[roboto] uppercase active:bg-[#552026] active:text-white active:border-0 hover:text-black hover:bg-white hover:border-black hover:border-4"
+      :class="[getTextColor(type), getBgColor(type), ...sizeClass]"
       @click="emit('click')"
     >
       <slot />
@@ -11,20 +11,18 @@
 </template>
 
 <script setup lang="ts">
-import {
-  ButtonType,
-  getButtonColor,
-  getTextColor,
-} from "@/components/elements/CCButton/ButtonType";
+import { Color, getBgColor, getTextColor } from "@/components/utils/color";
 
 const emit = defineEmits(["click"]);
 
 const props = withDefaults(
   defineProps<{
-    type?: ButtonType;
+    sizeClass?: string[];
+    type?: Color;
   }>(),
   {
-    type: ButtonType.YELLOW,
+    sizeClass: () => ["w-72", "h-12"],
+    type: Color.YELLOW,
   },
 );
 </script>

src/components/elements/CCButton/LinkCCButton.vue

@@ -12,18 +12,17 @@
 </template>
 
 <script setup lang="ts">
-import { ButtonType } from "@/components/elements/CCButton/ButtonType";
+import BaseCCButton from "@/components/elements/CCButton/BaseCCButton.vue";
+import { Color } from "@/components/utils/color";
 
 const props = withDefaults(
   defineProps<{
     to: string;
-    type?: ButtonType;
+    type?: Color;
   }>(),
   {
     to: "dummy",
-    type: ButtonType.YELLOW,
-  }
+    type: Color.YELLOW,
+  },
 );
-
-import BaseCCButton from "@/components/elements/CCButton/BaseCCButton.vue";
 </script>

src/components/elements/CCButton/RouterCCButton.vue

@@ -12,17 +12,17 @@
 </template>
 
 <script setup lang="ts">
-import { ButtonType } from "@/components/elements/CCButton/ButtonType";
 import BaseCCButton from "@/components/elements/CCButton/BaseCCButton.vue";
+import { Color } from "@/components/utils/color";
 
 const props = withDefaults(
   defineProps<{
     to: any;
-    type?: ButtonType;
+    type?: Color;
   }>(),
   {
     to: {},
-    type: ButtonType.YELLOW,
-  }
+    type: Color.YELLOW,
+  },
 );
 </script>

src/components/elements/CCButton/SmallCCButton.vue

@@ -0,0 +1,24 @@
+<template>
+  <BaseCCButton
+    :size-class="['w-48', 'h-12']"
+    :type="type"
+    @click="emit('click')"
+  >
+    <slot />
+  </BaseCCButton>
+</template>
+<script setup lang="ts">
+import BaseCCButton from "@/components/elements/CCButton/BaseCCButton.vue";
+import { Color } from "@/components/utils/color";
+
+const emit = defineEmits(["click"]);
+
+const props = withDefaults(
+  defineProps<{
+    type?: Color;
+  }>(),
+  {
+    type: Color.YELLOW,
+  },
+);
+</script>

src/components/elements/Dropdown/Dropdown.vue

@@ -3,7 +3,7 @@
     class="relative inline-block text-left rounded hover:cursor-pointer"
     :class="[
       ...(isOpen ? ['ring', 'ring-white', 'ring-opacity-100'] : []),
-      getButtonColor(type),
+      getBgColor(type),
       getTextColor(type),
     ]"
     @click="toggleDropdown"
@@ -19,7 +19,7 @@
     <ul
       v-if="isOpen"
       class="absolute z-30 ring ring-white rounded ring-opacity-100 whitespace-nowrap"
-      :class="[getButtonColor(type)]"
+      :class="[getBgColor(type)]"
     >
       <li
         v-for="(option, idx) in options"
@@ -35,11 +35,7 @@
 
 <script setup lang="ts" generic="T">
 import { ref, watch } from "vue";
-import {
-  ButtonType,
-  getButtonColor,
-  getTextColor,
-} from "@/components/elements/CCButton/ButtonType";
+import { Color, getBgColor, getTextColor } from "@/components/utils/color";
 import { useDropdown } from "@/def-composables/useDropdown";
 
 const model = defineModel<T>();
@@ -52,13 +48,13 @@ const props = withDefaults(
     options: Array<T>;
     initial?: string;
     displayFn?: (v: T) => string;
-    type?: ButtonType;
+    type?: Color;
   }>(),
   {
     options: () => [],
     initial: "?",
     displayFn: (v: T): string => "" + v,
-    type: ButtonType.PUSSYRED,
+    type: Color.PUSSYRED,
   },
 );