Merge pull request kookmin-sw#95 from JisuuungKim/master

fix. github-pages 수정
sunwoopia · May 23, 2024 · 226fb2f · 226fb2f
2 parents 804245e + ef63e6d
commit 226fb2f
Show file tree

Hide file tree

Showing 15 changed files with 136 additions and 40 deletions.
diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml
@@ -0,0 +1,65 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+# Sample workflow for building and deploying a Jekyll site to GitHub Pages
+name: Deploy Jekyll site to Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["master"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  # Build job
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
+        with:
+          ruby-version: '3.1' # Not needed with a .ruby-version file
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+          cache-version: 0 # Increment this number if you need to re-download cached gems
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v5
+      - name: Build with Jekyll
+        # Outputs to the './_site' directory by default
+        run: bundle exec jekyll build --baseurl "/capstone-2024-15/creative-theme-jekyll-master"
+        env:
+          PAGES_REPO_NWO: kookmin-sw/capstone-2024-15
+          JEKYLL_ENV: production
+      - name: Upload artifact
+        # Automatically uploads an artifact from the './_site' directory by default
+        uses: actions/upload-pages-artifact@v3
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/_config.yml b/_config.yml
@@ -24,18 +24,23 @@ description: >- # this means to ignore newlines until "baseurl:"
   Write an awesome description for your new site here. You can edit this
   line in _config.yml. It will appear in your document head meta (for
   Google search results) and in your feed.xml site description.
-baseurl: /beginnerGain/creative-theme-jekyll-master/ # the subpath of your site, e.g. /blog
+baseurl: "" # the subpath of your site, e.g. /blog
 url: "" # the base hostname & protocol for your site, e.g. http://example.com
 twitter_username: jekyllrb
 github_username:  jekyll
 
 # Build settings
 theme: minima
-minima:
-  skin: default
 plugins:
   - jekyll-feed
 
+# Sass
+sass:
+  sass_dir: _sass
+
+source: creative-theme-jekyll-master
+
+
 # Exclude from processing.
 # The following items will not be processed, by default.
 # Any item listed under the `exclude:` key here will be automatically added to

diff --git a/creative-theme-jekyll-master/_config.yml b/creative-theme-jekyll-master/_config.yml
diff --git a/creative-theme-jekyll-master/_includes/aside.html b/creative-theme-jekyll-master/_includes/aside.html
@@ -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>
diff --git a/creative-theme-jekyll-master/_includes/call-to-action.html b/creative-theme-jekyll-master/_includes/call-to-action.html
@@ -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>이 있다는 것을 느꼈습니다.

diff --git a/creative-theme-jekyll-master/_includes/contact.html b/creative-theme-jekyll-master/_includes/contact.html
@@ -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">
@@ -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>
diff --git a/creative-theme-jekyll-master/_includes/head.html b/creative-theme-jekyll-master/_includes/head.html
@@ -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">

diff --git a/creative-theme-jekyll-master/_includes/nav.html b/creative-theme-jekyll-master/_includes/nav.html
@@ -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 -->
@@ -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>

diff --git a/creative-theme-jekyll-master/_includes/portfolio.html b/creative-theme-jekyll-master/_includes/portfolio.html
@@ -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">

diff --git a/creative-theme-jekyll-master/_includes/services.html b/creative-theme-jekyll-master/_includes/services.html
@@ -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>

diff --git a/creative-theme-jekyll-master/_sass/_base.scss b/creative-theme-jekyll-master/_sass/_base.scss
@@ -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;
@@ -366,7 +364,6 @@ header {
     border: none;
     border-radius: 300px;
     font-weight: 700;
-    text-transform: uppercase;
 }
 
 .btn-xl {
@@ -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;

diff --git a/creative-theme-jekyll-master/css/main.scss b/creative-theme-jekyll-master/css/main.scss
@@ -39,6 +39,6 @@ $theme-dark: #222;
 
 // Import partials from `sass_dir` (defaults to `_sass`)
 @import
-        "../_sass/mixins",
-        "../_sass/base"
+        "mixins",
+        "base"
 ;
diff --git a/creative-theme-jekyll-master/img/folder-icon.svg b/creative-theme-jekyll-master/img/folder-icon.svg
diff --git a/creative-theme-jekyll-master/test.txt b/creative-theme-jekyll-master/test.txt
@@ -0,0 +1 @@
+
diff --git a/index.html b/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="refresh" content="0; url=creative-theme-jekyll-master/index.html">
+    <title>Redirecting...</title>
+</head>
+<body>
+    <p>If you are not redirected, <a href="creative-theme-jekyll-master/index.html">click here</a>.</p>
+</body>
+</html>