(
+ COOKIE_BANNER_KEY_STORAGE,
+ true,
+);
diff --git a/src/hooks/useCookieBanner/index.ts b/src/hooks/useCookieBanner/index.ts
new file mode 100644
index 00000000..8b88d546
--- /dev/null
+++ b/src/hooks/useCookieBanner/index.ts
@@ -0,0 +1 @@
+export * from './useCookiebanner';
diff --git a/src/hooks/useCookieBanner/useCookiebanner.ts b/src/hooks/useCookieBanner/useCookiebanner.ts
new file mode 100644
index 00000000..fdb1bfbd
--- /dev/null
+++ b/src/hooks/useCookieBanner/useCookiebanner.ts
@@ -0,0 +1,6 @@
+import { useAtom } from 'jotai';
+import { cookieBannerAtom } from './atom';
+
+export const useCookieBanner = () => {
+ return useAtom(cookieBannerAtom);
+};
diff --git a/src/hooks/useInitSentry.ts b/src/hooks/useInitSentry.ts
new file mode 100644
index 00000000..7ce72d74
--- /dev/null
+++ b/src/hooks/useInitSentry.ts
@@ -0,0 +1,63 @@
+import * as Sentry from '@sentry/react';
+import config from 'connect-config';
+import React, { useEffect } from 'react';
+import {
+ createRoutesFromChildren,
+ matchRoutes,
+ useLocation,
+ useNavigationType,
+} from 'react-router-dom';
+import { useAcceptedCookies } from './useAcceptedCookies';
+
+export function useInitSenty() {
+ const [acceptedCookies] = useAcceptedCookies();
+ const { analytics } = acceptedCookies;
+
+ useEffect(() => {
+ const client = Sentry.getClient();
+ if (!analytics) {
+ if (client) {
+ void client.close();
+ }
+ return;
+ }
+
+ if (client || !config.sentry.dsn || config.sentry.dsn === '') {
+ return;
+ }
+
+ const release = import.meta.env.SENTRY_RELEASE;
+
+ const integrations: Sentry.BrowserOptions['integrations'] = [
+ Sentry.extraErrorDataIntegration({ depth: 5 }),
+ Sentry.replayIntegration(),
+ Sentry.captureConsoleIntegration({ levels: ['error'] }),
+ ];
+ if (config.sentry.tracing) {
+ integrations.push(
+ Sentry.reactRouterV6BrowserTracingIntegration({
+ useEffect: React.useEffect,
+ useLocation,
+ useNavigationType,
+ createRoutesFromChildren,
+ matchRoutes,
+ }),
+ );
+ }
+
+ Sentry.init({
+ release,
+ dsn: config.sentry.dsn,
+ environment: config.sentry.env,
+ integrations,
+ ignoreErrors: [
+ 'User is not allowed to create files',
+ 'User is not allowed to move documents',
+ 'The user aborted a request.',
+ ],
+ tracesSampleRate: 1.0,
+ replaysSessionSampleRate: 0.1,
+ replaysOnErrorSampleRate: 1.0,
+ });
+ }, [analytics]);
+}
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index f844f582..51f9fc8d 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -76,6 +76,14 @@
"exportDocumentWithErrors": {
"title": "Your document contains errors",
"body": "Your document contains structure errors. Do you want to export it anyway?"
+ },
+ "disclaimer": {
+ "title": "Disclaimer",
+ "body": "All content provided herein our website, hyperlinked sites, associated applications, forums, blogs, social media accounts and other platforms (“Site”) is for your general information only, procured from third party sources. We make no warranties of any kind in relation to our content, including but not limited to accuracy and updatedness. No part of the content that we provide constitutes financial advice, legal advice or any other form of advice meant for your specific reliance for any purpose. Any use or reliance on our content is solely at your own risk and discretion. You should conduct your own research, review, analyse and verify our content before relying on them. Trading is a highly risky activity that can lead to major losses, please therefore consult your financial advisor before making any decision. No content on our Site is meant to be a solicitation or offer."
+ },
+ "cookiesPolicy": {
+ "title": "Cookies Policy",
+ "body": "Use of Cookies and Similar TechnologiesThe Site is using cookies. Cookies are small text files that are placed on your computer by websites that you visit. They are widely used in order to make websites work, or work more efficiently, as well as to provide information to the owners of the site. Cookies are typically stored on your computer´s hard drive.Information collected from cookies is used by us to evaluate the effectiveness of our Site and analyze trends. The information collected from cookies allows us to determine such things as which parts of the Site are most visited and difficulties our visitors may experience in accessing the SIte. With this knowledge, we can improve the quality of your experience on the Site by recognizing and delivering more of the most desired features and information, as well as by resolving access difficulties.
We use third party service providers, to assist us in better understanding the use of our Site. Our service providers will place cookies on the hard drive of your computer (or use similar technologies) and will receive information that we select that will educate us on such things as how visitors navigate around our Site. This information is aggregated to provide statistical data about our users browsing actions and patterns, and does not personally identify individuals. This information may include:
Computer or mobile device information, Website usage information, such as:
Page views,Button clicks,Input form changes (without the values being entered),Errors.Our service providers analyses this information and provides us with aggregate reports. The information and analysis provided by our service providers will be used to assist us in better understanding our visitors interests in our Site and how to better serve those interests. If you want to avoid using cookies altogether, you can disable cookies in your browser. However, disabling cookies might make it impossible for you to use certain features of the Site. Your use of the Site with a browser that is configure to accept cookies constitutes an acceptance of our and third-party cookies.
"
}
},
"notifications": {
@@ -87,5 +95,20 @@
"driveSyncError": "Error synchronizing drive {{drive}}",
"driveSyncConflict": "Conflict error detected in {{drive}}",
"reloadApp": "It seems like you're running an outdated version of the app. Please reload Connect to get the latest version."
+ },
+ "footer": {
+ "cookiePolicy": "Cookie Policy",
+ "termsOfUse": "Terms of Use",
+ "disclaimer": "Disclaimer",
+ "builtWith": "Built with Powerhouse"
+ },
+ "cookieBanner": {
+ "message": "This website uses cookies for analytic purposes only. Cookies are anonymous and do not link to user data. We collect information to improve the user experience and validate UI changes. You can still use the page without cookies. For more information, please read our cookies policy.",
+ "accept": "Accept configured cookies",
+ "reject": "Reject all cookies",
+ "cookies": {
+ "functional": "Functional cookies",
+ "analytics": "Analytics cookies"
+ }
}
}
diff --git a/src/pages/content.tsx b/src/pages/content.tsx
index 526246c9..ffdfb21b 100644
--- a/src/pages/content.tsx
+++ b/src/pages/content.tsx
@@ -5,6 +5,7 @@ import { useTranslation } from 'react-i18next';
import Button from 'src/components/button';
import { DocumentEditor } from 'src/components/editors';
import FolderView from 'src/components/folder-view';
+import { Footer } from 'src/components/footer';
import { useModal } from 'src/components/modal';
import { SearchBar } from 'src/components/search-bar';
import { useConnectConfig } from 'src/hooks/useConnectConfig';
@@ -149,7 +150,7 @@ const Content = () => {
return (
{fileNodeDocument ? (
@@ -206,6 +207,9 @@ const Content = () => {
)}
+
+
+
);
};
diff --git a/src/renderer.ts b/src/renderer.ts
index b504cefa..7e4dea5e 100644
--- a/src/renderer.ts
+++ b/src/renderer.ts
@@ -26,7 +26,6 @@
* ```
*/
import { createRoot } from 'react-dom/client';
-import './app/sentry';
import App from './components/app';
import './i18n';
import './index.css';
diff --git a/src/service-worker.ts b/src/service-worker.ts
index e199dfd6..0bed378f 100644
--- a/src/service-worker.ts
+++ b/src/service-worker.ts
@@ -1,15 +1,12 @@
///
-import {
- ServiceWorkerEvent,
- ServiceWorkerManagerMessage,
-} from './utils/registerServiceWorker';
+import { ServiceWorkerEvent } from './utils/registerServiceWorker';
const _self = self as unknown as ServiceWorkerGlobalScope;
-const VERSION_CHECK_INTERVAL =
- parseInt(import.meta.env.PH_CONNECT_VERSION_CHECK_INTERVAL as string) ||
- 5 * 60 * 1000; // 5 minutes;
+const APP_VERSION = __APP_VERSION__;
+const REQUIRES_HARD_REFRESH = __REQUIRES_HARD_REFRESH__;
+
const VERSION_CACHE = 'version-cache';
const VERSION_KEY = 'app-version';
@@ -19,6 +16,8 @@ _self.addEventListener('install', () => {
_self.addEventListener('activate', (event: ExtendableEvent) => {
event.waitUntil(_self.clients.claim());
+
+ checkAppVersion(APP_VERSION, REQUIRES_HARD_REFRESH).catch(console.error);
});
export type NEW_VERSION_AVAILABLE_MESSAGE = {
@@ -30,43 +29,12 @@ export type ServiceWorkerMessageData = NEW_VERSION_AVAILABLE_MESSAGE;
export type ServiceWorkerMessage = ServiceWorkerEvent;
-interface VersionResponse {
- version: string;
- requiresHardRefresh: boolean;
-}
-
function postMessage(client: Client, message: ServiceWorkerMessageData) {
return client.postMessage(message);
}
-_self.addEventListener('message', async event => {
- const message =
- 'type' in event.data ? (event as ServiceWorkerManagerMessage) : null;
- switch (message?.data.type) {
- case 'SET_APP_VERSION': {
- const cache = await caches.open(VERSION_CACHE);
- await cache.put(VERSION_KEY, new Response(message.data.version));
- break;
- }
- case 'NETWORK_STATUS': {
- message.data.online
- ? startCheckingForUpdates()
- : stopCheckingForUpdates();
- break;
- }
- default: {
- console.warn('Unhandled message:', message);
- break;
- }
- }
-});
-
-async function checkForUpdates(basePath: string) {
+async function checkAppVersion(version: string, requiresHardRefresh: boolean) {
try {
- const response = await fetch(new URL('./version.json', basePath), {
- cache: 'no-store',
- });
- const newVersion = (await response.json()) as VersionResponse;
const cache = await caches.open(VERSION_CACHE);
const cachedResponse = await cache.match(VERSION_KEY);
@@ -78,47 +46,30 @@ async function checkForUpdates(basePath: string) {
if (currentVersion === '') {
// Initial cache
- await cache.put(VERSION_KEY, new Response(newVersion.version));
- } else if (currentVersion !== newVersion.version) {
+ await cache.put(VERSION_KEY, new Response(version));
+ } else if (currentVersion !== version) {
// New version detected
console.log('Current version:', currentVersion);
- console.log('New version:', newVersion.version);
-
- const clients = await _self.clients.matchAll();
- clients.forEach(client => {
- postMessage(client, {
- type: 'NEW_VERSION_AVAILABLE',
- requiresHardRefresh: newVersion.requiresHardRefresh,
- });
- });
+ console.log('New version:', version);
// Update the stored version
- await cache.put(VERSION_KEY, new Response(newVersion.version));
+ await cache.put(VERSION_KEY, new Response(version));
+
+ // Update clients
+ await updateClients(requiresHardRefresh);
}
} catch (error) {
console.error('Error checking version:', error);
}
}
-let checkUpdatesInterval: number | undefined;
-function startCheckingForUpdates() {
- stopCheckingForUpdates();
- const basePath = _self.registration.scope;
-
- // does the initial check right away
- setTimeout(() => checkForUpdates(basePath), 0);
-
- // Check for updates every 5 minutes
- checkUpdatesInterval = setInterval(
- () => checkForUpdates(basePath),
- VERSION_CHECK_INTERVAL,
- ) as unknown as number;
-}
-
-function stopCheckingForUpdates() {
- if (checkUpdatesInterval) {
- clearInterval(checkUpdatesInterval);
- }
+async function updateClients(requiresHardRefresh: boolean) {
+ await _self.clients.claim();
+ const clients = await _self.clients.matchAll();
+ clients.forEach(client => {
+ postMessage(client, {
+ type: 'NEW_VERSION_AVAILABLE',
+ requiresHardRefresh,
+ });
+ });
}
-
-startCheckingForUpdates();
diff --git a/src/store/document-drive.ts b/src/store/document-drive.ts
index 9c5400a9..7acc862a 100644
--- a/src/store/document-drive.ts
+++ b/src/store/document-drive.ts
@@ -128,7 +128,9 @@ export function useFileNodeDocument(
} = props;
const [fileNodeDocument, setFileNodeDocument] =
useAtom(fileNodeDocumentAtom);
- const isReadMode = selectedDriveNode?.syncStatus === undefined;
+ const isReadMode =
+ selectedDriveNode?.sharingType !== 'LOCAL' &&
+ selectedDriveNode?.syncStatus === undefined;
const driveId = selectedNode?.driveId;
const documentId = selectedNode?.id;
const kind = selectedNode?.kind;
diff --git a/src/utils/registerServiceWorker.ts b/src/utils/registerServiceWorker.ts
index 1b7490a2..c32cea53 100644
--- a/src/utils/registerServiceWorker.ts
+++ b/src/utils/registerServiceWorker.ts
@@ -2,6 +2,10 @@
import connectConfig from 'connect-config';
import { ServiceWorkerMessage } from 'src/service-worker';
+const VERSION_CHECK_INTERVAL =
+ parseInt(import.meta.env.PH_CONNECT_VERSION_CHECK_INTERVAL as string) ||
+ 60 * 60 * 1000; // 1 hour;
+
const basePath = connectConfig.routerBasename;
const serviceWorkerScriptPath = [basePath, 'service-worker.js']
@@ -17,21 +21,6 @@ export interface ServiceWorkerEvent
data: T;
}
-export type SET_APP_VERSION = {
- type: 'SET_APP_VERSION';
- version: string;
-};
-
-export type NETWORK_STATUS = {
- type: 'NETWORK_STATUS';
- online: boolean;
-};
-
-export type ServiceWorkerManagerMessageData = SET_APP_VERSION | NETWORK_STATUS;
-
-export type ServiceWorkerManagerMessage =
- ServiceWorkerEvent;
-
class ServiceWorkerManager {
ready = false;
debug = false;
@@ -82,31 +71,6 @@ class ServiceWorkerManager {
this.registration = registration;
this.ready = true;
-
- window.addEventListener('online', () => {
- if (navigator.serviceWorker.controller) {
- this.sendMessage({
- type: 'NETWORK_STATUS',
- online: true,
- });
- }
- });
-
- window.addEventListener('offline', () => {
- if (navigator.serviceWorker.controller) {
- this.sendMessage({
- type: 'NETWORK_STATUS',
- online: false,
- });
- }
- });
-
- if (navigator.serviceWorker.controller) {
- this.sendMessage({
- type: 'SET_APP_VERSION',
- version: import.meta.env.APP_VERSION,
- });
- }
}
}
@@ -117,37 +81,45 @@ class ServiceWorkerManager {
console.warn('Service Worker not available');
return;
}
- window.addEventListener('load', () => {
- navigator.serviceWorker
- .register(
- import.meta.env.MODE === 'development'
- ? './src/service-worker.ts'
- : serviceWorkerScriptPath,
- )
- .then(this.#handleServiceWorker.bind(this))
- .catch(error => {
- console.error('ServiceWorker registration failed: ', error);
- });
- });
- }
+ window.addEventListener('load', async () => {
+ try {
+ // checks if there is a service worker installed already and calls
+ // its the update method to check if there is a new version available
+ const existingRegistration =
+ await navigator.serviceWorker.getRegistration();
+ if (existingRegistration) {
+ await existingRegistration.update();
+ this.#handleServiceWorker(existingRegistration);
+ }
+
+ // if no service worker is installed then registers the service worker
+ else {
+ const registration = await navigator.serviceWorker.register(
+ serviceWorkerScriptPath,
+ );
+ this.#handleServiceWorker(registration);
- sendMessage(message: ServiceWorkerManagerMessageData) {
- if (this.ready && this.registration) {
- const serviceWorker =
- this.registration.active ||
- this.registration.waiting ||
- this.registration.installing;
- if (serviceWorker) {
- if (this.debug) {
- console.log('Sending message to service worker: ', message);
+ registration.addEventListener('updatefound', () => {
+ this.#handleServiceWorker(registration);
+ });
}
- serviceWorker.postMessage(message);
- } else {
- console.error('No active service worker found.');
+
+ // calls the update on an interval to force
+ // the browser to check for a new version
+ const intervalId = setInterval(async () => {
+ const existingRegistration =
+ await navigator.serviceWorker.getRegistration();
+ if (existingRegistration) {
+ await existingRegistration.update();
+ } else {
+ clearInterval(intervalId);
+ this.registerServiceWorker();
+ }
+ }, VERSION_CHECK_INTERVAL);
+ } catch (error) {
+ console.error('ServiceWorker registration failed: ', error);
}
- } else {
- console.error('Service Worker is not ready yet.');
- }
+ });
}
}
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
index 0de38d88..aab06110 100644
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@@ -40,6 +40,7 @@ type ImportMetaEnv = {
PH_CONNECT_SENTRY_DSN: string
PH_CONNECT_SENTRY_PROJECT: string
PH_CONNECT_SENTRY_ENV: string
+ PH_CONNECT_SENTRY_TRACING_ENABLED: string
// @user-defined-start
/*
* You can use this section to explicitly extend the type definition of `import.meta.env`
@@ -64,3 +65,6 @@ interface ImportMeta {
glob: import('vite-envs/types/importGlob').ImportGlobFunction
}
+
+declare const __APP_VERSION__: string
+declare const __REQUIRES_HARD_REFRESH__: boolean
diff --git a/vite.renderer.config.mts b/vite.renderer.config.mts
index 1d7fe1bc..b6dd180e 100644
--- a/vite.renderer.config.mts
+++ b/vite.renderer.config.mts
@@ -1,16 +1,9 @@
import { sentryVitePlugin } from '@sentry/vite-plugin';
import react from '@vitejs/plugin-react';
-import fs from 'fs';
import jotaiDebugLabel from 'jotai/babel/plugin-debug-label';
import jotaiReactRefresh from 'jotai/babel/plugin-react-refresh';
import path from 'path';
-import {
- HtmlTagDescriptor,
- Plugin,
- PluginOption,
- defineConfig,
- loadEnv,
-} from 'vite';
+import { HtmlTagDescriptor, PluginOption, defineConfig, loadEnv } from 'vite';
import { viteEnvs } from 'vite-envs';
import { createHtmlPlugin } from 'vite-plugin-html';
import svgr from 'vite-plugin-svgr';
@@ -18,47 +11,6 @@ import pkg from './package.json';
import clientConfig from './client.config';
-// Plugin to generate version.json in both dev and prod
-const addToBundlePlugin = (
- file: { version: string; requiresHardRefresh?: boolean },
- basePath = '/',
-): Plugin => {
- const versionManifest = {
- version: file.version,
- requiresHardRefresh: file.requiresHardRefresh || false,
- };
-
- console.info(versionManifest);
-
- return {
- name: 'add-to-bundle',
-
- // Hook for development mode (serves the file dynamically)
- configureServer(server) {
- // Middleware to serve version.json in dev mode
- server.middlewares.use((req, res, next) => {
- if (req.url === path.join(basePath, './version.json')) {
- res.setHeader('Content-Type', 'application/json');
- res.end(JSON.stringify(versionManifest, null, 2));
- } else {
- next();
- }
- });
- },
-
- // Hook for production mode (writes the file to the dist folder)
- closeBundle() {
- const outputPath = path.join('dist', 'version.json');
-
- // Write the JSON file to the dist folder during production builds
- fs.writeFileSync(
- outputPath,
- JSON.stringify(versionManifest, null, 2),
- );
- },
- };
-};
-
export default defineConfig(({ mode }) => {
const isProd = mode === 'production';
const env = loadEnv(mode, process.cwd());
@@ -107,13 +59,6 @@ export default defineConfig(({ mode }) => {
],
},
}),
- addToBundlePlugin(
- {
- version: APP_VERSION,
- requiresHardRefresh: REQUIRES_HARD_REFRESH,
- },
- env.PH_CONNECT_ROUTER_BASENAME,
- ),
viteEnvs({
computedEnv() {
return {
@@ -175,5 +120,9 @@ export default defineConfig(({ mode }) => {
events: 'rollup-plugin-node-polyfills/polyfills/events',
},
},
+ define: {
+ __APP_VERSION__: JSON.stringify(APP_VERSION),
+ __REQUIRES_HARD_REFRESH__: JSON.stringify(REQUIRES_HARD_REFRESH),
+ },
};
});