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

Feedback #1

Open
wants to merge 473 commits into
base: feedback
Choose a base branch
from
Open

Feedback #1

wants to merge 473 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on May 6, 2021

  1. 추가: 애니메이션 패키지 추가

    @Aqudi
    Aqudi committed May 6, 2021
    Configuration menu
    Copy the full SHA
    4197135 View commit details
    Browse the repository at this point in the history

  2. 구현: 애플리케이션 베이스 위젯

    @Aqudi
    Aqudi committed May 6, 2021
    Configuration menu
    Copy the full SHA
    b4d2aaf View commit details
    Browse the repository at this point in the history

  3. 구현: 라우트 시스템 적용

    @Aqudi
    Aqudi committed May 6, 2021
    Configuration menu
    Copy the full SHA
    f8ea8b9 View commit details
    Browse the repository at this point in the history

  4. 구현: 기본 페이지들 생성

    @Aqudi
    Aqudi committed May 6, 2021
    Configuration menu
    Copy the full SHA
    ef20ddb View commit details
    Browse the repository at this point in the history

  5. Merge pull request #116 from TongSeola/login-page 

    구현 : 새로운 디자인 적용
    @Aqudi
    Aqudi authored May 6, 2021
    Configuration menu
    Copy the full SHA
    15ea152 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/kookmin-sw/capstone-2021-3 … 

    …into create_new_base_scaffold
    @Aqudi
    Aqudi committed May 6, 2021
    Configuration menu
    Copy the full SHA
    aa8883d View commit details
    Browse the repository at this point in the history

  7. 리팩터: 이미지 리소스 정리

    @Aqudi
    Aqudi committed May 6, 2021
    Configuration menu
    Copy the full SHA
    37a481c View commit details
    Browse the repository at this point in the history

  8. 구현: 버튼 클릭시 drawer 닫기, Scaffold에 정렬 속성 추가

    @Aqudi
    Aqudi committed May 6, 2021
    Configuration menu
    Copy the full SHA
    f1b6be6 View commit details
    Browse the repository at this point in the history

  9. 구현: Google map 페이지 생성

    @Aqudi
    Aqudi committed May 6, 2021
    Configuration menu
    Copy the full SHA
    ab95c46 View commit details
    Browse the repository at this point in the history

  10. 구현: Introduction 페이지 구현 

    1. Login
2. AfterLogin
3. MakeBarcode
    @Aqudi
    Aqudi committed May 6, 2021
    Configuration menu
    Copy the full SHA
    9bedcce View commit details
    Browse the repository at this point in the history

  11. 구현: Introduction과 Map 라우트 연결

    @Aqudi
    Aqudi committed May 6, 2021
    Configuration menu
    Copy the full SHA
    e01cc6e View commit details
    Browse the repository at this point in the history

  12. 리팩터: 이미지 이름 오타 수정

    @Aqudi
    Aqudi committed May 6, 2021
    Configuration menu
    Copy the full SHA
    ad14d35 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #117 from kookmin-sw/add-new-base-scaffold 

    구현: 디자인 변경, 베이스 위젯 생성
    @Aqudi
    Aqudi authored May 6, 2021
    Configuration menu
    Copy the full SHA
    86eddf5 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2021

  1. Merge pull request #112 from kookmin-sw/fix-backend-model-type 

    버그: 중접모델 타입, 날짜 포맷 수정
    @Aqudi
    Aqudi authored May 7, 2021
    Configuration menu
    Copy the full SHA
    32ad503 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/kookmin-sw/capstone-2021-3 … 

    …into mqtt-client
    @Aqudi
    Aqudi committed May 7, 2021
    Configuration menu
    Copy the full SHA
    1d7dc93 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #108 from kookmin-sw/impl-pi-inference 

    구현: 라즈베리파이 tflite mobilenet inference 구현
    @minoring
    minoring authored May 7, 2021
    Configuration menu
    Copy the full SHA
    dc17f2f View commit details
    Browse the repository at this point in the history

  4. 버그: master 수정 내역 반영

    @Aqudi
    Aqudi committed May 7, 2021
    Configuration menu
    Copy the full SHA
    6cadf67 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2021

  1. 버그: 개발용 웹 접속 불가 

    - 개발용 웹 포트 80으로 수정
    @Aqudi
    Aqudi committed May 8, 2021
    Configuration menu
    Copy the full SHA
    ab63df3 View commit details
    Browse the repository at this point in the history

  2. 구현: MQTT 요청 로그 수정

    @Aqudi
    Aqudi committed May 8, 2021
    Configuration menu
    Copy the full SHA
    9615fe7 View commit details
    Browse the repository at this point in the history

  3. 구현: 기관의 디바이스 리스트를 가져오는 API

    @Aqudi
    Aqudi committed May 8, 2021
    Configuration menu
    Copy the full SHA
    011ff4a View commit details
    Browse the repository at this point in the history

  4. 포맷: black, isort, 문서 생성 적용

    @Aqudi
    Aqudi committed May 8, 2021
    Configuration menu
    Copy the full SHA
    53c5e99 View commit details
    Browse the repository at this point in the history

  5. 구현: IOT 클라이언, IOT 어드민 구현 

    MQTT
- mqtt 설정을 리로드 가능하도록 구현 (어드민에서 데이터 변경시 반영)
- mqtt_setting 폴더에 mqtt 관련 설정들 이동

Admin 페이지
- template, static 파일들 추가
- admin 라우트 구현 : 기관, 디바이스 검색 및 설정
- 로컬디비로 사용할 tinydb 추가
    @Aqudi
    Aqudi committed May 8, 2021
    Configuration menu
    Copy the full SHA
    76cfd22 View commit details
    Browse the repository at this point in the history

  6. 구현: 기기에서 수집하는 데이터 포맷 변경

    @Aqudi
    Aqudi committed May 8, 2021
    Configuration menu
    Copy the full SHA
    f279213 View commit details
    Browse the repository at this point in the history

  7. 문서: IOT 문서 정리

    @Aqudi
    Aqudi committed May 8, 2021
    Configuration menu
    Copy the full SHA
    e75d349 View commit details
    Browse the repository at this point in the history

  8. 구현 : API와 연결 

    - 기관별 랭킹
- 기기의 전체 위치
- 아직 더미 데이터가 부족하여 test파일 내용 포함됨

Issue #107
    TongSeola committed May 8, 2021
    Configuration menu
    Copy the full SHA
    d7fb2c4 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2021

  1. 수정 : 페이지 이름 변경 

    - SettinigPage -> SettingPage
    TongSeola committed May 10, 2021
    Configuration menu
    Copy the full SHA
    992aa15 View commit details
    Browse the repository at this point in the history

  2. 구현 : 이용 내역 페이지 기본틀 구현 

    Issue #122
    TongSeola committed May 10, 2021
    Configuration menu
    Copy the full SHA
    e287949 View commit details
    Browse the repository at this point in the history

  3. 구현 : 스크린 사이즈 조정 한번에

    TongSeola committed May 10, 2021
    Configuration menu
    Copy the full SHA
    8b282e7 View commit details
    Browse the repository at this point in the history

  4. 구현 : API의 기관의 전체 랭킹 보여주기 

    Issue #122
    TongSeola committed May 10, 2021
    Configuration menu
    Copy the full SHA
    1115c31 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2021

  1. Merge pull request #118 from kookmin-sw/mqtt-client 

    구현: Mqtt client
    @Aqudi
    Aqudi authored May 11, 2021
    Configuration menu
    Copy the full SHA
    214597d View commit details
    Browse the repository at this point in the history

  2. 수정 : 더미 파일 삭제 

    - 기관 위치 및 기관 랭킹 관련 더미 파일 삭제
    TongSeola committed May 11, 2021
    Configuration menu
    Copy the full SHA
    e4744b3 View commit details
    Browse the repository at this point in the history

  3. 리팩터 : api 연결 함수 분리 

    - 기기 위치 및 정보 서버 연결하기 함수와 기관의 포인트 랭킹 조화 함수 파일 분리
    TongSeola committed May 11, 2021
    Configuration menu
    Copy the full SHA
    69f0438 View commit details
    Browse the repository at this point in the history

  4. 구현 : JsonSerializable 적용 

    - 기관이름, 포인트 class에 JsonSerializable 적용
    TongSeola committed May 11, 2021
    Configuration menu
    Copy the full SHA
    c24cba6 View commit details
    Browse the repository at this point in the history

  5. 수정 : 더미 파일 삭제

    TongSeola committed May 11, 2021
    Configuration menu
    Copy the full SHA
    a03534b View commit details
    Browse the repository at this point in the history

  6. 구현 : api 연결 함수 적용 

    Issue #107
    TongSeola committed May 11, 2021
    Configuration menu
    Copy the full SHA
    a15195a View commit details
    Browse the repository at this point in the history

  7. 구현 : 바코드 보여주는 페이지 구현 

    - device_image.png 파일 이후에 변경
