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.

Sign up for GitHub

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

Jump to bottom

Background+ navbar link position changes #11

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Background+ navbar link position changes #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4533966
ProjectCard.css path in projects.jsx
DeepakSilaych Oct 26, 2023
6f6c048
changes in login form, register form, navbar etc
DeepakSilaych Oct 27, 2023
1b3d728
uppercase roll number
DeepakSilaych Oct 28, 2023
bbc00b3
background changes
DeepakSilaych Oct 28, 2023
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
3 changes: 3 additions & 0 deletions backend/accounts/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ def create(self, validated_data):
Override the create mehtod with objects.create_user,
since the former saves with an unencrypted password
"""

# Normalize roll number to ensure uniformity
validated_data['roll_number'] = validated_data.get('roll_number', '').upper()
return User.objects.create_user(**validated_data)


Expand Down
184 changes: 108 additions & 76 deletions frontend/src/components/Navbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,83 +1,115 @@
import React from "react";
// import PropTypes from "prop-types";
import {
Link
} from "react-router-dom";
import { Link } from "react-router-dom";

export default function Navbar(props) {
const style = {
boxShadow: "0px 0px 20px 0px rgba(0,0,0,0.75)",
};

// const router = createBrowserRouter([
// {
// path: "/",
// element: <MenteeForm/>,
// },
// ]);


// const router = createBrowserRouter(routes);

// const handleButtonClick = () => {
// // Use the router to navigate to a specific route
// router.navigate('/'); // Replace '/' with the desired route
// };


export default function Navbar(props){

return(
<nav className="navbar navbar-expand-lg bg-body-tertiary">
<div className="container-fluid">
<a className="navbar-brand" href="/">{props.title}</a>
<button classNameName="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span classNameName="navbar-toggler-icon"></span>
</button>
<div className="collapse navbar-collapse" id="navbarSupportedContent">
<ul className="navbar-nav me-auto mb-2 mb-lg-0">
<li className="nav-item">
<a className="nav-link active" aria-current="page" href="/">Home</a>
</li>
<li className="nav-item">
<a className="nav-link" href="/register" >Register</a>
{/* <Link to="/register">Register</Link> */}
</li>
<li className="nav-item">
<a className="nav-link" href="/current_projects">Current Projects</a>
{}
</li>
<li className="nav-item">
<a className="nav-link" href="/previous_projects">Login</a>
</li>
<li className="nav-item">
<a className="nav-link" href="/">Past Certificates</a>
</li>
<li className="nav-item dropdown">
<a className="nav-link dropdown-toggle" href="/" role="button" data-bs-toggle="dropdown" aria-expanded="false">
Dropdown
</a>
<ul className="dropdown-menu">
<li><a className="dropdown-item" href="/">Action</a></li>
<li><a className="dropdown-item" href="/">Another action</a></li>
<li><hr className="dropdown-divider"/></li>
<li><a classNameName="dropdown-item" href="/">Something else here</a></li>
</ul>
</li>
<li className="nav-item">
<a className="nav-link disabled" aria-disabled="true" href="/">Disabled</a>
</li>
</ul>
<form className="d-flex" role="search">
<input className="form-control me-2" type="search" placeholder="Search" aria-label="Search"/>
<button className="btn btn-outline-success" type="submit">Search</button>
</form>
</div>
return (
<nav className="navbar navbar-expand-lg bg-body-tertiary" style={style}>
<div className="container-fluid">
<a className="navbar-brand" href="/">
{props.title}
</a>
<button
className="navbar-toggler"
type="button"
data-bs-toggle="collapse"
data-bs-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent"
aria-expanded="false"
aria-label="Toggle navigation"
>
<span className="navbar-toggler-icon"></span>
</button>
<div className="collapse navbar-collapse" id="navbarSupportedContent">
<ul className="navbar-nav me-auto mb-2 mb-lg-0">
<li className="nav-item">
<a className="nav-link active" aria-current="page" href="/">
Home
</a>
</li>

<li className="nav-item">
<a className="nav-link" href="/current_projects">
Current Projects
</a>
</li>
<li className="nav-item">
<a className="nav-link" href="/dashboard">
Dashboard
</a>
</li>
<li className="nav-item">
<a
className="nav-link"
href="https://itc.gymkhana.iitb.ac.in/certificates/"
>
Past Certificates
</a>
</li>
<li className="nav-item dropdown">
<a
className="nav-link dropdown-toggle"
href="/"
role="button"
data-bs-toggle="dropdown"
aria-expanded="false"
>
Dropdown
</a>
<ul className="dropdown-menu">
<li>
<a className="dropdown-item" href="/">
Action
</a>
</li>
<li>
<a className="dropdown-item" href="/">
Another action
</a>
</li>
<li>
<hr className="dropdown-divider" />
</li>
<li>
<a className="dropdown-item" href="/">
Something else here
</a>
</li>
</ul>
</li>
</ul>
<ul className="navbar-nav me-3 mb-2 mb-lg-0">
<li className="nav-item">
<a className="nav-link" href="/register">
Register
</a>
</li>
<li className="nav-item">
<a className="nav-link" href="/previous_projects">
Login
</a>
</li>
</ul>
<form className="d-flex" role="search">
<input
className="form-control me-2"
type="search"
placeholder="Search"
aria-label="Search"
/>
<button className="btn btn-outline-success" type="submit">
Search
</button>
</form>
</div>
</nav>
)
</div>
</nav>
);
}

// Navbar.PropTypes={
// title: PropTypes.string,
// }

Navbar.defaultProps = {
title: 'set title here',
}
title: 'set title here',
};
2 changes: 1 addition & 1 deletion frontend/src/components/ProjectCard.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

.project-card {
background-color: #fff;
border-radius: 10px;
border-radius: 0 0 10px 10px;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
padding: 20px;
}
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/Textform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import "./scrollable.css"

export default function Textform(){
return(
<>
<div className="textform">
<div >
<h2 class="forSOC">
What is SOC?
Expand Down Expand Up @@ -45,6 +45,6 @@ export default function Textform(){
Reviews
</h2>
</div>
</>
</div>
)
}
86 changes: 86 additions & 0 deletions frontend/src/components/form.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
/* Register.css */

/* Styles for the main form container */
.form {
max-width: 400px;
margin: 5vh auto;
padding: 20px;
border-radius: 5px;
box-shadow: 10px 10px 20px rgba(0, 0, 0, 0.5);
background-color: rgba(255, 255, 255, 0.3); }

/* Styles for the form title */
.form h1 {
text-align: center;
margin-bottom: 20px;
color: black;
}

.form input{
background-color: rgba(255, 255, 255, 0.3);
}

/* Styles for buttons (Mentor/Mentee selection) */
.form .btn {
display: inline-block;
padding: 10px 20px;
margin: 5px;
background-color: #007bff;
background-color: rgba(255, 255, 255, 0.3);
border: none;
cursor: pointer;
border-radius: 5px;
width: 45%;
}

/* Styles for labels and input fields */
.form .label {
font-weight: 600;
margin: 10px 0 0 0;
}

.form .input {
width: 100%;
padding: 10px;
margin-bottom: 10px;
border: 1px solid #ccc;
border-radius: 5px;
background-color: rgba(255, 255, 255, .8);
}

/* Styles for error and success messages */
.form .error,.form .success {
background-color: rgba(244, 67, 54); /* Red for errors */
color: #fff;
padding: 10px;
margin-bottom: 10px;
border-radius: 5px;
}

.form .success {
background-color: #4CAF50; /* Green for success */
}

/* Center buttons horizontally within the form */
.form .messages {
text-align: center;
}

/* Additional styling for the submit button */
.form .btn[type="submit"] {
background-color: #2f00ff;
color: #fff;
border: none;
padding: 10px 20px;
border-radius: 5px;
cursor: pointer;
width: 100%;
}


/* Highlight the selected option */
.form .active {
background-color: #2f00ff; /* Change the background color to your desired color */
color: #fff; /* Change the text color to match */
}

67 changes: 67 additions & 0 deletions frontend/src/components/project_form.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
.project_form {
max-width: 400px;
margin: 5vh auto;
padding: 20px;
background-color: rgba(255, 255, 255, 0.3);
background: blur(100px);
border-radius: 5px;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
}

.project_form h1 {
text-align: center;
color: black;
}

.project_form form {
display: flex;
flex-direction: column;
}

.project_form label {
margin: 10px 0;
font-weight: 600;
color: black;
}

.project_form input[type="text"],
.project_form input[type="number"],
.project_form select,
.project_form input[type="file"] {
width: 100%;
padding: 10px;
border: 1px solid #ccc;
border-radius: 5px;
font-size: 14px;
background: rgba(255, 255, 255, 0.7);
margin: 5px 0 0 0;
color: rgba(0, 0, 0, 0.7);
}

.project_form select {
appearance: none;
padding: 10px;
border: 1px solid #ccc;
border-radius: 5px;
color: rgba(0, 0, 0, 1);
cursor: pointer;
}

.project_form button {
margin: 20px 0;
padding: 10px 20px;
background-color: transparent;
border: 1px solid black;
border-radius: 5px;
font-size: 16px;
color: black;
width: 100%;
cursor: pointer;
transition: background-color 0.3s, color 0.3s;
}

.project_form button:hover {
background-color: #007BFF;
color: #fff;
}

Loading