Skip to content

Commit d676a0e

Browse files
Ramiro RichmandRamiro Richmand
Ramiro Richmand
authored and
Ramiro Richmand
committed
Merge branch 'main' of github.com:thinesan29/BTNA_Capstone_Project
2 parents f044b1a + 4e50b58 commit d676a0e

File tree

3 files changed

+89
-148
lines changed

3 files changed

+89
-148
lines changed

‎client/src/App.css

+80-143
Original file line numberDiff line numberDiff line change
@@ -28,166 +28,103 @@ a:hover{
2828

2929
/* Login Page CSS starts here - fix later Monday evening */
3030

31-
.login-container {
32-
display: flex;
33-
flex-direction: column;
34-
justify-content: center;
35-
align-items: center;
36-
margin: 2rem auto;
37-
padding: 2rem;
38-
border: 2px solid #eee;
39-
border-radius: 1rem;
40-
background-color: #fff;
41-
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.2);
42-
width: 80%;
43-
max-width: 600px;
44-
}
45-
46-
.login-box {
47-
display: flex;
48-
flex-direction: column;
49-
align-items: center;
50-
justify-content: center;
51-
background-color: #444;
52-
padding: 2rem;
53-
border-radius: 5px;
54-
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
55-
}
56-
57-
h2 {
58-
font-size: 3rem;
59-
margin-bottom: 2rem;
60-
color: #fff;
61-
}
62-
63-
form {
64-
display: flex;
65-
flex-direction: column;
66-
align-items: center;
67-
}
68-
69-
label {
70-
display: flex;
71-
flex-direction: column;
72-
align-items: center;
73-
margin: 1rem 0;
74-
color: #fff;
75-
}
76-
77-
input[type="login-text"],
78-
input[type="login-password"] {
79-
border: none;
80-
border-bottom: 2px solid transparent;
81-
font-size: 1.5rem;
82-
padding: 0.5rem;
83-
background-color: transparent;
84-
color: #eee;
85-
transition: border-color 0.3s ease, box-shadow 0.3s ease;
86-
}
87-
88-
input[type="login-text"]:focus,
89-
input[type="login-password"]:focus {
90-
border-color: #ffd700;
91-
box-shadow: 0 0 10px 2px #ffd700;
92-
}
93-
94-
input[type="login-text"]:focus {
95-
box-shadow: 0 0 10px 2px gold;
96-
}
97-
98-
input[type="login-password"]:focus {
99-
box-shadow: 0 0 10px 2px navy;
100-
}
101-
102-
input[type="login-text"]:not(:placeholder-shown),
103-
input[type="login-password"]:not(:placeholder-shown) {
104-
color: #eee;
105-
}
106-
107-
input[type="login-text"]:not(:placeholder-shown) {
108-
box-shadow: 0 0 10px 2px gold;
109-
}
110-
111-
input[type="login-password"]:not(:placeholder-shown) {
112-
box-shadow: 0 0 10px 2px navy;
113-
}
114-
115-
input[type="login-submit"] {
116-
background-color: gold;
117-
border: none;
118-
padding: 0.5rem 2rem;
119-
border-radius: 5px;
120-
font-size: 1.5rem;
121-
color: #fff;
122-
margin-top: 2rem;
123-
cursor: pointer;
124-
transition: color 0.3s ease, box-shadow 0.3s ease;
125-
}
126-
127-
input[type="login-submit"]:hover {
128-
color: navy;
129-
box-shadow: 0 0 10px 2px navy;
130-
background-color: gold;
131-
transition: color 0.3s ease, box-shadow 0.3s ease, background-color 0.3s ease;
132-
}
133-
134-
input[type="login-submit"]:hover::before {
135-
content: "";
136-
display: block;
137-
position: absolute;
138-
width: 100%;
139-
height: 100%;
140-
top: 0;
141-
left: 0;
142-
background-image: linear-gradient(
143-
to right,
144-
rgba(255, 255, 255, 0.5),
145-
rgba(255, 255, 255, 0.8),
146-
rgba(255, 255, 255, 0.5)
147-
);
148-
opacity: 0.5;
149-
z-index: -1;
150-
animation: shimmer 1s ease-out infinite;
31+
.login-container {
32+
display: flex;
33+
flex-direction: column;
34+
justify-content: center;
35+
align-items: center;
36+
margin: 2rem auto;
37+
padding: 2rem;
38+
border: 2px solid #eee;
39+
border-radius: 1rem;
40+
background-color: #fff;
41+
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.2);
42+
width: 80%;
43+
max-width: 600px;
15144
}
15245

