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.

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

Jump to bottom

Aliases import #35

Merged
merged 4 commits into from
Aug 11, 2020
Merged

Aliases import #35

merged 4 commits into from
Aug 11, 2020

Conversation

ckiss
Copy link
Contributor

@ckiss ckiss commented Aug 7, 2020 •
edited
Loading

ref

  • All react source files moved from repo root to root/src folder
  • Aliases to top level folders in src added to babel and tsconfig with support for assets, components, constants, hooks,
    services, providers, theme
  • Import relative paths changed to use aliases
  • Colors import added to theme's index.ts to have easy, combined import like import { text, colors } from 'theme'
  • added missing type declarations for: react-native-easy-markdown, react-native-google-safetynet, react-native-ios11-devicecheck
  • sorted imports: dependencies at the top and then local imports

ckiss added 2 commits August 7, 2020 13:18
@ckiss
Merge branch 'current' of https://github.com/ckiss/covid-green-app in…
286e330 
…to aliases-import

# Conflicts:
#	src/assets/icons/app/alert.svg
#	src/assets/icons/app/arrow-right.svg
#	src/assets/icons/app/back-android.svg
#	src/assets/icons/app/back-ios.svg
#	src/assets/icons/app/bluetooth.svg
#	src/assets/icons/app/close.svg
#	src/assets/icons/app/notification.svg
#	src/assets/icons/app/share-android.svg
#	src/assets/icons/app/share-ios.svg
#	src/assets/icons/app/success.svg
#	src/assets/icons/bubble/cases.svg
#	src/assets/icons/bubble/check-in.svg
#	src/assets/icons/bubble/deaths.svg
#	src/assets/icons/bubble/hospital.svg
#	src/assets/icons/bubble/icu.svg
#	src/assets/icons/bubble/map-pin.svg
#	src/assets/icons/bubble/phone-call.svg
#	src/assets/icons/bubble/shield.svg
#	src/assets/icons/bubble/survey.svg
#	src/assets/icons/bubble/symptom.svg
#	src/assets/icons/check-mark-multiselect.svg
#	src/assets/icons/check-mark.svg
#	src/assets/icons/index.ts
#	src/assets/icons/logo.svg
#	src/assets/icons/privacy.svg
#	src/assets/icons/tab-bar/check-in.svg
#	src/assets/icons/tab-bar/contact-tracing-off.svg
#	src/assets/icons/tab-bar/contact-tracing-on.svg
#	src/assets/icons/tab-bar/contact-tracing-unknown.svg
#	src/assets/icons/tab-bar/settings-android.svg
#	src/assets/icons/tab-bar/settings-ios.svg
#	src/assets/icons/tab-bar/updates.svg
#	src/assets/images/age/age.png
#	src/assets/images/age/age@2x.png
#	src/assets/images/age/age@3x.png
#	src/assets/images/alert/alert.png
#	src/assets/images/alert/alert@2x.png
#	src/assets/images/alert/alert@3x.png
#	src/assets/images/arrow-down/arrow-down.png
#	src/assets/images/arrow-down/arrow-down@2x.png
#	src/assets/images/arrow-down/arrow-down@3x.png
#	src/assets/images/arrow-right/teal.png
#	src/assets/images/arrow-right/teal@2x.png
#	src/assets/images/arrow-right/teal@3x.png
#	src/assets/images/arrow-right/white.png
#	src/assets/images/arrow-right/white@2x.png
#	src/assets/images/arrow-right/white@3x.png
#	src/assets/images/back/back.png
#	src/assets/images/back/back@2x.png
#	src/assets/images/back/back@3x.png
#	src/assets/images/bar-chart/bar-chart-active.png
#	src/assets/images/bar-chart/bar-chart-active@2x.png
#	src/assets/images/bar-chart/bar-chart-active@3x.png
#	src/assets/images/bar-chart/bar-chart.png
#	src/assets/images/bar-chart/bar-chart@2x.png
#	src/assets/images/bar-chart/bar-chart@3x.png
#	src/assets/images/bluetooth/image.png
#	src/assets/images/bluetooth/image@2x.png
#	src/assets/images/bluetooth/image@3x.png
#	src/assets/images/check-mark/check-mark.png
#	src/assets/images/check-mark/check-mark@2x.png
#	src/assets/images/check-mark/check-mark@3x.png
#	src/assets/images/checkin-blue/checkin.png
#	src/assets/images/checkin-blue/checkin@2x.png
#	src/assets/images/checkin-blue/checkin@3x.png
#	src/assets/images/close/close.png
#	src/assets/images/close/close@2x.png
#	src/assets/images/close/close@3x.png
#	src/assets/images/contact-tracing/ct-off-selected.png
#	src/assets/images/contact-tracing/ct-off-selected@2x.png
#	src/assets/images/contact-tracing/ct-off-selected@3x.png
#	src/assets/images/contact-tracing/ct-off-unselected.png
#	src/assets/images/contact-tracing/ct-off-unselected@2x.png
#	src/assets/images/contact-tracing/ct-off-unselected@3x.png
#	src/assets/images/contact-tracing/ct-on-selected.png
#	src/assets/images/contact-tracing/ct-on-selected@2x.png
#	src/assets/images/contact-tracing/ct-on-selected@3x.png
#	src/assets/images/contact-tracing/ct-on-unselected.png
#	src/assets/images/contact-tracing/ct-on-unselected@2x.png
#	src/assets/images/contact-tracing/ct-on-unselected@3x.png
#	src/assets/images/covid-gray/covid.png
#	src/assets/images/covid-gray/covid@2x.png
#	src/assets/images/covid-gray/covid@3x.png
#	src/assets/images/covid-red/covid.png
#	src/assets/images/covid-red/covid@2x.png
#	src/assets/images/covid-red/covid@3x.png
#	src/assets/images/covid-teal/covid.png
#	src/assets/images/covid-teal/covid@2x.png
#	src/assets/images/covid-teal/covid@3x.png
#	src/assets/images/covid-white/covid.png
#	src/assets/images/covid-white/covid@2x.png
#	src/assets/images/covid-white/covid@3x.png
#	src/assets/images/dismiss/dismiss.png
#	src/assets/images/dismiss/dismiss@2x.png
#	src/assets/images/dismiss/dismiss@3x.png
#	src/assets/images/exclamation-mark/exclamation-mark.png
#	src/assets/images/exclamation-mark/exclamation-mark@2x.png
#	src/assets/images/exclamation-mark/exclamation-mark@3x.png
#	src/assets/images/handkerchief/handkerchief.png
#	src/assets/images/handkerchief/handkerchief@2x.png
#	src/assets/images/handkerchief/handkerchief@3x.png
#	src/assets/images/hospital/hospital.png
#	src/assets/images/hospital/hospital@2x.png
#	src/assets/images/hospital/hospital@3x.png
#	src/assets/images/hse-footer/hse-footer.png
#	src/assets/images/hse-footer/hse-footer@2x.png
#	src/assets/images/hse-footer/hse-footer@3x.png
#	src/assets/images/icu/icu.png
#	src/assets/images/icu/icu@2x.png
#	src/assets/images/icu/icu@3x.png
#	src/assets/images/map/ireland.png
#	src/assets/images/map/ireland@2x.png
#	src/assets/images/map/ireland@3x.png
#	src/assets/images/message/message.png
#	src/assets/images/message/message@2x.png
#	src/assets/images/message/message@3x.png
#	src/assets/images/notification/image.png
#	src/assets/images/notification/image@2x.png
#	src/assets/images/notification/image@3x.png
#	src/assets/images/onboard-step-1/image.png
#	src/assets/images/onboard-step-1/image@2x.png
#	src/assets/images/onboard-step-1/image@3x.png
#	src/assets/images/phone-call/phone-call.png
#	src/assets/images/phone-call/phone-call@2x.png
#	src/assets/images/phone-call/phone-call@3x.png
#	src/assets/images/settings/settings.png
#	src/assets/images/settings/settings@2x.png
#	src/assets/images/settings/settings@3x.png
#	src/assets/images/share/share.png
#	src/assets/images/share/share@2x.png
#	src/assets/images/share/share@3x.png
#	src/assets/images/success/green.png
#	src/assets/images/success/green@2x.png
#	src/assets/images/success/green@3x.png
#	src/assets/images/thumbs/thumbs.png
#	src/assets/images/thumbs/thumbs@2x.png
#	src/assets/images/thumbs/thumbs@3x.png
#	src/assets/images/under-16/image.png
#	src/assets/images/under-16/image@2x.png
#	src/assets/images/under-16/image@3x.png
#	src/components/atoms/card.tsx
#	src/components/atoms/dropdown/index.tsx
#	src/components/atoms/dropdown/modal.tsx
#	src/components/atoms/navbar.tsx
#	src/components/atoms/select-list.tsx
#	src/components/molecules/check-in-card.tsx
#	src/components/molecules/checkin-consent.tsx
#	src/components/molecules/close-contact-warning.tsx
#	src/components/molecules/county-breakdown-card.tsx
#	src/components/molecules/quick-checkin.tsx
#	src/components/molecules/tracing-available.tsx
#	src/components/organisms/app-stats.tsx
#	src/components/organisms/covid-stats.tsx
#	src/components/organisms/tab-bar-bottom.tsx
#	src/components/splash.png
#	src/components/views/close-contact.tsx
#	src/components/views/contact-tracing-information.tsx
#	src/components/views/contact-tracing/can-support.tsx
#	src/components/views/contact-tracing/no-support.tsx
#	src/components/views/contact-tracing/not-active.tsx
#	src/components/views/contact-tracing/not-enabled.tsx
#	src/components/views/dashboard.tsx
#	src/components/views/data-protection-policy.tsx
#	src/components/views/settings/check-in.tsx
#	src/components/views/settings/contact-tracing.tsx
#	src/components/views/settings/index.tsx
#	src/components/views/symptoms-history.tsx
#	src/components/views/upload-keys.tsx
#	src/components/views/your-data.tsx
@ckiss
solved conflicts ++
2a1d37f
jasnell
jasnell approved these changes Aug 7, 2020
View reviewed changes
Copy link
Contributor

@jasnell jasnell left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rubber-stamp LGTM

(in case folks are unfamiliar with the term.. "rubber-stamp LGTM" generally means -- "I didn't do a detailed review but I'll take your word that this is good to go ;-)...")

@jh3y
Copy link
Contributor

jh3y commented Aug 7, 2020

I believe this resolves #28 👍

@ShaunBaker ShaunBaker merged commit bdd6d78 into covidgreen:current Aug 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ShaunBaker ShaunBaker ShaunBaker approved these changes

@jasnell jasnell jasnell approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ckiss @jh3y @jasnell @ShaunBaker