From 1792baa72f8892c645f240a51eac97a9c2d909fa Mon Sep 17 00:00:00 2001
From: ZanJereb <zan_jereb@hotmail.com>
Date: Thu, 15 Feb 2024 12:09:58 +0100
Subject: [PATCH 01/11] Created modal for Terms and conditions, privacy policy

---
 .../components/parts/TermsAndConditions.vue   | 52 +++++++++++++++++++
 frontend/components/parts/form/SighUp.vue     | 22 +++++++-
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 frontend/components/parts/TermsAndConditions.vue

diff --git a/frontend/components/parts/TermsAndConditions.vue b/frontend/components/parts/TermsAndConditions.vue
new file mode 100644
index 0000000..4bd188a
--- /dev/null
+++ b/frontend/components/parts/TermsAndConditions.vue
@@ -0,0 +1,52 @@
+<template>
+  <div class="max-w-md w-full md:px-6 my-12 mx-auto">
+    <img :src="LogoPNG" class="mx-auto" width="241" height="240" alt="wallet" />
+
+    <div class="my-8 text-center">
+      <h3 class="mb-6">Terms and Conditions and Privacy Policy</h3>
+      <n-scrollbar style="max-height: 400px">
+        <div class="text-left">
+          <p>
+            We are happy to deliver information about our program to your inbox.
+            In order for you to be among the first to learn about MENT news, we need your consent
+            in accordance with the new legislation. MENT, which is produced by Kino Šiška,
+            will use your e-mail exclusively for the purpose of informing about events that are produced or co-produced by MENT.
+          </p>
+          <p>
+            Veseli smo, da vam lahko informacije o našem programu dostavimo v vaš e-nabiralnik.
+            Da boste med prvimi izvedeli novice o MENTu, v skladu z novo zakonodajo potrebujemo vaše soglasje.
+            MENT, ki ga producira Kino Šiška, bo vaš e-mail uporabljal izključno za namen obveščanja o dogodkih,
+            ki nastajajo v produkciji ali koprodukciji MENTa.
+          </p>
+          <hr class="fullWidth my-4 border-primary-bright" />
+          <p>
+            I agree that MENT uses my e-mail to provide information about the program and news related to it.
+          </p>
+          <p>
+            Strinjam se, da MENT moj e-mail uporablja za posredovanje informacij o programu in z njim povezanimi novicami.
+          </p>
+          <hr class="fullWidth my-4 border-primary-bright" />
+          <p>
+            You can change your mind at any time, change your choice, correct your contact details
+            or unsubscribe completely by clicking on the link at the bottom of our email. You can also contact us via e-mail at
+            <a href="mailto:info@ment.si"><u>info@ment.si</u></a>.
+            We collect and use your data in accordance with the provisions of the legislation on the protection of personal data
+            and with the aim of trying to show you via e-mail news that we conclude is of interest to you. Of course, we will also delete them completely at your request.
+          </p>
+          <p>
+            Kadarkoli si lahko premislite in svojo izbiro spremenite, popravite kontaktne podatke
+            ali se popolnoma odjavite tako, da kliknete na povezavo na dnu našega e-poštnega sporočila.
+            Lahko se tudi obrnete na nas prek e-pošte na naslov
+            <a href="mailto:info@ment.si"><u>info@ment.si</u></a>.
+            Vaše podatke zbiramo in uporabljamo v skladu z določili zakonodaje o varstvu osebnih podatkov ter z namenom,
+            da vam poskušamo preko e-pošte prikazati novice, za katere sklepamo, da vas zanimajo. Seveda pa jih bomo na vašo zahtevo tudi povsem izbrisali.
+          </p>
+        </div>
+      </n-scrollbar>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import LogoPNG from '/images/logo/MENT_Logo-01.png';
+</script>
diff --git a/frontend/components/parts/form/SighUp.vue b/frontend/components/parts/form/SighUp.vue
index 5516c5c..319f981 100644
--- a/frontend/components/parts/form/SighUp.vue
+++ b/frontend/components/parts/form/SighUp.vue
@@ -6,11 +6,14 @@ import { ruleRequired } from '~/lib/utils/validation';
 
 type SignupForm = {
   email: string | null;
+  termsAndConditions: boolean;
   token?: any;
 };
 
 const router = useRouter();
 
+const modalTermsAndConditionsVisible = ref<boolean>(false);
+
 const message = useMessage();
 const emit = defineEmits(['submitSuccess']);
 
@@ -28,6 +31,7 @@ const { handleError } = useErrors();
 const formRef = ref<FormInst | null>(null);
 const formData = ref<SignupForm>({
   email: null,
+  termsAndConditions: false,
   token: null as any,
 });
 
