Skip to content

Commit

Permalink
Merge pull request #1 from SKKU-MAV/dev
Browse files Browse the repository at this point in the history
Dev branch merge: 8기 모집 내용 업데이트 및 로고변경
  • Loading branch information
sonah5009 authored Nov 16, 2024
2 parents 0226104 + a8684a6 commit 0d3f2a4
Show file tree
Hide file tree
Showing 64 changed files with 30,588 additions and 236 deletions.
154 changes: 79 additions & 75 deletions activities.html
Original file line number Diff line number Diff line change
@@ -1,86 +1,90 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />

<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta charset="UTF-8" />
<link rel="stylesheet" href="./styles/shared.css" />
<link rel="stylesheet" href="./styles/subpages.css" />
<link rel="stylesheet" href="./styles/activites.css" />
<!-- 폰트 -->
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Gamja+Flower&family=Gothic+A1:wght@400;800&family=Paytone+One&family=Quicksand:wght@300;400&family=Rajdhani:wght@600&display=swap"
rel="stylesheet" />

<meta charset="UTF-8">
<link rel="stylesheet" href="./styles/shared.css">
<link rel="stylesheet" href="./styles/subpages.css">
<!-- 폰트 -->
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link
href="https://fonts.googleapis.com/css2?family=Gamja+Flower&family=Gothic+A1:wght@400;800&family=Paytone+One&family=Quicksand:wght@300;400&family=Rajdhani:wght@600&display=swap"
rel="stylesheet">
<title>MAV</title>
<!-- <link href="https://fonts.googleapis.com/css2?family=Gothic+A1:wght@400;800&display=swap" rel="stylesheet"> -->
<script src="./javascript/index.js" defer></script>
</head>

<title>MAV</title>
<!-- <link href="https://fonts.googleapis.com/css2?family=Gothic+A1:wght@400;800&display=swap" rel="stylesheet"> -->
<script src="./javascript/index.js" defer></script>
</head>

<body>
<header id="main-header">
<a href="./index.html" id="page-logo">MAV</a>
<nav>
<ul>
<li>
<a href="./activities.html" class="nav-underline">ACTIVITIES</a>
</li>
<li>
<a href="./members.html" class="nav-underline">MEMBERS</a>
</li>
<li>
<a href="./recruitment.html" class="nav-underline">RECRUITMENT</a>
</li>
</ul>
</nav>
<a href="#side-drawer" class="menu-btn">
<span></span>
<span></span>
<span></span>
</a>
</header>
<aside id="side-drawer">
<header>
<a href="#" class="menu-btn menu-btn-on">
<body>
<header id="main-header">
<!-- <a href="./index.html" id="page-logo">MAV</a> -->
<a href="./index.html">
<img src="./images/logo.svg" alt="mav-logo" width="70" />
</a>
<ul>
<li>
<a href="./activities.html" class="nav-underline">ACTIVITIES</a>
</li>
<li>
<a href="./members.html" class="nav-underline">MEMBERS</a>
</li>
<li>
<a href="./recruitment.html" class="nav-underline">RECRUITMENT</a>
</li>
</ul>
</nav>
<a href="#side-drawer" class="menu-btn">
<span></span>
<span></span>
<span></span>
</a>
</header>
<nav>
<ul>
<li>
<a href="./activities.html">ACTIVITIES</a>
</li>
<li>
<a href="./members.html">MEMBERS</a>
</li>
<li>
<a href="./recruitment.html">RECRUITMENT</a>
</li>
</ul>
</nav>
</aside>
<main>
<!-- MAV 명칭 소개 -->
<section class="section-padding">
<div>
<div class="subtitle">
<span class="color-blue-100">A</span>CTIVITIES
<aside id="side-drawer">
<header>
<a href="#" class="menu-btn menu-btn-on">
<span></span>
<span></span>
<span></span>
</a>
</header>
<nav>
<ul>
<li>
<a href="./activities.html">ACTIVITIES</a>
</li>
<li>
<a href="./members.html">MEMBERS</a>
</li>
<li>
<a href="./recruitment.html">RECRUITMENT</a>
</li>
</ul>
</nav>
</aside>
<main>
<!-- MAV 명칭 소개 -->
<section class="section-padding">
<div>
<div class="subtitle">
<span class="color-blue-100">A</span>CTIVITIES
</div>
<p>성균관대학교 메타버스 스튜디오</p>
</div>
<p>
성균관대학교 메타버스 스튜디오
</p>
</div>
</section>

