From 2798c60d88b48254cefa3088b0b560c085c7f608 Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Wed, 9 Aug 2023 22:26:46 +0900 Subject: [PATCH 01/34] Feat: Add index --- .firebaserc | 5 +++ .gitignore | 70 +++++++++++++++++++++++++++++++++++++ firebase.json | 17 +++++++++ firestore.indexes.json | 4 +++ firestore.rules | 9 +++++ public/404.html | 33 ++++++++++++++++++ public/index.html | 42 ++++++++++++++++++++++ public/main.css | 48 +++++++++++++++++++++++++ public/main.js | 34 ++++++++++++++++++ public/reset.css | 79 ++++++++++++++++++++++++++++++++++++++++++ public/upload.html | 60 ++++++++++++++++++++++++++++++++ storage.rules | 12 +++++++ 12 files changed, 413 insertions(+) create mode 100644 .firebaserc create mode 100644 .gitignore create mode 100644 firebase.json create mode 100644 firestore.indexes.json create mode 100644 firestore.rules create mode 100644 public/404.html create mode 100644 public/index.html create mode 100644 public/main.css create mode 100644 public/main.js create mode 100644 public/reset.css create mode 100644 public/upload.html create mode 100644 storage.rules diff --git a/.firebaserc b/.firebaserc new file mode 100644 index 000000000..66e05759c --- /dev/null +++ b/.firebaserc @@ -0,0 +1,5 @@ +{ + "projects": { + "default": "javascript-picture" + } +} diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..855bd1c81 --- /dev/null +++ b/.gitignore @@ -0,0 +1,70 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +firebase-debug.log* +firebase-debug.*.log* + +# Firebase cache +.firebase/ + +# Firebase config + +# Uncomment this if you'd like others to create their own Firebase project. +# For a team working on the same Firebase project(s), it is recommended to leave +# it commented so all members can deploy to the same project(s) in .firebaserc. +# .firebaserc + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + + +# Ignore IDE specific files +.vscode/ diff --git a/firebase.json b/firebase.json new file mode 100644 index 000000000..13c45df0f --- /dev/null +++ b/firebase.json @@ -0,0 +1,17 @@ +{ + "firestore": { + "rules": "firestore.rules", + "indexes": "firestore.indexes.json" + }, + "hosting": { + "public": "public", + "ignore": [ + "firebase.json", + "**/.*", + "**/node_modules/**" + ] + }, + "storage": { + "rules": "storage.rules" + } +} diff --git a/firestore.indexes.json b/firestore.indexes.json new file mode 100644 index 000000000..415027e5d --- /dev/null +++ b/firestore.indexes.json @@ -0,0 +1,4 @@ +{ + "indexes": [], + "fieldOverrides": [] +} diff --git a/firestore.rules b/firestore.rules new file mode 100644 index 000000000..cd1a4346f --- /dev/null +++ b/firestore.rules @@ -0,0 +1,9 @@ +rules_version = '2'; + +service cloud.firestore { + match /databases/{database}/documents { + match /{document=**} { + allow read, write: if false; + } + } +} \ No newline at end of file diff --git a/public/404.html b/public/404.html new file mode 100644 index 000000000..829eda8fd --- /dev/null +++ b/public/404.html @@ -0,0 +1,33 @@ + + + + + + Page Not Found + + + + +
+

404

+

Page Not Found

+

The specified file was not found on this website. Please check the URL for mistakes and try again.

+

Why am I seeing this?

+

This page was generated by the Firebase Command-Line Interface. To modify it, edit the 404.html file in your project's configured public directory.

+
+ + diff --git a/public/index.html b/public/index.html new file mode 100644 index 000000000..8dd2e1c4a --- /dev/null +++ b/public/index.html @@ -0,0 +1,42 @@ + + + + + + + ๐Ÿ™‹โ€โ™€๏ธemployee picture + + + + + +
+

๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

+ +
+ + +
+ +
+ + + + + + + + + + + + + \ No newline at end of file diff --git a/public/main.css b/public/main.css new file mode 100644 index 000000000..c0379a59e --- /dev/null +++ b/public/main.css @@ -0,0 +1,48 @@ +h1 { + text-align: center; + font-size: 2.6rem; + margin: 40px auto; +} + +.pos-r { + position: relative; +} +.nav ul { + display: flex; + justify-content: space-around; + width: 100%; + margin: 40px auto; +} +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: flex-start; + margin-top: 2rem; +} + +.employee { + width: 100%; + display: flex; + padding: 10px; +} + +.employee .profile { + font-size: 1rem; + line-height: 1.6rem; + margin-left: 4%; +} + +.employee .profile .name { + font-weight: bold; + font-size: 1.4rem; + line-height: 3rem; +} + +.thumbnail { + max-width: 200px; + width: 100%; + border-radius: 10px; + background-size: cover; + background-position: center; +} diff --git a/public/main.js b/public/main.js new file mode 100644 index 000000000..0396d6d98 --- /dev/null +++ b/public/main.js @@ -0,0 +1,34 @@ +const firebaseConfig = { + apiKey: "AIzaSyBRDdAmcnRV3_Ui_Md_vhbyp9-9-eXqzbw", + authDomain: "javascript-picture.firebaseapp.com", + projectId: "javascript-picture", + storageBucket: "javascript-picture.appspot.com", + messagingSenderId: "487659103783", + appId: "1:487659103783:web:e98479de1137818dfa9002", + measurementId: "G-0RSTQFT7N8" + }; + + // Initialize Firebase + firebase.initializeApp(firebaseConfig) + const db = firebase.firestore(); + + db.collection('member').get().then((๊ฒฐ๊ณผ)=>{ + console.log(๊ฒฐ๊ณผ); + ๊ฒฐ๊ณผ.forEach((doc)=>{ + console.log(doc.data()); + var template = `
+
+
+
${doc.data().์ด๋ฆ„}
+

์†Œ์†/์ง๊ธ‰: ${doc.data().์ง๊ธ‰}

+

์—ฐ๋ฝ์ฒ˜: ${doc.data().์—ฐ๋ฝ์ฒ˜}

+ +

๊ธฐํƒ€: ${doc.data().๊ธฐํƒ€}

