Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
c534831
yg
cookiehankie Sep 20, 2023
ebaa8c3
Merge remote-tracking branch 'refs/remotes/origin/main'
cookiehankie Sep 20, 2023
df8f4d8
yg
cookiehankie Sep 20, 2023
c0a0f24
Please enter the commit message for your changes. Lines starting
txli299 Sep 20, 2023
5bbdb08
Init
txli299 Sep 20, 2023
bd20757
.gitignore
cdb19950522 Sep 21, 2023
a5c0d5c
change location
cdb19950522 Sep 21, 2023
8f91349
Merge pull request #5 from txli299/main
cdb19950522 Sep 21, 2023
0962722
rm
cdb19950522 Sep 21, 2023
dcf79a7
Add new viewController and Framework
txli299 Sep 25, 2023
57f8f90
Initial Start Screen UI
jcport1 Oct 1, 2023
fff8e1a
Store Layout finished
txli299 Oct 1, 2023
6c7a120
Wallet FrontPage
cookiehankie Oct 1, 2023
03eb931
Wallet FrontPage-MVC
cookiehankie Oct 1, 2023
0832aa5
Wallet FrontPage-MVC
cookiehankie Oct 1, 2023
fccc3d6
Init
txli299 Oct 2, 2023
efdedaa
Store page code finished
txli299 Oct 2, 2023
789070d
profile
cdb19950522 Oct 2, 2023
1db1cb9
Nick's change for time view
txli299 Oct 3, 2023
037c0f2
Initial Start Screen UI (#6)
jcport1 Oct 3, 2023
8f1cac5
Merge remote-tracking branch 'refs/remotes/origin/main'
txli299 Oct 3, 2023
7695230
Time view and Store view designing completed (#7)
txli299 Oct 3, 2023
38ec627
Update ViewController.swift
cdb19950522 Oct 3, 2023
79403b3
Merge branch 'main' into dingbang
cdb19950522 Oct 3, 2023
bbcad76
Merge pull request #4 from txli299/dingbang
cdb19950522 Oct 3, 2023
de593ec
Merge pull request #9 from txli299/main
cdb19950522 Oct 3, 2023
4d679cc
Merge pull request #10 from txli299/jeff
cdb19950522 Oct 3, 2023
183e34d
update
cookiehankie Oct 3, 2023
614ddf1
Merge branch 'main' into Yucheng
cdb19950522 Oct 3, 2023
28d6eb8
Merge pull request #11 from txli299/Yucheng
cdb19950522 Oct 3, 2023
8844030
Merge pull request #12 from txli299/main
cdb19950522 Oct 3, 2023
9499ceb
fix
cdb19950522 Oct 3, 2023
0df21bf
Merge remote-tracking branch 'refs/remotes/origin/main'
txli299 Oct 4, 2023
eb368ea
5 screens Integrated
txli299 Oct 5, 2023
2419b20
Merge branch 'cliff' into main
txli299 Oct 5, 2023
bf89ece
Merge pull request #15 from txli299/main
cdb19950522 Oct 5, 2023
c2942d0
comment
cdb19950522 Oct 3, 2023
fb68a0f
style changes
cdb19950522 Oct 12, 2023
441e8e8
Adds tab bar
jcport1 Oct 15, 2023
df9d265
Merge pull request #18 from txli299/dingbang
cdb19950522 Oct 18, 2023
b5f3e43
Merge branch 'main' into jeff
jcport1 Oct 18, 2023
762ad9f
Merge pull request #19 from txli299/jeff
jcport1 Oct 18, 2023
ca95f48
Login, sign up functionality added (#21)
txli299 Oct 20, 2023
7f0cb9e
Location services enabled
nicholasletarte Oct 20, 2023
2955dec
Merge pull request #23 from txli299/main
cdb19950522 Oct 27, 2023
478cba2
New images folder
nicholasletarte Nov 7, 2023
4abd3ef
Update README.md
nicholasletarte Nov 7, 2023
39a900a
Update README.md
nicholasletarte Nov 7, 2023
e202a0f
images folder
nicholasletarte Nov 7, 2023
1baba6c
Update README.md
nicholasletarte Nov 7, 2023
bc6db24
Merge pull request #24 from txli299/main
jcport1 Nov 10, 2023
8eebb9c
Initial Stripe API setup
jcport1 Nov 10, 2023
2c219dc
Adds Stripe API stack view and pay function
jcport1 Nov 13, 2023
ebcf1fa
Stripe API view
jcport1 Nov 13, 2023
584ce46
Wallet logic setup
jcport1 Nov 13, 2023
ac64d08
removes unused code
jcport1 Nov 13, 2023
25fd6ce
Login/Logout Logic & Json to Backend Updates
cookiehankie Nov 13, 2023
f967f3b
Login/Logout & Json updates
cookiehankie Nov 13, 2023
889f4c0
Store Location Functionality Enabled
nicholasletarte Nov 18, 2023
d68c812
Store Location Functionality Enabled
nicholasletarte Nov 18, 2023
093b83a
Choose cafe on time page
nicholasletarte Nov 19, 2023
1d536a5
UI Update
cookiehankie Nov 19, 2023
0289179
Merge pull request #26 from txli299/Yucheng
cookiehankie Nov 19, 2023
dd721b0
Merge pull request #27 from txli299/main
cdb19950522 Nov 20, 2023
794d7dd
Updates
jcport1 Nov 20, 2023
9d1fbcf
load balance and add balance backend functionality added to UI
jcport1 Nov 20, 2023
11ed971
Removes unnecessary print statements
jcport1 Nov 20, 2023
8bccc92
Merge branch 'main' into locationBranch
nicholasletarte Nov 20, 2023
cff523c
Merge pull request #22 from txli299/locationBranch
nicholasletarte Nov 20, 2023
71851d2
fix
cdb19950522 Nov 20, 2023
ad69c68
Merge pull request #30 from txli299/main
cdb19950522 Nov 20, 2023
ab58c54
pod
cdb19950522 Nov 20, 2023
1bf692b
time screen
cdb19950522 Nov 23, 2023
67140ab
Start page finished
txli299 Nov 24, 2023
74d1253
Check if order existed
txli299 Nov 24, 2023
cb025ba
Updates to gitignore
jcport1 Nov 28, 2023
77a7e27
resolves merge conflict
jcport1 Nov 28, 2023
7dc7c5b
xcode project files updated
jcport1 Nov 29, 2023
989ffed
Adds validations, uid to endpoint, and cleans up code
jcport1 Nov 29, 2023
49f6c49
Updates to User Service
jcport1 Nov 29, 2023
b32829f
Updates to WalletView
jcport1 Nov 29, 2023
2f12ae5
adds pod files
jcport1 Nov 29, 2023
d6edc98
Merge pull request #35 from txli299/jeff2
jcport1 Nov 30, 2023
7e246df
Merge branch 'main' into dingbang
cdb19950522 Nov 30, 2023
7d6943c
Merge pull request #31 from txli299/dingbang
cdb19950522 Nov 30, 2023
fb06332
ff
cdb19950522 Nov 30, 2023
70165c9
fix
cdb19950522 Nov 30, 2023
d7fb40f
refresh time
cdb19950522 Nov 30, 2023
59efa2b
UI Update
cookiehankie Nov 30, 2023
34d05ba
Merge pull request #36 from txli299/Yucheng
cookiehankie Nov 30, 2023
379aec7
Reload time and start page when navigating
txli299 Dec 1, 2023
8d9707a
Update README.md
nicholasletarte Dec 1, 2023
2a5e2ac
Fixes wallet/order bug
jcport1 Dec 1, 2023
14f244a
Merge branch 'main' of https://github.com/txli299/PowerUp
jcport1 Dec 1, 2023
c785fa3
Update README.md
nicholasletarte Dec 2, 2023
499aedf
Updated image
nicholasletarte Dec 2, 2023
c008eaf
Update README.md
nicholasletarte Dec 2, 2023
f8400d7
Update README.md
nicholasletarte Dec 4, 2023
1f37ac7
Scanning Function Update
cookiehankie Dec 5, 2023
cbe603e
Add appIcon
txli299 Dec 6, 2023
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 .DS_Store
Binary file not shown.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*.xcodeproj/xcuserdata/
.DS_Store
.xcodeproj
*.xcuserstate
Binary file added Images/POWER_UP.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/PowerUp.pdf.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Uncomment the next line to define a global platform for your project
# platform :ios, '9.0'

target 'PowerUp' do
# Comment the next line if you don't want to use dynamic frameworks
use_frameworks!
pod 'SwiftKeychainWrapper'
pod 'Alamofire'

# Pods for PowerUp
pod 'Alamofire'

target 'PowerUpTests' do
inherit! :search_paths
# Pods for testing
end

target 'PowerUpUITests' do
# Pods for testing
end

end
20 changes: 20 additions & 0 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
PODS:
- Alamofire (5.8.1)
- SwiftKeychainWrapper (4.0.1)

DEPENDENCIES:
- Alamofire
- SwiftKeychainWrapper

SPEC REPOS:
trunk:
- Alamofire
- SwiftKeychainWrapper

SPEC CHECKSUMS:
Alamofire: 3ca42e259043ee0dc5c0cdd76c4bc568b8e42af7
SwiftKeychainWrapper: 807ba1d63c33a7d0613288512399cd1eda1e470c

PODFILE CHECKSUM: bf2ff8da615b1d74f26a9300de94dbd2d59b6a33

COCOAPODS: 1.13.0
19 changes: 19 additions & 0 deletions Pods/Alamofire/LICENSE

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

227 changes: 227 additions & 0 deletions Pods/Alamofire/README.md

Large diffs are not rendered by default.

874 changes: 874 additions & 0 deletions Pods/Alamofire/Source/AFError.swift

Large diffs are not rendered by default.

40 changes: 40 additions & 0 deletions Pods/Alamofire/Source/Alamofire.swift

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

61 changes: 61 additions & 0 deletions Pods/Alamofire/Source/AlamofireExtended.swift

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

Loading