Skip to content

Commit c87e45a

Browse files
i-nayui-nayu
committed
Done
フロントエンド残りのページとcss修正
1 parent 3e56578 commit c87e45a

15 files changed

Lines changed: 883 additions & 37 deletions

File tree

‎Backend/Workspace/Server.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ app.get(/.*/, (req, res) => {
4343
res.sendFile(path.join(__dirname, '..', 'Frontend', 'dist', 'index.html'));
4444
});
4545

46-
app.listen(PORT, '0.0.0.0', () => { console.log(`Server running at https://localhost:${PORT}`)} );
46+
app.listen(PORT, '0.0.0.0', () => { console.log(`Server running at http://localhost:${PORT}`)} );

‎Frontend/src/Pages/Create/Create.css‎

Lines changed: 40 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ body,
1010
#root {
1111
height: 100%;
1212
width: 100%;
13+
overflow-x: hidden;
1314
}
1415

1516
h1{
@@ -28,13 +29,15 @@ h2 {
2829
form {
2930
/*大きさ設定*/
3031
height: 100%;
32+
overflow-x: hidden;
3133
width: 100%;
3234
}
3335

3436
.CreateBackground {
3537
/*大きさ設定*/
3638
height: 100%;
3739
width: 100%;
40+
overflow-x: hidden;
3841

3942
/*背景設定*/
4043
background-color: #F3F4F8;
@@ -108,7 +111,7 @@ form {
108111
/*大きさ設定*/
109112
height: 90%;
110113
width: 100%;
111-
overflow-y: auto;
114+
overflow-x: hidden;
112115

113116
/*位置設定*/
114117
display: flex;
@@ -117,24 +120,27 @@ form {
117120
align-items: center;
118121

119122
/*余白設定*/
120-
padding: 2%;
123+
padding: 20px;
121124
gap: 2%;
122125
}
123126

124127
.CreateRegister {
125128
/*大きさ設定*/
126-
height: 85%;
127-
width: 90%;
129+
overflow-y: auto;
130+
overflow-x: hidden;
131+
min-height: 95%;
132+
overflow-y: auto;
128133

129134
/*位置設定*/
130135
display: flex;
131136
flex-direction: column;
132-
justify-content: flex-start;
137+
justify-content: center;
133138
align-items: center;
134139

135-
/*余白設定*/
136-
padding-bottom: 5%;
140+
/*余白設定*/
137141
gap: 5%;
142+
padding-bottom: 10px;
143+
padding-top: 10px;
138144

139145
/*背景設定*/
140146
background-color: white;
@@ -144,23 +150,25 @@ form {
144150

145151
.CreateInput {
146152
/*大きさ設定*/
147-
width: 80%;
148-
height: 40%;
153+
width: 100%;
154+
height: auto;
149155

150156
/*位置設定*/
151157
display: flex;
152158
flex-direction: row;
153-
justify-content: center;
159+
justify-content: center;
154160
align-items: center;
161+
flex-wrap: wrap;
155162

156163
/*余白設定*/
157-
gap: 5%;
164+
gap: 20px;
165+
padding-bottom: 10px;
158166
}
159167

160168
.CreateOneset {
161169
/*大きさ設定*/
162-
width: 50%;
163-
height: 100%;
170+
width: 40%;
171+
min-width: 250px;
164172

165173
/*位置設定*/
166174
display: flex;
@@ -172,21 +180,29 @@ form {
172180
/*文字設定*/
173181
font-size: 30px;
174182
font-weight: bold;
183+
color: #242B3C !important;
184+
185+
/*余白設定*/
186+
padding-bottom: 5px;
175187
}
176188

189+
190+
177191
.CreateImage {
178192
/*大きさ設定*/
179193
height: 100%;
194+
max-width: 25%;
180195
object-fit: contain;
181196
}
182197

183198
.CreateOneset input {
184199
/*大きさ設定*/
185200
width: 100%;
186-
max-height: 100px;
201+
min-height: 75px;
187202

188203
/*文字設定*/
189204
font-size: 40px;
205+
color: #242B3C !important;
190206
}
191207

192208
.CreateFile{
@@ -215,18 +231,27 @@ form {
215231

216232
/*背景設定*/
217233
background-color: #FBFBFD;
234+
235+
/*文字設定*/
236+
color: #242B3C !important;
218237
}
219238

220239
.CreateRegister button {
221240
/*大きさ設定*/
222241
width: 40%;
223242
height: 20%;
224243

244+
/*位置設定*/
245+
display: flex;
246+
justify-content: center;
247+
align-items: center;
248+
225249
/*文字設定*/
226250
font-size: 40px;
227251
}
228252

229253
.CreateError {
230254
/*文字設定*/
231255
color: red;
232-
}
256+
}
257+

‎Frontend/src/Pages/Create/Create.tsx‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { useNavigate } from "react-router-dom";
44
import { useState } from "react";
55
import InputField from "../../Components/InputField/InputField";
66
import ConfirmButton from "../../Components/ConfirmButton/ConfirmButton";
7-
import icon from "../../Components/Elements/icon.png";
87
import image from "../../Components/Elements/image.png";
98

109
function Create() {
@@ -52,8 +51,7 @@ function Create() {
5251
<div className="CreateBackground">
5352
<div className="CreateTab">
5453
<div className="CreateLeft">
55-
<img src={icon} className="CreateIcon" alt="ロゴ" />
56-
<button type="button" onClick={() => { navigate("/"); }} className="CreateButton">
54+
<button type="button" onClick={() => { navigate("/Home"); }} className="CreateButton">
5755
<h1>ルーム作成</h1>
5856
</button>
5957
</div>
@@ -128,9 +126,9 @@ function Create() {
128126
</div>
129127
<ConfirmButton label="作成" onClick={() => {
130128
if (!RoomName || !TokenName || !RoomIcon || !TokenIcon) {
131-
if (!RoomName || !TokenName) setTextError("必要事項を入力してください");
132-
if (!RoomIcon) setRoomIconError("画像を選択してください");
133-
if (!TokenIcon) setTokenIconError("画像を選択してください");
129+
if (!RoomName || !TokenName) setTextError("入力が必要です");
130+
if (!RoomIcon) setRoomIconError("画像が必要です");
131+
if (!TokenIcon) setTokenIconError("画像が必要です");
134132
return;
135133
} else {
136134
HandleCreate();

‎Frontend/src/Pages/Home/Home.css‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ h2 {
101101
height: 100%;
102102
width: 100%;
103103
overflow-y: auto;
104+
overflow-x: hidden;
104105

105106
/*位置設定*/
106107
display: flex;
@@ -114,7 +115,7 @@ h2 {
114115

115116
.HomeJoin {
116117
/*大きさ設定*/
117-
min-height: 10%;
118+
min-height: 80px;
118119
min-width: 400px;
119120
max-width: 100%;
120121

@@ -127,6 +128,7 @@ h2 {
127128

128129
/*余白設定*/
129130
padding: 1%;
131+
padding-right: 5px;
130132
gap: 2%;
131133

132134
}
@@ -135,6 +137,9 @@ h2 {
135137
/*位置設定*/
136138
display: flex;
137139
flex-direction: column;
140+
141+
/*大きさ設定*/
142+
max-width: 70%;
138143
}
139144

140145
.HomeField input {
@@ -156,6 +161,8 @@ h2 {
156161

157162
/*余白設定*/
158163
gap: 5%;
164+
padding-left: 10px;
165+
padding-right: 10px;
159166

160167
}
161168

‎Frontend/src/Pages/Login/Login.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,14 @@ form {
106106
/*大きさ設定*/
107107
height: 85%;
108108
width: 80%;
109+
overflow-y: auto;
109110

110111
/*位置設定*/
111112
display: flex;
112113
flex-direction: column;
113114
justify-content: flex-start;
114115
align-items: center;
116+
115117

116118
/*余白設定*/
117119
padding-bottom: 5%;
@@ -139,6 +141,7 @@ form {
139141
/*大きさ設定*/
140142
width: 100%;
141143
height: 45%;
144+
min-height: 180px;
142145

143146
/*余白設定*/
144147
padding: 5%;

‎Frontend/src/Pages/Login/Login.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ function Login() {
7373
<ConfirmButton label="送信"
7474
onClick={() => {
7575
if (userId === "" || password === "") {
76-
setError("必要事項を入力してください");
76+
setError("入力が必要です");
7777
} else {
7878
HandleLogin();
7979
}

0 commit comments

Comments
 (0)