✨ added II support

letmejustputthishere · Jan 18, 2024 · 65f3532 · 65f3532
1 parent d8caacb
commit 65f3532
Show file tree

Hide file tree

Showing 10 changed files with 292 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,6 +30,7 @@ dist-ssr
 .dfx
 .vessel
 .mops
+deps
 
 # Environment variables
 /build

diff --git a/backend/main.mo b/backend/main.mo
@@ -1,5 +1,9 @@
 actor class Main() {
-	public func greet(name : Text) : async Text {
+	public query func greet(name : Text) : async Text {
 		return "Hello, " # name # "!";
 	};
+
+	public query ({ caller }) func whoAmI() : async Principal {
+		return caller;
+	};
 };
diff --git a/dfx.json b/dfx.json
@@ -7,7 +7,11 @@
 		"frontend": {
 			"dependencies": ["backend"],
 			"type": "assets",
-			"source": ["dist/"]
+			"source": ["build/"]
+		},
+		"internet_identity": {
+			"type": "pull",
+			"id": "rdmx6-jaaaa-aaaaa-aaadq-cai"
 		}
 	},
 	"defaults": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,14 +3,15 @@
 	"version": "0.0.1",
 	"private": true,
 	"scripts": {
-		"setup": "npm i && dfx generate backend && dfx deploy backend",
+		"setup": "npm i && npm run init-ii && dfx generate backend && dfx generate internet_identity && dfx deploy backend && dfx deps deploy",
+		"init-ii": "dfx deps pull && dfx deps init internet_identity --argument '(null)'",
 		"start": "run-p frontend backend",
 		"frontend": "vite --port 3000",
 		"backend": "mo-dev --generate --deploy -y",
 		"build": "vite build",
 		"test": "run-s test:backend test:frontend",
 		"test:frontend": "vitest run",
-		"test:backend": "mo-test",
+		"test:backend": "mops test",
 		"format": "prettier --write .",
 		"sources": "mops sources",
 		"postinstall": "mops install",
@@ -22,9 +23,11 @@
 	},
 	"devDependencies": {
 		"@dfinity/agent": "^0.20.2",
+		"@dfinity/auth-client": "^0.20.2",
 		"@dfinity/candid": "^0.20.2",
 		"@dfinity/principal": "^0.20.2",
 		"@sveltejs/adapter-auto": "^3.0.0",
+		"@sveltejs/adapter-static": "^3.0.1",
 		"@sveltejs/kit": "^2.0.0",
 		"@sveltejs/vite-plugin-svelte": "^3.0.0",
 		"@types/eslint": "8.56.0",

diff --git a/src/app.html b/src/app.html
@@ -4,7 +4,6 @@
 		<meta charset="utf-8" />
 		<link rel="icon" href="%sveltekit.assets%/favicon.ico" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
-		<link rel="stylesheet" href="/src/global.scss" />
 		%sveltekit.head%
 	</head>
 	<body data-sveltekit-preload-data="hover">

diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -0,0 +1,5 @@
+<script>
+	import '../global.scss';
+</script>
+
+<slot />
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
@@ -0,0 +1 @@
+export const prerender = true;
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ dist-ssr @@
     .dfx
     .vessel
     .mops
+    deps
     # Environment variables
     /build
@@ Expand Down @@