prodV1 #2

RomanGolienko · 2024-03-27T12:04:08+03:00

RomanGolienko commented

2024-03-27 12:04:08 +03:00

No description provided.

RomanGolienko added 267 commits 2024-03-27 12:04:09 +03:00

63441e5ef7 design changes for admin-layout.blade.php and reception-screen.blade.php

de6b83d675 refactoring routes

fe8e9c94c0 rename fileController to DocumentController

56d4f387b8 add Direction resource

4cbf0cadda fix CI

f1442e66d8 fix CI

490c04f772 fix CI

a2a00831ad fix CI

887d946558 fix CI

9ebb8e8372 fix CI

3da2646052 fix CI

98a2dd92f8 fix CI

95f2c72231 fix CI

03690516f5 fix CI

3d14987fcb fix CI

023dba341a fix CI

eb4206e86d fix CI

caafa73a1b fix CI

447f8f5552 fix CI

8e18821812 fix CI

b75c784cdf fix CI

559d925c51 fix CI

afebc7ea6c fix CI

b07fb7648f refactoring delete not used elements

abfa800707 refactoring regroup requests

35104455c2 refactoring Department resource

7d4461e231 add tests to Department resource

1091847227 refactoring fix lint Department resource

c5abf73eb0 refactoring fix lint Direction resource

07cb065e1c add FOREIGN KEY direction and department

54765f6202 refactoring Departments and Directions

f391a26b7d refactoring Faculty resource

173a744f79 refactoring routes

1f67f437f3 refactoring EducationalInstitution resource

94300bee31 refactoring Service Layer

551864fbb8 refactoring rename admin view

e15ff69e01 design variations

3e50dee628 refactoring Reception screen to Admission

968a4b06c8 refactoring requests rules

fffd4c3310 refactoring views, rename routes

4b094339f0 refactoring Document and Admission resource

5a462a0823 add field URL to show views from department, direction, documents

1659980a2e refactoring Admission and Document resource

2a21e25200 fix field description from string to text

fc706fce82 refactoring User resource

a5f8751f94 refactoring User resource

0cdc43d547 refactoring User resource

83a398c5bc fix lint 120 char per line

52d3d7af09 fix lint

6a4c2253d1 move views from menu to pages

d9b8f8be33 delete unused element

295d7a5711 fix update unique name

75899051c7 add Education Level resource

639a8c92af add Education Level test

6954e296d6 refactoring migrations nullable or not

e7818471db refactoring Requests max characters and numeric field

454a4a6d96 fix lint

17625fd0d4 fix lint delete comments

8cf5631f5a add Education Form resource

9beeeb4edb add field education form to show Direction

dc54ec6b74 design changes for admin-layout.blade.php and reception-screen.blade.php

c4d11de8ad design variations

23033cbb1f refactoring fix unique field slug in Requests

d9362477c2 refactoring move to directory Direction

1070d543c5 add ExaminationType resource

4e5d567720 new design (blue)

88919c251d Merge remote-tracking branch 'origin/new-design' into new-design