Issue #115
    TongSeola committed May 11, 2021
    Configuration menu
    Copy the full SHA
    06d46ec View commit details
    Browse the repository at this point in the history

  8. 구현: Filter를 이용한 augmentation 구현

    @minoring
    minoring committed May 11, 2021
    Configuration menu
    Copy the full SHA
    097cfb1 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2021

  1. 문서 : 주석 추가

    TongSeola committed May 12, 2021
    Configuration menu
    Copy the full SHA
    15e534a View commit details
    Browse the repository at this point in the history

  2. 추가 : 이미지 추가 

    - 쓰샘 기기 이미지 (이후에 변경요망)
- 핸드폰 이미지 (이후에 2개로 나눠서 변경 오먕)
- 플라스틱 컵 이미지
Issue #77
    TongSeola committed May 12, 2021
    Configuration menu
    Copy the full SHA
    2a9fa25 View commit details
    Browse the repository at this point in the history

  3. 문서 : class 설명 주석 추가

    TongSeola committed May 12, 2021
    Configuration menu
    Copy the full SHA
    d65a447 View commit details
    Browse the repository at this point in the history

  4. 구현 : 이용 안내 페이지 추가

    TongSeola committed May 12, 2021
    Configuration menu
    Copy the full SHA
    a18748c View commit details
    Browse the repository at this point in the history

  5. 구현 : 쓰샘 기기 이용안내 페이지 구현 

    Issue #124
    TongSeola committed May 12, 2021
    Configuration menu
    Copy the full SHA
    e2c1c2a View commit details
    Browse the repository at this point in the history

  6. 구현 : 기기 정보 관련 JsonSerializable 구현

    TongSeola committed May 12, 2021
    Configuration menu
    Copy the full SHA
    f7cf7ee View commit details
    Browse the repository at this point in the history

  7. 수정 : 기관 JsonSerializable 수정

    TongSeola committed May 12, 2021
    Configuration menu
    Copy the full SHA
    e968823 View commit details
    Browse the repository at this point in the history

  8. 구현 : 기관 순위 row 리스트 ListTile로 수정 

    Issue #122
    TongSeola committed May 12, 2021
    Configuration menu
    Copy the full SHA
    423ed44 View commit details
    Browse the repository at this point in the history

  9. 버그: 백엔드 uvicorn 버젼 고정

    @Aqudi
    Aqudi committed May 12, 2021
    Configuration menu
    Copy the full SHA
    6ef3aa1 View commit details
    Browse the repository at this point in the history

  10. 수정 : 리뷰 남긴 사항들 수정 

    - final 선언
- 사용하지 않는 함수 제외
    TongSeola committed May 12, 2021
    Configuration menu
    Copy the full SHA
    a842f94 View commit details
    Browse the repository at this point in the history

  11. 추가: IOT 설치 스크립트, Systemd에 클라이언트 등록

    @Aqudi
    Aqudi committed May 12, 2021
    Configuration menu
    Copy the full SHA
    7ce146c View commit details
    Browse the repository at this point in the history

  12. 구현: mqtt client initialized 상태 추가

    @Aqudi
    Aqudi committed May 12, 2021
    Configuration menu
    Copy the full SHA
    ae3d014 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2021

  1. 리팩토링: 버튼 class로 따로 빼기

    TongSeola committed May 13, 2021
    Configuration menu
    Copy the full SHA
    98b973f View commit details
    Browse the repository at this point in the history

  2. 수정 : Appbar 뒤로가기 버튼 기능 원상복구

    TongSeola committed May 13, 2021
    Configuration menu
    Copy the full SHA
    708e9f6 View commit details
    Browse the repository at this point in the history

  3. 리펙토링 : 경고 수정 

    - Expanded로 인하여 발생하는 경고 수정
    TongSeola committed May 13, 2021
    Configuration menu
    Copy the full SHA
    a3eedfd View commit details
    Browse the repository at this point in the history

  4. 수정 : 리뷰관련 내용 수정

    TongSeola committed May 13, 2021
    Configuration menu
    Copy the full SHA
    05d4e24 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2021

  1. Merge pull request #123 from kookmin-sw/impl-filter-aug 

    구현: Filter를 이용한 augmentation 구현
    @minoring
    minoring authored May 14, 2021
    Configuration menu
    Copy the full SHA
    1450c6f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #121 from TongSeola/new-connect-api 

    구현 : API와 연결
(완료)
    @TongSeola
    TongSeola authored May 14, 2021
    Configuration menu
    Copy the full SHA
    7d2727b View commit details
    Browse the repository at this point in the history

  3. 구현 : 설정 페이지 디자인 구현 

    - 각 버튼의 이동은 구현하지 않음
Issue #129
    TongSeola committed May 14, 2021
    Configuration menu
    Copy the full SHA
    b027b67 View commit details
    Browse the repository at this point in the history

  4. 추가 : flutter vesrion 고정

    TongSeola committed May 14, 2021
    Configuration menu
    Copy the full SHA
    c3ce391 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into fix-flutter-version

    @TongSeola
    TongSeola authored May 14, 2021
    Configuration menu
    Copy the full SHA
    7d2f40a View commit details
    Browse the repository at this point in the history

  6. Merge pull request #132 from TongSeola/fix-flutter-version 

    추가 : flutter vesrion 고정
    @TongSeola
    TongSeola authored May 14, 2021
    Configuration menu
    Copy the full SHA
    d89a460 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #130 from TongSeola/setting-page 

    설정 페이지 구현
    @TongSeola
    TongSeola authored May 14, 2021
    Configuration menu
    Copy the full SHA
    34d2582 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2021

  1. Merge branch 'master' into make-barcode-page

    @TongSeola
    TongSeola authored May 15, 2021
    Configuration menu
    Copy the full SHA
    b393437 View commit details
    Browse the repository at this point in the history

  2. 수정 : 잘못 수정한 내용 

    SettingPage로 수정
    @TongSeola
    TongSeola authored May 15, 2021
    Configuration menu
    Copy the full SHA
    be4ed72 View commit details
    Browse the repository at this point in the history

  3. 수정 : 버전 변화 및 flutter channel 변화로 인한 충돌 문제 해결

    TongSeola committed May 15, 2021
    Configuration menu
    Copy the full SHA
    25966ed View commit details
    Browse the repository at this point in the history

Commits on May 16, 2021

  1. Merge pull request #125 from TongSeola/make-barcode-page 

    구현 : 바코드 페이지& 쓰샘 기기 이용안내 페이지
    @TongSeola
    TongSeola authored May 16, 2021
    Configuration menu
    Copy the full SHA
    a6d3d25 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #133 from TongSeola/set-flutter-run 

    수정 : 버전 변화 및 flutter channel 변화로 인한 충돌 문제 해결
    @TongSeola
    TongSeola authored May 16, 2021
    Configuration menu
    Copy the full SHA
    925713f View commit details
    Browse the repository at this point in the history

  3. 구현: 쓰샘 기기용 REST API 설계 및 구현 

    + 컵투입시 데이터등록 API
