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

Sign up log in #8

Merged
merged 9 commits into from
Dec 16, 2023
Merged

Sign up log in #8

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
888ca3c
✨ feat: SingUp page
AhmedHamed3699 Dec 15, 2023
f60bc2f
✨ feat: LogIn page
AhmedHamed3699 Dec 15, 2023
d7cac10
🗃️ feat: connect to database and set environment variables
AhmedHamed3699 Dec 15, 2023
83cdf10
✨ feat: Add authController
AhmedHamed3699 Dec 16, 2023
c17a91f
🔧 chore: update environment example file & add new dependencies
AhmedHamed3699 Dec 16, 2023
b15b5a4
🛂 feat: done with signUp controller
AhmedHamed3699 Dec 16, 2023
3d91ae3
🛂 feat: Add Log In authentication
AhmedHamed3699 Dec 16, 2023
4034eca
🛂 feat: done with authorization of logged-In captain
AhmedHamed3699 Dec 16, 2023
77384f0
Merge branch 'main' into SignUp-LogIn
AhmedHamed3699 Dec 16, 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
4 changes: 3 additions & 1 deletion client/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import "./theme.scss";
import SignUp from "./components/module_OR_PAGE/signUp";
import LogIn from "./components/module_OR_PAGE/logIn";

function App() {
return (
<>
<h1> 🚀 Sanity Check</h1>
<LogIn />
</>
);
}
Expand Down
Empty file removed client/src/assets/styles/components/DELETEME.txt
View file
Open in desktop
Empty file.
64 changes: 64 additions & 0 deletions client/src/assets/styles/components/logIn.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
.hero {
display: flex;
width: 22.5rem;
height: 40rem;
flex-direction: column;
align-items: center;
justify-content: center;
margin: auto;
padding: 1.75rem 0.25rem;
gap: 1.1875rem;
}

.card {
background-color: #1f2a37;
border-radius: 1.875rem;
display: flex;
width: 16.9375rem;
padding: 1.0625rem 0rem;
margin-top: 3rem;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 0.875rem;
}
.card .input-field {
display: flex;
width: 14.16319rem;
padding: 0.125rem 0.75rem;
justify-content: flex-end;
align-items: center;
align-content: center;
gap: 0rem 9.25rem;
flex-wrap: wrap;
}
.card .input-field input {
background: #374151;
margin-block: 0.3rem;
border: 1px solid #4b5563;
border-radius: 0.25rem;
width: 12.66319rem;
height: 1.75rem;
flex-shrink: 0;
}

.no-account {
color: #0694A2;
font-family: "Noto Kufi Arabic";
margin-bottom: 1rem;
}

button {
color: #e2efee;
font-family: "Noto Kufi Arabic";
background: #046C4E;
border: 0px solid;
border-radius: 0.3125rem;
display: flex;
width: 7.25rem;
height: 1.875rem;
padding: 0.8125rem 0.625rem;
justify-content: center;
align-items: center;
gap: 1.25rem;
}/*# sourceMappingURL=logIn.css.map */
74 changes: 74 additions & 0 deletions client/src/assets/styles/components/logIn.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
$Teal-900: #014451;
$Teal-500: #0694A2;
$grey-800: #1f2a37;
$grey-700: #374151;
$grey-600: #4b5563;
$green-700: #046C4E;
$Primary-900: #0e0218;
$text-color: #e2efee;
$font: 'Noto Kufi Arabic';

.hero {
display: flex;
width: 22.5rem;
height: 40rem;
flex-direction: column;
align-items: center;
justify-content: center;
margin: auto;
padding: 1.75rem 0.25rem;
gap: 1.1875rem;
}

.card {
background-color: $grey-800;
border-radius: 1.875rem;
display: flex;
width: 16.9375rem;
padding: 1.0625rem 0rem;
margin-top: 3rem;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 0.875rem;
.input-field {
display: flex;
width: 14.16319rem;
padding: 0.125rem 0.75rem;
justify-content: flex-end;
align-items: center;
align-content: center;
gap: 0rem 9.25rem;
flex-wrap: wrap;
input {
background: $grey-700;
margin-block: 0.3rem;
border: 1px solid $grey-600;
border-radius: 0.25rem;
width: 12.66319rem;
height: 1.75rem;
flex-shrink: 0;
}
}
}

.no-account {
color: $Teal-500;
font-family: $font;
margin-bottom: 1rem;
}

button {
color: $text-color;
font-family: $font;
background: $green-700;
border: 0px solid;
border-radius: 0.3125rem;
display: flex;
width: 7.25rem;
height: 1.875rem;
padding: 0.8125rem 0.625rem;
justify-content: center;
align-items: center;
gap: 1.25rem;
}
87 changes: 87 additions & 0 deletions client/src/assets/styles/components/signUp.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
.hero {
display: flex;
width: 22.5rem;
height: 93.375rem;
flex-direction: column;
align-items: center;
margin: auto;
padding: 1.75rem 0.25rem;
gap: 1.1875rem;
}

