Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
5cf0f1b
initial frontend
HulekJakub Nov 25, 2024
9086e02
setup script added
paulinagacek Nov 26, 2024
e08f5e8
Initial frontend
j-skrzynski-agh Nov 26, 2024
3b3c4ca
Merge pull request #2 from agh-development-workshop-2/initial_frontend
j-skrzynski-agh Nov 26, 2024
631a5f1
Merge pull request #1 from agh-development-workshop-2/installation_sc…
HulekJakub Nov 26, 2024
c65adbc
frontend moved to a single folder
paulinagacek Nov 27, 2024
ed3f966
Minor fixes in readme (how to run frontend)
paulinagacek Dec 2, 2024
02a1a45
add about page and link it
HulekJakub Dec 2, 2024
29f2a0e
update base to take in elements rather than be an element
HulekJakub Dec 2, 2024
de996aa
TODO deleted
paulinagacek Dec 3, 2024
d1f2ec5
Merge pull request #9 from agh-development-workshop-2/4-migrate-to-re…
paulinagacek Dec 3, 2024
99742ea
Fixes in Base, Home and Footer
paulinagacek Dec 3, 2024
7c0c530
Merge pull request #10 from agh-development-workshop-2/fixing-react-w…
paulinagacek Dec 3, 2024
746e5be
Login, Register non-functional pages
paulinagacek Dec 3, 2024
0435fef
Basic authentication mechanism
paulinagacek Dec 4, 2024
c1fd98a
storybook added
paulinagacek Dec 4, 2024
33a1ae9
Merge pull request #11 from agh-development-workshop-2/7-migrate-to-r…
paulinagacek Dec 9, 2024
5545d85
deleted storybook, added rest api logging registrationa and logout lo…
HulekJakub Dec 9, 2024
0841a37
cleand up some code and added better communication and error catching
HulekJakub Dec 10, 2024
fc65f86
minor fixes
paulinagacek Dec 10, 2024
1f8ff33
Merge pull request #13 from agh-development-workshop-2/12-implement-a…
HulekJakub Dec 11, 2024
2ea77ce
implemented profile edition mechanisms
HulekJakub Dec 20, 2024
8f435f8
Merge pull request #16 from agh-development-workshop-2/14-implement-e…
HulekJakub Dec 20, 2024
864e601
card page
kskorupka Dec 20, 2024
0ddbbf1
wikipedia card
kskorupka Dec 20, 2024
3363908
search result list
kskorupka Dec 20, 2024
25d5d70
plain search
kskorupka Dec 20, 2024
a0516df
adjust home and app to search queries
kskorupka Dec 20, 2024
2968892
Literature review list migrated
paulinagacek Jan 10, 2025
23eb57b
working search
kskorupka Jan 10, 2025
5a5452b
add .env in README
kskorupka Jan 10, 2025
736f024
My literature review list + endpoint
paulinagacek Jan 10, 2025
df3c615
review fixes
paulinagacek Jan 10, 2025
73150e2
Merge pull request #19 from agh-development-workshop-2/literature_rev…
paulinagacek Jan 10, 2025
c040d51
working pagination
kskorupka Jan 11, 2025
246d10c
fix frontend README
kskorupka Jan 11, 2025
773f901
revert changes from README
kskorupka Jan 19, 2025
5eeef72
create API for search results
kskorupka Jan 19, 2025
e6fd524
remove REACT_FRONTEND variable from settings
kskorupka Jan 19, 2025
1f392b9
use API in SearchResultList.js
kskorupka Jan 19, 2025
c7ffaf9
merge main
kskorupka Jan 19, 2025
1fdeab4
Merge pull request #17 from agh-development-workshop-2/migrate-docume…
kskorupka Jan 19, 2025
fd7b0f7
migrating organizations pages
j-skrzynski-agh Jan 20, 2025
89112cf
Update App.js
j-skrzynski-agh Jan 20, 2025
fa335dd
Merge pull request #22 from agh-development-workshop-2/6-migrate-to-r…
j-skrzynski-agh Jan 20, 2025
8c7d1de
feature: docker setup
MarcinZ20 Apr 28, 2025
bc3e87c
fix: update docker-compose
MarcinZ20 Apr 28, 2025
33eae2f
add dark mode tooggle and dark mode to base file
May 5, 2025
84db252
fix: stop using bulma
MarcinZ20 May 11, 2025
ac42d2c
feature: change element to use tailwind.css
MarcinZ20 May 11, 2025
4043e3c
feature: rewrite footer component to use tailwind
MarcinZ20 May 11, 2025
a5c6e4e
fix: main layout fix
MarcinZ20 May 11, 2025
c825113
fix: remove shadow from header
MarcinZ20 May 11, 2025
6e60128
feature: start using transpartent images
MarcinZ20 May 11, 2025
1d89ec2
feature: login component tailwind integration
MarcinZ20 May 11, 2025
c6c6886
feature: register component tailwind integration
MarcinZ20 May 11, 2025
ed0ba6c
fix: change button color
MarcinZ20 May 11, 2025
7d8d2c4
adding first colors and Faq changing
May 21, 2025
f1860b2
feature: refactor login page
MarcinZ20 May 21, 2025
57097d3
fix: searchbar and button colors
MarcinZ20 May 21, 2025
f9042bb
feature: sign up page refactor
MarcinZ20 May 21, 2025
8cd5341
fix: change header text in the form
MarcinZ20 May 21, 2025
7bf494a
feature: setup working docker
MarcinZ20 May 31, 2025
51ee88a
feature: add README.md files
MarcinZ20 May 31, 2025
01e5892
fix: improve search ui
MarcinZ20 Jun 2, 2025
765ab33
fix: assign proper colours fror tailwind.conf
MarcinZ20 Jun 3, 2025
c3200d8
fix: footer layout on full-screen
MarcinZ20 Jun 3, 2025
eefecfd
fix: colour changes
MarcinZ20 Jun 3, 2025
b1bca67
fix: fix colours on about page
MarcinZ20 Jun 3, 2025
00dec49
feature: fix colours in FAQ section
MarcinZ20 Jun 3, 2025
3c4a6a5
fix: fix colour scheme in User Profile
MarcinZ20 Jun 3, 2025
483d333
feature: style reviews
MarcinZ20 Jun 3, 2025
94cf9b9
fix: fix colours on the search list
MarcinZ20 Jun 3, 2025
5d23202
feature: persist dark mode state in browser
MarcinZ20 Jun 3, 2025
c44b5db
fix: fix update toggle state
MarcinZ20 Jun 3, 2025
6a3dc12
fix: profile dropdown dark-mode bug
MarcinZ20 Jun 3, 2025
e15602b
Merge pull request #1 from MarcinZ20/feature/search-ui
MarcinZ20 Jun 4, 2025
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
29 changes: 29 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ data/
.idea/
*.DS_Store
src/backend/docker-compose-local.yml
miniconda.sh
es_data
node_modules

