-
Notifications
You must be signed in to change notification settings - Fork 84
Review #13
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
flash42
wants to merge
36
commits into
CodecoolBase:master
Choose a base branch
from
GaborPap:review-base
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
Review #13
Changes from all commits
Commits
Show all changes
36 commits
Select commit
Hold shift + click to select a range
3f05582
Workshop
GaborPap 15a6438
login
HackerVik 46f24e0
write_csv
MartonTevald cd772f7
Merge pull request #1 from GaborPap/csv_write
MartonTevald 01d4a8c
in prgoress
RoyB91 6a8f925
board show
RoyB91 95f1e2c
listAllBoardHeader
RoyB91 168640c
ajax
GaborPap fbc3b3d
merge
GaborPap f36603f
tolni
RoyB91 93305ef
fix
RoyB91 4055198
list_done
RoyB91 c735935
Merge branch 'listBoards' of /home/adrian/codecool/Web/proman with co…
adrianFarkas 0d3b4d5
trash
adrianFarkas 7bb2843
dataset_order
RoyB91 d4872a7
dataset_cardid
RoyB91 bf2c0e7
Merge pull request #2 from GaborPap/listBoards
adrianFarkas 37fbde6
created authentication
GaborPap 99284d6
Merge branch 'master' into login
GaborPap a3077ba
Merge pull request #3 from GaborPap/login
GaborPap 8ad926b
merge conflict resolution
HackerVik 28c9fe3
implement slide
adrianFarkas 5ffa884
Merge branch 'master' into slide
adrianFarkas 974f8de
Merge pull request #4 from GaborPap/slide
adrianFarkas 5fcc07a
requirements.txt
HackerVik 5a1735f
Merge branch 'master' of https://github.com/GaborPap/proman-javascript
HackerVik 666b3d5
marton login
MartonTevald 966696d
Merge branch 'master' of github.com:GaborPap/proman-javascript
MartonTevald fedb838
links
adrianFarkas 826633a
Merge branch 'master' of https://github.com/GaborPap/proman-javascript
adrianFarkas 1df0ef1
Merge branch 'master' of /home/gabor/Codecool/WEB/GIT/proman-javascri…
GaborPap 5d9f85c
Added users to boards. Boards linket to users.
GaborPap f775f5d
Change modal title and button to register and login
GaborPap 4b8cbee
PEP8
GaborPap 828d2fc
guest can see only public boards. After login can see only own boards
GaborPap 330317f
Merge pull request #5 from GaborPap/userboards
adrianFarkas 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 |
|---|---|---|
| @@ -1,3 +1,9 @@ | ||
| id,title | ||
| 1,"Board 1" | ||
| 2,"Board 2" | ||
| id,title,userid | ||
| 1,"Board public 1",0 | ||
| 2,"Board user 1",1 | ||
| 3,"Board user 2",2 | ||
| 4,"Board user 2_2",2 | ||
| 5,"Board public 2",0 | ||
| 6,"Board user 3",3 | ||
| 7,"Board user 2_3",2 | ||
| 8,"Board public 3",0 |
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
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 |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| id,title | ||
| 0,new | ||
| 1,"in progress" | ||
| 1,"in_progress" | ||
| 2,testing | ||
| 3,done |
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,3 @@ | ||
| id,username,password | ||
| 1,gabor,$2b$12$cyufJCWyed8lP57ATXq.9.SdfRu5S7jHOzloY1AI8kuBjpbe4.MvG | ||
| 2,alma,$2b$12$bmNkkgmQEYhw4WDdpAOYze5PqXBKwj.E2IkX7zC60E.NBFNuce/I2 |
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
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
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
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,10 @@ | ||
| bcrypt==3.1.6 | ||
| cffi==1.12.3 | ||
| Click==7.0 | ||
| Flask==1.0.2 | ||
| itsdangerous==1.1.0 | ||
| Jinja2==2.10.1 | ||
| MarkupSafe==1.1.1 | ||
| pycparser==2.19 | ||
| six==1.12.0 | ||
| Werkzeug==0.15.2 |
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 |
|---|---|---|
| @@ -1,3 +1,129 @@ | ||
| #boards { | ||
| background-color: green; | ||
| } | ||
| :root{ | ||
| --border-radius: 3px; | ||
| --status-1: #590000; | ||
| --status-2: #594300; | ||
| --status-3: #525900; | ||
| --status-4: #085900; | ||
| } | ||
|
|
||
| body{ | ||
| min-width: 620px; | ||
| background: #ddd url(http://cdn.backgroundhost.com/backgrounds/subtlepatterns/diagonal-noise.png); | ||
| font-family: sans-serif; | ||
| } | ||
|
|
||
| h1, .board-title, .board-column-title{ | ||
| font-weight: 100; | ||
| } | ||
|
|
||
| h1{ | ||
| text-align: center; | ||
| font-size: 4em; | ||
| letter-spacing: 5px; | ||
| transform: scale(1.2, 1); | ||
| } | ||
|
|
||
| button{ | ||
| background: #222; | ||
| color: #fff; | ||
| border: none; | ||
| font-size: 14px; | ||
| font-family: sans-serif; | ||
| padding: 4px 10px; | ||
| } | ||
|
|
||
| .board-container{ | ||
| max-width: 960px; | ||
| margin: 0 auto; | ||
| } | ||
|
|
||
| section.board{ | ||
| margin: 20px; | ||
| border: aliceblue; | ||
| background: #ffffff90; | ||
| border-radius: 3px; | ||
| } | ||
|
|
||
| .board-header{ | ||
| height: 50px; | ||
| background: #fff; | ||
| border-radius: var(--border-radius) var(--border-radius) 0 0; | ||
| } | ||
|
|
||
| .board-title{ | ||
| margin: 13px; | ||
| display: inline-block; | ||
| font-size: 20px; | ||
| } | ||
| .board-title, .board-add, .board-toggle{ | ||
| display: inline-block; | ||
| } | ||
|
|
||
| .board-toggle{ | ||
| float: right; | ||
| margin: 13px; | ||
| } | ||
|
|
||
| .board-columns{ | ||
| display: flex; | ||
| flex-wrap: nowrap; | ||
| } | ||
|
|
||
| .board-column{ | ||
| padding: 10px; | ||
| flex: 1; | ||
| } | ||
|
|
||
| .board-column-content{ | ||
| min-height: 49px; | ||
| } | ||
|
|
||
| .board-column-content:empty{ | ||
| /*This only works if the tag is really empty and there is not even whitespace inside*/ | ||
| border: 4px solid #cdcdcd; | ||
| margin-top: 4px; | ||
| border-radius: 10px; | ||
| background: #eee; | ||
| } | ||
|
|
||
| .board-column-title{ | ||
| text-align: center; | ||
| } | ||
|
|
||
| .card{ | ||
| position: relative; | ||
| background: #222; | ||
| color: #fff; | ||
| border-radius: var(--border-radius); | ||
| margin: 4px 0; | ||
| padding: 4px; | ||
| } | ||
|
|
||
| .board-column:nth-of-type(1) .card{ | ||
| background: var(--status-1); | ||
| } | ||
|
|
||
| .board-column:nth-of-type(2) .card{ | ||
| background: var(--status-2); | ||
| } | ||
|
|
||
| .board-column:nth-of-type(3) .card{ | ||
| background: var(--status-3); | ||
| } | ||
|
|
||
| .board-column:nth-of-type(4) .card{ | ||
| background: var(--status-4); | ||
| } | ||
|
|
||
| .card-remove{ | ||
| display: block; | ||
| position: absolute; | ||
| top: 4px; | ||
| right: 4px; | ||
| font-size: 12px; | ||
| cursor: pointer; | ||
| } | ||
|
|
||
| .card-title{ | ||
| padding-right: 16px; | ||
| } |
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 |
|---|---|---|
|
|
@@ -24,6 +24,9 @@ export let dataHandler = { | |
| }, | ||
| getBoards: function (callback) { | ||
| // the boards are retrieved and then the callback function is called with the boards | ||
| if(this._data.hasOwnProperty('boards')){ | ||
|
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. whitespace 🚔 |
||
| callback(this._data.boards); | ||
| } | ||
|
|
||
| // Here we use an arrow function to keep the value of 'this' on dataHandler. | ||
| // if we would use function(){...} here, the value of 'this' would change. | ||
|
|
@@ -43,6 +46,13 @@ export let dataHandler = { | |
| }, | ||
| getCardsByBoardId: function (boardId, callback) { | ||
| // the cards are retrieved and then the callback function is called with the cards | ||
| if (this._data.hasOwnProperty('cards')) { | ||
| callback(this._data.cards); | ||
| } | ||
| this._api_get(`/get-cards/${boardId}`, (response) => { | ||
| this._data = response; | ||
| callback(response) | ||
| }); | ||
| }, | ||
| getCard: function (cardId, callback) { | ||
| // the card is retrieved and then the callback function is called with the card | ||
|
|
@@ -55,3 +65,5 @@ export let dataHandler = { | |
| } | ||
| // here comes more features | ||
| }; | ||
|
|
||
| sessionStorage.get | ||
Oops, something went wrong.
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.
print in production code?