diff --git a/src/gui/src/UI/UIDesktop.js b/src/gui/src/UI/UIDesktop.js index 13c17dba0..1bdfad496 100644 --- a/src/gui/src/UI/UIDesktop.js +++ b/src/gui/src/UI/UIDesktop.js @@ -18,7 +18,7 @@ */ import path from '../lib/path.js'; -import UIWindowClaimReferral from './UIWindowClaimReferral.js'; + import UIContextMenu from './UIContextMenu.js'; import UIItem from './UIItem.js'; import UIAlert from './UIAlert.js'; @@ -29,7 +29,7 @@ import UIWindowMyWebsites from './UIWindowMyWebsites.js'; import UIWindowFeedback from './UIWindowFeedback.js'; import UIWindowLogin from './UIWindowLogin.js'; import UIWindowQR from './UIWindowQR.js'; -import UIWindowRefer from './UIWindowRefer.js'; + import UIWindowProgress from './UIWindowProgress.js'; import UITaskbar from './UITaskbar.js'; import new_context_menu_item from '../helpers/new_context_menu_item.js'; @@ -1244,11 +1244,6 @@ async function UIDesktop (options) { // 'Show Desktop' ht += ``; - // refer - if ( window.user.referral_code ) { - ht += `
`; - } - // github ht += ``; @@ -1458,21 +1453,6 @@ async function UIDesktop (options) { display_ct(); setInterval(display_ct, 1000); - // show referral notice window - if ( window.show_referral_notice && !window.user.email_confirmed ) { - puter.kv.get('shown_referral_notice').then(async (val) => { - if ( !val || val === 'false' || val === false ) { - setTimeout(() => { - UIWindowClaimReferral(); - }, 1000); - puter.kv.set({ - key: 'shown_referral_notice', - value: true, - }); - } - }); - } - window.hide_toolbar = (animate = true) => { // Always show toolbar on mobile and tablet devices if ( isMobile.phone || isMobile.tablet ) { @@ -2388,10 +2368,6 @@ $(document).on('click', '.user-options-create-account-btn', async function (e) { }); }); -$(document).on('click', '.refer-btn', async function (e) { - UIWindowRefer(); -}); - $(document).on('click', '.start-app', async function (e) { launch_app({ name: $(this).attr('data-app-name'), diff --git a/src/gui/src/UI/UIWindowClaimReferral.js b/src/gui/src/UI/UIWindowClaimReferral.js deleted file mode 100644 index 769bde9a1..000000000 --- a/src/gui/src/UI/UIWindowClaimReferral.js +++ /dev/null @@ -1,71 +0,0 @@ -/** - * Copyright (C) 2024-present Puter Technologies Inc. - * - * This file is part of Puter. - * - * Puter is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -import UIWindow from './UIWindow.js'; -import UIWindowSaveAccount from './UIWindowSaveAccount.js'; - -async function UIWindowClaimReferral (options) { - let h = ''; - - h += '
'; - h += '
×
'; - h += ``; - h += `

${i18n('you_have_been_referred_to_puter_by_a_friend')}

`; - h += `

${i18n('confirm_account_for_free_referral_storage_c2a')}

`; - h += ``; - h += '
'; - - const el_window = await UIWindow({ - title: 'Refer a friend!', - icon: null, - uid: null, - is_dir: false, - body_content: h, - has_head: false, - selectable_body: false, - draggable_body: true, - allow_context_menu: false, - is_draggable: true, - is_resizable: false, - is_droppable: false, - init_center: true, - allow_native_ctxmenu: true, - allow_user_select: true, - width: 400, - dominant: true, - window_css: { - height: 'initial', - }, - body_css: { - width: 'initial', - 'max-height': 'calc(100vh - 200px)', - 'background-color': 'rgb(241 246 251)', - 'backdrop-filter': 'blur(3px)', - 'padding': '10px 20px 20px 20px', - 'height': 'initial', - }, - }); - - $(el_window).find('.create-account-ref-btn').on('click', function (e) { - UIWindowSaveAccount(); - $(el_window).close(); - }); -} - -export default UIWindowClaimReferral; \ No newline at end of file diff --git a/src/gui/src/UI/UIWindowRefer.js b/src/gui/src/UI/UIWindowRefer.js deleted file mode 100644 index 8d052642a..000000000 --- a/src/gui/src/UI/UIWindowRefer.js +++ /dev/null @@ -1,118 +0,0 @@ -/** - * Copyright (C) 2024-present Puter Technologies Inc. - * - * This file is part of Puter. - * - * Puter is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -import UIWindow from './UIWindow.js'; -import UIPopover from './UIPopover.js'; -import socialLink from '../helpers/socialLink.js'; - -async function UIWindowRefer (options) { - let h = ''; - const url = `${window.gui_origin}/?r=${window.user.referral_code}`; - - h += '
'; - h += '
×
'; - h += ``; - h += `

${i18n('refer_friends_c2a')}

`; - h += ``; - h += ''; - h += ``; - h += ``; - h += '
'; - - const el_window = await UIWindow({ - title: i18n('window_title_refer_friend'), - window_class: 'window-refer-friend', - icon: null, - uid: null, - is_dir: false, - body_content: h, - has_head: false, - selectable_body: false, - draggable_body: true, - allow_context_menu: false, - is_draggable: true, - is_resizable: false, - is_droppable: false, - init_center: true, - allow_native_ctxmenu: true, - allow_user_select: true, - width: 500, - dominant: true, - window_css: { - height: 'initial', - }, - body_css: { - width: 'initial', - 'max-height': 'calc(100vh - 200px)', - 'background-color': 'rgb(241 246 251)', - 'backdrop-filter': 'blur(3px)', - 'padding': '10px 20px 20px 20px', - 'height': 'initial', - }, - }); - - $(el_window).find('.window-body .downloadable-link').val(url); - - $(el_window).find('.window-body .share-copy-link-on-social').on('click', function (e) { - const social_links = socialLink({ url: url, title: i18n('refer_friends_social_media_c2a'), description: i18n('refer_friends_social_media_c2a') }); - - let social_links_html = ''; - social_links_html += '
'; - social_links_html += `

${i18n('share_to')}

`; - social_links_html += ``; - social_links_html += ``; - social_links_html += ``; - social_links_html += ``; - social_links_html += ``; - social_links_html += ``; - social_links_html += '
'; - - UIPopover({ - content: social_links_html, - snapToElement: this, - parent_element: this, - // width: 300, - height: 100, - position: 'bottom', - }); - }); - - $(el_window).find('.window-body .copy-downloadable-link').on('click', async function (e) { - var copy_btn = this; - if ( navigator.clipboard ) { - // Get link text - const selected_text = $(el_window).find('.window-body .downloadable-link').val(); - // copy selected text to clipboard - await navigator.clipboard.writeText(selected_text); - } - else { - // Get the text field - $(el_window).find('.window-body .downloadable-link').select(); - // Copy the text inside the text field - document.execCommand('copy'); - } - - $(this).html(i18n('link_copied')); - setTimeout(function () { - $(copy_btn).html(i18n('copy_link')); - }, 1000); - }); -} - -export default UIWindowRefer; \ No newline at end of file diff --git a/src/gui/src/UI/UIWindowSignup.js b/src/gui/src/UI/UIWindowSignup.js index 7ca113424..1fef2b9b0 100644 --- a/src/gui/src/UI/UIWindowSignup.js +++ b/src/gui/src/UI/UIWindowSignup.js @@ -318,7 +318,6 @@ function UIWindowSignup (options) { // Include captcha in request only if required const requestData = { username: username, - referral_code: window.referral_code, email: email, password: password, referrer: options.referrer ?? window.referrerStr, diff --git a/src/gui/src/css/style.css b/src/gui/src/css/style.css index 4c55b55a1..d30337aff 100644 --- a/src/gui/src/css/style.css +++ b/src/gui/src/css/style.css @@ -5417,13 +5417,6 @@ html.dark-mode .usage-table-show-less:hover { max-width: calc(100% - 30px); } -.device-phone .window.window-refer-friend { - left: 50% !important; - transform: translate(-50%) !important; - height: initial !important; - max-width: calc(100% - 30px); -} - .device-phone .window.window-task-manager { height: initial !important; } @@ -5682,15 +5675,7 @@ html.dark-mode .usage-table-show-less:hover { visibility: hidden; } -.refer-friend-c2a { - text-align: center; - font-size: 16px; - padding: 20px; - font-weight: 400; - margin: -10px 10px 20px 10px; - -webkit-font-smoothing: antialiased; - color: #5f626d; -} + .progress-report{ font-size:15px; overflow: hidden; diff --git a/src/gui/src/initgui.js b/src/gui/src/initgui.js index dcbb89b53..4ae28f7b3 100644 --- a/src/gui/src/initgui.js +++ b/src/gui/src/initgui.js @@ -516,20 +516,6 @@ window.initgui = async function (options) { window.history.replaceState(null, document.title, cleanUrl); } - //-------------------------------------------------------------------------------------- - // Get user referral code from URL query params - // i.e. https://puter.com/?r=123456 - //-------------------------------------------------------------------------------------- - if ( window.url_query_params.has('r') ) { - window.referral_code = window.url_query_params.get('r'); - // remove 'r' from URL - window.history.pushState(null, document.title, '/'); - // show referral notice, this will be used later if Desktop is loaded - if ( window.first_visit_ever ) { - window.show_referral_notice = true; - } - } - //-------------------------------------------------------------------------------------- // Desktop background (early) // Set before action=login/signup so OIDC error redirects show the background behind the form. @@ -1161,7 +1147,6 @@ window.initgui = async function (options) { let spinner_init_ts = Date.now(); const requestData = { referrer: referrer, - referral_code: window.referral_code, is_temp: true, };