</main>
<footer>

</footer>
</body>
</html>
</section>
<section class="section-padding">
<div class="project-title">Unity study - boost project</div>
<img
src="./images/activities1.gif"
alt="unity-activities1"
id="unity-activities1" />
</section>
</main>
<footer></footer>
</body>
</html>
Binary file added images/activities1.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/activities1.mp4
Binary file not shown.
101 changes: 75 additions & 26 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,29 @@
<source type="video/mp4" src="./images/mav_anime2_length.mp4">
</video>
<header id="main-header">
<a href="./index.html" id="page-logo">MAV</a>
<nav>
<ul>
<li>
<a href="./activities.html" class="nav-underline">ACTIVITIES</a>
</li>
<li>
<a href="./members.html" class="nav-underline">MEMBERS</a>
</li>
<li>
<a href="./recruitment.html" class="nav-underline">RECRUITMENT</a>
</li>
</ul>
</nav>
<a href="#side-drawer" class="menu-btn">
<span></span>
<span></span>
<span></span>
<!-- <a href="./index.html" id="page-logo">MAV</a> -->
<a href="./index.html">
<img src="./images/logo.svg" alt="mav-logo" width="70" />
</a>
<nav>
<nav>
<ul>
<li>
<a href="./activities.html" class="nav-underline">ACTIVITIES</a>
</li>
<li>
<a href="./members.html" class="nav-underline">MEMBERS</a>
</li>
<li>
<a href="./recruitment.html" class="nav-underline">RECRUITMENT</a>
</li>
</ul>
</nav>
<a href="#side-drawer" class="menu-btn">
<span></span>
<span></span>
<span></span>
</a>
</header>

<aside id="side-drawer">
Expand All @@ -72,7 +76,7 @@
</ul>
</nav>
</aside>

