김채리

Concluded merge

......@@ -108,6 +108,7 @@ dist
# Stores VSCode versions used for testing VSCode extensions
.vscode-test
.vscode
# yarn v2
.yarn/cache
......
......@@ -10,7 +10,7 @@ KHU-Hub repo: [khuhub.khu.ac.kr/2018102216/dev-profile](https://khuhub.khu.ac.kr
- [x] your basic profile
- [x] random quotes **_for developers_** to motivate you :sparkles:
- [x] the amount of commits you've done on [GitHub](https://github.com/) at a glance
- [ ] your most-contributed project on GitHub
- [x] your most-contributed project on GitHub
- [x] today's trending repositories on GitHub
<br>
......@@ -43,7 +43,46 @@ npm run dev:assets
```
<br>
### Installation MongoDB
1. Access to the MongoDB homepage.
![image](/uploads/3d5d283732343d4c5ff4b5c7bd16c78f/image.png)
2. Select options and download MongoDB.
![image](/uploads/46038b5c881bb18074dd8e732804f5d7/image.png)
3. If this screen appears when installing MongoDB, please select 'complete' and proceed.
![image](/uploads/510d184825d6eaf04dcb2d254f03b918/image.png)
4. When you enter 'mongo' command in vsc terminal, it is installed well when the screen appears as below.
![image](/uploads/202bf8555f6842938d15c6e3b0e789c1/image.png)
### To setting environment variable.
ps. When entering 'mongo' command in vsc terminal, skip this part if it runs well.
1. Find folder where mongoDB is installed, and make a copy of the folder's route.
![image](/uploads/93b13c8df931ef11781d21ad574ee441/image.png)
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'.
![image](/uploads/64278904603d6b3cdb78a0689695344a/image.png)
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'.
![image](/uploads/9077ec8854585640dfb526e45cbcb3fb/image.png)
4. Create a new environmental variable path using the Mongo db address you copied earlier.
![image](/uploads/0018e1de51ae1c10cc9a5d5bc01fcf9d/image.png)
5. Please check if Mongo Db is working well in fourth method of "Installation MongoDB".
### How to contribution our project.
1. Please fork our repository.
2. Change your branch to 'developer'.
3. Send pull request.
### How to fill .env file.
1. If you clone our repository and downloads required modules, make new '.env' file.
2. Fill in the required values as shown below.
![image](/uploads/cbdf2726a8b5c6326378cd5fa8295726/image.png)
### API reference
[Programming Quotes API](quotes.stormconsultancy.co.uk/random.json)
......
......@@ -6,7 +6,12 @@ const totalContributionIndicator = document.getElementById(
);
const userCharacterBox = document.querySelector(".user-status__character");
const userRepoBox = document.querySelector(".user-repo");
<<<<<<< HEAD
const githubNickname = document.getElementById("jsGithubNickname");
=======
const githubName = document.getElementById("jsGithubname").innerText;
const URL = `https://api.github.com/users/${githubName}/repos?sort=updated&per_page=2`;
>>>>>>> 3dd97787bdb67559e6cc61cb60fb395606d3d6d5
const handleImage = () => {
const total = totalContributionIndicator.innerText;
......
......@@ -33,7 +33,11 @@ export const getUserDetail = async (req, res) => {
quote: quote.quote,
author: quote.author,
user,
<<<<<<< HEAD
totalContributions: totalCon
=======
totalContributions: totalCon,
>>>>>>> 3dd97787bdb67559e6cc61cb60fb395606d3d6d5
});
} catch (error) {
console.log(error);
......@@ -150,7 +154,11 @@ export const logout = (req, res) => {
res.redirect("/");
};
<<<<<<< HEAD
const getContributions = async (username) => {
=======
const getContributions = async(username) =>{
>>>>>>> 3dd97787bdb67559e6cc61cb60fb395606d3d6d5
const token = process.env.GH_SECRET_SH;
const headers = {
Authorization: `bearer ${token}`,
......
......@@ -6,6 +6,7 @@ block content
h3=author
hr
<<<<<<< HEAD
.pageLayout
.user-profile
.user-profile__column
......@@ -73,5 +74,50 @@ block content
=======
.user-profile
.user-profile__column
img(src=`/${user.avatarUrl}`)
.user-profile__link
a(href=user.githubUrl target="_blank") Github
a(href=`//${user.blogUrl}` target="_blank") Blog
.user-profile__column
.user-profile__info
.user-profile__name
h3 NAME:
h4=user.name
.user-profile__github
h3 GITHUB NICKNAME:
h4#jsGithubname=user.githubName
.user-profile__email
h3 EMAIL:
h4=user.email
.user-profile__school
h3 SCHOOL:
h4=user.school
.user-profile__tech
h3 TECH:
ul
each tech in user.tech
li=tech
.user-profile__career
h3 CAREER:
ul
each career in user.career
li=career
.user-profile__introduction
h3 SELF-INTRODUCTION:
h4=user.introduction
hr
.user-status
.user-status__contributions
span#jsTotalContributions=totalContributions
img(src=`http://ghchart.rshah.org/${user.githubName}` alt="Name Your Github chart")
.user-status__character
h3 Your step
.user-repositories
.user-repo
h3 Repositories
>>>>>>> 3dd97787bdb67559e6cc61cb60fb395606d3d6d5
block scripts
script(src="/static/js/githubInfo.js")
......