525bc7c · dashared/GDproject

git.iko.soy/dashared/GDproject

on master help sign in

fixed a few bugs

525bc7cDarya Rednikina7 years ago

GDproject/Controller/Log In/FacultyTableViewController.swift+1

compare with master

unifiedsplit

@@ -81,6 +81,7 @@ class FacultyTableViewController: UITableViewController {

82 override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {

83 delegate?.onChooseFaculty(faculty: currentFaculties[indexPath.row])

84+ searchController.dismiss(animated: true, completion: nil)

84 self.navigationController?.popViewController(animated: true)

85 self.navigationController?.popViewController(animated: true)

85 }

86 }

GDproject/Controller/Log In/LogInViewController.swift+2

@@ -47,6 +47,8 @@ class LogInViewController: UIViewController {

47 textField.placeholder = "Mail"

48 textField.borderStyle = .roundedRect

49 textField.textColor = .black

50+ textField.autocorrectionType = UITextAutocorrectionType.no

51+ textField.autocapitalizationType = UITextAutocapitalizationType.none

50 textField.clearButtonMode = .always

52 textField.clearButtonMode = .always

51 return textField

53 return textField

52 }()

54 }()

GDproject/Simple model/Model.swift+88−3

@@ -17,12 +17,14 @@ class Model{

17 static var hashTagTree: CompletionTree?

19 private static var isValidTocken: ((Int)->())? = { responce in

20− print(responce)

20+

21 if responce == invalidTocken {

22+

23+ DataStorage.standard.setIsLoggedIn(value: false, with: 0)

24+ (UIApplication.shared.delegate as! AppDelegate).relaunch()

25+

22 Model.logout {

26 Model.logout {

23 print("Logout Is Successful")

27 print("Logout Is Successful")

24− DataStorage.standard.setIsLoggedIn(value: false, with: 0)

25− (UIApplication.shared.delegate as! AppDelegate).relaunch()

26 }

28 }

27 }

29 }

28 }

30 }

@@ -208,6 +210,10 @@ class Model{

208 AF.request(request).response { (responce) in

210 AF.request(request).response { (responce) in

209 isValidTocken?(responce.response?.statusCode ?? 498)

211 isValidTocken?(responce.response?.statusCode ?? 498)

210

212

213+ if let code = responce.response?.statusCode, code == 498 {

214+ return

215+ }

216+

211 completion()

217 completion()

212 }

218 }

213 }

219 }

@@ -240,6 +246,10 @@ class Model{

240 guard let code = responce.response?.statusCode else { return }

246 guard let code = responce.response?.statusCode else { return }

241 isValidTocken?(code)

247 isValidTocken?(code)

242

248

249+ if let code = responce.response?.statusCode, code == 498 {

250+ return

251+ }

252+

243 if code == 204 {

253 if code == 204 {

244 let fields = responce.response?.allHeaderFields as? [String :String]

254 let fields = responce.response?.allHeaderFields as? [String :String]

245

255

@@ -249,6 +259,7 @@ class Model{

249

259

250 completion()

260 completion()

251 }

261 }

262+

252 }

263 }

253 }

264 }

254

265