<main>
<!-- MAV 명칭 소개 -->
<section class="section-padding bar" id="move">
Expand All @@ -86,6 +90,21 @@
</div>
</div>
</section>
<section id="scroll2" class="section-padding">
<div id="recruiting-p">
🎮 8기 부원 모집 중 🎮
</div>
<h2>서류 접수</h2>
<p>2024.02.24(토) ~ 03.03(일)</p>
</div>
<!-- <div style="padding-top: 10px">오류가 생겨 고치는 중입니다. 구글 폼 작성은 2023.02.21 오후 6시에 열립니다.</div>
<div>궁금한 점은 <a href="http://pf.kakao.com/_yDxkvxj" style="color: yellow">카카오톡 채널</a>로 문의 주세요</div> -->
<div id="applyBtn">
<a target="_blank" href="https://forms.gle/3GDcXwkRkvHdveLLA">
지원하기
</a>
</div>
</section>
</main>
<footer class="section-padding">
<div id="footer-p">MAV</div><br>
Expand All @@ -95,18 +114,48 @@
viewBox="0 0 16 16">
<path d="M8 16s6-5.686 6-10A6 6 0 0 0 2 6c0 4.314 6 10 6 10zm0-7a3 3 0 1 1 0-6 3 3 0 0 1 0 6z"></path>
</svg>
성균관대학교 자연과학캠퍼스 반도체관 400617
성균관대학교 자연과학캠퍼스 반도체관 400617
<a href="https://map.naver.com/p/entry/place/19198641?c=16.00,0,0,0,dh" target="_blank" class="footer_logo">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-geo-alt-fill"
viewBox="0 0 16 16">
<path d="M8 16s6-5.686 6-10A6 6 0 0 0 2 6c0 4.314 6 10 6 10zm0-7a3 3 0 1 1 0-6 3 3 0 0 1 0 6z"></path>
</svg>
<p>
성균관대학교 삼성학술정보관 2층 솦:콤존
격물 480214
</p>
</a>
</div>
<br>
<div id="github-icon">
<a href="https://github.com/SKKU-MAV">
<svg width="40" height="40" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg" role="img"><g clip-path="url(#github-40x40_svg__a)"><path d="M23.467 41.628c0 1.046.033 2.088-.012 3.125-.03.71-.623 1.034-1.337.785-2.353-.822-4.465-2.053-6.31-3.733-2.268-2.064-3.926-4.535-4.95-7.425a18.055 18.055 0 0 1-1.007-7.438c.323-4.37 1.984-8.162 5.01-11.319 3.36-3.505 7.496-5.4 12.354-5.606C35.5 9.67 42.901 14.907 45.36 22.82a17.859 17.859 0 0 1 .63 7.969c-.736 5.04-3.17 9.08-7.207 12.16-1.487 1.134-3.141 1.977-4.909 2.589-.82.283-1.369-.124-1.367-1.015 0-1.564.017-3.127.02-4.691 0-.86-.094-1.708-.492-2.484-.18-.354-.425-.674-.66-1.041.389-.062.793-.12 1.196-.188 1.39-.236 2.71-.663 3.884-1.47 1.376-.947 2.244-2.265 2.68-3.853.488-1.766.644-3.562.223-5.37a6.43 6.43 0 0 0-1.412-2.752c-.166-.194-.203-.352-.127-.598.463-1.474.296-2.923-.239-4.342-.038-.103-.266-.21-.385-.19-.581.09-1.193.134-1.724.36-.91.39-1.76.91-2.647 1.354-.17.085-.406.14-.585.095a17.702 17.702 0 0 0-8.508 0 .797.797 0 0 1-.55-.086c-1.058-.66-2.128-1.288-3.35-1.59a5.22 5.22 0 0 0-1.124-.133c-.115-.002-.3.14-.341.257-.521 1.439-.658 2.897-.19 4.383a.5.5 0 0 1-.087.399c-1.212 1.446-1.743 3.112-1.696 4.99.038 1.517.242 2.992.885 4.383.784 1.7 2.092 2.832 3.809 3.528 1.016.413 2.08.63 3.16.776.116.015.231.041.332.06-.237.39-.5.75-.687 1.148-.154.327-.208.699-.323 1.046-.037.112-.104.263-.197.3-1.4.564-2.792.7-4.063-.297-.391-.308-.717-.725-.996-1.142-.547-.816-1.171-1.535-2.138-1.828a3.381 3.381 0 0 0-1.214-.108c-.371.028-.44.286-.185.569.157.173.338.337.535.46.844.535 1.392 1.31 1.796 2.194.305.669.581 1.35 1.12 1.874 1.01.982 2.252 1.308 3.614 1.26.518-.018 1.035-.104 1.628-.166l-.001-.002Z" fill="#FCFCFC"></path></g><defs><clipPath id="github-40x40_svg__a"><path fill="#fff" transform="translate(9.8 10)" d="M0 0h36.38v35.624H0z"></path></clipPath></defs>
<div>
<a href="http://pf.kakao.com/_jltrG" target="_blank" class="footer_logo">
<svg width="30" height="30" fill="none" xmlns="http://www.w3.org/2000/svg" role="img" id="kakao">
<path
d="M15 21.525c-.606 0-1.2-.039-1.776-.114-.577.374-3.911 2.531-4.226 2.572 0 0-.128.046-.238-.013-.11-.06-.09-.217-.09-.217.033-.207.864-2.85 1.017-3.337C6.872 19.13 5 16.856 5 14.263 5 10.252 9.477 7 15 7s10 3.252 10 7.263c0 4.01-4.477 7.262-10 7.262Z"
fill="#FCFCFC"></path>
<path
d="M11.22 13.177h-.86v3.111c0 .276-.247.5-.552.5-.305 0-.551-.224-.551-.5v-3.111h-.861a.553.553 0 0 1-.357-.163.5.5 0 0 1-.144-.35.5.5 0 0 1 .144-.35.553.553 0 0 1 .357-.162h2.824c.136.01.263.067.356.162a.5.5 0 0 1 .145.35.5.5 0 0 1-.145.35.553.553 0 0 1-.356.163Zm10.773 2.753a.511.511 0 0 1 .107.388.503.503 0 0 1-.215.344.57.57 0 0 1-.773-.102l-1.293-1.627-.191.182v1.142a.512.512 0 0 1-.162.37.568.568 0 0 1-.78 0 .511.511 0 0 1-.161-.37v-3.582a.513.513 0 0 1 .17-.357.568.568 0 0 1 .381-.145c.143 0 .28.052.382.146a.513.513 0 0 1 .17.356V13.8l1.54-1.461a.43.43 0 0 1 .304-.118c.137 0 .277.057.38.156a.506.506 0 0 1 .162.331.388.388 0 0 1-.121.32l-1.257 1.192 1.358 1.709h-.001Zm-8.187-3.26a.827.827 0 0 0-.735-.518.828.828 0 0 0-.735.516l-1.318 3.297c-.168.493-.022.678.13.745.11.047.23.072.35.071.23 0 .406-.088.459-.23l.273-.68h1.682l.273.68c.053.142.229.23.46.23.12 0 .24-.024.35-.072.151-.066.297-.25.13-.745l-1.319-3.296v.001Zm-1.285 2.274.55-1.486.55 1.486h-1.1Zm5.79 1.287a.48.48 0 0 1-.16.344.533.533 0 0 1-.37.137h-1.768a.545.545 0 0 1-.37-.136.494.494 0 0 1-.16-.345v-3.556c0-.289.253-.524.564-.524.311 0 .563.235.563.524v3.077h1.172c.29 0 .53.215.53.48h-.002Z"
fill="#2A2A2A"></path>
</svg>
<p>
카톡채널링크 http://pf.kakao.com/_jltrG
</p>
</a>
</div>
<div>
<a href="http://pf.kakao.com/_yDxkvxj">
<svg width="30" height="30" fill="none" xmlns="http://www.w3.org/2000/svg" role="img" id="kakao"><path d="M15 21.525c-.606 0-1.2-.039-1.776-.114-.577.374-3.911 2.531-4.226 2.572 0 0-.128.046-.238-.013-.11-.06-.09-.217-.09-.217.033-.207.864-2.85 1.017-3.337C6.872 19.13 5 16.856 5 14.263 5 10.252 9.477 7 15 7s10 3.252 10 7.263c0 4.01-4.477 7.262-10 7.262Z" fill="#FCFCFC"></path><path d="M11.22 13.177h-.86v3.111c0 .276-.247.5-.552.5-.305 0-.551-.224-.551-.5v-3.111h-.861a.553.553 0 0 1-.357-.163.5.5 0 0 1-.144-.35.5.5 0 0 1 .144-.35.553.553 0 0 1 .357-.162h2.824c.136.01.263.067.356.162a.5.5 0 0 1 .145.35.5.5 0 0 1-.145.35.553.553 0 0 1-.356.163Zm10.773 2.753a.511.511 0 0 1 .107.388.503.503 0 0 1-.215.344.57.57 0 0 1-.773-.102l-1.293-1.627-.191.182v1.142a.512.512 0 0 1-.162.37.568.568 0 0 1-.78 0 .511.511 0 0 1-.161-.37v-3.582a.513.513 0 0 1 .17-.357.568.568 0 0 1 .381-.145c.143 0 .28.052.382.146a.513.513 0 0 1 .17.356V13.8l1.54-1.461a.43.43 0 0 1 .304-.118c.137 0 .277.057.38.156a.506.506 0 0 1 .162.331.388.388 0 0 1-.121.32l-1.257 1.192 1.358 1.709h-.001Zm-8.187-3.26a.827.827 0 0 0-.735-.518.828.828 0 0 0-.735.516l-1.318 3.297c-.168.493-.022.678.13.745.11.047.23.072.35.071.23 0 .406-.088.459-.23l.273-.68h1.682l.273.68c.053.142.229.23.46.23.12 0 .24-.024.35-.072.151-.066.297-.25.13-.745l-1.319-3.296v.001Zm-1.285 2.274.55-1.486.55 1.486h-1.1Zm5.79 1.287a.48.48 0 0 1-.16.344.533.533 0 0 1-.37.137h-1.768a.545.545 0 0 1-.37-.136.494.494 0 0 1-.16-.345v-3.556c0-.289.253-.524.564-.524.311 0 .563.235.563.524v3.077h1.172c.29 0 .53.215.53.48h-.002Z" fill="#2A2A2A"></path></svg>
<div id="github-icon">
<a href="https://github.com/SKKU-MAV" target="_blank">
<svg width="40" height="40" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg" role="img">
<g clip-path="url(#github-40x40_svg__a)">
<path
d="M23.467 41.628c0 1.046.033 2.088-.012 3.125-.03.71-.623 1.034-1.337.785-2.353-.822-4.465-2.053-6.31-3.733-2.268-2.064-3.926-4.535-4.95-7.425a18.055 18.055 0 0 1-1.007-7.438c.323-4.37 1.984-8.162 5.01-11.319 3.36-3.505 7.496-5.4 12.354-5.606C35.5 9.67 42.901 14.907 45.36 22.82a17.859 17.859 0 0 1 .63 7.969c-.736 5.04-3.17 9.08-7.207 12.16-1.487 1.134-3.141 1.977-4.909 2.589-.82.283-1.369-.124-1.367-1.015 0-1.564.017-3.127.02-4.691 0-.86-.094-1.708-.492-2.484-.18-.354-.425-.674-.66-1.041.389-.062.793-.12 1.196-.188 1.39-.236 2.71-.663 3.884-1.47 1.376-.947 2.244-2.265 2.68-3.853.488-1.766.644-3.562.223-5.37a6.43 6.43 0 0 0-1.412-2.752c-.166-.194-.203-.352-.127-.598.463-1.474.296-2.923-.239-4.342-.038-.103-.266-.21-.385-.19-.581.09-1.193.134-1.724.36-.91.39-1.76.91-2.647 1.354-.17.085-.406.14-.585.095a17.702 17.702 0 0 0-8.508 0 .797.797 0 0 1-.55-.086c-1.058-.66-2.128-1.288-3.35-1.59a5.22 5.22 0 0 0-1.124-.133c-.115-.002-.3.14-.341.257-.521 1.439-.658 2.897-.19 4.383a.5.5 0 0 1-.087.399c-1.212 1.446-1.743 3.112-1.696 4.99.038 1.517.242 2.992.885 4.383.784 1.7 2.092 2.832 3.809 3.528 1.016.413 2.08.63 3.16.776.116.015.231.041.332.06-.237.39-.5.75-.687 1.148-.154.327-.208.699-.323 1.046-.037.112-.104.263-.197.3-1.4.564-2.792.7-4.063-.297-.391-.308-.717-.725-.996-1.142-.547-.816-1.171-1.535-2.138-1.828a3.381 3.381 0 0 0-1.214-.108c-.371.028-.44.286-.185.569.157.173.338.337.535.46.844.535 1.392 1.31 1.796 2.194.305.669.581 1.35 1.12 1.874 1.01.982 2.252 1.308 3.614 1.26.518-.018 1.035-.104 1.628-.166l-.001-.002Z"
fill="#FCFCFC"></path>
</g>
<defs>
<clipPath id="github-40x40_svg__a">
<path fill="#fff" transform="translate(9.8 10)" d="M0 0h36.38v35.624H0z"></path>
</clipPath>
</defs>
</svg>
</a>
</div>
</footer>
Expand Down
23 changes: 23 additions & 0 deletions mav-app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
70 changes: 70 additions & 0 deletions mav-app/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# Getting Started with Create React App

This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).

## Available Scripts

In the project directory, you can run:

### `npm start`

Runs the app in the development mode.\
Open [http://localhost:3000](http://localhost:3000) to view it in your browser.

The page will reload when you make changes.\
You may also see any lint errors in the console.

### `npm test`

Launches the test runner in the interactive watch mode.\
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.

### `npm run build`

Builds the app for production to the `build` folder.\
It correctly bundles React in production mode and optimizes the build for the best performance.

The build is minified and the filenames include the hashes.\
Your app is ready to be deployed!

See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.

### `npm run eject`

**Note: this is a one-way operation. Once you `eject`, you can't go back!**

If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.

Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.

You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.

## Learn More

You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).

To learn React, check out the [React documentation](https://reactjs.org/).

### Code Splitting

This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)

### Analyzing the Bundle Size

This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)

### Making a Progressive Web App

This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)

### Advanced Configuration

This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)

### Deployment

This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)

### `npm run build` fails to minify

This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
Loading

0 comments on commit 0d3f2a4

Please sign in to comment.