Dev-FE-1 / team2-intranet-project-

ํ† ์ดํ”„๋กœ์ ํŠธI - 2์กฐ ๊ธฐ์—…์šฉ ์‚ฌ๋‚ด ์ธํŠธ๋ผ๋„ท ๊ฐœ๋ฐœ
https://organic-meggy-toyproject-group2-intranet-solution-b9fd064a.koyeb.app/
0 stars 1 forks source link

Feature/refactor-employesslist-table #218

Closed nakyeonko3 closed 3 months ago

nakyeonko3 commented 3 months ago

๐Ÿ“์ž‘์—… ๋‚ด์šฉ

merge ์ดํ›„์— ๋กœ๋”ฉ ์ปดํฌ๋„ŒํŠธ ๋•Œ๋ฌธ์— ๊ณ„์† ์˜ค๋ฅ˜๊ฐ€ ๊ฑธ๋ ค์„œ ์ฝ”๋“œ๋ฅผ ์ˆ˜์ •ํ–ˆ์Šต๋‹ˆ๋‹ค. ์ œ๊ฐ€ ๋ฆฌํŽ™ํ† ๋งํ•œ ๋ถ€๋ถ„๋“ค์„ ๋‹ค์‹œ ๋˜๋Œ๋ฆฌ๊ณ  ๋กœ๋”ฉ ์ปดํฌ๋„ŒํŠธ๋งŒ ๋‹ค์‹œ ์ ์šฉํ•˜๊ณ  ๋กœ๋”ฉ์ปดํฌ๋„ŒํŠธ css ํŒŒ์ผ๊ณผ ๋กœ๋”ฉ์ปดํฌ๋„ŒํŠธ js ํŒŒ์ผ ์ผ๋ถ€๋ฅผ ์ˆ˜์ •ํ–ˆ์Šต๋‹ˆ๋‹ค. pr hot fix๋กœ ๋„ฃ์—ˆ์œผ๋‹ˆ ์ง€๊ธˆ ์Šน์ธํ•ด์ฃผ์‹œ๋ฉด ๊ฐ์‚ฌํ•˜๊ฒ ์Šต๋‹ˆ๋‹ค.

์ˆ˜์ • ์ดํ›„์—๋Š” ์ •์ƒ์ ์œผ๋กœ ๋™์ž‘ํ•ฉ๋‹ˆ๋‹ค.

         <div class="loading-component-container"></div>
  addLoadingComponent() {
    const loadingComponentContainer = document.querySelector('.loading-component-container');
    this.loading = new Loading(loadingComponentContainer, {});
    this.loading.render();
  }

  removeLoadingComponent() {
    const loadingComponentContainer = document.querySelector('.loading-component-container');
    loadingComponentContainer.remove();
    this.loading.hide();
  }
clara-shin commented 3 months ago

์ง€๊ธˆ conflict์ด ์žˆ๋Š”๋ฐ ๋จธ์ง€ ๊ฐ™์ด ํ• ๊นŒ์š”?