フロント画面が完成

Author: isystk

business/src/main/resources/application-common-local.yml

@@ -41,4 +41,4 @@ aws:
 
 stripe:
   apiKey: "pk_xxxxxx"
-  apiSecret: "pk_xxxxxx"
+  apiSecret: "sk_xxxxxx"

business/src/main/resources/application-common-product.yml

@@ -38,4 +38,4 @@ aws:
 
 stripe:
   apiKey: "pk_xxxxxx"
-  apiSecret: "pk_xxxxxx"
+  apiSecret: "sk_xxxxxx"

business/src/main/resources/application-common-staging.yml

@@ -38,4 +38,4 @@ aws:
 
 stripe:
   apiKey: "pk_xxxxxx"
-  apiSecret: "pk_xxxxxx"
+  apiSecret: "sk_xxxxxx"

web-admin/src/main/java/com/isystk/sample/web/admin/controller/html/contact/ContactListForm.java

@@ -2,9 +2,7 @@
 
 import com.isystk.sample.common.dto.Pageable;
 import com.isystk.sample.web.base.controller.html.BaseSearchForm;
-import java.math.BigInteger;
 import java.time.LocalDate;
-import javax.validation.constraints.Digits;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;

web-front/resources/src/pages/email/verify/index.tsx

@@ -4,6 +4,7 @@ import Box from '@/components/Box'
 import Layout from '@/components/Layout'
 import MainService from '@/services/main'
 import CSRFToken from '@/components/elements/CSRFToken'
+import { Form } from 'reactstrap'
 
 type Props = {
   appRoot: MainService
@@ -32,14 +33,14 @@ const Verify: FC<Props> = ({ appRoot }) => (
           こちら
         </a>{' '}
         から再度リクエストしてください。
-        <form
+        <Form
           id="email-form"
-          action="/email/resend"
+          action="/register/resend"
           method="POST"
           style={{ display: 'none' }}
         >
           <CSRFToken appRoot={appRoot} />
-        </form>
+        </Form>
       </Box>
     </main>
   </Layout>

web-front/resources/src/pages/index.tsx

@@ -5,6 +5,7 @@ import TopCarousel from '@/components/pages/shop/TopCarousel'
 import Layout from '@/components/Layout'
 import MainService from '@/services/main'
 import { useLocation, useNavigate } from 'react-router-dom'
+import { Form } from 'reactstrap'
 
 type Props = {
   appRoot: MainService
@@ -59,7 +60,7 @@ const Index: FC<Props> = ({ appRoot }) => {
           <p>{stock.name}</p>
           <p className="c-red">{stock.price}</p>
           <p className="mb20">{stock.detail} </p>
-          <form action="/shop/addcart" method="post">
+          <Form action="/shop/addcart" method="post">
             <input type="hidden" name="stock_id" value={stock.id} />
 
             {stock.quantity === 0 ? (
@@ -86,7 +87,7 @@ const Index: FC<Props> = ({ appRoot }) => {
                 }}
               />
             )}
-          </form>
+          </Form>
         </div>
       ))}
     </>

web-front/resources/src/pages/password/reset/[id].tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState, FC } from 'react'
-import { Form, Input } from 'reactstrap'
+import { Form } from 'reactstrap'
 import TextInput from '@/components/elements/TextInput'
 import SubmitButton from '@/components/elements/SubmitButton'
 import CSRFToken from '@/components/elements/CSRFToken'
@@ -30,10 +30,13 @@ const ResetForm: FC<Props> = ({ appRoot }) => {
       <main className="main">
         <Box title="パスワード変更" small={true}>
           <SessionAlert target="status" />
-          <Form method="POST" action="/password/reset/config" id="login-form">
+          <Form
+            method="POST"
+            action={`/password/reset/${onetimeKey}`}
+            id="login-form"
+          >
             <CSRFToken appRoot={appRoot} />
             <RequestToken />
-            <Input type="hidden" name="onetimeKey" defaultValue={onetimeKey} />
             <TextInput
               identity="password"
               controlType="password"

web-front/resources/src/router.tsx

@@ -55,6 +55,10 @@ const Router: FC<Props> = ({ session }) => {
         <Routes>
           <Route index element={<ShopTop appRoot={appRoot} />} />
           <Route path={Url.LOGIN} element={<LoginForm appRoot={appRoot} />} />
+          <Route
+            path="/auth/loginFailure"
+            element={<LoginForm appRoot={appRoot} />}
+          />
           <Route
             path={Url.REGISTER}
             element={<RegisterForm appRoot={appRoot} />}

web-front/src/main/java/com/isystk/sample/web/front/controller/api/v1/auth/AuthRestController.java renamed to web-front/src/main/java/com/isystk/sample/web/front/controller/api/v1/auth/AuthController.java

@@ -7,20 +7,17 @@
 import com.isystk.sample.web.base.controller.api.AbstractRestController;
 import com.isystk.sample.web.base.controller.api.resource.Resource;
 import com.isystk.sample.web.front.dto.auth.AuthUserDto;
-import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
 import java.util.Arrays;
 import java.util.Optional;
 
-import static com.isystk.sample.common.Const.*;
 import static com.isystk.sample.common.FrontUrl.*;
 
 @RestController
-public class AuthRestController extends AbstractRestController {
+public class AuthController extends AbstractRestController {
 
   @Override
   public String getFunctionName() {

web-front/src/main/java/com/isystk/sample/web/front/controller/api/v1/constant/ConstantRestController.java renamed to web-front/src/main/java/com/isystk/sample/web/front/controller/api/v1/constant/ConstantController.java

@@ -21,7 +21,7 @@
 
 @RestController
 @RequestMapping(path = API_V1_CONSTS, produces = MediaType.APPLICATION_JSON_VALUE)
-public class ConstantRestController extends AbstractRestController {
+public class ConstantController extends AbstractRestController {
 
   @Value("${stripe.apiKey}")
   String apiKey;