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

SolveSignupview #93

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

SolveSignupview #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file added ...deproj/project.xcworkspace/xcuserdata/romark17.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
14 changes: 14 additions & 0 deletions SwiftUIBasics.xcodeproj/xcuserdata/romark17.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>SwiftUIBasics.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
</dict>
</plist>
103 changes: 89 additions & 14 deletions SwiftUIBasics/Views/SignUpView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,53 @@
//
// SignUpView.swift
// SwiftUIBasics
//
// Created by Diplomado on 09/12/23.
//

import SwiftUI
import Combine

class SignUpViewModel: ObservableObject {
// inputs
@Published var username: String = ""
@Published var mail: String = ""

@Published var password: String = ""
@Published var passwordConfirm: String = ""

// outputs
@Published var isValidUsernameLength: Bool = false
@Published var isValidPasswordLength: Bool = false
@Published var isValidPasswordUpperCase: Bool = false

@Published var isValidMail: Bool = false

@Published var isValidPasswordLowerCase: Bool = false
@Published var isValidPasswordHasASymbol: Bool = false
@Published var isValidPasswordHasANumber: Bool = false




@Published var isValidPasswordMatch: Bool = false
@Published var isValid: Bool = false

private var cancelableSet: Set<AnyCancellable> = []

init() {
$username
// $username
// .receive(on: RunLoop.main)
// .map { username in
// return username.count >= 4
// }
// .assign(to: \.isValidUsernameLength, on: self)
// .store(in: &cancelableSet)

$mail
.receive(on: RunLoop.main)
.map { username in
return username.count >= 4
.map { mail in
let emailRegEx = "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,64}"
let emailPred = NSPredicate(format:"SELF MATCHES %@", emailRegEx)
return emailPred.evaluate(with: mail)
}
.assign(to: \.isValidUsernameLength, on: self)
.assign(to: \.isValidMail, on: self)
.store(in: &cancelableSet)


$password
.receive(on: RunLoop.main)
.map { password in
Expand All @@ -40,10 +56,11 @@ class SignUpViewModel: ObservableObject {
.assign(to: \.isValidPasswordLength, on: self)
.store(in: &cancelableSet)

// isValidPasswordUpperCase
$password
.receive(on: RunLoop.main)
.map { password in
let pattern = "[A-Z]"
let pattern = "[A-Z]+"
if let _ = password.range(of: pattern, options: .regularExpression) {
return true
} else {
Expand All @@ -52,6 +69,50 @@ class SignUpViewModel: ObservableObject {
}
.assign(to: \.isValidPasswordUpperCase, on: self)
.store(in: &cancelableSet)

// isValidPasswordLowerCase
$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)

// isValidPasswordHasASymbol
$password
.receive(on: RunLoop.main)
.map { password in
let pattern = "[!@#$%^&*()_+\\-=\\[\\]{};':\"\\\\|,.<>\\/?]"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
let pattern = "[!@#$%^&*()_+\\-=\\[\\]{};':\"\\\\|,.<>\\/?]"
let pattern = "\\W"

if let _ = password.range(of: pattern, options: .regularExpression) {
return true
} else {
return false
}
}
.assign(to: \.isValidPasswordHasASymbol, on: self)
.store(in: &cancelableSet)

// isValidPasswordHasANumber
$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: \.isValidPasswordHasANumber, on: self)
.store(in: &cancelableSet)



Publishers.CombineLatest($password, $passwordConfirm)
.receive(on: RunLoop.main)
Expand Down Expand Up @@ -80,13 +141,26 @@ 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: "Username", value: $vm.username)
// RequirementText(text: "A minimum of 4 characters", isValid: vm.isValidUsernameLength)
// .padding()

FormTextField(name: "Mail", value: $vm.mail)
.keyboardType(.emailAddress)


RequirementText(text: "Must be a valid mail", isValid: vm.isValidMail)
.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: "At least one symbol", isValid: vm.isValidPasswordHasASymbol)
RequirementText(text: "At least one number", isValid: vm.isValidPasswordHasANumber)

}
.padding()
FormTextField(name: "Confirm Password", value: $vm.passwordConfirm, isSecure: true)
Expand Down Expand Up @@ -132,3 +206,4 @@ struct SignUpView: View {
#Preview {
SignUpView()
}