Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ui changes and user bug fixe #151

Merged
merged 33 commits into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
b4a1cb2
dev: added hexagon view to spelling bee
mrkc2303 Nov 1, 2024
8bb31c4
Merge branch 'main' into SCRUM-64
krishnacalindi Nov 1, 2024
16d3b85
Made colors dynamic
mrkc2303 Nov 2, 2024
16658a6
Made colors dynamic
mrkc2303 Nov 2, 2024
4a4f3df
letterboxed puzzle setter
AntonioRosV Nov 11, 2024
b2debaa
rspec updates and improvements
AntonioRosV Nov 11, 2024
db34380
Merge pull request #143 from tamu-edu-students/main
mrkc2303 Nov 12, 2024
716c625
automatic puzzles for letterboxed
AntonioRosV Nov 13, 2024
558e5e3
New games page UI
mrkc2303 Nov 14, 2024
c75011e
debugging session temp code
nandiniiys Nov 14, 2024
0b2fd0f
fixed the users bug
krishnacalindi Nov 14, 2024
e32d257
Made better welcome page with minor changes
mrkc2303 Nov 14, 2024
76825e4
paths on puzzle setter page
AntonioRosV Nov 14, 2024
7388006
aesthetic fix
AntonioRosV Nov 14, 2024
2ec043a
changes to UI in User profile page
mrkc2303 Nov 14, 2024
4c8e091
merge with main
mrkc2303 Nov 14, 2024
e445755
Minor fixes
mrkc2303 Nov 14, 2024
01c8627
Minor changes in cucumber senarios
mrkc2303 Nov 14, 2024
4676ab4
Fix cucumber tests
mrkc2303 Nov 14, 2024
1710a3f
fixed tests
AntonioRosV Nov 14, 2024
c012ad4
SCRUM-72-73-74-75: streamline wordle puzzle setter interface
nandiniiys Nov 13, 2024
9f5bd4e
[SCRUM-72-73-74-75] add documentation comments as per the gem yard
nandiniiys Nov 13, 2024
1bee255
add ui flow docs ofr wordle puzzle setter
nandiniiys Nov 13, 2024
d8cdc2b
SCRUM-72-73-74-75- add cucumber tests
nandiniiys Nov 13, 2024
493169e
rubocop and doc for helper
krishnacalindi Nov 13, 2024
754152f
rescues
krishnacalindi Nov 13, 2024
de54b6b
Merge pull request #148 from tamu-edu-students/SCRUM-64
krishnacalindi Nov 14, 2024
eb3da62
Merge branch 'main' into oauth-bug
krishnacalindi Nov 14, 2024
1bfacb0
Merge branch 'main' into SCRUM-76
krishnacalindi Nov 14, 2024
4eced76
Merge pull request #150 from tamu-edu-students/oauth-bug
krishnacalindi Nov 14, 2024
607c572
Merge branch 'prod' into main
krishnacalindi Nov 14, 2024
55de7a7
Merge branch 'main' into SCRUM-76
AntonioRosV Nov 14, 2024
7c844bb
Merge pull request #149 from tamu-edu-students/SCRUM-76
krishnacalindi Nov 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/stylesheets/dashboard.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
padding: 20px;
background-color: #e0e0e0; /* Light gray background */
border-radius: 10px;
margin-bottom: 20px;
margin: 20px 50px;
}

/* Each Stat Card */
Expand Down
46 changes: 43 additions & 3 deletions app/assets/stylesheets/games.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
.dropdown-content {
display: none;
position: absolute;
right: 0;
margin-right: 10px;
background-color: #f9f9f9;
border: 2px solid black;
min-width: 160px;
Expand All @@ -37,6 +39,35 @@
display: block;
}


.dropdown-content-account {
display: none;
position: absolute;
right: 0;
margin-right: 170px;
background-color: #f9f9f9;
border: 2px solid black;
min-width: 160px;
box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
z-index: 1;
font-family: Verdana, Geneva, Tahoma, sans-serif;
}

.dropdown-content-account a {
color: black;
padding: 12px 16px;
text-decoration: none;
display: block;
}

.dropdown-content-account a:hover {
background-color: #f1f1f1;
}

.dropdown:hover .dropdown-content-account {
display: block;
}