@@ -264,6 +275,10 @@ class Model{

264 guard let statusCode = responce.response?.statusCode else { completion(false); return }

275 guard let statusCode = responce.response?.statusCode else { completion(false); return }

265 isValidTocken?(statusCode)

276 isValidTocken?(statusCode)

266

277

278+ if let code = responce.response?.statusCode, code == 498 {

279+ return

280+ }

281+

267 if statusCode == 204 {

282 if statusCode == 204 {

268 // at this point cookies are set

283 // at this point cookies are set

269 completion(true)

284 completion(true)

@@ -283,6 +298,10 @@ class Model{

283 guard let statusCode = responce.response?.statusCode else { completion(false); return }

298 guard let statusCode = responce.response?.statusCode else { completion(false); return }

284 isValidTocken?(statusCode)

299 isValidTocken?(statusCode)

285

300

301+ if let code = responce.response?.statusCode, code == 498 {

302+ return

303+ }

304+

286 guard let json = responce.data else { return }

305 guard let json = responce.data else { return }

287 guard let personId = Int(String(data: json, encoding: String.Encoding.utf8)!) else {

306 guard let personId = Int(String(data: json, encoding: String.Encoding.utf8)!) else {

288 completion(false)

307 completion(false)

@@ -377,6 +396,10 @@ class Model{

377

396

378 isValidTocken?(response.response?.statusCode ?? 498)

397 isValidTocken?(response.response?.statusCode ?? 498)

379

398

399+ if let code = response.response?.statusCode, code == 498 {

400+ return

401+ }

402+

380 guard let json = response.data else { return }

403 guard let json = response.data else { return }

381

404

382 guard let newQueery = try? decoder.decode(QueryPosts<Posts>.self, from: json) else { print("no")

405 guard let newQueery = try? decoder.decode(QueryPosts<Posts>.self, from: json) else { print("no")

@@ -402,6 +425,10 @@ class Model{

402 (response) in

425 (response) in

403

426

404 isValidTocken?(response.response?.statusCode ?? 498)

427 isValidTocken?(response.response?.statusCode ?? 498)

428+

429+ if let code = response.response?.statusCode, code == 498 {

430+ return

431+ }

405 }

432 }

406 }

433 }

407

434

@@ -427,6 +454,10 @@ class Model{

427

454

428 isValidTocken?(response.response?.statusCode ?? 498)

455 isValidTocken?(response.response?.statusCode ?? 498)

429

456

457+ if let code = response.response?.statusCode, code == 498 {

458+ return

459+ }

460+

430 guard let json = response.data else { return }

461 guard let json = response.data else { return }

431

462

432 guard let newPost = try? decoder.decode(QueryPosts<Posts>.self, from: json) else { return }

463 guard let newPost = try? decoder.decode(QueryPosts<Posts>.self, from: json) else { return }

@@ -453,6 +484,10 @@ class Model{

453

484

454 isValidTocken?(response.response?.statusCode ?? 498)

485 isValidTocken?(response.response?.statusCode ?? 498)

455

486

487+ if let code = response.response?.statusCode, code == 498 {

488+ return

489+ }

490+

456 guard let json = response.data else { return }

491 guard let json = response.data else { return }

457

492

458 guard let users = try? decoder.decode([Users].self, from: json) else { return }

493 guard let users = try? decoder.decode([Users].self, from: json) else { return }

@@ -485,6 +520,9 @@ class Model{

485

520

486 isValidTocken?(response.response?.statusCode ?? 498)

521 isValidTocken?(response.response?.statusCode ?? 498)

487

522

523+ if let code = response.response?.statusCode, code == 498 {

524+ return

525+ }

488

526

489 guard let json = response.data else { return }

527 guard let json = response.data else { return }

490

528

@@ -507,6 +545,9 @@ class Model{

507 (response) in

545 (response) in

508

546

509 isValidTocken?(response.response?.statusCode ?? 498)

547 isValidTocken?(response.response?.statusCode ?? 498)

548+ if let code = response.response?.statusCode, code == 498 {

549+ return

550+ }

510 }

551 }

511

552

512 }

553 }

@@ -519,6 +560,9 @@ class Model{

519 AF.request(request).responseJSON { (response) in

560 AF.request(request).responseJSON { (response) in

520

561

521 isValidTocken?(response.response?.statusCode ?? 498)

562 isValidTocken?(response.response?.statusCode ?? 498)

563+ if let code = response.response?.statusCode, code == 498 {

564+ return

565+ }

522

566

523 guard let json = response.data else { return }

567 guard let json = response.data else { return }

524

568

@@ -537,6 +581,9 @@ class Model{

537

581

538 AF.request(request).response { (response) in

582 AF.request(request).response { (response) in

539 isValidTocken?(response.response?.statusCode ?? 498)

583 isValidTocken?(response.response?.statusCode ?? 498)

584+ if let code = response.response?.statusCode, code == 498 {

585+ return

586+ }

540 }

587 }

541 completion()

588 completion()

542 }

589 }

@@ -552,6 +599,9 @@ class Model{

552 (response) in

599 (response) in

553

600

554 isValidTocken?(response.response?.statusCode ?? 498)

601 isValidTocken?(response.response?.statusCode ?? 498)

602+ if let code = response.response?.statusCode, code == 498 {

603+ return

604+ }

555 }

605 }

556 }

606 }

557

607

@@ -574,6 +624,9 @@ class Model{

574 }

624 }

575

625

576 isValidTocken?(response.response?.statusCode ?? 498)

626 isValidTocken?(response.response?.statusCode ?? 498)

627+ if let code = response.response?.statusCode, code == 498 {

628+ return

629+ }

577 }

630 }

578 }

631 }

579

632

