GithubHelp home page GithubHelp logo

c-b-u / cbums Goto Github PK

View Code? Open in Web Editor NEW
12.0 12.0 4.0 20.48 MB

씨부엉 공식 서비스 프로젝트

License: Apache License 2.0

HTML 20.81% CSS 24.19% JavaScript 27.34% Java 25.46% Shell 2.02% Dockerfile 0.18%

cbums's People

Contributors

gnu-kenny avatar phjppo0918 avatar pol6463 avatar rabbit-22 avatar yo0oni avatar

Stargazers

 avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar

Watchers

 avatar

cbums's Issues

우아한 형제들 배달의 민족 git-flow

master : 제품으로 출시될 수 있는 브랜치

develop : 다음 출시 버전을 개발하는 브랜치

feature : 기능을 개발하는 브랜치

release : 이번 출시 버전을 준비하는 브랜치

hotfix : 출시 버전에서 발생한 버그를 수정 하는 브랜치

##project structor

config - class which will read from property files

cache - caching mechanism class files

constants - constant defined class

controller - controller class

exception - exception class

model - pojos classes will be present

security - security classes

service - Impl classes

util - utility classes

validation - validators classes

bootloader - main class

Feature/study work journal branch merge 불가

Conflicting files

  • frontPageTemplate/default/default.html
  • frontPageTemplate/scripts/script.js
  • frontPageTemplate/scripts/sidebar.js
  • frontPageTemplate/styles/default.css
  • frontPageTemplate/styles/header.css
    해당 파일 변경으로 인하여 develop과 차이가 있어 충돌이 나는 것 같아요!
    @rabbit-22

Feature/study make complete page merge 충돌

Conflicting files

  • frontPageTemplate/default/default.html
  • frontPageTemplate/scripts/script.js
  • frontPageTemplate/scripts/sidebar.js
  • frontPageTemplate/styles/default.css
  • frontPageTemplate/styles/header.css
    해당 파일 변경으로 인하여 develop과 차이가 있어 충돌이 나는 것 같아요!
    @rabbit-22

/api/project 요청 시 CORS error

Access to XMLHttpRequest at 'localhost:8000/api/project' from origin 'http://localhost' has been blocked by CORS policy: Cross origin requests are only supported for protocol schemes: http, data, chrome, chrome-extension, chrome-untrusted, https.

django model

django.core.management.base.SystemCheckError: SystemCheckError: System check identified some issues:

ERRORS:
cbums.TbBook.book_borrower: (fields.E304) Reverse accessor for 'TbBook.book_borrower' clashes with reverse accessor for 'TbBook.book_owner'.
HINT: Add or change a related_name argument to the definition for 'TbBook.book_borrower' or 'TbBook.book_owner'.
cbums.TbBook.book_owner: (fields.E304) Reverse accessor for 'TbBook.book_owner' clashes with reverse accessor for 'TbBook.book_borrower'.
HINT: Add or change a related_name argument to the definition for 'TbBook.book_owner' or 'TbBook.book_borrower'.
cbums.TbBookTag.book_owner: (fields.E305) Reverse query name for 'TbBookTag.book_owner' clashes with reverse query name for 'TbBookTag.tag_book_isbn'.
HINT: Add or change a related_name argument to the definition for 'TbBookTag.book_owner' or 'TbBookTag.tag_book_isbn'.
cbums.TbBookTag: (models.E012) 'unique_together' refers to the nonexistent field 'isbn'.
cbums.TbProjectParticipation.progress_date: (fields.E305) Reverse query name for 'TbProjectParticipation.progress_date' clashes with reverse query name for 'TbProjectParticipation.p_seq'.
HINT: Add or change a related_name argument to the definition for 'TbProjectParticipation.progress_date' or 'TbProjectParticipation.p_seq'.

Fix that was bug of signup when registering as a member using a different path with the same email account

image
image

51번 경우 동일한 Email 계정으로 naver, kakao 로그인 시 새로 생성되지 않고 덧붙이는 현상 발생.

config/auth/CustomOAuth2UserService.java

private Member saveOrUpdate(OAuthAttributes attributes) {
        Member member = memberRepository.findByEmail(attributes.getEmail())
                .map(entity -> entity.update(attributes.getName(),attributes.getPicture()))
                .orElse(attributes.toEntity());

        return memberRepository.save(member);
    }

defaultPage Swiper css Link 중복 및 header, footer css 링크 없음

<link rel="stylesheet" href="../styles/default.css"> <link href='http://fonts.googleapis.com/css?family=Noto+Sans' rel='stylesheet' type='text/css'> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.2/css/all.min.css"> <link rel="stylesheet" href="../styles/swiper.min.css">

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.