.dropdown:hover .dropbtn {
background-color: white;
color: black;
Expand All @@ -45,24 +76,33 @@

.game-list {
display: grid;
grid-template-columns: repeat(3, 1fr);
grid-template-columns: repeat(2, 1fr);
gap: 20px;
margin-top: 20px;
width: 90%;
margin: 0 auto;
}

.game-item {
padding: 15px;
display: flex;
justify-content: space-between;
align-items: center;
padding: 15px 50px;
border: 1px solid #000;
text-align: center;
border-radius: 20px;
transition: transform 0.3s ease, box-shadow 0.3s ease;
box-shadow: 0px 4px 6px rgba(0, 0, 0, 0.1);
}

.game-image {
width: auto;
height: 100px;
margin-bottom: 10px;
}

.game-item:hover {
transform: scale(1.10);
transform: scale(1.04);
box-shadow: 0px 10px 15px rgba(0, 0, 0, 0.2);
border: 40px;
}
61 changes: 60 additions & 1 deletion app/assets/stylesheets/spellingbee.css
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
.live-demo {
border: 2px solid black;
border-radius: 5 px;
padding: 60px;
padding: 5px;
}

.sb-table {
Expand All @@ -151,3 +151,62 @@ td {
border: 1px solid black;
vertical-align: middle;
}

.hex-container {
display: flex;
flex-direction: column;
align-items: center;
gap: 0;
}

.hex-row {
display: flex;
justify-content: center;
gap: 0;
}

.hex {
width: 100px;
height: 100px;
clip-path: polygon(50% 0%, 93.3% 25%, 93.3% 75%, 50% 100%, 6.7% 75%, 6.7% 25%);
display: flex;
justify-content: center;
align-items: center;
font-size: 1.5rem;
color: var(--font-clr);
position: relative;
/* background-color: var(--primary-clr); */
z-index: 1;
}

/* .hex::after {
content: "";
position: absolute;
top: -2px;
left: -2px;
width: calc(100% + 4px);
height: calc(100% + 4px);
clip-path: polygon(50% 0%, 93.3% 25%, 93.3% 75%, 50% 100%, 6.7% 75%, 6.7% 25%);
background-color: black;
z-index: 0;
} */

.hex-content {
position: relative;
z-index: 2; /* Ensure text is visible */
display: flex;
justify-content: center;
align-items: center;
font-size: 1.5rem;
color: black;
}


.hex-center {
background-color: var(--primary-clr);
}

.hex:hover {
cursor: pointer;
background-color: var(--primary-clr);
}
180 changes: 134 additions & 46 deletions app/assets/stylesheets/users.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,78 +29,166 @@ caption {
padding: 10px;
}

.user-options {
/* Profile Container Styling */
.profile-container {
display: grid;
grid-template-columns: 1fr 1fr; /* Two columns layout */
gap: 20px;
width: 90%;
max-width: 1200px;
margin: 50px auto;
padding: 20px;
box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
border-radius: 10px;
background-color: #ffffff;
}

/* Profile Section - Information Cards */
.profile-section, .sso-account, .role-info, .user-options-container {
background-color: #f9f9f9;
border-radius: 10px;
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
padding: 15px; /* Reduce padding to make cards more compact */
margin: 10px 0;
}

/* Section Headers */
.profile-container h3 {
font-size: 1.2rem;
color: #333;
font-family: Verdana, Geneva, Tahoma, sans-serif;
border-bottom: 2px solid #ddd;
padding-bottom: 8px;
margin-bottom: 10px;
}

/* SSO Account Section */
.sso-account {
display: flex;
flex-direction: row;
flex-direction: column;
gap: 10px;
}

.modal {
display: none;
position: fixed;
z-index: 1;
padding-top: 100px;
left: 0;
top: 0;
width: 100%;
height: 100%;
background-color: rgb(0,0,0); /* Fallback color */
background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
.sso-btns {
display: flex;
align-items: center;
gap: 10px; /* Space between icon and text */
padding: 8px 0;
}

.sso-btns .btn {
background-color: #e0e0e0;
color: #333;
border-radius: 50%;
width: 35px; /* Reduce icon size */
height: 35px;
display: flex;
align-items: center;
justify-content: center;
font-size: 1.2rem;
transition: background-color 0.3s;
}

.modal-content {
background-color: #fefefe;
margin: auto;
padding: 20px;
border: 1px solid #888;
width: 80%;
.sso-btns .btn:hover {
background-color: #007bff;
color: white;
}

/* The Close Button */
.close {
color: #000000;
float: right;
font-size: 28px;
font-weight: bold;
/* Account Info Text */
.sso-info {
font-size: 0.95rem;
color: #555;
}

.close:hover,
.close:focus {
color: #ee0b0b;
text-decoration: none;
cursor: pointer;
/* Role Information Section */
.role-info ul {
list-style: none;
padding: 0;
}

.user-page {
.role-info li {
display: flex;
flex-direction: row;
justify-content: space-between;
padding: 8px;
border-bottom: 1px solid #ddd;
font-size: 1rem;
color: #444;
}

.user-options {
display: flex;
flex-direction: row;
.role-info li:last-child {
border-bottom: none;
}

.sso-account {
.user-options-container {
display: flex;
flex-direction: column;
/* align-items: center; */
/* padding-top: 10px; */
}

.sso-btns {
.user-options-container h3 {
margin-bottom: 10px;
}

.user-options {
display: flex;
flex-direction: row;
align-items: center;
gap: 10px;
justify-content: center;
}

.sso-info {
.user-options .btn-login {
background-color: #007bff;
color: white;
border-radius: 5px;
padding: 8px 12px; /* Smaller button padding */
font-size: 1rem;
font-family: Verdana, Geneva, Tahoma, sans-serif;
transition: background-color 0.3s, transform 0.2s;
}

h3 {
font-family: Verdana, Geneva, Tahoma, sans-serif;
.user-options .btn-login:hover {
background-color: #0056b3;
transform: scale(1.05);
}

.role-info {
font-family: Verdana, Geneva, Tahoma, sans-serif;
}
.user-options .dis-btn {
background-color: #ff4c4c;
}

.user-options .dis-btn:hover {
background-color: #c0392b;
}

.user-options-separator {
width: 90%;
height: 1px;
background-color: #ddd;
margin: 10px 0;
}


/* Responsive Design Adjustments */
@media (max-width: 1024px) {
.profile-container {
grid-template-columns: 1fr; /* Stack in a single column on medium screens */
padding: 15px;
display: flex;
flex-direction: column;
align-items: center;
}

.profile-section, .sso-account, .role-info, .user-options-container {
width: 90%;
padding: 15px;
}
}

@media (max-width: 768px) {
.profile-container {
grid-template-columns: 1fr; /* Single column on smaller screens */
}

.user-options {
flex-direction: row; /* Stack buttons horizontally */
justify-content: center;
}
}
Loading
Loading