+
+
` + const wrap = document.querySelector('.container') + wrap.insertAdjacentHTML('beforeend',template) + + }) + + }) \ No newline at end of file diff --git a/public/reset.css b/public/reset.css new file mode 100644 index 000000000..8e31ad25f --- /dev/null +++ b/public/reset.css @@ -0,0 +1,79 @@ +@charset "utf-8"; + + +html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, small, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary, time, mark, audio, video { + margin:0; + padding:0; + border:0; + outline:0; + font-size:100%; + vertical-align:baseline; + background:transparent; +} + +body { + line-height:1; +} + +h1{text-align: center + ;} +article,aside,details,figcaption,figure, footer,header,hgroup,menu,nav,section { + display:block; +} + +ul { + list-style:none; +} + +blockquote, q { + quotes:none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content:''; + content:none; +} +a { + margin:0; + padding:0; + font-size:100%; + vertical-align:baseline; + background:transparent; +} +/* change colors to suit your needs */ +ins { + background-color:#ff9; + color:#000; + text-decoration:none; +} +/* change colors to suit your needs */ +mark { + background-color:#ff9; + color:#000; + font-style:italic; + font-weight:bold; +} +del { + text-decoration: line-through; +} +abbr[title], dfn[title] { + border-bottom:1px dotted; + cursor:help; +} +table { + border-collapse:collapse; + border-spacing:0; +} +/* change border color to suit your needs */ +hr { + display:block; + height:1px; + border:0; + border-top:1px solid #cccccc; + margin:1em 0; + padding:0; +} +input, select { + vertical-align:middle; +} + diff --git a/public/upload.html b/public/upload.html new file mode 100644 index 000000000..3b2cbe6fe --- /dev/null +++ b/public/upload.html @@ -0,0 +1,60 @@ + + + + + + + ๐Ÿ™‹โ€โ™€๏ธemployee picture + + + + + + + +
+

๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

+ +
+ + +
+ + + + + + + +
+ +
+ +
+ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/storage.rules b/storage.rules new file mode 100644 index 000000000..f08744f03 --- /dev/null +++ b/storage.rules @@ -0,0 +1,12 @@ +rules_version = '2'; + +// Craft rules based on data in your Firestore database +// allow write: if firestore.get( +// /databases/(default)/documents/users/$(request.auth.uid)).data.isAdmin; +service firebase.storage { + match /b/{bucket}/o { + match /{allPaths=**} { + allow read, write: if false; + } + } +} From 3b85946efe04a52a1f85b739e29bae75e66b0628 Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Thu, 10 Aug 2023 12:58:30 +0900 Subject: [PATCH 02/34] Feat: Add upload & login --- public/common.js | 17 +++++++ public/index.html | 23 ++++++---- public/login.html | 65 +++++++++++++++++++++++++++ public/login.js | 36 +++++++++++++++ public/main.css | 89 +++++++++++++++++++++++++++++++++++- public/main.js | 25 ++++++----- public/upload.html | 52 +++++++++++---------- public/upload.js | 110 +++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 371 insertions(+), 46 deletions(-) create mode 100644 public/common.js create mode 100644 public/login.html create mode 100644 public/login.js create mode 100644 public/upload.js diff --git a/public/common.js b/public/common.js new file mode 100644 index 000000000..7a08a017f --- /dev/null +++ b/public/common.js @@ -0,0 +1,17 @@ +const firebaseConfig = { + apiKey: "AIzaSyBRDdAmcnRV3_Ui_Md_vhbyp9-9-eXqzbw", + authDomain: "javascript-picture.firebaseapp.com", + projectId: "javascript-picture", + storageBucket: "javascript-picture.appspot.com", + messagingSenderId: "487659103783", + appId: "1:487659103783:web:e98479de1137818dfa9002", + measurementId: "G-0RSTQFT7N8" + }; + + + // Initialize Firebase + firebase.initializeApp(firebaseConfig) + + +const db = firebase.firestore(); +const storage = firebase.storage(); \ No newline at end of file diff --git a/public/index.html b/public/index.html index 8dd2e1c4a..ec4ea2e31 100644 --- a/public/index.html +++ b/public/index.html @@ -5,8 +5,12 @@ ๐Ÿ™‹โ€โ™€๏ธemployee picture - - + + + + @@ -14,19 +18,19 @@

๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

-
+
-
+ @@ -34,6 +38,7 @@

๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

+ diff --git a/public/login.html b/public/login.html new file mode 100644 index 000000000..9b1a51827 --- /dev/null +++ b/public/login.html @@ -0,0 +1,65 @@ + + + + + + + ๐Ÿ™‹โ€โ™€๏ธemployee picture + + + + + + + +
+

๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

+ +
+ + +
+

ํšŒ์›๊ฐ€์ž…

+
+ + + +
+ +
+
+ +
+ + +
+

๋กœ๊ทธ์ธ

+
+ + + +
+ + +
+
+ + + + + + + + + + \ No newline at end of file diff --git a/public/login.js b/public/login.js new file mode 100644 index 000000000..4f6bea391 --- /dev/null +++ b/public/login.js @@ -0,0 +1,36 @@ +const joinBtn=document.getElementById('join-btn') +const loginBtn=document.getElementById('login-btn') +const logoutBtn=document.getElementById('logout-btn') + +//๊ฐ€์ž…ํ•˜๊ธฐ ๋ฒ„ํŠผ ๋ˆ„๋ฅด๋ฉด +joinBtn.addEventListener("click",function(){ + const joinName = document.getElementById("join__name").value; + const joinEmail = document.getElementById("join__email").value; + const joinPw = document.getElementById("join__pw").value; + + firebase.auth().createUserWithEmailAndPassword(joinEmail,joinPw).then((result)=>{ + console.log(result); + console.log(result.user); + result.user.updateProfile( {displayName : joinName} ) + + }) +}); + + +//๋กœ๊ทธ์ธ ๋ฒ„ํŠผ ๋ˆ„๋ฅด๋ฉด +loginBtn.addEventListener("click",function(){ + const loginEmail = document.getElementById("login__email").value; + const loginPw = document.getElementById("login__pw").value; + + firebase.auth().signInWithEmailAndPassword(loginEmail,loginPw).then((result)=>{ + console.log('๋กœ๊ทธ์ธ ์™„๋ฃŒ!'+result.user) + alert('๋กœ๊ทธ์ธ ์™„๋ฃŒ!') + + }) +}); + +//๋กœ๊ทธ์•„์›ƒ ๋ฒ„ํŠผ ๋ˆ„๋ฅด๋ฉด +logoutBtn.addEventListener("click",function(){ + firebase.auth().signOut(); + alert('๋กœ๊ทธ์•„์›ƒ ์™„๋ฃŒ!') +}); \ No newline at end of file diff --git a/public/main.css b/public/main.css index c0379a59e..acc2403c9 100644 --- a/public/main.css +++ b/public/main.css @@ -1,9 +1,25 @@ h1 { text-align: center; font-size: 2.6rem; - margin: 40px auto; + margin: 4rem auto; +} +h2 { + text-align: center; + font-size: 1.4rem; + margin: 4rem auto 2rem; +} +.txt-l { + text-align: left; +} +.txt-r { + text-align: right; +} +.txt-c { + text-align: center; +} +.ml-20 { + margin-left: 20px; } - .pos-r { position: relative; } @@ -20,6 +36,14 @@ h1 { align-items: flex-start; margin-top: 2rem; } +.input-col { + display: flex; + flex-direction: column; + justify-content: center; + align-items: flex-start; + margin-top: 2rem; + gap: 0.5rem; +} .employee { width: 100%; @@ -46,3 +70,64 @@ h1 { background-size: cover; background-position: center; } + +.input-col { + width: 50%; + margin: 0 auto; +} +.form-input, +.form-text { + width: 100%; + margin: 0 auto 0.4rem; + height: 30px; +} +.upload-area .form-file { + z-index: 0; + position: absolute; + top: 10%; + left: 32px; +} +.upload-area .custom-upload { + background: #797979; + color: #fff; + padding: 10px; + border-radius: 5px; + cursor: pointer; + position: relative; + z-index: 1; +} +.custom-upload:hover { + background: #b1b1b1; +} +.upload-area, +.btn-area { + width: 100%; + margin: 0.5rem 0; +} +.upload-area { + display: flex; + justify-content: flex-start; +} +.btn-area { + display: flex; + justify-content: space-between; + align-items: center; + flex-wrap: nowrap; +} +.btn { + width: 100%; + height: 50px; + background: #264665; + border-radius: 5px; + color: #fff; + border: none; +} +.btn:hover { + background: #3e4e6d; +} +#login .btn { + width: 49%; +} +.btn#logout-btn { + background: #828282; +} diff --git a/public/main.js b/public/main.js index 0396d6d98..40a7b07d0 100644 --- a/public/main.js +++ b/public/main.js @@ -1,16 +1,17 @@ -const firebaseConfig = { - apiKey: "AIzaSyBRDdAmcnRV3_Ui_Md_vhbyp9-9-eXqzbw", - authDomain: "javascript-picture.firebaseapp.com", - projectId: "javascript-picture", - storageBucket: "javascript-picture.appspot.com", - messagingSenderId: "487659103783", - appId: "1:487659103783:web:e98479de1137818dfa9002", - measurementId: "G-0RSTQFT7N8" - }; +// const firebaseConfig = { +// apiKey: "AIzaSyBRDdAmcnRV3_Ui_Md_vhbyp9-9-eXqzbw", +// authDomain: "javascript-picture.firebaseapp.com", +// projectId: "javascript-picture", +// storageBucket: "javascript-picture.appspot.com", +// messagingSenderId: "487659103783", +// appId: "1:487659103783:web:e98479de1137818dfa9002", +// measurementId: "G-0RSTQFT7N8" +// }; - // Initialize Firebase - firebase.initializeApp(firebaseConfig) - const db = firebase.firestore(); +// // Initialize Firebase +// firebase.initializeApp(firebaseConfig) + + // const db = firebase.firestore(); db.collection('member').get().then((๊ฒฐ๊ณผ)=>{ console.log(๊ฒฐ๊ณผ); diff --git a/public/upload.html b/public/upload.html index 3b2cbe6fe..17f17fa25 100644 --- a/public/upload.html +++ b/public/upload.html @@ -5,8 +5,8 @@ ๐Ÿ™‹โ€โ™€๏ธemployee picture - - + + + + + +
+

๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

+ +
+ + +
+

์ƒ์„ธ์ •๋ณด

+ +
+ + + + + + + + + + \ No newline at end of file diff --git a/public/detail.js b/public/detail.js new file mode 100644 index 000000000..dbf52fd69 --- /dev/null +++ b/public/detail.js @@ -0,0 +1,36 @@ +//url query string์— ์žˆ๋˜ ์ž๋ฃŒ๋ฅผ object๋กœ ๋ณ€ํ™˜ +let queryString = new URLSearchParams(window.location.search); +queryString.get('id') + +db.collection('member').doc(queryString.get('id')).get().then((result) => { + console.log(result.data()) + + var templateDetail = ` +
+
+
+
+
+
${result.data().์ด๋ฆ„}
+
์†Œ์†ํŒ€: ${result.data().์†Œ์†ํŒ€}
+
์ง๊ธ‰: ${result.data().์ง๊ธ‰}
+
๋‚ด์„ ๋ฒˆํ˜ธ: ${result.data().๋‚ด์„ ๋ฒˆํ˜ธ}
+
์—ฐ๋ฝ์ฒ˜: ${result.data().์—ฐ๋ฝ์ฒ˜}
+
์ด๋ฉ”์ผ: ${result.data().์ด๋ฉ”์ผ}
+
๊ธฐํƒ€: ${result.data().๊ธฐํƒ€}
+
+
+ ` + + const wrap = document.querySelector('#detail') + wrap.insertAdjacentHTML('beforeend',templateDetail) +}); + + + + + + + + + From d831dfd48b61845e469442557bae59e763bd243a Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Thu, 10 Aug 2023 17:57:06 +0900 Subject: [PATCH 05/34] Fix: Delete form tag --- public/login.html | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/public/login.html b/public/login.html index c0ce584dc..ebe94a39c 100644 --- a/public/login.html +++ b/public/login.html @@ -21,44 +21,38 @@

๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

  • ์ง์›๋ชฉ๋ก
  • ์—…๋กœ๋“œ
  • ๋กœ๊ทธ์ธ
    • -
  • ์ƒ์„ธ์ •๋ณด
  • ๊ฒ€์ƒ‰
    • -
    +

    ํšŒ์›๊ฐ€์ž…

    -
    -
    -
    +

    ๋กœ๊ทธ์ธ

    -
    -
    - - - - - - - + + + + + + \ No newline at end of file From 5a28ac19734d92df7bb00dd7187299d1e2cbf24f Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Thu, 10 Aug 2023 17:59:55 +0900 Subject: [PATCH 06/34] Design: Modify layout(index,upload) --- public/index.html | 100 +++++++++++++++++++++++++++------------------ public/main.css | 32 ++++++++++----- public/main.js | 31 ++++---------- public/reset.css | 2 + public/upload.html | 17 +++----- public/upload.js | 7 +++- 6 files changed, 103 insertions(+), 86 deletions(-) diff --git a/public/index.html b/public/index.html index ec4ea2e31..834389bbc 100644 --- a/public/index.html +++ b/public/index.html @@ -1,47 +1,69 @@ - - - - - ๐Ÿ™‹โ€โ™€๏ธemployee picture - - - - - - + + +
    +

    ๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

    + +
    -
    -

    ๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

    - -
    +
    +
    +
    ์ด๋ฏธ์ง€
    +
    ์ด๋ฆ„
    +
    ์†Œ์†/์ง๊ธ‰
    +
    ๋‚ด์„ ๋ฒˆํ˜ธ
    +
    ์ƒ์„ธ์ •๋ณด
    +
    +
    - -
    - -
    - - - - - - - + + + + + + - - - - - \ No newline at end of file + + diff --git a/public/main.css b/public/main.css index acc2403c9..df11d6105 100644 --- a/public/main.css +++ b/public/main.css @@ -45,32 +45,44 @@ h2 { gap: 0.5rem; } -.employee { - width: 100%; - display: flex; - padding: 10px; -} -.employee .profile { +.profile { font-size: 1rem; line-height: 1.6rem; - margin-left: 4%; } -.employee .profile .name { +.profile .name { font-weight: bold; font-size: 1.4rem; line-height: 3rem; } +main .profile, +main .profile_title{ + width: 100%; + display:grid; + grid-template-columns: 20% 20% 20% 20% 20%; + margin:10px auto; + text-align: center;align-items: center; +} + .thumbnail { - max-width: 200px; width: 100%; + height: 100%; + margin:0 auto; border-radius: 10px; background-size: cover; background-position: center; } +main .thumbnail{ max-width: 80px; height: 100%;} +#detail .profile{display:flex;flex-direction: row;flex-wrap: wrap; line-height: 2rem;} +#detail .profile .col-1{width:30%;} +#detail .profile .col-2{width:70%;} + +#detail .thumbnail{ max-width: 200px;} + + .input-col { width: 50%; margin: 0 auto; @@ -117,7 +129,7 @@ h2 { .btn { width: 100%; height: 50px; - background: #264665; + background: #183153; border-radius: 5px; color: #fff; border: none; diff --git a/public/main.js b/public/main.js index 40a7b07d0..1a27ea9b6 100644 --- a/public/main.js +++ b/public/main.js @@ -1,32 +1,15 @@ -// const firebaseConfig = { -// apiKey: "AIzaSyBRDdAmcnRV3_Ui_Md_vhbyp9-9-eXqzbw", -// authDomain: "javascript-picture.firebaseapp.com", -// projectId: "javascript-picture", -// storageBucket: "javascript-picture.appspot.com", -// messagingSenderId: "487659103783", -// appId: "1:487659103783:web:e98479de1137818dfa9002", -// measurementId: "G-0RSTQFT7N8" -// }; - -// // Initialize Firebase -// firebase.initializeApp(firebaseConfig) - - // const db = firebase.firestore(); db.collection('member').get().then((๊ฒฐ๊ณผ)=>{ console.log(๊ฒฐ๊ณผ); ๊ฒฐ๊ณผ.forEach((doc)=>{ console.log(doc.data()); - var template = `
    -
    -
    -
    ${doc.data().์ด๋ฆ„}
    -

    ์†Œ์†/์ง๊ธ‰: ${doc.data().์ง๊ธ‰}

    -

    ์—ฐ๋ฝ์ฒ˜: ${doc.data().์—ฐ๋ฝ์ฒ˜}

    - -

    ๊ธฐํƒ€: ${doc.data().๊ธฐํƒ€}

    -
    -
    ` + var template = `
    +
    +
    ${doc.data().์ด๋ฆ„}
    +
    ${doc.data().์†Œ์†ํŒ€} ${doc.data().์ง๊ธ‰}
    +
    ${doc.data().๋‚ด์„ ๋ฒˆํ˜ธ}
    +
    ์ƒ์„ธ

    +

    ` const wrap = document.querySelector('.container') wrap.insertAdjacentHTML('beforeend',template) diff --git a/public/reset.css b/public/reset.css index 8e31ad25f..b0ef7a8ae 100644 --- a/public/reset.css +++ b/public/reset.css @@ -39,6 +39,8 @@ a { font-size:100%; vertical-align:baseline; background:transparent; + color:#000; + text-decoration:none; } /* change colors to suit your needs */ ins { diff --git a/public/upload.html b/public/upload.html index 17f17fa25..9ce299f88 100644 --- a/public/upload.html +++ b/public/upload.html @@ -21,19 +21,19 @@

    ๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

  • ์ง์›๋ชฉ๋ก
  • ์—…๋กœ๋“œ
  • ๋กœ๊ทธ์ธ
    • -
  • ์ƒ์„ธ์ •๋ณด
  • ๊ฒ€์ƒ‰
    • -
    +

    ์ง์› ์ •๋ณด ์—…๋กœ๋“œ

    -
    - + + - + +
    @@ -43,12 +43,7 @@

    ์ง์› ์ •๋ณด ์—…๋กœ๋“œ

    - -
    - - - - +
    diff --git a/public/upload.js b/public/upload.js index 6cf59dc24..5ed1e29d7 100644 --- a/public/upload.js +++ b/public/upload.js @@ -22,17 +22,20 @@ console.log('์—…๋กœ๋“œ๋œ ๊ฒฝ๋กœ๋Š”', url); const name = document.getElementById("name").value; + const tel = document.getElementById("tel").value; const phone = document.getElementById("phone").value; const email= document.getElementById("email").value; + const team= document.getElementById("team").value; const rank= document.getElementById("rank").value; const memo = document.getElementById("memo").value; - const saveData ={ ์ด๋ฆ„ : name, + ๋‚ด์„ ๋ฒˆํ˜ธ : tel, + ์†Œ์†ํŒ€ : team, + ์ง๊ธ‰ : rank, ์—ฐ๋ฝ์ฒ˜ : phone, ์ด๋ฉ”์ผ : email, - ์ง๊ธ‰ : rank, ๊ธฐํƒ€ : memo, ์ด๋ฏธ์ง€: url } From 6ab7483b6516b430e260b8ec9631a847c3fdba17 Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Fri, 11 Aug 2023 18:27:35 +0900 Subject: [PATCH 07/34] Feat: Add onAuthStateChanged --- public/common.js | 66 +++++++++++++++++++++++++++++++-- public/detail.html | 53 -------------------------- public/detail/detail.html | 55 +++++++++++++++++++++++++++ public/{ => detail}/detail.js | 0 public/index.html | 27 +++++++++----- public/login.html | 58 ----------------------------- public/login/login.html | 69 ++++++++++++++++++++++++++++++++++ public/{ => login}/login.js | 15 +++----- public/main.css | 28 ++++++++------ public/upload.html | 61 ------------------------------ public/upload/upload.html | 70 +++++++++++++++++++++++++++++++++++ public/{ => upload}/upload.js | 1 + 12 files changed, 298 insertions(+), 205 deletions(-) delete mode 100644 public/detail.html create mode 100644 public/detail/detail.html rename public/{ => detail}/detail.js (100%) delete mode 100644 public/login.html create mode 100644 public/login/login.html rename public/{ => login}/login.js (75%) delete mode 100644 public/upload.html create mode 100644 public/upload/upload.html rename public/{ => upload}/upload.js (99%) diff --git a/public/common.js b/public/common.js index 7a08a017f..4dd0a44c0 100644 --- a/public/common.js +++ b/public/common.js @@ -9,9 +9,69 @@ const firebaseConfig = { }; - // Initialize Firebase - firebase.initializeApp(firebaseConfig) + // Initialize Firebase + firebase.initializeApp(firebaseConfig) const db = firebase.firestore(); -const storage = firebase.storage(); \ No newline at end of file +const storage = firebase.storage(); + + + +if (localStorage.getItem('user') != null) { + console.log('ํ˜„์žฌ๋กœ๊ทธ์ธ์ค‘') + //๋กœ์ปฌ์Šคํ† ๋ฆฌ์ง€์—์„œ ์œ ์ €์ •๋ณด ๊ฐ€์ ธ์˜ค๊ธฐ + const localDataUser =localStorage.getItem('user') + const localName = JSON.parse(localDataUser).displayName; + console.log(localName) + document.querySelector('#user-name').innerHTML = localName +'๋‹˜'; + // document.querySelector('.user-welcome').classList.remove('none'); + document.querySelector('.logout').classList.remove('none'); + document.querySelector('.login').classList.add('none'); + +}else{ + console.log('ํ˜„์žฌ๋กœ๊ทธ์•„์›ƒ์ค‘') + localStorage.removeItem('user') + // document.querySelector('.user-welcome').classList.add('none'); + document.querySelector('.logout').classList.add('none'); + document.querySelector('.login').classList.remove('none'); +} + + + +//๋กœ๊ทธ์ธ ์ƒํƒœ ํ™•์ธ. ๋กœ๊ทธ์ธ,๋กœ๊ทธ์•„์›ƒ,์ƒˆ๋กœ๊ณ ์นจ ๋“ฑ ์œ ์ € ์ธ์ฆ์ƒํƒœ ๋ณ€๊ฒฝ์‹œ๋งˆ๋‹ค ์‹คํ–‰๋จ +firebase.auth().onAuthStateChanged((user)=>{ + if(user){ + console.log(user) + console.log(user.displayName+'๋กœ๊ทธ์ธ ์™„๋ฃŒ') + // document.querySelector('.user-welcome').classList.remove('none'); + document.querySelector('.logout').classList.remove('none'); + document.querySelector('.login').classList.add('none'); + + //๋กœ์ปฌ์Šคํ† ๋ฆฌ์ง€์— ์œ ์ €์ •๋ณด ์ €์žฅ + localStorage.setItem('user', JSON.stringify(user)) + // userUid = user.uid; + // console.log(userUid) + + }else if(user = null){ + localStorage.removeItem('user') + // document.querySelector('.user-welcome').classList.add('none'); + document.querySelector('.logout').classList.add('none'); + document.querySelector('.login').classList.remove('none'); + + } +}) + + +const logoutBtn=document.getElementById('logout-btn') + +//๋กœ๊ทธ์•„์›ƒ ๋ฒ„ํŠผ ๋ˆ„๋ฅด๋ฉด +logoutBtn.addEventListener("click",function(){ + firebase.auth().signOut(); + localStorage.removeItem('user') + // document.querySelector('.user-welcome').classList.add('none'); + alert('๋กœ๊ทธ์•„์›ƒ ์™„๋ฃŒ!') + document.querySelector('.logout').classList.add('none'); + document.querySelector('.login').classList.remove('none'); + +}); \ No newline at end of file diff --git a/public/detail.html b/public/detail.html deleted file mode 100644 index 5b00a98b0..000000000 --- a/public/detail.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - ๐Ÿ™‹โ€โ™€๏ธemployee picture - - - - - - - -
    -

    ๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

    - -
    - - -
    -

    ์ƒ์„ธ์ •๋ณด

    - -
    - - - - - - - - - - \ No newline at end of file diff --git a/public/detail/detail.html b/public/detail/detail.html new file mode 100644 index 000000000..bcfbf864b --- /dev/null +++ b/public/detail/detail.html @@ -0,0 +1,55 @@ + + + + + + + ๐Ÿ™‹โ€โ™€๏ธemployee picture + + + + + + + +
    +

    ๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

    + +
    +
      +
    • ์˜ค๋Š˜๋„ ํž˜์ฐจ๊ฒŒ!๐Ÿ˜
      • +
      • +
    +
    + +
    + + +
    +

    ์ƒ์„ธ์ •๋ณด

    + + +
    + + + + + + + + + + \ No newline at end of file diff --git a/public/detail.js b/public/detail/detail.js similarity index 100% rename from public/detail.js rename to public/detail/detail.js diff --git a/public/index.html b/public/index.html index 834389bbc..c81358086 100644 --- a/public/index.html +++ b/public/index.html @@ -17,24 +17,31 @@ onload="this.rel = 'stylesheet'" href="main.css" /> - - +
    -

    ๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

    +

    ๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

    + +
    +
      +
    • ์˜ค๋Š˜๋„ ํž˜์ฐจ๊ฒŒ!๐Ÿ˜
      • +
      • +
    +
    +
    -
    ์ด๋ฏธ์ง€
    diff --git a/public/login.html b/public/login.html deleted file mode 100644 index ebe94a39c..000000000 --- a/public/login.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - ๐Ÿ™‹โ€โ™€๏ธemployee picture - - - - - - - -
    -

    ๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

    - -
    - - -
    -

    ํšŒ์›๊ฐ€์ž…

    - - - -
    - -
    -
    - - -
    -

    ๋กœ๊ทธ์ธ

    - - -
    - - -
    -
    - - - - - - - - - \ No newline at end of file diff --git a/public/login/login.html b/public/login/login.html new file mode 100644 index 000000000..2c0f13ec8 --- /dev/null +++ b/public/login/login.html @@ -0,0 +1,69 @@ + + + + + + + ๐Ÿ™‹โ€โ™€๏ธemployee picture + + + + + + + +
    +

    ๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

    + +
    +
      +
    • ์˜ค๋Š˜๋„ ํž˜์ฐจ๊ฒŒ!๐Ÿ˜
      • +
      • +
    +
    + +
    + + +
    +

    ํšŒ์›๊ฐ€์ž…

    + + + +
    + +
    +
    + + +
    +

    ๋กœ๊ทธ์ธ

    + + +
    + +
    +
    + + + + + + + + + + \ No newline at end of file diff --git a/public/login.js b/public/login/login.js similarity index 75% rename from public/login.js rename to public/login/login.js index 4f6bea391..87fe07e4b 100644 --- a/public/login.js +++ b/public/login/login.js @@ -1,6 +1,5 @@ const joinBtn=document.getElementById('join-btn') const loginBtn=document.getElementById('login-btn') -const logoutBtn=document.getElementById('logout-btn') //๊ฐ€์ž…ํ•˜๊ธฐ ๋ฒ„ํŠผ ๋ˆ„๋ฅด๋ฉด joinBtn.addEventListener("click",function(){ @@ -23,14 +22,12 @@ loginBtn.addEventListener("click",function(){ const loginPw = document.getElementById("login__pw").value; firebase.auth().signInWithEmailAndPassword(loginEmail,loginPw).then((result)=>{ - console.log('๋กœ๊ทธ์ธ ์™„๋ฃŒ!'+result.user) - alert('๋กœ๊ทธ์ธ ์™„๋ฃŒ!') - + alert('๋กœ๊ทธ์ธ ์™„๋ฃŒ!') + window.location.href="/index.html" + document.querySelector('.user-welcome').classList.remove('none'); + document.querySelector('.logout').classList.remove('none'); + document.querySelector('.login').classList.add('none'); }) }); -//๋กœ๊ทธ์•„์›ƒ ๋ฒ„ํŠผ ๋ˆ„๋ฅด๋ฉด -logoutBtn.addEventListener("click",function(){ - firebase.auth().signOut(); - alert('๋กœ๊ทธ์•„์›ƒ ์™„๋ฃŒ!') -}); \ No newline at end of file + diff --git a/public/main.css b/public/main.css index df11d6105..68b152a22 100644 --- a/public/main.css +++ b/public/main.css @@ -6,8 +6,11 @@ h1 { h2 { text-align: center; font-size: 1.4rem; - margin: 4rem auto 2rem; + width: 100%; + margin: 1rem; } +.none{display: none;} + .txt-l { text-align: left; } @@ -37,6 +40,9 @@ h2 { margin-top: 2rem; } .input-col { + width: 50%; + margin: 0 auto; + min-width: 300px; display: flex; flex-direction: column; justify-content: center; @@ -83,10 +89,7 @@ main .thumbnail{ max-width: 80px; height: 100%;} #detail .thumbnail{ max-width: 200px;} -.input-col { - width: 50%; - margin: 0 auto; -} + .form-input, .form-text { width: 100%; @@ -137,9 +140,12 @@ main .thumbnail{ max-width: 80px; height: 100%;} .btn:hover { background: #3e4e6d; } -#login .btn { - width: 49%; -} -.btn#logout-btn { - background: #828282; -} + + +.user-welcome{ + display: flex; + align-items: center; + justify-content: flex-end; + gap:1rem; + padding:0 1.5rem; +} \ No newline at end of file diff --git a/public/upload.html b/public/upload.html deleted file mode 100644 index 9ce299f88..000000000 --- a/public/upload.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - ๐Ÿ™‹โ€โ™€๏ธemployee picture - - - - - - - -
    -

    ๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

    - -
    - -
    -

    ์ง์› ์ •๋ณด ์—…๋กœ๋“œ

    - - - - - - - - -
    - - -
    -
    - -
    -
    - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/upload/upload.html b/public/upload/upload.html new file mode 100644 index 000000000..137274a5a --- /dev/null +++ b/public/upload/upload.html @@ -0,0 +1,70 @@ + + + + + + + ๐Ÿ™‹โ€โ™€๏ธemployee picture + + + + + + + +
    +

    ๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

    + +
    +
      +
    • ์˜ค๋Š˜๋„ ํž˜์ฐจ๊ฒŒ!๐Ÿ˜
      • +
      • +
    +
    + +
    + +
    +

    ์ง์› ์ •๋ณด ์—…๋กœ๋“œ

    + + + + + + + + +
    + + +
    +
    + +
    +
    + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/upload.js b/public/upload/upload.js similarity index 99% rename from public/upload.js rename to public/upload/upload.js index 5ed1e29d7..9b7feec49 100644 --- a/public/upload.js +++ b/public/upload/upload.js @@ -38,6 +38,7 @@ ์ด๋ฉ”์ผ : email, ๊ธฐํƒ€ : memo, ์ด๋ฏธ์ง€: url + } console.log(name,phone,email,rank,memo) From ad58f9320fc118adb96fd2ef86793144abcd30a6 Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Fri, 11 Aug 2023 19:14:28 +0900 Subject: [PATCH 08/34] Feat: Add upload permission --- public/upload/upload.js | 185 ++++++++++++++++------------------------ 1 file changed, 73 insertions(+), 112 deletions(-) diff --git a/public/upload/upload.js b/public/upload/upload.js index 9b7feec49..91db33d94 100644 --- a/public/upload/upload.js +++ b/public/upload/upload.js @@ -1,114 +1,75 @@ - // ์˜ฌ๋ฆฌ๊ธฐ ๋ฒ„ํŠผ์„ ๋ˆ„๋ฅด๋ฉด ๋ฐฉ๊ธˆ๋งŒ๋“  ์ œ๋ชฉ, ๋‚ด์šฉ, ๊ฐ€๊ฒฉ ์ธํ’‹์— ์ž…๋ ฅํ•œ ์ •๋ณด db์ €์žฅ - document.getElementById("send").addEventListener("click", function(){ - - //์Šคํ† ๋ฆฌ์ง€์— ์ด๋ฏธ์ง€ ์ €์žฅ - let file = document.querySelector('#image').files[0]; - const storageRef = storage.ref(); - let imgPath = storageRef.child('image/'+file.name); - let upload = imgPath.put(file) - - //์ด๋ฏธ์ง€ ์—…๋กœ๋“œ / ์‹คํŒจ ํ™•์ธ - upload.on( 'state_changed', - // ๋ณ€ํ™”์‹œ ๋™์ž‘ํ•˜๋Š” ํ•จ์ˆ˜ - null, - //์—๋Ÿฌ์‹œ ๋™์ž‘ํ•˜๋Š” ํ•จ์ˆ˜ - (error) => { - console.error('์‹คํŒจ์‚ฌ์œ ๋Š”', error); - }, - // ์„ฑ๊ณต์‹œ ๋™์ž‘ํ•˜๋Š” ํ•จ์ˆ˜ - () => { - upload.snapshot.ref.getDownloadURL().then((url) => { //์ด๋ฏธ์ง€ url ๊ฐ€์ ธ์˜ค๊ธฐ - console.log('์—…๋กœ๋“œ๋œ ๊ฒฝ๋กœ๋Š”', url); - - const name = document.getElementById("name").value; - const tel = document.getElementById("tel").value; - const phone = document.getElementById("phone").value; - const email= document.getElementById("email").value; - const team= document.getElementById("team").value; - const rank= document.getElementById("rank").value; - const memo = document.getElementById("memo").value; - - const saveData ={ - ์ด๋ฆ„ : name, - ๋‚ด์„ ๋ฒˆํ˜ธ : tel, - ์†Œ์†ํŒ€ : team, - ์ง๊ธ‰ : rank, - ์—ฐ๋ฝ์ฒ˜ : phone, - ์ด๋ฉ”์ผ : email, - ๊ธฐํƒ€ : memo, - ์ด๋ฏธ์ง€: url - - } - - console.log(name,phone,email,rank,memo) - - db.collection('member').add(saveData).then((result)=>{ - window.location.href="/index.html" - console.log(result) - }).catch((err)=>{ - console.log(err) - }); - - }); - - } - ); - - - }); - - // ์˜ฌ๋ฆฌ๊ธฐ ๋ฒ„ํŠผ์„ ๋ˆ„๋ฅด๋ฉด ๋ฐฉ๊ธˆ๋งŒ๋“  ์ œ๋ชฉ, ๋‚ด์šฉ, ๊ฐ€๊ฒฉ ์ธํ’‹์— ์ž…๋ ฅํ•œ ์ •๋ณด db์ €์žฅ - document.getElementById("send").addEventListener("click", function(){ - - //์Šคํ† ๋ฆฌ์ง€์— ์ด๋ฏธ์ง€ ์ €์žฅ - let file = document.querySelector('#image').files[0]; - const storageRef = storage.ref(); - let imgPath = storageRef.child('image/'+file.name); - let upload = imgPath.put(file) - - //์ด๋ฏธ์ง€ ์—…๋กœ๋“œ / ์‹คํŒจ ํ™•์ธ - upload.on( 'state_changed', - // ๋ณ€ํ™”์‹œ ๋™์ž‘ํ•˜๋Š” ํ•จ์ˆ˜ - null, - //์—๋Ÿฌ์‹œ ๋™์ž‘ํ•˜๋Š” ํ•จ์ˆ˜ - (error) => { - console.error('์‹คํŒจ์‚ฌ์œ ๋Š”', error); - }, - // ์„ฑ๊ณต์‹œ ๋™์ž‘ํ•˜๋Š” ํ•จ์ˆ˜ - () => { - upload.snapshot.ref.getDownloadURL().then((url) => { //์ด๋ฏธ์ง€ url ๊ฐ€์ ธ์˜ค๊ธฐ - console.log('์—…๋กœ๋“œ๋œ ๊ฒฝ๋กœ๋Š”', url); - - const name = document.getElementById("name").value; - const phone = document.getElementById("phone").value; - const email= document.getElementById("email").value; - const rank= document.getElementById("rank").value; - const memo = document.getElementById("memo").value; - - - const saveData ={ - ์ด๋ฆ„ : name, - ์—ฐ๋ฝ์ฒ˜ : phone, - ์ด๋ฉ”์ผ : email, - ์ง๊ธ‰ : rank, - ๊ธฐํƒ€ : memo, - ์ด๋ฏธ์ง€: url - } - - console.log(name,phone,email,rank,memo) - - db.collection('member').add(saveData).then((result)=>{ - window.location.href="/index.html" - console.log(result) - }).catch((err)=>{ - console.log(err) - }); - - }); - - } - ); - - +//๋น„๋กœ๊ทธ์ธ์‹œ ์—…๋กœ๋“œ ๋ถˆ๊ฐ€ +if (localStorage.getItem("user") == null) { + document.querySelectorAll('input').forEach(el => { + el.addEventListener("focus", function () { + alert("๋กœ๊ทธ์ธ ํ›„ ์—…๋กœ๋“œ ๊ฐ€๋Šฅํ•ฉ๋‹ˆ๋‹ค!"); + this.blur(); }); + }) +} + +// ์˜ฌ๋ฆฌ๊ธฐ ๋ฒ„ํŠผ์„ ๋ˆ„๋ฅด๋ฉด ๋ฐฉ๊ธˆ๋งŒ๋“  ์ œ๋ชฉ, ๋‚ด์šฉ, ๊ฐ€๊ฒฉ ์ธํ’‹์— ์ž…๋ ฅํ•œ ์ •๋ณด db์ €์žฅ +document.getElementById("send").addEventListener("click", function () { + + if (localStorage.getItem("user") != null) { + //์Šคํ† ๋ฆฌ์ง€์— ์ด๋ฏธ์ง€ ์ €์žฅ + let file = document.querySelector("#image").files[0]; + const storageRef = storage.ref(); + let imgPath = storageRef.child("image/" + file.name); + let upload = imgPath.put(file); + + //์ด๋ฏธ์ง€ ์—…๋กœ๋“œ ์„ฑ๊ณต,์‹คํŒจ ํ™•์ธ + upload.on( + "state_changed", + // ๋ณ€ํ™”์‹œ ๋™์ž‘ํ•˜๋Š” ํ•จ์ˆ˜ + null, + //์—๋Ÿฌ์‹œ ๋™์ž‘ํ•˜๋Š” ํ•จ์ˆ˜ + (error) => { + console.error("์‹คํŒจ์‚ฌ์œ ๋Š”", error); + }, + // ์„ฑ๊ณต์‹œ ๋™์ž‘ํ•˜๋Š” ํ•จ์ˆ˜ + () => { + upload.snapshot.ref.getDownloadURL().then((url) => { + //์ด๋ฏธ์ง€ url ๊ฐ€์ ธ์˜ค๊ธฐ + console.log("์—…๋กœ๋“œ๋œ ๊ฒฝ๋กœ๋Š”", url); + + const name = document.getElementById("name").value; + const tel = document.getElementById("tel").value; + const phone = document.getElementById("phone").value; + const email = document.getElementById("email").value; + const team = document.getElementById("team").value; + const rank = document.getElementById("rank").value; + const memo = document.getElementById("memo").value; + + const saveData = { + ์ด๋ฆ„: name, + ๋‚ด์„ ๋ฒˆํ˜ธ: tel, + ์†Œ์†ํŒ€: team, + ์ง๊ธ‰: rank, + ์—ฐ๋ฝ์ฒ˜: phone, + ์ด๋ฉ”์ผ: email, + ๊ธฐํƒ€: memo, + ์ด๋ฏธ์ง€: url, + uid: JSON.parse(localStorage.getItem("user")).uid, + username: JSON.parse(localStorage.getItem("user")).displayName, + }; + + console.log(name, phone, email, rank, memo); + + db.collection("member") + .add(saveData) + .then((result) => { + window.location.href = "/index.html"; + console.log(result); + }) + .catch((err) => { + console.log(err); + }); + }); + } + ); + }else{ + alert("๋กœ๊ทธ์ธ ํ›„ ์—…๋กœ๋“œ ๊ฐ€๋Šฅํ•ฉ๋‹ˆ๋‹ค!"); + } +}); From 6113e2a8fd2d51f6721e727529d95f9b5185e8c6 Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Fri, 11 Aug 2023 19:31:25 +0900 Subject: [PATCH 09/34] fix: Modify detail path(href) --- public/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/main.js b/public/main.js index 1a27ea9b6..3257aa703 100644 --- a/public/main.js +++ b/public/main.js @@ -8,7 +8,7 @@
    ${doc.data().์ด๋ฆ„}
    ${doc.data().์†Œ์†ํŒ€} ${doc.data().์ง๊ธ‰}
    ${doc.data().๋‚ด์„ ๋ฒˆํ˜ธ}
    -
    ์ƒ์„ธ

    +

    ์ƒ์„ธ

    ` const wrap = document.querySelector('.container') wrap.insertAdjacentHTML('beforeend',template) From 8150a30b0800b613a744fb5a4b0fb1d295b6d445 Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Fri, 11 Aug 2023 19:33:01 +0900 Subject: [PATCH 10/34] Feat: Add DB_uid, DB_username --- public/upload/upload.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/upload/upload.js b/public/upload/upload.js index 91db33d94..d6102d14a 100644 --- a/public/upload/upload.js +++ b/public/upload/upload.js @@ -52,7 +52,7 @@ document.getElementById("send").addEventListener("click", function () { ๊ธฐํƒ€: memo, ์ด๋ฏธ์ง€: url, uid: JSON.parse(localStorage.getItem("user")).uid, - username: JSON.parse(localStorage.getItem("user")).displayName, + username: JSON.parse(localStorage.getItem("user")).displayName }; console.log(name, phone, email, rank, memo); From cc9c04f599ecb16b401c3d52cdbb927c2afcc5f9 Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Sat, 12 Aug 2023 16:26:42 +0900 Subject: [PATCH 11/34] Feat: Add edit page --- public/detail/detail.html | 3 +- public/detail/detail.js | 40 +++++++++++----------- public/edit/edit.html | 72 +++++++++++++++++++++++++++++++++++++++ public/edit/edit.js | 38 +++++++++++++++++++++ 4 files changed, 132 insertions(+), 21 deletions(-) create mode 100644 public/edit/edit.html create mode 100644 public/edit/edit.js diff --git a/public/detail/detail.html b/public/detail/detail.html index bcfbf864b..08b8b1e61 100644 --- a/public/detail/detail.html +++ b/public/detail/detail.html @@ -40,8 +40,7 @@

    ๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

    ์ƒ์„ธ์ •๋ณด

    - - +
    diff --git a/public/detail/detail.js b/public/detail/detail.js index dbf52fd69..e6609f06c 100644 --- a/public/detail/detail.js +++ b/public/detail/detail.js @@ -6,28 +6,30 @@ db.collection('member').doc(queryString.get('id')).get().then((result) => { console.log(result.data()) var templateDetail = ` -
    -
    -
    -
    -
    -
    ${result.data().์ด๋ฆ„}
    -
    ์†Œ์†ํŒ€: ${result.data().์†Œ์†ํŒ€}
    -
    ์ง๊ธ‰: ${result.data().์ง๊ธ‰}
    -
    ๋‚ด์„ ๋ฒˆํ˜ธ: ${result.data().๋‚ด์„ ๋ฒˆํ˜ธ}
    -
    ์—ฐ๋ฝ์ฒ˜: ${result.data().์—ฐ๋ฝ์ฒ˜}
    -
    ์ด๋ฉ”์ผ: ${result.data().์ด๋ฉ”์ผ}
    -
    ๊ธฐํƒ€: ${result.data().๊ธฐํƒ€}
    -
    -
    - ` - - const wrap = document.querySelector('#detail') - wrap.insertAdjacentHTML('beforeend',templateDetail) +
    +
    +
    +
    +
    +
    ${result.data().์ด๋ฆ„}
    +
    ์†Œ์†ํŒ€: ${result.data().์†Œ์†ํŒ€}
    +
    ์ง๊ธ‰: ${result.data().์ง๊ธ‰}
    +
    ๋‚ด์„ ๋ฒˆํ˜ธ: ${result.data().๋‚ด์„ ๋ฒˆํ˜ธ}
    +
    ์—ฐ๋ฝ์ฒ˜: ${result.data().์—ฐ๋ฝ์ฒ˜}
    +
    ์ด๋ฉ”์ผ: ${result.data().์ด๋ฉ”์ผ}
    +
    ๊ธฐํƒ€: ${result.data().๊ธฐํƒ€}
    +
    +
    + ` + const wrap = document.querySelector('#detail') + wrap.insertAdjacentHTML('beforeend',templateDetail) }); - +const detailEditBtn= document.querySelector('.detail__edit-btn'); +detailEditBtn.addEventListener('click',function(){ + window.location.href='/edit/edit.html?id='+ queryString.get('id') +}); diff --git a/public/edit/edit.html b/public/edit/edit.html new file mode 100644 index 000000000..638cf7347 --- /dev/null +++ b/public/edit/edit.html @@ -0,0 +1,72 @@ + + + + + + + ๐Ÿ™‹โ€โ™€๏ธemployee picture + + + + + + + +
    +

    ๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

    + +
    +
      +
    • ์˜ค๋Š˜๋„ ํž˜์ฐจ๊ฒŒ!๐Ÿ˜
      • +
      • +
    +
    + +
    + +
    +

    ์ •๋ณด ์ˆ˜์ •

    +
    + + + + + + + +
    +
    + + +
    +
    + +
    + +
    + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/edit/edit.js b/public/edit/edit.js new file mode 100644 index 000000000..429aaa3ef --- /dev/null +++ b/public/edit/edit.js @@ -0,0 +1,38 @@ +//url query string์— ์žˆ๋˜ ์ž๋ฃŒ๋ฅผ object๋กœ ๋ณ€ํ™˜ +let queryString = new URLSearchParams(window.location.search); +queryString.get('id') + + +db.collection('member').doc(queryString.get('id')).get().then((result) => { + console.log(result.data()) + document.getElementById("name").value =` ${result.data().์ด๋ฆ„}`; + document.getElementById("tel").value=`${result.data().๋‚ด์„ ๋ฒˆํ˜ธ}`; + document.getElementById("phone").value=`${result.data().์—ฐ๋ฝ์ฒ˜}`; + document.getElementById("email").value=`${result.data().์ด๋ฉ”์ผ}`; + document.getElementById("team").value=`${result.data().์†Œ์†ํŒ€}`; + document.getElementById("rank").value=`${result.data().์ง๊ธ‰}`; + document.getElementById("memo").value=`${result.data().๊ธฐํƒ€}`; +}); + + +// ์ˆ˜์ •๋ฒ„ํŠผ ํด๋ฆญ ์‹œ +const editBtn= document.querySelector('.edit__edit-btn'); +editBtn.addEventListener('click',function(){ + + let editDB = { + ์ด๋ฆ„ : document.getElementById("name").value, + ๋‚ด์„ ๋ฒˆํ˜ธ : document.getElementById("tel").value, + ์—ฐ๋ฝ์ฒ˜ : document.getElementById("phone").value, + ์ด๋ฉ”์ผ : document.getElementById("email").value, + ์†Œ์†ํŒ€ : document.getElementById("team").value, + ์ง๊ธ‰ : document.getElementById("rank").value, + ๊ธฐํƒ€ : document.getElementById("memo").value + } + + console.log(editDB) + + db.collection('member').doc(queryString.get('id')).update(editDB) + // window.location.href='/detail/detail.html?id='+ queryString.get('id') + // console.log(queryString.get('id')) +}); + From 1aeb1d30bfce690babb9755d822b4638fc65cbbd Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Sat, 12 Aug 2023 16:36:34 +0900 Subject: [PATCH 12/34] Docs: Change field name --- public/common.js | 8 +------- public/detail/detail.js | 16 ++++++++-------- public/edit/edit.js | 28 ++++++++++++++-------------- public/main.js | 8 ++++---- public/upload/upload.js | 26 +++++++++----------------- 5 files changed, 36 insertions(+), 50 deletions(-) diff --git a/public/common.js b/public/common.js index 4dd0a44c0..b701ec13f 100644 --- a/public/common.js +++ b/public/common.js @@ -16,8 +16,6 @@ const firebaseConfig = { const db = firebase.firestore(); const storage = firebase.storage(); - - if (localStorage.getItem('user') != null) { console.log('ํ˜„์žฌ๋กœ๊ทธ์ธ์ค‘') //๋กœ์ปฌ์Šคํ† ๋ฆฌ์ง€์—์„œ ์œ ์ €์ •๋ณด ๊ฐ€์ ธ์˜ค๊ธฐ @@ -25,16 +23,15 @@ if (localStorage.getItem('user') != null) { const localName = JSON.parse(localDataUser).displayName; console.log(localName) document.querySelector('#user-name').innerHTML = localName +'๋‹˜'; - // document.querySelector('.user-welcome').classList.remove('none'); document.querySelector('.logout').classList.remove('none'); document.querySelector('.login').classList.add('none'); }else{ console.log('ํ˜„์žฌ๋กœ๊ทธ์•„์›ƒ์ค‘') localStorage.removeItem('user') - // document.querySelector('.user-welcome').classList.add('none'); document.querySelector('.logout').classList.add('none'); document.querySelector('.login').classList.remove('none'); + } @@ -44,7 +41,6 @@ firebase.auth().onAuthStateChanged((user)=>{ if(user){ console.log(user) console.log(user.displayName+'๋กœ๊ทธ์ธ ์™„๋ฃŒ') - // document.querySelector('.user-welcome').classList.remove('none'); document.querySelector('.logout').classList.remove('none'); document.querySelector('.login').classList.add('none'); @@ -55,7 +51,6 @@ firebase.auth().onAuthStateChanged((user)=>{ }else if(user = null){ localStorage.removeItem('user') - // document.querySelector('.user-welcome').classList.add('none'); document.querySelector('.logout').classList.add('none'); document.querySelector('.login').classList.remove('none'); @@ -69,7 +64,6 @@ const logoutBtn=document.getElementById('logout-btn') logoutBtn.addEventListener("click",function(){ firebase.auth().signOut(); localStorage.removeItem('user') - // document.querySelector('.user-welcome').classList.add('none'); alert('๋กœ๊ทธ์•„์›ƒ ์™„๋ฃŒ!') document.querySelector('.logout').classList.add('none'); document.querySelector('.login').classList.remove('none'); diff --git a/public/detail/detail.js b/public/detail/detail.js index e6609f06c..9a01b1f34 100644 --- a/public/detail/detail.js +++ b/public/detail/detail.js @@ -8,16 +8,16 @@ db.collection('member').doc(queryString.get('id')).get().then((result) => { var templateDetail = `
    -
    +
    -
    ${result.data().์ด๋ฆ„}
    -
    ์†Œ์†ํŒ€: ${result.data().์†Œ์†ํŒ€}
    -
    ์ง๊ธ‰: ${result.data().์ง๊ธ‰}
    -
    ๋‚ด์„ ๋ฒˆํ˜ธ: ${result.data().๋‚ด์„ ๋ฒˆํ˜ธ}
    -
    ์—ฐ๋ฝ์ฒ˜: ${result.data().์—ฐ๋ฝ์ฒ˜}
    -
    ์ด๋ฉ”์ผ: ${result.data().์ด๋ฉ”์ผ}
    -
    ๊ธฐํƒ€: ${result.data().๊ธฐํƒ€}
    +
    ${result.data().name}
    +
    ์†Œ์†ํŒ€: ${result.data().team}
    +
    ์ง๊ธ‰: ${result.data().rank}
    +
    ๋‚ด์„ ๋ฒˆํ˜ธ: ${result.data().ext}
    +
    ์—ฐ๋ฝ์ฒ˜: ${result.data().phone}
    +
    ์ด๋ฉ”์ผ: ${result.data().email}
    +
    ๊ธฐํƒ€: ${result.data().memo}
    ` diff --git a/public/edit/edit.js b/public/edit/edit.js index 429aaa3ef..9269a7ad2 100644 --- a/public/edit/edit.js +++ b/public/edit/edit.js @@ -5,13 +5,13 @@ queryString.get('id') db.collection('member').doc(queryString.get('id')).get().then((result) => { console.log(result.data()) - document.getElementById("name").value =` ${result.data().์ด๋ฆ„}`; - document.getElementById("tel").value=`${result.data().๋‚ด์„ ๋ฒˆํ˜ธ}`; - document.getElementById("phone").value=`${result.data().์—ฐ๋ฝ์ฒ˜}`; - document.getElementById("email").value=`${result.data().์ด๋ฉ”์ผ}`; - document.getElementById("team").value=`${result.data().์†Œ์†ํŒ€}`; - document.getElementById("rank").value=`${result.data().์ง๊ธ‰}`; - document.getElementById("memo").value=`${result.data().๊ธฐํƒ€}`; + document.getElementById("name").value =` ${result.data().name}`; + document.getElementById("tel").value=`${result.data().ext}`; + document.getElementById("phone").value=`${result.data().phone}`; + document.getElementById("email").value=`${result.data().email}`; + document.getElementById("team").value=`${result.data().team}`; + document.getElementById("rank").value=`${result.data().rank}`; + document.getElementById("memo").value=`${result.data().memo}`; }); @@ -20,13 +20,13 @@ const editBtn= document.querySelector('.edit__edit-btn'); editBtn.addEventListener('click',function(){ let editDB = { - ์ด๋ฆ„ : document.getElementById("name").value, - ๋‚ด์„ ๋ฒˆํ˜ธ : document.getElementById("tel").value, - ์—ฐ๋ฝ์ฒ˜ : document.getElementById("phone").value, - ์ด๋ฉ”์ผ : document.getElementById("email").value, - ์†Œ์†ํŒ€ : document.getElementById("team").value, - ์ง๊ธ‰ : document.getElementById("rank").value, - ๊ธฐํƒ€ : document.getElementById("memo").value + name : document.getElementById("name").value, + ext : document.getElementById("tel").value, + phone : document.getElementById("phone").value, + email : document.getElementById("email").value, + team : document.getElementById("team").value, + rank : document.getElementById("rank").value, + memo : document.getElementById("memo").value } console.log(editDB) diff --git a/public/main.js b/public/main.js index 3257aa703..99da3cfe1 100644 --- a/public/main.js +++ b/public/main.js @@ -4,10 +4,10 @@ ๊ฒฐ๊ณผ.forEach((doc)=>{ console.log(doc.data()); var template = `
    -
    -
    ${doc.data().์ด๋ฆ„}
    -
    ${doc.data().์†Œ์†ํŒ€} ${doc.data().์ง๊ธ‰}
    -
    ${doc.data().๋‚ด์„ ๋ฒˆํ˜ธ}
    +
    +
    ${doc.data().name}
    +
    ${doc.data().team} ${doc.data().rank}
    +
    ${doc.data().ext}
    ์ƒ์„ธ

    ` const wrap = document.querySelector('.container') diff --git a/public/upload/upload.js b/public/upload/upload.js index d6102d14a..1b52c09c7 100644 --- a/public/upload/upload.js +++ b/public/upload/upload.js @@ -34,23 +34,15 @@ document.getElementById("send").addEventListener("click", function () { //์ด๋ฏธ์ง€ url ๊ฐ€์ ธ์˜ค๊ธฐ console.log("์—…๋กœ๋“œ๋œ ๊ฒฝ๋กœ๋Š”", url); - const name = document.getElementById("name").value; - const tel = document.getElementById("tel").value; - const phone = document.getElementById("phone").value; - const email = document.getElementById("email").value; - const team = document.getElementById("team").value; - const rank = document.getElementById("rank").value; - const memo = document.getElementById("memo").value; - - const saveData = { - ์ด๋ฆ„: name, - ๋‚ด์„ ๋ฒˆํ˜ธ: tel, - ์†Œ์†ํŒ€: team, - ์ง๊ธ‰: rank, - ์—ฐ๋ฝ์ฒ˜: phone, - ์ด๋ฉ”์ผ: email, - ๊ธฐํƒ€: memo, - ์ด๋ฏธ์ง€: url, + let saveData = { + name : document.getElementById("name").value, + ext : document.getElementById("tel").value, + team : document.getElementById("team").value, + rank : document.getElementById("rank").value, + phone: document.getElementById("phone").value, + email : document.getElementById("email").value, + memo: document.getElementById("memo").value, + img: url, uid: JSON.parse(localStorage.getItem("user")).uid, username: JSON.parse(localStorage.getItem("user")).displayName }; From 90d83226271c8f20ce973ee81f21599e09b15253 Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Sat, 12 Aug 2023 17:43:58 +0900 Subject: [PATCH 13/34] Feat: DB delete --- public/detail/detail.html | 8 +++++++- public/detail/detail.js | 15 +++++++++++++-- public/edit/edit.html | 1 + public/edit/edit.js | 17 +++++++++++------ 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/public/detail/detail.html b/public/detail/detail.html index 08b8b1e61..6f4984e04 100644 --- a/public/detail/detail.html +++ b/public/detail/detail.html @@ -40,7 +40,13 @@

    ๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

    ์ƒ์„ธ์ •๋ณด

    -
    +
    + +
    +
    + + +
    diff --git a/public/detail/detail.js b/public/detail/detail.js index 9a01b1f34..a3fb818c8 100644 --- a/public/detail/detail.js +++ b/public/detail/detail.js @@ -21,8 +21,7 @@ db.collection('member').doc(queryString.get('id')).get().then((result) => {
    ` - const wrap = document.querySelector('#detail') - wrap.insertAdjacentHTML('beforeend',templateDetail) + document.querySelector('.detail-area').insertAdjacentHTML('beforeend',templateDetail) }); @@ -31,6 +30,18 @@ detailEditBtn.addEventListener('click',function(){ window.location.href='/edit/edit.html?id='+ queryString.get('id') }); +const detailDeleteBtn= document.querySelector('.detail__delete-btn'); +detailDeleteBtn.addEventListener('click',function(){ + db.collection('member').doc(queryString.get('id')).delete().then(()=>{ + alert('์‚ญ์ œ๋˜์—ˆ์Šต๋‹ˆ๋‹ค.'); + window.location.href='/' + }) + + +}); + + + diff --git a/public/edit/edit.html b/public/edit/edit.html index 638cf7347..88e4481c8 100644 --- a/public/edit/edit.html +++ b/public/edit/edit.html @@ -54,6 +54,7 @@

    ์ •๋ณด ์ˆ˜์ •

    +
    diff --git a/public/edit/edit.js b/public/edit/edit.js index 9269a7ad2..8797fc3ea 100644 --- a/public/edit/edit.js +++ b/public/edit/edit.js @@ -17,8 +17,7 @@ db.collection('member').doc(queryString.get('id')).get().then((result) => { // ์ˆ˜์ •๋ฒ„ํŠผ ํด๋ฆญ ์‹œ const editBtn= document.querySelector('.edit__edit-btn'); -editBtn.addEventListener('click',function(){ - +editBtn.addEventListener('click',function(){ let editDB = { name : document.getElementById("name").value, ext : document.getElementById("tel").value, @@ -29,10 +28,16 @@ editBtn.addEventListener('click',function(){ memo : document.getElementById("memo").value } - console.log(editDB) - db.collection('member').doc(queryString.get('id')).update(editDB) - // window.location.href='/detail/detail.html?id='+ queryString.get('id') - // console.log(queryString.get('id')) + window.location.href='/detail/detail.html?id='+ queryString.get('id') +}); + + +const deleteBtn= document.querySelector('.edit__delete-btn'); +deleteBtn.addEventListener('click',function(){ + db.collection('member').doc(queryString.get('id')).delete().then(()=>{ + alert('์‚ญ์ œ๋˜์—ˆ์Šต๋‹ˆ๋‹ค.'); + window.location.href='/' + }) }); From 5931373c1aa1cb86d695c47c20abed21223c3529 Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Fri, 18 Aug 2023 14:40:25 +0900 Subject: [PATCH 14/34] Feat: Preview, login check --- .gitignore | 1 + README.md | 46 ++--- public/common.js | 71 ------- public/detail/detail.html | 139 +++++++------ public/detail/detail.js | 69 +++---- public/edit/delete.js | 23 +++ public/edit/edit.html | 193 +++++++++++------- public/edit/edit.js | 133 +++++++++---- public/index.html | 97 +++++---- public/keyframes.css | 0 public/login/login.html | 176 +++++++++++------ public/login/login.js | 80 +++++--- public/login_ck.js | 88 +++++++++ public/main.css | 399 +++++++++++++++++++++++++++++++------- public/main.js | 86 ++++++-- public/media.css | 98 ++++++++++ public/preview.js | 32 +++ public/upload/upload.html | 178 +++++++++++------ public/upload/upload.js | 34 ++-- 19 files changed, 1350 insertions(+), 593 deletions(-) delete mode 100644 public/common.js create mode 100644 public/edit/delete.js create mode 100644 public/keyframes.css create mode 100644 public/login_ck.js create mode 100644 public/media.css create mode 100644 public/preview.js diff --git a/.gitignore b/.gitignore index 855bd1c81..e2cc90f00 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ node_modules/ # Ignore IDE specific files .vscode/ +.test/ \ No newline at end of file diff --git a/README.md b/README.md index a29ee163b..3f291a0f2 100644 --- a/README.md +++ b/README.md @@ -1,48 +1,26 @@ # :camera: ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค -์ง์›๋“ค์˜ ์‚ฌ์ง„์„ ๊ด€๋ฆฌํ•  ์ˆ˜ ์žˆ๋Š” ์‚ฌ์ง„ ๊ด€๋ฆฌ์ž ์„œ๋น„์Šค๋ฅผ ๋งŒ๋“ค์–ด ๋ณด์„ธ์š”. - -๊ณผ์ œ ์ˆ˜ํ–‰ ๋ฐ ๋ฆฌ๋ทฐ ๊ธฐ๊ฐ„์€ ๋ณ„๋„ ๊ณต์ง€๋ฅผ ์ฐธ๊ณ ํ•˜์„ธ์š”! -## [๊ณผ์ œ ์ˆ˜ํ–‰ ๋ฐ ์ œ์ถœ ๋ฐฉ๋ฒ•] -1. ํ˜„์žฌ ์ €์žฅ์†Œ๋ฅผ ๋กœ์ปฌ์— ํด๋ก (Clone)ํ•ฉ๋‹ˆ๋‹ค. -2. ์ž์‹ ์˜ ๋ณธ๋ช…์œผ๋กœ ๋ธŒ๋žœ์น˜๋ฅผ ์ƒ์„ฑํ•ฉ๋‹ˆ๋‹ค.(๊ตฌ๋ถ„ ๊ฐ€๋Šฅํ•˜๋„๋ก ๋ณธ๋ช…์„ ๊ผญ ํŒŒ์Šค์นผ์ผ€์ด์Šค๋กœ ํ‘œ์‹œํ•˜์„ธ์š”, git branch KDT0_์ด๋ฆ„) -3. ์ž์‹ ์˜ ๋ณธ๋ช… ๋ธŒ๋žœ์น˜์—์„œ ๊ณผ์ œ๋ฅผ ์ˆ˜ํ–‰ํ•ฉ๋‹ˆ๋‹ค. -4. ๊ณผ์ œ ์ˆ˜ํ–‰์ด ์™„๋ฃŒ๋˜๋ฉด, ์ž์‹ ์˜ ๋ณธ๋ช… ๋ธŒ๋žœ์น˜๋ฅผ ์›๊ฒฉ ์ €์žฅ์†Œ์— ํ‘ธ์‹œ(Push)ํ•ฉ๋‹ˆ๋‹ค.(main ๋ธŒ๋žœ์น˜์— ํ‘ธ์‹œํ•˜์ง€ ์•Š๋„๋ก ๊ผญ ์ฃผ์˜ํ•˜์„ธ์š”, git push origin KDT0_์ด๋ฆ„) -5. ์ €์žฅ์†Œ์—์„œ main ๋ธŒ๋žœ์น˜๋ฅผ ๋Œ€์ƒ์œผ๋กœ Pull Request ์ƒ์„ฑํ•˜๋ฉด, ๊ณผ์ œ ์ œ์ถœ์ด ์™„๋ฃŒ๋ฉ๋‹ˆ๋‹ค!(E.g, main <== KDT0_์ด๋ฆ„) -6. Pull Request ๋งํฌ๋ฅผ LMS๋กœ๋„ ์ œ์ถœํ•ด ์ฃผ์…”์•ผ ํ•ฉ๋‹ˆ๋‹ค. -7. main ํ˜น์€ ๋‹ค๋ฅธ ์‚ฌ๋žŒ์˜ ๋ธŒ๋žœ์น˜๋กœ ์ ˆ๋Œ€ ๋ณ‘ํ•ฉํ•˜์ง€ ์•Š๋„๋ก ์ฃผ์˜ํ•˜์„ธ์š”! -8. Pull Request์—์„œ ๋ณด์ด๋Š” ์„ค๋ช…์„ ๋‹ค๋ฅธ ์‚ฌ๋žŒ๋“ค์ด ์ดํ•ดํ•˜๊ธฐ ์‰ฝ๋„๋ก ๊ผผ๊ผผํ•˜๊ฒŒ ์ž‘์„ฑํ•˜์„ธ์š”! -9. Pull Request์—์„œ ๊ณผ์ œ ์ œ์ถœ ํ›„ ์ ˆ๋Œ€ ๋ณ‘ํ•ฉ(Merge)ํ•˜์ง€ ์•Š๋„๋ก ์ฃผ์˜ํ•˜์„ธ์š”! -10. ๊ณผ์ œ ์ˆ˜ํ–‰ ๋ฐ ์ œ์ถœ ๊ณผ์ •์—์„œ ๋ฌธ์ œ๊ฐ€ ๋ฐœ์ƒํ•œ ๊ฒฝ์šฐ, ๋ฐ”๋กœ ๋‹ด๋‹น ๋ฉ˜ํ† ๋‚˜ ๊ฐ•์‚ฌ์—์„œ ์–˜๊ธฐํ•˜์„ธ์š”! - -## [ํ•„์ˆ˜ ์š”๊ตฌ์‚ฌํ•ญ] -- โ€œAWS S3 / Firebase ๊ฐ™์€ ์„œ๋น„์Šคโ€๋ฅผ ์ด์šฉํ•˜์—ฌ ์‚ฌ์ง„์„ ๊ด€๋ฆฌํ•  ์ˆ˜ ์žˆ๋Š” ํŽ˜์ด์ง€๋ฅผ ๊ตฌํ˜„ํ•˜์„ธ์š”. -- ํ”„๋กœํ•„ ํŽ˜์ด์ง€๋ฅผ ๊ฐœ๋ฐœํ•˜์„ธ์š”. -- ์Šคํฌ๋กค์ด ๊ฐ€๋Šฅํ•œ ํ˜•ํƒœ์˜ ๋ฆฌ์ŠคํŒ… ํŽ˜์ด์ง€๋ฅผ ๊ฐœ๋ฐœํ•˜์„ธ์š”. -- ์ „์ฒด ํŽ˜์ด์ง€ ๋ฐ์Šคํฌํƒ‘-๋ชจ๋ฐ”์ผ ๋ฐ˜์‘ํ˜• ํŽ˜์ด์ง€๋ฅผ ๊ฐœ๋ฐœํ•˜์„ธ์š”. -- ์‚ฌ์ง„์„ ๋“ฑ๋ก, ์ˆ˜์ •, ์‚ญ์ œ๊ฐ€ ๊ฐ€๋Šฅํ•ด์•ผ ํ•ฉ๋‹ˆ๋‹ค. -- ์œ ์ € ํ”Œ๋กœ์šฐ๋ฅผ ์ œ์ž‘ํ•˜์—ฌ ๋ฆฌ๋“œ๋ฏธ์— ์ถ”๊ฐ€ํ•˜์„ธ์š”. +์ง์›๋“ค์˜ ์‚ฌ์ง„์„ ๊ด€๋ฆฌํ•  ์ˆ˜ ์žˆ๋Š” ์‚ฌ์ง„ ๊ด€๋ฆฌ์ž ์„œ๋น„์Šค + +## [๊ตฌํ˜„๋ฒ”์œ„] +- โ€œFirebase ์„œ๋น„์Šคโ€๋ฅผ ์ด์šฉํ•˜์—ฌ ์‚ฌ์ง„์„ ๊ด€๋ฆฌํ•  ์ˆ˜ ์žˆ๋Š” ํŽ˜์ด์ง€๋ฅผ ๊ตฌํ˜„ +- ํ”„๋กœํ•„ ํŽ˜์ด์ง€๋ฅผ ๊ฐœ๋ฐœ +- ์Šคํฌ๋กค์ด ๊ฐ€๋Šฅํ•œ ํ˜•ํƒœ์˜ ๋ฆฌ์ŠคํŒ… ํŽ˜์ด์ง€๋ฅผ ๊ฐœ๋ฐœ +- ์ „์ฒด ํŽ˜์ด์ง€ ๋ฐ์Šคํฌํƒ‘-๋ชจ๋ฐ”์ผ ๋ฐ˜์‘ํ˜• ํŽ˜์ด์ง€๋ฅผ ๊ฐœ๋ฐœ +- ์‚ฌ์ง„ ๋“ฑ๋ก, ์ˆ˜์ •, ์‚ญ์ œ ๊ฐ€๋Šฅ +- ๋กœ๊ทธ์ธ / ํšŒ์›๊ฐ€์ž… ํŽ˜์ด์ง€ ๊ฐœ๋ฐœ + * CSS * ์• ๋‹ˆ๋ฉ”์ด์…˜ ๊ตฌํ˜„ * ์ƒ๋Œ€์ˆ˜์น˜ ์‚ฌ์šฉ(rem, em) * JavaScript * DOM event ์กฐ์ž‘ -## [์„ ํƒ ์š”๊ตฌ์‚ฌํ•ญ] -- ์‚ฌ์ง„ ๊ด€๋ฆฌ ํŽ˜์ด์ง€์™€ ๊ด€๋ จ๋œ ๊ธฐํƒ€ ๊ธฐ๋Šฅ๋„ ๊ณ ๋ คํ•ด ๋ณด์„ธ์š”. -- ํŽ˜์ด์ง€๊ฐ€ ๋ณด์—ฌ์ง€๊ธฐ ์ „์— ๋กœ๋”ฉ ์• ๋‹ˆ๋ฉ”์ด์…˜์ด ๋ณด์ด๋„๋ก ๋งŒ๋“ค์–ด๋ณด์„ธ์š”. -- ์ง์›์„ ๋“ฑ๋ก, ์ˆ˜์ •, ์‚ญ์ œ๊ฐ€ ๊ฐ€๋Šฅํ•˜๊ฒŒ ํ•ด๋ณด์„ธ์š”. -- ์ง์› ๊ฒ€์ƒ‰ ๊ธฐ๋Šฅ์„ ์ถ”๊ฐ€ํ•ด ๋ณด์„ธ์š”. -- infinity scroll ๊ธฐ๋Šฅ์„ ์ถ”๊ฐ€ํ•ด ๋ณด์„ธ์š”. -- ์‚ฌ์ง„์„ ํŽธ์ง‘ํ•  ์ˆ˜ ์žˆ๋Š” ๊ธฐ๋Šฅ์„ ์ถ”๊ฐ€ํ•ด ๋ณด์„ธ์š”. +- ์ง์›์„ ๋“ฑ๋ก, ์ˆ˜์ •, ์‚ญ์ œ๊ฐ€ ๊ฐ€๋Šฅ +- infinity scroll ๊ธฐ๋Šฅ - LocalStorage ์‚ฌ์šฉ -## [ํ™”๋ฉด ์˜ˆ์‹œ] -![Untitled (1)](https://github.com/KDT1-FE/Y_FE_JAVASCRIPT_PICTURE/assets/38754963/5dda6755-2501-4af4-bc3e-b63a353c44c2) - -![Untitled (2)](https://github.com/KDT1-FE/Y_FE_JAVASCRIPT_PICTURE/assets/38754963/6c1805f1-2b00-453e-a729-2b483612726d) - ## [ํ๋ฆ„] ![Untitled](https://github.com/KDT1-FE/Y_FE_JAVASCRIPT_PICTURE/assets/38754963/e2934c05-26f6-4ef6-88d4-beed76aa007a) diff --git a/public/common.js b/public/common.js deleted file mode 100644 index b701ec13f..000000000 --- a/public/common.js +++ /dev/null @@ -1,71 +0,0 @@ -const firebaseConfig = { - apiKey: "AIzaSyBRDdAmcnRV3_Ui_Md_vhbyp9-9-eXqzbw", - authDomain: "javascript-picture.firebaseapp.com", - projectId: "javascript-picture", - storageBucket: "javascript-picture.appspot.com", - messagingSenderId: "487659103783", - appId: "1:487659103783:web:e98479de1137818dfa9002", - measurementId: "G-0RSTQFT7N8" - }; - - - // Initialize Firebase - firebase.initializeApp(firebaseConfig) - - -const db = firebase.firestore(); -const storage = firebase.storage(); - -if (localStorage.getItem('user') != null) { - console.log('ํ˜„์žฌ๋กœ๊ทธ์ธ์ค‘') - //๋กœ์ปฌ์Šคํ† ๋ฆฌ์ง€์—์„œ ์œ ์ €์ •๋ณด ๊ฐ€์ ธ์˜ค๊ธฐ - const localDataUser =localStorage.getItem('user') - const localName = JSON.parse(localDataUser).displayName; - console.log(localName) - document.querySelector('#user-name').innerHTML = localName +'๋‹˜'; - document.querySelector('.logout').classList.remove('none'); - document.querySelector('.login').classList.add('none'); - -}else{ - console.log('ํ˜„์žฌ๋กœ๊ทธ์•„์›ƒ์ค‘') - localStorage.removeItem('user') - document.querySelector('.logout').classList.add('none'); - document.querySelector('.login').classList.remove('none'); - -} - - - -//๋กœ๊ทธ์ธ ์ƒํƒœ ํ™•์ธ. ๋กœ๊ทธ์ธ,๋กœ๊ทธ์•„์›ƒ,์ƒˆ๋กœ๊ณ ์นจ ๋“ฑ ์œ ์ € ์ธ์ฆ์ƒํƒœ ๋ณ€๊ฒฝ์‹œ๋งˆ๋‹ค ์‹คํ–‰๋จ -firebase.auth().onAuthStateChanged((user)=>{ - if(user){ - console.log(user) - console.log(user.displayName+'๋กœ๊ทธ์ธ ์™„๋ฃŒ') - document.querySelector('.logout').classList.remove('none'); - document.querySelector('.login').classList.add('none'); - - //๋กœ์ปฌ์Šคํ† ๋ฆฌ์ง€์— ์œ ์ €์ •๋ณด ์ €์žฅ - localStorage.setItem('user', JSON.stringify(user)) - // userUid = user.uid; - // console.log(userUid) - - }else if(user = null){ - localStorage.removeItem('user') - document.querySelector('.logout').classList.add('none'); - document.querySelector('.login').classList.remove('none'); - - } -}) - - -const logoutBtn=document.getElementById('logout-btn') - -//๋กœ๊ทธ์•„์›ƒ ๋ฒ„ํŠผ ๋ˆ„๋ฅด๋ฉด -logoutBtn.addEventListener("click",function(){ - firebase.auth().signOut(); - localStorage.removeItem('user') - alert('๋กœ๊ทธ์•„์›ƒ ์™„๋ฃŒ!') - document.querySelector('.logout').classList.add('none'); - document.querySelector('.login').classList.remove('none'); - -}); \ No newline at end of file diff --git a/public/detail/detail.html b/public/detail/detail.html index 6f4984e04..8bd1c196d 100644 --- a/public/detail/detail.html +++ b/public/detail/detail.html @@ -1,60 +1,87 @@ - - - - - ๐Ÿ™‹โ€โ™€๏ธemployee picture - - - - - - + +
    +

    ์ƒ์„ธ์ •๋ณด

    +
    +
    + + +
    +
    -
    -

    ๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

    - -
    -
      -
    • ์˜ค๋Š˜๋„ ํž˜์ฐจ๊ฒŒ!๐Ÿ˜
      • -
      • -
    -
    - -
    - - -
    -

    ์ƒ์„ธ์ •๋ณด

    -
    - -
    -
    - - -
    -
    - - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/public/detail/detail.js b/public/detail/detail.js index a3fb818c8..a866cbb90 100644 --- a/public/detail/detail.js +++ b/public/detail/detail.js @@ -1,49 +1,36 @@ -//url query string์— ์žˆ๋˜ ์ž๋ฃŒ๋ฅผ object๋กœ ๋ณ€ํ™˜ -let queryString = new URLSearchParams(window.location.search); -queryString.get('id') - -db.collection('member').doc(queryString.get('id')).get().then((result) => { - console.log(result.data()) +db.collection("member") + .doc(queryString.get("id")) + .get() + .then((result) => { + console.log(result.data()); var templateDetail = `
    -
    +
    -
    ${result.data().name}
    -
    ์†Œ์†ํŒ€: ${result.data().team}
    -
    ์ง๊ธ‰: ${result.data().rank}
    -
    ๋‚ด์„ ๋ฒˆํ˜ธ: ${result.data().ext}
    -
    ์—ฐ๋ฝ์ฒ˜: ${result.data().phone}
    -
    ์ด๋ฉ”์ผ: ${result.data().email}
    -
    ๊ธฐํƒ€: ${result.data().memo}
    +
    ์ด๋ฆ„ : ${result.data().name}
    +
    ์†Œ์†ํŒ€ : ${result.data().team}
    +
    ์ง๊ธ‰ : ${result.data().rank}
    +
    ๋‚ด์„ ๋ฒˆํ˜ธ : ${result.data().ext}
    +
    ์—ฐ๋ฝ์ฒ˜ : ${result.data().phone}
    +
    ์ด๋ฉ”์ผ : ${result.data().email}
    +
    ๊ธฐํƒ€ : ${ + result.data().memo + }
    - ` - document.querySelector('.detail-area').insertAdjacentHTML('beforeend',templateDetail) -}); - - -const detailEditBtn= document.querySelector('.detail__edit-btn'); -detailEditBtn.addEventListener('click',function(){ - window.location.href='/edit/edit.html?id='+ queryString.get('id') -}); - -const detailDeleteBtn= document.querySelector('.detail__delete-btn'); -detailDeleteBtn.addEventListener('click',function(){ - db.collection('member').doc(queryString.get('id')).delete().then(()=>{ - alert('์‚ญ์ œ๋˜์—ˆ์Šต๋‹ˆ๋‹ค.'); - window.location.href='/' - }) - - -}); - - - - - - - - + `; + document + .querySelector(".detail-area") + .insertAdjacentHTML("beforeend", templateDetail); + }); + +if (localStorage.getItem("user") != null) { + document.querySelector(".edit-btn").addEventListener("click", editBtnClick); +} else { + document.querySelector(".edit-btn").addEventListener("click", alertLogin); +} diff --git a/public/edit/delete.js b/public/edit/delete.js new file mode 100644 index 000000000..c0fcede03 --- /dev/null +++ b/public/edit/delete.js @@ -0,0 +1,23 @@ + // ์‚ญ์ œ + const deleteBtn= document.querySelectorAll('.delete-btn'); + deleteBtn.addEventListener('click',function(){ + //db์ •๋ณด ์‚ญ์ œ + db.collection('member').doc(queryString.get('id')).delete().then(()=>{ + alert('์‚ญ์ œ๋˜์—ˆ์Šต๋‹ˆ๋‹ค.'); + window.location.href='/' + + }) + + //์ด๋ฏธ์ง€ ์‚ญ์ œ + var deleteFilename = document.getElementById('image-delete').value; + var deleteRef = storage.refFromURL(deleteFilename) + // console.log(deleteRef) + + deleteRef.delete().then(function() { + console.log("File deleted successfully"); + }).catch(function(error) { + console.error("Error removing file.", error); + }); + + + }); \ No newline at end of file diff --git a/public/edit/edit.html b/public/edit/edit.html index 88e4481c8..9b478716e 100644 --- a/public/edit/edit.html +++ b/public/edit/edit.html @@ -1,73 +1,136 @@ - - - - - ๐Ÿ™‹โ€โ™€๏ธemployee picture - - - - - - +
    +

    ์ •๋ณด ์ˆ˜์ •

    +
    +
    + +
    + + + +
    +
    + + +
    +
    -
    -

    ๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

    - -
    -
      -
    • ์˜ค๋Š˜๋„ ํž˜์ฐจ๊ฒŒ!๐Ÿ˜
      • -
      • -
    -
    - -
    - -
    -

    ์ •๋ณด ์ˆ˜์ •

    -
    - - - - - - - -
    -
    - - -
    -
    - - + + + + + + + + +
    + + +
    - -
    +
    - - - - - - + + + + - + + + + - - - \ No newline at end of file + + + diff --git a/public/edit/edit.js b/public/edit/edit.js index 8797fc3ea..24af1ed23 100644 --- a/public/edit/edit.js +++ b/public/edit/edit.js @@ -1,43 +1,92 @@ -//url query string์— ์žˆ๋˜ ์ž๋ฃŒ๋ฅผ object๋กœ ๋ณ€ํ™˜ -let queryString = new URLSearchParams(window.location.search); -queryString.get('id') - - -db.collection('member').doc(queryString.get('id')).get().then((result) => { - console.log(result.data()) - document.getElementById("name").value =` ${result.data().name}`; - document.getElementById("tel").value=`${result.data().ext}`; - document.getElementById("phone").value=`${result.data().phone}`; - document.getElementById("email").value=`${result.data().email}`; - document.getElementById("team").value=`${result.data().team}`; - document.getElementById("rank").value=`${result.data().rank}`; - document.getElementById("memo").value=`${result.data().memo}`; -}); - - -// ์ˆ˜์ •๋ฒ„ํŠผ ํด๋ฆญ ์‹œ -const editBtn= document.querySelector('.edit__edit-btn'); -editBtn.addEventListener('click',function(){ - let editDB = { - name : document.getElementById("name").value, - ext : document.getElementById("tel").value, - phone : document.getElementById("phone").value, - email : document.getElementById("email").value, - team : document.getElementById("team").value, - rank : document.getElementById("rank").value, - memo : document.getElementById("memo").value - } - - db.collection('member').doc(queryString.get('id')).update(editDB) - window.location.href='/detail/detail.html?id='+ queryString.get('id') -}); - - -const deleteBtn= document.querySelector('.edit__delete-btn'); -deleteBtn.addEventListener('click',function(){ - db.collection('member').doc(queryString.get('id')).delete().then(()=>{ - alert('์‚ญ์ œ๋˜์—ˆ์Šต๋‹ˆ๋‹ค.'); - window.location.href='/' - }) -}); +const employeeName = document.getElementById("name"); +const ext = document.getElementById("tel"); +const phone = document.getElementById("phone"); +const email = document.getElementById("email"); +const team = document.getElementById("team"); +const rank = document.getElementById("rank"); +const memo = document.getElementById("memo"); +const deleteImg = document.getElementById("image-delete"); +const previewImg = document.getElementById("preview-image"); +const editBtn = document.querySelector(".edit-btn"); +db.collection("member") + .doc(queryString.get("id")) + .get() + .then((result) => { + console.log(result.data()); + console.log("์ˆ˜์ • ์ „ ์ด๋ฏธ์ง€url::::" + result.data().img); + employeeName.value = result.data().name; + ext.value = result.data().ext; + phone.value = result.data().phone; + email.value = result.data().email; + team.value = result.data().team; + rank.value = result.data().rank; + memo.value = result.data().memo; + deleteImg.value = result.data().img; + previewImg.src = result.data().img; + + // ์ˆ˜์ •๋ฒ„ํŠผ ํด๋ฆญ ์‹œ + editBtn.addEventListener("click", function () { + const editImg = document.querySelector("#image").files[0]; + const imgName = document.querySelector("#image").files.name; + const storageRef = storage.ref(); + const editImgPath = storageRef.child("image/" + randomNum + imgName); + const updateImg = editImgPath.put(editImg); + + updateImg.on( + "state_changed", + null, + (err) => { + console.log(err); + }, + () => { + updateImg.snapshot.ref.getDownloadURL().then((editUrl) => { + console.log("์ˆ˜์ •๋œ ๊ฒฝ๋กœ๋Š”", editUrl); + + const editDB = { + name: employeeName.value, + ext: ext.value, + phone: phone.value, + email: email.value, + team: team.value, + rank: rank.value, + memo: memo.value, + img: editUrl, + }; + + if (previewImg.src === result.data().img) { + editDB["img"] = result.data().img; + } + + db.collection("member") + .doc(queryString.get("id")) + .update(editDB) + .then(() => { + alert(editDB.name + "๋‹˜์˜ ์ง์› ์ •๋ณด๊ฐ€ ์ˆ˜์ •๋˜์—ˆ์Šต๋‹ˆ๋‹ค:)"); + window.location.href = + "/detail/detail.html?id=" + queryString.get("id"); + }); + }); + } + ); + }); + }); + +//์ด๋ฏธ์ง€๋งŒ ์‚ญ์ œ +document + .getElementById("file-delete-btn") + .addEventListener("click", function (e) { + var deleteFilename = document.getElementById("image-delete").value; + var deleteRef = storage.refFromURL(deleteFilename); + // console.log(deleteRef) + + deleteRef + .delete() + .then(function () { + alert("์ด๋ฏธ์ง€๊ฐ€ ์‚ญ์ œ๋˜์—ˆ์Šต๋‹ˆ๋‹ค!"); + window.location.reload(); + }) + .catch(function (error) { + console.error("Error removing file.", error); + }); + }); diff --git a/public/index.html b/public/index.html index c81358086..debb72bfe 100644 --- a/public/index.html +++ b/public/index.html @@ -9,68 +9,97 @@ rel="preload" as="style" onload="this.rel = 'stylesheet'" - href="reset.css" + href="/reset.css" /> - + +
    -

    ๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

    - -
    -
      -
    • ์˜ค๋Š˜๋„ ํž˜์ฐจ๊ฒŒ!๐Ÿ˜
      • -
      • -
    -
    +

    ๐Ÿ™‹โ€โ™‚๏ธ---logo--- ๐Ÿ™‹โ€โ™€๏ธ

    +
    + +
    -
    ์ด๋ฏธ์ง€
    -
    ์ด๋ฆ„
    -
    ์†Œ์†/์ง๊ธ‰
    -
    ๋‚ด์„ ๋ฒˆํ˜ธ
    -
    ์ƒ์„ธ์ •๋ณด
    +
    ์ด๋ฏธ์ง€
    +
    ์ด๋ฆ„
    +
    ์†Œ์†/์ง๊ธ‰
    +
    ๋‚ด์„ ๋ฒˆํ˜ธ
    +
    ์ƒ์„ธ์ •๋ณด
    +
    +
    +
    +
    +
    - - - - + + - - - + + + + diff --git a/public/keyframes.css b/public/keyframes.css new file mode 100644 index 000000000..e69de29bb diff --git a/public/login/login.html b/public/login/login.html index 2c0f13ec8..17e2e4858 100644 --- a/public/login/login.html +++ b/public/login/login.html @@ -1,69 +1,123 @@ - - - - - ๐Ÿ™‹โ€โ™€๏ธemployee picture - - - - - - - -
    -

    ๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

    - -
    -
      -
    • ์˜ค๋Š˜๋„ ํž˜์ฐจ๊ฒŒ!๐Ÿ˜
      • -
      • -
    -
    - -
    - - -
    -

    ํšŒ์›๊ฐ€์ž…

    - - - -
    - + +
    +
    + +
    -
    - -
    -

    ๋กœ๊ทธ์ธ

    - - -
    - + +
    +
    + + +
    +
    + +
    -
    - - - - - - + +
    +
    + + + +
    +
    + +
    +
    +
    - - \ No newline at end of file + + + + + + + + + diff --git a/public/login/login.js b/public/login/login.js index 87fe07e4b..b7b118dcb 100644 --- a/public/login/login.js +++ b/public/login/login.js @@ -1,33 +1,63 @@ -const joinBtn=document.getElementById('join-btn') -const loginBtn=document.getElementById('login-btn') +const joinBtn = document.getElementById("join-btn"); +const loginBtn = document.getElementById("login-btn"); //๊ฐ€์ž…ํ•˜๊ธฐ ๋ฒ„ํŠผ ๋ˆ„๋ฅด๋ฉด -joinBtn.addEventListener("click",function(){ - const joinName = document.getElementById("join__name").value; - const joinEmail = document.getElementById("join__email").value; - const joinPw = document.getElementById("join__pw").value; - - firebase.auth().createUserWithEmailAndPassword(joinEmail,joinPw).then((result)=>{ - console.log(result); - console.log(result.user); - result.user.updateProfile( {displayName : joinName} ) - - }) -}); +joinBtn.addEventListener("click", function () { + const joinName = document.getElementById("join__name").value; + const joinEmail = document.getElementById("join__email").value; + const joinPw = document.getElementById("join__pw").value; + + firebase + .auth() + .createUserWithEmailAndPassword(joinEmail, joinPw) + .then((result) => { + const userInfo = { + name: joinName, + email: joinEmail, + }; + db.collection("user") + .doc(result.user.uid) + .set(userInfo) + .then(() => { + window.location.reload(true); + alert("ํšŒ์›๊ฐ€์ž…์ด ์™„๋ฃŒ๋˜์—ˆ์Šต๋‹ˆ๋‹ค.:)"); + + // console.log(result); + // console.log(result.user); + result.user.updateProfile({ displayName: joinName }); + }); + }); +}); //๋กœ๊ทธ์ธ ๋ฒ„ํŠผ ๋ˆ„๋ฅด๋ฉด -loginBtn.addEventListener("click",function(){ - const loginEmail = document.getElementById("login__email").value; - const loginPw = document.getElementById("login__pw").value; - - firebase.auth().signInWithEmailAndPassword(loginEmail,loginPw).then((result)=>{ - alert('๋กœ๊ทธ์ธ ์™„๋ฃŒ!') - window.location.href="/index.html" - document.querySelector('.user-welcome').classList.remove('none'); - document.querySelector('.logout').classList.remove('none'); - document.querySelector('.login').classList.add('none'); - }) +loginBtn.addEventListener("click", function () { + const loginEmail = document.getElementById("login__email").value; + const loginPw = document.getElementById("login__pw").value; + + firebase + .auth() + .signInWithEmailAndPassword(loginEmail, loginPw) + .then((result) => { + alert("๋กœ๊ทธ์ธ ์™„๋ฃŒ!"); + window.location.href = "/index.html"; + document.querySelector(".user-welcome").classList.remove("none"); + document.querySelector(".logout").classList.remove("none"); + document.querySelector(".login").classList.add("none"); + }); }); +//๋กœ๊ทธ์ธ, ํšŒ์›๊ฐ€์ž… ํƒญ +const tabBtn = document.querySelectorAll(".tab-btn"); +const tabCon = document.querySelectorAll(".tab-con"); +for (let i = 0; i < tabBtn.length; i++) { + tabBtn[i].addEventListener("click", function (e) { + for (let j = 0; j < tabBtn.length; j++) { + tabBtn[j].classList.remove("act"); + tabCon[j].classList.remove("show"); + } + tabBtn[i].classList.add("act"); + tabCon[i].classList.add("show"); + }); +} diff --git a/public/login_ck.js b/public/login_ck.js new file mode 100644 index 000000000..29e5ec81e --- /dev/null +++ b/public/login_ck.js @@ -0,0 +1,88 @@ + + +if (localStorage.getItem("user") != null) { + console.log("ํ˜„์žฌ๋กœ๊ทธ์ธ์ค‘"); + //๋กœ์ปฌ์Šคํ† ๋ฆฌ์ง€์—์„œ ์œ ์ €์ •๋ณด ๊ฐ€์ ธ์˜ค๊ธฐ + const localDataUser = localStorage.getItem("user"); + const localName = JSON.parse(localDataUser).displayName; + document.querySelector("#user-name").innerHTML = localName + "๋‹˜"; + document.querySelector(".welcome__logout").classList.remove("none"); + document.querySelector(".welcome__login").classList.add("none"); + document.querySelectorAll(".delete-btn").forEach(el => { + el.addEventListener("click", deleteBtnClick); + }); +} else { + console.log("ํ˜„์žฌ๋กœ๊ทธ์•„์›ƒ์ค‘"); + localStorage.removeItem("user"); + document.querySelector(".welcome__logout").classList.add("none"); + document.querySelector(".welcome__login").classList.remove("none"); + document.querySelector(".delete-btn").addEventListener("click", alertLogin); +} + + +//๋กœ๊ทธ์ธ ์ƒํƒœ ํ™•์ธ. ๋กœ๊ทธ์ธ,๋กœ๊ทธ์•„์›ƒ,์ƒˆ๋กœ๊ณ ์นจ ๋“ฑ ์œ ์ € ์ธ์ฆ์ƒํƒœ ๋ณ€๊ฒฝ์‹œ๋งˆ๋‹ค ์‹คํ–‰๋จ +firebase.auth().onAuthStateChanged((user) => { + if (user) { + console.log(user); + console.log(user.displayName + "๋กœ๊ทธ์ธ ์™„๋ฃŒ"); + document.querySelector(".welcome__logout").classList.remove("none"); + document.querySelector(".welcome__login").classList.add("none"); + + //๋กœ์ปฌ์Šคํ† ๋ฆฌ์ง€์— ์œ ์ €์ •๋ณด ์ €์žฅ + localStorage.setItem("user", JSON.stringify(user)); + // userUid = user.uid; + // console.log(userUid) + } else if ((user = null)) { + localStorage.removeItem("user"); + document.querySelector(".welcome__logout").classList.add("none"); + document.querySelector(".welcome__login").classList.remove("none"); + } +}); + +const logoutBtn = document.getElementById("logout-btn"); +//๋กœ๊ทธ์•„์›ƒ ๋ฒ„ํŠผ ๋ˆ„๋ฅด๋ฉด +logoutBtn.addEventListener("click", function () { + firebase.auth().signOut(); + localStorage.removeItem("user"); + alert("๋กœ๊ทธ์•„์›ƒ ์™„๋ฃŒ!"); + document.querySelector(".welcome__logout").classList.add("none"); + document.querySelector(".welcome__login").classList.remove("none"); +}); + + +function deleteBtnClick() { + //db์ •๋ณด ์‚ญ์ œ + db.collection("member") + .doc(queryString.get("id")) + .delete() + .then(() => { + alert("์‚ญ์ œ๋˜์—ˆ์Šต๋‹ˆ๋‹ค."); + window.location.href = "/"; + + //์ด๋ฏธ์ง€ ์‚ญ์ œ + var deleteFilename = document.getElementById("image-delete").value; + var deleteRef = storage.refFromURL(deleteFilename); + // console.log(deleteRef) + + deleteRef + .delete() + .then(function () { + console.log("File deleted successfully"); + }) + .catch(function (error) { + console.error("Error removing file.", error); + }); + }); + } + + function editBtnClick(){ + window.location.href='/edit/edit.html?id='+ queryString.get('id') +} + + + function alertLogin(){ + alert('๋กœ๊ทธ์ธ์ด ํ•„์š”ํ•ฉ๋‹ˆ๋‹ค!') + } + + + diff --git a/public/main.css b/public/main.css index 68b152a22..81970f3cd 100644 --- a/public/main.css +++ b/public/main.css @@ -1,151 +1,410 @@ +/*common */ + +body { + font-size: 14px; +} +* { + font-family: "NanumSquareNeo"; +} + +a, +button { + cursor: pointer; +} + +:root { + --sky: #78a4b8; + --navy: #7888a9; + --yellow: #ffdf81; +} + h1 { text-align: center; - font-size: 2.6rem; - margin: 4rem auto; + font-size: 2rem; + margin: 3rem auto; } h2 { text-align: center; font-size: 1.4rem; width: 100%; - margin: 1rem; + padding: 20px; + box-sizing: border-box; + border-radius: 0; + color: #575279; + border: 1px solid #575279; + border-left: none; + border-right: none; } -.none{display: none;} - -.txt-l { - text-align: left; -} -.txt-r { - text-align: right; +.none, +main .profile_title { + display: none; } + .txt-c { text-align: center; } -.ml-20 { - margin-left: 20px; + +.mr1 { + margin: 1rem auto; } + .pos-r { position: relative; } -.nav ul { + +/* layout */ +.nav .gnb { display: flex; - justify-content: space-around; + justify-content: flex-start; + align-items: center; + flex-wrap: wrap; width: 100%; - margin: 40px auto; + gap: 20px; + margin: 1.4rem auto; + font-size: 1rem; } -.container { +.gnb__welcome { display: flex; - flex-direction: column; - justify-content: center; - align-items: flex-start; - margin-top: 2rem; + justify-content: flex-end; + width: 100%; + background: #183153; + color: #fff; + padding: 0 0 0 10px; + position: relative; + text-align: right; } -.input-col { - width: 50%; + +.gnb__welcome button { + position: relative; + left: 0px; +} +.gnb li a { + font-weight: 800; + color: #183153; +} + +.search { + text-align: center; +} +section, +main, +header { + width: 90%; margin: 0 auto; - min-width: 300px; + max-width: 900px; +} +.input-col { + width: 100%; + max-width: 500px; display: flex; flex-direction: column; justify-content: center; align-items: flex-start; - margin-top: 2rem; gap: 0.5rem; + margin: 40px auto; } +.btn { + font-weight: bold; + width: 100%; + height: 50px; + border-radius: 5px; + border: 1px solid #000; + background: var(--yellow); +} +.btn-del { + background: #ffeaea; +} + +.btn-area, +.btn-area-full { + display: flex; + justify-content: space-between; + align-items: center; + flex-wrap: nowrap; + gap: 1%; + width: 100%; +} +.btn-area .btn { + width: 50%; +} +.btn-area-full .btn { + display: block; + width: 100%; +} + +.btn-area .btn:nth-child(1) { + background: var(--yellow); + color: #000; +} +.btn-area .btn:nth-child(2) { + background: #ddd; + color: #000; +} + +.btn-s { + overflow: hidden; + position: relative; + display: inline-block; + background: #78a4b8; + color: #fff; + border-radius: 5px; + transition: all 0.5s ease; + border: 1px solid #78a4b8; + padding: 5px 10px; + transform: translateY(8px); +} + +.btn-s:hover { + background-color: #78a4b8; + color: #fff; + border-color: #78a4b8; + box-shadow: 0px 3px 3px #b5b8d1; +} + +/* main / detail */ .profile { - font-size: 1rem; line-height: 1.6rem; + box-sizing: border-box; } .profile .name { font-weight: bold; - font-size: 1.4rem; + font-size: 1rem; line-height: 3rem; } -main .profile, -main .profile_title{ + +main .profile .tel::before { + content: "๐Ÿ“ž"; + display: inline-block; + transform: rotate(10deg); +} + +main .profile { + border: 1px solid #000; + border-radius: 20px; + padding: 1rem; width: 100%; - display:grid; - grid-template-columns: 20% 20% 20% 20% 20%; - margin:10px auto; - text-align: center;align-items: center; + display: grid; + grid-template-columns: 100%; + margin: 1.4rem auto; + text-align: center; + align-items: center; + box-shadow: 5px 8px 1px var(--navy); + background: #fff; + opacity: 0; + transition: all 1s; + scale: 0.5; + transition-delay: 0.3s; + position: relative; +} +main .profile:first-child { + margin-top: 0; } +/* main .profile .ck{position: absolute;} */ +main .profile__dl { + width: 100%; + display: grid; + grid-template-columns: 50% 50%; + grid-template-rows: 20% 20% 20% 40%; + align-items: center; +} +main .ck { + margin-left: -10px; + display: none; +} + +main .profile.active { + opacity: 1; + scale: 1; + background: #fffcf3; +} + +main .profile:nth-child(odd) { + box-shadow: 5px 8px 1px #adbbd5; + background: #f9ffff; +} .thumbnail { width: 100%; - height: 100%; - margin:0 auto; + margin: 0 auto; border-radius: 10px; background-size: cover; background-position: center; } -main .thumbnail{ max-width: 80px; height: 100%;} -#detail .profile{display:flex;flex-direction: row;flex-wrap: wrap; line-height: 2rem;} -#detail .profile .col-1{width:30%;} -#detail .profile .col-2{width:70%;} +main .ck, +main .thumbnail { + grid-row: span 4; +} +main .thumbnail { + max-width: 130px; + max-height: 130px; + height: 100%; + background-position: center; + border-radius: 100px; +} -#detail .thumbnail{ max-width: 200px;} +/* upload, edit input */ +.image-container { + width: 100%; + margin: 0 auto; + text-align: center; + background: #f2f5fb; + border-radius: 10px; + border: 1px solid #ccc; + padding: 10px; + box-sizing: border-box; +} +.image-container img { + width: 100%; +} + +#upload .image-container { + border-radius: 0; +} + +#detail .profile { + display: flex; + flex-direction: column; + line-height: 2rem; + box-sizing: border-box; +} +#detail .profile .col-1 { + border: 1px solid var(--navy); + border-radius: 10px; + margin-top: 1rem; +} +#detail .thumbnail { + width: 100%; + height: 28vh; +} .form-input, .form-text { width: 100%; - margin: 0 auto 0.4rem; - height: 30px; + height: 35px; + border-radius: 5px; + box-sizing: border-box; + border: 1px solid #ccc; } + .upload-area .form-file { - z-index: 0; - position: absolute; - top: 10%; - left: 32px; + display: none; } .upload-area .custom-upload { - background: #797979; + background: var(--navy); color: #fff; - padding: 10px; - border-radius: 5px; + padding: 1.5rem 0; + border-radius: 5px 0 0 5px; cursor: pointer; + width: 30%; position: relative; - z-index: 1; + box-sizing: border-box; + border-right: 1px solid #000; +} +.upload-area .custom-upload span { + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + width: 100%; + text-align: center; + line-height: 1.2rem; + font-size: 0.8rem; +} + +#upload .file-data { + position: absolute; } -.custom-upload:hover { - background: #b1b1b1; +#edit .filedata { + font-size: 0.5rem; + position: absolute; + right: 5%; + bottom: 5%; + transform: translateY(-50%); + color: #fff; } -.upload-area, -.btn-area { + +.upload-area { width: 100%; margin: 0.5rem 0; + box-sizing: border-box; } .upload-area { display: flex; justify-content: flex-start; + background: #fff; + border-radius: 5px; + border: 1px solid #000; } -.btn-area { + +.edit__del { + position: relative; +} + +.edit__del input[type="text"] { + display: none; +} + +.tab-wrap { + max-width: 500px; +} + +.tab-wrap .btn { + border-color: var(--navy); + color: #333a49; +} +.tab-wrap .tab-btn-area { display: flex; - justify-content: space-between; - align-items: center; - flex-wrap: nowrap; + position: relative; } -.btn { +.tab-wrap .tab-btn { + text-align: center; + background: transparent; +} +.tab-wrap .tab-btn { + border: none; + border-bottom: 2px solid var(--navy); width: 100%; height: 50px; - background: #183153; - border-radius: 5px; - color: #fff; - border: none; } -.btn:hover { - background: #3e4e6d; + +.tab-wrap .tab-con { + display: none; + width: 100%; + margin: 0px auto; } +.tab-wrap .tab-btn.act { + background-color: var(--sky); + border: 1px solid var(--navy); + border-bottom: none; + border-radius: 10px 10px 0 0; + color: #fff; +} -.user-welcome{ +.tab-con.show { display: flex; - align-items: center; - justify-content: flex-end; - gap:1rem; - padding:0 1.5rem; -} \ No newline at end of file + flex-direction: column; +} +.tab-wrap .input-col { + margin: 40px auto 20px; +} +.tab-wrap .form-input { + height: 45px; +} + +/* ์ˆจ๊น€ */ +#gnb__delete-btn, +.ck { + display: none; +} +.nav .gnb li:nth-child(1) .nav .gnb li:nth-child(2) { + width: 20%; +} +/* .nav .gnb li.welcome__login, .nav .gnb li.welcome__logout{width: 100%;} */ diff --git a/public/main.js b/public/main.js index 99da3cfe1..fdf43bb94 100644 --- a/public/main.js +++ b/public/main.js @@ -1,18 +1,74 @@ +// import { firebaseConfig } from '/firebase.js'; +const firebaseConfig = { + apiKey: "AIzaSyBRDdAmcnRV3_Ui_Md_vhbyp9-9-eXqzbw", + authDomain: "javascript-picture.firebaseapp.com", + projectId: "javascript-picture", + storageBucket: "javascript-picture.appspot.com", + messagingSenderId: "487659103783", + appId: "1:487659103783:web:e98479de1137818dfa9002", + measurementId: "G-0RSTQFT7N8", +}; - db.collection('member').get().then((๊ฒฐ๊ณผ)=>{ +// Initialize Firebase +firebase.initializeApp(firebaseConfig); + +const db = firebase.firestore(); +const storage = firebase.storage(); +const randomNum = Math.round(Math.random() * 9999); + +//url query string์— ์žˆ๋˜ ์ž๋ฃŒ๋ฅผ object๋กœ ๋ณ€ํ™˜ +const queryString = new URLSearchParams(window.location.search); +queryString.get("id"); + +db.collection("member") + .get() + .then((๊ฒฐ๊ณผ) => { console.log(๊ฒฐ๊ณผ); - ๊ฒฐ๊ณผ.forEach((doc)=>{ + ๊ฒฐ๊ณผ.forEach((doc) => { console.log(doc.data()); - var template = `
    -
    -
    ${doc.data().name}
    -
    ${doc.data().team} ${doc.data().rank}
    -
    ${doc.data().ext}
    -
    ์ƒ์„ธ

    -

    ` - const wrap = document.querySelector('.container') - wrap.insertAdjacentHTML('beforeend',template) - - }) - - }) \ No newline at end of file + + const template = ` + + `; + + const wrap = document.querySelector(".basic-container"); + wrap.insertAdjacentHTML("beforeend", template); + }); + }) + .then(() => { + // intersectionObserver + + const io = new IntersectionObserver((entries, observer) => { + entries.forEach((entry) => { + // ์ฃผ์‹œ ๋Œ€์ƒ์ด ๋ทฐํฌํŠธ ์•ˆ์œผ๋กœ ๋“ค์–ด์˜ค๋ฉด active ํด๋ž˜์Šค ์ถ”๊ฐ€ + if (entry.intersectionRatio > 0) { + entry.target.classList.add("active"); + } + // ์•„๋‹ˆ๋ฉด active ํด๋ž˜์Šค ์ œ๊ฑฐ + else { + entry.target.classList.remove("active"); + } + }); + }); + + // ์ฃผ์‹œ ๋Œ€์ƒ ์„ ์–ธ, ์ฃผ์‹œ ์‹œ์ž‘ + const boxElList = document.querySelectorAll(".profile"); + boxElList.forEach((el) => { + io.observe(el); + }); + }); diff --git a/public/media.css b/public/media.css new file mode 100644 index 000000000..c053d0b0a --- /dev/null +++ b/public/media.css @@ -0,0 +1,98 @@ +@charset "utf-8"; + +/* Mobile Device */ +@media (min-width: 576px) { + /* layout */ + header, + main, + section { + max-width: 80%; + margin: 0 auto; + } + .nav .gnb { + flex-wrap: nowrap; + justify-content: space-between; + } + .gnb__welcome { + display: flex; + justify-content: flex-end; + width: initial; + } + .tab-wrap { + max-width: 500px; + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + } + + h1 { + font-size: 2.8rem; + } + + /* :hover */ + main .profile_title { + display: block; + } + main .profile { + width: 100%; + margin: 3rem auto; + } + main .profile_title { + background: #ffffde; + padding: 10px; + box-sizing: border-box; + margin: 3.4rem auto 1.4rem; + } + + /* ์ฒดํฌ๋ฐ•์Šค ์ƒ๊ธฐ๋ฉด ์ฃผ์„ ํ•ด์ œ */ + /* main .profile{ grid-template-columns: 10% 90%;} */ + main .profile_title, + main .profile__dl { + display: grid; + align-items: center; + text-align: center; + grid-template-columns: 20% 20% 20% 20% 20%; + grid-template-rows: 100%; + } + main .profile .thumbnail { + width: 100%; + height: 130px; + } + main .profile .btn-s { + padding: 10px; + } + main .profile .btn-s:hover { + transform: translateY(0px); + } + .profile .name { + font-size: 1.4rem; + } + + #detail .profile { + flex-direction: row; + flex-wrap: nowrap; + gap: 5%; + } + #detail .profile .col-1 { + width: 30%; + } + #detail .profile .col-2 { + width: 70%; + } + + .custom-upload:hover { + background: #ffc107; + color: #183153; + } +} + +/* Tablet & Desktop Device */ +@media all and (min-width: 768px) { + header, + section, + main { + max-width: 800px; + margin: 0 auto; + } +} diff --git a/public/preview.js b/public/preview.js new file mode 100644 index 000000000..803c29e0f --- /dev/null +++ b/public/preview.js @@ -0,0 +1,32 @@ + +function readImage(input) { + // ์ธํ’‹ ํƒœ๊ทธ์— ํŒŒ์ผ์ด ์žˆ๋Š” ๊ฒฝ์šฐ + if (input.files && input.files[0]) { + // FileReader ์ธ์Šคํ„ด์Šค ์ƒ์„ฑ + const reader = new FileReader(); + // ์ด๋ฏธ์ง€๊ฐ€ ๋กœ๋“œ๊ฐ€ ๋œ ๊ฒฝ์šฐ + reader.onload = (e) => { + const previewImage = document.getElementById("preview-image"); + previewImage.src = e.target.result; + }; + // reader๊ฐ€ ์ด๋ฏธ์ง€ ์ฝ๋„๋ก ํ•˜๊ธฐ + reader.readAsDataURL(input.files[0]); + } +} + +// input file change ์ด๋ฒคํŠธ ๋ถ€์—ฌ +const inputImage = document.getElementById("image"); +inputImage.addEventListener("change", (e) => { + let file = e.target.files[0]; + let fileName = file.name; + const fileData = document.querySelector(".filedata"); + + if (fileName) { + fileData.style.display = "block"; + } + fileData.innerHTML = fileName; + console.log(file, fileName); + + readImage(e.target); + +}); \ No newline at end of file diff --git a/public/upload/upload.html b/public/upload/upload.html index 137274a5a..43cf9bf97 100644 --- a/public/upload/upload.html +++ b/public/upload/upload.html @@ -1,70 +1,122 @@ - - - - - ๐Ÿ™‹โ€โ™€๏ธemployee picture - - - - - - +
    + + +
    + + +
    +
    -
    -

    ๐Ÿ™‹โ€โ™€๏ธ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค๐Ÿ™‹โ€โ™‚๏ธ

    - -
    -
      -
    • ์˜ค๋Š˜๋„ ํž˜์ฐจ๊ฒŒ!๐Ÿ˜
      • -
      • -
    -
    - -
    - -
    -

    ์ง์› ์ •๋ณด ์—…๋กœ๋“œ

    - - - - - - - - -
    - - -
    -
    - +
    + +
    -
    - - - - - - - +
    - + + + + + + + + - - - \ No newline at end of file + + + diff --git a/public/upload/upload.js b/public/upload/upload.js index 1b52c09c7..fcc070337 100644 --- a/public/upload/upload.js +++ b/public/upload/upload.js @@ -1,23 +1,25 @@ - //๋น„๋กœ๊ทธ์ธ์‹œ ์—…๋กœ๋“œ ๋ถˆ๊ฐ€ if (localStorage.getItem("user") == null) { - document.querySelectorAll('input').forEach(el => { + document.querySelectorAll("input").forEach((el) => { el.addEventListener("focus", function () { alert("๋กœ๊ทธ์ธ ํ›„ ์—…๋กœ๋“œ ๊ฐ€๋Šฅํ•ฉ๋‹ˆ๋‹ค!"); this.blur(); }); - }) + }); } -// ์˜ฌ๋ฆฌ๊ธฐ ๋ฒ„ํŠผ์„ ๋ˆ„๋ฅด๋ฉด ๋ฐฉ๊ธˆ๋งŒ๋“  ์ œ๋ชฉ, ๋‚ด์šฉ, ๊ฐ€๊ฒฉ ์ธํ’‹์— ์ž…๋ ฅํ•œ ์ •๋ณด db์ €์žฅ +// ์˜ฌ๋ฆฌ๊ธฐ ๋ฒ„ํŠผ์„ ๋ˆ„๋ฅด๋ฉด ์ž…๋ ฅํ•œ ์ •๋ณด db์ €์žฅ document.getElementById("send").addEventListener("click", function () { - if (localStorage.getItem("user") != null) { //์Šคํ† ๋ฆฌ์ง€์— ์ด๋ฏธ์ง€ ์ €์žฅ - let file = document.querySelector("#image").files[0]; + + const file = document.querySelector("#image").files[0]; const storageRef = storage.ref(); - let imgPath = storageRef.child("image/" + file.name); - let upload = imgPath.put(file); + const imgPath = storageRef.child( + "image/" + Math.round(Math.random() * 9999) + file + ); + + const upload = imgPath.put(file); //์ด๋ฏธ์ง€ ์—…๋กœ๋“œ ์„ฑ๊ณต,์‹คํŒจ ํ™•์ธ upload.on( @@ -34,17 +36,17 @@ document.getElementById("send").addEventListener("click", function () { //์ด๋ฏธ์ง€ url ๊ฐ€์ ธ์˜ค๊ธฐ console.log("์—…๋กœ๋“œ๋œ ๊ฒฝ๋กœ๋Š”", url); - let saveData = { - name : document.getElementById("name").value, - ext : document.getElementById("tel").value, - team : document.getElementById("team").value, - rank : document.getElementById("rank").value, + const saveData = { + name: document.getElementById("name").value, + ext: document.getElementById("tel").value, + team: document.getElementById("team").value, + rank: document.getElementById("rank").value, phone: document.getElementById("phone").value, - email : document.getElementById("email").value, + email: document.getElementById("email").value, memo: document.getElementById("memo").value, img: url, uid: JSON.parse(localStorage.getItem("user")).uid, - username: JSON.parse(localStorage.getItem("user")).displayName + username: JSON.parse(localStorage.getItem("user")).displayName, }; console.log(name, phone, email, rank, memo); @@ -61,7 +63,7 @@ document.getElementById("send").addEventListener("click", function () { }); } ); - }else{ + } else { alert("๋กœ๊ทธ์ธ ํ›„ ์—…๋กœ๋“œ ๊ฐ€๋Šฅํ•ฉ๋‹ˆ๋‹ค!"); } }); From 7237b5be8b68fa40f023fcaf80bf1540e7c0f6a4 Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Fri, 18 Aug 2023 15:12:21 +0900 Subject: [PATCH 15/34] Docs:Add firebase.js --- public/detail/detail.html | 4 ---- public/firebase.js | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 public/firebase.js diff --git a/public/detail/detail.html b/public/detail/detail.html index 8bd1c196d..4a36b161d 100644 --- a/public/detail/detail.html +++ b/public/detail/detail.html @@ -65,19 +65,15 @@

    ์ƒ์„ธ์ •๋ณด

    diff --git a/public/firebase.js b/public/firebase.js new file mode 100644 index 000000000..9fb83327f --- /dev/null +++ b/public/firebase.js @@ -0,0 +1,21 @@ +const firebaseConfig = { + apiKey: "AIzaSyBRDdAmcnRV3_Ui_Md_vhbyp9-9-eXqzbw", + authDomain: "javascript-picture.firebaseapp.com", + projectId: "javascript-picture", + storageBucket: "javascript-picture.appspot.com", + messagingSenderId: "487659103783", + appId: "1:487659103783:web:e98479de1137818dfa9002", + measurementId: "G-0RSTQFT7N8" + }; + +// Initialize Firebase +firebase.initializeApp(firebaseConfig) ; + +const db = firebase.firestore(); +const storage = firebase.storage(); +const randomNum = Math.round(Math.random() * 9999); + +//url query string์— ์žˆ๋˜ ์ž๋ฃŒ๋ฅผ object๋กœ ๋ณ€ํ™˜ +const queryString = new URLSearchParams(window.location.search); +queryString.get('id') + From e1fe1003e49469108923682c92f81ed00c1c57c3 Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Fri, 18 Aug 2023 21:25:37 +0900 Subject: [PATCH 16/34] Feat:Add loading page --- public/loading.css | 131 +++++++++++++++++++++++++++++++++++++++++++++ public/loading.js | 11 ++++ 2 files changed, 142 insertions(+) create mode 100644 public/loading.css create mode 100644 public/loading.js diff --git a/public/loading.css b/public/loading.css new file mode 100644 index 000000000..0e1140db1 --- /dev/null +++ b/public/loading.css @@ -0,0 +1,131 @@ +@charset "utf-8"; + +@font-face { + font-family: 'DungGeunMo'; + src: url("https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_six@1.2/DungGeunMo.woff") format('woff'); + font-weight: normal; + font-style: normal; +} + +* { + box-sizing: border-box; +} +#wrap { + position: relative; +} + +.loading { + position: fixed; + width: 100vw; + height: 100vh; + top: 0; + left: 0; + display: flex; + align-items: center; + background-color: rgb(255, 235, 248); + z-index: 10; + +} + +#loading > div { + margin: 10px auto; + border: 10px solid #aeaefa; + border-radius: 20px; + background-color: rgb(252, 251, 255); + width: 300px; + max-width: 800px; + margin: 0px auto; + max-height: 80vh; + padding: 1rem; + display: inline-block; + text-align: center; + box-shadow: 10px 10px #a4ddd2; + box-sizing: border-box; +} + +#loading .loading_txt { + animation: loading 2.5s infinite step-end; + text-align: center; + color: #aeaefa; + display: block; + font-family: "DungGeunMo"; + font-weight: bold; + font-size: 24px; + letter-spacing: 0.5rem; + margin: 2rem auto; + text-transform: uppercase; +} +#loading .loading_txt .rotate { + display: inline-block; + animation-name: rotate; + animation-duration: 6s; + animation-iteration-count: infinite; + text-shadow: 3px 3px #ffeebc; +} +#loading .loading_txt .hi { + display: inline-block; + animation-duration: 1.5s; + animation-name: hi; + animation-iteration-count: infinite; + text-shadow: 3px 3px #ffeebc; + -webkit-text-stroke: 0.5px #fffae6; +} +#loading .loading_txt:first-child { + animation-delay: 0s; +} + +#loading .loading_txt:nth-child(2) { + animation-delay: 0.1s; +} + +#loading .loading_txt:nth-child(3) { + animation-delay: 0.2s; +} +#loading .loading_txt:nth-child(4) { + animation-delay: 0.3s; +} +#loading .loading_txt:nth-child(5) { + animation-delay: 0.4s; +} +#loading .loading_txt:nth-child(6) { + animation-delay: 0.5s; +} + +@keyframes loading { + 0% { + text-shadow: 1px 1px #fff, 2px 2px #a4ddd2, 3px 3px #a4ddd2, 4px 4px #a4ddd2, + 5px 5px #a4ddd2, 6px 6px #a4ddd2; + } + 60% { + text-shadow: none; + } +} +@keyframes hi { + 0% { + transform: rotate(0deg); + } + 25% { + transform: rotate(-10deg); + } + 50% { + transform: rotate(15deg); + } + 75% { + transform: rotate(-10deg); + } + 100% { + transform: rotate(0deg); + } +} + +@keyframes rotate { + 0% { + transform: rotate(0deg); + } + 45% { + transform: rotate(360deg); + } + 90% { + transform: rotate(0deg); + } +} diff --git a/public/loading.js b/public/loading.js new file mode 100644 index 000000000..6bc49d953 --- /dev/null +++ b/public/loading.js @@ -0,0 +1,11 @@ +window.onload = function () { + setTimeout(()=>{ + loading.style.opacity = "0"; + loading.style.transform = "scale(0)"; + loading.style.transition='all 1s'; + + },1200); +} + + + From 3b15ad8449a718ddf9d327001252aedec015a3eb Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Fri, 18 Aug 2023 21:29:42 +0900 Subject: [PATCH 17/34] Feat: Add loading page --- public/index.html | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/public/index.html b/public/index.html index debb72bfe..a704b367f 100644 --- a/public/index.html +++ b/public/index.html @@ -11,6 +11,12 @@ onload="this.rel = 'stylesheet'" href="/reset.css" /> + + + +
    + + +
    +
    +

    ....๐Ÿ™‹....

    +

    ....๋กœ....

    +

    ....์˜ค....

    +

    ....์˜ค....

    +

    ....๋”ฉ....

    +

    ....๐ŸŒž....

    +
    +

    ๐Ÿ™‹โ€โ™‚๏ธ---logo--- ๐Ÿ™‹โ€โ™€๏ธ

    - + @@ -98,7 +119,7 @@
    ์ƒ์„ธ์ •๋ณด
    src="https://kit.fontawesome.com/3e1fab0201.js" crossorigin="anonymous" > - + From 45ec51afc596c51c19d821ae0c6320186f284d2a Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Fri, 18 Aug 2023 21:30:28 +0900 Subject: [PATCH 18/34] Fix:login_edit/delete --- public/detail/detail.js | 6 ++++++ public/edit/edit.js | 6 ++++++ public/login/login.js | 5 ++++- public/login_ck.js | 5 +---- public/upload/upload.js | 8 +++++++- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/public/detail/detail.js b/public/detail/detail.js index a866cbb90..c809a9ea7 100644 --- a/public/detail/detail.js +++ b/public/detail/detail.js @@ -31,6 +31,12 @@ db.collection("member") if (localStorage.getItem("user") != null) { document.querySelector(".edit-btn").addEventListener("click", editBtnClick); + document.querySelectorAll(".delete-btn").forEach(el => { + el.addEventListener("click", deleteBtnClick); +}); + } else { document.querySelector(".edit-btn").addEventListener("click", alertLogin); + document.querySelector(".delete-btn").addEventListener("click", alertLogin); + } diff --git a/public/edit/edit.js b/public/edit/edit.js index 24af1ed23..48444e3b2 100644 --- a/public/edit/edit.js +++ b/public/edit/edit.js @@ -90,3 +90,9 @@ document console.error("Error removing file.", error); }); }); + +// ์‚ญ์ œ + document.querySelectorAll(".delete-btn").forEach(el => { + el.addEventListener("click", deleteBtnClick); + }); + diff --git a/public/login/login.js b/public/login/login.js index b7b118dcb..bd9766d89 100644 --- a/public/login/login.js +++ b/public/login/login.js @@ -44,7 +44,10 @@ loginBtn.addEventListener("click", function () { document.querySelector(".user-welcome").classList.remove("none"); document.querySelector(".logout").classList.remove("none"); document.querySelector(".login").classList.add("none"); - }); + }).catch(function(error) { + console.error("Error removing file.", error); + alert('๋กœ๊ทธ์ธ์— ์‹คํŒจํ•˜์˜€์Šต๋‹ˆ๋‹ค. \n '+error.message) + }); }); //๋กœ๊ทธ์ธ, ํšŒ์›๊ฐ€์ž… ํƒญ diff --git a/public/login_ck.js b/public/login_ck.js index 29e5ec81e..378e9bd34 100644 --- a/public/login_ck.js +++ b/public/login_ck.js @@ -8,15 +8,11 @@ if (localStorage.getItem("user") != null) { document.querySelector("#user-name").innerHTML = localName + "๋‹˜"; document.querySelector(".welcome__logout").classList.remove("none"); document.querySelector(".welcome__login").classList.add("none"); - document.querySelectorAll(".delete-btn").forEach(el => { - el.addEventListener("click", deleteBtnClick); - }); } else { console.log("ํ˜„์žฌ๋กœ๊ทธ์•„์›ƒ์ค‘"); localStorage.removeItem("user"); document.querySelector(".welcome__logout").classList.add("none"); document.querySelector(".welcome__login").classList.remove("none"); - document.querySelector(".delete-btn").addEventListener("click", alertLogin); } @@ -82,6 +78,7 @@ function deleteBtnClick() { function alertLogin(){ alert('๋กœ๊ทธ์ธ์ด ํ•„์š”ํ•ฉ๋‹ˆ๋‹ค!') + window.location.href='login/login.html' } diff --git a/public/upload/upload.js b/public/upload/upload.js index fcc070337..cdb16282b 100644 --- a/public/upload/upload.js +++ b/public/upload/upload.js @@ -3,6 +3,7 @@ if (localStorage.getItem("user") == null) { document.querySelectorAll("input").forEach((el) => { el.addEventListener("focus", function () { alert("๋กœ๊ทธ์ธ ํ›„ ์—…๋กœ๋“œ ๊ฐ€๋Šฅํ•ฉ๋‹ˆ๋‹ค!"); + window.location.href='/login/login.html' this.blur(); }); }); @@ -54,7 +55,11 @@ document.getElementById("send").addEventListener("click", function () { db.collection("member") .add(saveData) .then((result) => { - window.location.href = "/index.html"; + console.log(result) + window.location.href = + "/detail/detail.html?id=" + saveData.uid; + // "/detail/detail.html?id=" + queryString.get("id"); + // window.location.href = "/index.html"; console.log(result); }) .catch((err) => { @@ -65,5 +70,6 @@ document.getElementById("send").addEventListener("click", function () { ); } else { alert("๋กœ๊ทธ์ธ ํ›„ ์—…๋กœ๋“œ ๊ฐ€๋Šฅํ•ฉ๋‹ˆ๋‹ค!"); + window.location.href='/login/login.html' } }); From 3986b80805f20af1316bf7878b442bc7caa5218b Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Fri, 18 Aug 2023 21:31:09 +0900 Subject: [PATCH 19/34] Chore:Modify design --- public/main.css | 8 +++++++- public/media.css | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/public/main.css b/public/main.css index 81970f3cd..f844b747e 100644 --- a/public/main.css +++ b/public/main.css @@ -2,6 +2,7 @@ body { font-size: 14px; + background:#fffefd; } * { font-family: "NanumSquareNeo"; @@ -69,7 +70,7 @@ main .profile_title { width: 100%; background: #183153; color: #fff; - padding: 0 0 0 10px; + padding: 0 0 0 15px; position: relative; text-align: right; } @@ -77,6 +78,11 @@ main .profile_title { .gnb__welcome button { position: relative; left: 0px; + border-radius: 3px; + border: solid #333;background:#eee; + margin-left: 10px; +} + } .gnb li a { font-weight: 800; diff --git a/public/media.css b/public/media.css index c053d0b0a..213b30c06 100644 --- a/public/media.css +++ b/public/media.css @@ -19,6 +19,7 @@ width: initial; } .tab-wrap { + margin-top: 3rem; max-width: 500px; position: absolute; left: 50%; @@ -39,7 +40,6 @@ margin: 3rem auto; } main .profile_title { - background: #ffffde; padding: 10px; box-sizing: border-box; margin: 3.4rem auto 1.4rem; From 39c6efdfb55ad9d4654eb7bb1841511b66ad8847 Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Fri, 18 Aug 2023 22:59:16 +0900 Subject: [PATCH 20/34] Add:userflow, readme --- README.md | 18 +++++++++++++++++- userflow.JPG | Bin 0 -> 53542 bytes 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 userflow.JPG diff --git a/README.md b/README.md index 3f291a0f2..c930346af 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,19 @@ # :camera: ์ง์› ์‚ฌ์ง„ ๊ด€๋ฆฌ ์„œ๋น„์Šค -์ง์›๋“ค์˜ ์‚ฌ์ง„์„ ๊ด€๋ฆฌํ•  ์ˆ˜ ์žˆ๋Š” ์‚ฌ์ง„ ๊ด€๋ฆฌ์ž ์„œ๋น„์Šค +## ์ง์›๋“ค์˜ ์‚ฌ์ง„์„ ๊ด€๋ฆฌํ•  ์ˆ˜ ์žˆ๋Š” ์‚ฌ์ง„ ๊ด€๋ฆฌ์ž ์„œ๋น„์Šค +https://javascript-picture.web.app/index.html + +ID: admin@email.com + +PW: 123456 + +- ๋น„๋กœ๊ทธ์ธ์‹œ ๋ฐ์ดํ„ฐ ์กฐํšŒ๋งŒ ๊ฐ€๋Šฅํ•ฉ๋‹ˆ๋‹ค. + +- admin@email.com์œผ๋กœ ๋กœ๊ทธ์ธ ์‹œ ๋ชจ๋“  ๋ฐ์ดํ„ฐ์˜ ๋“ฑ๋ก / ์ˆ˜์ • / ์‚ญ์ œ๊ฐ€ ๊ฐ€๋Šฅํ•ฉ๋‹ˆ๋‹ค. ๐Ÿ˜Š + +- ํšŒ์›๊ฐ€์ž…/๋กœ๊ทธ์ธ ์‹œ ์ž์‹ ์ด ์‚ฌ์ง„ ๋“ฑ๋ก ๊ฐ€๋Šฅํ•˜๋ฉฐ, ์ž‘์„ฑ์ž์™€ ๋กœ๊ทธ์ธ ํ•œ ์œ ์ €๊ฐ€ ๋™์ผ ํ•  ๊ฒฝ์šฐ์— ๋“ฑ๋กํ•œ ์‚ฌ์ง„์˜ ์ˆ˜์ •, ์‚ญ์ œ๊ฐ€ ๊ฐ€๋Šฅํ•ฉ๋‹ˆ๋‹ค. + ## [๊ตฌํ˜„๋ฒ”์œ„] - โ€œFirebase ์„œ๋น„์Šคโ€๋ฅผ ์ด์šฉํ•˜์—ฌ ์‚ฌ์ง„์„ ๊ด€๋ฆฌํ•  ์ˆ˜ ์žˆ๋Š” ํŽ˜์ด์ง€๋ฅผ ๊ตฌํ˜„ @@ -20,8 +32,12 @@ - ์ง์›์„ ๋“ฑ๋ก, ์ˆ˜์ •, ์‚ญ์ œ๊ฐ€ ๊ฐ€๋Šฅ - infinity scroll ๊ธฐ๋Šฅ - LocalStorage ์‚ฌ์šฉ +- ๋กœ๋”ฉํŽ˜์ด์ง€ ๊ตฌํ˜„ ## [ํ๋ฆ„] ![Untitled](https://github.com/KDT1-FE/Y_FE_JAVASCRIPT_PICTURE/assets/38754963/e2934c05-26f6-4ef6-88d4-beed76aa007a) +## [ํ•„์š”ํ•œ ์ž‘์—…] +- ๊ฒ€์ƒ‰ / ์ •๋ ฌ ๊ธฐ๋Šฅ +- ๋ฐ์ดํ„ฐ ์œ ํšจ์„ฑ ๊ฒ€์‚ฌ diff --git a/userflow.JPG b/userflow.JPG new file mode 100644 index 0000000000000000000000000000000000000000..49f7d3583f368bfeb7b043eccb8b3a286ac877c4 GIT binary patch literal 53542 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 Vzt+HCYv8Xn@V|8p;C&nV{{T^)OLqVO literal 0 HcmV?d00001 From df0a88339f3e6d43f3c96294e5813da6b2f96d01 Mon Sep 17 00:00:00 2001 From: developer-jyyun <131247158+developer-jyyun@users.noreply.github.com> Date: Fri, 18 Aug 2023 23:17:08 +0900 Subject: [PATCH 21/34] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c930346af..3c21fbd41 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ PW: 123456 - ๋กœ๋”ฉํŽ˜์ด์ง€ ๊ตฌํ˜„ ## [ํ๋ฆ„] -![Untitled](https://github.com/KDT1-FE/Y_FE_JAVASCRIPT_PICTURE/assets/38754963/e2934c05-26f6-4ef6-88d4-beed76aa007a) +![userflow](https://firebasestorage.googleapis.com/v0/b/javascript-picture.appspot.com/o/image%2Fuserflow.JPG?alt=media&token=1164b946-69e6-411b-ad31-93facf55cbab) ## [ํ•„์š”ํ•œ ์ž‘์—…] From 7e42e40df275918643882229c6b17d08ad03298a Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Sat, 19 Aug 2023 15:00:44 +0900 Subject: [PATCH 22/34] Fix: login alert --- et HEAD~1 | 113 ++++++++++++++++++++++++++++++++++++++++++ public/login/login.js | 2 +- 2 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 et HEAD~1 diff --git a/et HEAD~1 b/et HEAD~1 new file mode 100644 index 000000000..7f2116390 --- /dev/null +++ b/et HEAD~1 @@ -0,0 +1,113 @@ +commit 4808e2bd550a4a6092a626020846f74c45adb156 (HEAD -> KDT0_YunJiYoung) +Author: developer-jyyun +Date: Fri Aug 18 19:36:47 2023 +0900 + + Feat: Add loading page + +commit 7237b5be8b68fa40f023fcaf80bf1540e7c0f6a4 +Author: developer-jyyun +Date: Fri Aug 18 15:12:21 2023 +0900 + + Docs:Add firebase.js + +commit 5931373c1aa1cb86d695c47c20abed21223c3529 +Author: developer-jyyun +Date: Fri Aug 18 14:40:25 2023 +0900 + + Feat: Preview, login check + +commit 90d83226271c8f20ce973ee81f21599e09b15253 +Author: developer-jyyun +Date: Sat Aug 12 17:43:58 2023 +0900 + + Feat: DB delete + +commit 1aeb1d30bfce690babb9755d822b4638fc65cbbd +Author: developer-jyyun +Date: Sat Aug 12 16:36:34 2023 +0900 + + Docs: Change field name + +commit cc9c04f599ecb16b401c3d52cdbb927c2afcc5f9 +Author: developer-jyyun +Date: Sat Aug 12 16:26:42 2023 +0900 + + Feat: Add edit page + +commit 8150a30b0800b613a744fb5a4b0fb1d295b6d445 +Author: developer-jyyun +Date: Fri Aug 11 19:33:01 2023 +0900 + + Feat: Add DB_uid, DB_username + +commit 6113e2a8fd2d51f6721e727529d95f9b5185e8c6 +Author: developer-jyyun +Date: Fri Aug 11 19:31:25 2023 +0900 + + fix: Modify detail path(href) + +commit ad58f9320fc118adb96fd2ef86793144abcd30a6 +Author: developer-jyyun +Date: Fri Aug 11 19:14:28 2023 +0900 + + Feat: Add upload permission + +commit 6ab7483b6516b430e260b8ec9631a847c3fdba17 +Author: developer-jyyun +Date: Fri Aug 11 18:27:35 2023 +0900 + + Feat: Add onAuthStateChanged + +commit 5a28ac19734d92df7bb00dd7187299d1e2cbf24f +Author: developer-jyyun +Date: Thu Aug 10 17:59:55 2023 +0900 + + Design: Modify layout(index,upload) + +commit d831dfd48b61845e469442557bae59e763bd243a +Author: developer-jyyun +Date: Thu Aug 10 17:57:06 2023 +0900 + + Fix: Delete form tag + +commit ec35453339b3b3b491cb4821a7ff4e8173391296 +Author: developer-jyyun +Date: Thu Aug 10 17:50:31 2023 +0900 + + Feat: Add detail page + +commit a491878cb971f6c21454b2017a2304a82fe25f62 +Author: developer-jyyun +Date: Thu Aug 10 13:09:29 2023 +0900 + + Correct: close section tag + +commit 3b85946efe04a52a1f85b739e29bae75e66b0628 +Author: developer-jyyun +Date: Thu Aug 10 12:58:30 2023 +0900 + + Feat: Add upload & login + +commit 2798c60d88b48254cefa3088b0b560c085c7f608 +Author: developer-jyyun +Date: Wed Aug 9 22:26:46 2023 +0900 + + Feat: Add index + +commit 6eb0917c558a06852aef719ab8bb7cbd5067629d (origin/main, origin/HEAD, main) +Author: DT - Career <96465306+DT-Career@users.noreply.github.com> +Date: Tue Aug 8 17:31:50 2023 +0900 + + Update README.md + +commit 61a894eb885fd617a3218008af46cd415871e1b1 +Author: John Ahn +Date: Tue Aug 8 12:23:57 2023 +0900 + + Update README.md + +commit acc67141cdce095352aa4dc28e0e6e1dbd64cdf8 +Author: John Ahn +Date: Tue Aug 8 12:12:26 2023 +0900 + + Initial commit diff --git a/public/login/login.js b/public/login/login.js index bd9766d89..b402203ec 100644 --- a/public/login/login.js +++ b/public/login/login.js @@ -46,7 +46,7 @@ loginBtn.addEventListener("click", function () { document.querySelector(".login").classList.add("none"); }).catch(function(error) { console.error("Error removing file.", error); - alert('๋กœ๊ทธ์ธ์— ์‹คํŒจํ•˜์˜€์Šต๋‹ˆ๋‹ค. \n '+error.message) + // alert('๋กœ๊ทธ์ธ์— ์‹คํŒจํ•˜์˜€์Šต๋‹ˆ๋‹ค. \n '+error.message) }); }); From 8adbc2d538248d8430e4fede6de5b87c080c8b42 Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Sat, 19 Aug 2023 15:30:38 +0900 Subject: [PATCH 23/34] Fix : Login error --- public/login/login.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/public/login/login.js b/public/login/login.js index b402203ec..54e0219b7 100644 --- a/public/login/login.js +++ b/public/login/login.js @@ -22,7 +22,6 @@ joinBtn.addEventListener("click", function () { .then(() => { window.location.reload(true); alert("ํšŒ์›๊ฐ€์ž…์ด ์™„๋ฃŒ๋˜์—ˆ์Šต๋‹ˆ๋‹ค.:)"); - // console.log(result); // console.log(result.user); result.user.updateProfile({ displayName: joinName }); @@ -41,12 +40,9 @@ loginBtn.addEventListener("click", function () { .then((result) => { alert("๋กœ๊ทธ์ธ ์™„๋ฃŒ!"); window.location.href = "/index.html"; - document.querySelector(".user-welcome").classList.remove("none"); - document.querySelector(".logout").classList.remove("none"); - document.querySelector(".login").classList.add("none"); }).catch(function(error) { console.error("Error removing file.", error); - // alert('๋กœ๊ทธ์ธ์— ์‹คํŒจํ•˜์˜€์Šต๋‹ˆ๋‹ค. \n '+error.message) + alert('๋กœ๊ทธ์ธ์— ์‹คํŒจํ•˜์˜€์Šต๋‹ˆ๋‹ค. \n '+error.message) }); }); From 42c71e616dc73fbeed76f30d5b0e8710c525aee4 Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Sat, 19 Aug 2023 17:08:52 +0900 Subject: [PATCH 24/34] Fix: Loading --- public/loading.js | 5 +++++ public/login/login.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/public/loading.js b/public/loading.js index 6bc49d953..a148cf9e9 100644 --- a/public/loading.js +++ b/public/loading.js @@ -1,10 +1,15 @@ window.onload = function () { + + const loading = document.getElementById("loading"); + setTimeout(()=>{ loading.style.opacity = "0"; loading.style.transform = "scale(0)"; loading.style.transition='all 1s'; },1200); + + console.log(loading) } diff --git a/public/login/login.html b/public/login/login.html index 17e2e4858..6013da47a 100644 --- a/public/login/login.html +++ b/public/login/login.html @@ -117,7 +117,7 @@

    ๐Ÿ™‹โ€โ™‚๏ธ---logo--- ๐Ÿ™‹โ€โ™€๏ธ

    - + From 8579876d56cffddbf1643f8bebe0147a5e562d21 Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Sat, 19 Aug 2023 17:21:51 +0900 Subject: [PATCH 25/34] Fix: Remove remove class --- public/loading.js | 2 +- public/main.js | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/public/loading.js b/public/loading.js index a148cf9e9..408801cc8 100644 --- a/public/loading.js +++ b/public/loading.js @@ -9,7 +9,7 @@ window.onload = function () { },1200); - console.log(loading) + // console.log(loading) } diff --git a/public/main.js b/public/main.js index fdf43bb94..b48c7413b 100644 --- a/public/main.js +++ b/public/main.js @@ -59,10 +59,7 @@ db.collection("member") if (entry.intersectionRatio > 0) { entry.target.classList.add("active"); } - // ์•„๋‹ˆ๋ฉด active ํด๋ž˜์Šค ์ œ๊ฑฐ - else { - entry.target.classList.remove("active"); - } + }); }); From f65db110f6093585c04a8b3d9cb783fbce444f1f Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Sat, 19 Aug 2023 17:33:46 +0900 Subject: [PATCH 26/34] Fix: Url --- public/login_ck.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/login_ck.js b/public/login_ck.js index 378e9bd34..8e2c818bc 100644 --- a/public/login_ck.js +++ b/public/login_ck.js @@ -78,7 +78,7 @@ function deleteBtnClick() { function alertLogin(){ alert('๋กœ๊ทธ์ธ์ด ํ•„์š”ํ•ฉ๋‹ˆ๋‹ค!') - window.location.href='login/login.html' + window.location.href='/login/login.html' } From d02f1673c4778315eeb323e42352790c4d4e91c2 Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Sat, 19 Aug 2023 17:47:02 +0900 Subject: [PATCH 27/34] edit path --- public/detail/detail.html | 4 ++-- public/index.html | 4 ++-- public/login/login.html | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/detail/detail.html b/public/detail/detail.html index 4a36b161d..daa667f35 100644 --- a/public/detail/detail.html +++ b/public/detail/detail.html @@ -77,7 +77,7 @@

    ์ƒ์„ธ์ •๋ณด

    src="https://www.gstatic.com/firebasejs/8.6.5/firebase-storage.js" > - - + + diff --git a/public/index.html b/public/index.html index a704b367f..e7e938106 100644 --- a/public/index.html +++ b/public/index.html @@ -119,8 +119,8 @@
    ์ƒ์„ธ์ •๋ณด
    src="https://kit.fontawesome.com/3e1fab0201.js" crossorigin="anonymous" > - - + + diff --git a/public/login/login.html b/public/login/login.html index 6013da47a..bd8e29da9 100644 --- a/public/login/login.html +++ b/public/login/login.html @@ -118,6 +118,6 @@

    ๐Ÿ™‹โ€โ™‚๏ธ---logo--- ๐Ÿ™‹โ€โ™€๏ธ

    - + From 568a2ffdf722a66c55c90b33db287f931026b841 Mon Sep 17 00:00:00 2001 From: developer-jyyun <131247158+developer-jyyun@users.noreply.github.com> Date: Sat, 19 Aug 2023 21:34:14 +0900 Subject: [PATCH 28/34] Delete delete.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ์‚ฌ์šฉํ•˜์ง€ ์•Š๋Š” ํŒŒ์ผ// login_ck.js์— ํ•ด๋‹น ๋‚ด์šฉ ์ด๋™ --- public/edit/delete.js | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 public/edit/delete.js diff --git a/public/edit/delete.js b/public/edit/delete.js deleted file mode 100644 index c0fcede03..000000000 --- a/public/edit/delete.js +++ /dev/null @@ -1,23 +0,0 @@ - // ์‚ญ์ œ - const deleteBtn= document.querySelectorAll('.delete-btn'); - deleteBtn.addEventListener('click',function(){ - //db์ •๋ณด ์‚ญ์ œ - db.collection('member').doc(queryString.get('id')).delete().then(()=>{ - alert('์‚ญ์ œ๋˜์—ˆ์Šต๋‹ˆ๋‹ค.'); - window.location.href='/' - - }) - - //์ด๋ฏธ์ง€ ์‚ญ์ œ - var deleteFilename = document.getElementById('image-delete').value; - var deleteRef = storage.refFromURL(deleteFilename) - // console.log(deleteRef) - - deleteRef.delete().then(function() { - console.log("File deleted successfully"); - }).catch(function(error) { - console.error("Error removing file.", error); - }); - - - }); \ No newline at end of file From afa4035b439bbd30de3e3c0a8dd25d07ca82e8c6 Mon Sep 17 00:00:00 2001 From: developer-jyyun <131247158+developer-jyyun@users.noreply.github.com> Date: Sat, 19 Aug 2023 21:34:54 +0900 Subject: [PATCH 29/34] Delete keyframes.css --- public/keyframes.css | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 public/keyframes.css diff --git a/public/keyframes.css b/public/keyframes.css deleted file mode 100644 index e69de29bb..000000000 From 4813e76035c61ec490d325e8678bb2b9324113e3 Mon Sep 17 00:00:00 2001 From: developer-jyyun Date: Sat, 19 Aug 2023 22:50:22 +0900 Subject: [PATCH 30/34] Fix:pocation path --- .gitignore | 1 - public/detail/detail.js | 10 +++------- public/edit/edit.js | 1 + public/firebase.js | 1 - public/index.html | 2 +- public/main.css | 2 +- public/main.js | 1 - public/upload/upload.html | 6 +++--- public/upload/upload.js | 7 +++---- 9 files changed, 12 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index e2cc90f00..855bd1c81 100644 --- a/.gitignore +++ b/.gitignore @@ -68,4 +68,3 @@ node_modules/ # Ignore IDE specific files .vscode/ -.test/ \ No newline at end of file diff --git a/public/detail/detail.js b/public/detail/detail.js index c809a9ea7..997e13411 100644 --- a/public/detail/detail.js +++ b/public/detail/detail.js @@ -4,12 +4,10 @@ db.collection("member") .then((result) => { console.log(result.data()); - var templateDetail = ` + const templateDetail = `
    -
    +
    ์ด๋ฆ„ : ${result.data().name}
    @@ -18,9 +16,7 @@ db.collection("member")
    ๋‚ด์„ ๋ฒˆํ˜ธ : ${result.data().ext}
    ์—ฐ๋ฝ์ฒ˜ : ${result.data().phone}
    ์ด๋ฉ”์ผ : ${result.data().email}
    -
    ๊ธฐํƒ€ : ${ - result.data().memo - }
    +
    ๊ธฐํƒ€ : ${result.data().memo}
    `; diff --git a/public/edit/edit.js b/public/edit/edit.js index 48444e3b2..63d0b3257 100644 --- a/public/edit/edit.js +++ b/public/edit/edit.js @@ -29,6 +29,7 @@ db.collection("member") editBtn.addEventListener("click", function () { const editImg = document.querySelector("#image").files[0]; const imgName = document.querySelector("#image").files.name; + const randomNum = Math.round(Math.random() * 9999); const storageRef = storage.ref(); const editImgPath = storageRef.child("image/" + randomNum + imgName); const updateImg = editImgPath.put(editImg); diff --git a/public/firebase.js b/public/firebase.js index 9fb83327f..a6fea73f0 100644 --- a/public/firebase.js +++ b/public/firebase.js @@ -13,7 +13,6 @@ firebase.initializeApp(firebaseConfig) ; const db = firebase.firestore(); const storage = firebase.storage(); -const randomNum = Math.round(Math.random() * 9999); //url query string์— ์žˆ๋˜ ์ž๋ฃŒ๋ฅผ object๋กœ ๋ณ€ํ™˜ const queryString = new URLSearchParams(window.location.search); diff --git a/public/index.html b/public/index.html index e7e938106..452b470d0 100644 --- a/public/index.html +++ b/public/index.html @@ -55,7 +55,7 @@

    ๐Ÿ™‹โ€โ™‚๏ธ---logo--- ๐Ÿ™‹โ€โ™€๏ธ