+ 바코드등록시 데이터 업데이트

Ralated to #134
    @ParkJeongseop
    ParkJeongseop committed May 16, 2021
    Configuration menu
    Copy the full SHA
    248ae78 View commit details
    Browse the repository at this point in the history

  4. 구현: 사용자 관리 관련 API 삭제 

    + Firebase 유저 관리 도입으로 유저 관련 API 삭제

Ralated to #134
    @ParkJeongseop
    ParkJeongseop committed May 16, 2021
    Configuration menu
    Copy the full SHA
    beb4393 View commit details
    Browse the repository at this point in the history

  5. 구현: 본인 정보 반환 API 구현 #134

    @ParkJeongseop
    ParkJeongseop committed May 16, 2021
    Configuration menu
    Copy the full SHA
    8cbd6cf View commit details
    Browse the repository at this point in the history

  6. 구현: support 페이지

    @Aqudi
    Aqudi committed May 16, 2021
    Configuration menu
    Copy the full SHA
    34c841e View commit details
    Browse the repository at this point in the history

Commits on May 17, 2021

  1. Merge pull request #127 from kookmin-sw/fix-backend-package-version 

    버그: 백엔드 uvicorn 버젼 고정
    @Aqudi
    Aqudi authored May 17, 2021
    Configuration menu
    Copy the full SHA
    149e445 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #126 from kookmin-sw/mqtt-client-deploy 

    추가: mqtt 배포 스크립트 및 initialize 속성 추가

> 리눅스용인가요