# Byte-compiled / optimized / DLL files
__pycache__/
Expand Down Expand Up @@ -132,3 +135,29 @@ dmypy.json

# Pyre type checker
.pyre/


## Frontend
# dependencies
frontendApp/node_modules
frontendApp/.pnp
frontendApp/.pnp.js

# testing
frontendApp/coverage

# production
frontendApp/build

# misc
frontendApp/.DS_Store
frontendApp/.env.local
frontendApp/.env.development.local
frontendApp/.env.test.local
frontendApp/.env.production.local

frontendApp/npm-debug.log*
frontendApp/yarn-debug.log*
frontendApp/yarn-error.log*

*storybook.log
43 changes: 39 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,15 @@ This project contains four parts:

As a minimum, you need to install the first two parts.

### 1.1 Python Django Backend
### 1.1 Fast installation for Ubuntu/WSL

Replace placeholders (YOUR_PASSWORD, your-secret-django-key, etc.) in the script `setup_cruise.sh` with your actual configurations.
```bash
chmod +x setup_cruise.sh
bash setup_cruise.sh
```

### 1.2 Python Django Backend

Project was tested on Python 3.9+. It will not run on Python 3.8 and below because of type hints for generics.

Expand All @@ -45,7 +53,7 @@ Use pip to install requirements (you will need `g++` to install fasttext):
npm install bulma-calendar


### 1.2 Postgres database
### 1.3 Postgres database

[Install PostgreSQL](https://www.postgresql.org/download/)

Expand Down Expand Up @@ -136,14 +144,14 @@ DATABASE_URL=postgres://SYSTEM_USERNAME:YOUR_PASSWORD@localhost:5432/cruise_lite
```


### 1.3 ElasticSearch and Search API
### 1.4 ElasticSearch and Search API

Check [backend API](src/backend/README.md) documentation to learn more about installation.

In order to use [CORE search API](https://core.ac.uk/services/api) create a file `data/core_api_key.txt` and insert your API key.
Next, change `SEARCH_WITH_CORE` to `True` in [`cruise_literature/settings.py`](src/cruise_literature/cruise_literature/settings.py).

### 1.4 Text to text API
### 1.5 Text to text API

It is a separate `flask` application that can be used to generate text predictions (question answering, summarisation) for a given text.
It is not necessary and can be switched off in the [`cruise_literature/settings.py`](src/cruise_literature/cruise_literature/settings.py) by setting:
Expand Down Expand Up @@ -231,3 +239,30 @@ Run Django server:
```bash
(cruise-literature)$ python manage.py runserver YOUR_IP:YOUR_PORT
```


## 3. React frontend

### Installation
1. NPM instalation
Make sure you have npm installed!
- WSL: https://stackoverflow.com/questions/49919063/installing-npm-node-on-bash-on-ubuntu-on-windows-wsl-what-architecture-does-u
2. Dependency installation
```bash
cd src/frontend/
npm ci
```

### Running
```bash
cd src/frontend/
npm start
```
The project should open at `http://localhost:3000/`

### Testing
```bash
npm run storybook
```

Navigate to `http://localhost:6006` and view the component rendered with mock data.
Empty file removed data/external/.gitkeep
Empty file.
Empty file removed data/processed/.gitkeep
Empty file.
24 changes: 0 additions & 24 deletions scripts/data/README.md

This file was deleted.

145 changes: 0 additions & 145 deletions scripts/data/concept_rate.py

This file was deleted.

Loading