김채리

Concluded merge

...@@ -108,6 +108,7 @@ dist ...@@ -108,6 +108,7 @@ dist
108 108
109 # Stores VSCode versions used for testing VSCode extensions 109 # Stores VSCode versions used for testing VSCode extensions
110 .vscode-test 110 .vscode-test
111 +.vscode
111 112
112 # yarn v2 113 # yarn v2
113 .yarn/cache 114 .yarn/cache
......
...@@ -10,7 +10,7 @@ KHU-Hub repo: [khuhub.khu.ac.kr/2018102216/dev-profile](https://khuhub.khu.ac.kr ...@@ -10,7 +10,7 @@ KHU-Hub repo: [khuhub.khu.ac.kr/2018102216/dev-profile](https://khuhub.khu.ac.kr
10 - [x] your basic profile 10 - [x] your basic profile
11 - [x] random quotes **_for developers_** to motivate you :sparkles: 11 - [x] random quotes **_for developers_** to motivate you :sparkles:
12 - [x] the amount of commits you've done on [GitHub](https://github.com/) at a glance 12 - [x] the amount of commits you've done on [GitHub](https://github.com/) at a glance
13 -- [ ] your most-contributed project on GitHub 13 +- [x] your most-contributed project on GitHub
14 - [x] today's trending repositories on GitHub 14 - [x] today's trending repositories on GitHub
15 <br> 15 <br>
16 16
...@@ -43,6 +43,45 @@ npm run dev:assets ...@@ -43,6 +43,45 @@ npm run dev:assets
43 ``` 43 ```
44 44
45 <br> 45 <br>
46 +### Installation MongoDB
47 + 1. Access to the MongoDB homepage.
48 + ![image](/uploads/3d5d283732343d4c5ff4b5c7bd16c78f/image.png)
49 +
50 + 2. Select options and download MongoDB.
51 + ![image](/uploads/46038b5c881bb18074dd8e732804f5d7/image.png)
52 +
53 + 3. If this screen appears when installing MongoDB, please select 'complete' and proceed.
54 + ![image](/uploads/510d184825d6eaf04dcb2d254f03b918/image.png)
55 +
56 + 4. When you enter 'mongo' command in vsc terminal, it is installed well when the screen appears as below.
57 + ![image](/uploads/202bf8555f6842938d15c6e3b0e789c1/image.png)
58 +
59 +### To setting environment variable.
60 + ps. When entering 'mongo' command in vsc terminal, skip this part if it runs well.
61 +
62 + 1. Find folder where mongoDB is installed, and make a copy of the folder's route.
63 + ![image](/uploads/93b13c8df931ef11781d21ad574ee441/image.png)
64 +
65 + 2. And you open the 'environment variable' page. If using window environment, you can use command (window + R) and input 'sysdm.cpl ,3'. And click 'environment variable'.
66 + ![image](/uploads/64278904603d6b3cdb78a0689695344a/image.png)
67 +
68 + 3. You must find 'path' in 'system variable' categroy, not 'users variable'. If you find 'path' in 'system variable', then check 'path' and click 'Editing'.
69 + ![image](/uploads/9077ec8854585640dfb526e45cbcb3fb/image.png)
70 +
71 + 4. Create a new environmental variable path using the Mongo db address you copied earlier.
72 + ![image](/uploads/0018e1de51ae1c10cc9a5d5bc01fcf9d/image.png)
73 +
74 + 5. Please check if Mongo Db is working well in fourth method of "Installation MongoDB".
75 +
76 +### How to contribution our project.
77 + 1. Please fork our repository.
78 + 2. Change your branch to 'developer'.
79 + 3. Send pull request.
80 +
81 +### How to fill .env file.
82 + 1. If you clone our repository and downloads required modules, make new '.env' file.
83 + 2. Fill in the required values as shown below.
84 + ![image](/uploads/cbdf2726a8b5c6326378cd5fa8295726/image.png)
46 85
47 ### API reference 86 ### API reference
48 87
......
...@@ -6,7 +6,12 @@ const totalContributionIndicator = document.getElementById( ...@@ -6,7 +6,12 @@ const totalContributionIndicator = document.getElementById(
6 ); 6 );
7 const userCharacterBox = document.querySelector(".user-status__character"); 7 const userCharacterBox = document.querySelector(".user-status__character");
8 const userRepoBox = document.querySelector(".user-repo"); 8 const userRepoBox = document.querySelector(".user-repo");
9 +<<<<<<< HEAD
9 const githubNickname = document.getElementById("jsGithubNickname"); 10 const githubNickname = document.getElementById("jsGithubNickname");
11 +=======
12 +const githubName = document.getElementById("jsGithubname").innerText;
13 +const URL = `https://api.github.com/users/${githubName}/repos?sort=updated&per_page=2`;
14 +>>>>>>> 3dd97787bdb67559e6cc61cb60fb395606d3d6d5
10 15
11 const handleImage = () => { 16 const handleImage = () => {
12 const total = totalContributionIndicator.innerText; 17 const total = totalContributionIndicator.innerText;
......
...@@ -33,7 +33,11 @@ export const getUserDetail = async (req, res) => { ...@@ -33,7 +33,11 @@ export const getUserDetail = async (req, res) => {
33 quote: quote.quote, 33 quote: quote.quote,
34 author: quote.author, 34 author: quote.author,
35 user, 35 user,
36 +<<<<<<< HEAD
36 totalContributions: totalCon 37 totalContributions: totalCon
38 +=======
39 + totalContributions: totalCon,
40 +>>>>>>> 3dd97787bdb67559e6cc61cb60fb395606d3d6d5
37 }); 41 });
38 } catch (error) { 42 } catch (error) {
39 console.log(error); 43 console.log(error);
...@@ -150,7 +154,11 @@ export const logout = (req, res) => { ...@@ -150,7 +154,11 @@ export const logout = (req, res) => {
150 res.redirect("/"); 154 res.redirect("/");
151 }; 155 };
152 156
157 +<<<<<<< HEAD
153 const getContributions = async (username) => { 158 const getContributions = async (username) => {
159 +=======
160 +const getContributions = async(username) =>{
161 +>>>>>>> 3dd97787bdb67559e6cc61cb60fb395606d3d6d5
154 const token = process.env.GH_SECRET_SH; 162 const token = process.env.GH_SECRET_SH;
155 const headers = { 163 const headers = {
156 Authorization: `bearer ${token}`, 164 Authorization: `bearer ${token}`,
......
...@@ -6,6 +6,7 @@ block content ...@@ -6,6 +6,7 @@ block content
6 h3=author 6 h3=author
7 7
8 hr 8 hr
9 +<<<<<<< HEAD
9 .pageLayout 10 .pageLayout
10 .user-profile 11 .user-profile
11 .user-profile__column 12 .user-profile__column
...@@ -73,5 +74,50 @@ block content ...@@ -73,5 +74,50 @@ block content
73 74
74 75
75 76
77 +=======
78 + .user-profile
79 + .user-profile__column
80 + img(src=`/${user.avatarUrl}`)
81 + .user-profile__link
82 + a(href=user.githubUrl target="_blank") Github
83 + a(href=`//${user.blogUrl}` target="_blank") Blog
84 + .user-profile__column
85 + .user-profile__info
86 + .user-profile__name
87 + h3 NAME:
88 + h4=user.name
89 + .user-profile__github
90 + h3 GITHUB NICKNAME:
91 + h4#jsGithubname=user.githubName
92 + .user-profile__email
93 + h3 EMAIL:
94 + h4=user.email
95 + .user-profile__school
96 + h3 SCHOOL:
97 + h4=user.school
98 + .user-profile__tech
99 + h3 TECH:
100 + ul
101 + each tech in user.tech
102 + li=tech
103 + .user-profile__career
104 + h3 CAREER:
105 + ul
106 + each career in user.career
107 + li=career
108 + .user-profile__introduction
109 + h3 SELF-INTRODUCTION:
110 + h4=user.introduction
111 + hr
112 + .user-status
113 + .user-status__contributions
114 + span#jsTotalContributions=totalContributions
115 + img(src=`http://ghchart.rshah.org/${user.githubName}` alt="Name Your Github chart")
116 + .user-status__character
117 + h3 Your step
118 + .user-repositories
119 + .user-repo
120 + h3 Repositories
121 +>>>>>>> 3dd97787bdb67559e6cc61cb60fb395606d3d6d5
76 block scripts 122 block scripts
77 script(src="/static/js/githubInfo.js") 123 script(src="/static/js/githubInfo.js")
......