diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json index 8e3e124e23..c4038d96ce 100644 --- a/services/web/frontend/extracted-translations.json +++ b/services/web/frontend/extracted-translations.json @@ -1,9 +1,7 @@ { - "access_your_projects_with_git": "", "account_settings": "", "anyone_with_link_can_edit": "", "anyone_with_link_can_view": "", - "ask_proj_owner_to_upgrade_for_git_bridge": "", "ask_proj_owner_to_upgrade_for_longer_compiles": "", "auto_compile": "", "autocompile_disabled": "", @@ -24,13 +22,11 @@ "change_project_owner": "", "chat": "", "clear_cached_files": "", - "clone_with_git": "", "close": "", "clsi_maintenance": "", "clsi_unavailable": "", "code_check_failed": "", "code_check_failed_explanation": "", - "collaborate_online_and_offline": "", "collabs_per_proj": "", "collapse": "", "common": "", @@ -49,7 +45,6 @@ "creating": "", "delete": "", "deleting": "", - "demonstrating_git_integration": "", "dismiss": "", "dismiss_error_popup": "", "done": "", @@ -72,8 +67,6 @@ "full_doc_history": "", "full_screen": "", "generic_something_went_wrong": "", - "get_collaborative_benefits": "", - "git_bridge_modal_description": "", "give_feedback": "", "go_to_error_location": "", "headers": "", @@ -173,7 +166,6 @@ "start_free_trial": "", "stop_compile": "", "stop_on_validation_error": "", - "store_your_work": "", "sure_you_want_to_delete": "", "sync_to_dropbox": "", "sync_to_github": "", @@ -189,13 +181,11 @@ "too_many_requests": "", "too_recently_compiled": "", "total_words": "", - "try_it_for_free": "", "turn_off_link_sharing": "", "turn_on_link_sharing": "", "unlimited_projects": "", "upgrade_for_longer_compiles": "", "upload": "", - "use_your_own_machine": "", "validation_issue_description": "", "validation_issue_entry_description": "", "view_all_errors": "", diff --git a/services/web/frontend/js/shared/context/application-context.js b/services/web/frontend/js/shared/context/application-context.js index dd39ee6337..0993e3ca98 100644 --- a/services/web/frontend/js/shared/context/application-context.js +++ b/services/web/frontend/js/shared/context/application-context.js @@ -10,18 +10,15 @@ ApplicationContext.Provider.propTypes = { id: PropTypes.string.isRequired }), exposedSettings: PropTypes.shape({ - appName: PropTypes.string.isRequired, enableSubscriptions: PropTypes.bool - }), - gitBridgePublicBaseUrl: PropTypes.string.isRequired + }) }) } export function ApplicationProvider({ children }) { const applicationContextValue = { user: window.user, - exposedSettings: ExposedSettings, - gitBridgePublicBaseUrl: window.gitBridgePublicBaseUrl + exposedSettings: ExposedSettings } return ( diff --git a/services/web/frontend/stories/fixtures/context.js b/services/web/frontend/stories/fixtures/context.js index 442a59b89d..38a63b8d8c 100644 --- a/services/web/frontend/stories/fixtures/context.js +++ b/services/web/frontend/stories/fixtures/context.js @@ -24,6 +24,4 @@ export function setupContext() { removeListener: sinon.stub() } } - window.ExposedSettings = window.ExposedSettings || {} - window.ExposedSettings.gitBridgePublicBaseUrl = 'https://git.stories.com' } diff --git a/services/web/frontend/stories/git-bridge-modal.stories.js b/services/web/frontend/stories/git-bridge-modal.stories.js deleted file mode 100644 index 17780a86e5..0000000000 --- a/services/web/frontend/stories/git-bridge-modal.stories.js +++ /dev/null @@ -1,48 +0,0 @@ -import React from 'react' -import { ContextRoot } from '../js/shared/context/root-context' -import { setupContext } from './fixtures/context' -import importOverleafModules from '../macros/import-overleaf-module.macro' - -const [ - { - import: { default: GitBridgeModal } - } -] = importOverleafModules('gitBridge') - -setupContext() - -export const GitBridgeUrlModal = args => -GitBridgeUrlModal.args = { - type: 'show_url' -} - -export const CollaboratorModal = args => -CollaboratorModal.args = { - type: 'collaborator' -} - -export const TeaserModal = args => -TeaserModal.args = { - type: 'teaser' -} - -export default { - title: 'Modals / Git Bridge Modal', - component: GitBridgeModal, - args: { - show: true - }, - argTypes: { - handleHide: { action: 'handleHide' }, - startFreeTrial: { action: 'startFreeTrial' } - }, - decorators: [ - Story => ( - <> - - - - - ) - ] -} diff --git a/services/web/frontend/stylesheets/app/editor.less b/services/web/frontend/stylesheets/app/editor.less index 2434232948..bd01e4a71e 100644 --- a/services/web/frontend/stylesheets/app/editor.less +++ b/services/web/frontend/stylesheets/app/editor.less @@ -623,10 +623,6 @@ CodeMirror text-align: center; } -.teaser-refresh-label { - text-align: center; -} - .teaser-img, .dropbox-teaser-img { .img-responsive; diff --git a/services/web/locales/en.json b/services/web/locales/en.json index b5ecf37e5c..53f065999d 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -454,11 +454,6 @@ "tagline_student_monthly": "Great for a single term", "all_premium_features": "All premium features", "sync_dropbox_github": "Sync with Dropbox and GitHub", - "demonstrating_git_integration": "Demonstrating Git integration", - "collaborate_online_and_offline": "Collaborate online and offline, using your own workflow", - "get_collaborative_benefits": "Get the collaborative benefits from __appName__, even if you prefer to work offline", - "use_your_own_machine": "Use your own machine, with your own setup", - "store_your_work": "Store your work on your own infrastructure", "track_changes": "Track changes", "tooltip_hide_pdf": "Click to hide the PDF", "tooltip_show_pdf": "Click to show the PDF", diff --git a/services/web/test/frontend/helpers/render-with-context.js b/services/web/test/frontend/helpers/render-with-context.js index f0d9daa4a8..c89483d123 100644 --- a/services/web/test/frontend/helpers/render-with-context.js +++ b/services/web/test/frontend/helpers/render-with-context.js @@ -12,7 +12,6 @@ export function renderWithEditorContext( ) { window.user = user || window.user window.ExposedSettings.appName = 'test' - window.gitBridgePublicBaseUrl = 'git.overleaf.test' window.project_id = projectId != null ? projectId : window.project_id window._ide = { $scope: {