Skip to content
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.

Sign up for GitHub

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

Jump to bottom

RE-126 - Top Bar. #52

Merged
merged 34 commits into from
Nov 4, 2020
Merged

RE-126 - Top Bar. #52

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
3c4142b
Merge branch 'development' into RE-126
csbduzi Oct 24, 2020
d025967
Merge branch 'development' into RE-126
bloulidi Oct 24, 2020
ec41b9a
RE-126 - Created a top bar with breadcrumbs, no functionality
bloulidi Oct 27, 2020
9c72abc
RE-126 - Added a notification bell with mocked data
bloulidi Oct 27, 2020
38ba9e0
RE-126 - Align the notification bell to the right and reduced the siz…
bloulidi Oct 27, 2020
e33ba04
RE-126 - Lighter bottom border and changed data inside breadcrumbs
bloulidi Oct 27, 2020
a69bd44
RE-126 - Change breadcrumbs symbol from '/' to '>'
bloulidi Oct 27, 2020
503af2c
RE-126 - Change color of current breadcrumb to black and bold
bloulidi Oct 27, 2020
0cb864f
RE126 - Add weather indication with weather icon (Not real data)
bloulidi Oct 28, 2020
112de85
RE-126 - Location is now obtained from an API
bloulidi Oct 30, 2020
508eee6
RE-126 - Hidden API keys + weather data comes from API
bloulidi Oct 30, 2020
c523fcf
RE-126 - Weather icon dynamicaly changes with the temperature and cha…
bloulidi Oct 30, 2020
58bf2b2
Added new icons next to breadcrumbs (Static) and made a change button
bloulidi Nov 3, 2020
abd2a61
RE-116 - Cleaned up code and sectioned into smaller components
bloulidi Nov 3, 2020
ee1b2de
Merge branch 'development' into RE-126
bloulidi Nov 3, 2020
08c1c46
RE-126 - Eslint modifications to the code
bloulidi Nov 3, 2020
49b9ee8
RE-126 - Made top bar and side menu next to each other
bloulidi Nov 3, 2020
e1c1d50
RE-126 - Changed name from NavMenu to TopBar
bloulidi Nov 3, 2020
7c217a9
RE-126 - Fix failing travis CI "SyntaxError: Cannot use import statem…
bloulidi Nov 3, 2020
c28b249
RE-126 - Fix failing travis CI "SyntaxError: Cannot use import statem…
bloulidi Nov 3, 2020
c080dd9
RE-126 - Fixed the changes made from eslint.
bloulidi Nov 4, 2020
b193456
RE-126 - Final fix for eslint issue
bloulidi Nov 4, 2020
359fbb6
RE-126 - Removed fetch data file which was needed for template topbar
bloulidi Nov 4, 2020
da224a1
RE-126 - Removed file i was working on and forgot to remove
bloulidi Nov 4, 2020
9fa28db
RE-126 - Removed eslint precomit formating and removed unused components
bloulidi Nov 4, 2020
8430f0f
RE-126 - Fixed notification counter too large
bloulidi Nov 4, 2020
d3c867f
RE-126 - Change == to === and add an "alt" prop to the img tag
bloulidi Nov 4, 2020
4b0deb6
RE-126 - Update packages
bloulidi Nov 4, 2020
bb33fc5
RE-126 - Change file extention of index.js to index.cjs
bloulidi Nov 4, 2020
78e7b84
RE-126 - Add automated system tests for the TopBar
bkenza Nov 4, 2020
b30feca
RE-126 - Modify NotificationBell component
bkenza Nov 4, 2020
e7690f0
RE-126 - Finished modifying the notification Bell component
bloulidi Nov 4, 2020
30a1b59
RE-126 - Modify system tests to reflect component update
bkenza Nov 4, 2020
4df6ed0
RE-126 - Create unit tests for the TopBar and NotificationBell compon…
bkenza Nov 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions RecommendationEngine/RecommendationEngine/FrontEnd/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

# misc
.DS_Store
.env
.env.local
.env.development.local
.env.test.local
Expand Down
681 changes: 351 additions & 330 deletions RecommendationEngine/RecommendationEngine/FrontEnd/README.md
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 8 additions & 4 deletions RecommendationEngine/RecommendationEngine/FrontEnd/assetTransformer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
const path = require('path');

module.exports = {
process (src, filename, config, options) {
return 'module.exports = ' + JSON.stringify(path.basename(filename)) + ';';
},
};
process(src, filename, config, options) {
return (
'module.exports = ' +
JSON.stringify(path.basename(filename)) +
';'
);
},
};
8 changes: 4 additions & 4 deletions RecommendationEngine/RecommendationEngine/FrontEnd/cypress/integration/App.e2e.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
describe('App E2E', () => {
it('should have a header', () => {
cy.visit('http://localhost:3000');
it('should have a header', () => {
cy.visit('http://localhost:3000');

cy.get('h1').should('have.text', 'Hello, world!');
});
cy.get('h1').should('have.text', 'Hello, world!');
});
});
Loading