Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FEAT] GPA #54

Merged
merged 8 commits into from
Jun 30, 2022
Merged

[FEAT] GPA #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
760bcf8
docs: update README (version 2.3.0)
youngkwon02 Jun 15, 2022
466d566
HOTFIX: invalid hyperlink properties
youngkwon02 Jun 15, 2022
0cc5d9f
chore: turn debug off
youngkwon02 Jun 15, 2022
6ee8517
docs: update README (version 2.3.1)
youngkwon02 Jun 15, 2022
2ac6e68
HOTFIX: reset debug function
youngkwon02 Jun 15, 2022
049aef5
docs: update README(ver 2.3.2)
youngkwon02 Jun 27, 2022
9d12dff
Merge pull request #52 from youngkwon02/main
youngkwon02 Jun 27, 2022
8fede90
feat: GPA and overall style refactoring
youngkwon02 Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@
| 2.2.1 | 2022.05. | Modify primary email address |
| 2.2.2 | 2022.05. | Project(READ ME, 오시내시) update, Fix nav mail address |
| 2.2.3 | 2022.06. | Update Timeline (LikeLion 10th, Software Maestro 13th) |
| 2.3.0 | 2022.06. | Update Timeline (Hide Software Maestro 13th temporary, Update spark PC url) |
| 2.3.1 | 2022.06. | Debug off |
| 2.3.2 | 2022.06. | Make SW Maestro visible |
53 changes: 25 additions & 28 deletions youngkwonFE/aboutme/templates/aboutme.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,7 @@
<div class="timeline">
<div class="timeline__main">
<div class="when">2021.03.27 - 2021.12.01</div>
<div class="title">
<br />중앙대학교 멋쟁이사자처럼<br />
9기
</div>
<div class="title"><br />중앙대학교 멋쟁이사자처럼 9기</div>
</div>
</div>
<div class="timeline">
Expand All @@ -191,10 +188,15 @@
</div>
<div class="timeline">
<div class="timeline__main">
<div class="when">2017.03 - 현재</div>
<div class="when">2017.03.02 - 현재</div>
<div class="title">
Chung-Ang University,<br />
Computer Science and Engineering
Computer Science and Engineering<br />
<div class="gpa-box">
GPA<br />
Major : 4.16 / 4.5<br />
Overall : 3.97 / 4.5<br />
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -231,9 +233,9 @@
<div class="category">Kotlin</div>
<div class="category not-mob-category">Firebase</div>
<div class="category not-mob-category">Google-Cloud</div>
<div class="category mob-category">Gcloud</div>
<div class="category mob-category">GCF</div>
<div class="category not-mob-category">PostgreSQL</div>
<div class="category mob-category">Postgres</div>
<div class="category mob-category">pgSQL</div>
</div>
</div>
<div class="detail">
Expand Down Expand Up @@ -266,12 +268,11 @@
</a>
</div>
<div class="stack">
<div class="category">JSP</div>
<div class="category not-mob-category">JavaScript</div>
<div class="category mob-category">JS</div>
<div class="category">Java</div>
<div class="category">JSP</div>
<div class="category">JavaScript</div>
<div class="category">Oracle</div>
<div class="category">CMS</div>
<div class="category not-mob-category">CMS</div>
</div>
</div>
<div class="detail">
Expand Down Expand Up @@ -358,7 +359,7 @@
</div>
<div class="stack">
<div class="category">NodeJS</div>
<div class="category">Express</div>
<div class="category not-mob-category">Express</div>
<div class="category">JavaScript</div>
<div class="category">Firebase</div>
<div class="category">Swift</div>
Expand Down Expand Up @@ -388,15 +389,14 @@
>
</div>
<div class="stack">
<div class="category">NodeJS</div>
<div class="category">TypeScript</div>
<div class="category">NestJS</div>
<div class="category">TypeScript</div>
<div class="category">TypeORM</div>
<div class="category not-mob-category">Swift</div>
<div class="category not-mob-category">Kotlin</div>
<div class="category not-mob-category">PostgreSQL</div>
<div class="category not-mob-category">AWS-EC2</div>
<div class="category mob-category">EC2</div>
<div class="category mob-category">pgSQL</div>
<div class="category">AWS</div>
</div>
</div>
<div class="detail">
Expand Down Expand Up @@ -428,13 +428,12 @@
</div>
<div class="stack">
<div class="category">NodeJS</div>
<div class="category">Express</div>
<div class="category not-mob-category">Express</div>
<div class="category">TypeScript</div>
<div class="category not-mob-category">Kotlin</div>
<div class="category not-mob-category">MongoDB</div>
<div class="category">Mongoose</div>
<div class="category not-mob-category">AWS-EC2</div>
<div class="category mob-category">EC2</div>
<div class="category">MongoDB</div>
<div class="category not-mob-category">Mongoose</div>
<div class="category">AWS</div>
</div>
</div>
<div class="detail">
Expand Down Expand Up @@ -536,11 +535,10 @@
</div>
<div class="stack">
<div class="category">JSP</div>
<div class="category not-mob-category">JavaScript</div>
<div class="category mob-category">JS</div>
<div class="category">JavaScript</div>
<div class="category">Java</div>
<div class="category">Oracle</div>
<div class="category">CMS</div>
<div class="category not-mob-category">CMS</div>
</div>
</div>
<div class="detail">
Expand Down Expand Up @@ -572,11 +570,10 @@
</div>
<div class="stack">
<div class="category">JSP</div>
<div class="category not-mob-category">JavaScript</div>
<div class="category mob-category">JS</div>
<div class="category">JavaScript</div>
<div class="category">Java</div>
<div class="category">Oracle</div>
<div class="category">CMS</div>
<div class="category not-mob-category">CMS</div>
</div>
</div>
<div class="detail">
Expand Down
Binary file modified youngkwonFE/project/__pycache__/urls.cpython-39.pyc
View file
Open in desktop
Binary file not shown.
Binary file modified youngkwonFE/project/__pycache__/views.cpython-39.pyc
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion youngkwonFE/project/static/css/aboutme-mob.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@media (max-width: 730px) {
.content-aboutme {
padding: 0 1.25rem;
padding: 0 .84rem;
overflow: hidden;
}
.sub-content {
Expand Down
4 changes: 4 additions & 0 deletions youngkwonFE/project/static/css/aboutme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,3 +313,7 @@ body {
.project-content .project-elem .project-info .head .stack .mob-category {
display: none;
}

.gpa-box {
line-height: .7rem;
}
2 changes: 1 addition & 1 deletion youngkwonFE/project/static/css/common.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ nav ul a:hover {

footer {
width: 100vw;
margin-bottom: 4rem;
margin: 1rem 0 3rem 0;
}

footer ul {
Expand Down
1 change: 1 addition & 0 deletions youngkwonFE/project/static/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#carousel-content {
padding-top: 90px;
height: 66vh;
margin-bottom: 3rem;
}

.scroll-notice {
Expand Down
2 changes: 1 addition & 1 deletion youngkwonFE/project/templates/acid-world.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,6 @@
}
init();
</script>
<a href="/"><div class="cancel-btn"></div></a>
<a href="/home"><div class="cancel-btn"></div></a>
</body>
</html>
2 changes: 1 addition & 1 deletion youngkwonFE/project/templates/ironman.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,6 @@
}
init();
</script>
<a href="/"><div class="cancel-btn"></div></a>
<a href="/home"><div class="cancel-btn"></div></a>
</body>
</html>
190 changes: 113 additions & 77 deletions youngkwonFE/project/templates/slingshot.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,87 +1,123 @@
{% load static %}
<!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">
<link rel="icon" type="image/png" href="{% static 'image/favicon.ico' %}"/>
<link rel="stylesheet" href="{% static 'css/common.css' %}">
<link rel="stylesheet" href="{% static 'css/slingshot.css' %}">
<title>Sling Shot</title>
</head>
<body>
<div class="game-board">
<div>Shot : <span class="score">0</span></div><br>
<div class="reset" onclick="location.reload()">Reset</div>
</div>
<script src="{% static 'js/matter.min.js' %}"></script>
<script>
let divWidth = window.innerWidth;
let divHeight = window.innerHeight;
let engine = Matter.Engine.create();
let render = Matter.Render.create({
element: document.body,
engine: engine,
options: {
width: divWidth,
height: divHeight,
wireframes: false
}
});
let ground, slingX, stack;
if(divWidth > 900) {
ground = Matter.Bodies.rectangle(divWidth - 340,divHeight - 200,300,20,{isStatic: true});
slingX = 300;
stack = Matter.Composites.stack(divWidth - 450,80,4,4,0,0, function(x,y){
return Matter.Bodies.polygon(x,y,8,30);
});
} else {
ground = Matter.Bodies.rectangle(divWidth - 100,200,150,20,{isStatic: true});
slingX = 70;
stack = Matter.Composites.stack(divWidth - 178,30,4,4,0,0, function(x,y){
return Matter.Bodies.polygon(x,y,8,20);
<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" />
<link rel="icon" type="image/png" href="{% static 'image/favicon.ico' %}" />
<link rel="stylesheet" href="{% static 'css/common.css' %}" />
<link rel="stylesheet" href="{% static 'css/slingshot.css' %}" />
<title>Sling Shot</title>
</head>
<body>
<div class="game-board">
<div>Shot : <span class="score">0</span></div>
<br />
<div class="reset" onclick="location.reload()">Reset</div>
</div>
<script src="{% static 'js/matter.min.js' %}"></script>
<script>
let divWidth = window.innerWidth;
let divHeight = window.innerHeight;
let engine = Matter.Engine.create();
let render = Matter.Render.create({
element: document.body,
engine: engine,
options: {
width: divWidth,
height: divHeight,
wireframes: false,
},
});
}
let mouse = Matter.Mouse.create(render.canvas);
let mouseConstraint = Matter.MouseConstraint.create(engine, {
mouse: mouse,
constraint: {
render: {visible: false}
let ground, slingX, stack;
if (divWidth > 900) {
ground = Matter.Bodies.rectangle(
divWidth - 340,
divHeight - 200,
300,
20,
{ isStatic: true }
);
slingX = 300;
stack = Matter.Composites.stack(
divWidth - 450,
80,
4,
4,
0,
0,
function (x, y) {
return Matter.Bodies.polygon(x, y, 8, 30);
}
);
} else {
ground = Matter.Bodies.rectangle(divWidth - 100, 200, 150, 20, {
isStatic: true,
});
slingX = 70;
stack = Matter.Composites.stack(
divWidth - 178,
30,
4,
4,
0,
0,
function (x, y) {
return Matter.Bodies.polygon(x, y, 8, 20);
}
);
}
});
render.mouse = mouse;
let mouse = Matter.Mouse.create(render.canvas);
let mouseConstraint = Matter.MouseConstraint.create(engine, {
mouse: mouse,
constraint: {
render: { visible: false },
},
});
render.mouse = mouse;

let slingY = divHeight - 200;

let slingY = divHeight-200;
let ball = Matter.Bodies.circle(slingX, slingY, 20);
let sling = Matter.Constraint.create({
pointA: { x: slingX, y: slingY },
bodyB: ball,
stiffness: 0.05,
});

let ball = Matter.Bodies.circle(slingX,slingY,20);
let sling = Matter.Constraint.create({
pointA: {x:slingX, y:slingY},
bodyB: ball,
stiffness: 0.05
});
let firing = false;
Matter.Events.on(mouseConstraint, "enddrag", function (e) {
if (e.body === ball) firing = true;
});
Matter.Events.on(engine, "afterUpdate", function () {
if (
firing &&
Math.abs(ball.position.x - slingX) < 20 &&
Math.abs(ball.position.y - slingY) < 20
) {
ball = Matter.Bodies.circle(slingX, slingY, 20);
Matter.World.add(engine.world, ball);
sling.bodyB = ball;
firing = false;

let firing = false;
Matter.Events.on(mouseConstraint, 'enddrag', function(e){
if(e.body === ball) firing = true;
});
Matter.Events.on(engine,'afterUpdate',function(){
if(firing && Math.abs(ball.position.x-slingX) < 20 && Math.abs(ball.position.y-slingY)<20) {
ball = Matter.Bodies.circle(slingX, slingY, 20);
Matter.World.add(engine.world,ball);
sling.bodyB = ball;
firing = false;
let updatedScore =
parseInt(document.querySelector(".score").innerHTML) + 1;
document.querySelector(".score").innerHTML = updatedScore;
}
});

let updatedScore = parseInt(document.querySelector('.score').innerHTML) + 1;
document.querySelector('.score').innerHTML = updatedScore;
}
});

Matter.World.add(engine.world,[stack, ground, ball, sling, mouseConstraint]);
Matter.Engine.run(engine);
Matter.Render.run(render);
</script>
Matter.World.add(engine.world, [
stack,
ground,
ball,
sling,
mouseConstraint,
]);
Matter.Engine.run(engine);
Matter.Render.run(render);
</script>

<a href="/"><div class="cancel-btn"></div></a>
</body>
</html>
<a href="/home"><div class="cancel-btn"></div></a>
</body>
</html>
Loading