-
Notifications
You must be signed in to change notification settings - Fork 25
Combine exercise emails #73
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
Open
Danielmr97
wants to merge
4
commits into
iOSLabUNAM:main
Choose a base branch
from
Danielmr97:combineExerciseEmail
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -10,7 +10,7 @@ import Combine | |||||
|
||||||
class SignUpViewModel: ObservableObject { | ||||||
// inputs | ||||||
@Published var username: String = "" | ||||||
@Published var email: String = "" | ||||||
@Published var password: String = "" | ||||||
@Published var passwordConfirm: String = "" | ||||||
|
||||||
|
@@ -20,17 +20,37 @@ class SignUpViewModel: ObservableObject { | |||||
@Published var isValidPasswordUpperCase: Bool = false | ||||||
@Published var isValidPasswordMatch: Bool = false | ||||||
@Published var isValid: Bool = false | ||||||
|
||||||
// New Rules | ||||||
@Published var isValidPasswordSymbol : Bool = false | ||||||
@Published var isValidPasswordNumber : Bool = false | ||||||
@Published var isValidPasswordLowerCase : Bool = false | ||||||
@Published var isValidEmail : Bool = false | ||||||
@Published var isValidation : Bool = false | ||||||
|
||||||
|
||||||
private var cancelableSet: Set<AnyCancellable> = [] | ||||||
|
||||||
init() { | ||||||
$username | ||||||
.receive(on: RunLoop.main) | ||||||
.map { username in | ||||||
return username.count >= 4 | ||||||
} | ||||||
.assign(to: \.isValidUsernameLength, on: self) | ||||||
.store(in: &cancelableSet) | ||||||
.receive(on: RunLoop.main) | ||||||
.map { password in | ||||||
let pattern = "[@.]" | ||||||
if let _ = password.range(of: pattern, options: .regularExpression) { | ||||||
return true | ||||||
} else { | ||||||
return false | ||||||
} | ||||||
} | ||||||
.assign(to: \.isValidEmail, on: self) | ||||||
.store(in: &cancelableSet) | ||||||
|
||||||
|
||||||
$password | ||||||
.receive(on: RunLoop.main) | ||||||
|
@@ -53,6 +73,45 @@ class SignUpViewModel: ObservableObject { | |||||
.assign(to: \.isValidPasswordUpperCase, on: self) | ||||||
.store(in: &cancelableSet) | ||||||
|
||||||
$password | ||||||
.receive(on: RunLoop.main) | ||||||
.map { password in | ||||||
let pattern = "[a-z]" | ||||||
if let _ = password.range(of: pattern, options: .regularExpression) { | ||||||
return true | ||||||
} else { | ||||||
return false | ||||||
} | ||||||
} | ||||||
.assign(to: \.isValidPasswordLowerCase, on: self) | ||||||
.store(in: &cancelableSet) | ||||||
|
||||||
$password | ||||||
.receive(on: RunLoop.main) | ||||||
.map { password in | ||||||
let pattern = "[0-9]" | ||||||
if let _ = password.range(of: pattern, options: .regularExpression) { | ||||||
return true | ||||||
} else { | ||||||
return false | ||||||
} | ||||||
} | ||||||
.assign(to: \.isValidPasswordNumber, on: self) | ||||||
.store(in: &cancelableSet) | ||||||
|
||||||
$password | ||||||
.receive(on: RunLoop.main) | ||||||
.map { password in | ||||||
let pattern = "[! # $ % & ' ( ) * + , -. / : ; < = > ? @ [ ] ^ _ ` { | }]" | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
if let _ = password.range(of: pattern, options: .regularExpression) { | ||||||
return true | ||||||
} else { | ||||||
return false | ||||||
} | ||||||
} | ||||||
.assign(to: \.isValidPasswordSymbol, on: self) | ||||||
.store(in: &cancelableSet) | ||||||
|
||||||
Publishers.CombineLatest($password, $passwordConfirm) | ||||||
.receive(on: RunLoop.main) | ||||||
.map { (password, passwordConfirm) in | ||||||
|
@@ -61,7 +120,14 @@ class SignUpViewModel: ObservableObject { | |||||
.assign(to: \.isValidPasswordMatch, on: self) | ||||||
.store(in: &cancelableSet) | ||||||
|
||||||
Publishers.CombineLatest4($isValidUsernameLength, $isValidPasswordLength, $isValidPasswordUpperCase, $isValidPasswordMatch) | ||||||
Publishers.CombineLatest4($isValidPasswordLowerCase, $isValidPasswordNumber, $isValidPasswordSymbol,$isValidUsernameLength ) | ||||||
.map { (a, b, c, d) in | ||||||
return a && b && c && d | ||||||
} | ||||||
.assign(to: \.isValidation, on: self) | ||||||
.store(in: &cancelableSet) | ||||||
|
||||||
Publishers.CombineLatest4($isValidation, $isValidPasswordLength, $isValidPasswordUpperCase, $isValidPasswordMatch) | ||||||
.map { (a, b, c, d) in | ||||||
return a && b && c && d | ||||||
} | ||||||
|
@@ -80,13 +146,19 @@ struct SignUpView: View { | |||||
.bold() | ||||||
.foregroundStyle(.maryBlue) | ||||||
.padding(.bottom, 30) | ||||||
FormTextField(name: "Username", value: $vm.username) | ||||||
RequirementText(text: "A minimum of 4 characters", isValid: vm.isValidUsernameLength) | ||||||
FormTextField(name: "email", value: $vm.email) | ||||||
VStack{ | ||||||
RequirementText(text: "A minimum of 4 characters", isValid: vm.isValidUsernameLength) | ||||||
RequirementText(text: "Is email valid", isValid: vm.isValidEmail) | ||||||
} | ||||||
.padding() | ||||||
FormTextField(name: "Password", value: $vm.password, isSecure: true) | ||||||
VStack { | ||||||
RequirementText(text: "A minimum of 8 characters", isValid: vm.isValidPasswordLength) | ||||||
RequirementText(text: "One uppercase letter", isValid: vm.isValidPasswordUpperCase) | ||||||
RequirementText(text: "One lowercase letter", isValid: vm.isValidPasswordLowerCase) | ||||||
RequirementText(text: "One Number", isValid: vm.isValidPasswordNumber) | ||||||
RequirementText(text: "One Symbol", isValid: vm.isValidPasswordSymbol) | ||||||
} | ||||||
.padding() | ||||||
FormTextField(name: "Confirm Password", value: $vm.passwordConfirm, isSecure: true) | ||||||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is way too simple, and it will fail