update auth.js

cosmasken · Jun 1, 2024 · ef8c6c0 · ef8c6c0
1 parent 5f0e637
commit ef8c6c0
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 537 deletions.
diff --git a/canisters/ethlogin/Cargo.toml b/canisters/ethlogin/Cargo.toml
diff --git a/canisters/ethlogin/src/lib.rs b/canisters/ethlogin/src/lib.rs
diff --git a/canisters/siwe_ic/Cargo.toml b/canisters/siwe_ic/Cargo.toml
diff --git a/canisters/siwe_ic/siwe_ic.did b/canisters/siwe_ic/siwe_ic.did
diff --git a/canisters/siwe_ic/src/lib.rs b/canisters/siwe_ic/src/lib.rs
diff --git a/dfx.json b/dfx.json
@@ -7,7 +7,6 @@
       "dependencies": [
         "ckbtc_ledger"
 
-
       ],
       "declarations": {
         "node_compatibility": true
@@ -56,6 +55,8 @@
         }
       }
     }
+
+
   },
   "defaults": {
     "build": {

diff --git a/frontend/App.vue b/frontend/App.vue
@@ -1,15 +1,3 @@
-<<<<<<< HEAD
-<template class="font-lexend">
-
-  <main>
-
-    <div v-if="isReady">
-      <router-view v-if="isAuthenticated" />
-      <SignIn v-else />
-    </div>
-    <div v-else>
-      <div class="flex justify-center items-center h-screen">
-=======
 <script setup>
 import { ref, watchEffect } from "vue";
 import { useAuthStore } from "./store/auth";
@@ -108,7 +96,6 @@ const data = {
         aria-modal="true"
       >
         <!-- Off-canvas menu backdrop, show/hide based on off-canvas menu state. -->
->>>>>>> workingpoint
         <div
           enter-class="transition ease-out duration-300"
           enter-start-class="opacity-0"
@@ -1472,40 +1459,10 @@ const data = {
   </main>
 </template>
 
-<<<<<<< HEAD
-<script setup>
-import "@rainbow-me/rainbowkit/styles.css";
-import router from "./router"
-import SignIn from "./components/auth/SignIn.vue"
-import { storeToRefs } from "pinia"
-import { useAuthStore } from "./store/auth"
-import {Connect2ICProvider} from "@connect2ic/vue"
-import "@connect2ic/core/style.css"
-
-const authStore = useAuthStore()
-
-const { isReady, isAuthenticated, authType } = storeToRefs(authStore)
-if (isReady.value === false) {
-
-  if (authType.value === "internet-identity") {
-    console.log("internet-identity")
-    authStore.init()
-  } else if(authType.value === "connect2ic") {
-    console.log("connect2ic")
-    authStore.init()
-  } else {
-    console.log("siwe")
-    authStore.init()
-  }
- // authStore.init()
-} else {
-  router.push("/home/dashboard")
-=======
 <style scoped>
 .fade-enter-active,
 .fade-leave-active {
   transition: opacity 300ms ease-out;
->>>>>>> workingpoint
 }
 .fade-enter, .fade-leave-to /* .fade-leave-active below version 2.1.8 */ {
   opacity: 0;

diff --git a/frontend/components/auth/AuthDropDown.vue b/frontend/components/auth/AuthDropDown.vue