Skip to content

Eliot han mdb socials #33

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

Open
eliot1019 wants to merge 87 commits into
base: master
Choose a base branch
from
Open

Eliot han mdb socials #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
8ef560a
Initial Commit
eliot1019 Oct 3, 2016
7fad803
First Commit. Setup Firebase
eliot1019 Oct 3, 2016
3f51f33
Added Firebase/Auth pod and setup basic UI elements on login screen
eliot1019 Oct 4, 2016
0fa9943
Super basic login screen setup using frames. Will need to change to c…
eliot1019 Oct 4, 2016
aff3cf3
segue to signup
eliot1019 Oct 5, 2016
cff0204
If user is already logged in go straight to feedVC
eliot1019 Oct 5, 2016
39a125a
login layout
rochelle-shen Oct 5, 2016
4bb7416
Merge remote-tracking branch 'origin/master'
rochelle-shen Oct 5, 2016
83990d4
minor change
eliot1019 Oct 5, 2016
fd0291a
minorchange2
eliot1019 Oct 5, 2016
d61441f
Added Create Event VC, fixed bugs, more progress
eliot1019 Oct 5, 2016
7638855
changes?
rochelle-shen Oct 7, 2016
5a5c109
Merge remote-tracking branch 'origin/master'
rochelle-shen Oct 7, 2016
fa08707
Post Button Added and unwind segue created.
eliot1019 Oct 12, 2016
31fae57
Setup basic UI in create event VC. Added a constants file to access c…
eliot1019 Oct 12, 2016
7f92a76
Merge remote-tracking branch 'origin/master'
rochelle-shen Oct 12, 2016
8881864
signoutbutton, reinstalled all pods
eliot1019 Oct 12, 2016
182e44a
constants...
rochelle-shen Oct 12, 2016
f0a3f93
Merge remote-tracking branch 'origin/master'
rochelle-shen Oct 12, 2016
9696c48
Added UIImagePicker
eliot1019 Oct 12, 2016
0ac8990
Merge remote-tracking branch 'origin/master'
eliot1019 Oct 12, 2016
911a7b3
fixing this hierarchy thing
rochelle-shen Oct 12, 2016
37bc085
Merge remote-tracking branch 'origin/master'
eliot1019 Oct 12, 2016
6f92e0e
adjustment
rochelle-shen Oct 12, 2016
fc40a10
testing UI
rochelle-shen Oct 12, 2016
d5131a5
Action Sheet Fully Implemented with Camera and Library
eliot1019 Oct 13, 2016
820400c
Merge remote-tracking branch 'origin/master'
eliot1019 Oct 13, 2016
af35d10
Merged
eliot1019 Oct 13, 2016
d5c3cbe
commit
rochelle-shen Oct 13, 2016
9ef141a
Merge remote-tracking branch 'origin/master'
rochelle-shen Oct 13, 2016
1c332f3
some progress :))))
rochelle-shen Oct 13, 2016
fd8f433
Firebase code for events data in, not working currently.
eliot1019 Oct 13, 2016
b09686c
Merge remote-tracking branch 'origin/master'
eliot1019 Oct 13, 2016
5754c51
Merge remote-tracking branch 'origin/master'
rochelle-shen Oct 13, 2016
ca1df4d
now nav bar shows
rochelle-shen Oct 13, 2016
87d8e6b
Firebase write data works!
eliot1019 Oct 13, 2016
e5ae92d
Tried to resolve merge conflicts 1
eliot1019 Oct 13, 2016
ca0a4ed
don't conflict
rochelle-shen Oct 13, 2016
9371a43
Merge remote-tracking branch 'origin/master'
rochelle-shen Oct 13, 2016
a6dafa4
Minor changes, merging with Rochelle's commit
eliot1019 Oct 13, 2016
e42ca13
Merge remote-tracking branch 'origin/master'
eliot1019 Oct 13, 2016
6c2ddaa
Added Users in Firebase Database and Added pod for FirStorage and hav…
eliot1019 Oct 13, 2016
bd811ec
this icon thing is annoying
rochelle-shen Oct 13, 2016
1402307
Merge remote-tracking branch 'origin/master'
rochelle-shen Oct 13, 2016
4923a97
register page looking good
rochelle-shen Oct 14, 2016
f7eea3f
Firebase Storage For images done
eliot1019 Oct 14, 2016
c95e886
Merge remote-tracking branch 'origin/master'
rochelle-shen Oct 14, 2016
88cbdc5
Detailsviewcontroller and cell
rochelle-shen Oct 14, 2016
e1af960
Tableview stuff implemented without cell stuff
eliot1019 Oct 14, 2016
94d3dae
Merge remote-tracking branch 'origin/master'
eliot1019 Oct 14, 2016
c40e23f
I uploaded the font now
rochelle-shen Oct 14, 2016
7824adc
Merge remote-tracking branch 'origin/master'
rochelle-shen Oct 14, 2016
2ee5406
I uploaded the font
rochelle-shen Oct 14, 2016
62a537e
..
eliot1019 Oct 14, 2016
d178744
Merge remote-tracking branch 'origin/master'
eliot1019 Oct 14, 2016
4f0c766
deleted the extra stuff
rochelle-shen Oct 14, 2016
0b4f403
Merge remote-tracking branch 'origin/master'
eliot1019 Oct 14, 2016
456ff05
k
rochelle-shen Oct 14, 2016
8170195
s.
eliot1019 Oct 14, 2016
eded944
Merge remote-tracking branch 'origin/master'
eliot1019 Oct 14, 2016
b0b3e3d
:)
rochelle-shen Oct 14, 2016
72eec6f
pls work ...
eliot1019 Oct 14, 2016
c63b79b
fix?
eliot1019 Oct 14, 2016
6a21706
Merge branch 'master' of https://github.com/eliot1019/MDBSocials
eliot1019 Oct 14, 2016
8443826
trying to firsnapshot stuff for tableview
eliot1019 Oct 14, 2016
4267ced
UI for Creating an Event
rochelle-shen Oct 14, 2016
69cb3a2
Merge remote-tracking branch 'origin/master'
rochelle-shen Oct 14, 2016
6d7c6e6
Got names to update in cell
eliot1019 Oct 14, 2016
99d3af8
Merge remote-tracking branch 'origin/master'
eliot1019 Oct 14, 2016
f26b7dc
Changes to Login
rochelle-shen Oct 14, 2016
fbf32f1
fix merge
rochelle-shen Oct 14, 2016
16bde85
.
eliot1019 Oct 14, 2016
842a6b8
Merge branch 'master' of https://github.com/eliot1019/MDBSocials
eliot1019 Oct 14, 2016
7ae14a6
merging! :)
rochelle-shen Oct 14, 2016
8360d0c
ui changes more work
eliot1019 Oct 14, 2016
ca7b3a5
Mergin
rochelle-shen Oct 14, 2016
ea736e4
pizza
eliot1019 Oct 14, 2016
e6a642e
i just ate artichokes pizza W00t!!!!
rochelle-shen Oct 14, 2016
707923a
Merge remote-tracking branch 'origin/master'
eliot1019 Oct 14, 2016
49e5aec
Merge branch 'master' of https://github.com/eliot1019/MDBSocials
rochelle-shen Oct 14, 2016
9ec796e
Fixing UI
rochelle-shen Oct 14, 2016
55ba9c6
fixed merge conflicts
eliot1019 Oct 14, 2016
0d4e3a5
merge
eliot1019 Oct 14, 2016
e949831
username labels
eliot1019 Oct 14, 2016
e818891
done -ish
rochelle-shen Oct 14, 2016
c227df8
donee ya
rochelle-shen Oct 14, 2016
0c1e9ca
Merge branch 'master' of https://github.com/ssuresh2dev/mdbtrainingpr…
eliot1019 Oct 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
667 changes: 667 additions & 0 deletions MDBSocials.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions MDBSocials.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

