Commit @eca42f37a4c104e9290134c47afa580a967e7415

kimgkdud898 2023-10-26

231026김하영

@eca42f37a4c104e9290134c47afa580a967e7415

41c157f

eca42f3

client/resources/css/common.css

--- client/resources/css/common.css

+++ client/resources/css/common.css

...	...	@@ -43,3 +43,21 @@
43	43	padding-top: 1rem;
44	44	box-shadow: 2px 2px 2px #33333300 !important;
45	45	}
	46	+
	47	+/* 버튼 */
	48	+button {
	49	+ cursor: pointer;
	50	+}
	51	+/* 페이지별 로고 공통 */
	52	+.page-logo {
	53	+ padding: 6rem 2rem 2rem 2rem;
	54	+ width: 85%;
	55	+}
	56	+
	57	+.page-logo h1 {
	58	+ font-size: 4rem;
	59	+ font-family: SBaggroM;
	60	+ font-weight: 500;
	61	+ color: #0e0077;
	62	+ /* position: relative; */
	63	+}

eca42f3

client/resources/jpg/info-logo.png (Binary) (added)

+++ client/resources/jpg/info-logo.png

Binary file is not shown

41c157f

eca42f3

client/views/layout/Menu.vue

--- client/views/layout/Menu.vue

+++ client/views/layout/Menu.vue

...	...	@@ -68,6 +68,7 @@
68	68	isHovered: false,
69	69	subMenu: [
70	70	{ text: "기술문서", link: "/Technology.page" },
	71	+ { text: "AI 디지털교과서개발 가이드라인", link: "/Technology.page" },
71	72	{ text: "자료집", link: "/Data.page" }
72	73	]
73	74	},
...	...	@@ -81,19 +82,20 @@
81	82	},
82	83	{
83	84	text: "커뮤니티",
84		- link: "",
	85	+ link: "/Notice.page",
85	86	isHovered: false,
86	87	subMenu: [
87		- { text: "공지사항", link: "" },
88		- { text: "홍보/뉴스", link: "" }
	88	+ { text: "공지사항", link: "/Notice.page" },
	89	+ { text: "홍보/뉴스", link: "" },
	90	+ { text: "WG 커뮤니티", link: "" }
89	91	]
90	92	},
91	93	{
92	94	text: "마이페이지",
93		- link: "",
	95	+ link: "/Info.page",
94	96	isHovered: false,
95	97	subMenu: [
96		- { text: "내 정보 수정", link: "" },
	98	+ { text: "내 정보 수정", link: "/Info.page" },
97	99	{ text: "매칭 관리", link: "" }
98	100	]
99	101	}

41c157f

eca42f3

client/views/pages/AppRouter.js

--- client/views/pages/AppRouter.js

+++ client/views/pages/AppRouter.js


 import { createWebHistory, createRouter } from "vue-router";
 
 import Main from "../pages/user/main/Main.vue";
-import Matching from "../pages/user/matching/Matching.vue";
+import Matching from "../pages/user/networking/Matching.vue";
 import Data from "../pages/user/Data/Data.vue";
 import Login from "../pages/user/login/Login.vue";
 import Join from "../pages/user/Join/Join.vue";
 import Introduction from "../pages/user/introduction/Introduction.vue";
 import Technology from "../pages/user/Data/Technology.vue";
+import Notice from "../pages/user/community/Notice.vue";
+import Info from "../pages/user/mypage/Info.vue";
 