153-
.login-box input[type="login-text"] {
154-
background-color: #ddd;
155-
color: gold;
46+
.login-container h2 {
47+
font-size: 2rem;
48+
color: navy;
49+
margin-bottom: 1rem;
15650
}
15751

158-
.login-box input[type="login-password"] {
159-
background-color: #ddd;
160-
color: navy;
52+
.login-element {
53+
display: flex;
54+
flex-direction: column;
55+
margin-bottom: 1rem;
56+
width: 100%;
16157
}
16258

163-
.login-box input[type="login-text"]:focus {
164-
background-color: #eee;
59+
.login-element label {
60+
font-size: 1.5rem;
61+
color: navy;
62+
margin-bottom: 0.5rem;
16563
}
16664

167-
.login-box input[type="login-password"]:focus {
168-
background-color: #eee;
65+
.login-element input {
66+
padding: 1rem;
67+
border: none;
68+
border-radius: 0.5rem;
69+
font-size: 1.5rem;
70+
margin-bottom: 1rem;
71+
color: #333;
72+
background-color: #eee;
73+
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.2);
74+
transition: all 0.3s ease-in-out;
75+
width: 100%;
16976
}
17077

171-
.login-box input[type="login-text"]:not(:placeholder-shown),
172-
.login-box input[type="login-password"]:not(:placeholder-shown) {
173-
color: #eee;
78+
.login-element input:focus {
79+
outline: none;
80+
border: 2px solid #f8d43b;
81+
box-shadow: 0 0 10px #f8d43b;
17482
}
17583

176-
.login-box input[type="login-text"]:not(:placeholder-shown) {
177-
box-shadow: 0 0 10px 2px gold;
84+
.login-element input:focus::before {
85+
content: "";
86+
position: absolute;
87+
top: -5px;
88+
left: -5px;
89+
right: -5px;
90+
bottom: -5px;
91+
border-radius: 0.5rem;
92+
background: linear-gradient(
93+
90deg,
94+
#f8d43b,
95+
#f8d43b 50%,
96+
transparent 50%
97+
);
98+
background-size: 400%;
99+
z-index: -1;
100+
animation: animate 1.5s linear infinite;
178101
}
179102

180-
.login-box input[type="login-password"]:not(:placeholder-shown) {
181-
box-shadow: 0 0 10px 2px navy;
103+
input[type="login-submit"] {
104+
background-color: navy;
105+
color: #fff;
106+
font-size: 1.5rem;
107+
padding: 0.5rem 1rem;
108+
border: none;
109+
border-radius: 0.5rem;
110+
cursor: pointer;
111+
transition: all 0.3s ease-in-out;
112+
width: 50%;
113+
margin: 0 auto;
114+
display: block;
115+
text-align: center;
182116
}
183117

184-
@keyframes shimmer {
185-
0% {
186-
background-position: left;
187-
}
188-
100% {
189-
background-position: right;
118+
input[type="login-submit"]:hover {
119+
background-color: #f8d43b;
120+
color: navy;
121+
transform: translateY(-2px);
122+
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.2);
190123
}
124+
125+
input[type="login-submit"]:active {
126+
transform: translateY(0);
127+
box-shadow: none;
191128
}
192129

193130
/* Login Page CSS ends here */

‎client/src/Components/LoginForm.js

+4
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,18 @@ const LoginForm = () => {
1616
<div className="login-container">
1717
<h2>Login</h2>
1818
<form onSubmit={handleSubmit}>
19+
<div className="login-element">
1920
<label>
2021
User:
2122
<input type="login-text" value={user} onChange={(e) => setUser(e.target.value)} />
2223
</label>
24+
</div>
25+
<div className="login-element">
2326
<label>
2427
Password:
2528
<input type="login-password" value={password} onChange={(e) => setPassword(e.target.value)} />
2629
</label>
30+
</div>
2731
<input type="login-submit" value="Login" />
2832
</form>
2933
</div>

‎server/src/main/java/com/bnta/capstone_backEndAPI/Components/DataLoader.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void run(ApplicationArguments args) throws Exception {
3636
Movie movie1 = new Movie("John Wick 4", 169, LanguageEnum.ENGLISH, GenreEnum.ACTION, "Incredible performances, stunning cinematography.", 3, "https://www.youtube.com/embed/yjRHZEUamCc");
3737
Movie movie2 = new Movie("Avatar The Way of Water", 192, LanguageEnum.ENGLISH, GenreEnum.ACTION, "Page-turner, couldn't put it down.", 4, "https://www.youtube.com/embed/d9MyW72ELq0");
3838
Movie movie3 = new Movie("Fast and Furious 5", 130, LanguageEnum.ENGLISH, GenreEnum.ACTION, "Thought-provoking and emotionally resonant.", 4,"https://www.youtube.com/embed/OqjeOYeG5_A");
39-
Movie movie4 = new Movie("The Dark Knight", 152, LanguageEnum.ENGLISH, GenreEnum.ACTION, "Engaging and thoroughly entertaining throughout.", 5,"https://www.youtube.com/embed/PZpmTj1Q8Q");
39+
Movie movie4 = new Movie("The Dark Knight", 152, LanguageEnum.ENGLISH, GenreEnum.ACTION, "Engaging and thoroughly entertaining throughout.", 5,"https://www.youtube.com/embed/TQfATDZY5Y4");
4040
Movie movie5 = new Movie("Top Gun Maverick", 131, LanguageEnum.ENGLISH, GenreEnum.ACTION, "Masterful storytelling, beautifully crafted.", 3,"https://www.youtube.com/embed/giXco2jaZ_4");
4141

4242
Cast cast1 = new Cast("Keanu Reeves", 58, "Keanu Reeves, a versatile actor born in Beirut in 1964, gained fame for roles in The Matrix, John Wick, and Bill & Ted. Known for his humility and philanthropy, he captivates fans worldwide.");
@@ -122,7 +122,7 @@ public void run(ApplicationArguments args) throws Exception {
122122
// HORROR
123123

124124
Movie movie16 = new Movie("Scream", 111, LanguageEnum.ENGLISH.SPANISH.KOREAN, GenreEnum.HORROR, "Excellent, classic, well-cast", 5,"https://www.youtube.com/embed/beToTslH17s");
125-
Movie movie17 = new Movie("The Conjuring", 112, LanguageEnum.ENGLISH.SPANISH.FRENCH.HINDI, GenreEnum.HORROR, "Terrifying, gripping, suspenseful", 5,"https://www.youtube.com/embed/k10ETZ41q5o");
125+
Movie movie17 = new Movie("The Conjuring", 112, LanguageEnum.ENGLISH.SPANISH.FRENCH.HINDI, GenreEnum.HORROR, "Terrifying, gripping", 5,"https://www.youtube.com/embed/k10ETZ41q5o");
126126
Movie movie18 = new Movie("Winnie The Pooh Blood & Honey", 111, LanguageEnum.ENGLISH, GenreEnum.HORROR, "Awful.", 1,"https://www.youtube.com/embed/W3E74j_xFtg");
127127
Movie movie19 = new Movie("The Orphanage", 97, LanguageEnum.SPANISH.ENGLISH, GenreEnum.HORROR, "Spine-Chilling", 5,"https://www.youtube.com/embed/UkuKtS-N1rM");
128128
Movie movie20 = new Movie("Bird Box", 124, LanguageEnum.ENGLISH.FRENCH.SPANISH.KOREAN, GenreEnum.HORROR, "Gripping, intense, touching.", 3,"https://www.youtube.com/embed/o2AsIXSh2xo");
@@ -153,7 +153,7 @@ public void run(ApplicationArguments args) throws Exception {
153153
// DOCUMENTARIES -
154154
Movie movie21 = new Movie("The Last Dance", 500,LanguageEnum.ENGLISH,GenreEnum.DOCUMENTARIES,"Feel-Good",5,"https://www.youtube.com/embed/JQk2hJs2ToA");
155155
Movie movie22 = new Movie("Tiger King", 350,LanguageEnum.ENGLISH,GenreEnum.DOCUMENTARIES,"Provocative, Investigative",3,"https://www.youtube.com/embed/acTdxsoa428");
156-
Movie movie23 = new Movie("I AM BOLT", 117,LanguageEnum.ENGLISH,GenreEnum.DOCUMENTARIES,"Inpsiring, Feel-Good, Exciting",3,"https://www.youtube.com/embed/XVje1n8K240");
156+
Movie movie23 = new Movie("I AM BOLT", 117,LanguageEnum.ENGLISH,GenreEnum.DOCUMENTARIES,"Feel-Good, Exciting",3,"https://www.youtube.com/embed/XVje1n8K240");
157157
Movie movie24 = new Movie("Harry & Meghan", 360,LanguageEnum.ENGLISH,GenreEnum.DOCUMENTARIES,"Investigative, Intimate",2,"https://www.youtube.com/embed/2rlVhiXlcHU");
158158
Movie movie25 = new Movie("Stutz", 96,LanguageEnum.ENGLISH,GenreEnum.DOCUMENTARIES,"Inspiring, Intimate, Heartfelt",4,"https://www.youtube.com/embed/UKCmefQdplI");
159159

@@ -178,10 +178,10 @@ public void run(ApplicationArguments args) throws Exception {
178178

179179
// BLOCKBUSTER ORIGINALS
180180

181-
Movie movie26 = new Movie("Wednesday", 28, LanguageEnum.ENGLISH, GenreEnum.ORIGINALS, "Witty, morbid, captivating, clever, unexpected.", 3,"https://www.youtube.com/embed/Di310WS8zLk");
181+
Movie movie26 = new Movie("Wednesday", 28, LanguageEnum.ENGLISH, GenreEnum.ORIGINALS, "Witty, morbid, captivating", 3,"https://www.youtube.com/embed/Di310WS8zLk");
182182
Movie movie27 = new Movie("Creed 3", 117, LanguageEnum.ENGLISH, GenreEnum.ORIGINALS, "Inspiring", 8,"https://www.youtube.com/embed/AHmCH7iB_IM");
183183
Movie movie28 = new Movie("Run", 89, LanguageEnum.ENGLISH, GenreEnum.ORIGINALS, "Thrilling", 4,"https://www.youtube.com/embed/EoGojQE4p-8");
184-
Movie movie29 = new Movie("Fall",106, LanguageEnum.ENGLISH, GenreEnum.ORIGINALS, "Explosive, suspenseful, thriller", 4,"https://www.youtube.com/embed/iSspRSGc4Dk");
184+
Movie movie29 = new Movie("Fall",106, LanguageEnum.ENGLISH, GenreEnum.ORIGINALS, "Explosive, suspenseful.", 4,"https://www.youtube.com/embed/iSspRSGc4Dk");
185185
Movie movie30 = new Movie("Luther The Fallen Sun", 130, LanguageEnum.ENGLISH.SPANISH, GenreEnum.ORIGINALS, "Ominous, gritty, dark.", 5,"https://www.youtube.com/embed/EGK5qtXuc1Q");
186186

187187
Cast cast49 = new Cast("Jenna Ortega", 20, "Jenna Ortega, born in 2002, is an American actress known for Stuck in the Middle, You, and Wednesday");

0 commit comments

Comments
 (0)