Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Team 14 - IDATT1002
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

16a851a2

Commit 16a851a2 authored 5 years ago by Eirik Steira

Downloads
- Plain Diff

Merge branch 'Search_page' into 'dev'

Created basic search result page layout

See merge request !22

parents 6ac802aa 90aa6207

No related branches found

No related tags found

2 merge requests!30Weekly merge to master,!22Created basic search result page layout

Pipeline #75559 canceled 5 years ago

Stage: build

Stage: test

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/NTNU/IDATT1002/controllers/LoggedInController.java 3 additions, 2 deletions

...n/java/NTNU/IDATT1002/controllers/LoggedInController.java
src/main/java/NTNU/IDATT1002/controllers/SearchPageController.java 49 additions, 0 deletions

...java/NTNU/IDATT1002/controllers/SearchPageController.java
src/main/resources/NTNU/IDATT1002/explore_page.fxml 12 additions, 12 deletions

src/main/resources/NTNU/IDATT1002/explore_page.fxml
src/main/resources/NTNU/IDATT1002/logged-in.fxml 1 addition, 0 deletions

src/main/resources/NTNU/IDATT1002/logged-in.fxml
src/main/resources/NTNU/IDATT1002/search_page.fxml 304 additions, 0 deletions

src/main/resources/NTNU/IDATT1002/search_page.fxml
src/main/resources/NTNU/IDATT1002/search_page_2.fxml 304 additions, 0 deletions

src/main/resources/NTNU/IDATT1002/search_page_2.fxml

with 673 additions and 14 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment