-
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
Observer simple version #35
Open
brkristoffer
wants to merge
63
commits into
kth-csc-iprog:master
Choose a base branch
from
nicolaa5:observer-simple-version
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
Observer simple version #35
brkristoffer
wants to merge
63
commits into
kth-csc-iprog:master
from
nicolaa5:observer-simple-version
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
just added them to select-dish page
- Added Sidebar / Navbar - Mobile expansion - Confirm DInner - Searchfield - Dropdown - Change from Bootstrap 4 to 3
getFullMenu and getAllIngredients are now functioning. I used line 80 in exampleView to test the output.
Merging "Master" & "Dinner model" Branches
-Top left logo/homepage return -Alignment & color changed -Typography added
I replaced all the reference ID's in the HTML so this renaming works out.
- Chosen recipes (hardcoded) - Print recipe button + link
also made prevented the amount of guests to go below 0
- Added ingredient list and description
- Buttons - href to pages - Typography Removed sidebar.js as it had no functionality
- Change of color in css
-Resizing images for mobile
- Marker to return to if we want to go back to Lab 1
This reverts commit c7c9929. - I reverted this commit in order to do it the right way as specified at the end of lab 1
for example, this.guests was replaced with var guests
plus some minor syntax changes
- Changing names - Changing references to names in the code All the changed names are shown in the image here: https://docs.google.com/document/d/1Z2MNflXovnR7FcYBNQHnqfbk_AHhWiDvL4lXIiYpnHk/edit
Implementation of the MVC structure for changing the amount of guests. The "STEP" comments refer to the steps made in the "Model-View-Controller Overview and Timeline": https://kth.instructure.com/courses/4645/pages/model-view-controller-overview-and-timeline?module_item_id=62195
This reverts commit eba2ddd.
This reverts commit 3b74566.
This reverts commit 2bd28a9.
This reverts commit 2b12a50.
...or something
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.
let's hope for the best