From a3f68d7a15260620837d6ce256d3029fda0d1b1b Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 22 Jun 2020 18:20:29 -0500 Subject: [PATCH] Move SessionLoginPage to react-rails --- app/javascript/components/SessionLoginPage.js | 11 +++++++++++ .../legacy_react/app/session_login_page.tsx | 14 -------------- app/javascript/packs/session_login_page.js | 3 --- app/views/devise/sessions/new.html.erb | 6 ++---- 4 files changed, 13 insertions(+), 21 deletions(-) create mode 100644 app/javascript/components/SessionLoginPage.js delete mode 100644 app/javascript/legacy_react/app/session_login_page.tsx delete mode 100644 app/javascript/packs/session_login_page.js diff --git a/app/javascript/components/SessionLoginPage.js b/app/javascript/components/SessionLoginPage.js new file mode 100644 index 00000000..9a8f0138 --- /dev/null +++ b/app/javascript/components/SessionLoginPage.js @@ -0,0 +1,11 @@ +import React from "react" +require('bootstrap-loader'); +import Root from "../legacy_react/src/components/common/Root" +import SessionLogPage from "../legacy_react/src/components/session_login_page/SessionLoginPage" + + +function SessionLoginPage(props:{}){ + return () +} + +export default SessionLoginPage diff --git a/app/javascript/legacy_react/app/session_login_page.tsx b/app/javascript/legacy_react/app/session_login_page.tsx deleted file mode 100644 index 0a0b8f63..00000000 --- a/app/javascript/legacy_react/app/session_login_page.tsx +++ /dev/null @@ -1,14 +0,0 @@ -// License: LGPL-3.0-or-later -// require a root component here. This will be treated as the root of a webpack package -import Root from "../src/components/common/Root" -import SessionLoginPage from "../src/components/session_login_page/SessionLoginPage" - -import * as ReactDOM from 'react-dom' -import * as React from 'react' - -function LoadReactPage(element:HTMLElement) { - ReactDOM.render(, element) -} - - -(window as any).LoadReactPage = LoadReactPage \ No newline at end of file diff --git a/app/javascript/packs/session_login_page.js b/app/javascript/packs/session_login_page.js deleted file mode 100644 index 7e7147b2..00000000 --- a/app/javascript/packs/session_login_page.js +++ /dev/null @@ -1,3 +0,0 @@ -// License: LGPL-3.0-or-later -require('bootstrap-loader'); -require('../legacy_react/app/session_login_page') \ No newline at end of file diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 35c557f6..e7f2dfc1 100755 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -2,12 +2,10 @@ # Full license explanation at https://github.com/houdiniproject/houdini/blob/master/LICENSE -%> <% content_for :title, t("login.header") %> <% content_for :javascripts do %> - <%= javascript_pack_tag 'i18n', 'session_login_page' %> + <%= javascript_pack_tag 'i18n', 'application' %> <% end %> <% content_for :stylesheets do %> <%= stylesheet_link_tag 'users/page' %> <% end %> -
- - +<%= react_component('SessionLoginPage', {}) %>