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.

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

Merge dev to main for new release #57

Merged
merged 248 commits into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
248 commits
Select commit Hold shift + click to select a range
cb523b5
Create publish_container_image.yml
SevLG Dec 14, 2023
d05736b
Create snyk-scan.yml
SevLG Dec 14, 2023
e9d1dbf
Delete .github/workflows/snyk-scan.yml
SevLG Dec 14, 2023
20d3b3a
First commit
SevLG Dec 14, 2023
362840a
moved README to root directory
SevLG Dec 14, 2023
1775864
Footer created and added to preliminary index page 'App'
SevLG Dec 15, 2023
1ea2ca2
New components dir and component name
SevLG Dec 18, 2023
87ec116
Merge pull request #1 from ScilifelabDataCentre/footer_branch
SevLG Dec 18, 2023
b69c6ef
Basic README setup for frontend project
SevLG Dec 18, 2023
31a7363
Preliminary header component added
SevLG Dec 18, 2023
1e42080
Basic header added, interface added
SevLG Dec 20, 2023
3b3d6f4
Added dockerfile
SevLG Dec 20, 2023
eb7120d
Adding snyk and trivy scans, changed snyk workflow to node@master, ho…
SevLG Dec 20, 2023
315269b
Merge pull request #5 from ScilifelabDataCentre/security_scan_branch
JanProgrammierung Dec 20, 2023
1e8f491
Merge pull request #2 from ScilifelabDataCentre/readme_branch2
JanProgrammierung Dec 20, 2023
833278f
Changed twitter bird to X logo
SevLG Dec 21, 2023
f764237
Merge pull request #4 from ScilifelabDataCentre/dockerfile_branch
SevLG Dec 21, 2023
da752b0
Merge pull request #6 from ScilifelabDataCentre/footer_branch
JanProgrammierung Dec 21, 2023
bf8ecee
Merge pull request #3 from ScilifelabDataCentre/header_branch
JanProgrammierung Dec 21, 2023
f1a68e9
Trying another setup for Dockerfile, because the build broke with the…
SevLG Dec 22, 2023
8c0a9aa
Merge pull request #7 from ScilifelabDataCentre/dockerfile_branch
JanProgrammierung Dec 22, 2023
d247f29
initial commit with react-markdown setup, no actual work done yet
SevLG Dec 22, 2023
8a8331c
Adding another lib for rendering markdown links, footnotes and such.
SevLG Dec 22, 2023
dc4a254
Added basic markdown handling component
SevLG Jan 9, 2024
a851e0b
Trying a new version of npm alpine and some minor changes
SevLG Jan 9, 2024
ee763ae
Merge pull request #8 from ScilifelabDataCentre/markdown_handling_branch
SevLG Jan 9, 2024
e561ce5
Merge pull request #9 from ScilifelabDataCentre/dockerfile_branch
SevLG Jan 9, 2024
5a12b31
Modifying Dockerfile to run node as non-root user
SevLG Jan 10, 2024
66223bf
Merge pull request #10 from ScilifelabDataCentre/dockerfile_branch
SevLG Jan 10, 2024
091c474
Trying a new dockerfile with npm run build using an nginx image
SevLG Jan 11, 2024
0f8da04
Merge branch 'dev' into dockerfile_branch
SevLG Jan 11, 2024
eb0e9e0
Merge pull request #11 from ScilifelabDataCentre/dockerfile_branch
SevLG Jan 11, 2024
f37751c
Added chown of /tmp for node user in Dockerfile
SevLG Jan 11, 2024
63700a6
Added explicit ownership to copied files to node in docker image
SevLG Jan 11, 2024
4733029
Merge pull request #12 from ScilifelabDataCentre/dockerfile_branch
SevLG Jan 11, 2024
2b710d0
Removed chown for usr and tmp
SevLG Jan 11, 2024
0235ba6
Merge pull request #13 from ScilifelabDataCentre/dockerfile_branch
SevLG Jan 11, 2024
009f2b9
Changes to Dockerfile setup
SevLG Jan 12, 2024
05f6a64
Merge pull request #14 from ScilifelabDataCentre/dockerfile_branch
SevLG Jan 12, 2024
2526756
Added transparent PNG for logo, changed daisyUI theme
SevLG Jan 17, 2024
0a5fddf
Ignore DS_Store
SevLG Jan 17, 2024
9d99919
Merge pull request #15 from ScilifelabDataCentre/header_branch
SevLG Jan 17, 2024
4974a14
Trying to set up and use an npm package called matomo-tracker-react
SevLG Jan 18, 2024
dd6b534
Organized the code a bit in footer, created interface for SVGs
SevLG Jan 22, 2024
6b79a96
Took out footer classes from JSX part
SevLG Jan 22, 2024
ef725cd
Merge pull request #17 from ScilifelabDataCentre/footer_branch
JanProgrammierung Jan 22, 2024
0c71cad
Merge pull request #16 from ScilifelabDataCentre/matomo_branch
JanProgrammierung Jan 22, 2024
fd00f64
Delete .DS_Store
SevLG Jan 22, 2024
d1e20ef
Merge pull request #18 from ScilifelabDataCentre/SevLG-patch-1
JanProgrammierung Jan 22, 2024
544e390
Adding a Card Component with some prop options, testing them in App.tsx
SevLG Jan 22, 2024
0c8141b
Merge branch 'dev' into card_branch
SevLG Jan 22, 2024
2c7ea27
Old matomo-tracker-react was not working, trying another version
SevLG Jan 22, 2024
0acc7f5
Merge pull request #20 from ScilifelabDataCentre/matomo_branch
SevLG Jan 22, 2024
a3702d6
Merge pull request #19 from ScilifelabDataCentre/card_branch
SevLG Jan 22, 2024
fb5c929
Fixing footer so that it doesn't follow the screen, more consistent c…
SevLG Jan 23, 2024
aef89fe
Merge branch 'footer_branch' into sebbe-pre-dev_branch
SevLG Jan 23, 2024
c40738e
Adding tracking page view to App for testing
SevLG Jan 23, 2024
fcbbf1e
Merge branch 'matomo_branch' into sebbe-pre-dev_branch
SevLG Jan 23, 2024
baed18a
Added a black with fade textbar and formated index page
SevLG Jan 23, 2024
ade138e
Merge branch 'index_page_branch' into sebbe-pre-dev_branch
SevLG Jan 23, 2024
7a53dff
Adding a placeholder image carousel component
SevLG Jan 23, 2024
844d5a1
Merge branch 'image_carousel_branch' into sebbe-pre-dev_branch
SevLG Jan 23, 2024
028ee92
Doing some minor edits for the index page layout
SevLG Jan 23, 2024
91b1416
Merge branch 'index_page_branch' into sebbe-pre-dev_branch
SevLG Jan 23, 2024
cac9e42
Merge pull request #21 from ScilifelabDataCentre/sebbe-pre-dev_branch
SevLG Jan 24, 2024
c1d1021
Implementing routing skeleton with empty pages
SevLG Jan 25, 2024
e3e5017
Something weird happened during merge, committing again
SevLG Jan 25, 2024
3aca194
Removed unused import
SevLG Jan 25, 2024
809a2c0
Removed some unused vars, added some return values
SevLG Jan 25, 2024
b8bebe2
Using white SciLifeLab Logo instead of green
SevLG Jan 25, 2024
c6a663d
Put together a working first version of privacy page, going to work o…
SevLG Jan 30, 2024
371dc73
Merge branch 'privacy_page_branch' into sebbe-pre-dev_branch
SevLG Jan 30, 2024
0202eb2
Decided to just separate some of the code since the cookies alert mig…
SevLG Jan 30, 2024
c243bdb
Merge branch 'privacy_page_branch' into sebbe-pre-dev_branch
SevLG Jan 30, 2024
892afb3
Merge pull request #22 from ScilifelabDataCentre/sebbe-pre-dev_branch
SevLG Jan 30, 2024
d11bbbe
Was hardcoding tailwind classes in different places, moved reusable s…
SevLG Jan 30, 2024
6a3bf9e
Merge branch 'code_organizing_branch' into sebbe-pre-dev_branch
SevLG Jan 30, 2024
08e4ebd
Made a more dynamic way of rendering breadcrumbs
SevLG Jan 30, 2024
1729b6e
Merge branch 'privacy_page_branch' into sebbe-pre-dev_branch
SevLG Jan 30, 2024
55d39c4
Fiddled with header and body padding
SevLG Jan 30, 2024
84d1afc
Merge branch 'header_branch' into sebbe-pre-dev_branch
SevLG Jan 30, 2024
53f6e29
Merge pull request #23 from ScilifelabDataCentre/sebbe-pre-dev_branch
SevLG Jan 30, 2024
b908e84
Generalizing CardComponent for different uses, had to make changes to…
SevLG Feb 1, 2024
fdd56d4
Cards now working as intended on both HomePage and AboutPage
SevLG Feb 1, 2024
a014482
Using more simple flex rows instead of grids + rows for AboutPage
SevLG Feb 1, 2024
acc337d
Merge branch 'about_page_branch' into sebbe-pre-dev_branch
SevLG Feb 1, 2024
6a66cc8
Some polishing of the index page and related elements
SevLG Feb 1, 2024
7442843
Merge branch 'index_page_branch' into sebbe-pre-dev_branch
SevLG Feb 1, 2024
622a56b
After looking it up, it appears concatenating strings for tailwind cl…
SevLG Feb 1, 2024
d5ba762
Merge branch 'about_page_branch' into sebbe-pre-dev_branch
SevLG Feb 1, 2024
fe3fd1b
Fixed scaling of index page to look good on my laptop, need to make i…
SevLG Feb 1, 2024
6906ccd
Merge branch 'index_page_branch' into sebbe-pre-dev_branch
SevLG Feb 1, 2024
fafb99b
Fiddled with cols and rows for card placement, started working on FAQ…
SevLG Feb 2, 2024
69a8104
Assumed I had to write a function for accordion component, but just s…
SevLG Feb 5, 2024
507a486
Separated AboutPage's different sections in preparation to make them …
SevLG Feb 5, 2024
04da8a2
Fixed routing from clicking tabs to AboutPage's child elements
SevLG Feb 5, 2024
7676387
Adding some padding to give some space to the about page elements and…
SevLG Feb 5, 2024
a56da2d
Added content from NextCloud to public folder, nothing to do with Abo…
SevLG Feb 6, 2024
54c8625
Merge branch 'about_page_branch' into sebbe-pre-dev_branch
SevLG Feb 6, 2024
cafa233
Adding text content to privacy page. Currently hardcoded manually, sh…
SevLG Feb 6, 2024
23f0a39
Merge branch 'privacy_page_branch' into sebbe-pre-dev_branch
SevLG Feb 6, 2024
9679ed4
Removed some unused variables that had been moved to About pages chil…
SevLG Feb 6, 2024
d983348
Merge pull request #24 from ScilifelabDataCentre/sebbe-pre-dev_branch
JanProgrammierung Feb 7, 2024
6c4b851
Adding DS_Store to gitignore... again
SevLG Feb 8, 2024
4519175
Fixed routing issue by editing nginx.config in the nginx-unpriviliged…
SevLG Feb 12, 2024
c313f37
Merge branch 'dockerfile_branch' into sebbe-pre-dev_branch
SevLG Feb 12, 2024
c79c41a
Merge pull request #25 from ScilifelabDataCentre/sebbe-pre-dev_branch
SevLG Feb 12, 2024
ac95547
Changing 'var' variable declaration to 'let', which is scoped. Not of…
SevLG Feb 13, 2024
7f13d3a
Merge branch 'code_organizing_branch' into sebbe-pre-dev_branch
SevLG Feb 13, 2024
f340242
Initial setup of cookies package and setting basic cookie in App.tsx
SevLG Feb 15, 2024
274fa98
Clicking on opt out on privacy page now sets trackingEnabled to False
SevLG Feb 15, 2024
5f0090c
Tracking cookie expires after 365 days (GDPR sets 12 month limit on c…
SevLG Feb 15, 2024
555f3c3
Tried to collect the code for the tracking react event to one file, a…
SevLG Feb 15, 2024
361bba2
Merge branch 'matomo_branch' into sebbe-pre-dev_branch
SevLG Feb 15, 2024
eec29ac
Merge pull request #26 from ScilifelabDataCentre/sebbe-pre-dev_branch
JanProgrammierung Feb 15, 2024
e9d5868
js-cookie package was installed in the wrong dir, fixed now
SevLG Feb 16, 2024
6bab974
Merge pull request #27 from ScilifelabDataCentre/sebbe-pre-dev_branch
SevLG Feb 16, 2024
bbfaafc
Added possibility to opt in, as well as text indicating if you're opt…
SevLG Feb 16, 2024
a75edff
Merge branch 'matomo_branch' into sebbe-pre-dev_branch
SevLG Feb 16, 2024
1b19620
Some initial work on creating a form for contacting us. Almost works,…
SevLG Mar 5, 2024
4d8c59b
Got the basic functionality in, it now tells you if your input is wro…
SevLG Mar 6, 2024
ad7bb12
Basic functionality in place. Will start working on the visual layout
SevLG Mar 7, 2024
14be6e3
Mostly finished contact form with validation (some minor details migh…
SevLG Mar 7, 2024
e15ab0a
Merge branch 'contact_component_branch' into sebbe-pre-dev_branch
SevLG Mar 7, 2024
fac1836
Removed a bunch of unused imports
SevLG Mar 7, 2024
8da93eb
Removed commented out code in App.tsx. Fixed issue where a non-link e…
SevLG Mar 7, 2024
4a32488
Made the two columns on home page 'justify-between' so that they chan…
SevLG Mar 7, 2024
065d02a
Removed another unused import that I previously missed.
SevLG Mar 7, 2024
e35f478
Merge branch 'minor_fixes' into sebbe-pre-dev_branch
SevLG Mar 8, 2024
127971c
Merge pull request #28 from ScilifelabDataCentre/sebbe-pre-dev_branch
SevLG Mar 11, 2024
59a24b3
Recreated the project using Vite, moved all the files, fixed configur…
SevLG Mar 12, 2024
8186a42
Merge pull request #29 from ScilifelabDataCentre/vite_rebuild
SevLG Mar 13, 2024
daa2dee
Fixing duplicate gitignore file and changing gitignore file for new v…
SevLG Mar 13, 2024
f4b0ce5
Restructured content to it's own file, can be imported as a JS object…
SevLG Mar 13, 2024
2e68e46
Fixed some of the previous pages to collect content in separate file …
SevLG Mar 13, 2024
ec7d69d
Merge branch 'content_setup' into pre-dev
SevLG Mar 13, 2024
628f69f
Added links to frontend and backend in footer. Not sure about styling.
SevLG Mar 13, 2024
b8e7a72
Added link to DC twitter, linked in, fixed a linked in SVG icon, remo…
SevLG Mar 13, 2024
c65aad9
Merge branch 'footer_links' into pre-dev
SevLG Mar 13, 2024
bcf2cc0
Added Seb and Natashia team pics to content.ts and prepared content.…
SevLG Mar 13, 2024
ec9b00e
Added preliminary team pics to repo and content.ts
SevLG Mar 14, 2024
6d657f3
Adjusted image sizes, changed JSX structure to grid and used automati…
SevLG Mar 14, 2024
942104f
Merge branch 'team_desc' into pre-dev
SevLG Mar 14, 2024
d38d6fa
Changed visual design of github links below footer
SevLG Mar 14, 2024
1f57bfc
Merge branch 'footer_links' into pre-dev
SevLG Mar 14, 2024
e17754f
New pic for Sebbe, recropping of all pics to not be cut off
SevLG Mar 14, 2024
65bdb4a
Merge branch 'team_desc' into pre-dev
SevLG Mar 14, 2024
3280856
Merge pull request #30 from ScilifelabDataCentre/pre-dev
JanProgrammierung Mar 14, 2024
efa55b9
Adding reCaptcha v2 functionality, unable to test locally because of …
SevLG Mar 19, 2024
2397eb7
Merge branch 'form_manager' into pre-dev
SevLG Mar 19, 2024
1ae131c
Merge pull request #31 from ScilifelabDataCentre/pre-dev
SevLG Mar 19, 2024
bc9a3c9
Fixed bug introduced when changing custom types
SevLG Mar 19, 2024
4aef118
Merge pull request #32 from ScilifelabDataCentre/pre-dev
SevLG Mar 19, 2024
baa7c7d
Something went wrong with the kubernetes deployment after switching t…
SevLG Mar 19, 2024
e576e13
Merge pull request #33 from ScilifelabDataCentre/pre-dev
JanProgrammierung Mar 19, 2024
f31cb5d
Fixed public key in wrong place for recaptcha
SevLG Mar 19, 2024
3f2da9b
Merge pull request #34 from ScilifelabDataCentre/pre-dev
SevLG Mar 19, 2024
f2ebd55
Only the header text changed
JanProgrammierung Apr 12, 2024
d51ccf6
Fixed routes for header sections
JanProgrammierung Apr 12, 2024
42e91e3
Fixed the layout of the header, added navbar-end to have the menu pro…
JanProgrammierung Apr 12, 2024
da13741
Fixed the router and file names
JanProgrammierung Apr 12, 2024
d67a025
Changed the footer links
JanProgrammierung Apr 12, 2024
25e030a
added Gradient color
JanProgrammierung Apr 12, 2024
978e015
Merge pull request #35 from ScilifelabDataCentre/jan-pre-dev
JanProgrammierung Apr 12, 2024
8192a6a
Suggestion to change footer color to teal-800 / Scilifelab color
JanProgrammierung Apr 12, 2024
da5a35d
New way of adding the header text. It is now stored in the content.ts…
JanProgrammierung Apr 15, 2024
30a2162
Theme update. New theme and new colors. Updated all pages to take the…
JanProgrammierung Apr 15, 2024
9a108be
Merge branch 'dev' into jan-pre-dev
JanProgrammierung Apr 15, 2024
dcf527c
Small update of header text
JanProgrammierung Apr 15, 2024
d0210af
Merge branch 'jan-pre-dev' of https://github.com/ScilifelabDataCentre…
JanProgrammierung Apr 15, 2024
b514688
Updated FAQ component. No component is now open by default
JanProgrammierung Apr 15, 2024
6a030bb
Changed error text color in contact form. Changed size of header men…
JanProgrammierung Apr 16, 2024
9fb97c1
New update of text error colors in contact form
JanProgrammierung Apr 16, 2024
69a0aef
Merge pull request #36 from ScilifelabDataCentre/jan-pre-dev
JanProgrammierung Apr 16, 2024
d040b2e
Updated logo and better responsive layout
JanProgrammierung Apr 17, 2024
1b8151e
Merge pull request #37 from ScilifelabDataCentre/updated-logo
JanProgrammierung Apr 17, 2024
1da714d
Changed the size of the menu item text. Changed the margin top so it …
JanProgrammierung Apr 19, 2024
4bd029e
Merge pull request #38 from ScilifelabDataCentre/menu-item-height-fix
SevLG Apr 22, 2024
69f4ce8
Commented out unused import which prevented building image. Changed c…
SevLG Apr 22, 2024
26547d6
Also added keys to react component iteration, a minor bug causing war…
SevLG Apr 22, 2024
47e867a
Merge pull request #39 from ScilifelabDataCentre/bugfix
SevLG Apr 22, 2024
2ab93fa
Added new standard background color for the body in the config file. …
JanProgrammierung Apr 28, 2024
c2d6643
Added footer and header px max 2xl part.
JanProgrammierung Apr 28, 2024
561e4bf
Deleted s and d file
JanProgrammierung Apr 28, 2024
e737042
HomePage bottom part is commented out for now. An AlternativeCarousel…
JanProgrammierung Apr 28, 2024
4e04568
Fixing indentation on some divs
SevLG Apr 29, 2024
7230603
Merge branch 'dev' into marginwhitespace
SevLG Apr 29, 2024
db89b98
Merge pull request #40 from ScilifelabDataCentre/marginwhitespace
JanProgrammierung Apr 29, 2024
50670a3
Merge branch 'dev' into indexupdate
JanProgrammierung Apr 29, 2024
1ab7937
Major update to layout and design of about us pages. The tab selectio…
JanProgrammierung Apr 30, 2024
079468d
Fetching json data and filtering out non-precision medicine related s…
SevLG Apr 30, 2024
d4a13f8
Updated the FAQ text and corrected it. The About Partners page has be…
JanProgrammierung May 2, 2024
65091e9
Added alt descriptions to index page images
JanProgrammierung May 2, 2024
005ddb5
Updated the partner descriptions. Added images. Those still need to b…
JanProgrammierung May 6, 2024
174b2e5
Working on data sources functionality
SevLG May 6, 2024
3a00e9c
Continued work on data sources component functionality. Can now fetch…
SevLG May 7, 2024
691af18
Basic filter now works but needs to be tweaked to not be inclusive (o…
SevLG May 8, 2024
61eee6b
Merge pull request #41 from ScilifelabDataCentre/indexupdate
JanProgrammierung May 8, 2024
7225be5
Fixed checkbox filter to be exclusive rather than inclusive. Made som…
SevLG May 13, 2024
5544a04
Added new mapping between data sources and disease types given by Nat…
SevLG May 14, 2024
6568461
Now using updated data sources that have disease types integrated. Th…
SevLG May 16, 2024
9bbaa3c
Merge branch 'dev' into data_sources
SevLG May 16, 2024
b48e25e
Installed and added Lato sans-serif as default font.
SevLG May 16, 2024
cc08811
Working on data sources page styling. Mostly finished except transpar…
SevLG May 16, 2024
1b2b58b
Merge remote-tracking branch 'origin' into data_sources
SevLG May 16, 2024
b4bcaac
Merge branch 'data_sources' of https://github.com/ScilifelabDataCentr…
SevLG May 16, 2024
28f2646
Fixed checkbox checked color
SevLG May 16, 2024
9b17078
Some minor adjustments to styling
SevLG May 16, 2024
e27fec2
Updated images on organization about page
JanProgrammierung May 16, 2024
2cd45e2
Added ; to types for consistency purposes. Moreover, I readded react-…
JanProgrammierung May 16, 2024
018035f
Added blank target to link, so it opens a new tab instead.
JanProgrammierung May 16, 2024
fdbdec5
Merge pull request #42 from ScilifelabDataCentre/data_sources
SevLG May 17, 2024
9a87528
Merge pull request #44 from ScilifelabDataCentre/change_font
SevLG May 17, 2024
94a233f
Merge branch 'dev' into aboutpageupdate
SevLG May 20, 2024
d079675
Merge pull request #45 from ScilifelabDataCentre/aboutpageupdate
JanProgrammierung May 20, 2024
46f0718
Slightly increased size of linkedin SVG in footer. Fixed consistant i…
SevLG May 20, 2024
809baa6
Merge pull request #46 from ScilifelabDataCentre/fix_team_images
SevLG May 21, 2024
260b885
Commented out unused code, image won't be built when there are minor …
SevLG May 21, 2024
168e0c0
Merge pull request #47 from ScilifelabDataCentre/build_fix
SevLG May 21, 2024
ac6c39f
Added images to the public folder. This folder can be referenced in c…
JanProgrammierung May 23, 2024
a46eca2
Added new images. The BioSamples one is incorrect but can be fixed la…
JanProgrammierung May 23, 2024
5bcc342
Changed the img class and added padding to the parent div. The img is…
JanProgrammierung May 23, 2024
dd95645
Quick fix to have the disease types in alphabetical order.
JanProgrammierung May 23, 2024
5bea50b
Changed PRIDE_logo to PRIDE. Changed the height of the image so it is…
JanProgrammierung May 24, 2024
e11cbb3
Changed and added images.
JanProgrammierung May 24, 2024
5fc0a97
Commented out the recently uncommented dataSourceURI to Data Platform…
JanProgrammierung May 24, 2024
8847af4
Added new text from Natashia. To have a separate paragraph, I created…
JanProgrammierung May 24, 2024
2303f00
Changed the source of JSON file. It now links to the dev branch of th…
JanProgrammierung May 27, 2024
9ed3703
Added object-right to have the images better aligned. Especially the…
JanProgrammierung May 27, 2024
307f1f4
Added margin left to the img element. This prevents long texts to the…
JanProgrammierung May 27, 2024
ae37f22
Merge pull request #48 from ScilifelabDataCentre/images_data_sources
JanProgrammierung May 28, 2024
4eb8440
Merge branch 'dev' into about_product_update
JanProgrammierung May 28, 2024
fa5fa75
Merge pull request #49 from ScilifelabDataCentre/about_product_update
JanProgrammierung May 28, 2024
2f34694
Updated the header texts based on Natashia's file in NextCloud.
JanProgrammierung May 29, 2024
f565042
Merge pull request #50 from ScilifelabDataCentre/header-text-update
JanProgrammierung May 30, 2024
a029137
My Signed Commit
natashiab Jun 27, 2024
0c5defe
faq update all
natashiab Jun 28, 2024
028542d
faq update questionmark
natashiab Jun 28, 2024
b371678
Merge pull request #51 from ScilifelabDataCentre/faq_update
natashiab Jun 28, 2024
6ce24a0
“changes_policy”
natashiab Jul 9, 2024
b27fe02
Added statistics section to HTML to add list styling
SevLG Jul 9, 2024
ea6b582
Merge pull request #52 from ScilifelabDataCentre/privacy
natashiab Jul 12, 2024
9354574
“clinicaldatapage”
natashiab Aug 8, 2024
c61b314
Merge branch 'dev' into clinical_data
JanProgrammierung Aug 8, 2024
98dc08c
Updates: TailwindCSS instead of regular CSS. Fixing of margins betwee…
JanProgrammierung Aug 9, 2024
c0dee98
Merge pull request #53 from ScilifelabDataCentre/clinical_data
JanProgrammierung Aug 9, 2024
3ea4e8c
Added new Sonnhammer logo
JanProgrammierung Aug 13, 2024
164386c
Merge pull request #54 from ScilifelabDataCentre/new-images-to-sources
JanProgrammierung Aug 13, 2024
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
7 changes: 7 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
node_modules
npm-debug.log
build
.dockerignore
**/.git
**/.DS_Store
**/node_modules
54 changes: 54 additions & 0 deletions .github/workflows/publish_container_image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Build and push precision medicine portal container image
on:
push:
tags:
- 'v*.*.*'
jobs:
build_push_container:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Run docker/setup-qemu-action
uses: docker/setup-qemu-action@v3
- name: Run docker/setup-buildx-action
id: buildx
uses: docker/setup-buildx-action@v3
- name: List available platforms
run: echo ${{ steps.buildx.outputs.platforms }}
- name: Run docker/login-action
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Run docker/metadata-action
id: metadata_action_id
uses: docker/metadata-action@v5
with:
images: ghcr.io/ScilifelabDataCentre/precision-medicine-portal-frontend
flavor: |
latest=auto
tags: |
type=sha,format=long
type=ref,event=branch
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
labels: |
org.opencontainers.image.title=precision-medicine-portal-frontend
org.opencontainers.image.description=precision medicine web portal frontend
org.opencontainers.image.url=${{ github.event.repository.html_url }}
org.opencontainers.image.source=${{ github.event.repository.html_url }}
- name: Build and push
uses: docker/build-push-action@v5
with:
push: true
context: .
file: ./Dockerfile
platforms: linux/amd64,linux/arm64
tags: ${{ steps.metadata_action_id.outputs.tags }}
labels: ${{ steps.metadata_action_id.outputs.labels }}
36 changes: 36 additions & 0 deletions .github/workflows/snyk-scan.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Snyk: Scan for for vulnerabilities in your Python code and dependencies
# The results are then uploaded to GitHub Security Code Scanning
# https://github.com/snyk/actions/
---
name: Snyk

on:
push:
branches: ["dev", main]
pull_request:
# The branches below must be a subset of the branches above
branches: ["dev"]
schedule:
- cron: "0 7,13 * * *"

jobs:
snyk:
permissions:
contents: read
security-events: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Run Snyk to check for vulnerabilities
uses: snyk/actions/node@master
continue-on-error: true # To make sure that SARIF upload gets called
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
with:
command: code test
args: --sarif-file-output=snyk.sarif
- name: Upload result to GitHub Code Scanning
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: snyk.sarif
category: snyk
37 changes: 37 additions & 0 deletions .github/workflows/trivy-scan.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Trivy: Scan of current branch
# Trivy is a comprehensive and versatile security scanner.
# Trivy has scanners that look for security issues, and targets where it can find those issues.
# https://github.com/aquasecurity/trivy
# ---------------------------------
name: Trivy - branch scan
on:
pull_request:
push:
branches:
- main
- dev
jobs:
scan:
permissions:
contents: read
security-events: write
name: Build
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@master
with:
scan-type: "fs"
ignore-unfixed: true
format: "sarif"
output: "trivy-results.sarif"
severity: "CRITICAL,HIGH"

- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: "trivy-results.sarif"
category: trivy
13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
.DS_Store
.vscode/*

# dependencies
/pmp-frontend-app/node_modules

# misc
/pmp-frontend-app/.DS_Store

/pmp-frontend-app/npm-debug.log*
pmp-frontend-app/public/.DS_Store

/react-app
19 changes: 19 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
FROM node:21-alpine as builder
# Add a work directory
WORKDIR /app
RUN chown -R node:node /app
USER node
# Cache and Install dependencies
COPY ./pmp-frontend-app/package.json .
COPY ./pmp-frontend-app/package-lock.json .
RUN npm ci
# Copy app files
COPY ./pmp-frontend-app/ .
RUN npm run build

FROM nginxinc/nginx-unprivileged:stable-alpine
USER 101
COPY ./conf/nginx.conf /etc/nginx/conf.d/default.conf
COPY --from=builder /app/dist /usr/share/nginx/html
EXPOSE 8080
CMD ["nginx", "-g", "daemon off;"]
138 changes: 138 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,140 @@
# precision-medicine-portal-frontend
React project for the frontend of the Precision Medicine Portal by DC Data Science Node

- [Introduction](#introduction)
- [Development](#development)
- [Step 1: Clone the repository](#step-1-clone-the-repository)
- [Step 2: Create a branch and develop](#step-2-create-a-branch-and-develop)
- [Step 3: Make a pull request](#step-3-make-a-pull-request)

## Introduction

The [Data Driven Life Science](https://www.scilifelab.se/data-driven/) (DDLS) initiative has appointed four [Data Science Nodes](https://www.scilifelab.se/news/ddls-data-science-nodes-to-be-launched/) (DSNs) to serve as database, data and bioinformatics support for data driven research in life science. This repository contains the code for the frontend of a Precision Medicine Portal by the Precision Medicine DSN, which is hosted at [Karolinska Institutet](https://ki.se/en) and [SciLifeLab](https://www.scilifelab.se).

The short term aim of this portal is to host content related to precision medicine as a starting point for the project.


### Step 1: Clone the Repository

#### Git setup

Clone the repository to your machine:

```bash
git clone https://github.com/ScilifelabDataCentre/precision-medicine-portal-frontend.git
```

Fetch changes at any time from this remote:

```bash
git pull upstream dev
```

The project is set up using npm. If you want to run the project locally, install npm and use it to run the available scripts:

## Available Scripts

Note that you need to be in the "react-app" directory. In this directory, you can run:

### `npm start`

Runs the app in the development mode.\
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.

The page will reload if you make edits.\
You will also see any lint errors in the console.

### `npm test`

Launches the test runner in the interactive watch mode.\
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.

### `npm run build`

Builds the app for production to the `build` folder.\
It correctly bundles React in production mode and optimizes the build for the best performance.

The build is minified and the filenames include the hashes.\
Your app is ready to be deployed!

See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.

### `npm run eject`

**Note: this is a one-way operation. Once you `eject`, you can’t go back!**

If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.

Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.

You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.

You will see that a local development server starts running. You can access the web page by opening a web browser and visiting the URI "localhost:5000". To stop the server press CTRL+C in the terminal.


#### Docker

You can use the provided Dockerfile to build and run a container.


### Step 2: Create a branch and develop

Note that commits need to be signed as per SciLifeLab policy. There are many different ways to sign github commits and how to set it up may vary based on your operating system. An example of how to set it up for MacOS can be seen here:

https://gist.github.com/troyfontaine/18c9146295168ee9ca2b30c00bd1b41e

To create a new branch and start developing in it:

```bash
git branch my_branch
git checkout my_branch
```

After doing this you can make any changes you want. You must then either add all changed files or specific changed files to your commit:

```bash
git add -A
```

or

```bash
git add my_changed_file
```

You can then commit and push to your branch:

(NOTE: DO NOT FORGET TO SIGN YOUR COMMITS, by policy only signed commits can be merged into the main branches.)

```bash
git commit -S -m "My commit"
git push origin my_branch
```

The code is now in my_branch in the repository, but you it does not get merged into the main branches without being reviewed as a pull request.


### Step 3: Make a pull request

Once you're finished with your edits and they are committed and pushed to your branch, it's time to open a pull request.

You can find full documentation on the [GitHub help website](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests), however in short:

- Visit the dev repository: [https://github.com/ScilifelabDataCentre/precision-medicine-portal-frontend](https://github.com/ScilifelabDataCentre/precision-medicine-portal-frontend)
- Find the branch my_branch that you created and pushed to
- Click the button that reads _"New Pull Request"_
- Add/change title as well as a description of what you've done
- Add reviewers from the organization to review your pull request
- Click Create Pull Request

Once created, a member of the website team will review your changes.
Once approved, they will be merged and deployed.

## How to get help

If in doubt, you can ask for help by emailing [[email protected]](mailto:[email protected]).

## Credits

The portal was built by the DDLS Precision Medicine Data Science Node with colleagues at SciLifeLab.

8 changes: 8 additions & 0 deletions conf/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
server {
listen 8080;
location / {
root /usr/share/nginx/html;
index index.html index.htm;
try_files $uri $uri/ /index.html;
}
}
18 changes: 18 additions & 0 deletions pmp-frontend-app/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
module.exports = {
root: true,
env: { browser: true, es2020: true },
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:react-hooks/recommended',
],
ignorePatterns: ['dist', '.eslintrc.cjs'],
parser: '@typescript-eslint/parser',
plugins: ['react-refresh'],
rules: {
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true },
],
},
}
30 changes: 30 additions & 0 deletions pmp-frontend-app/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# React + TypeScript + Vite

This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.

Currently, two official plugins are available:

- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh

## Expanding the ESLint configuration

If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:

- Configure the top-level `parserOptions` property like this:

```js
export default {
// other rules...
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
project: ['./tsconfig.json', './tsconfig.node.json'],
tsconfigRootDir: __dirname,
},
}
```

- Replace `plugin:@typescript-eslint/recommended` to `plugin:@typescript-eslint/recommended-type-checked` or `plugin:@typescript-eslint/strict-type-checked`
- Optionally add `plugin:@typescript-eslint/stylistic-type-checked`
- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and add `plugin:react/recommended` & `plugin:react/jsx-runtime` to the `extends` list
12 changes: 12 additions & 0 deletions pmp-frontend-app/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Precision Medicine Portal</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>
Loading
Loading