오늘 보여드린 라즈베리파이 용입니다.
    @Aqudi
    Aqudi authored May 17, 2021
    Configuration menu
    Copy the full SHA
    8001976 View commit details
    Browse the repository at this point in the history

  3. Bump pydantic from 1.8.1 to 1.8.2 in /iot 

    Bumps [pydantic](https://github.com/samuelcolvin/pydantic) from 1.8.1 to 1.8.2.
- [Release notes](https://github.com/samuelcolvin/pydantic/releases)
- [Changelog](https://github.com/samuelcolvin/pydantic/blob/master/HISTORY.md)
- [Commits](pydantic/pydantic@v1.8.1...v1.8.2)

Signed-off-by: dependabot[bot] <[email protected]>
    @dependabot
    dependabot[bot] authored May 17, 2021
    Configuration menu
    Copy the full SHA
    d7e75eb View commit details
    Browse the repository at this point in the history

  4. Bump pydantic from 1.8.1 to 1.8.2 in /backend/requirements 

    Bumps [pydantic](https://github.com/samuelcolvin/pydantic) from 1.8.1 to 1.8.2.
- [Release notes](https://github.com/samuelcolvin/pydantic/releases)
- [Changelog](https://github.com/samuelcolvin/pydantic/blob/master/HISTORY.md)
- [Commits](pydantic/pydantic@v1.8.1...v1.8.2)

Signed-off-by: dependabot[bot] <[email protected]>
    @dependabot
    dependabot[bot] authored May 17, 2021
    Configuration menu
    Copy the full SHA
    d69d5a5 View commit details
    Browse the repository at this point in the history

  5. 추가 : 구글 로그인 파일 추가 

    - 파일 추가
- 초기 세팅
Issue #119
    TongSeola committed May 17, 2021
    Configuration menu
    Copy the full SHA
    27ed103 View commit details
    Browse the repository at this point in the history

  6. 구현 : Firebase를 이용한 구글 로그인/아웃 함수 만들기 

    - Firebase 초기화
- User 클래스 만들기
- 로그인/아웃 함수 구현
Issue #119
    TongSeola committed May 17, 2021
    Configuration menu
    Copy the full SHA
    589210e View commit details
    Browse the repository at this point in the history

  7. 리팩터: Config 객체를 만들어 각 setting들을 lazy하게 호출가능하도록 수정 

    - 환경변수 적용 후 config를 load하도록 하기 위함
    @Aqudi
    Aqudi committed May 17, 2021
    Configuration menu
    Copy the full SHA
    f40994b View commit details
    Browse the repository at this point in the history

  8. 리팩터: fastapi-mqtt를 사용한 mqtt 라우터를 api에서 제거

    @Aqudi
    Aqudi committed May 17, 2021
    Configuration menu
    Copy the full SHA
    9c4a408 View commit details
    Browse the repository at this point in the history

  9. 리팩터: gunicorn 설정을 Dockerfile에서 제거 및 포트 80:80 고정

    @Aqudi
    Aqudi committed May 17, 2021
    Configuration menu
    Copy the full SHA
    8710fc8 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' of https://github.com/kookmin-sw/capstone-2021-3 … 

    …into add-support-page
    @Aqudi
    Aqudi committed May 17, 2021
    Configuration menu
    Copy the full SHA
    922b4a6 View commit details
    Browse the repository at this point in the history

  11. 수정 : 필요 없는 페이지 삭제 

    - 바코드 닉네임 만들어 주는 페이지 삭제
    TongSeola committed May 17, 2021
    Configuration menu
    Copy the full SHA
    8fbfd7b View commit details
    Browse the repository at this point in the history

  12. 구현 : Firebase를 이용한 구글 로그인/아웃 함수 만들기 

    - AuthService 클래스 만들기
- 로그인/아웃 함수 구현
Issue #119
    TongSeola committed May 17, 2021
    Configuration menu
    Copy the full SHA
    1d03507 View commit details
    Browse the repository at this point in the history

  13. 구현 : 유저 정보 활용하기 

    - 사용자 이름
- UID 값으로 바코드 구현
Issue #131
    TongSeola committed May 17, 2021
    Configuration menu
    Copy the full SHA
    54f3e0f View commit details
    Browse the repository at this point in the history

  14. 수정: http.get 파라미터 타입을 String에서 Uri 로 변경

    @Aqudi
    Aqudi committed May 17, 2021
    Configuration menu
    Copy the full SHA
    eaf4db9 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #136 from kookmin-sw/dependabot/pip/backend/requir… 

    …ements/pydantic-1.8.2

Bump pydantic from 1.8.1 to 1.8.2 in /backend/requirements
    @Aqudi
    Aqudi authored May 17, 2021
    Configuration menu
    Copy the full SHA
    011606d View commit details
    Browse the repository at this point in the history

  16. Merge pull request #135 from kookmin-sw/dependabot/pip/iot/pydantic-1… 

    ….8.2

Bump pydantic from 1.8.1 to 1.8.2 in /iot
    @Aqudi
    Aqudi authored May 17, 2021
    Configuration menu
    Copy the full SHA
    39860d4 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2021

  1. 구현: 개발, 배포 환경 모두 필요한 서비스 기다리도록 스크립트 수정

    @Aqudi
    Aqudi committed May 18, 2021
    Configuration menu
    Copy the full SHA
    acc419c View commit details
    Browse the repository at this point in the history

  2. 버그: user 필드의 타입을 str에서 PyObjectId로 수정

    @Aqudi
    Aqudi committed May 18, 2021
    Configuration menu
    Copy the full SHA
    da7b0cc View commit details
    Browse the repository at this point in the history

Commits on May 19, 2021

  1. Merge pull request #138 from TongSeola/make-google-login 

    구현 : 구글 로그인
    @TongSeola
    TongSeola authored May 19, 2021
    Configuration menu
    Copy the full SHA
    0976ec5 View commit details
    Browse the repository at this point in the history

  2. 추가 : 이노버스 제공 이미지 추가 

    - 스마일 모양 이미지 추가
    TongSeola committed May 19, 2021
    Configuration menu
    Copy the full SHA
    e43ea79 View commit details
    Browse the repository at this point in the history

  3. 구현 : 이용안내 페이지 구현 

    - 쓰샘 기기 및 바코드 사용 방법 페이지
- 추첨권/포인트 서비스 안내 페이지
- RouteArgument의 selectList에 따라 다른 list(기기이용, 추췀군/포인트안내)를 보여준다.
Issue #124
    TongSeola committed May 19, 2021
    Configuration menu
    Copy the full SHA
    48804bd View commit details
    Browse the repository at this point in the history

  4. 구현 : 이용 안내 페이지 구현 

    - 이용 안내 페이지 디자인 구현
- 이용 안내 페이지에 사용되는 버튼 구현(circle_button.dart)
Issue #124
    TongSeola committed May 19, 2021
    Configuration menu
    Copy the full SHA
    032e094 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into lottery-information

    @TongSeola
    TongSeola authored May 19, 2021
    Configuration menu
    Copy the full SHA
    2835417 View commit details
    Browse the repository at this point in the history

  6. 구현: IOT 기기의 메시지를 처리하는 consumer 서비스 

    - pika(AMQP 프로토콜 지원) 패키지 추가
- paho-mqtt(MQTT 프로토콜 지원) 패키지 추가
- main_consumer 디비에 메시지 저장 구현
- 포인트 DB 갱신 후 갱신 내용 publish 로직 구현
- docker-compose 서비스로 consumer 추가

- loguru(logging 지원) 패키지 추가
- unify logger 구현
    @Aqudi
    Aqudi committed May 19, 2021
    Configuration menu
    Copy the full SHA
    5299a1e View commit details
    Browse the repository at this point in the history

  7. 구현: MQTT Client 백엔드 변경사항 적용, 포인트 수신 시 로컬 데이터 업데이트 

    - database 안 쓰는 import 제거
- backend logger 사용
- point 업데이트 시 로컬에 반영
    @Aqudi
    Aqudi committed May 19, 2021
    Configuration menu
    Copy the full SHA
    9ff870b View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/kookmin-sw/capstone-2021-3 … 

    …into add-support-page
    @Aqudi
    Aqudi committed May 19, 2021
    Configuration menu
    Copy the full SHA
    e0f32b8 View commit details
    Browse the repository at this point in the history

  9. 구현: 유저가 최근 6개월간 월별 포인트 실적 조회 #142

    @ParkJeongseop
    ParkJeongseop committed May 19, 2021
    Configuration menu
    Copy the full SHA
    3dd0644 View commit details
    Browse the repository at this point in the history

  10. 수정: 함수명 변경

    @ParkJeongseop
    ParkJeongseop committed May 19, 2021
    Configuration menu
    Copy the full SHA
    237a9e4 View commit details
    Browse the repository at this point in the history

  11. 구현: admin ui padding 추가 및 업데이트된 config와 logger 적용

    @Aqudi
    Aqudi committed May 19, 2021
    Configuration menu
    Copy the full SHA
    4c89314 View commit details
    Browse the repository at this point in the history

  12. 문서: 라즈베리파이 클라이언트 설치하는 방법 추가 정리

    @Aqudi
    Aqudi committed May 19, 2021
    Configuration menu
    Copy the full SHA
    766b549 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' of https://github.com/kookmin-sw/capstone-2021-3 … 

    …into fix-mqtt-communication
    @Aqudi
    Aqudi committed May 19, 2021
    Configuration menu
    Copy the full SHA
    cdc184c View commit details
    Browse the repository at this point in the history

  14. 수정: 규칙 적용

    @ParkJeongseop
    ParkJeongseop committed May 19, 2021
    Configuration menu
    Copy the full SHA
    a9832cb View commit details
    Browse the repository at this point in the history

  15. 추가 : 이노버스에서 새로 제공된 이미지 적용 

    Issue #124
    TongSeola committed May 19, 2021
    Configuration menu
    Copy the full SHA
    6b36912 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'lottery-information' of https://github.com/TongSeola/ca… 

    …pstone-2021-3 into lottery-information
    TongSeola committed May 19, 2021
    Configuration menu
    Copy the full SHA
    3ea1ef8 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #137 from kookmin-sw/add-support-page 

    구현: support 페이지
    @Aqudi
    Aqudi authored May 19, 2021
    Configuration menu
    Copy the full SHA
    f3abd26 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'master' into lottery-information

    @TongSeola
    TongSeola authored May 19, 2021
    Configuration menu
    Copy the full SHA
    68b7b8c View commit details
    Browse the repository at this point in the history

  19. Merge pull request #143 from kookmin-sw/backend-api-userhistory 

    구현: 유저가 최근 6개월간 월별 포인트 실적 조회
    @ParkJeongseop
    ParkJeongseop authored May 19, 2021
    Configuration menu
    Copy the full SHA
    48273cf View commit details
    Browse the repository at this point in the history

  20. 포맷 : fomat, analyze

    TongSeola committed May 19, 2021
    Configuration menu
    Copy the full SHA
    305f36f View commit details
    Browse the repository at this point in the history

  21. 구현 : 각 페이지 Expanded 적용 

    - device_input.png 파일 크기 줄이기
- app_scaffold.dart Expanded 및 SafeArea 적용
    TongSeola committed May 19, 2021
    Configuration menu
    Copy the full SHA
    441f38b View commit details
    Browse the repository at this point in the history

  22. 구현: 추첨권 발행, 보안 관련 이슈 수정 

    + GET메소드에서 보안을 위해 POST로 변경
+ ObjectId사용 수정
+ 동일 데이터에 대해 중복 리워딩 방지
+ 보안을 위해 클라이언트는 최소 정보 제공 원칙을 위해 정상 요청이 아닐시 Access denied표시, 서버에만 내용표시
+ 추첨권 발행
+ 추첨권 데이터 모델 설계

Related to #134
    @ParkJeongseop
    ParkJeongseop committed May 19, 2021
    Configuration menu
    Copy the full SHA
    218e48e View commit details
    Browse the repository at this point in the history

  23. 구현: 사용자의 현월의 추첨권 정보 API 구현 

    + 사용자 식별자 기반 현재달의 추첨권 보유량 반환 API 구현
+ 사용자 추첨권 보유량 반환 모델 설계
+ 기존 API 설명 수정

Related to #134
    @ParkJeongseop
    ParkJeongseop committed May 19, 2021
    Configuration menu
    Copy the full SHA
    1fcf45c View commit details
    Browse the repository at this point in the history

Commits on May 20, 2021

  1. Merge branch 'master' into fix-mqtt-communication

    @Aqudi
    Aqudi authored May 20, 2021
    Configuration menu
    Copy the full SHA
    747db7f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #140 from kookmin-sw/fix-mqtt-communication 

    버그: 하나의 데이터를 여러번 저장, 응답하지 않는 경우 발생
    @Aqudi
    Aqudi authored May 20, 2021
    Configuration menu
    Copy the full SHA
    0dbde30 View commit details
    Browse the repository at this point in the history

  3. 구현 : 이미지 사이즈 조정 

    Issue #124
    TongSeola committed May 20, 2021
    Configuration menu
    Copy the full SHA
    df2c7f1 View commit details
    Browse the repository at this point in the history

  4. 구현 : 추첨권-포인트 페이지 디자인 구현 

    - 디자인 위치 및 크기만 구현
Issue #145
    TongSeola committed May 20, 2021
    Configuration menu
    Copy the full SHA
    e9139ff View commit details
    Browse the repository at this point in the history

  5. 구현 : 사용자의 포인트 내역 차트로 그리기 

    - 임의 User.dart를 생성
- 임의 값들로 Chart 구성
Issue #122
    TongSeola committed May 20, 2021
    Configuration menu
    Copy the full SHA
    40d0e49 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2021

  1. Merge pull request #141 from TongSeola/lottery-information 

    구현 : 이용 안내 페이지 구현
    @TongSeola
    TongSeola authored May 21, 2021
    Configuration menu
    Copy the full SHA
    90b5bd1 View commit details
    Browse the repository at this point in the history

  2. 구현 : 사용자 누적 포인트 값 가져오기 

    Isseu #145
    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    d56403e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into history-page

    @TongSeola
    TongSeola authored May 21, 2021
    Configuration menu
    Copy the full SHA
    6bd986a View commit details
    Browse the repository at this point in the history

  4. 수정 : dart 파일명 수정

    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    ef76e03 View commit details
    Browse the repository at this point in the history

  5. 구현 : 사용자 history 정보 가져오기 

    Issue #122
    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    05c0992 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'history-page' of https://github.com/TongSeola/capstone-… 

    …2021-3 into history-page
    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    8baeeb7 View commit details
    Browse the repository at this point in the history

  7. 구현 : 이용 내역에 사용자 정보 포함 

    - 사용자 정보 포함
- 월별 포인트 적립
- 전체 기관별 순위
Issue #122
    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    4f8ac77 View commit details
    Browse the repository at this point in the history

  8. 수정: image_resizer 가로 세로 다르게 줄수있게 수정.

    @minoring
    minoring committed May 21, 2021
    Configuration menu
    Copy the full SHA
    96db0ae View commit details
    Browse the repository at this point in the history

  9. 구현: inobus_v3 데이터 616 사이즈. 

    세부 내용은 notion에 있다.
    @minoring
    minoring committed May 21, 2021
    Configuration menu
    Copy the full SHA
    1618b1d View commit details
    Browse the repository at this point in the history

  10. 구현: v4 데이터 (실제 하드웨어에서 찍은거) 구현

    @minoring
    minoring committed May 21, 2021
    Configuration menu
    Copy the full SHA
    04bc42b View commit details
    Browse the repository at this point in the history

  11. 구현: v4 데이터에서 기존에 스마트폰으로 찍은 이미지 추가한 v5 구현

    @minoring
    minoring committed May 21, 2021
    Configuration menu
    Copy the full SHA
    2c51e10 View commit details
    Browse the repository at this point in the history

  12. 수정: 라즈베리파이 inference 속도 재는데 평균속도 추가.

    @minoring
    minoring committed May 21, 2021
    Configuration menu
    Copy the full SHA
    bd500e9 View commit details
    Browse the repository at this point in the history

  13. 구현: 하드웨어에서 찍은 데이터로 실험한 v4 노트북 구현.

    @minoring
    minoring committed May 21, 2021
    Configuration menu
    Copy the full SHA
    76127b1 View commit details
    Browse the repository at this point in the history

  14. 구현: v4 데이터에 스마트폰 이미지 추가한 데이터 노트북 구현

    @minoring
    minoring committed May 21, 2021
    Configuration menu
    Copy the full SHA
    8bb0440 View commit details
    Browse the repository at this point in the history

  15. 구현: v5 데이터에 sift + svm classifier 구현.

    @minoring
    minoring committed May 21, 2021
    Configuration menu
    Copy the full SHA
    f6d4cce View commit details
    Browse the repository at this point in the history

  16. opencv requirement 추가

    @minoring
    minoring committed May 21, 2021
    Configuration menu
    Copy the full SHA
    d4cbc06 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #156 from kookmin-sw/add-opencv-req 

    opencv requirement 추가
    @minoring
    minoring authored May 21, 2021
    Configuration menu
    Copy the full SHA
    4478473 View commit details
    Browse the repository at this point in the history

  18. 구현 : 추첨권 및 포인트 구현 

    - user 정보 임의로 설정하여 구현
Issue #145
    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    faedffb View commit details
    Browse the repository at this point in the history

  19. Merge pull request #148 from kookmin-sw/resizer-to-diff-width-height 

    수정: image_resizer 가로 세로 다르게 줄수있게 수정.
    @minoring
    minoring authored May 21, 2021
    Configuration menu
    Copy the full SHA
    66e9f70 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #149 from kookmin-sw/v3_616 

    구현: inobus_v3 데이터 616 사이즈.
    @minoring
    minoring authored May 21, 2021
    Configuration menu
    Copy the full SHA
    0f79214 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #150 from kookmin-sw/v4_data 

    구현: v4 데이터 (실제 하드웨어에서 찍은거) 구현
    @minoring
    minoring authored May 21, 2021
    Configuration menu
    Copy the full SHA
    a3882a5 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #151 from kookmin-sw/v5_data 

    구현: v4 데이터에서 기존에 스마트폰으로 찍은 이미지 추가한 v5 구현
    @minoring
    minoring authored May 21, 2021
    Configuration menu
    Copy the full SHA
    d1f20da View commit details
    Browse the repository at this point in the history

  23. Merge pull request #152 from kookmin-sw/add-infer-average 

    수정: 라즈베리파이 inference 속도 재는데 평균속도 추가.
    @minoring
    minoring authored May 21, 2021
    Configuration menu
    Copy the full SHA
    99a0076 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #153 from kookmin-sw/add-v4-notebook 

    구현: 하드웨어에서 찍은 데이터로 실험한 v4 노트북 구현.
    @minoring
    minoring authored May 21, 2021
    Configuration menu
    Copy the full SHA
    ef3fa61 View commit details
    Browse the repository at this point in the history

  25. Merge pull request #154 from kookmin-sw/add-v5-notebook 

    구현: v4 데이터에 스마트폰 이미지 추가한 데이터 노트북 구현
    @minoring
    minoring authored May 21, 2021
    Configuration menu
    Copy the full SHA
    8239cd9 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #155 from kookmin-sw/add-v5-sift-notebook 

    구현: v5 데이터에 sift + svm classifier 구현.
    @minoring
    minoring authored May 21, 2021
    Configuration menu
    Copy the full SHA
    13df408 View commit details
    Browse the repository at this point in the history

  27. 구현 : 이용내역 사용자 이미지 동그라미로 만들기 

    Issue #122
    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    5713e62 View commit details
    Browse the repository at this point in the history

  28. 구현 : appBar 문제 해결

    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    f8ad987 View commit details
    Browse the repository at this point in the history

  29. 구현 : AppBar 밑줄 문제 해결

    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    31dcbec View commit details
    Browse the repository at this point in the history

  30. Merge pull request #146 from TongSeola/history-page 

    이용내역 그래프 구현
    @TongSeola
    TongSeola authored May 21, 2021
    Configuration menu
    Copy the full SHA
    35c740f View commit details
    Browse the repository at this point in the history

  31. Merge branch 'master' into point-page

    @TongSeola
    TongSeola authored May 21, 2021
    Configuration menu
    Copy the full SHA
    c9ecca3 View commit details
    Browse the repository at this point in the history

  32. Merge pull request #147 from TongSeola/point-page 

    추첨권/포인트 페이지
    @TongSeola
    TongSeola authored May 21, 2021
    Configuration menu
    Copy the full SHA
    b3e3681 View commit details
    Browse the repository at this point in the history

  33. 구현: HTTP Redirection 미들웨어 추가 및 환경 변수 등록

    @Aqudi
    Aqudi committed May 21, 2021
    Configuration menu
    Copy the full SHA
    299eac8 View commit details
    Browse the repository at this point in the history

  34. 구현: Docker 이미지의 위치를 ECR로 변경

    @Aqudi
    Aqudi committed May 21, 2021
    Configuration menu
    Copy the full SHA
    1446489 View commit details
    Browse the repository at this point in the history

  35. 구현: AWS CloudFormation 리소스 명시 및 health check 추가

    @Aqudi
    Aqudi committed May 21, 2021
    Configuration menu
    Copy the full SHA
    7d08b68 View commit details
    Browse the repository at this point in the history

  36. 추가 : 이노버스 제공 이미지 추가 

    - 핸드폰 이미지, 기기 이미지 추가
- 각 이미지 추가하여 구현
    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    3de9d45 View commit details
    Browse the repository at this point in the history

  37. 구현 : api url 가져오기 class로 구현

    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    1e7abd6 View commit details
    Browse the repository at this point in the history

  38. 구현 : Json 이용하여 불러오기

    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    44aa49c View commit details
    Browse the repository at this point in the history

  39. 수정 : 이전에 UI에 사용한 파일 삭제

    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    f991edd View commit details
    Browse the repository at this point in the history

  40. 구현 : 추첨권 페이지 user 정보로 동기화

    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    c89a105 View commit details
    Browse the repository at this point in the history

  41. 수정 : 에코마켓, 공지사항 삭제

    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    757a543 View commit details
    Browse the repository at this point in the history

  42. 구현 : 뒤로가기와 홈버튼 기능 정상화

    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    87839cf View commit details
    Browse the repository at this point in the history

  43. 구현 : 앱 버전 설정

    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    f4b3e3f View commit details
    Browse the repository at this point in the history

  44. 구현 : drawer 구성 사용자 정보로 바꿈

    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    4a96211 View commit details
    Browse the repository at this point in the history

  45. 구현 : 추첨권 페이지 포인트 배경 투명으로 변경

    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    705df16 View commit details
    Browse the repository at this point in the history

  46. 수정 : 불필요 var 및 print문 삭제

    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    994ebc9 View commit details
    Browse the repository at this point in the history

  47. 구현 : 지도에 핀 색상 주황색으로 변경

    TongSeola committed May 21, 2021
    Configuration menu
    Copy the full SHA
    0b46363 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2021

  1. 수정 : 애플로그인 막아 놓기

    TongSeola committed May 22, 2021
    Configuration menu
    Copy the full SHA
    535dcc6 View commit details
    Browse the repository at this point in the history

  2. 버그: .env 파일 Line ending LF로 변경

    @Aqudi
    Aqudi committed May 22, 2021
    Configuration menu
    Copy the full SHA
    05082b8 View commit details
    Browse the repository at this point in the history

  3. 구현 : 회원가입 로딩 추가

    TongSeola committed May 22, 2021
    Configuration menu
    Copy the full SHA
    6a8329a View commit details
    Browse the repository at this point in the history

  4. 구현: 파이어베이스 DB 접근부 모듈화 하여 분리 

    + 파이어베이스 접근부분 분리
+ 유틸리티에 포함

Related to #158
    @ParkJeongseop
    ParkJeongseop committed May 22, 2021
    Configuration menu
    Copy the full SHA
    92f073f View commit details
    Browse the repository at this point in the history

  5. Merge pull request #157 from TongSeola/rest-function 

    나머지 기능 구현
    @Aqudi
    Aqudi authored May 22, 2021
    Configuration menu
    Copy the full SHA
    1fc8e83 View commit details
    Browse the repository at this point in the history

  6. 구현: 코드리뷰 반영(모델활용) 

    + 설계한 모듈을 활용, 모델수정

Related to #134
    @ParkJeongseop
    ParkJeongseop committed May 22, 2021
    Configuration menu
    Copy the full SHA
    b8c3bc9 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into backend-api-reward

    @ParkJeongseop
    ParkJeongseop authored May 22, 2021
    Configuration menu
    Copy the full SHA
    a3a8477 View commit details
    Browse the repository at this point in the history

  8. 구현: 모델관련 수정 

    + 모델 설명 보충
+ 모델 변수 타입 원복 및 관련 적용코드 수정
    @ParkJeongseop
    ParkJeongseop committed May 22, 2021
    Configuration menu
    Copy the full SHA
    3f3fb9f View commit details
    Browse the repository at this point in the history

  9. 수정: 코드리뷰 수정 

    + 기관명->기관코드
+ 테스트코드 삭제
    @ParkJeongseop
    ParkJeongseop committed May 22, 2021
    Configuration menu
    Copy the full SHA
    a693cfe View commit details
    Browse the repository at this point in the history

  10. 수정: HTTP ststus code 수정

    @ParkJeongseop
    ParkJeongseop committed May 22, 2021
    Configuration menu
    Copy the full SHA
    acec960 View commit details
    Browse the repository at this point in the history

  11. 구현: RabbitMQ 보안설정 

    - 데이터 유저와 어드민 유저 분리
- RabbitMQ관련 설정파일 docker/rabbitmq로 이전
- .json파일과 env 파일들의 line ending LF로 변경
    @Aqudi
    Aqudi committed May 22, 2021
    Configuration menu
    Copy the full SHA
    5e31973 View commit details
    Browse the repository at this point in the history

  12. 문서: 폴더 및 파일 구조 업데이트, 배포과정추가, 실행방법 업데이트

    @Aqudi
    Aqudi committed May 22, 2021
    Configuration menu
    Copy the full SHA
    a868f88 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #144 from kookmin-sw/backend-api-reward 

    쓰샘 기기용 REST API 구현
    @ParkJeongseop
    ParkJeongseop authored May 22, 2021
    Configuration menu
    Copy the full SHA
    985dc83 View commit details
    Browse the repository at this point in the history

  14. Bump tensorflow from 2.4.1 to 2.5.0 in /deep_learning 

    Bumps [tensorflow](https://github.com/tensorflow/tensorflow) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/tensorflow/tensorflow/releases)
- [Changelog](https://github.com/tensorflow/tensorflow/blob/master/RELEASE.md)
- [Commits](tensorflow/tensorflow@v2.4.1...v2.5.0)

Signed-off-by: dependabot[bot] <[email protected]>
    @dependabot
    dependabot[bot] authored May 22, 2021
    Configuration menu
    Copy the full SHA
    9a59b6c View commit details
    Browse the repository at this point in the history

  15. Merge branch 'master' of https://github.com/kookmin-sw/capstone-2021-3 … 

    …into deploy-ecs
    @Aqudi
    Aqudi committed May 22, 2021
    Configuration menu
    Copy the full SHA
    0ccd973 View commit details
    Browse the repository at this point in the history

  16. 포맷: isort, black 적용

    @Aqudi
    Aqudi committed May 22, 2021
    Configuration menu
    Copy the full SHA
    1dfde3f View commit details
    Browse the repository at this point in the history

  17. 버그: Reidrect 횟수 초과 문제로 미들웨어 제거

    @Aqudi
    Aqudi committed May 22, 2021
    Configuration menu
    Copy the full SHA
    a29e62f View commit details
    Browse the repository at this point in the history

  18. Merge pull request #159 from kookmin-sw/dependabot/pip/deep_learning/… 

    …tensorflow-2.5.0

Bump tensorflow from 2.4.1 to 2.5.0 in /deep_learning
    @minoring
    minoring authored May 22, 2021
    Configuration menu
    Copy the full SHA
    37a0103 View commit details
    Browse the repository at this point in the history

  19. 구현: 쓰샘 IoT화면 구현 

    + 웹소켓으로 웹-로컬 통신 구현
+ 웹과 API를 통한 서버-웹 통신 구현
+ 프론트엔드 디자인
    + 사용영상 비디오
    + CSS애니메이션 효과
    @ParkJeongseop
    ParkJeongseop committed May 22, 2021
    Configuration menu
    Copy the full SHA
    19bc111 View commit details
    Browse the repository at this point in the history

  20. 구현 : 두번 눌러서 시스템 종료 

    - 로그아웃 후 회원가입 부분
- 멥 부분
    TongSeola committed May 22, 2021
    Configuration menu
    Copy the full SHA
    fbbbff4 View commit details
    Browse the repository at this point in the history

  21. 구현 : 안드로이드 IOS 구별 

    - 로그인 실패시 알림창 뜨게 만들기
- 안드로이드는 구글 로그인만 보이게 만들기
    TongSeola committed May 22, 2021
    Configuration menu
    Copy the full SHA
    ad45e04 View commit details
    Browse the repository at this point in the history

  22. 구현 : 클릭 필요 없는 박스 일반 박스로 변경

    TongSeola committed May 22, 2021
    Configuration menu
    Copy the full SHA
    81c7f8f View commit details
    Browse the repository at this point in the history

  23. 구현 : 카카오 오픈채팅방 url 연결

    TongSeola committed May 22, 2021
    Configuration menu
    Copy the full SHA
    6f9eb3f View commit details
    Browse the repository at this point in the history

Commits on May 23, 2021

  1. Merge pull request #162 from TongSeola/back-button 

    뒤로가기 버튼 오류 해결
    @TongSeola
    TongSeola authored May 23, 2021
    Configuration menu
    Copy the full SHA
    ee48576 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into check-os

    @TongSeola
    TongSeola authored May 23, 2021
    Configuration menu
    Copy the full SHA
    f320f22 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #161 from TongSeola/check-os 

    구현 : 안드로이드,IOS 구별
    @TongSeola
    TongSeola authored May 23, 2021
    Configuration menu
    Copy the full SHA
    c682a16 View commit details
    Browse the repository at this point in the history

  4. 수정 : .fvm 파일 ignore 

    - fvm 파일 .fvm/flutter_sdk 추가
    TongSeola committed May 23, 2021
    Configuration menu
    Copy the full SHA
    06e8e20 View commit details
    Browse the repository at this point in the history

  5. 수정 : ios swift 버그 수정 

    - AppDelegate.swfit 수정
    TongSeola committed May 23, 2021
    Configuration menu
    Copy the full SHA
    e3b8f2f View commit details
    Browse the repository at this point in the history

  6. Merge pull request #165 from TongSeola/ignore-fvm 

    수정 : .fvm 파일 ignore
    @Aqudi
    Aqudi authored May 23, 2021
    Configuration menu
    Copy the full SHA
    a7869b4 View commit details
    Browse the repository at this point in the history

  7. 수정: 딥러닝 문서 수정

    @minoring
    minoring committed May 23, 2021
    Configuration menu
    Copy the full SHA
    edd334f View commit details
    Browse the repository at this point in the history

  8. Merge pull request #166 from kookmin-sw/update-dl-readme 

    수정: 딥러닝 문서 수정
    @minoring
    minoring authored May 23, 2021
    Configuration menu
    Copy the full SHA
    750ff48 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into ui-refactor

    @TongSeola
    TongSeola authored May 23, 2021
    Configuration menu
    Copy the full SHA
    5747234 View commit details
    Browse the repository at this point in the history

  10. 수정 : merge 충돌 문제 해결

    TongSeola committed May 23, 2021
    Configuration menu
    Copy the full SHA
    29f6098 View commit details
    Browse the repository at this point in the history

  11. 추가: 파이어베이스 패키지 추가

    @Aqudi
    Aqudi committed May 23, 2021
    Configuration menu
    Copy the full SHA
    a0807ff View commit details
    Browse the repository at this point in the history

  12. Merge pull request #160 from kookmin-sw/deploy-ecs 

    구현: 배포 설정 및 보안 관련 설정 적용
    @Aqudi
    Aqudi authored May 23, 2021
    Configuration menu
    Copy the full SHA
    7da7784 View commit details
    Browse the repository at this point in the history

  13. Update README.md

    @minoring
    minoring authored May 23, 2021
    Configuration menu
    Copy the full SHA
    0b87517 View commit details
    Browse the repository at this point in the history

  14. 포맷 : format, analyze

    TongSeola committed May 23, 2021
    Configuration menu
    Copy the full SHA
    8e8902f View commit details
    Browse the repository at this point in the history

  15. Merge pull request #163 from TongSeola/ui-refactor 

    구현 : 클릭 필요 없는 버튼 일반 박스로 변경
    @TongSeola
    TongSeola authored May 23, 2021
    Configuration menu
    Copy the full SHA
    d16ed39 View commit details
    Browse the repository at this point in the history

  16. Update README.md

    @minoring
    minoring authored May 23, 2021
    Configuration menu
    Copy the full SHA
    e14e1b1 View commit details
    Browse the repository at this point in the history

  17. 버그: service account file ignore에 추가

    @Aqudi
    Aqudi committed May 23, 2021
    Configuration menu
    Copy the full SHA
    1c157a2 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #167 from kookmin-sw/fix-service-account-file-path 

    버그: service account file ignore에 추가
    @Aqudi
    Aqudi authored May 23, 2021
    Configuration menu
    Copy the full SHA
    19caf92 View commit details
    Browse the repository at this point in the history

  19. 수정: 월별 기록 API 에러 수정

    @ParkJeongseop
    ParkJeongseop committed May 23, 2021
    Configuration menu
    Copy the full SHA
    8efe5f1 View commit details
    Browse the repository at this point in the history

  20. 수정: 컵투입등록 API 제거

    @ParkJeongseop
    ParkJeongseop committed May 23, 2021
    Configuration menu
    Copy the full SHA
    56ac806 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #168 from kookmin-sw/backend-hotfix 

    수정: 월별 기록 API 에러 수정
    @ParkJeongseop
    ParkJeongseop authored May 23, 2021
    Configuration menu
    Copy the full SHA
    2cc598e View commit details
    Browse the repository at this point in the history

  22. Merge branch 'master' into backend-remove-insertcup

    @ParkJeongseop
    ParkJeongseop authored May 23, 2021
    Configuration menu
    Copy the full SHA
    5a401de View commit details
    Browse the repository at this point in the history

  23. Merge pull request #169 from kookmin-sw/backend-remove-insertcup 

    수정: 컵투입등록 API 제거
    @ParkJeongseop
    ParkJeongseop authored May 23, 2021
    Configuration menu
    Copy the full SHA
    a2eddc9 View commit details
    Browse the repository at this point in the history

  24. 수정 : 사용자 티켓 api 연결

    TongSeola committed May 23, 2021
    Configuration menu
    Copy the full SHA
    15a5f9f View commit details
    Browse the repository at this point in the history

  25. 버그: Rabbitmq User permission 및 예제 비번 수정

    @Aqudi
    Aqudi committed May 23, 2021
    Configuration menu
    Copy the full SHA
    a86c22e View commit details
    Browse the repository at this point in the history

  26. 구현 : 노션 대신 회사 홈페이지 연결

    TongSeola committed May 23, 2021
    Configuration menu
    Copy the full SHA
    82eb33b View commit details
    Browse the repository at this point in the history

  27. 구현: 포인트 적립에서 유저를 지우고 기기만 남김

    @Aqudi
    Aqudi committed May 23, 2021
    Configuration menu
    Copy the full SHA
    0d0daa9 View commit details
    Browse the repository at this point in the history

  28. Merge pull request #164 from TongSeola/connect-open-url 

    구현 : 오픈 url 연결
    @TongSeola
    TongSeola authored May 23, 2021
    Configuration menu
    Copy the full SHA
    1380746 View commit details
    Browse the repository at this point in the history

  29. Merge pull request #170 from TongSeola/api-ticket 

    수정 : 사용자 티켓 api 연결
    @TongSeola
    TongSeola authored May 23, 2021
    Configuration menu
    Copy the full SHA
    b640326 View commit details
    Browse the repository at this point in the history

  30. 수정 : 불필요한 print문 삭제

    TongSeola committed May 23, 2021
    Configuration menu
    Copy the full SHA
    fca836b View commit details
    Browse the repository at this point in the history

  31. 버그: systemd service 파일 위치 수정

    @Aqudi
    Aqudi committed May 23, 2021
    Configuration menu
    Copy the full SHA
    ebb9fbf View commit details
    Browse the repository at this point in the history

  32. 버그: python3.7문제로 cached_property를 lru_cache로 변경

    @Aqudi
    Aqudi committed May 23, 2021
    Configuration menu
    Copy the full SHA
    fd254f0 View commit details
    Browse the repository at this point in the history

  33. 포맷: isort, black 적용

    @Aqudi
    Aqudi committed May 23, 2021
    Configuration menu
    Copy the full SHA
    2144665 View commit details
    Browse the repository at this point in the history

  34. Merge pull request #170 from TongSeola/api-ticket 

    수정 : 사용자 티켓 api 연결
    @TongSeola
    TongSeola authored May 23, 2021
    Configuration menu
    Copy the full SHA
    4d3daef View commit details
    Browse the repository at this point in the history

  35. 구현: v6 데이터 Augmentaiton, 툴 구현

    @minoring
    minoring committed May 23, 2021
    Configuration menu
    Copy the full SHA
    343cefb View commit details
    Browse the repository at this point in the history

  36. 구현: 웹 컵 등록부 MQTT전환 및 프론트 수정

    @ParkJeongseop
    ParkJeongseop committed May 23, 2021
    Configuration menu
    Copy the full SHA
    c920d24 View commit details
    Browse the repository at this point in the history

  37. 수정: 테스트 코드 삭제

    @ParkJeongseop
    ParkJeongseop committed May 23, 2021
    Configuration menu
    Copy the full SHA
    82e56d9 View commit details
    Browse the repository at this point in the history

  38. Merge branch 'iot-webui' into fix-iot-point

    @ParkJeongseop
    ParkJeongseop committed May 23, 2021
    Configuration menu
    Copy the full SHA
    d84fa5a View commit details
    Browse the repository at this point in the history

  39. Merge pull request #171 from kookmin-sw/v6-data-aug 

    구현: v6 데이터 Augmentaiton, 툴 구현
    @minoring
    minoring authored May 23, 2021
    Configuration menu
    Copy the full SHA
    4055f73 View commit details
    Browse the repository at this point in the history

  40. 구현: 컵투입시 MQTT-웹 간 웹소켓으로 통신 구현

    @ParkJeongseop
    ParkJeongseop committed May 23, 2021
    Configuration menu
    Copy the full SHA
    2bebdd8 View commit details
    Browse the repository at this point in the history

  41. 구현: 같은그룹의 다른 기기에서 포인트 갱신 기능 구현

    @ParkJeongseop
    ParkJeongseop committed May 23, 2021
    Configuration menu
    Copy the full SHA
    8a1345d View commit details
    Browse the repository at this point in the history

  42. 구현 : UI 수정

    TongSeola committed May 23, 2021
    Configuration menu
    Copy the full SHA
    df7a621 View commit details
    Browse the repository at this point in the history

  43. 구현: Websocket으로 point 데이터 연동

    @Aqudi
    Aqudi committed May 23, 2021
    Configuration menu
    Copy the full SHA
    747bf80 View commit details
    Browse the repository at this point in the history

  44. 버그: docker-compose service 이름 수정

    @Aqudi
    Aqudi committed May 23, 2021
    Configuration menu
    Copy the full SHA
    7c15a1e View commit details
    Browse the repository at this point in the history

  45. Merge branch 'fix-iot-point' of https://github.com/kookmin-sw/capston… 

    …e-2021-3 into fix-iot-point
    @Aqudi
    Aqudi committed May 23, 2021
    Configuration menu
    Copy the full SHA
    665d06b View commit details
    Browse the repository at this point in the history

  46. 버그: try catch 문 추가로 소켓이 init 안 됐을때 에러 방지

    @Aqudi
    Aqudi committed May 23, 2021
    Configuration menu
    Copy the full SHA
    1620466 View commit details
    Browse the repository at this point in the history

  47. Merge branch 'master' into fix-iot-point

    @ParkJeongseop
    ParkJeongseop authored May 23, 2021
    Configuration menu
    Copy the full SHA
    d9f849a View commit details
    Browse the repository at this point in the history

  48. Merge pull request #173 from kookmin-sw/fix-iot-point 

    버그: point 전달이 안됨, Websocket으로 point 신호 받아서 웹UI 업데이트
    @ParkJeongseop
    ParkJeongseop authored May 23, 2021
    Configuration menu
    Copy the full SHA
    79b1766 View commit details
    Browse the repository at this point in the history

  49. Merge branch 'master' into fix-iot-setting

    @Aqudi
    Aqudi authored May 23, 2021
    Configuration menu
    Copy the full SHA
    6e043c4 View commit details
    Browse the repository at this point in the history

  50. Merge pull request #174 from kookmin-sw/fix-iot-setting 

    Fix iot setting
    @ParkJeongseop
    ParkJeongseop authored May 23, 2021
    Configuration menu
    Copy the full SHA
    01e212c View commit details
    Browse the repository at this point in the history

  51. 수정 : 박스 크기 수정

    TongSeola committed May 23, 2021
    Configuration menu
    Copy the full SHA
    4f3bc3c View commit details
    Browse the repository at this point in the history

Commits on May 24, 2021

  1. Update README.md 

    - Firebase 사용법
- 폴더 구조
- 애플리케이션 주요 기능
- 애플리케이션 간략한 시연 영상
    @TongSeola
    TongSeola authored May 24, 2021
    Configuration menu
    Copy the full SHA
    c3ae7e0 View commit details
    Browse the repository at this point in the history

  2. 구현: spalsh 추가

    @Aqudi
    Aqudi committed May 24, 2021
    Configuration menu
    Copy the full SHA
    428a0e0 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #172 from TongSeola/rest-ui 

    구현 : UI 수정
    @Aqudi
    Aqudi authored May 24, 2021
    Configuration menu
    Copy the full SHA
    caaf1a4 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #175 from kookmin-sw/App-README-수정 

    Update README.md
    @TongSeola
    TongSeola authored May 24, 2021
    Configuration menu
    Copy the full SHA
    73ba314 View commit details
    Browse the repository at this point in the history

  5. Update README.md 

    - 앱 주요 기능
- 유튜브 링크
    @TongSeola
    TongSeola authored May 24, 2021
    Configuration menu
    Copy the full SHA
    0985760 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2021

  1. Update README.md

    @minoring
    minoring authored May 25, 2021
    Configuration menu
    Copy the full SHA
    d5ea2dd View commit details
    Browse the repository at this point in the history

Commits on May 26, 2021

  1. Merge pull request #176 from kookmin-sw/splash 

    구현: spalsh 추가
    @Aqudi
    Aqudi authored May 26, 2021
    Configuration menu
    Copy the full SHA
    d1f0371 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #177 from kookmin-sw/TongSeola-patch-1 

    Update README.md
    @TongSeola
    TongSeola authored May 26, 2021
    Configuration menu
    Copy the full SHA
    15db89c View commit details
    Browse the repository at this point in the history

Commits on May 27, 2021

  1. Bump pydantic from 1.8.1 to 1.8.2 in /backend/requirements 

    Bumps [pydantic](https://github.com/samuelcolvin/pydantic) from 1.8.1 to 1.8.2.
- [Release notes](https://github.com/samuelcolvin/pydantic/releases)
- [Changelog](https://github.com/samuelcolvin/pydantic/blob/master/HISTORY.md)
- [Commits](pydantic/pydantic@v1.8.1...v1.8.2)

Signed-off-by: dependabot[bot] <[email protected]>
    @dependabot
    dependabot[bot] authored May 27, 2021
    Configuration menu
    Copy the full SHA
    2b72064 View commit details
    Browse the repository at this point in the history

  2. 수정 : 에러 수정 

    - 사용자 월별 포인트 값 반대로 인것 수정
- 글자 수정
- 버튼 크기 수정
    TongSeola committed May 27, 2021
    Configuration menu
    Copy the full SHA
    f2b1cfb View commit details
    Browse the repository at this point in the history

Commits on May 28, 2021

  1. Merge pull request #179 from TongSeola/rest-ui 

    수정 : 에러 수정
    @TongSeola
    TongSeola authored May 28, 2021
    Configuration menu
    Copy the full SHA
    76049e6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #178 from kookmin-sw/dependabot/pip/backend/requir… 

    …ements/pydantic-1.8.2

Bump pydantic from 1.8.1 to 1.8.2 in /backend/requirements
    @Aqudi
    Aqudi authored May 28, 2021
    Configuration menu
    Copy the full SHA
    cd730df View commit details
    Browse the repository at this point in the history

Commits on May 29, 2021

  1. Create README.md

    @minoring
    minoring authored May 29, 2021
    Configuration menu
    Copy the full SHA
    b1484e0 View commit details
    Browse the repository at this point in the history

  2. Update README.md

    @minoring
    minoring authored May 29, 2021
    Configuration menu
    Copy the full SHA
    11525af View commit details
    Browse the repository at this point in the history