118 changes: 118 additions & 0 deletions MDBSocials.xcodeproj/xcuserdata/eliothan.xcuserdatad/xcschemes/MDBSocials.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "152F0ADD1DA2454C00CB7D34"
BuildableName = "MDBSocials.app"
BlueprintName = "MDBSocials"
ReferencedContainer = "container:MDBSocials.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "152F0AF11DA2454C00CB7D34"
BuildableName = "MDBSocialsTests.xctest"
BlueprintName = "MDBSocialsTests"
ReferencedContainer = "container:MDBSocials.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "152F0AFC1DA2454C00CB7D34"
BuildableName = "MDBSocialsUITests.xctest"
BlueprintName = "MDBSocialsUITests"
ReferencedContainer = "container:MDBSocials.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "152F0ADD1DA2454C00CB7D34"
BuildableName = "MDBSocials.app"
BlueprintName = "MDBSocials"
ReferencedContainer = "container:MDBSocials.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "152F0ADD1DA2454C00CB7D34"
BuildableName = "MDBSocials.app"
BlueprintName = "MDBSocials"
ReferencedContainer = "container:MDBSocials.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<EnvironmentVariables>
<EnvironmentVariable
key = "OS_ACTIVITY_MODE"
value = "disable"
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "152F0ADD1DA2454C00CB7D34"
BuildableName = "MDBSocials.app"
BlueprintName = "MDBSocials"
ReferencedContainer = "container:MDBSocials.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
32 changes: 32 additions & 0 deletions MDBSocials.xcodeproj/xcuserdata/eliothan.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?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>MDBSocials.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>152F0ADD1DA2454C00CB7D34</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>152F0AF11DA2454C00CB7D34</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>152F0AFC1DA2454C00CB7D34</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
111 changes: 111 additions & 0 deletions MDBSocials.xcodeproj/xcuserdata/rochelleshen.xcuserdatad/xcschemes/MDBSocials.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "152F0ADD1DA2454C00CB7D34"
BuildableName = "MDBSocials.app"
BlueprintName = "MDBSocials"
ReferencedContainer = "container:MDBSocials.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "152F0AF11DA2454C00CB7D34"
BuildableName = "MDBSocialsTests.xctest"
BlueprintName = "MDBSocialsTests"
ReferencedContainer = "container:MDBSocials.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "152F0AFC1DA2454C00CB7D34"
BuildableName = "MDBSocialsUITests.xctest"
BlueprintName = "MDBSocialsUITests"
ReferencedContainer = "container:MDBSocials.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "152F0ADD1DA2454C00CB7D34"
BuildableName = "MDBSocials.app"
BlueprintName = "MDBSocials"
ReferencedContainer = "container:MDBSocials.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "152F0ADD1DA2454C00CB7D34"
BuildableName = "MDBSocials.app"
BlueprintName = "MDBSocials"
ReferencedContainer = "container:MDBSocials.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "152F0ADD1DA2454C00CB7D34"
BuildableName = "MDBSocials.app"
BlueprintName = "MDBSocials"
ReferencedContainer = "container:MDBSocials.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
32 changes: 32 additions & 0 deletions MDBSocials.xcodeproj/xcuserdata/rochelleshen.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?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>MDBSocials.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>152F0ADD1DA2454C00CB7D34</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>152F0AF11DA2454C00CB7D34</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>152F0AFC1DA2454C00CB7D34</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
10 changes: 10 additions & 0 deletions MDBSocials.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions MDBSocials.xcworkspace/xcuserdata/eliothan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
type = "0"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.SwiftErrorBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
Binary file added MDBSocials.xcworkspace/xcuserdata/rochelleshen.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
23 changes: 23 additions & 0 deletions ...ials.xcworkspace/xcuserdata/rochelleshen.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
type = "0"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "MDBSocials/FeedViewController.swift"
timestampString = "498120823.473138"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "55"
endingLineNumber = "55"
landmarkName = "prepare(for:sender:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
Loading