.container {
background: #014451;
border-radius: 1.25rem;
display: flex;
width: 19rem;
padding: 1.5rem 0.4375rem;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 1.0625rem;
}

.card {
background-color: #1f2a37;
border-radius: 1.875rem;
display: flex;
width: 16.9375rem;
padding: 1.0625rem 0rem;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 0.875rem;
}
.card .input-field {
display: flex;
width: 14.16319rem;
padding: 0.125rem 0.75rem;
justify-content: flex-end;
align-items: center;
align-content: center;
gap: 0rem 9.25rem;
flex-wrap: wrap;
}
.card .input-field input {
background: #374151;
margin-block: 0.3rem;
border: 1px solid #4b5563;
border-radius: 0.25rem;
width: 12.66319rem;
height: 1.75rem;
flex-shrink: 0;
}
.card .radio-field {
display: flex;
width: 14.16319rem;
padding: 0.5625rem 0.75rem;
flex-direction: column;
justify-content: flex-end;
align-items: flex-end;
flex-wrap: wrap;
gap: 0.0625rem;
}
.card .radio-field .radio-buttons {
display: flex;
padding: 0.3125rem 0.5rem;
margin: auto;
gap: 3.1875rem;
}
.card .radio-field .radio-buttons small input {
margin: 0.5rem;
}

button {
color: #e2efee;
font-family: "Noto Kufi Arabic";
background: #0e0218;
border: 0px solid;
border-radius: 0.3125rem;
display: flex;
width: 12.5rem;
height: 3.125rem;
padding: 0.8125rem 0.6875rem 0.8125rem 0.625rem;
justify-content: center;
align-items: center;
gap: 2.5rem;
}/*# sourceMappingURL=signUp.css.map */
97 changes: 97 additions & 0 deletions client/src/assets/styles/components/signUp.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
$Teal-900: #014451;
$grey-800: #1f2a37;
$grey-700: #374151;
$grey-600: #4b5563;
$Primary-900: #0e0218;
$text-color: #e2efee;
$font: 'Noto Kufi Arabic';

.hero {
display: flex;
width: 22.5rem;
height: 93.375rem;
flex-direction: column;
align-items: center;
margin: auto;
padding: 1.75rem 0.25rem;
gap: 1.1875rem;
}

.container {
background: $Teal-900;
border-radius: 1.25rem;
display: flex;
width: 19rem;
padding: 1.5rem 0.4375rem;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 1.0625rem;
}

.card {
background-color: $grey-800;
border-radius: 1.875rem;
display: flex;
width: 16.9375rem;
padding: 1.0625rem 0rem;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 0.875rem;
.input-field {
display: flex;
width: 14.16319rem;
padding: 0.125rem 0.75rem;
justify-content: flex-end;
align-items: center;
align-content: center;
gap: 0rem 9.25rem;
flex-wrap: wrap;
input {
background: $grey-700;
margin-block: 0.3rem;
border: 1px solid $grey-600;
border-radius: 0.25rem;
width: 12.66319rem;
height: 1.75rem;
flex-shrink: 0;
}
}

.radio-field {
display: flex;
width: 14.16319rem;
padding: 0.5625rem 0.75rem;
flex-direction: column;
justify-content: flex-end;
align-items: flex-end;
flex-wrap: wrap;
gap: 0.0625rem;
.radio-buttons {
display: flex;
padding: 0.3125rem 0.5rem;
margin: auto;
gap: 3.1875rem;
small input {
margin: 0.5rem;
}
}
}
}


button {
color: $text-color;
font-family: $font;
background: $Primary-900;
border: 0px solid;
border-radius: 0.3125rem;
display: flex;
width: 12.5rem;
height: 3.125rem;
padding: 0.8125rem 0.6875rem 0.8125rem 0.625rem;
justify-content: center;
align-items: center;
gap: 2.5rem;
}
Empty file removed client/src/components/module_OR_PAGE/DELETEME.txt
View file
Open in desktop
Empty file.
21 changes: 21 additions & 0 deletions client/src/components/module_OR_PAGE/logIn.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import '../../assets/styles/components/logIn.css'

export default function LogIn() {
return (
<div className="hero">
<h2>تسجيل الدخول</h2>
<div className="card">
<label className="input-field">
الحساب
<input type="email" />
</label>
<label className="input-field">
الرمز السري
<input type="password" />
</label>
<button>تسجيل الدخول</button>
</div>
<small className="no-account">ليس لديك حساب؟</small>
</div>
)
}
Loading