Skip to content

Commit

Permalink
Merge pull request #165 from urLink-DEV/release/1.2.0
Browse files Browse the repository at this point in the history
🚀 Release/1.2.0
  • Loading branch information
yjkwon07 authored Nov 22, 2021
2 parents 8254151 + 8ad547b commit 97b9044
Show file tree
Hide file tree
Showing 54 changed files with 906 additions and 467 deletions.
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,7 @@
"source.organizeImports": false,
"source.fixAll.eslint": true
},
"cSpell.words": [
"favorited"
],
}
48 changes: 29 additions & 19 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "urlink-chrome-extension",
"version": "1.1.4",
"version": "1.2.0",
"private": true,
"dependencies": {
"@craco/craco": "^6.1.1",
Expand All @@ -17,12 +17,13 @@
"axios": "^0.21.1",
"clsx": "^1.1.0",
"history": "^4.10.1",
"immer": "^8.0.1",
"immer": "^9.0.6",
"moment": "^2.26.0",
"node-sass": "^4.14.1",
"react": "^16.13.0",
"react-chrome-extension-router": "^1.1.0",
"react-dom": "^16.13.0",
"react-ga": "^3.3.0",
"react-hook-form": "^6.13.1",
"react-id-swiper": "^4.0.0",
"react-redux": "^7.2.2",
Expand All @@ -32,7 +33,7 @@
"redux-devtools-extension": "^2.13.8",
"redux-saga": "^1.1.3",
"redux-thunk": "^2.3.0",
"swiper": "^5.4.5",
"swiper": "^6.5.1",
"yup": "^0.32.8"
},
"scripts": {
Expand Down
20 changes: 20 additions & 0 deletions public/analytics.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/* eslint-disable no-undef */
/* eslint-disable no-unused-expressions */

;(function (i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r
;(i[r] =
i[r] ||
function () {
;(i[r].q = i[r].q || []).push(arguments)
}),
(i[r].l = 1 * new Date())
;(a = s.createElement(o)), (m = s.getElementsByTagName(o)[0])
a.async = 1
a.src = g
m.parentNode.insertBefore(a, m)
})(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga')

ga('create', 'UA-207149982-2', 'auto')
ga('set', 'checkProtocolTask', null)
ga('send', 'pageview')
14 changes: 6 additions & 8 deletions public/background.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<head>
<meta charset="UTF-8" />
<title>UrLink-background</title>
</head>

<body>
</body>
<script src="analytics.js"></script>
</head>

</html>
<body></body>
</html>
19 changes: 10 additions & 9 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>UrLink</title>
</head>
<body>
<div id="root"></div>
</body>
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>UrLink</title>
<script src="analytics.js"></script>
</head>
<body>
<div id="root"></div>
</body>
</html>
6 changes: 3 additions & 3 deletions public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "urLink",
"version": "1.1.4",
"version": "1.2.0",
"manifest_version": 2,
"description": "url collection",
"description": "북마크보다 손쉽게 웹사이트를 보관하고 정리하세요.",
"permissions": ["tabs", "<all_urls>", "identity", "history", "notifications"],
"icons": {
"16": "images/logo/logo16.png",
Expand All @@ -24,5 +24,5 @@
"client_id": "683415540436-aimi7aksc043mre0pdj2nejtr08fkchs.apps.googleusercontent.com",
"scopes": ["https://www.googleapis.com/auth/userinfo.profile", "https://www.googleapis.com/auth/userinfo.email"]
},
"content_security_policy": "script-src 'self' https://apis.google.com 'sha256-34M3HxxCd7web+UMuTvWUlRtVdx6QrTGItv3k4d183Y='; object-src 'self'"
"content_security_policy": "script-src 'self' https://www.google-analytics.com https://apis.google.com 'sha256-34M3HxxCd7web+UMuTvWUlRtVdx6QrTGItv3k4d183Y='; object-src 'self'"
}
47 changes: 23 additions & 24 deletions public/popup.html
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>UrLink-popup</title>
<script src="analytics.js"></script>
</head>

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>UrLink-popup</title>
</head>
<body>
<div class="popup-body">
<div id="categoryList" class="category"></div>

<body>
<div class="popup-body">
<div id="categoryList" class="category"></div>
<div class="btn-group">
<div id="linkSave" class="link-save-btn">
<span>링크 저장하기</span>
</div>

<div class="btn-group">
<div id="linkSave" class="link-save-btn">
<span>링크 저장하기</span>
</div>
<div class="urlLink-open-btn">
<a class="urlLink-open-btn-text" href="%PUBLIC_URL%/index.html" target="blank">유어링크 열기</a>
</div>

<div class="urlLink-open-btn">
<a class="urlLink-open-btn-text" href="%PUBLIC_URL%/index.html" target="blank">유어링크 열기</a>
<div class="center">
<img src="%PUBLIC_URL%/images/logo/group-5.svg" class="logo" />
</div>
</div>

<div class="center">
<img src="%PUBLIC_URL%/images/logo/group-5.svg" class="logo">
</div>
<div class="container"></div>
</div>

<div class="container"></div>
</div>
<div id="categoryPopup" class="category-popup-container" style="display: none;"></div>
</body>

</html>
<div id="categoryPopup" class="category-popup-container" style="display: none"></div>
</body>
</html>
5 changes: 3 additions & 2 deletions src/assets/css/default.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
:root {
--maincolor: #2083ff;
--lightblue: #77caff;
--powder-blue: #afe7ff;
--powder-blue: #e3f0ff;
--pale-sky-blue: #c2e8ff;
--maintext: #212529;
--battleship-grey: #737b84;
--blue-grey: #868e96;
--very-light-blue: #e9ecef;
--pale-grey: #f6f7f9;
--pale-grey: #c4c4c4;
--light-grey: #f4f4f4;
--salmon: #ff6b6b;
--green-blue: #00b381;
}
Expand Down
Loading

0 comments on commit 97b9044

Please sign in to comment.