コミット
d33e505f0f
ファイル差分が大きすぎるため省略します
差分を読み込み
ファイル差分が大きすぎるため省略します
差分を読み込み
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"/js/app.js": "/js/app.js",
|
||||
"/js/index.js": "/js/index.js",
|
||||
"/css/app.css": "/css/app.css"
|
||||
}
|
||||
|
|
|
@ -1,3 +1,25 @@
|
|||
require('./bootstrap');
|
||||
import ReactDOM from 'react-dom';
|
||||
import { BrowserRouter, useRoutes } from 'react-router-dom';
|
||||
import { CookiesProvider } from "react-cookie";
|
||||
import routes from './routes';
|
||||
|
||||
import ScrollToTop from './component/scroll_top';
|
||||
|
||||
|
||||
const KIKIAPP = () => {
|
||||
const routing = useRoutes(routes);
|
||||
return routing;
|
||||
};
|
||||
|
||||
|
||||
if(document.getElementById('root')){
|
||||
ReactDOM.render((
|
||||
<CookiesProvider>
|
||||
<BrowserRouter>
|
||||
<ScrollToTop />
|
||||
<KIKIAPP />
|
||||
</BrowserRouter>
|
||||
</CookiesProvider>
|
||||
), document.getElementById('root'));
|
||||
}
|
||||
|
||||
require('./index')
|
||||
|
|
|
@ -215,7 +215,7 @@ const ChildSignUp = () => {
|
|||
checked={check_terms}
|
||||
/>
|
||||
<span className='lbl padding-16'>
|
||||
<Link to="/terms" className='term-link' rel="noopener noreferrer">規約</Link>
|
||||
<Link to="/terms" target="_blank" className='term-link' rel="noopener noreferrer">規約</Link>
|
||||
に同意する
|
||||
</span>
|
||||
</label>
|
||||
|
|
|
@ -1,25 +1,3 @@
|
|||
import ReactDOM from 'react-dom';
|
||||
import { BrowserRouter, useRoutes } from 'react-router-dom';
|
||||
import { CookiesProvider } from "react-cookie";
|
||||
import routes from './routes';
|
||||
|
||||
import ScrollToTop from './component/scroll_top';
|
||||
|
||||
|
||||
const KIKIAPP = () => {
|
||||
const routing = useRoutes(routes);
|
||||
return routing;
|
||||
};
|
||||
|
||||
|
||||
if(document.getElementById('root')){
|
||||
ReactDOM.render((
|
||||
<CookiesProvider>
|
||||
<BrowserRouter>
|
||||
<ScrollToTop />
|
||||
<KIKIAPP />
|
||||
</BrowserRouter>
|
||||
</CookiesProvider>
|
||||
), document.getElementById('root'));
|
||||
}
|
||||
require('./bootstrap');
|
||||
|
||||
require('./app');
|
||||
|
|
|
@ -188,7 +188,7 @@ const ParentSignUp = () => {
|
|||
checked={check_terms}
|
||||
/>
|
||||
<span className='lbl padding-16'>
|
||||
<Link to="/terms" className='term-link' rel="noopener noreferrer">規約</Link>
|
||||
<Link to="/terms" className='term-link' target="_blank" rel="noopener noreferrer">規約</Link>
|
||||
に同意する
|
||||
</span>
|
||||
</label>
|
||||
|
|
|
@ -79,7 +79,7 @@ const ParentChildAdd = () => {
|
|||
switch(response.data.status_code){
|
||||
case 200: {
|
||||
if(type == "invite") setSuccess('招待用URLをコピーしました。');
|
||||
else if(type=='line') copyLineText();
|
||||
else if(type=='line') sendLineMsg();
|
||||
break;
|
||||
}
|
||||
case 400: set400Error(response.data.error_messages); break;
|
||||
|
@ -111,11 +111,11 @@ const ParentChildAdd = () => {
|
|||
}
|
||||
|
||||
|
||||
const copyLineText = () => {
|
||||
const sendLineMsg = () => {
|
||||
const inviteUrl = document.getElementById('inviteurl_html').value;
|
||||
const siteUrl = document.getElementById('siteurl').value;
|
||||
const lineText = `「KIKI」の招待が届いています。%0Aまずは以下より仮登録を行ってください。%0A%0A※スマホ本体を最新の状態にアップデートしてからURLをクリックしてください。%0A%0A${inviteUrl}%0A%0A▼公式サイトはこちら%0A${siteUrl}`;
|
||||
window.location.href = 'http://line.me/R/msg/text/?'+lineText;
|
||||
window.location.href = 'http://line.naver.jp/R/msg/text/?'+lineText;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -45,15 +45,11 @@
|
|||
</body>
|
||||
|
||||
|
||||
<script src="{{ asset('js/components/es5-shim.min.js') }}"></script>
|
||||
<script src="{{ asset('js/components/es5-sham.min.js') }}"></script>
|
||||
<script src="{{ asset('js/components/json3.min.js') }}"></script>
|
||||
<script src="{{ asset('js/components/es6-shim.min.js') }}"></script>
|
||||
<script src="{{ asset('js/components/es6-sham.min.js') }}"></script>
|
||||
<script src="{{ asset('js/components/html5shiv-printshiv.min.js') }}"></script>
|
||||
<script src="{{ asset('js/components/html5shiv.min.js') }}"></script>
|
||||
<script src="{{ asset('js/components/es6-promise.js') }}"></script>
|
||||
<script src="{{ asset('js/components/pdf-worker.js') }}"></script> <!-- v2.9.359 -->
|
||||
<script src="{{ asset('js/app.js') }}"></script>
|
||||
<script src="{{ asset('js/index.js') }}"></script>
|
||||
<!-- V1, 2022/1/15 -->
|
||||
</html>
|
||||
|
|
|
@ -11,6 +11,6 @@ const mix = require('laravel-mix');
|
|||
|
|
||||
*/
|
||||
|
||||
mix.js('resources/js/app.js', 'public/js')
|
||||
mix.js('resources/js/index.js', 'public/js')
|
||||
.react()
|
||||
.sass('resources/sass/app.scss', 'public/css');
|
||||
|
|
新しいイシューから参照