-  /* 관리자 */
-  import AdminMain from "../pages/admin/main/Main.vue";
-  import AdminUser from "../pages/admin/user/UserSelectList.vue";
+/* 관리자 */
+import AdminMain from "../pages/admin/main/Main.vue";
+import AdminUser from "../pages/admin/user/UserSelectList.vue";
 
 const routes = [
   /* 메인화면 */

   { path: "/Join.page", name: "Join", component: Join },
   { path: "/Introduction.page", name: "Introduction", component: Introduction },
   { path: "/Technology.page", name: "Technology", component: Technology },
+  { path: "/Notice.page", name: "Notice", component: Notice },
+  { path: "/Info.page", name: "Info", component: Info },
   /* 관리자 */
   { path: "/adm.page", name: "AdminMain", component: AdminMain },
   { path: "/adm/user.page", name: "AdminUser", component: AdminUser },

41c157f

eca42f3

client/views/pages/user/Data/Technology.vue

--- client/views/pages/user/Data/Technology.vue

+++ client/views/pages/user/Data/Technology.vue


 .tech-box-sec {
     padding: 2rem;
     /* border-radius: 2rem; */
-    background-color: #fafafa;
+    background-color: #ffff;
     box-shadow: 2px 2px 5px rgba(191, 191, 191, 0.447);
     /* border: 1px solid rgb(191, 191, 191); */
 }

eca42f3

client/views/pages/user/community/Notice.vue (added)

+++ client/views/pages/user/community/Notice.vue

...	...	@@ -0,0 +1,167 @@
	1	+<template>
	2	+ <div class="w1400">
	3	+ <div class="noti-bos">
	4	+
	5	+ <section class="page-logo">
	6	+ <h1>공지사항</h1>
	7	+ </section>
	8	+
	9	+ <div class="data-select">
	10	+
	11	+
	12	+ <select name="data-table-sild" id="data-table-sild">
	13	+ <option value="전체" selected>전체</option>
	14	+ <option value="기본순">기본순</option>
	15	+ <option value="업로드순" disabled>업로드순</option>
	16	+ <option value="조회순">조회순</option>
	17	+ </select>
	18	+ <div class="input-group">
	19	+ <input type="text" class="input" onfocus="this.value=''; return true;" value="검색어를 입력해주세요.">
	20	+ <input class="button--submit" value="검색" type="submit">
	21	+ </div>
	22	+ </div>
	23	+
	24	+ <section class="noti-sec">
	25	+ <div class="noti-sec-table">
	26	+ <table>
	27	+ <th>no</th>
	28	+ <th>제목</th>
	29	+ <th>작성자</th>
	30	+ <th>작성일</th>
	31	+ <th>조회수</th>
	32	+
	33	+ <tr>
	34	+ <td>1</td>
	35	+ <td>AI 디지털교과서 개발 기술지원 수요조사</td>
	36	+ <td>KERIS</td>
	37	+ <td>2023-09-12</td>
	38	+ <td>129</td>
	39	+ </tr>
	40	+ <tr>
	41	+ <td>1</td>
	42	+ <td>AI 디지털교과서 개발 기술지원 수요조사</td>
	43	+ <td>KERIS</td>
	44	+ <td>2023-09-12</td>
	45	+ <td>129</td>
	46	+ </tr>
	47	+ <tr>
	48	+ <td>1</td>
	49	+ <td>AI 디지털교과서 개발 기술지원 수요조사</td>
	50	+ <td>KERIS</td>
	51	+ <td>2023-09-12</td>
	52	+ <td>129</td>
	53	+ </tr>
	54	+ <tr>
	55	+ <td>1</td>
	56	+ <td>AI 디지털교과서 개발 기술지원 수요조사</td>
	57	+ <td>KERIS</td>
	58	+ <td>2023-09-12</td>
	59	+ <td>129</td>
	60	+ </tr>
	61	+ <tr>
	62	+ <td>1</td>
	63	+ <td>AI 디지털교과서 개발 기술지원 수요조사</td>
	64	+ <td>KERIS</td>
	65	+ <td>2023-09-12</td>
	66	+ <td>129</td>
	67	+ </tr>
	68	+ <tr>
	69	+ <td>1</td>
	70	+ <td>AI 디지털교과서 개발 기술지원 수요조사</td>
	71	+ <td>KERIS</td>
	72	+ <td>2023-09-12</td>
	73	+ <td>129</td>
	74	+ </tr>
	75	+ <tr>
	76	+ <td>1</td>
	77	+ <td>AI 디지털교과서 개발 기술지원 수요조사</td>
	78	+ <td>KERIS</td>
	79	+ <td>2023-09-12</td>
	80	+ <td>129</td>
	81	+ </tr>
	82	+ <tr>
	83	+ <td>1</td>
	84	+ <td>AI 디지털교과서 개발 기술지원 수요조사</td>
	85	+ <td>KERIS</td>
	86	+ <td>2023-09-12</td>
	87	+ <td>129</td>
	88	+ </tr>
	89	+ <tr>
	90	+ <td>1</td>
	91	+ <td>AI 디지털교과서 개발 기술지원 수요조사</td>
	92	+ <td>KERIS</td>
	93	+ <td>2023-09-12</td>
	94	+ <td>129</td>
	95	+ </tr>
	96	+ <tr>
	97	+ <td>1</td>
	98	+ <td>AI 디지털교과서 개발 기술지원 수요조사</td>
	99	+ <td>KERIS</td>
	100	+ <td>2023-09-12</td>
	101	+ <td>129</td>
	102	+ </tr>
	103	+ </table>
	104	+ </div>
	105	+ </section>
	106	+ </div>
	107	+ </div>
	108	+</template>
	109	+
	110	+<script>
	111	+export default {
	112	+ data() {
	113	+ return {
	114	+ }
	115	+ },
	116	+ methods: {
	117	+
	118	+ },
	119	+ watch: {
	120	+
	121	+ },
	122	+ computed: {
	123	+
	124	+ },
	125	+ mounted() {
	126	+
	127	+ }
	128	+}
	129	+</script>
	130	+
	131	+<style scoped>
	132	+.noti-bos {
	133	+ width: 100%;
	134	+}
	135	+
	136	+
	137	+
	138	+.noti-sec {
	139	+ width: 100%;
	140	+ padding: 3rem;
	141	+}
	142	+
	143	+.noti-sec-table {
	144	+ /* padding: 0 0 8rem 0; */
	145	+}
	146	+
	147	+.noti-sec-table table {
	148	+ border-bottom: 1px solid #cccccc;
	149	+
	150	+}
	151	+
	152	+.noti-sec-table th {
	153	+ padding: 1.5rem;
	154	+ color: white;
	155	+ background-color: #007aff;
	156	+ font-size: 1.5rem;
	157	+}
	158	+
	159	+.noti-sec-table td {
	160	+ padding: 1.5rem;
	161	+ font-size: 1.5rem;
	162	+ border-bottom: 1px solid #cccccc;
	163	+ text-align: center;
	164	+}
	165	+</style>
	166	+
	167	+

eca42f3

client/views/pages/user/mypage/Info.vue (added)

+++ client/views/pages/user/mypage/Info.vue

...	...	@@ -0,0 +1,39 @@
	1	+<template>
	2	+ <div class="w1400">
	3	+ <div class="info-bos">
	4	+ <section class="info-logo">
	5	+ <img src="../../../../resources/jpg/info-logo.png" alt="">
	6	+
	7	+ <h1>기본 회원정보</h1>
	8	+ </section>
	9	+
	10	+
	11	+ <div class="info-sec">
	12	+ <section></section>
	13	+ </div>
	14	+ </div>
	15	+ </div>
	16	+</template>
	17	+
	18	+<script>
	19	+export default {
	20	+ data() {
	21	+ return {
	22	+ }
	23	+ },
	24	+ methods: {
	25	+
	26	+ },
	27	+ watch: {
	28	+
	29	+ },
	30	+ computed: {
	31	+
	32	+ },
	33	+ mounted() {
	34	+ console.log('Login mounted');
	35	+ }
	36	+}
	37	+</script>
	38	+
	39	+

41c157f

eca42f3

client/views/pages/user/networking/Matching.vue (Renamed from client/views/pages/user/matching/Matching.vue)

--- client/views/pages/user/matching/Matching.vue

+++ client/views/pages/user/networking/Matching.vue

No changes

Add a comment

Open 0
Closed 0

List

...	...	@@ -211,7 +211,7 @@
211	211	.tech-box-sec {
212	212	padding: 2rem;
213	213	/* border-radius: 2rem; */
214		- background-color: #fafafa;
	214	+ background-color: #ffff;
215	215	box-shadow: 2px 2px 5px rgba(191, 191, 191, 0.447);
216	216	/* border: 1px solid rgb(191, 191, 191); */
217	217	}

...	...	@@ -1,16 +1,18 @@
1	1	import { createWebHistory, createRouter } from "vue-router";
2	2
3	3	import Main from "../pages/user/main/Main.vue";
4		-import Matching from "../pages/user/matching/Matching.vue";
	4	+import Matching from "../pages/user/networking/Matching.vue";
5	5	import Data from "../pages/user/Data/Data.vue";
6	6	import Login from "../pages/user/login/Login.vue";
7	7	import Join from "../pages/user/Join/Join.vue";
8	8	import Introduction from "../pages/user/introduction/Introduction.vue";
9	9	import Technology from "../pages/user/Data/Technology.vue";
	10	+import Notice from "../pages/user/community/Notice.vue";
	11	+import Info from "../pages/user/mypage/Info.vue";
10	12
11		- /* 관리자 */
12		- import AdminMain from "../pages/admin/main/Main.vue";
13		- import AdminUser from "../pages/admin/user/UserSelectList.vue";
	13	+/* 관리자 */
	14	+import AdminMain from "../pages/admin/main/Main.vue";
	15	+import AdminUser from "../pages/admin/user/UserSelectList.vue";
14	16
15	17	const routes = [
16	18	/* 메인화면 */
...	...	@@ -21,6 +23,8 @@
21	23	{ path: "/Join.page", name: "Join", component: Join },
22	24	{ path: "/Introduction.page", name: "Introduction", component: Introduction },
23	25	{ path: "/Technology.page", name: "Technology", component: Technology },
	26	+ { path: "/Notice.page", name: "Notice", component: Notice },
	27	+ { path: "/Info.page", name: "Info", component: Info },
24	28	/* 관리자 */
25	29	{ path: "/adm.page", name: "AdminMain", component: AdminMain },
26	30	{ path: "/adm/user.page", name: "AdminUser", component: AdminUser },

Delete comment