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

SD-2693/Metais-projects #151

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
dfd99d1
Metais projects added
tomasdrga Aug 21, 2024
b321e94
Use structure.sql instead of schema.rb
tomasdrga Aug 21, 2024
d6f76c1
Cleaned up jobs, change some editing stuff
tomasdrga Aug 21, 2024
8290907
try to use db scturcture in tests
celuchmarek Aug 22, 2024
0556bd3
Added jobs for data extraction from python model
tomasdrga Aug 22, 2024
7d9b7a5
Merge branch 'SD-2693/Metais-projects' of github.com:slovensko-digita…
tomasdrga Aug 22, 2024
0bb2f84
Jobs rspec tests added
tomasdrga Aug 23, 2024
9ca24b3
Added documents to edit, tailwind style status badges, project index …
tomasdrga Aug 23, 2024
74fa0a1
Change the model structure between projects and metais_projects
tomasdrga Aug 25, 2024
b7ee240
Added prefix file for metais module
tomasdrga Aug 25, 2024
8ac7751
Metais in separate rake task
tomasdrga Aug 25, 2024
0b18cb7
multiple fixes
celuchmarek Aug 26, 2024
a3c7678
Merge branch 'master' into SD-2693/Metais-projects
celuchmarek Aug 26, 2024
d2e0d00
metais admin and ai
celuchmarek Aug 26, 2024
2faf6fe
raise an error on problematic extraction result job
celuchmarek Aug 27, 2024
ea545c1
Filter changes, small fixes, texts, fe
tomasdrga Sep 16, 2024
7ede0ae
Filter moved to models, added the same filter to admin, small fe changes
tomasdrga Sep 17, 2024
9cecb36
Fixed admin editing, FE stuff, filters for evaluations, misc stuff
tomasdrga Sep 24, 2024
747defa
Ordering of project documents, js errors fixed
tomasdrga Sep 25, 2024
bc05039
Modified the CI workflow to create datahub_test db
tomasdrga Sep 26, 2024
0ace20a
fixed failing rspec tests
tomasdrga Sep 30, 2024
f87241e
Added datahub db structure
tomasdrga Sep 30, 2024
21bd5b0
Test doubles in correct format
tomasdrga Sep 30, 2024
45de608
Change from instance double to double
tomasdrga Sep 30, 2024
ee63679
SyncProjectEventsJobSpec further changes
tomasdrga Sep 30, 2024
afeebfa
BE changes to clean up the code, added tooltips to origin types
tomasdrga Oct 3, 2024
e46e9f9
Added legend for project origin types, be fixes
tomasdrga Oct 3, 2024
e338404
Rake tasks execution time moved, linking of projects through metais c…
tomasdrga Oct 4, 2024
7e0473a
Separated the delete logic from data extraction result job, modified …
tomasdrga Oct 4, 2024
b2e270e
Update app/jobs/link_metais_projects_and_evaluations_job.rb
celuchmarek Oct 7, 2024
c2cbf41
grammar fix
celuchmarek Oct 7, 2024
56ff094
simplify sorting
celuchmarek Oct 7, 2024
74ace44
add AI button and fix AI result handle empty
celuchmarek Oct 9, 2024
f59eadb
handle no project plan in ai
celuchmarek Oct 9, 2024
d20b654
handle file deletion if even ai docs not found
celuchmarek Oct 9, 2024
5528eb2
fix redirect after ai start post
celuchmarek Oct 9, 2024
9b049b2
Sort direction field change fixed
tomasdrga Oct 10, 2024
b4fe070
Merged changes
tomasdrga Oct 10, 2024
bcd551c
Resolved conflict in metais/project.rb
tomasdrga Oct 10, 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
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ GOOGLE_APPLICATION_CREDENTIALS=
GOOGLE_SHEET_ID=
GOOGLE_SHEET_EXPORT_ID=
GOOGLE_SHEET_SCRIPT_URL=

API_URL=
2 changes: 1 addition & 1 deletion .github/workflows/slovensko_digital_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
with:
bundler-cache: true

- run: bundle exec rails db:create db:schema:load --trace
- run: bundle exec rails db:create db:structure:load --trace
- run: bundle exec rspec

gitlab-push:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.2
2.7.8
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.7.2
FROM ruby:2.7.8

# Install packages
RUN apt-get update && apt-get install -y build-essential nodejs libpq-dev
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

ruby '2.7.2'
ruby '2.7.8'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
Expand Down
Binary file added app/assets/images/acf.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/icons/ai_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/icons/metais_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/icons/sd_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/images/pontis_white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions app/assets/images/skdigital_biela.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/us_embassy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
55 changes: 15 additions & 40 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,56 +6,31 @@

@import 'projects';
@import 'static';

@import 'schedule';
@import 'statuses';
@import 'navbar';
@import 'footer';

h1, h2, h3, h4, h5, h6 {
font-family: $headings-font-family;
font-weight: $font-weight-bold;
}

.btn-outline-primary:hover {
border-color: $link-hover-color;
color: $link-hover-color;
background-color: transparent;
}

.navbar {
@include media-breakpoint-up(md) {
.navbar-brand img {
width: 240px;
}
}
}

