-
Notifications
You must be signed in to change notification settings - Fork 195
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
OneDish branch #37
Open
ghost
wants to merge
65
commits into
kth-csc-iprog:master
Choose a base branch
from
sofiajag:oneDish-branch
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
OneDish branch #37
Conversation
This file contains 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
Ta bort navbar så borde den vara ok!
Vänster sidebar måste kollapsa samt ha rätt höjd. kaos i css-fil.
fixat data hämtningen i view 2 och 3, påbörjat view4
# Conflicts: # view4.html # view5.html
View 4 och View 6 ok
ersätt this med var i deklarationen av DinnerModel.
Controller och views för homepage och ny indexsida.
ny stateController som ska hantera show/hide de olika views. På detta sätt kommer resp viewControl bara att sköta de olika uppdateringarna. app-kopia sparades som säkerhet när jag började testa mig fram.
den "hoppar" nu tillbaka till startsidan när man trycker search(?) fick inte till inputs från form att fungera med mainpic.
fixade nån loop i modellen. lade till id i rätterna (för att koppla ihop med knapptryck till recept) en displayedDish som ska hålla valt id för detsamma.
funkar, men ska rensas!
än så länge bara (fungerande) kopia av lab 2
This reverts commit 9fc1a98.
fixat: -print, -mängder i ingred.tabell, -visa All Dishes, -removeDish from menu, -minskat bilderna i searchview, -notifiobserver argumenten har jag fixat så de används. har ännu inte kommit fram till varför onedishView visas på halva sidan i vissa fall...
Saknar bara bra spinner!
inkl API titel och bilder
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.