From 3ba2322de92b90be5292e5552d15f95e438e4738 Mon Sep 17 00:00:00 2001 From: Fachreza Ghifary Date: Wed, 23 Jun 2021 21:57:42 +0700 Subject: [PATCH 1/5] add 2 3 --- fish.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fish.js b/fish.js index 5260838..b9fec59 100644 --- a/fish.js +++ b/fish.js @@ -5,4 +5,6 @@ ("1") ("1") ("1") -("1") \ No newline at end of file +("1") +("2") +("3") \ No newline at end of file From d633b0fc1ab5079aa3208ac3844018338ae569bf Mon Sep 17 00:00:00 2001 From: Fachreza Ghifary Date: Wed, 23 Jun 2021 22:03:18 +0700 Subject: [PATCH 2/5] add 4 --- fish.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fish.js b/fish.js index b9fec59..28c6160 100644 --- a/fish.js +++ b/fish.js @@ -7,4 +7,5 @@ ("1") ("1") ("2") -("3") \ No newline at end of file +("3") +("4") \ No newline at end of file From 747038b74525f0c7bfa7787b881701dbb0f4c5f9 Mon Sep 17 00:00:00 2001 From: Fachreza Ghifary Date: Thu, 24 Jun 2021 14:05:33 +0700 Subject: [PATCH 3/5] mend --- form.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/form.js b/form.js index 1a0352e..8195335 100644 --- a/form.js +++ b/form.js @@ -1,5 +1,6 @@ import React, { useEffect, useState } from "react"; import Typography from "@material-ui/core/Typography"; +import { FormattedMessage } from "react-intl"; import Input from "@material-ui/core/Input"; import RadioGroup from "@material-ui/core/RadioGroup"; import FormControlLabel from "@material-ui/core/FormControlLabel"; @@ -45,7 +46,7 @@ const GroupRegistrationForm = ({ setDataForm, isFormValid, reset }) => { - Group Name (JP) +
@@ -62,7 +63,7 @@ const GroupRegistrationForm = ({ setDataForm, isFormValid, reset }) => { { !isFormValid && ( - *Required + ) } @@ -71,7 +72,7 @@ const GroupRegistrationForm = ({ setDataForm, isFormValid, reset }) => { - Group Name (EN) +
@@ -88,7 +89,7 @@ const GroupRegistrationForm = ({ setDataForm, isFormValid, reset }) => { - Memo +
@@ -107,7 +108,7 @@ const GroupRegistrationForm = ({ setDataForm, isFormValid, reset }) => {
- Group Type +
From 0088f42b5a833ddffd81cff7c324a518edc0316a Mon Sep 17 00:00:00 2001 From: Fachreza Ghifary Date: Thu, 24 Jun 2021 14:06:42 +0700 Subject: [PATCH 4/5] add japan --- en.js | 6 +++++ jp.js | 6 +++++ usergroupstyle.js | 68 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 en.js create mode 100644 jp.js create mode 100644 usergroupstyle.js diff --git a/en.js b/en.js new file mode 100644 index 0000000..9151ea4 --- /dev/null +++ b/en.js @@ -0,0 +1,6 @@ +"app.components.GroupRegistration.groupNameJP": "Group Name (JP)", +"app.components.GroupRegistration.groupNameEN": "Group Name (EN)", +"app.components.GroupRegistration.groupType": "Group Type", +"app.components.GroupRegistration.Memo": "Memo", +"app.components.GroupRegistration.Executive": "Executive", +"app.components.GroupRegistration.User": "User", \ No newline at end of file diff --git a/jp.js b/jp.js new file mode 100644 index 0000000..46fd6b8 --- /dev/null +++ b/jp.js @@ -0,0 +1,6 @@ +"app.components.GroupRegistration.groupNameJP": "グループ名(JP)", +"app.components.GroupRegistration.groupNameEN": "グループ名(EN)", +"app.components.GroupRegistration.groupType": "グループ種別", +"app.components.GroupRegistration.Memo": "メモ", +"app.components.GroupRegistration.Executive": "役員", +"app.components.GroupRegistration.User": "利用者", \ No newline at end of file diff --git a/usergroupstyle.js b/usergroupstyle.js new file mode 100644 index 0000000..0bd3c47 --- /dev/null +++ b/usergroupstyle.js @@ -0,0 +1,68 @@ +import { makeStyles } from "@material-ui/core"; + +export const useStyles = makeStyles((theme) => ({ + fieldNameJPContainer: { + fontSize: "14px", + marginTop: "16px", + height: "100%", + }, + fieldNameJPTitle: { + fontSize: "14px", + paddingLeft: "14px", + fontWeight: "bold" + }, + fieldNameJP: { + fontSize: "14px", + marginTop: "4px", + width: "100%", + borderRadius: "18px", + padding: "0 18px", + border: `0.5px solid ${theme.palette.olive.textColorThree}` + }, + fieldNameENContainer: { + marginTop: "16px", + }, + fieldNameENTitle: { + fontSize: "14px", + paddingLeft: "14px", + }, + fieldNameEN: { + fontSize: "14px", + marginTop: "4px", + width: "100%", + borderRadius: "18px", + padding: "0 18px", + border: `0.5px solid ${theme.palette.olive.textColorThree}` + }, + fieldMemoContainer: { + marginTop: "16px", + }, + fieldMemoTitle: { + fontSize: "14px", + paddingLeft: "14px", + }, + fieldMemo: { + fontSize: "14px", + marginTop: "4px", + width: "100%", + borderRadius: "18px", + padding: "10px 18px", + border: `0.5px solid ${theme.palette.olive.textColorThree}` + }, + fieldGroupTypeContainer: { + marginTop: "22px", + }, + fieldGroupTypeTitle: { + fontSize: "14px", + paddingLeft: "14px", + fontWeight: "bold" + }, + fieldError: { + border: `1px solid ${theme.palette.olive.red}`, + }, + errorText: { + fontSize: 12, + marginLeft: 20, + color: theme.palette.olive.red + }, +})); From b9de00b379031756fff8bc7c249e060363f97c36 Mon Sep 17 00:00:00 2001 From: Fachreza Ghifary Date: Thu, 24 Jun 2021 14:41:16 +0700 Subject: [PATCH 5/5] add lines --- cats.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cats.js b/cats.js index 5c84236..76df480 100644 --- a/cats.js +++ b/cats.js @@ -13,4 +13,6 @@ console.log("change 3"); console.log("fachreza");console.log("This is my app"); console.log("change 2"); console.log("change 3"); +console.log("fachreza"); +console.log("change 3"); console.log("fachreza"); \ No newline at end of file