.container {
max-width: 1024px;
.table-title-item, .table-price {
font-family: $headings-font-family;
font-size: large;
color: $black;
}

footer {
background-color: $gray-dark;
color: $white;

a {
color: $white;
&:hover {
color: $white;
}
}

.fa-inverse {
color: $gray-dark;
}

.icons {
a:hover {
text-decoration: none;
}
}
#filterForm.collapsing {
transition: height 0.5s ease-out;

.newsletter {
.legal {
font-size: $small-font-size;

a {
text-decoration: underline;
}
}
}
}

h1 .badge-alpha {
Expand Down
85 changes: 85 additions & 0 deletions app/assets/stylesheets/footer.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
footer {
background-color: $light_black;
color: $white;

a {
color: $white;
&:hover {
color: $white;
}
}

.fa-inverse {
color: $gray-dark;
}

.icons {
a:hover {
text-decoration: none;
}
}

.newsletter {
.legal {
font-size: $small-font-size;

a {
text-decoration: underline;
}
}
}
}

.footer-border {
border-left: 1px solid;
padding-left: 3rem;
}

.footer-sk {
padding-right: 3rem;
}

.pontis-logo {
width: 125px;
}

.us-logo, .acf-logo {
width: 200px;
}
@media (max-width: 1200px) {
.pontis-logo {
width: 100px;
}
.us-logo, .acf-logo {
width: 175px;
}
}
@media (max-width: 992px) {
.pontis-logo {
width: 75px;
}
.us-logo, .acf-logo {
width: 150px;
}
}
@media (max-width: 768px) {
.responsive-img {
width: 125px;
}
.footer-border {
border-top: 1px solid;
border-left: none;
padding-left: 2rem;
padding-right: 2rem;
padding-top: 3rem;
}
.footer-sk {
padding-right: 0;
padding-bottom: 3rem;
}
}
@media (max-width: 576px) {
.responsive-img {
width: 100px;
}
}
2 changes: 2 additions & 0 deletions app/assets/stylesheets/google-fonts.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import url('https://fonts.googleapis.com/css2?family=Roboto+Mono&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');

/* cyrillic-ext */
@font-face {
font-family: 'Merriweather';
Expand Down
29 changes: 29 additions & 0 deletions app/assets/stylesheets/navbar.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
.navbar {
@include media-breakpoint-up(md) {
.navbar-brand img {
width: 100%;
}
}
}

.navbar-light .navbar-nav .nav-link {
font-weight: $font-weight-semi-bold;
transition: 0.2s ease-in-out;
color: $black;
}

.navbar-light .navbar-nav .nav-link:focus {
color: $black;
}

.navbar-light .navbar-nav .nav-link:hover {
color: $blue;
}

.navbar-light .navbar-nav .nav-link:active {
color: $blue;
}

.navbar-light .navbar-nav .nav-item.active .nav-link {
color: $blue;
}
11 changes: 5 additions & 6 deletions app/assets/stylesheets/projects.scss
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,12 @@ img.emoji {
}

.accordion:after {
font-family: 'Merriweather';
font-size: $h3-font-size;
content: "-";
color: $black;
font-size: medium;
text-decoration: underline;
content: "Schovať hodnotené kritériá";
}

.accordion.collapsed:after {
font-family: 'Merriweather';
font-size: $h3-font-size;
content: "+";
content: "Zobraziť hodnotené kritériá";
}
100 changes: 100 additions & 0 deletions app/assets/stylesheets/schedule.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
.card {
position: relative;
display: flex;
flex-direction: column;
min-width: 100%;
word-wrap: break-word;
}

.card-body {
flex: 1 1 auto;
padding: 1.25rem;
}
.vertical-timeline {
width: 100%;
position: relative;
padding: 1.5rem 0 1rem;
}

.vertical-timeline::before {
content: '';
position: absolute;
top: 0;
left: 67px;
height: 100%;
width: 4px;
background: #e9ecef;
}

.vertical-timeline-element {
position: relative;
margin: 0 0 1rem;
}

.vertical-timeline--animate .vertical-timeline-element-icon.bounce-in {
visibility: visible;
animation: cd-bounce-1 .8s;
}
.vertical-timeline-element-icon {
position: absolute;
top: 0;
left: 60px;
}

.vertical-timeline-element-icon .badge-dot-xl {
box-shadow: 0 0 0 5px #fff;
}

.badge-dot-xl {
width: 18px;
height: 18px;
position: relative;
}
.badge:empty {
display: none;
}


.badge-dot-xl::before {
content: '';
width: 10px;
height: 10px;
border-radius: .25rem;
position: absolute;
left: 50%;
top: 50%;
margin: -5px 0 0 -5px;
background: #fff;
}

.vertical-timeline-element-content {
position: relative;
margin-left: 90px;
font-size: .8rem;
}

.vertical-timeline-element-content .timeline-title {
font-size: .8rem;
text-transform: uppercase;
margin: 0 0 .5rem;
padding: 2px 0 0;
font-weight: bold;
}

.vertical-timeline-element-content .vertical-timeline-element-date {
display: block;
position: absolute;
left: -100px;
top: 0;
padding-right: 10px;
text-align: right;
color: #000000;
font-size: .7619rem;
white-space: nowrap;
}

.vertical-timeline-element-content:after {
content: "";
display: table;
clear: both;
}
Loading
Loading