33bf946ab2 Merge pull request 'new-design' (#14 ) from RomanGolienko/Roman_applicant-site:new-design into main

Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/14

7b6db05648 new design (blue) font added in public/fonts

7d149e8845 Merge pull request 'new design (blue) font added in public/fonts' (#15 ) from RomanGolienko/Roman_applicant-site:new-design into main

Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/15

6e7ed94654 add Docker for deploy

00271923b1 add xdebud.ini

46d984b49b add php 8.3

90488e5d99 add php 8.3

4b154e1160 add php 8.3

96e2e4270c add php 8.3

65d9b41197 add php 8.3

f8f6d4b3d3 add fix in appservice provider

8b2736e785 add comand db-prepare and start-app

0fc9053675 add dev to install docker

c34ba769dd add faker to required

a78f2bdef5 add faker to required

e86a93d3d4 add refresh

1e0cf9a9e0 fix lint

f5d69e9c7f fix tests error show view on examination type

5f3c4449c0 add ExaminationTypeTest.php

1462d70800 add Subject resource

84061c6c95 fix structure files

5b1e4cab99 fix SubjectType recourse

1ae23bc31c fix deploy crash

be385af496 fix deploy crash

881c0c63b7 add EntranceExamination resource

566087919b add EntranceExamination resource

7d08fb0e12 Merge remote-tracking branch 'github/main'

# Conflicts:
#	app/Http/Controllers/admin/Catalog/Direction/EntranceExaminationController.php

75452eff7d any fix in Subject type resource

52dd465532 add Place and PlaceType resources

d8dbf40445 lint fix

115f49ea53 add Cost resource

1e804e1161 fix rename methods in PlaceController.php

5f5c3135d8 add Direction Profile resource

88cf25014c lint fix

cc64e20ad5 add Period resource

afcdd940dd add Period resource

74d0c8f678 add Period resource

4ed8dabb19 add Period resource

c1dbcc82b3 add quota at Places Resource

3cb9ec4a08 add jquery to project

422a5872c9 add entrance Examination to store Direction

f482d036e1 any fix

727d273d97 main page completed

022d8cc0ec Merge pull request 'main page completed' (#16 ) from RomanGolienko/Roman_applicant-site:new-design into main

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/16

ade2422a4b reorganization resource Cost, Places, Placetype, Period

bd8bb7e059 reorganization direction resource

9d7f531ac8 reorganization DirectionProfile and Direction to many to many

44fdacb9e4 Merge branch 'main' of gitea.mkgtu.ru:aslan/applicant-site

86597ad075 refactoring Direction edit, add firstOrNew in add entrance-examination

435ad06dca add duplication at Direction

d0a9dcae2b lint fix

e7aba8b09c modal added

68dddc98fe modal added

8109381611 Merge pull request 'modal added' (#17 ) from RomanGolienko/Roman_applicant-site:new-design into main

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/17

f24aa19877 variations added

a8c6394684 Merge pull request 'variations added' (#18 ) from RomanGolienko/Roman_applicant-site:new-design into main

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/18

0a9f7ab004 add locale for requests and position helper

3dc4b84357 Merge branch 'main' of gitea.mkgtu.ru:aslan/applicant-site

c4caf84226 add rules message and active class to main menu

b3d4231ec8 for view faculty

6ae42fafe8 fix DirectionProfile store and update

33b803472d adding logic in views

1163f5e007 Merge pull request 'adding logic in views' (#19 ) from RomanGolienko/Roman_applicant-site:new-design into main

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/19

19ea529eb2 fix tests errors

7f98a7edc5 merge roman

98e7687d72 composer update

b095a0f51b fix tests errors

6fa24915be add api route for calculator

d3c6a8336a add localize for tooltips for Faculty create

2c209f5ddc add unique field for faculty and bootstrap validation for Faculty

50be5bfd70 adding logic in views

471d02aac5 adding logic in views

cc89ecabe8 add bootstrap validation for Direction

b372f14c37 new-design changes

19b075c755 add api calculator

b43e602fab Merge pull request 'new-design' (#20 ) from RomanGolienko/Roman_applicant-site:new-design into main

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/20

730573b1fe fix CI

f68e22fa9f new-design changes

5d7863a655 Merge pull request 'new-design' (#21 ) from RomanGolienko/Roman_applicant-site:new-design into main

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/21

d0abc35a07 fix calculator

f1cefa1184 new-design changes

6ac6c8436b update composer

09b7c8cbe3 add faculty bootstrap validate to faculty update

f15fc3f7f7 new-design changes

b9c143bab5 add Logging to project with route admin/logs

3c37c2b903 add logging to faculty

bbd706bd82 add logging to faculty

54e3706dd0 Merge pull request 'new-design changes' (#22 ) from RomanGolienko/Roman_applicant-site:new-design into main

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/22

2eca5776b9 fix lint & tests errors

ad97ed8a43 add setup scenario for CI

e2a7b2ec98 fix scenario for deploy CI

64ad13f96f add bootstrap validated and logging to Direction Profile and fix faculty Logging

40414f6da8 add bootstrap validated and logging to Subject Type Profile

66fdb9d7b0 add Slug Helper

2c32dd8667 any fix direction profile

1ef21ae943 calculator

15c6dcc5bc Merge remote-tracking branch 'origin/new-design' into new-design

# Conflicts:
#	resources/views/new-design/bakalavr-special.blade.php

08c6632aec Merge branch 'new-design' of http://172.17.254.104/RomanGolienko/Roman_applicant-site into RomanGolienko-new-design

9e689c8b68 Merge branch 'RomanGolienko-new-design'

ed47971981 disable phpcs for html code in services

5cf8061fd5 add bootstrap validated and logging to Subject

59d2e38110 fix logging level to Faculty

db7704df6e fix to Faculty

4eee38fea3 add bootsrtap validation and Logging for Examination type

299817069e add bootstrap validation and Logging for Education Level

2104362d4e add bootstrap validation and Logging for Education Form

4e2d8bec4b add bootstrap validation and Logging for Entrance Examination

4af0da1984 cross-browser code added

6230a15d17 Merge pull request 'cross-browser code added' (#24 ) from RomanGolienko/Roman_applicant-site:new-design into main

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/24

5fa4b20ec7 add bootstrap validation and Logging for Department

ebe604293f Merge branch 'main' of gitea.mkgtu.ru:aslan/applicant-site

8a6e1bea3d fix lint and test

be5eb8fa82 fixing professor

4cb1422b09 Merge pull request 'fixing professor' (#25 ) from RomanGolienko/Roman_applicant-site:new-design into main

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/25

7f2f24ca59 add bootstrap validation and Logging for Educational Institution

f3c98e1548 Merge branch 'main' of gitea.mkgtu.ru:aslan/applicant-site

ec57a7bd02 fix slug store in Educational Institution

54901c7ed5 add Logging to DirectionController

78c5d7700e fix messages valdation and any fix

e397d4b46a fix slug deparment

45143e541f add edit direction validation bootstrap

919bfca236 fix tooltips

7c904cec0e fixing professor

a0ce271215 Merge pull request 'fixing professor' (#26 ) from RomanGolienko/Roman_applicant-site:new-design into main

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/26

f7b5773c4d adding white logo, fixing

490f720850 Merge pull request 'adding white logo, fixing' (#27 ) from RomanGolienko/Roman_applicant-site:new-design into main

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/27

3d71cdde17 any fix

6187bf360e fix cost paid 200 000

f5638722a6 fix unique table directions field name

858492cd2e fix cost_paid_place table directions field name

27cbb5d8cf desc sort to direction

1743d10289 fix calculator

ac72d0d562 fix calculator

b9ad413fbb fix calculator

5fc547803c 1

1aded8007b Merge pull request '1' (#28 ) from RomanGolienko/Roman_applicant-site:new-design into main

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/28

ef1524b96e fix

2cfca44edc fix lint

99f6e2afde Merge pull request 'fix' (#29 ) from RomanGolienko/Roman_applicant-site:new-design into main

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/29

04d596b0eb fix table departments field name not unique

f1ffe64ef3 update logic for delete direction

c35a3cefcb delete negative destroy test direction

48767bbf27 add faculty to department

8d1078e8d5 add direction profile to direction index

61ed53e348 add no cache to header

cf8cbe5670 install maatwebsite/excel

8304fb438d fix type field to create Educational Institution

03b8fa831d add faculty to department field in edit direction

c6742d7d5e delete unique to department in requests

e93ffe4705 add gitea host to CI deploy

93a54c12fd add gitea host to CI deploy

51f313b85a add gitea host to CI deploy

9496a627fd add gitea host to CI deploy

8723cc7594 add gitea host to CI deploy

dbb3e4190b add gitea host to CI deploy

339b4bfb83 add gitea host to CI deploy

0996ea3b8c add gitea host to CI deploy

dcac3ed4a9 add gitea host to CI deploy

00ae3b8938 add gitea host to CI deploy

242d498685 direction offcanvas design change

056452b137 Merge pull request 'direction offcanvas design change' (#30 ) from RomanGolienko/Roman_applicant-site:new-design into main

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/30

b5951c2d34 add import xls

1155f2c34a Merge remote-tracking branch 'origin/main'

c91ae889a3 direction show logic change

18c703f931 Merge pull request 'direction show logic change' (#31 ) from RomanGolienko/Roman_applicant-site:new-design into main

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/31

8e8b16d540 adding logic to direction view

5202545724 Merge pull request 'adding logic to direction view' (#32 ) from RomanGolienko/Roman_applicant-site:new-design into main

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/32

c13f5f38c2 fix lint

08bc93ad2d add new logic to calculator with required and optional subjects

b37a1225c4 fix new logic to calculator with required and optional subjects

1bd362180e fix lint

077eda117f fix new logic to calculator with required and optional subjects

68ccbf2910 fix new logic to calculator with required and optional subjects

8a94e7a750 fix new logic to calculator with required and optional subjects

75870ab2fd fix new logic to calculator with required and optional subjects

9fcd049173 fix new logic to calculator with required and optional subjects

c2616e8713 adding to gitignore

f93404d996 adding to gitignore

116c949f45 fixing directions

7fe4d05252 Merge remote-tracking branch 'origin/new-design' into new-design

16785b5698 add queryBuilder and add filter to name for Direction

c3eed199ac add directionsWithInstitution to new-design.bakalavr-special

303f4e59a0 adding to gitignore

4fc8a80a04 fixing directions

56662905a9 calculator design fix

419ec63dde Merge remote-tracking branch 'origin/new-design' into new-design

d5ace86b61 add news

560679316d design changes

8520384aa3 Merge remote-tracking branch 'origin/new-design' into new-design

8667765396 Merge pull request 'new-design' (#33 ) from RomanGolienko/Roman_applicant-site:new-design into main

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/33

3bf100ed74 design changes

9bd1c03580 Merge pull request 'design changes' (#34 ) from RomanGolienko/Roman_applicant-site:prodV1 into main

Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/34

ba9f268ff7 add groupedDirections array to main page

09f4ed38f8 Merge remote-tracking branch 'origin/main'

bb262c66f4 fix groupedDirections array to main page - add branches

e42910067b fix groupedDirections array to main page - add information for faculty

e435e5c7dd fix lint

1f207a427d redesign of direction card

a9f9a8f0fe fixing budget_places button

2f7474d311 direction view completed, favicon changed

RomanGolienko added 7 commits 2024-03-27 14:03:25 +03:00

4ff59c8d11 Merge pull request 'redesign of direction card' (#35 ) from RomanGolienko/Roman_applicant-site:prodV1 into main

Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/35

b47d800d19 fix lint

c45bbe4a77 fix CI deleted JIT

484038d9c5 fix CI add php8.3-gd

742d604f07 fix CI add php8.3-gd

dd8db9dc4b small design fixes

22e6a16c32 Merge branch 'prodV1' of http://172.17.254.104/RomanGolienko/Roman_applicant-site into prodV1

RomanGolienko added 6 commits 2024-03-27 15:50:08 +03:00

RomanGolienko added 4 commits 2024-04-01 15:57:24 +03:00

edb4a2b383 fix ci

d7430e13ee fix ci

61defaaf37 Merge pull request 'adaptive design fixes' (#39 ) from RomanGolienko/Roman_applicant-site:prodV1 into main

Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/39

bc0cd7989c direction offcanvas minor changes

RomanGolienko added 2 commits 2024-04-02 15:53:32 +03:00

a8d0774aea Merge pull request 'direction offcanvas minor changes' (#40 ) from RomanGolienko/Roman_applicant-site:prodV1 into main

Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/40

66ae948c6e adding news block and yandex maps api

RomanGolienko added 1 commit 2024-04-03 15:16:55 +03:00

859a94be84 minor design changes

RomanGolienko added 8 commits 2024-04-04 14:15:15 +03:00

9a205d06f5 Merge pull request 'adding news block and yandex maps api' (#41 ) from RomanGolienko/Roman_applicant-site:prodV1 into main

Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/41

ddf218bbf7 fix ci

0e65ddaed0 add new calculator

5547d00565 fix logic new calculator

4ccd7b651e Merge pull request 'minor design changes' (#42 ) from RomanGolienko/Roman_applicant-site:prodV1 into main

Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/42

432b3d0c5d Merge pull request 'new-calculator' (#43 ) from new-calculator into main

Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/43

dce51c638d fix lint

48faac8771 fixing main page

RomanGolienko added 2 commits 2024-04-05 16:37:16 +03:00

0c16dc960e Merge pull request 'fixing main page' (#44 ) from RomanGolienko/Roman_applicant-site:prodV1 into main

Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/44

a3819e02a1 adding video, fixing adaptive

RomanGolienko added 1 commit 2024-04-08 11:14:46 +03:00

1ca14c903c minor design changes

RomanGolienko added 3 commits 2024-04-09 15:53:46 +03:00

03b895e32c Merge pull request 'adding video, fixing adaptive' (#45 ) from RomanGolienko/Roman_applicant-site:prodV1 into main

Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/45

c6986b6c74 Merge pull request 'minor design changes' (#46 ) from RomanGolienko/Roman_applicant-site:prodV1 into main

Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/46

31339e6b29 minor design fixes, adding magistr and inostran pages

RomanGolienko added 3 commits 2024-04-15 16:28:14 +03:00

dd859d0ebf Merge pull request 'minor design fixes, adding magistr and inostran pages' (#47 ) from RomanGolienko/Roman_applicant-site:prodV1 into main

Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/47

aca13d134d fix ci

3057579f9e adding news section

RomanGolienko added 1 commit 2024-04-16 14:22:50 +03:00

bdf4e7b64c fixing news section, adding adaptive

RomanGolienko added 2 commits 2024-04-17 14:23:59 +03:00

a1e936f156 Merge pull request 'adding news section' (#48 ) from RomanGolienko/Roman_applicant-site:prodV1 into main

Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/48

ab0d2db731 adding news to inostran and magistr pages

RomanGolienko added 2 commits 2024-04-22 14:23:12 +03:00

933b0f7e99 Merge pull request 'adding news to inostran and magistr pages' (#49 ) from RomanGolienko/Roman_applicant-site:prodV1 into main

Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/49

ca2c92f4fe fixing green circle button

This pull request can be merged automatically.

You are not authorized to merge this pull request.

You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.

git checkout -b prodV1 main

git pull origin prodV1

Step 2:

Merge the changes and update on Gitea.

git checkout main

git merge --no-ff prodV1

git push origin main

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No Assignees

1 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: RomanGolienko/Roman_applicant-site#2