-
Notifications
You must be signed in to change notification settings - Fork 0
Contact list #15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
SergeyKostikov
wants to merge
9
commits into
master
Choose a base branch
from
Contact-list
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Contact list #15
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
d84e094
contact list branch
SergeyKostikov 253d9be
refactoring
SergeyKostikov 130de00
refactoring
SergeyKostikov 2ac58fd
refactoring
SergeyKostikov 96f449a
refactoring
SergeyKostikov 211e8e0
contact list
SergeyKostikov 31135de
visual fix and refactor
SergeyKostikov eb87c2c
new page and style
SergeyKostikov 2d58684
modify model
SergeyKostikov File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <link href="src/main.css" rel="stylesheet"> | ||
| <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.1/css/all.css" integrity="sha384-O8whS3fhG2OnA5Kas0Y9l3cfpmYjapjI0E4theH4iuMD+pLhbf6JI0jIMfYcK3yZ" crossorigin="anonymous"> | ||
| <meta charset="UTF-8"> | ||
| <title>Contact</title> | ||
| </head> | ||
| <body> | ||
| <div class="main"> | ||
| <div class="app-header"> | ||
| My Phone App | ||
| </div> | ||
| <div class="app-content"> | ||
|
|
||
| </div> | ||
| <div class="app-footer"> | ||
| <div></div> | ||
| </div> | ||
| </div> | ||
| <script src="src/main.js"></script> | ||
| </body> | ||
| </html> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <link href="src/main.css" rel="stylesheet"> | ||
| <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.1/css/all.css" integrity="sha384-O8whS3fhG2OnA5Kas0Y9l3cfpmYjapjI0E4theH4iuMD+pLhbf6JI0jIMfYcK3yZ" crossorigin="anonymous"> | ||
| <meta charset="UTF-8"> | ||
| <title>Phone App</title> | ||
| </head> | ||
| <body> | ||
| <div class="main"> | ||
| <div class="app-header"> | ||
| My Phone App | ||
| </div> | ||
| <div class="app-content"> | ||
| <table class="contact-table" cellspacing="0" cellpadding="0"> | ||
| </table> | ||
|
|
||
| </div> | ||
| <div class="app-footer"> | ||
| <div></div> | ||
| </div> | ||
| </div> | ||
| <script src="src/main.js"></script> | ||
| </body> | ||
| </html> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| body{ | ||
| font-family: Helvetica, sans-serif | ||
| } | ||
| ::-webkit-scrollbar { | ||
| width: 5px; | ||
| } | ||
|
|
||
| /* Track */ | ||
| ::-webkit-scrollbar-track { | ||
| background: #f1f1f1; | ||
| } | ||
|
|
||
| /* Handle */ | ||
| ::-webkit-scrollbar-thumb { | ||
| background: #858585; | ||
| } | ||
|
|
||
| /* Handle on hover */ | ||
| ::-webkit-scrollbar-thumb:hover { | ||
| background: #555; | ||
| } | ||
|
|
||
| div.main{ | ||
| margin: auto; | ||
| position: relative; | ||
| width: 500px; | ||
| border: 1px solid #858585; | ||
| box-shadow: 0 0 15px #858585; | ||
| } | ||
| div.app-header, div.app-footer{ | ||
| text-align: center; | ||
| max-width: 478px; | ||
| width: 100%; | ||
| min-height: 25px; | ||
| color: #fff; | ||
| background: #3367d6; | ||
| padding: 15px 10px; | ||
| border: 1px solid #3367d6; | ||
| } | ||
| .app-contact-buttons{ | ||
| text-align: center; | ||
| font-size: 20px; | ||
|
|
||
| } | ||
| .app-contact-buttons a{ | ||
| color:#000; | ||
| } | ||
| .app-contact-avatar, .app-contact-buttons{ | ||
| width: 13.3%; | ||
| height: 50px; | ||
| padding: 15px | ||
| } | ||
| .app-contact-avatar img{ | ||
| width: 50px; | ||
| } | ||
| .app-content{ | ||
| height:700px; | ||
| overflow:auto; | ||
| /**/ | ||
| } | ||
| .icon-link{ | ||
| text-decoration: none; | ||
|
|
||
| } | ||
| tr td{ | ||
| border-bottom: 1px solid #858585; | ||
| } | ||
| tr:hover td{ | ||
| height: 60px; | ||
| border-top: 1px solid #858585; | ||
| border-bottom: 2px solid #858585; | ||
| } | ||
| tr:hover{ | ||
| cursor: pointer; | ||
| background-color: #f1f1f1; | ||
|
|
||
| } | ||
| .round-avatar{ | ||
| overflow:hidden; | ||
| border-radius: 25px; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,233 @@ | ||
| class PhoneApp{ | ||
| constructor(){ | ||
| this.database = []; | ||
| } | ||
|
|
||
| addUser (user) { | ||
| let currentUser = {}; | ||
| currentUser.id = this.database.length + 1; | ||
| currentUser.avatar = user.avatar || "avatar-2" | ||
| if (user.name) { | ||
| currentUser.name = user.name; | ||
| } | ||
| if (user.phone) { | ||
| if (!this.checkPhoneNumber(user.phone)) { | ||
| currentUser.phone = user.phone; | ||
| } else { | ||
| console.log( | ||
| "не удалось сохранить номер телефона, Телефон должен состоять только из цифр" | ||
| ); | ||
| } | ||
| } | ||
| if (user.homePhone) { | ||
| if (!this.checkPhoneNumber(user.homePhone)) { | ||
| currentUser.homePhone = user.homePhone; | ||
| } else { | ||
| console.log( | ||
| "не удалось сохранить номер телефона, Телефон должен состоять только из цифр" | ||
| ); | ||
| } | ||
| } | ||
| this.database.push(currentUser); | ||
| }; | ||
|
|
||
| checkPhoneNumber(phone){ | ||
| isNaN(+phone) | ||
| }; | ||
|
|
||
|
|
||
| deleteUser(id) { | ||
| this.database.filter((elem, index) => { | ||
| if (elem.id == id) { | ||
| this.database.splice(index, 1); | ||
| } | ||
| }); | ||
| }; | ||
|
|
||
| searchUserByName(name) { | ||
| return this.database.filter(function(elem) { | ||
| if (elem.name == name) { | ||
| return elem; | ||
| } | ||
| }); | ||
| }; | ||
|
|
||
| editUser(id, options) { | ||
| this.database.map(elem => { | ||
| if (elem.id == id) { | ||
| if (options.name) { | ||
| elem.name = options.name; | ||
| } | ||
| if (options.phone) { | ||
| elem.phone = options.phone; | ||
| } | ||
| if (options.homePhone) { | ||
| elem.homePhone = options.homePhone; | ||
| } | ||
| } | ||
| }); | ||
| }; | ||
|
|
||
| filterUser(param) { | ||
| return this.database.filter(elem => { | ||
| if (elem[param]) { | ||
| return elem; | ||
| } | ||
| }); | ||
| }; | ||
|
|
||
| sortUser(param, direction) { | ||
| return this.database.sort((a, b) => { | ||
| if (direction) { | ||
| //from small value to big value | ||
| if (direction == "up") { | ||
| return a[param] < b[param]; | ||
| } | ||
| //from big value to small value | ||
| if (direction == "down") { | ||
| return a[param] > b[param]; | ||
| } | ||
| //default | ||
| } else { | ||
| return a.id > b.id; | ||
| } | ||
| }); | ||
| }; | ||
| } | ||
|
|
||
| class User{ | ||
| constructor(options){ | ||
| this.name = options.name | ||
| this.phone = options.phone | ||
| this.homePhone = options.homePhone | ||
| this.avatar = options.avatar | ||
| } | ||
| } | ||
|
|
||
| let vasya = new User({ | ||
| name: "Vasya", | ||
| phone: "123456789", | ||
| homePhone: "11111" | ||
| }) | ||
| let petja = new User({ name: "Petja", phone: "123456798" }) | ||
| let brigitte = new User({ name: "Brigitte", phone: "123457689", avatar:"girl-1" }) | ||
| let tracer = new User({ name: "Tracer", phone: "123546789" }) | ||
| let anduin = new User({ | ||
| name: "Anduin", | ||
| phone: "113456789", | ||
| homePhone: "535353" | ||
| }) | ||
| let torgrim = new User({ name: "Torgrim", phone: "321456789", avatar:"man-2" }) | ||
| let anduin2 = new User({ | ||
| name: "Anduin", | ||
| phone: "113451189", | ||
| homePhone: "222222" | ||
| }) | ||
| let user = new User({ | ||
| name: "User", | ||
| phone: "113451189", | ||
| homePhone: "222222" | ||
| }) | ||
| let name = new User({ | ||
| name: "Name", | ||
| phone: "113451189", | ||
| homePhone: "222222" | ||
| }) | ||
| let someUaser = new User({ | ||
| name: "someUaser", | ||
| phone: "113451189", | ||
| homePhone: "222222" | ||
| }) | ||
| let blabla = new User({ | ||
| name: "blabla", | ||
| phone: "113451189", | ||
| homePhone: "222222" | ||
| }) | ||
|
|
||
| class App{ | ||
| constructor(){ | ||
| this.baseBlock = document.querySelector(".contact-table"); | ||
| } | ||
|
|
||
| createUsersList(users){ | ||
| users.database.forEach(elem => { | ||
| this.render(this.createUserTR(elem)) | ||
| }) | ||
| } | ||
|
|
||
| createUserTR(user){ | ||
| let tr = this.newElem("tr"); | ||
| tr.className = "borderdered"; | ||
|
|
||
| let avatarTD = this.newElem("td"); | ||
| let infoTD = this.newElem("td"); | ||
| let buttonTD = this.newElem("td"); | ||
|
|
||
| avatarTD.className = "app-contact-avatar" | ||
| infoTD.className = "app-contact-name" | ||
| buttonTD.className = "app-contact-buttons" | ||
|
|
||
| let p_name = this.newElem("p") | ||
| p_name.textContent = user.name | ||
| let p_phone = this.newElem("p") | ||
| p_phone.textContent = user.phone | ||
|
|
||
| let avatarDIV = this.newElem("div") | ||
| avatarDIV.className = "round-avatar" | ||
|
|
||
| let avatarImg = this.newElem("img"); | ||
| avatarImg.setAttribute("src","img/"+user.avatar+".png") | ||
|
|
||
| let editA = this.newElem("a"); | ||
| editA.setAttribute("href","contact.html?do=edit"); | ||
| editA.className = "icon-link"; | ||
|
|
||
| let editIconAwesome = this.newElem("i"); | ||
| editIconAwesome.classList.add("far","fa-edit"); | ||
|
|
||
| editA.appendChild(editIconAwesome); | ||
| buttonTD.appendChild(editA); | ||
|
|
||
| infoTD.appendChild(p_name) | ||
| infoTD.appendChild(p_phone) | ||
|
|
||
| avatarDIV.appendChild(avatarImg) | ||
| avatarTD.appendChild(avatarDIV) | ||
|
|
||
| tr.appendChild(avatarTD); | ||
| tr.appendChild(infoTD) | ||
| tr.appendChild(buttonTD) | ||
| tr.setAttribute("onclick", "window.location.href = 'contact.html'"); | ||
|
|
||
| return tr | ||
| } | ||
|
|
||
| render(elem){ | ||
| this.baseBlock.appendChild(elem) | ||
| } | ||
|
|
||
| newElem(elem){ | ||
| return document.createElement(elem); | ||
| } | ||
| } | ||
|
|
||
| let app = new App() | ||
|
|
||
|
|
||
| const myPhoneApp = new PhoneApp(); | ||
| myPhoneApp.addUser(vasya); | ||
| myPhoneApp.addUser(petja); | ||
| myPhoneApp.addUser(brigitte); | ||
| myPhoneApp.addUser(tracer); | ||
| myPhoneApp.addUser(anduin); | ||
| myPhoneApp.addUser(torgrim); | ||
| myPhoneApp.addUser(anduin2); | ||
| myPhoneApp.addUser(user); | ||
| myPhoneApp.addUser(name); | ||
| myPhoneApp.addUser(someUaser); | ||
| myPhoneApp.addUser(blabla); | ||
|
|
||
| console.log(app.createUsersList(myPhoneApp)) | ||
| console.log(myPhoneApp) | ||
|
|
||
| console.log(myPhoneApp.searchUserByName('Anduin')); | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same about that property