@@ -89,6 +93,14 @@ function onCaptchaVerify(token: string) {
       />
     </n-form-item>
 
+    <div class="flex pb-6 space-x-2">
+      <div class="my-auto">
+        <input v-model="formData.termsAndConditions" type="checkbox" class="w-[18px] h-[18px]">
+      </div>
+      
+      <p>I have read and agree to <u class="cursor-pointer" @click="modalTermsAndConditionsVisible = true"><strong>Terms and Conditions and Privacy Policy.</strong></u></p>
+    </div>
+
     <!-- Hcaptcha -->
     <vue-hcaptcha
       ref="captchaInput"
@@ -109,11 +121,19 @@ function onCaptchaVerify(token: string) {
         size="large"
         :color="colors.konference"
         :loading="loading"
-        :disabled="!formData.email || !formData.token"
+        :disabled="!formData.email || !formData.token || !formData.termsAndConditions"
         @click="handleSubmit"
       >
         Sign up
       </Btn>
     </n-form-item>
+
+      <modal
+      :show="modalTermsAndConditionsVisible"
+      @close="() => (modalTermsAndConditionsVisible = false)"
+      @update:show="modalTermsAndConditionsVisible = false"
+    >
+      <TermsAndConditions />
+    </modal>
   </n-form>
 </template>

From 7d146ad369479c2207e93d096fecc00c115155ea Mon Sep 17 00:00:00 2001
From: ZanJereb <zan_jereb@hotmail.com>
Date: Thu, 15 Feb 2024 12:14:37 +0100
Subject: [PATCH 02/11] Fixes

---
 frontend/components/parts/TermsAndConditions.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/parts/TermsAndConditions.vue b/frontend/components/parts/TermsAndConditions.vue
index 4bd188a..e08f834 100644
--- a/frontend/components/parts/TermsAndConditions.vue
+++ b/frontend/components/parts/TermsAndConditions.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="max-w-md w-full md:px-6 my-12 mx-auto">
-    <img :src="LogoPNG" class="mx-auto" width="241" height="240" alt="wallet" />
+    <img :src="LogoPNG" class="mx-auto" width="240" height="240" alt="MENT" />
 
     <div class="my-8 text-center">
       <h3 class="mb-6">Terms and Conditions and Privacy Policy</h3>

From c69074d73560b80654e5bd3dfe2913254dafa2f0 Mon Sep 17 00:00:00 2001
From: Tine Mlakar <tine.mlakar@kalmia.si>
Date: Thu, 15 Feb 2024 12:45:22 +0100
Subject: [PATCH 03/11] docker configs

---
 backend/build-image.sh           |  2 +-
 backend/docker-compose.proxy.yml | 43 ++++++++++++++++++++++++++++++++
 backend/docker-compose.yml       | 33 ++++++++----------------
 docker-compose.proxy.yml         | 38 ++++++++++++++++++++++++++++
 4 files changed, 93 insertions(+), 23 deletions(-)
 create mode 100644 backend/docker-compose.proxy.yml
 create mode 100644 docker-compose.proxy.yml

diff --git a/backend/build-image.sh b/backend/build-image.sh
index e9dd9d6..4ab56c3 100755
--- a/backend/build-image.sh
+++ b/backend/build-image.sh
@@ -1,4 +1,4 @@
 aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/i0e4n2k8
 docker build -t ment-airdrop:latest .
 docker tag ment-airdrop:latest public.ecr.aws/i0e4n2k8/ment-airdrop:latest
-# docker push public.ecr.aws/i0e4n2k8/ment-airdrop:latest
\ No newline at end of file
+docker push public.ecr.aws/i0e4n2k8/ment-airdrop:latest
\ No newline at end of file
diff --git a/backend/docker-compose.proxy.yml b/backend/docker-compose.proxy.yml
new file mode 100644
index 0000000..98764cc
--- /dev/null
+++ b/backend/docker-compose.proxy.yml
@@ -0,0 +1,43 @@
+services:
+  proxy:
+    image: nginxproxy/nginx-proxy:latest
+    container_name: nginx-proxy
+    restart: unless-stopped
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - /app/certs:/etc/nginx/certs:ro
+      # - /etc/nginx/vhost.d
+      # - /usr/share/nginx/html
+      - vhost:/etc/nginx/vhost.d
+      - html:/usr/share/nginx/html
+    environment:
+      - HTTPS_METHOD=noredirect
+    networks:
+      - web
+
+  proxy-ssl:
+    image: nginxproxy/acme-companion
+    container_name: acme-companion
+    restart: unless-stopped
+    volumes_from:
+      - proxy
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - /app/certs:/etc/nginx/certs:rw
+      - acme:/etc/acme.sh
+    environment:
+      - DEFAULT_EMAIL=itkalmia@kalmia.si
+    networks:
+      - web
+
+volumes: 
+  vhost:
+  html:
+  acme:
+
+networks:
+  web:
+    name: web
diff --git a/backend/docker-compose.yml b/backend/docker-compose.yml
index d5b896c..1906876 100644
--- a/backend/docker-compose.yml
+++ b/backend/docker-compose.yml
@@ -6,14 +6,13 @@ services:
     container_name: airdrop_db
     env_file:
       - .env.sql.deploy
-    # environment:
-    #   MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-    #   MYSQL_DATABASE: ${MYSQL_DATABASE}
     ports:
       - '3306:3306'
     restart: always
     volumes:
       - mysql-data:/var/lib/mysql
+    networks:
+      - db
 
   airdrop_app:
     image: public.ecr.aws/i0e4n2k8/ment-airdrop:latest
@@ -22,26 +21,16 @@ services:
       - airdrop_db
     env_file:
       - .env.deploy
-    # environment:
-    #   APP_SECRET: ${APP_SECRET}
-    #   APP_URL: ${APP_URL}
-    #   ADMIN_WALLET: ${ADMIN_WALLET}
-    #   APILLON_KEY: ${APILLON_KEY}
-    #   APILLON_SECRET: ${APILLON_SECRET}
-    #   COLLECTION_UUID: ${COLLECTION_UUID}
-    #   SMTP_HOST: ${SMTP_HOST}
-    #   SMTP_PORT: ${SMTP_PORT}
-    #   SMTP_USERNAME: ${SMTP_USERNAME}
-    #   SMTP_PASSWORD: ${SMTP_PASSWORD}
-    #   SMTP_EMAIL_FROM: ${SMTP_EMAIL_FROM}
-    #   SMTP_NAME_FROM: ${SMTP_NAME_FROM}
-    #   API_HOST: ${API_HOST}
-    #   API_PORT: ${API_PORT}
-    #   CAPTCHA_SECRET: ${CAPTCHA_SECRET}
-    #   CLAIM_EXPIRES_IN: ${CLAIM_EXPIRES_IN}
-    ports:
-      - '8080:${API_PORT}'
     restart: always
+    networks:
+      - web
+      - db
 
 volumes:
   mysql-data:
+
+networks:
+  db:
+  web:
+    name: web
+    external: true
diff --git a/docker-compose.proxy.yml b/docker-compose.proxy.yml
new file mode 100644
index 0000000..aea42f5
--- /dev/null
+++ b/docker-compose.proxy.yml
@@ -0,0 +1,38 @@
+services:
+  proxy:
+    image: nginxproxy/nginx-proxy:latest
+    container_name: nginx-proxy
+    restart: unless-stopped
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - /app/certs:/etc/nginx/certs:ro
+      # - /etc/nginx/vhost.d
+      # - /usr/share/nginx/html
+      - vhost:/etc/nginx/vhost.d
+      - html:/usr/share/nginx/html
+    environment:
+      - HTTPS_METHOD=noredirect
+    networks:
+      - web
+
+  proxy-ssl:
+    image: nginxproxy/acme-companion
+    container_name: acme-companion
+    restart: unless-stopped
+    volumes_from:
+      - proxy
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - /app/certs:/etc/nginx/certs:rw
+      - acme:/etc/acme.sh
+    environment:
+      - DEFAULT_EMAIL=itkalmia@kalmia.si
+    networks:
+      - web
+
+networks:
+  web:
+    name: web

From f84f8f47f9d6b39148d108456f229dfe2bf32b25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vinko=20=C5=A0mid?= <vinko.smid@kalmia.si>
Date: Thu, 15 Feb 2024 13:48:53 +0100
Subject: [PATCH 04/11] fixed en-airdrop-claim mail, so that available hours
 for mint are passed via parameter.

---
 backend/src/cron.ts                           | 62 +++++++++++--------
 .../src/templates/mail/en-airdrop-claim.html  |  2 +-
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/backend/src/cron.ts b/backend/src/cron.ts
index fde6f0f..a01ec30 100644
--- a/backend/src/cron.ts
+++ b/backend/src/cron.ts
@@ -1,20 +1,22 @@
-import { CronJob } from 'cron';
-import { AirdropStatus } from './models/user';
-import { dateToSqlString } from './lib/sql-utils';
-import { SqlModelStatus } from './models/base-sql-model';
-import { MysqlConnectionManager } from './lib/mysql-connection-manager';
-import { SmtpSendTemplate } from './lib/node-mailer';
-import { env } from './config/env';
-import { generateEmailAirdropToken } from './lib/jwt';
-import { LogType, writeLog } from './lib/logger';
+import { CronJob } from "cron";
+import { AirdropStatus } from "./models/user";
+import { dateToSqlString } from "./lib/sql-utils";
+import { SqlModelStatus } from "./models/base-sql-model";
+import { MysqlConnectionManager } from "./lib/mysql-connection-manager";
+import { SmtpSendTemplate } from "./lib/node-mailer";
+import { env } from "./config/env";
+import { generateEmailAirdropToken } from "./lib/jwt";
+import { LogType, writeLog } from "./lib/logger";
 
 export class Cron {
   private cronJobs: CronJob[] = [];
 
   constructor() {
-    this.cronJobs.push(new CronJob('* * * * *', this.sendEmail, null, false));
+    this.cronJobs.push(new CronJob("* * * * *", this.sendEmail, null, false));
     if (env.MAX_SUPPLY > 0) {
-      this.cronJobs.push(new CronJob('* * * * *', this.processExpiredClaims, null, false));
+      this.cronJobs.push(
+        new CronJob("* * * * *", this.processExpiredClaims, null, false)
+      );
     }
   }
 
@@ -73,10 +75,16 @@ export class Cron {
         try {
           if (!env.MAX_SUPPLY || i < availableNftLeft) {
             const token = await generateEmailAirdropToken(users[i].email);
-            await SmtpSendTemplate([users[i].email], 'Claim your NFT', 'en-airdrop-claim', {
-              appUrl: env.APP_URL,
-              link: `${env.APP_URL}/claim?token=${token}`,
-            });
+            await SmtpSendTemplate(
+              [users[i].email],
+              "Claim your NFT",
+              "en-airdrop-claim",
+              {
+                appUrl: env.APP_URL,
+                link: `${env.APP_URL}/claim?token=${token}`,
+                claimExpiresIn: env.CLAIM_EXPIRES_IN,
+              }
+            );
             updates.push(
               `(${users[i].id}, '${users[i].email}', ${
                 AirdropStatus.EMAIL_SENT
@@ -86,8 +94,8 @@ 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',
-              'en-airdrop-waiting-line',
+              "You are in waiting line for NFT claim",
+              "en-airdrop-waiting-line",
               {
                 appUrl: env.APP_URL,
               }
@@ -99,11 +107,11 @@ export class Cron {
             );
           }
         } catch (e) {
-          writeLog(LogType.ERROR, e, 'cron.ts', 'sendEmail');
+          writeLog(LogType.ERROR, e, "cron.ts", "sendEmail");
           updates.push(
-            `(${users[i].id}, '${users[i].email}', ${AirdropStatus.EMAIL_ERROR}, '${dateToSqlString(
-              new Date()
-            )}')`
+            `(${users[i].id}, '${users[i].email}', ${
+              AirdropStatus.EMAIL_ERROR
+            }, '${dateToSqlString(new Date())}')`
           );
         }
       }
@@ -111,7 +119,7 @@ export class Cron {
       if (updates.length > 0) {
         const sql = `
         INSERT INTO user (id, email, airdrop_status, email_sent_time)
-        VALUES ${updates.join(',')}
+        VALUES ${updates.join(",")}
         ON DUPLICATE KEY UPDATE
         airdrop_status = VALUES(airdrop_status),
         email_sent_time = VALUES(email_sent_time)`;
@@ -121,7 +129,7 @@ export class Cron {
 
       await mysql.commit(conn);
     } catch (e) {
-      writeLog(LogType.ERROR, e, 'cron.ts', 'sendEmail');
+      writeLog(LogType.ERROR, e, "cron.ts", "sendEmail");
       await mysql.rollback(conn);
     }
   }
@@ -143,14 +151,14 @@ export class Cron {
           null,
           conn
         )
-      ).map(x => x.id);
+      ).map((x) => x.id);
 
       if (usersWithExpiredClaim.length) {
         //Update those users to claim expired
         await mysql.paramExecute(
           `UPDATE user 
           SET airdrop_status = ${AirdropStatus.AIRDROP_CLAIM_EXPIRED}
-          WHERE id IN (${usersWithExpiredClaim.join(',')})
+          WHERE id IN (${usersWithExpiredClaim.join(",")})
         ;
        `,
           null,
@@ -176,7 +184,7 @@ export class Cron {
           await mysql.paramExecute(
             `UPDATE user 
                 SET airdrop_status = ${AirdropStatus.PENDING}
-                WHERE id IN (${usersInWaitingLine.map(x => x.id).join(',')})
+                WHERE id IN (${usersInWaitingLine.map((x) => x.id).join(",")})
               ;
             `,
             null,
@@ -187,7 +195,7 @@ export class Cron {
 
       await mysql.commit(conn);
     } catch (e) {
-      writeLog(LogType.ERROR, e, 'cron.ts', 'processExpiredClaims');
+      writeLog(LogType.ERROR, e, "cron.ts", "processExpiredClaims");
       await mysql.rollback(conn);
     }
   }
diff --git a/backend/src/templates/mail/en-airdrop-claim.html b/backend/src/templates/mail/en-airdrop-claim.html
index 6328a84..4f6f1ea 100644
--- a/backend/src/templates/mail/en-airdrop-claim.html
+++ b/backend/src/templates/mail/en-airdrop-claim.html
@@ -104,7 +104,7 @@ <h1>Congrats!</h1>
             </tr>
             <tr>
               <td>
-                <p><strong> Your MENT token has been reserved, you now have 72 hours to claim it.</strong></p>
+                <p><strong> Your MENT token has been reserved, you now have {{claimExpiresIn}} hours to claim it.</strong></p>
                 <br /><br />
                 <p>To fully own your value-packed MENT token, these are the steps to go through:</p>
                 <ol>

From 27db7bb539740bf2df772a0a2259e20367b99a9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vinko=20=C5=A0mid?= <vinko.smid@kalmia.si>
Date: Thu, 15 Feb 2024 14:26:12 +0100
Subject: [PATCH 05/11] Users in waiting line are fetched by createTime ASC.

---
 backend/src/cron.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/cron.ts b/backend/src/cron.ts
index c2ae2c7..dc341ab 100644
--- a/backend/src/cron.ts
+++ b/backend/src/cron.ts
@@ -160,6 +160,7 @@ export class Cron {
             `SELECT * FROM user WHERE
           airdrop_status = ${AirdropStatus.IN_WAITING_LINE}
           AND status = ${SqlModelStatus.ACTIVE}
+          ORDER BY createTime ASC
           LIMIT ${usersWithExpiredClaim.length}
           FOR UPDATE
         ;

From b99b03185b25b117e90a5218346a8a2454e77305 Mon Sep 17 00:00:00 2001
From: Tine Mlakar <tine.mlakar@kalmia.si>
Date: Thu, 15 Feb 2024 14:40:19 +0100
Subject: [PATCH 06/11] docekerfile fix

---
 backend/dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/dockerfile b/backend/dockerfile
index 037f1e7..0c3c6a8 100644
--- a/backend/dockerfile
+++ b/backend/dockerfile
@@ -43,6 +43,8 @@ ADD ./ ${appDir}/
 
 RUN npm install 
 RUN npm run build
+RUN mkdir -p ./dist/templates/mail/ 
+RUN cp ./src/templates/mail/*.html ./dist/templates/mail/
 
 EXPOSE 3000
 RUN chmod +x ./bin/docker-start.sh ./bin/create-database.sh

From 3dd36d301520ee422c77dae4499e6756710e3e62 Mon Sep 17 00:00:00 2001
From: ZanJereb <zan_jereb@hotmail.com>
Date: Thu, 15 Feb 2024 20:59:57 +0100
Subject: [PATCH 07/11] Changed texts, added image on email templates

---
 .../src/templates/mail/en-airdrop-claim.html  | 34 +++++++++++++------
 .../mail/en-airdrop-waiting-line.html         | 18 ++++++++--
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/backend/src/templates/mail/en-airdrop-claim.html b/backend/src/templates/mail/en-airdrop-claim.html
index 4f6f1ea..40e941e 100644
--- a/backend/src/templates/mail/en-airdrop-claim.html
+++ b/backend/src/templates/mail/en-airdrop-claim.html
@@ -46,6 +46,11 @@
         height: 25px;
       }
 
+      .logo {
+        width: 275px;
+        height: 81px;
+      }
+
       a {
         color: rgb(228, 178, 0);
       }
@@ -67,10 +72,10 @@
 
       .button {
           border-style: solid;
-          border-color: #78dce8;
+          border-color: rgb(228, 178, 0);
           border-width: 16px 40px 16px 40px;
           display: inline-block;
-          background: #78dce8;
+          background: rgb(228, 178, 0);
           font-size: 16px;
           font-weight: 700;
           font-family: 'IBM Plex Mono','arial','helvetica neue','helvetica','sans-serif';
@@ -94,7 +99,14 @@
           <table class="main-content" align="center">
             <tr>
               <td align="left">
-                <img src="cid:logo.png" />
+                  <a href="https://www.ment.si/">
+                    <img
+                        class="logo"
+                        src="{{appUrl}}/images/logo/MENT_Logo-01.png"
+                        title="MENT"
+                        alt="MENT"
+                      />
+                  </a>
               </td>
             </tr>
             <tr>
@@ -108,22 +120,22 @@ <h1>Congrats!</h1>
                 <br /><br />
                 <p>To fully own your value-packed MENT token, these are the steps to go through:</p>
                 <ol>
-                  <li>Install a <strong>digital wallet</strong> - either as a mobile app or a desktop browser extension. The platform supports connectivity with:
+                  <li><p>Install a <strong>digital wallet</strong> - either as a mobile app or a desktop browser extension. The platform supports connectivity with:</p>
                     <ul>
-                      <li>MetaMask (<a href="https://support.metamask.io/hc/en-us/articles/360015489531-Getting-started-with-MetaMask">tutorials</a>)</li>
-                      <li>Coinbase Wallet (<a href="https://www.coinbase.com/en-gb/wallet/tutorials">tutorials</a>)</li>
-                      <li>WalletConnec (<a href="https://www.youtube.com/watch?v=63eiQD7AUwY">tutorials</a>)</li>
+                      <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>
                     </ul>
                   </li>
-                  <li>Proceed to <strong>the NFT platform</strong> (through the button below). The instructions will follow as you go.</li>
-                  <li>Successfully connect your wallet and <strong>claim your MENT token.</strong></li>
-                  <li>Own, admire and brag about your newly acquired collectibles.</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>
                   <a href="{{link}}" class="button">Claim MENT token</a>
                 </p>
                 <br /><br />
-                <p>If you need additional assistance, or you received this email in error, please contact <a>mail</a></p>
+                <p>If you need additional assistance, or you received this email in error, please contact <a href="mailto:manage@ment.si">manage@ment.si</a></p>
                 <br /><br />
                 <p>Best, <br />The MENT team</p>
                 <br /><br />
diff --git a/backend/src/templates/mail/en-airdrop-waiting-line.html b/backend/src/templates/mail/en-airdrop-waiting-line.html
index 5e67e52..85b9c39 100644
--- a/backend/src/templates/mail/en-airdrop-waiting-line.html
+++ b/backend/src/templates/mail/en-airdrop-waiting-line.html
@@ -46,6 +46,11 @@
         height: 25px;
       }
 
+      .logo {
+        width: 275px;
+        height: 81px;
+      }
+      
       a {
         color: rgb(228, 178, 0);
       }
@@ -74,7 +79,14 @@
           <table class="main-content" align="center">
             <tr>
               <td align="left">
-                <img src="cid:logo.png" />
+                <a href="https://www.ment.si/">
+                  <img
+                      class="logo"
+                      src="{{appUrl}}/images/logo/MENT_Logo-01.png"
+                      title="MENT"
+                      alt="MENT"
+                    />
+                </a>
               </td>
             </tr>
             <tr>
@@ -84,9 +96,9 @@ <h1>Unfortunately, all the NFT-claim spots have been filled.</h1>
             </tr>
             <tr>
               <td>
-                <p>You will be placed on a MENT token waitlist - in case someone before you doesn’t claim their token, you’ll be next in line! </p>
+                <p>You will be placed on a <strong>MENT token waitlist</strong> - in case someone before you doesn’t claim their token, you’ll be next in line! </p>
                 <p>If that happens, we will notify you via email and you’ll get the necessary information to proceed.</p>
-                <p>Should you need additional assistance, or you received this email in error, please contact <a>email</a></p>
+                <p>Should you need additional assistance, or you received this email in error, please contact <a href="mailto:manage@ment.si">manage@ment.si</a>.</p>
                 <br /><br />
                 <p>Best, <br />The MENT team</p>
                 <br /><br />

From 35c187305ed846987fcd424702377838e8c4821f Mon Sep 17 00:00:00 2001
From: ZanJereb <zan_jereb@hotmail.com>
Date: Thu, 15 Feb 2024 21:11:54 +0100
Subject: [PATCH 08/11] Changed button and text colors

---
 frontend/components/parts/ConnectWallet.vue |  7 +++++++
 frontend/components/parts/form/SighUp.vue   |  4 ++--
 frontend/components/parts/form/Wallet.vue   |  2 +-
 frontend/layouts/claim.vue                  |  7 +++++--
 frontend/pages/claim.vue                    | 14 ++++++++++++--
 frontend/pages/share.vue                    |  6 +++---
 frontend/tailwind.colors.ts                 |  3 ++-
 frontend/tailwind.config.js                 |  3 ++-
 8 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/frontend/components/parts/ConnectWallet.vue b/frontend/components/parts/ConnectWallet.vue
index 1388a33..c0491e1 100644
--- a/frontend/components/parts/ConnectWallet.vue
+++ b/frontend/components/parts/ConnectWallet.vue
@@ -4,6 +4,8 @@
     <Btn
       v-if="isConnected && (!admin || userStore.jwt)"
       v-bind="$attrs"
+      class="text-white"
+      :color="colors.button"
       :size="size"
       :loading="loading || isLoading"
       @click="disconnectWallet()"
@@ -13,6 +15,8 @@
     <Btn
       v-else-if="isConnected"
       v-bind="$attrs"
+      class="text-white"
+      :color="colors.button"
       :size="size"
       :loading="loading || isLoading"
       @click="login()"
@@ -22,6 +26,8 @@
     <Btn
       v-else
       v-bind="$attrs"
+      class="text-white"
+      :color="colors.button"
       :size="size"
       :loading="loading || isLoading"
       @click="modalWalletVisible = true"
@@ -40,6 +46,7 @@
 </template>
 
 <script lang="ts" setup>
+import colors from '~/tailwind.colors';
 import type { Size } from 'naive-ui/es/button/src/interface';
 import { useAccount, useConnect, useDisconnect, useWalletClient } from 'use-wagmi';
 
diff --git a/frontend/components/parts/form/SighUp.vue b/frontend/components/parts/form/SighUp.vue
index 319f981..a6fdd60 100644
--- a/frontend/components/parts/form/SighUp.vue
+++ b/frontend/components/parts/form/SighUp.vue
@@ -105,7 +105,6 @@ function onCaptchaVerify(token: string) {
     <vue-hcaptcha
       ref="captchaInput"
       :sitekey="captchaKey"
-      theme="dark"
       @error="onCaptchaError"
       @verify="onCaptchaVerify"
       @expired="onCaptchaExpire"
@@ -119,7 +118,8 @@ function onCaptchaVerify(token: string) {
       <Btn
         type="primary"
         size="large"
-        :color="colors.konference"
+        class="text-white"
+        :color="colors.button"
         :loading="loading"
         :disabled="!formData.email || !formData.token || !formData.termsAndConditions"
         @click="handleSubmit"
diff --git a/frontend/components/parts/form/Wallet.vue b/frontend/components/parts/form/Wallet.vue
index ce665d8..689d99f 100644
--- 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>{{ connector.name }}</span>
+          <span class=" text-black">{{ connector.name }}</span>
         </span>
       </Btn>
     </n-space>
diff --git a/frontend/layouts/claim.vue b/frontend/layouts/claim.vue
index b8cf156..e3a2f9a 100644
--- a/frontend/layouts/claim.vue
+++ b/frontend/layouts/claim.vue
@@ -6,7 +6,7 @@
     <div class="container h-full pb-8 lg:pb-24 flex flex-col justify-center" :style="containerStyle">
       <slot />
     </div>
-    <div>
+    <div ref="footerRef" class="justify-center">
       <Footer />
     </div>
   </n-layout>
@@ -15,10 +15,13 @@
 <script lang="ts" setup>
 /** Heading height */
 const headerRef = ref<HTMLElement>();
+const footerRef = ref<HTMLElement>();
 
 const containerStyle = computed(() => {
+  const hHeight = headerRef.value?.clientHeight || 0;
+  const fHeight = footerRef.value?.clientHeight || 0;
   return {
-    minHeight: `calc(100dvh - ${headerRef.value?.clientHeight || 0}px)`,
+    minHeight: `calc(100dvh - ${hHeight + fHeight}px)`,
   };
 });
 </script>
diff --git a/frontend/pages/claim.vue b/frontend/pages/claim.vue
index 236af2d..051b324 100644
--- a/frontend/pages/claim.vue
+++ b/frontend/pages/claim.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 type Address = `0x${string}`;
 import SuccessSVG from '~/assets/images/success.svg';
+import colors from '~/tailwind.colors';
 import { useAccount, useConnect, useContractRead, useWalletClient } from 'use-wagmi';
 import { abi } from '~/lib/config/abi';
 import { getContractAddress } from 'viem';
@@ -9,7 +10,7 @@ definePageMeta({
   layout: 'claim',
 });
 useHead({
-  title: 'Apillon email airdrop prebuilt solution',
+  title: 'MENT NFT airdrop',
 });
 
 const { query } = useRoute();
@@ -115,6 +116,15 @@ async function loadNft(contract: Address, id: number, transactionHash: string) {
     </div>
 
     <ConnectWallet v-if="!isConnected" size="large" />
-    <Btn v-else size="large" :loading="loading" @click="claimAirdrop()">Claim your MENT token</Btn>
+    <Btn
+      v-else
+      size="large"
+      class="text-white"
+      :color="colors.button"
+      :loading="loading"
+      @click="claimAirdrop()"
+    >
+      Claim your MENT token
+    </Btn>
   </div>
 </template>
diff --git a/frontend/pages/share.vue b/frontend/pages/share.vue
index c656d7a..5763bd4 100644
--- a/frontend/pages/share.vue
+++ b/frontend/pages/share.vue
@@ -58,7 +58,7 @@ function transactionLink(transactionHash?: string | null): string {
     <div class="rounded-lg overflow-hidden mb-8">
       <img :src="metadata.image" class="" width="400" height="400" alt="nft" />
 
-      <div class="p-6 bg-bg-lighter">
+      <div class="p-6 bg-bg-light">
         <h5>{{ metadata.name }}</h5>
       </div>
       <div class="mt-4 text-center">
@@ -80,8 +80,8 @@ function transactionLink(transactionHash?: string | null): string {
       :href="`https://twitter.com/intent/tweet?text=Just minted my ${metadata.name} NFT on nft.ment.si!&url=https://nft.ment.si/`"
     >
       <span class="inline-flex gap-2 items-center">
-        <NuxtIcon name="x" class="text-xl" />
-        <span>Share on X</span>
+        <NuxtIcon name="x" class="text-xl text-black" />
+        <span class="text-black">Share on X</span>
       </span>
     </Btn>
   </div>
diff --git a/frontend/tailwind.colors.ts b/frontend/tailwind.colors.ts
index 1ced15e..0d27829 100644
--- a/frontend/tailwind.colors.ts
+++ b/frontend/tailwind.colors.ts
@@ -1,6 +1,6 @@
 /** This is copy of Tailwind custom colors */
 export default {
-  primary: '#91331F',
+  primary: '#FF6188',
   secondary: '#78DCE8',
 
   transparent: 'transparent',
@@ -21,6 +21,7 @@ export default {
   sprejemi: '#15D0AB',
   specialke: '#DD73DD',
   info: '#E9E8C4',
+  button: '#AC56AC',
 
   body: '#9D9E91',
   bodyDark: '#6A6B63',
diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js
index e63dc5c..ffe67a1 100644
--- a/frontend/tailwind.config.js
+++ b/frontend/tailwind.config.js
@@ -23,7 +23,7 @@ module.exports = {
     },
 
     colors: {
-      primary: '#91331F',
+      primary: '#FF6188',
       secondary: '#78DCE8',
 
       transparent: 'transparent',
@@ -44,6 +44,7 @@ module.exports = {
       sprejemi: '#15D0AB',
       specialke: '#DD73DD',
       info: '#E9E8C4',
+      button: '#AC56AC',
 
       body: '#9D9E91',
       bodyDark: '#6A6B63',

From 9d4475b7f8f69d69b7a758d044a2a3b03e41143d Mon Sep 17 00:00:00 2001
From: ZanJereb <zan_jereb@hotmail.com>
Date: Thu, 15 Feb 2024 21:12:13 +0100
Subject: [PATCH 09/11] Added errors

---
 frontend/lib/misc/errors.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/lib/misc/errors.ts b/frontend/lib/misc/errors.ts
index c38df42..efe2c53 100644
--- a/frontend/lib/misc/errors.ts
+++ b/frontend/lib/misc/errors.ts
@@ -65,6 +65,7 @@ export const ErrorCodes = {
   400005: 'Missing signature',
   400006: 'Token does not exists',
   400007: 'NFT already claimed',
+  400008: 'Invalid admin',
   403001: 'Missing auth token, please login!',
   403002: 'UNKNOWN USER',
   403003: 'UNAUTHORIZED',
@@ -76,6 +77,8 @@ export const ErrorCodes = {
   422005: 'Captcha not configured!',
   422006: 'Please solve captcha',
   422007: 'Captcha error, please solver captcha again',
+  422008: 'User already minted',
+  422009: 'Wallet belongs to another user, please login with different wallet',
 
   // SystemErrorCode
   500000: 'DEFAULT_SYSTEM_ERROR',

From 453fe96c2f576033dd88d4b950c78502db3efac7 Mon Sep 17 00:00:00 2001
From: ZanJereb <zan_jereb@hotmail.com>
Date: Fri, 16 Feb 2024 08:42:33 +0100
Subject: [PATCH 10/11] Added close button on terms and conditions

---
 frontend/components/parts/TermsAndConditions.vue | 12 ++++++++++++
 frontend/components/parts/form/SighUp.vue        |  5 ++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/frontend/components/parts/TermsAndConditions.vue b/frontend/components/parts/TermsAndConditions.vue
index e08f834..0a66927 100644
--- a/frontend/components/parts/TermsAndConditions.vue
+++ b/frontend/components/parts/TermsAndConditions.vue
@@ -44,9 +44,21 @@
         </div>
       </n-scrollbar>
     </div>
+    <btn
+      type="primary"
+      size="large"
+      class="text-white"
+      :color="colors.button"
+      @click="$emit('close', false)"
+    >
+      Close
+    </btn>
   </div>
 </template>
 
 <script setup lang="ts">
 import LogoPNG from '/images/logo/MENT_Logo-01.png';
+import colors from '~/tailwind.colors';
+
+const emits = defineEmits(['close']);
 </script>
diff --git a/frontend/components/parts/form/SighUp.vue b/frontend/components/parts/form/SighUp.vue
index a6fdd60..b08b2a5 100644
--- a/frontend/components/parts/form/SighUp.vue
+++ b/frontend/components/parts/form/SighUp.vue
@@ -128,12 +128,11 @@ function onCaptchaVerify(token: string) {
       </Btn>
     </n-form-item>
 
-      <modal
+    <modal
       :show="modalTermsAndConditionsVisible"
-      @close="() => (modalTermsAndConditionsVisible = false)"
       @update:show="modalTermsAndConditionsVisible = false"
     >
-      <TermsAndConditions />
+      <TermsAndConditions @close="() => (modalTermsAndConditionsVisible = false)"/>
     </modal>
   </n-form>
 </template>

From 441cf6e837c70d3b0c2d222107835ae8bb02dd91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Urban=20Kova=C4=8D?= <urban.kovac@kalmia.si>
Date: Fri, 16 Feb 2024 08:57:58 +0100
Subject: [PATCH 11/11] FE (import type fixes)

---
 frontend/components/parts/Statistics.vue  | 2 +-
 frontend/components/parts/form/Upload.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/components/parts/Statistics.vue b/frontend/components/parts/Statistics.vue
index a55ed1b..0ddfb05 100644
--- a/frontend/components/parts/Statistics.vue
+++ b/frontend/components/parts/Statistics.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script lang="ts" setup>
-import { PropType } from 'vue';
+import { type PropType } from 'vue';
 
 defineProps({
   statistics: { type: Object as PropType<StatisticsInterface>, default: null },
diff --git a/frontend/components/parts/form/Upload.vue b/frontend/components/parts/form/Upload.vue
index 7ebce44..5317092 100644
--- a/frontend/components/parts/form/Upload.vue
+++ b/frontend/components/parts/form/Upload.vue
@@ -43,8 +43,8 @@
 </template>
 
 <script lang="ts" setup>
-import { UploadCustomRequestOptions } from 'naive-ui';
-import { FileInfo } from 'naive-ui/es/upload/src/interface';
+import type { UploadCustomRequestOptions } from 'naive-ui';
+import type { FileInfo } from 'naive-ui/es/upload/src/interface';
 
 defineEmits(['close', 'proceed']);