merge

anyproto · Jan 31, 2025 · ab00175 · ab00175
2 parents bd9681e + c20b775
commit ab00175
Show file tree

Hide file tree

Showing 110 changed files with 1,177 additions and 547 deletions.
diff --git a/dist/challenge/index.html b/dist/challenge/index.html
@@ -21,7 +21,8 @@
 			body { font-family: 'Inter', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 22px; background-color: #fff; color: #252525; }
 
 			.content { display: flex; align-items: center; justify-content: center; flex-direction: column; padding: 16px; height: 100%; }
-			.title { font-size: 18px; line-height: 26px; letter-spacing: -0.28px; font-weight: 700; margin: 0px 0px 24px 0px; text-align: center; }
+			.title { font-size: 18px; line-height: 26px; letter-spacing: -0.28px; font-weight: 700; margin: 0px 0px 4px 0px; text-align: center; }
+			.description { font-size: 14px; line-height: 22px; letter-spacing: -0.28px; font-weight: 400; margin: 0px 0px 24px 0px; text-align: center; }
 
 			#challenge { display: flex; align-items: center; justify-content: center; flex-direction: row; gap: 0px 8px; }
 			#challenge .number { background-color: #f2f2f2; border-radius: 12px; font-weight: 700; font-size: 36px; line-height: 40px; padding: 12px; }
@@ -31,13 +32,15 @@
 	<body>
 		<div class="content">
 			<div id="title" class="title"></div>
+			<div id="description" class="description"></div>
 			<div id="challenge"></div>
 		</div>
 		<script type="text/javascript">
 			$(() => {
 				const win = $(window);
 				const html = $('html')
 				const title = $('#title');
+				const description = $('#description');
 				const challengeEl = $('#challenge');
 
 				window.Electron.on('challenge', (e, data) => {
@@ -57,6 +60,7 @@
 						contentType: 'application/json',
 						success: data => {
 							title.text(data.challengeTitle);
+							description.text(data.challengeDescription);
 						},
 					});
 				});

diff --git a/electron.js b/electron.js
@@ -10,14 +10,16 @@ const remote = require('@electron/remote/main');
 const { installNativeMessagingHost } = require('./electron/js/lib/installNativeMessagingHost.js');
 const binPath = fixPathForAsarUnpack(path.join(__dirname, 'dist', `anytypeHelper${is.windows ? '.exe' : ''}`));
 const Store = require('electron-store');
+const suffix = app.isPackaged ? '' : 'dev';
+const store = new Store({ name: [ 'localStorage', suffix ].join('-') });
 
 // Fix notifications app name
 if (is.windows) {
     app.setAppUserModelId(app.name);
 };
 
 storage.setDataPath(app.getPath('userData'));
-Store.initRenderer();
+//Store.initRenderer();
 
 const Api = require('./electron/js/api.js');
 const ConfigManager = require('./electron/js/config.js');
@@ -53,6 +55,16 @@ powerMonitor.on('resume', () => {
 	Util.log('info', '[PowerMonitor] resume');
 });
 
+ipcMain.on('storeGet', (e, key) => {
+	e.returnValue = store.get(key);
+});
+ipcMain.on('storeSet', (e, key, value) => {
+	e.returnValue = store.set(key, value);
+});
+ipcMain.on('storeDelete', (e, key) => {
+	e.returnValue = store.delete(key);
+});
+
 let deeplinkingUrl = '';
 let waitLibraryPromise = null;
 let mainWindow = null;

diff --git a/electron/js/api.js b/electron/js/api.js
@@ -217,6 +217,10 @@ class Api {
 		WindowManager.createChallenge(param);
 	};
 
+	hideChallenge (win, param) {
+		WindowManager.closeChallenge(param);
+	};
+
 	reload (win, route) {
 		win.route = route;
 		win.webContents.reload();

diff --git a/electron/js/menu.js b/electron/js/menu.js
@@ -261,6 +261,7 @@ class MenuManager {
 				{ label: Util.translate('electronMenuDebugReconcile'), click: () => Util.send(this.win, 'commandGlobal', 'debugReconcile') },
 				{ label: Util.translate('electronMenuDebugNet'), click: () => Util.send(this.win, 'commandGlobal', 'debugNet') },
 				{ label: Util.translate('electronMenuDebugLog'), click: () => Util.send(this.win, 'commandGlobal', 'debugLog') },
+				{ label: Util.translate('electronMenuDebugProfiler'), click: () => Util.send(this.win, 'commandGlobal', 'debugProfiler') },
 
 				Separator,
 

diff --git a/electron/js/preload.js b/electron/js/preload.js
@@ -5,9 +5,6 @@ const os = require('os');
 const path = require('path');
 const mime = require('mime-types');
 const tmpPath = () => app.getPath('temp');
-const Store = require('electron-store');
-const suffix = app.isPackaged ? '' : 'dev';
-const store = new Store({ name: [ 'localStorage', suffix ].join('-') });
 
 contextBridge.exposeInMainWorld('Electron', {
 	version: {
@@ -19,9 +16,9 @@ contextBridge.exposeInMainWorld('Electron', {
 	platform: os.platform(),
 	arch: process.arch,
 
-	storeSet: (key, value) => store.set(key, value),
-	storeGet: key => store.get(key),
-	storeDelete: key => store.delete(key),
+	storeGet: key => ipcRenderer.sendSync('storeGet', key),
+	storeSet: (key, value) => ipcRenderer.sendSync('storeSet', key, value),
+	storeDelete: key => ipcRenderer.sendSync('storeDelete', key),
 
 	isPackaged: app.isPackaged,
 	userPath: () => app.getPath('userData'),

diff --git a/electron/js/window.js b/electron/js/window.js
@@ -21,7 +21,6 @@ class WindowManager {
 	list = new Set();
 
 	create (options, param) {
-		const { route, isChild } = options;
 		const { hideMenuBar } = ConfigManager.config;
 
 		param = Object.assign({
@@ -45,8 +44,7 @@ class WindowManager {
 
 		remote.enable(win.webContents);
 
-		win.isChild = isChild;
-		win.route = route;
+		win = Object.assign(win, options);
 		win.windowId = win.id;
 
 		this.list.add(win);
@@ -144,33 +142,39 @@ class WindowManager {
 	createChallenge (options) {
 		const { screen } = require('electron');
 		const primaryDisplay = screen.getPrimaryDisplay();
-		const { width } = primaryDisplay.workAreaSize;
+		const { width, height } = primaryDisplay.workAreaSize;
 
-		const win = this.create({}, {
+		const win = this.create({ ...options, isChallenge: true }, {
 			backgroundColor: '',
 			width: 424, 
 			height: 232,
 			x: Math.floor(width / 2 - 212),
-			y: 50,
+			y: Math.floor(height - 282),
 			titleBarStyle: 'hidden',
+			alwaysOnTop: true,
+			focusable: true,
+			skipTaskbar: true,
 		});
 
-		win.loadURL('file://' + path.join(Util.appPath, 'dist', 'challenge', `index.html`));
+		win.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true });
+		win.loadURL('file://' + path.join(Util.appPath, 'dist', 'challenge', 'index.html'));
 		win.setMenu(null);
-
-		is.windows || is.linux ? win.showInactive() : win.show();
-		win.focus();
+		win.showInactive(); // show inactive to prevent focus loose from other app
 
 		win.webContents.once('did-finish-load', () => {
 			win.webContents.postMessage('challenge', options);
 		});
 
-		setTimeout(() => {
-			if (win && !win.isDestroyed()) {
+		setTimeout(() => this.closeChallenge(options), 30000);
+		return win;
+	};
+
+	closeChallenge (options) {
+		for (const win of this.list) {
+			if (win && win.isChallenge && (win.challenge == options.challenge) && !win.isDestroyed()) {
 				win.close();
 			};
-		}, 30000);
-		return win;
+		};
 	};
 
 	command (win, cmd, param) {

diff --git a/extension/popup/index.tsx b/extension/popup/index.tsx
@@ -66,6 +66,8 @@ const Index = observer(class Index extends React.Component<I.PageComponent, Stat
 	login () {
 		const appKey = Storage.get('appKey');
 
+		console.log('appKey', appKey);
+
 		if (appKey) {
 			Util.authorize(appKey, () => {
 				const { serverPort, gatewayPort } = S.Extension;

diff --git a/middleware.version b/middleware.version
@@ -1 +1 @@
-0.39.0-rc02
+0.39.2
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "anytype",
-	"version": "0.44.4-alpha",
+	"version": "0.44.15-beta",
 	"description": "Anytype",
 	"main": "electron.js",
 	"scripts": {
@@ -206,19 +206,7 @@
 			"node_modules/p-finally",
 			"node_modules/file-type",
 			"node_modules/regedit",
-			"node_modules/mime-types",
-			"node_modules/electron-store",
-			"node_modules/conf",
-			"node_modules/dot-prop",
-			"node_modules/is-obj",
-			"node_modules/pkg-up",
-			"node_modules/env-paths",
-			"node_modules/atomically",
-			"node_modules/fast-deep-equal",
-			"node_modules/fast-uri",
-			"node_modules/ajv-formats",
-			"node_modules/debounce-fn",
-			"node_modules/semver"
+			"node_modules/mime-types"
 		],
 		"extraResources": [
 			{

diff --git a/src/img/icon/info.svg b/src/img/icon/info.svg
diff --git a/src/img/icon/widget/button/arrow.svg b/src/img/icon/widget/button/arrow.svg
diff --git a/src/img/icon/widget/button/chat.svg b/src/img/icon/widget/button/chat.svg
diff --git a/src/json/text.json b/src/json/text.json
@@ -182,6 +182,8 @@
 	"commonPin": "Pin on top",
 	"commonUnpin": "Unpin",
 	"commonOpenType": "Open Type",
+	"commonManage": "Manage",
+	"commonSize": "Size",
 
 	"pluralDay": "day|days",
 	"pluralObject": "Object|Objects",
@@ -245,6 +247,7 @@
 	"electronMenuDebugReconcile": "Reconcile",
 	"electronMenuDebugNet": "Network",
 	"electronMenuDebugLog": "Export log",
+	"electronMenuDebugProfiler": "Export CPU trace",
 	"electronMenuClose": "Close Window",
 	"electronMenuEdit": "Edit",
 	"electronMenuUndo": "Undo",
@@ -781,7 +784,6 @@
 	"popupSettingsSpacesListSpace": "Space",
 	"popupSettingsSpacesCancelRequest": "Cancel request",
 	"popupSettingsSpacesListAccess": "Access",
-	"popupSettingsSpacesListSize": "Size",
 	"popupSettingsSpacesListNetwork": "Network",
 	"popupSettingsSpacesListDevice": "Device",
 
@@ -797,6 +799,9 @@
 	"popupSettingsDataManagementDeleteText": "Once you request your vault to be deleted, you have 30 days to cancel this request. After 30 days, your encrypted vault data is permanently removed from the backup node, you won't be able to sign into Anytype on new devices.",
 	"popupSettingsDataManagementDeleteButton": "Delete vault",
 
+	"popupSettingsDataManagementDataPublishTitle": "My Sites",
+	"popupSettingsDataManagementDataPublishDate": "Published date",
+
 	"popupSettingsSpaceIndexTitle": "Space Settings",
 	"popupSettingsSpaceIndexDescriptionPlaceholder": "Add a few words about the space...",
 	"popupSettingsSpaceIndexSpaceTypePersonalTooltipTitle": "End-to-end encryption (E2EE)",
@@ -902,7 +907,6 @@
 	"popupSettingsMembershipPerGenericMany": "per %s %s",
 	"popupSettingsMembershipLearnMore": "Learn more",
 	"popupSettingsMembershipCurrent": "Current",
-	"popupSettingsMembershipManage": "Manage",
 	"popupSettingsMembershipValidUntil": "Valid until %s",
 	"popupSettingsMembershipForeverFree": "Forever free",
 	"popupSettingsMembershipPending": "Pending...",
@@ -1623,8 +1627,15 @@
 	"menuSyncStatusEmpty": "There are no objects to show",
 
 	"menuPublishTitle": "Publish to web",
-	"menuPublishLabel": "Join Space Button",
-	"menuPublishButton": "Publish",
+	"menuPublishInfoTooltip": "Published object will be uploaded to our publishing server and will be accessible via the URL as a static, unencrypted HTML page. Linked objects will not be published.<br/>Currently, not all blocks are supported for publishing, such as sets, collections, and relations.",
+	"menuPublishLabelJoin": "Join Space Button",
+	"menuPublishButtonPublish": "Publish",
+	"menuPublishButtonUnpublish": "Unpublish",
+	"menuPublishButtonUpdate": "Update",
+	"menuPublishButtonView": "View in Browser",
+	"menuPublishButtonOpen": "Open Object",
+	"menuPublishButtonCopy": "Copy Web Link",
+	"menuPublishLabelOffline": "No internet connection",
 
 	"previewEdit": "Edit Link",
 
@@ -2135,6 +2146,8 @@
 	"errorSpaceMakeShareable103": "Oops! The request failed. Please check your Internet connection and try again.",
 	"errorSpaceMakeShareable104": "Limit reached for this space. Please upgrade your membership or contact support for assistance.",
 
+	"errorPublishingCreate103": "Looks like some files are over 100 MB. Please remove or slim them down and try again.",
+
 	"errorIncorrectEmail": "Incorrect E-mail",
 
 	"origin0": "Empty",
@@ -2146,6 +2159,7 @@
 	"origin6": "Use case",
 	"origin7": "Library installed",
 	"origin8": "Bookmark",
+	"origin9": "API",
 
 	"emojiCategoryPeople": "Smileys & People",
 	"emojiCategoryNature": "Animals & Nature",
@@ -2227,7 +2241,8 @@
 	"spaceStatus9": "Joining",
 	"spaceStatus10": "Removing",
 
-	"challengeTitle": "Please enter the following numbers in the extension",
+	"challengeTitle": "Grant Limited Access",
+	"challengeDescription": "This extension requires a 4-digit code for limited access to your account. Proceed only if you trust the extension.",
 	"webclipperEmptySelection": "Selection is empty",
 
 	"paymentMethod0": "None",

diff --git a/src/json/url.ts b/src/json/url.ts
@@ -23,8 +23,9 @@ export default {
 	invite:				 'https://invite.any.coop/%s#%s',
 	share: 				 'https://join.anytype.io/',
 	notionFAQ:			 'https://doc.anytype.io/anytype-docs/basics/space/import-export#notion-import-faq',
-	publishDomain:		 '%s.coop',
-	publish:			 'https://any.coop/%s/',
+	publishDomain:		 '%s.org',
+	publish:			 'any.coop/%s',
+	api:				 '127.0.0.1:31009',
 
 	survey: {
 		register:		 'https://community.anytype.io/survey0',
@@ -34,4 +35,4 @@ export default {
 		shared:			 'https://community.anytype.io/survey4',
 		multiplayer:	 'https://community.anytype.io/survey5'
 	}
-};
+};
diff --git a/src/scss/block/dataview/cell.scss b/src/scss/block/dataview/cell.scss
@@ -39,7 +39,7 @@
 
 .cellContent { cursor: default; }
 .cellContent {
-	.iconObject { margin-right: 8px; vertical-align: top; flex-shrink: 0; cursor: default; }
+	.iconObject { flex-shrink: 0; cursor: default; }
 	.icon.clear { display: none; }
 
 	.name { display: inline-block; vertical-align: top; user-select: text !important; }