Merge pull request #17 from Apillon/dev

Dev
Apillon · Feb 16, 2024 · 242ddf6 · 242ddf6
2 parents c7a852f + 7663c66
commit 242ddf6
Show file tree

Hide file tree

Showing 13 changed files with 58 additions and 50 deletions.
diff --git a/backend/src/cron.ts b/backend/src/cron.ts
@@ -38,7 +38,7 @@ export class Cron {
 
     let availableNftLeft = 0;
     if (env.MAX_SUPPLY) {
-      const res = await mysql.db.execute(
+      const res = await mysql.paramExecute(
         `SELECT COUNT(id) as total FROM user WHERE
           airdrop_status IN (
             ${AirdropStatus.EMAIL_SENT},
@@ -51,7 +51,7 @@ export class Cron {
         ;
        `
       );
-      const numOfReservations = res[0][0].total;
+      const numOfReservations = res[0].total;
       availableNftLeft = env.MAX_SUPPLY - numOfReservations;
     }
 
@@ -78,13 +78,14 @@ export class Cron {
             const token = await generateEmailAirdropToken(users[i].email);
             await SmtpSendTemplate(
               [users[i].email],
-              'Claim your NFT',
+              'Claim your MENT token',
               'en-airdrop-claim',
               {
                 appUrl: env.APP_URL,
                 link: `${env.APP_URL}/claim?token=${token}`,
                 claimExpiresIn: env.CLAIM_EXPIRES_IN,
-              }
+              },
+              'MENT',
             );
             updates.push(
               `(${users[i].id}, '${users[i].email}', ${
@@ -95,11 +96,12 @@ export class Cron {
             //Currently, waiting line for airdrop is full.Send info email and set appropriate status
             await SmtpSendTemplate(
               [users[i].email],
-              'You are in waiting line for NFT claim',
+              'You have been placed on a waitlist for MENT token',
               'en-airdrop-waiting-line',
               {
                 appUrl: env.APP_URL,
-              }
+              },
+              'MENT'
             );
             updates.push(
               `(${users[i].id}, '${users[i].email}', ${
@@ -171,20 +173,18 @@ export class Cron {
         );
 
         //Get users in waiting line and set their airdrop status to PENDING, so that they will recieve email for claim
-        const usersInWaitingLine = (
-          await mysql.paramExecute(
-            `SELECT * FROM user WHERE
+        const usersInWaitingLine = await mysql.paramExecute(
+          `SELECT * FROM user WHERE
           airdrop_status = ${AirdropStatus.IN_WAITING_LINE}
           AND status = ${SqlModelStatus.ACTIVE}
           ORDER BY createTime ASC
           LIMIT ${usersWithExpiredClaim.length}
           FOR UPDATE
         ;
        `,
-            null,
-            conn
-          )
-        )[0] as Array<any>;
+          null,
+          conn
+        );
 
         console.info(
           'Num of users in waiting line: ' + usersInWaitingLine.length

diff --git a/backend/src/templates/mail/en-airdrop-claim.html b/backend/src/templates/mail/en-airdrop-claim.html
@@ -79,7 +79,7 @@
           font-size: 16px;
           font-weight: 700;
           font-family: 'IBM Plex Mono','arial','helvetica neue','helvetica','sans-serif';
-          color: #141721;
+          color: #000000;
           text-decoration: none;
           width: auto;
           text-align: center;
@@ -124,14 +124,14 @@ <h1>Congrats!</h1>
                     <ul>
                       <li><p>MetaMask (<a href="https://support.metamask.io/hc/en-us/articles/360015489531-Getting-started-with-MetaMask">tutorials</a>)</p></li>
                       <li><p>Coinbase Wallet (<a href="https://www.coinbase.com/en-gb/wallet/tutorials">tutorials</a>)</p></li>
-                      <li><p>WalletConnect (<a href="https://www.youtube.com/watch?v=63eiQD7AUwY">tutorials</a>)</p></li>
+                      <li><p>WalletConnect (<a href="https://www.youtube.com/watch?v=63eiQD7AUwY">tutorial</a>)</p></li>
                     </ul>
                   </li>
                   <li><p>Proceed to <strong>the NFT platform</strong> (through the button below). The instructions will follow as you go.</p></li>
                   <li><p>Successfully connect your wallet and <strong>claim your MENT token.</strong></p></li>
                   <li><p>Own, admire and brag about your newly acquired collectibles.</p></li>
                 </ol>
-                <p>
+                <p align="center">
                   <a href="{{link}}" class="button">Claim MENT token</a>
                 </p>
                 <br /><br />

diff --git a/frontend/assets/styles/_transitions.css b/frontend/assets/styles/_transitions.css
@@ -19,6 +19,7 @@
   &:hover {
     animation-name: bounceIn;
     animation-duration: 50s;
+    border: 1px solid #000;
   }
   &.locked {
     animation-duration: 0s;

diff --git a/frontend/components/parts/ConnectWallet.vue b/frontend/components/parts/ConnectWallet.vue
@@ -10,7 +10,7 @@
       :loading="loading || isLoading"
       @click="disconnectWallet()"
     >
-      Disconnect
+      <span class="text-black">Disconnect</span>
     </Btn>
     <Btn
       v-else-if="isConnected"
@@ -21,7 +21,7 @@
       :loading="loading || isLoading"
       @click="login()"
     >
-      Login
+      <span class="text-black">Login</span>
     </Btn>
     <Btn
       v-else
@@ -32,7 +32,7 @@
       :loading="loading || isLoading"
       @click="modalWalletVisible = true"
     >
-      Connect your wallet
+      <span class="text-black">Connect your wallet</span>
     </Btn>
   </div>
 

diff --git a/frontend/components/parts/form/SighUp.vue b/frontend/components/parts/form/SighUp.vue
@@ -118,13 +118,12 @@ function onCaptchaVerify(token: string) {
       <Btn
         type="primary"
         size="large"
-        class="text-black"
         :color="colors.blue"
         :loading="loading"
         :disabled="!formData.email || !formData.token || !formData.termsAndConditions"
         @click="handleSubmit"
       >
-        Sign up
+        <span class="text-black">Sign up</span>
       </Btn>
     </n-form-item>
 

diff --git a/frontend/components/parts/form/Upload.vue b/frontend/components/parts/form/Upload.vue
@@ -33,17 +33,19 @@
     <Btn
       class="flex-auto"
       type="primary"
+      :color="colors.blue"
       :disabled="!uploadedFile || !hasRequiredColumns || !fileData || fileData.length === 0"
       @click="$emit('proceed', fileData)"
     >
-      Start New Airdrop
+    <span class="text-black">Start New Airdrop</span>
     </Btn>
   </div>
 </template>
 
 <script lang="ts" setup>
 import type { UploadCustomRequestOptions } from 'naive-ui';
 import type { FileInfo } from 'naive-ui/es/upload/src/interface';
+import colors from '~/tailwind.colors';
 
 defineEmits(['close', 'proceed']);
 

diff --git a/frontend/components/parts/form/Wallet.vue b/frontend/components/parts/form/Wallet.vue
@@ -28,7 +28,7 @@ const { connect, connectors, pendingConnector } = useConnect();
       >
         <span class="inline-flex gap-2 items-center">
           <NuxtIcon :name="connector.id" class="text-xl" filled />
-          <span class=" text-black">{{ connector.name }}</span>
+          <span class="text-black">{{ connector.name }}</span>
         </span>
       </Btn>
     </n-space>

diff --git a/frontend/lib/config/naive.ts b/frontend/lib/config/naive.ts
@@ -75,22 +75,22 @@ export const NaiveTheme: GlobalThemeOverrides = {
     colorLoading: colors.white,
     colorSuccess: colors.white,
     colorWarning: colors.white,
-    contentTextColor: colors.bg.DEFAULT,
-    contentTextColorError: colors.bg.DEFAULT,
-    contentTextColorInfo: colors.bg.DEFAULT,
-    contentTextColorSuccess: colors.bg.DEFAULT,
-    contentTextColorWarning: colors.bg.DEFAULT,
-    textColor: colors.bg.DEFAULT,
-    textColorError: colors.bg.DEFAULT,
-    textColorInfo: colors.bg.DEFAULT,
-    textColorLoading: colors.bg.DEFAULT,
-    textColorSuccess: colors.bg.DEFAULT,
-    textColorWarning: colors.bg.DEFAULT,
-    titleTextColor: colors.bg.DEFAULT,
-    titleTextColorError: colors.bg.DEFAULT,
-    titleTextColorInfo: colors.bg.DEFAULT,
-    titleTextColorSuccess: colors.bg.DEFAULT,
-    titleTextColorWarning: colors.bg.DEFAULT,
+    contentTextColor: colors.konference,
+    contentTextColorError: colors.konference,
+    contentTextColorInfo: colors.konference,
+    contentTextColorSuccess: colors.konference,
+    contentTextColorWarning: colors.konference,
+    textColor: colors.konference,
+    textColorError: colors.konference,
+    textColorInfo: colors.konference,
+    textColorLoading: colors.konference,
+    textColorSuccess: colors.konference,
+    textColorWarning: colors.konference,
+    titleTextColor: colors.konference,
+    titleTextColorError: colors.konference,
+    titleTextColorInfo: colors.konference,
+    titleTextColorSuccess: colors.konference,
+    titleTextColorWarning: colors.konference,
     titleFontWeight: '700',
   },
   Button: {
@@ -164,11 +164,11 @@ export const NaiveTheme: GlobalThemeOverrides = {
     borderColor: colors.bg.lighter,
     tdColor: colors.bg.DEFAULT,
     tdColorHover: colors.bg.dark,
-    tdTextColor: colors.white,
+    tdTextColor: colors.black,
     thColor: colors.bg.DEFAULT,
     thColorHover: colors.bg.DEFAULT,
     thFontWeight: '700',
-    thTextColor: colors.white,
+    thTextColor: colors.black,
   },
   Dialog: {
     border: `1px solid ${colors.bg.lighter}`,

diff --git a/frontend/pages/admin.vue b/frontend/pages/admin.vue
@@ -8,7 +8,7 @@ definePageMeta({
   layout: 'admin',
 });
 useHead({
-  title: 'Apillon email airdrop prebuilt solution',
+  title: 'MENT token airdrop',
 });
 
 const message = useMessage();
@@ -178,9 +178,11 @@ function checkUnfinishedRecipients() {
 
       <n-space class="w-full my-8" size="large" align="center" justify="space-between">
         <n-space size="large">
-          <Btn type="primary" class="text-black" @click="getUsers()"> Refresh </Btn>
+          <Btn type="primary" class="text-black" @click="getUsers()">
+            <span class="text-black">Refresh</span>
+          </Btn>
           <Btn :color="colors.blue" class="text-black" @click="modalUploadCsvVisible = true">
-            Upload CSV
+            <span class="text-black">Upload CSV</span>
           </Btn>
           <Btn type="secondary" @click="addRecipient">
             <span class="text-black">Add recipient</span>
@@ -194,7 +196,7 @@ function checkUnfinishedRecipients() {
             :disabled="!data || data.length === 0"
             @click="saveRecipients()"
           >
-            Save recipients
+            <span class="text-black">Save recipients</span>
           </Btn>
         </div>
       </n-space>

diff --git a/frontend/pages/claim.vue b/frontend/pages/claim.vue
@@ -8,7 +8,7 @@ definePageMeta({
   layout: 'claim',
 });
 useHead({
-  title: 'MENT NFT airdrop',
+  title: 'MENT token airdrop',
 });
 
 const { query } = useRoute();
@@ -122,7 +122,7 @@ async function loadNft(contract: Address, id: number, transactionHash: string) {
       :loading="loading"
       @click="claimAirdrop()"
     >
-      Claim your MENT token
+      <span class="text-black">Claim your MENT token</span>
     </Btn>
   </div>
 </template>
diff --git a/frontend/pages/index.vue b/frontend/pages/index.vue
@@ -2,7 +2,7 @@
 import SuperRareJpg from '~/assets/images/superrare.jpg';
 
 useHead({
-  title: 'MENT NFT airdrop',
+  title: 'MENT token airdrop',
 });
 </script>
 

diff --git a/frontend/pages/share.vue b/frontend/pages/share.vue
@@ -3,7 +3,7 @@ import { prepareOG } from '~/lib/utils/helpers';
 import { Chains } from '~/lib/values/general.values';
 
 useHead({
-  title: 'PINK PASS',
+  title: 'MENT token airdrop',
 });
 
 const router = useRouter();

diff --git a/frontend/pages/success.vue b/frontend/pages/success.vue
@@ -11,4 +11,8 @@
   </div>
 </template>
 
-<script setup lang="ts"></script>
+<script setup lang="ts">
+useHead({
+  title: 'MENT token airdrop',
+});
+</script>