Merge pull request #3 from beclab/bugfix/preview-first-load

fix: preview TerminusName slice bug and update preview document title
beclab · May 13, 2024 · f75c19e · f75c19e
2 parents e4fa0cd + a498462
commit f75c19e
Show file tree

Hide file tree

Showing 6 changed files with 9,671 additions and 9,687 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/editor/.gitignore b/packages/editor/.gitignore
@@ -5,6 +5,9 @@ node_modules
 # Quasar core related directories
 .quasar
 /dist
+.env
+./build.sh
+./releaseTest.sh
 
 # Cordova related directories and files
 /src-cordova/node_modules

diff --git a/packages/editor/package.json b/packages/editor/package.json
@@ -25,6 +25,7 @@
     "qrcode.vue": "^3.4.1",
     "quasar": "^2.6.0",
     "vue": "^3.0.0",
+		"dotenv": "^16.4.5",
     "vue-cropper": "^1.0.8",
     "vue-draggable-next": "^2.1.1",
     "vue-i18n": "^9.2.2",

diff --git a/packages/editor/quasar.config.js b/packages/editor/quasar.config.js
@@ -9,6 +9,10 @@
 // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js
 
 const { configure } = require('quasar/wrappers');
+const dotenv = require('dotenv');
+
+dotenv.config();
+console.log(process.env);
 
 module.exports = configure(function (/* ctx */) {
 	return {
@@ -65,10 +69,8 @@ module.exports = configure(function (/* ctx */) {
 			// analyze: true,
 			env: {
 				ACTION: process.env.ACTION,
-				NODE_RPC: 'https://sepolia.optimism.io',
-				CONTRACT_DID: '0x4c8c98e652d6a01494971a8faF5d3b68338f9ED4',
-				CONTRACT_ROOT_RESOLVER: '0xaA5bE49799b6A71Eda74d22D01F7A808aFf41b3f',
-				CONTRACT_REGISTRY: '0x9d100b3781cBB91746c13E876a3B520d22E0880F'
+				URL: process.env.URL,
+				WS_URL: process.env.WS_URL
 			}
 			// rawDefine: {}
 			// ignorePublicFolder: true,
@@ -86,12 +88,13 @@ module.exports = configure(function (/* ctx */) {
 
 		// Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#devServer
 		devServer: {
-			// https: true
+			https: true,
+			host: process.env.DEV_DOMAIN || 'localhost',
 			port: 9100,
 			proxy: {
 				// proxy all requests starting with /api to the backend server
 				'/api': {
-					target: 'http://localhost:3020',
+					target: `https://profile.${process.env.ACCOUNT}.myterminus.com`,
 					changeOrigin: true,
 					pathRewrite: {
 						'^/api': ''

diff --git a/packages/editor/src/App.vue b/packages/editor/src/App.vue
@@ -2,70 +2,45 @@
 	<router-view />
 </template>
 <script>
-//import { fetchData } from 'src/utils/helper';
-//import { User } from 'src/types/User';
 import { defineComponent, onMounted } from 'vue';
 import { useUserStore } from 'stores/user';
-//import { useProvide } from 'src/composables/useContext';
 import axios from 'axios';
 
 export default defineComponent({
 	name: 'App',
 	async preFetch() {
-		// if (process.env.ACTION === 'PREVIEW') {
-		//   const response = await fetchData('/api/user');
-		//   console.log(response);
-		//   const userStore = useUserStore();
-		//   try {
-		//     userStore.setUser(response.data as User);
-		//   } catch (e) {
-		//     console.log(e);
-		//   }
-		// }
 		const userStore = useUserStore();
 		if (process.env.ACTION === 'PREVIEW') {
 			return await axios
 				.get(window.location.origin + '/api/user/init')
 				.then((response) => {
 					console.log(response.data.data);
-
 					userStore.setUser(response.data.data.profile);
 					userStore.setInfo(response.data.data.info);
+
+					const profileName = userStore.user?.terminusName;
+					let title = '';
+					if (profileName) {
+						title = profileName;
+					} else {
+						title = userStore.info.terminusName;
+					}
+					document.title = title;
 				});
 		}
 	},
 	setup() {
-		//const { initUserData } = useProvide();
 		const userStore = useUserStore();
-
 		onMounted(async () => {
 			if (process.env.ACTION === 'EDITOR') {
 				axios
 					.get(window.location.origin + '/api/user/init')
 					.then((response) => {
 						userStore.setUser(response.data.data.profile);
 						userStore.setInfo(response.data.data.info);
-
-						const terminusName = response.data.data.info.terminusName;
-						const did = terminusName.slice(0, terminusName.indexOf('@'));
-						document.title = `${did} | Terminus HomePage`;
-
-						// initUserData(userStore.user);
 						userStore.getNftAddress();
 					});
 			}
-			// if (process.env.ACTION === 'EDITOR') {
-			//   const userStore = useUserStore();
-			//   try {
-			//     const response = await fetchData('/api/user');
-			//     console.log(response);
-			//     initUserData(response.data as User);
-			//     userStore.getNftAddress();
-			//   } catch (e) {
-			//     console.log(e);
-			//   }
-			// }
-			// axios.get('/api/backend/v1/terminus-info');
 		});
 	}
 });