Skip to content

Commit

Permalink
Merge pull request #96 from kookmin-sw/develop
Browse files Browse the repository at this point in the history
master <- develop
  • Loading branch information
JisuuungKim authored May 23, 2024
2 parents afc9e76 + 226fb2f commit 6bed479
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 23 deletions.
2 changes: 1 addition & 1 deletion creative-theme-jekyll-master/_includes/aside.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="container text-center">
<div class="call-to-action">
<h2>지금 바로 Beginnergain 서비스를 이용해보세요!</h2>
<a href="#" class="btn btn-default btn-xl wow tada">Beginnergain 홈페이지 바로가기</a>
<a href="http://beginnergain.com" class="btn btn-default btn-xl wow tada">Beginnergain 홈페이지 바로가기</a>
</div>
</div>
</aside>
3 changes: 3 additions & 0 deletions creative-theme-jekyll-master/_includes/call-to-action.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
<div class="col-lg-8 col-lg-offset-2 text-center">
<h2 class="section-heading">BeginnerGain 소개</h2>
<hr class="section-hr">
<div class="section-container">
<p class="text-faded">BeginnerGain provides an environment where developers can set up the basic structure of a project with just a few clicks. It features a simple and intuitive UI and flow, taking into account the perspective of novice developers who may not have specific framework knowledge. Additionally, it assists users through an interactive chatbot powered by artificial intelligence.</p>
</div>
<div class="section-container">
<h4 class="text-faded">1. 프로젝트 배경</h4>
<p class="text-faded">학과 동아리에서 프로젝트를 하면서 개발 경험이 많지 않은 팀원들은 <strong>처음 쓰는 프레임워크나 언어로 프로젝트를 진행하는 것에 어려움</strong>이 있다는 것을 느꼈습니다.
Expand Down
25 changes: 23 additions & 2 deletions creative-theme-jekyll-master/_includes/contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<h2 class="section-heading">Contact US!</h2>
<hr class="primary">
<p>비기너게인(BeginnerGain 멤버들)</p>
</div>
</div>
<div class="col-lg-12 text-center">
<table style="margin: 0 auto;">
<tr align="center">
Expand Down Expand Up @@ -66,13 +66,34 @@ <h2 class="section-heading">Contact US!</h2>
Frontend, Design
</td>
<td>
AI
Prompt Engineering
</td>
<td>
Frontend
</td>
</tr>
</table>
</div>
</div>
<div class="row document">
<div class="col-lg-8 col-lg-offset-2 text-center">
<h2 class="section-heading">Document</h2>
<hr class="primary">
</div>
<div class="col-lg-12 text-center folder-container">
<div>
<img src="img/folder-icon.svg">
<a href="https://drive.google.com/file/d/11OpLOFTizhXKs3u9HXxhUOYDIHf6LZ6u/view?usp=sharing">최종발표자료</a>
</div>
<div>
<img src="img/folder-icon.svg">
<a href="https://docs.google.com/document/d/14DPvr-uR6SugBjG2VXJs2A5kTcS7bqJM2HpDkIozWek/">수행결과보고서</a>
</div>
<div>
<img src="img/folder-icon.svg">
<a href="https://github.com/kookmin-sw/capstone-2024-15">github 링크</a>
</div>
</div>
</div>
</div>
</section>
2 changes: 1 addition & 1 deletion creative-theme-jekyll-master/_includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="description" content="">
<meta name="author" content="">

<title>Creative - Start Bootstrap Theme</title>
<title>BeginnerGain</title>

<!-- Bootstrap Core CSS -->
<link rel="stylesheet" href="css/bootstrap.min.css" type="text/css">
Expand Down
4 changes: 2 additions & 2 deletions creative-theme-jekyll-master/_includes/nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand page-scroll" href="#page-top">Start Bootstrap</a>
<a class="navbar-brand page-scroll" href="#page-top">BeginnerGain</a>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
Expand All @@ -21,7 +21,7 @@
<a class="page-scroll" href="#services">Services</a>
</li>
<li>
<a class="page-scroll" href="#portfolio">Portfolio</a>
<a class="page-scroll" href="#video">Video</a>
</li>
<li>
<a class="page-scroll" href="#contact">Contact</a>
Expand Down
5 changes: 3 additions & 2 deletions creative-theme-jekyll-master/_includes/portfolio.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,17 @@ <h2>기술 스택</h2>
<img src="https://img.shields.io/badge/NestJS-E0234E?style=for-the-badge&logo=java&logoColor=white"/>
<img src="https://img.shields.io/badge/postgresql-4169E1?style=for-the-badge&logo=java&logoColor=white"/>
<img src="https://img.shields.io/badge/AWS-%23FF9900.svg?style=for-the-badge&logo=amazon-aws&logoColor=white"/>
<img src="https://img.shields.io/badge/FastAPI-005571?style=for-the-badge&logo=fastapi"/>
<p>AI</p>
<img src="https://img.shields.io/badge/chatGPT-74aa9c?style=for-the-badge&logo=openai&logoColor=white"/>
<img src="https://img.shields.io/badge/python-3670A0?style=for-the-badge&logo=python&logoColor=ffdd54"/>
</div>
<div>
<h2>시스템 아키텍처</h2>
<hr>
<img src="../img/architecture.png" width="800" height="500">
<img src="img/architecture.png" width="800" height="500">
</div>
<div>
<div id="video">
<h2>시연 영상</h2>
<hr>
<div class="service-video">
Expand Down
13 changes: 1 addition & 12 deletions creative-theme-jekyll-master/_includes/services.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
<section id="services">
<!-- <div class="container">-->
<!-- <div>-->
<!-- <img src="../img/poster.jpeg" width="500"/>-->
<!-- </div>-->
<!-- <div class="row">-->
<!-- <div class="col-lg-12 text-center">-->
<!-- <h2 class="section-heading">주요 기능</h2>-->
<!-- <hr class="primary">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div class="container">
<img class="poster" src="../img/poster.jpeg" width="500"/>
<img class="poster" src="img/poster.jpeg" width="500"/>
<div>
<div class="text-center">
<h2 class="section-heading">주요 기능</h2>
Expand Down
15 changes: 12 additions & 3 deletions creative-theme-jekyll-master/_sass/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -207,14 +207,12 @@ header {
.header-content-inner {
h1 {
font-weight: 700;
text-transform: uppercase;
margin-top: 0;
margin-bottom: 0;
color: #060B21;
}
h2 {
font-weight: 700;
text-transform: uppercase;
margin-top: 8px;
margin-bottom: 0;
color: #060B21;
Expand Down Expand Up @@ -366,7 +364,6 @@ header {
border: none;
border-radius: 300px;
font-weight: 700;
text-transform: uppercase;
}

.btn-xl {
Expand Down Expand Up @@ -418,6 +415,18 @@ body {
padding: 0 4rem;
}

#contact .document {
margin-top: 8rem;
}

#contact .folder-container {
display: flex;
gap: 4rem;
justify-content: center;
font-size: 1.5rem;
padding-top: 3rem;
}

@media screen and (max-width: 1200px) {
#services .poster {
margin: 0 auto;
Expand Down
3 changes: 3 additions & 0 deletions creative-theme-jekyll-master/img/folder-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6bed479

Please sign in to comment.