Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 1 deletion client/.eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
build/*
build/*
src/
4 changes: 2 additions & 2 deletions client/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
env: {
browser: true,
es2021: true,
browser: false,
es2021: false,
node: true,
},
extends: ["google", "plugin:prettier/recommended"],
Expand Down
61 changes: 43 additions & 18 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"@reduxjs/toolkit": "^2.2.1",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/user-event": "^14.5.2",
"aos": "^2.3.4",
"autoprefixer": "^10.4.17",
"axios": "^1.6.7",
"framer-motion": "^11.0.8",
Expand Down
Binary file added client/public/images/img1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/images/img2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/images/img3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/images/img4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/images/img5.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/images/img6.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/images/logo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions client/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Dosis:wght@200..800&display=swap"
rel="stylesheet"
/>

<title>Condense: Video Analyzer</title>
</head>
Expand Down
2 changes: 1 addition & 1 deletion client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import Feedback from "./pages/feedback";
*/
function App() {
return (
<div className="">
<div >
<Provider store={store}>
<PersistGate loading={null} persistor={persistor}>
<Routes>
Expand Down
174 changes: 102 additions & 72 deletions client/src/pages/ContactUs.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,40 @@
.App2 {
text-align: center;
background: linear-gradient(to bottom, #872834, rgb(45, 4, 4));
min-height: 100vh;
border: 2px solid white;
}

.contactus-header {
display: flex;
flex-direction: row;
align-items: center;
padding: 10px 20px;
}

.icons {
display: flex;
gap: 10px;
background-color: #ccc;
background: #ffffff;
}

.profile-icon,
.home-icon {
cursor: pointer;
background-color: white;
border-radius: 40%; /* Makes the background circular */
padding: 25px;
font-size: 1.5rem;
}

.profile-icon {
margin-left: 65vh;
margin-top: 3vh;
padding: 20px 5px;
}

.home-icon {
margin-left: 5vh;
margin-top: 3vh;
}

.contactus-header {
Expand Down Expand Up @@ -77,79 +109,77 @@
}

.contact-container {
display: flex;
justify-content: space-between;
align-items: flex-start;
padding: 90px;
}

.contact-form {
flex: 1;
text-align: left;
color: #ffffff;
padding-left: 20px;

}

.contact-form form {
display: flex;
flex-direction: column;
align-items: flex-start;

}

.contact-form h2 {
font-size:xx-large;
}

.contact-form label {
margin-bottom: 8px;
}

.contact-form input,
.contact-form textarea {
margin-bottom: 10px;
padding: 10px;
width: 300px;
height: auto;
border: 1px solid #ffffff;
border-radius: 4px;
background-color: rgba(255, 255, 255, 0.3);
color: #ffffff; /* Set text color to white */
}

.contact-form input::placeholder,
.contact-form textarea::placeholder {
color: rgba(255, 255, 255, 0.6); /* Set placeholder text color to white */
}

.contact-form button {
background-color: #d49904;
color: #872834;
padding: 10px 20px;
cursor: pointer;
border: none;
border-radius: 4px;
font-size: 1rem;
transition: background-color 0.3s; /* Add transition for smooth hover effect */
}

.contact-form button:hover {
background-color: #ffc400; /* Change color on hover */
}

.contact-details {
right: 20px;
display: flex;
flex-direction: column;
color: #ffffff;
margin-left: 75%;
margin-top: 50px;
display: flex;
justify-content: space-between;
align-items: flex-start;
padding: 90px;
}

.contact-form {
flex: 1;
text-align: left;
color: #ffffff;
padding-left: 20px;
}

.contact-form form {
display: flex;
flex-direction: column;
align-items: flex-start;
}

.contact-form h2 {
font-size: xx-large;
}

.contact-form label {
margin-bottom: 8px;
}

.contact-form input,
.contact-form textarea {
margin-bottom: 10px;
padding: 10px;
width: 300px;
height: auto;
border: 1px solid #ffffff;
border-radius: 4px;
background-color: rgba(255, 255, 255, 0.3);
color: #ffffff; /* Set text color to white */
}

.contact-form input::placeholder,
.contact-form textarea::placeholder {
color: rgba(255, 255, 255, 0.6); /* Set placeholder text color to white */
}

.contact-form button {
background-color: #d49904;
color: #872834;
padding: 10px 20px;
cursor: pointer;
border: none;
border-radius: 4px;
font-size: 1rem;
transition: background-color 0.3s; /* Add transition for smooth hover effect */
}

.contact-form button:hover {
background-color: #ffc400; /* Change color on hover */
}

.contact-details {
right: 20px;
display: flex;
flex-direction: column;
color: #ffffff;
margin-left: 75%;
margin-top: 50px;
}

.contact-icon p {
font-size: 1rem;
margin-left: 10px;
font-size: 1rem;
margin-left: 10px;
}

.contact-icon {
Expand Down
Loading