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.

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

Merge develop to imager #12

Merged
merged 24 commits into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
1ac7632
Add loginscreen
Loule95450 Feb 28, 2024
6378b12
Update App.tsx
Loule95450 Feb 28, 2024
0376cf2
Update App.tsx
Loule95450 Feb 28, 2024
10083e4
Add logo
Loule95450 Feb 28, 2024
dc62a0d
Update LoginScreen.tsx
Loule95450 Feb 28, 2024
7f3be86
Add style in login
Loule95450 Feb 28, 2024
8c00f95
Create colors utils
Loule95450 Feb 28, 2024
1abf96f
resolving conflict
Louis95Yang Feb 28, 2024
b3c06c5
pushing the navigate to Account
Louis95Yang Feb 28, 2024
3dea292
Pushing the hiding headers when we are in login page
Louis95Yang Feb 28, 2024
caccd80
Update LoginScreen.styles.ts
Loule95450 Feb 28, 2024
51379b8
Eslint resolving the tab nav
Louis95Yang Feb 28, 2024
5460942
Merge branch 'feature/login' of https://github.com/CodingFactory-Repo…
Loule95450 Feb 28, 2024
b1886bd
Update TabNavigator.tsx
Loule95450 Feb 28, 2024
b9185b8
Merge branch 'feature/login' of https://github.com/CodingFactory-Repo…
Loule95450 Feb 28, 2024
67a8ea3
Merge pull request #9 from CodingFactory-Repos/feature/imager
Ruiseki Feb 28, 2024
c5245be
Add register
Loule95450 Feb 28, 2024
1b9a899
Update RegisterScreen.styles.ts
Loule95450 Feb 28, 2024
bad864e
Merge branch 'develop' into feature/login
Loule95450 Feb 28, 2024
d620fa3
Update TabNavigator.tsx
Loule95450 Feb 28, 2024
cba9095
Set imager to ts
Loule95450 Feb 28, 2024
156b19a
Merge pull request #10 from CodingFactory-Repos/feature/login
Loule95450 Feb 28, 2024
321e47b
Delete .github/workflows/eslint.yml
Loule95450 Feb 28, 2024
58e9be4
Update src/screens/carrot/CarrotScreen.tsx
Loule95450 Feb 28, 2024
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
51 changes: 0 additions & 51 deletions .github/workflows/eslint.yml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -497,3 +497,4 @@ $RECYCLE.BIN/
# - Also handy if you have a large number of dependant pods
# - AS PER https://guides.cocoapods.org/using/using-cocoapods.html NEVER IGNORE THE LOCK FILE
Pods/
vendor/
105 changes: 105 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.7)
base64
nkf
rexml
activesupport (6.1.7.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
base64 (0.2.0)
claide (1.1.0)
cocoapods (1.14.3)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.14.3)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.6.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.14.3)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (2.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
cocoapods-trunk (1.6.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.2.3)
escape (0.0.4)
ethon (0.16.0)
ffi (>= 1.15.0)
ffi (1.16.3)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
json (2.7.1)
minitest (5.22.2)
molinillo (0.8.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
nkf (0.2.0)
public_suffix (4.0.7)
rexml (3.2.6)
ruby-macho (2.5.1)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
xcodeproj (1.24.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
zeitwerk (2.6.13)

PLATFORMS
ruby

DEPENDENCIES
activesupport (>= 6.1.7.5, < 7.1.0)
cocoapods (>= 1.13, < 1.15)

RUBY VERSION
ruby 2.6.10p210

BUNDLED WITH
2.3.4
Binary file added assets/kayu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1113,7 +1113,7 @@ PODS:
- React-jsi (= 0.73.5)
- React-logger (= 0.73.5)
- React-perflogger (= 0.73.5)
- RNCAsyncStorage (1.22.2):
- RNCAsyncStorage (1.22.3):
- React-Core
- RNScreens (3.29.0):
- glog
Expand Down Expand Up @@ -1396,12 +1396,12 @@ SPEC CHECKSUMS:
React-runtimescheduler: 814b644a5f456c7df1fba7bcd9914707152527c6
React-utils: 987a4526a2fc0acdfaf87888adfe0bf9d0452066
ReactCommon: 2947b0bffd82ea0e58ca7928881152d4c6dae9af
RNCAsyncStorage: 014a78b2cc8cc107c9e92ee428dc0c1ac3223416
RNCAsyncStorage: 10591b9e0a91eaffee14e69b3721009759235125
RNScreens: 17e2f657f1b09a71ec3c821368a04acbb7ebcb46
RNVectorIcons: 73ab573085f65a572d3b6233e68996d4707fd505
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
VisionCamera: 7a5c87805b13adaaa557132b44879ed1e1e39786
Yoga: 9e6a04eacbd94f97d94577017e9f23b3ab41cf6c
Yoga: a716eea57d0d3430219c0a5a233e1e93ee931eb7

PODFILE CHECKSUM: 0324d2f1bead3c67e34ad5270355479295c48a2e

Expand Down
Loading