<commit_before>//
//  SettingsViewController.swift
//  Everest
//
//  Created by <NAME> on 10/13/17.
//  Copyright © 2017 <NAME>. All rights reserved.
//

import UIKit
import SwiftyJSON
enum ActionStatus: String {
  case inProgress = "in progress"
  case completed = "completed"
}
class SettingsViewController: UIViewController {
<<<<<<< HEAD
  var moment: Moment!
  var user: User!
  var action: Action!
  
  override func viewDidLoad() {
    super.viewDidLoad()
    
  }
  
  override func viewWillAppear(_ animated: Bool) {
    super.viewWillAppear(true)
    
    //register new user by email
    FireBaseManager.shared.registerNewUserWithEmail(name: "akrm", email: "<EMAIL>", password: "<PASSWORD>") { (user, error) in
      let newUser = user
    }
    
    //login using email + creating a user in our data base
    FireBaseManager.shared.loginUserWithEmail(email: "<EMAIL>", password: "<PASSWORD>") { (user, error) in
      if error == nil {
        self.user = User(id: FireBaseManager.UID, name: "<NAME>", email: "<EMAIL>", phone: "22332112", anonymous: false, createdDate: "\(Date())")
        FireBaseManager.shared.updateUser(user: self.user)
        
        
        //creating an action property within the User data model
        self.action = Action(id: "someIdAct", categoryId: "someIdCategory", createdAt: "\(Date())", status: ActionStatus.inProgress.rawValue)
        FireBaseManager.shared.updateAction(action: self.action)
        
        //creating a new moment
        let picUrls = ["www.test.com\\pic1", "www.test.com\\pic2"]
        let geoLocation = ["lat": "12.33333", "lon": "233.333332"]
        self.moment = Moment(title: "what a great feeling", details: "When I started the act ...", actId: self.action.id, userId: FireBaseManager.UID, timestamp: "\(Date())", picUrls: picUrls, geoLocation: geoLocation, location: "some address")
        FireBaseManager.shared.updateMoment(moment: self.moment)
        
        
        //get the moment timeline
        FireBaseManager.shared.getMomentsTimeLine(startAtMomentId: nil) { (moments, error) in
          if error == nil {
            var timelineMoments = moments
          }
        }
      }
=======
    var moment: Moment!
    var user: User!
    var action: Action!
    override func viewDidLoad() {
        super.viewDidLoad()
      
        FireBaseManager.shared.fetchAvailableActs(category: "Empathy")
      
        //register new user by email
        FireBaseManager.shared.registerNewUserWithEmail(name: "akrm", email: "<EMAIL>", password: "<PASSWORD>") { (user, error) in
            let newUser = user
        }
        
        //login using email + creating a user in our data base
        FireBaseManager.shared.loginUserWithEmail(email: "<EMAIL>", password: "<PASSWORD>") { (user, error) in
            if error == nil {
                self.user = User(id: FireBaseManager.UID, name: "<NAME>", email: "<EMAIL>", phone: "22332112", anonymous: false, createdDate: "\(Date())")
                FireBaseManager.shared.updateUser(user: self.user)
                
                
                //creating an action property within the User data model
                self.action = Action(id: "someIdAct", createdAt: "\(Date())", status: ActionStatus.inProgress.rawValue)
                FireBaseManager.shared.updateAction(action: self.action)
                
                //creating a new moment
                let picUrls = ["www.test.com\\pic1", "www.test.com\\pic2"]
                let geoLocation = ["lat": "12.33333", "lon": "233.333332"]
                self.moment = Moment(title: "what a great feeling", details: "When I started the act ...", actId: self.action.id, userId: FireBaseManager.UID, timestamp: "\(Date())", picUrls: picUrls, geoLocation: geoLocation, location: "some address")
                FireBaseManager.shared.updateMoment(moment: self.moment, newMoment: true)
                
                
                //get the moment timeline
                FireBaseManager.shared.getMomentsTimeLine(startAtMomentId: nil) { (moments, error) in
                    if error == nil {
                        var timelineMoments = moments
                    }
                }
            }
        }
      
    }

    override func didReceiveMemoryWarning() {
        super.didReceiveMemoryWarning()
        // Dispose of any resources that can be recreated.
>>>>>>> origin/master
    }
    
  }
  
}<commit_msg>removed conflict<commit_after>//
//  SettingsViewController.swift
//  Everest
//
//  Created by <NAME> on 10/13/17.
//  Copyright © 2017 <NAME>. All rights reserved.
//

import UIKit
import SwiftyJSON
enum ActionStatus: String {
  case inProgress = "in progress"
  case completed = "completed"
}
class SettingsViewController: UIViewController {
  
  var moment: Moment!
  var user: User!
  var action: Action!
  override func viewDidLoad() {
    super.viewDidLoad()
    
    FireBaseManager.shared.fetchAvailableActs(category: "Empathy")
    
    //register new user by email
    FireBaseManager.shared.registerNewUserWithEmail(name: "akrm", email: "<EMAIL>", password: "<PASSWORD>") { (user, error) in
      let newUser = user
    }
    
    //login using email + creating a user in our data base
    FireBaseManager.shared.loginUserWithEmail(email: "<EMAIL>", password: "<PASSWORD>") { (user, error) in
      if error == nil {
        self.user = User(id: FireBaseManager.UID, name: "<NAME>", email: "<EMAIL>", phone: "22332112", anonymous: false, createdDate: "\(Date())")
        FireBaseManager.shared.updateUser(user: self.user)
        
        
        //creating an action property within the User data model
        self.action = Action(id: "someIdAct", createdAt: "\(Date())", status: ActionStatus.inProgress.rawValue)
        FireBaseManager.shared.updateAction(action: self.action)
        
        //creating a new moment
        let picUrls = ["www.test.com\\pic1", "www.test.com\\pic2"]
        let geoLocation = ["lat": "12.33333", "lon": "233.333332"]
        self.moment = Moment(title: "what a great feeling", details: "When I started the act ...", actId: self.action.id, userId: FireBaseManager.UID, timestamp: "\(Date())", picUrls: picUrls, geoLocation: geoLocation, location: "some address")
        FireBaseManager.shared.updateMoment(moment: self.moment, newMoment: true)
        
        
        //get the moment timeline
        FireBaseManager.shared.getMomentsTimeLine(startAtMomentId: nil) { (moments, error) in
          if error == nil {
            var timelineMoments = moments
          }
        }
      }
    }
    
  }

}
{'fraction_non_alphanumeric': 0.12547355659948478, 'fraction_numerical': 0.0148507349598424, 'mean_word_length': 2.4755134281200633, 'pattern_counts': {'":': 6, '<': 32, '<?xml version=': 0, '>': 32, 'https://': 0, 'lorem ipsum': 0, 'www.': 6, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '5527075', 'n_tokens_mistral': 1992, 'n_tokens_neox': 1877, 'n_words': 512}