@@ -649,6 +702,9 @@ class Model{

649 (response) in

702 (response) in

650

703

651 isValidTocken?(response.response?.statusCode ?? 498)

704 isValidTocken?(response.response?.statusCode ?? 498)

705+ if let code = response.response?.statusCode, code == 498 {

706+ return

707+ }

652

708

653 guard let json = response.data else { return }

709 guard let json = response.data else { return }

654

710

@@ -664,6 +720,9 @@ class Model{

664 AF.request(URLRequest(url: hashTagTreeURL)).responseJSON {

720 AF.request(URLRequest(url: hashTagTreeURL)).responseJSON {

665 (response) in

721 (response) in

666 isValidTocken?(response.response?.statusCode ?? 498)

722 isValidTocken?(response.response?.statusCode ?? 498)

723+ if let code = response.response?.statusCode, code == 498 {

724+ return

725+ }

667 guard let json = response.data else { return }

726 guard let json = response.data else { return }

668 guard let tree = try? decoder.decode(CompletionTree.self, from: json) else { return }

727 guard let tree = try? decoder.decode(CompletionTree.self, from: json) else { return }

669 completion(tree)

728 completion(tree)

@@ -681,6 +740,10 @@ class Model{

681 AF.request(request).responseJSON { response in

740 AF.request(request).responseJSON { response in

682 isValidTocken?(response.response?.statusCode ?? 498)

741 isValidTocken?(response.response?.statusCode ?? 498)

683

742

743+ if let code = response.response?.statusCode, code == 498 {

744+ return

745+ }

746+

684 guard let json = response.data else { return }

747 guard let json = response.data else { return }

685 let dialogs = try! decoder.decode(QueryPosts<Dialog>.self, from: json)

748 let dialogs = try! decoder.decode(QueryPosts<Dialog>.self, from: json)

686

749

@@ -852,6 +915,9 @@ class Model{

852 AF.request(request).response { (response) in

915 AF.request(request).response { (response) in

853

916

854 isValidTocken?(response.response?.statusCode ?? 498)

917 isValidTocken?(response.response?.statusCode ?? 498)

918+ if let code = response.response?.statusCode, code == 498 {

919+ return

920+ }

855

921

856 guard let json = response.data else { return }

922 guard let json = response.data else { return }

857 let stringInt = String.init(data: json, encoding: String.Encoding.utf8)

923 let stringInt = String.init(data: json, encoding: String.Encoding.utf8)

@@ -880,6 +946,9 @@ class Model{

880 AF.request(request!).response { (response) in

946 AF.request(request!).response { (response) in

881

947

882 isValidTocken?(response.response?.statusCode ?? 498)

948 isValidTocken?(response.response?.statusCode ?? 498)

949+ if let code = response.response?.statusCode, code == 498 {

950+ return

951+ }

883

952

884 guard let json = response.data else { return }

953 guard let json = response.data else { return }

885 guard let messages = try? decoder.decode([LastMessage].self, from: json) else { return }

954 guard let messages = try? decoder.decode([LastMessage].self, from: json) else { return }

@@ -897,6 +966,10 @@ class Model{

897

966

898 AF.request(request).response { (response) in

967 AF.request(request).response { (response) in

899 isValidTocken?(response.response?.statusCode ?? 498)

968 isValidTocken?(response.response?.statusCode ?? 498)

969+

970+ if let code = response.response?.statusCode, code == 498 {

971+ return

972+ }

900 }

973 }

901

974

902 completion()

975 completion()

@@ -911,6 +984,10 @@ class Model{

911

984

912 AF.request(request).response { (response) in

985 AF.request(request).response { (response) in

913 isValidTocken?(response.response?.statusCode ?? 498)

986 isValidTocken?(response.response?.statusCode ?? 498)

987+

988+ if let code = response.response?.statusCode, code == 498 {

989+ return

990+ }

914 }

991 }

915

992

916 // completion()

993 // completion()

@@ -963,6 +1040,10 @@ class Model{

963 AF.request(request).response { (response) in

1040 AF.request(request).response { (response) in

964 isValidTocken?(response.response?.statusCode ?? 498)

1041 isValidTocken?(response.response?.statusCode ?? 498)

965

1042

1043+ if let code = response.response?.statusCode, code == 498 {

1044+ return

1045+ }

1046+

966 completion()

1047 completion()

967 }

1048 }

968 }

1049 }

@@ -990,6 +1071,10 @@ class Model{

990 AF.request(request).response { (response) in

1071 AF.request(request).response { (response) in

991 isValidTocken?(response.response?.statusCode ?? 498)

1072 isValidTocken?(response.response?.statusCode ?? 498)

992

1073

1074+ if let code = response.response?.statusCode, code == 498 {

1075+ return

1076+ }

1077+

993 guard let json = response.data else { return }

1078 guard let json = response.data else { return }

994 guard let faculties = try? decoder.decode([Faculty].self, from: json) else { return }

1079 guard let faculties = try? decoder.decode([Faculty].self, from: json) else { return }

995

1080