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

Refactor #99

Open
wants to merge 221 commits into
base: INCT-92-valid
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
221 commits
Select commit Hold shift + click to select a range
c5a1a5c
1440x1440 photo display in SwiperSlider
admalla Feb 13, 2024
6d82890
1440x1440 photo display in SwiperSlider
admalla Feb 13, 2024
b4cbab2
fixed the photo stretching
admalla Feb 13, 2024
b7a3ebd
feat/INCT-232 - fixed the photo stretching
admalla Feb 14, 2024
d15f5ec
feat/INCT-232 - fixed the photo stretching
admalla Feb 14, 2024
0ae3e93
fix duplication on /public-page and some fix
admalla Feb 15, 2024
4ea55c2
fix duplication on /public-page and some fix
admalla Feb 15, 2024
ad8fc44
Merge pull request #95 from elem15/duplications-photo-fix
admalla Feb 15, 2024
9642dc9
feat/INCT-232 - fix blinking photo
admalla Feb 17, 2024
3c34101
feat/INCT-232 - fix blinking photo
admalla Feb 17, 2024
078444d
feat/INCT-232 - fix TimeAgo and warning from console
admalla Feb 19, 2024
d76b9d2
feat/INCT-232 - some fix for build
admalla Feb 20, 2024
8131188
Merge pull request #96 from elem15/duplications-photo-fix
elem15 Feb 20, 2024
0e993ec
feat/INCT-233- subscription
admalla Mar 6, 2024
c91ec40
Devices
Ustin4 Mar 7, 2024
d7e6ed3
Devices
Ustin4 Mar 7, 2024
825d474
Devices
Ustin4 Mar 7, 2024
940019b
Devices active
Ustin4 Mar 10, 2024
3a2d422
Devices delete
Ustin4 Mar 10, 2024
62e2d33
Devices delete
Ustin4 Mar 10, 2024
00af1d9
Icons
Ustin4 Mar 11, 2024
be7cbd7
feat/INCT-233- fix/subscription
admalla Mar 12, 2024
04a66b6
feat/INCT-233 - some fix
admalla Mar 17, 2024
de4b03e
Language and pretty
Ustin4 Mar 18, 2024
1f1849e
Language and pretty
Ustin4 Mar 19, 2024
f8ea8e2
Next.js
Ustin4 Mar 19, 2024
c6b03ec
Add icon
Ustin4 Mar 19, 2024
8e374fa
Merge pull request #97 from elem15/INCT-92-valid
elem15 Mar 19, 2024
ff65bcd
Refactor devices
Ustin4 Mar 21, 2024
d743699
Refactor devices
Ustin4 Mar 21, 2024
cd3deaf
Refactor devices
Ustin4 Mar 21, 2024
f0895ff
Disable button
Ustin4 Mar 29, 2024
6ec544c
INCT-196 fix: sorted device from Data
Ustin4 Mar 30, 2024
17f4512
INCT-196 fix: sorted device from Data
Ustin4 Mar 30, 2024
de83fe0
INCT-196 fix: sorted device from Data
Ustin4 Apr 2, 2024
c31621c
INCT-196 fix: cursor log out and logo out button
Ustin4 Apr 3, 2024
4989a16
INCT-196 fix: log out icon and adapt for mobile
Ustin4 Apr 6, 2024
96b1f75
INCT-196 fix: log out icon and adapt for mobile
Ustin4 Apr 8, 2024
f622d8a
feat/INCT-233 - add autoRenewal
admalla Apr 12, 2024
77ddd17
INCT-235 fix: validation general Information
Ustin4 Apr 12, 2024
35761e2
INCT-235 fix: valid ganeral information
Ustin4 Apr 12, 2024
d567bb0
fix valid
Ustin4 Apr 12, 2024
5a17275
INCT-235 fix: validation for userName
Ustin4 Apr 13, 2024
2229aaa
feat/INCT-233 - refactor
admalla Apr 13, 2024
f1f94cb
feat/INCT-233 - some fix
admalla Apr 14, 2024
6b4561c
feat/INCT-233 - fix date form
admalla Apr 16, 2024
2eb1d51
feat/INCT-233 - some fix
admalla Apr 16, 2024
4680ef8
Merge pull request #100 from elem15/INCT-196
elem15 Apr 16, 2024
43c1a6f
feat/INCT-233 - some fix and refactor
admalla Apr 17, 2024
28ea4d2
Merge branch 'dev' into feat/INCT-233
admalla Apr 17, 2024
d1ba062
feat/INCT-233 - some fix
admalla Apr 17, 2024
61343aa
INCT-235 fix: esLint and pretty fix
Ustin4 Apr 18, 2024
c397f5b
feat/INCT-235 Buying more subscriptions (UC-18)
admalla Apr 19, 2024
8dac20a
feat/INCT-235 some fix
admalla Apr 21, 2024
73c38b3
feat/INCT-235 some fix
admalla Apr 24, 2024
b130329
feat/INCT-236 add My Payments
admalla Apr 26, 2024
3c34140
feat/INCT-236 some fix
admalla Apr 26, 2024
74d3238
feat/INCT-236 fix display of payment information
admalla Apr 27, 2024
0abd8f1
feat/INCT-236 some fix
admalla Apr 27, 2024
9b92556
feat/INCT-236 some fix
admalla Apr 27, 2024
0f40aea
feat/INCT-236 some fix
admalla Apr 27, 2024
83dfe7a
feat/INCT-236 some fix
admalla Apr 30, 2024
1a45c49
Merge pull request #101 from elem15/INCT-235
elem15 May 1, 2024
a8d3a59
Merge pull request #102 from elem15/feat/INCT-235
elem15 May 1, 2024
611716e
Merge pull request #103 from elem15/feat/INCT-236
elem15 May 1, 2024
a32989f
INCT-254 feat: superAdmin layout and page
Ustin4 May 5, 2024
cd2ca6a
feat/INCT-253 Drafting
admalla May 6, 2024
3272170
INCT-dev fix: adminPanel
Ustin4 May 7, 2024
b0fb4b9
INCT-254 feat: add admin Page and layout and page for admin
Ustin4 May 7, 2024
d4c040b
INCT-254 fix: build fix
Ustin4 May 8, 2024
276a659
feat/INCT-253 some refactor from code review
admalla May 9, 2024
934b56f
INCT-dev fix: conflict merge device
Ustin4 May 13, 2024
834bc0a
INCT-dev fix: conflict merge device
Ustin4 May 13, 2024
e8d2d8a
Merge pull request #106 from elem15/fix-device-from-dev
elem15 May 14, 2024
9313b82
Merge pull request #104 from elem15/feat/INCT-253
elem15 May 14, 2024
1a7c820
INCT-254 fix: conflict merge into dev
Ustin4 May 14, 2024
e485bca
Merge branch 'dev' into INCT-254
elem15 May 14, 2024
63fa10b
INCT-254 fix: conflict merge into dev
Ustin4 May 14, 2024
9dc99c4
Merge remote-tracking branch 'origin/INCT-254' into INCT-254
Ustin4 May 14, 2024
e3ab060
Merge pull request #107 from elem15/INCT-254
elem15 May 15, 2024
ea66209
feat/INCT-258 WIP: User List
admalla May 18, 2024
4d5c489
feat/INCT-258 some fix
admalla May 18, 2024
86a48b5
INCT-258 feat:list of usersAdmin
Ustin4 May 18, 2024
a2a3d5b
feat/INCT-258 show users
admalla May 19, 2024
99e3501
Merge branch 'feat/INCT-258' of https://github.com/elem15/inctagram i…
admalla May 19, 2024
f7f9c61
feat/INCT-258 some fix
admalla May 19, 2024
fca91f1
feat/INCT-258 UC-25 Done!
admalla May 19, 2024
ad98a65
INCT-254 fix: admin
Ustin4 May 21, 2024
f95d106
feat/INCT-253 add indexedDB
admalla May 22, 2024
76d5f66
INCT-254 fix: admin
Ustin4 May 22, 2024
63d7500
INCT-258 feat: delete user
Ustin4 May 22, 2024
f44128d
feat/INCT-253 some fix
admalla May 23, 2024
602d379
Merge branch 'refs/heads/feat/INCT-258' into feat/INCT-262
admalla May 24, 2024
aa8c19b
feat/INCT-262 user search
admalla May 24, 2024
be2e1f6
feat/INCT-254 some fix
admalla May 24, 2024
27715b7
feat/INCT-262 some fix
admalla May 25, 2024
0c1e432
Merge branch 'refs/heads/feat/INCT-258' into feat/INCT-260
admalla May 25, 2024
8165a30
Merge branch 'refs/heads/feat/INCT-262' into feat/INCT-260
admalla May 25, 2024
6072510
Merge pull request #110 from elem15/INCT-254
elem15 May 25, 2024
b3755ef
feat/INCT-260 Delete User and refactor Select
admalla May 25, 2024
b66db89
feat/INCT-260 some fix
admalla May 25, 2024
f3cbcbd
feat/INCT-260 some fix
admalla May 26, 2024
195495a
feat/INCT-262 some fix
admalla May 26, 2024
138eb62
feat/INCT-258 delete warnings
admalla May 26, 2024
9310d2d
feat/INCT-258 some fix
admalla May 26, 2024
c465c94
feat/INCT-258 some fix
admalla May 26, 2024
8526dad
Merge branch 'refs/heads/feat/INCT-258' into dev
admalla May 26, 2024
41b6d5e
Merge branch 'refs/heads/feat/INCT-262' into dev
admalla May 26, 2024
ebf7f9a
Merge branch 'refs/heads/feat/INCT-260' into dev
admalla May 26, 2024
a33ab4f
merge three branches
admalla May 26, 2024
b80578e
Merge pull request #112 from elem15/merge-INCT(258-260-262)
elem15 May 26, 2024
8323465
Merge pull request #113 from elem15/dev
elem15 May 27, 2024
4fee3af
add sorting-by-status-user
admalla May 27, 2024
b44f5f6
INCT-254 fix: confict merge
Ustin4 May 27, 2024
4a80c06
INCT-254 fix: confict merge
Ustin4 May 27, 2024
31fd1e6
add status in Local Storage
admalla May 29, 2024
b814075
some fix
admalla May 29, 2024
9748189
some fix
admalla May 30, 2024
afc5a16
Merge pull request #114 from elem15/fixMerg-254AdminLoyalt-from-dev
elem15 May 30, 2024
8dfe918
Merge pull request #116 from elem15/sorting-by-status-user
elem15 May 30, 2024
d3cb607
INCT-254 fix: confict merge after testing with local dev
Ustin4 May 31, 2024
950b31a
Merge branch 'dev' into INCT-254
elem15 May 31, 2024
2c82a27
Merge pull request #115 from elem15/INCT-254
elem15 May 31, 2024
dfa0e93
add sorting
admalla Jun 4, 2024
9514a36
Merge branch 'refs/heads/feat/INCT-253' into dev
admalla Jun 5, 2024
b4a1a7c
add indexedDB
admalla Jun 5, 2024
5a157f4
INCT-254 fix: fix bag for admin
Ustin4 Jun 5, 2024
ad246dc
Merge branch 'refs/heads/feat/INCT-264-User-sorting' into dev
admalla Jun 6, 2024
10aed14
Merge pull request #119 from elem15/INCT-254-fix-cinflictMerge-in-dev…
elem15 Jun 6, 2024
097ef2a
Merge pull request #117 from elem15/feat/INCT-264-User-sorting
elem15 Jun 6, 2024
2aaabe5
WIP
admalla Jun 9, 2024
38ff3f9
Merge remote-tracking branch 'origin/dev' into dev
admalla Jun 9, 2024
0949dda
Merge branch 'refs/heads/dev' into feat/INCT-266
admalla Jun 9, 2024
b05e281
INCT-266 add More information
admalla Jun 11, 2024
1784dd9
INCT-266 some fix
admalla Jun 12, 2024
4b25ef2
INCT-266 some fix
admalla Jun 12, 2024
5a1145f
Merge pull request #118 from elem15/add-indexedDB-in-branch-253
elem15 Jun 12, 2024
b867b13
Merge remote-tracking branch 'origin/dev' into dev
admalla Jun 12, 2024
9ced5cf
Merge branch 'refs/heads/dev' into feat/INCT-266
admalla Jun 12, 2024
19f19b3
Merge pull request #120 from elem15/feat/INCT-266
elem15 Jun 12, 2024
9d1b1ef
INCT-266 some fix
admalla Jun 12, 2024
6237dcc
INCT-266 some fix
admalla Jun 12, 2024
c5f9e14
Merge branch 'refs/heads/feat/INCT-266' into fix/prettier
admalla Jun 12, 2024
253c73c
INCT-266 fix prettier and some refactor
admalla Jun 12, 2024
592d8df
Merge pull request #122 from elem15/fix/prettier
elem15 Jun 12, 2024
3db6eaa
INCT-270 feat: creat a banUser
Ustin4 Jun 12, 2024
c32c381
INCT-270 feat: creat a banUser
Ustin4 Jun 17, 2024
a065b64
INCT-270 feat: creat a banUser
Ustin4 Jun 19, 2024
6f087b9
INCT-268 WIP
admalla Jun 20, 2024
d30a9a9
INCT-268 WIP
admalla Jun 21, 2024
89ce474
INCT-268 Notifications
admalla Jun 23, 2024
7a62c99
INCT-268 some fix
admalla Jun 23, 2024
92feba2
INCT-268 some fix
admalla Jun 24, 2024
bc2f012
INCT-268 some fix
admalla Jun 24, 2024
2831dcd
INCT-268 some fix
admalla Jun 25, 2024
cef9e8e
INCT-254 fix: confict merge after testing with local dev
Ustin4 Jun 29, 2024
43c4c97
INCT-254 fix: confict merge after testing with local dev
Ustin4 Jun 29, 2024
e755731
INCT-254 fix: confict merge after testing with local dev
Ustin4 Jul 1, 2024
85b1b66
INCT-268 BIG fix
admalla Jul 2, 2024
343d5f8
INCT-254 fix: confict merge after testing with local dev
Ustin4 Jul 2, 2024
a0d3971
INCT-254 fix: confict merge after testing with local dev
Ustin4 Jul 2, 2024
b93c93e
INCT-254 fix: confict merge after testing with local dev
Ustin4 Jul 2, 2024
6dac294
INCT-268 BIG fix
admalla Jul 3, 2024
8ea9d6a
INCT-254 fix: confict merge after testing with local dev
Ustin4 Jul 3, 2024
a91de5f
INCT-268 some fix
admalla Jul 3, 2024
e8c1fc6
INCT-268 some fix
admalla Jul 3, 2024
ba95300
INCT-271 init: unBan Users
Ustin4 Jul 4, 2024
d6f05b5
INCT-268 some fix
admalla Jul 4, 2024
e9b2f0f
INCT-268 some fix
admalla Jul 4, 2024
676b227
INCT-268 some fix
admalla Jul 4, 2024
bfce161
Merge pull request #124 from elem15/feat/INCT-268-(WebSocket)
elem15 Jul 4, 2024
f57aeb3
Merge branch 'refs/heads/INCT-270' into fix-dev-with-270
Ustin4 Jul 4, 2024
64a954d
INCT-271 fix: conflict with dev 270
Ustin4 Jul 4, 2024
6f3e265
INCT-271 fix: conflict with dev 270
Ustin4 Jul 4, 2024
0523211
Merge pull request #126 from elem15/fix-dev-with-270
elem15 Jul 4, 2024
ebd7ae5
Merge branch 'refs/heads/INCT-271' into dev-fix-merge-271
Ustin4 Jul 4, 2024
615cc2d
Merge branch 'dev' into dev-fix-merge-271
Ustin4 Jul 4, 2024
fc287e1
INCT-270 feat: creat a banUser
Ustin4 Jul 5, 2024
14c91f6
Merge pull request #128 from elem15/dev-fix-merge-271
elem15 Jul 5, 2024
6c7fd49
Merge remote-tracking branch 'origin/dev' into dev
admalla Jul 6, 2024
fb2d41a
INCT-274 view payment list
admalla Jul 9, 2024
f3ef78c
INCT-274 add Avatar of User
admalla Jul 12, 2024
9e204d4
INCT-274 add socket.io-client
admalla Jul 12, 2024
1329c75
Merge pull request #129 from elem15/feat/INCT-274
elem15 Jul 12, 2024
5eda1b6
INCT-279 feat: post by followwers
Ustin4 Jul 16, 2024
5310950
INCT-279 feat: post by followwers
Ustin4 Jul 16, 2024
36a6323
INCT-276 WIP
admalla Jul 17, 2024
ece5553
INCT-279 feat: comment posts
Ustin4 Jul 17, 2024
0fb8b28
INCT-279 feat: comment posts
Ustin4 Jul 21, 2024
a19e282
INCT-276 Ready
admalla Jul 21, 2024
fb58080
INCT-276 some fix
admalla Jul 23, 2024
c75e9d0
INCT-276 some fix
admalla Jul 23, 2024
085b83d
INCT-276 some fix
admalla Jul 23, 2024
9c05bb7
INCT-276 some fix
admalla Jul 23, 2024
76bff70
Merge pull request #130 from elem15/feat/INCT-276
elem15 Jul 23, 2024
e0d1981
INCT-276 some fix
admalla Jul 23, 2024
424b925
Merge pull request #131 from elem15/feat/INCT-276
elem15 Jul 24, 2024
8976266
INCT-278 completed UC-35
admalla Jul 26, 2024
4d3834a
INCT-279 feat: comment posts
Ustin4 Jul 26, 2024
40aa881
INCT-278 fix: count following for User
admalla Jul 30, 2024
6c7ba32
INCT-278 some fix
admalla Jul 30, 2024
0879e80
INCT-278 some fix
admalla Jul 30, 2024
16f1452
Merge pull request #132 from elem15/feat/INCT-278
elem15 Jul 30, 2024
14a73f9
INCT-279 feat: comment posts
Ustin4 Aug 2, 2024
30a6f76
INCT-279 feat: comment posts
Ustin4 Aug 3, 2024
d03991a
INCT-279 feat: comment posts
Ustin4 Aug 5, 2024
1a4d733
INCT-279-rebase feat: comment posts and like and ban and unban
Ustin4 Aug 6, 2024
df6a218
INCT-279 fix: home page
Ustin4 Aug 7, 2024
b731d6d
INCT-279 fix: home page without fakePost
Ustin4 Aug 7, 2024
037fd48
INCT-279 fix: home page without fakePost
Ustin4 Aug 7, 2024
62f74fa
INCT-279 feat: UC36-37 remake
Ustin4 Aug 18, 2024
01cce66
INCT-279 feat: UC36-37 remake
Ustin4 Aug 18, 2024
e575681
INCT-279 feat: UC36-37 remake
Ustin4 Aug 19, 2024
f6a837d
INCT-279 feat: UC36-37 remake
Ustin4 Aug 19, 2024
ee1163b
INCT-279 feat: UC36-37 remake
Ustin4 Aug 20, 2024
e59db81
INCT-279 feat: UC36-37 remake
Ustin4 Aug 20, 2024
a06f8d2
INCT-271 fix: conflict with dev 270
Ustin4 Aug 20, 2024
6ea09cc
INCT-279 feat: UC36-37 remake
Ustin4 Aug 20, 2024
848b6b8
INCT-279 feat: UC36-37 remake
Ustin4 Aug 20, 2024
4f93758
Merge branch 'INCT-279-UC36-37-dev-fix-merge' into dev
Ustin4 Aug 20, 2024
6e917a0
Merge pull request #134 from elem15/INCT-279-UC36-37-dev-fix-merge
elem15 Aug 20, 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
6 changes: 6 additions & 0 deletions next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ const nextConfig = {
port: '',
pathname: '/trainee-instagram-api/**',
},
{
protocol: 'https',
hostname: 'staging-it-incubator.s3.eu-central-1.amazonaws.com',
port: '',
pathname: '/trainee-instagram-api/Image/**',
},
],
},
}
Expand Down
Loading