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

pull #10

Open
wants to merge 336 commits into
base: deploy_test
Choose a base branch
from
Open

pull #10

Changes from 1 commit
Commits
Show all changes
336 commits
Select commit Hold shift + click to select a range
356a934
Update taskAllocation.md
dprincecoder Aug 3, 2022
532b9c7
portfolio section
okeycen Aug 4, 2022
a16e3cf
modified portfolio section
okeycen Aug 4, 2022
9dd9291
Update taskAllocation.md
dprincecoder Aug 4, 2022
aafc508
Merge pull request #7 from okeycen/portfolio-sect
dprincecoder Aug 4, 2022
6e1e05c
[Feature]: Incorporated the landing page with django templates
Ddilibe Aug 5, 2022
c736d80
[Feature]: Incorporated the landing page with django templates
Ddilibe Aug 5, 2022
95fd570
finished two pages
dprincecoder Aug 5, 2022
a7f67ab
changes
dprincecoder Aug 5, 2022
37c724f
[Feature]: Changed a little thing in the account login page
Ddilibe Aug 5, 2022
33fa668
fixes
dprincecoder Aug 5, 2022
77d59c9
updates
DumisaniLesley Aug 5, 2022
208637c
Merge branch 'main' of https://github.com/zuri-training/Team_14_CMS
DumisaniLesley Aug 5, 2022
df9fc18
Update taskAllocation.md
dprincecoder Aug 5, 2022
0331472
Update taskAllocation.md
dprincecoder Aug 5, 2022
ae47ef1
added slider to hero section
DumisaniLesley Aug 5, 2022
2927919
Merge branch 'main' of https://github.com/zuri-training/Team_14_CMS
DumisaniLesley Aug 5, 2022
1eda140
Add files via upload
Abdulbasit-123 Aug 5, 2022
3c30764
Add files via upload
Abdulbasit-123 Aug 5, 2022
f13b489
Merge branch 'main' of https://github.com/zuri-training/CMS_proj_14
Ddilibe Aug 5, 2022
04ad9f3
Update taskAllocation.md
AbiolaGold Aug 6, 2022
8fc3e88
Update taskAllocation.md
AbiolaGold Aug 6, 2022
7d78582
rename
dprincecoder Aug 6, 2022
538e49c
Update taskAllocation.md
Ukinyang Aug 6, 2022
7db1e67
finished registration page
dprincecoder Aug 6, 2022
d3f997a
[Feature]: Linked the signin page
Ddilibe Aug 5, 2022
23b260b
Update taskAllocation.md
eberre28 Aug 6, 2022
a72e256
Update taskAllocation.md
Amyy16 Aug 6, 2022
46cdabb
Update README.md
ololadetife Aug 6, 2022
d210bb2
Update style.css
Abdulbasit-123 Aug 6, 2022
25e6af9
work on signup page
holayide Aug 6, 2022
8c94cb2
Merge pull request #8 from holayide/main
holayide Aug 6, 2022
e638b84
Rename requirement.txt to requirements.txt
LizzyOrji123 Aug 6, 2022
79026f2
[Feature]: Replaced contents in index template
Ddilibe Aug 6, 2022
8e36476
Included Pillow in requirements.txt
Abidamola Aug 6, 2022
1225e62
Update README.md
danvictoria00 Aug 6, 2022
9037825
Update README.md
danvictoria00 Aug 6, 2022
8e1a6e6
[Feature]: Complete integration of the signin template to the backend
Ddilibe Aug 7, 2022
73fa0c1
Merge branch 'main' of https://github.com/zuri-training/CMS_proj_14
Ddilibe Aug 7, 2022
b375a9d
Update README.md
dprincecoder Aug 7, 2022
108b8f9
Update taskAllocation.md
dprincecoder Aug 7, 2022
27200b7
Update README.md
Ddilibe Aug 7, 2022
b47e1f7
Update README.md
Ddilibe Aug 7, 2022
24cfa02
[Feature]: Filling another branch
Ddilibe Aug 7, 2022
628793f
[Feature]: Resolving merge conflict
Ddilibe Aug 7, 2022
310a0e2
[Feature]: Trying to launch the app to heroku
Ddilibe Aug 7, 2022
1d4c85f
[Feature]: Still trying to push to heroku
Ddilibe Aug 7, 2022
6db2a5e
[Feature]: Added gunicorn
Ddilibe Aug 7, 2022
ff95472
[Feature]: Added gunicorn
Ddilibe Aug 7, 2022
4a13081
[Feature]: Added gunicorn
Ddilibe Aug 7, 2022
aa94267
Update README.md
Ajengsolange Aug 8, 2022
ebb588c
Update README.md
Ajengsolange Aug 8, 2022
e40a579
Update taskAllocation.md
AbiolaGold Aug 8, 2022
b202be4
done with creation and list waiting for templates
nwokporochukwuebuka Aug 8, 2022
0d6af8c
Merge branch 'main' of https://github.com/zuri-training/Team_14_CMS
nwokporochukwuebuka Aug 8, 2022
95bf8f2
[Feature]: Google Authentication for login and signup
Ddilibe Aug 8, 2022
bcfdc5a
[Fix]: Resolved url mapping error
Ddilibe Aug 8, 2022
d14f84b
[Fix]: Resolved url mapping error
Ddilibe Aug 8, 2022
ed66031
[Docs]: Made a commit to the contribution folder
Ddilibe Aug 8, 2022
4c6135a
[Docs]: Made a commit to the contribution folder
Ddilibe Aug 8, 2022
bfca9be
[Docs]: Made a commit to the contribution folder
Ddilibe Aug 8, 2022
dfd3918
added the contibutions folder and my task links
dprincecoder Aug 8, 2022
a50a9c5
fix
dprincecoder Aug 8, 2022
49f66e0
added the signin page responsive
dprincecoder Aug 9, 2022
9f15476
Create AbiolaGold.md
AbiolaGold Aug 9, 2022
af92e9c
changes
dprincecoder Aug 9, 2022
8832cdc
Merge branch 'main' of github.com:zuri-training/Team_14_CMS
dprincecoder Aug 9, 2022
e658676
Merge branch 'main' of https://github.com/zuri-training/CMS_proj_14
Ddilibe Aug 8, 2022
44603d5
Create Abidat.md
Abidamola Aug 9, 2022
cacf5e9
Update Abidat.md
Abidamola Aug 9, 2022
fa84acd
Update Abidat.md
Abidamola Aug 9, 2022
e9223ac
Update Abidat.md
Abidamola Aug 9, 2022
7fe451f
Update Abidat.md
Abidamola Aug 9, 2022
db03875
Create omofumike.md
omofumike Aug 9, 2022
5cb2a03
Update
omofumike Aug 9, 2022
1426073
add contribution
holayide Aug 9, 2022
2bf65ec
Merge pull request #19 from holayide/main
dprincecoder Aug 9, 2022
67e9c5c
Update dprincecoder.md
dprincecoder Aug 9, 2022
9acefcd
Update taskAllocation.md
danvictoria00 Aug 9, 2022
80fdf49
Finished the template page
DumisaniLesley Aug 9, 2022
958491f
worked on the features page
4PT3SR Aug 10, 2022
93b5aa7
Merge pull request #25 from void-4/main
4PT3SR Aug 10, 2022
de4e28e
Update dprincecoder.md
dprincecoder Aug 10, 2022
8b5f3b3
Add a hover effect on the cards, and a little of box-shadows and curs…
DumisaniLesley Aug 10, 2022
ec12d8b
Merge branch 'main' of https://github.com/zuri-training/Team_14_CMS
DumisaniLesley Aug 10, 2022
8473884
Create dprincecoder.me
dprincecoder Aug 10, 2022
a6d9e9e
Merge pull request #26 from zuri-training/team_14_assign_task
dprincecoder Aug 10, 2022
a43b842
Create dummy.me
dprincecoder Aug 10, 2022
88b33e6
Delete dprincecoder.me
dprincecoder Aug 10, 2022
109fbcc
Delete dummy.me
dprincecoder Aug 10, 2022
372852b
Done with mobile responsiveness
DumisaniLesley Aug 10, 2022
b3ff236
Merge branch 'main' of https://github.com/zuri-training/Team_14_CMS
DumisaniLesley Aug 10, 2022
b657151
Create prince.me
dprincecoder Aug 10, 2022
681a76d
Create PROMISE ADESOKAN
promiseadeola Aug 10, 2022
597d714
Update prince.me
dprincecoder Aug 10, 2022
f3b1414
Update templates.css
DumisaniLesley Aug 10, 2022
0dd9043
Merge branch 'main' of https://github.com/zuri-training/Team_14_CMS
DumisaniLesley Aug 10, 2022
2f965dc
Create Ukeme_inyang.me
Ukinyang Aug 10, 2022
b45c8f3
Create void-4.md
4PT3SR Aug 10, 2022
1cb02c6
creating my contributions
nwokporochukwuebuka Aug 10, 2022
6be65cf
Update AbiolaGold.md
AbiolaGold Aug 10, 2022
1c2f417
Update AbiolaGold.md
AbiolaGold Aug 10, 2022
7022811
adding tasks performed
nwokporochukwuebuka Aug 10, 2022
ccd6d26
Update AbiolaGold.md
AbiolaGold Aug 10, 2022
44c5a41
still updating
nwokporochukwuebuka Aug 10, 2022
fefd366
Update AbiolaGold.md
AbiolaGold Aug 10, 2022
cdc404c
done with contributions
nwokporochukwuebuka Aug 10, 2022
6e9108a
Update ebuka.md
nwokporochukwuebuka Aug 10, 2022
175e609
Update AbiolaGold.md
AbiolaGold Aug 10, 2022
1f6e36a
[Docs]: Updated the contributions folder
Ddilibe Aug 10, 2022
7b15212
[Docs]: Updated the contributions folder
Ddilibe Aug 10, 2022
34814f4
Create Pamela.me
eberre28 Aug 10, 2022
bded62d
Create Solange_Ajenganyi.me
Ajengsolange Aug 10, 2022
d47ded0
Update Pamela.me
eberre28 Aug 10, 2022
2695e68
Update Pamela.me
eberre28 Aug 10, 2022
5370ca5
Update and rename Pamela.me to Pamela.md
eberre28 Aug 10, 2022
aac8981
Delete prince.me
dprincecoder Aug 10, 2022
a43f586
Update dprincecoder.md
dprincecoder Aug 10, 2022
6487c45
Create Amyy_.md
Amyy16 Aug 10, 2022
18e0dd6
Update dprincecoder.md
dprincecoder Aug 10, 2022
47de66f
turn all links so it can be click able
dprincecoder Aug 10, 2022
fd43c63
Update AbiolaGold.md
AbiolaGold Aug 10, 2022
73f6656
Add title text to my contributions
eberre28 Aug 10, 2022
7b41b42
Add link to lo fi and hi fi for sign in page
eberre28 Aug 10, 2022
d5422fd
Update AbiolaGold.md
AbiolaGold Aug 10, 2022
2382b7a
Create Vivian.md
Viviyaan Aug 10, 2022
4e623ec
Update AbiolaGold.md
AbiolaGold Aug 10, 2022
d119883
Create ukeme.md
Ukinyang Aug 10, 2022
25e38c3
Create Mayode.me
ololadetife Aug 10, 2022
dedf2e1
Delete Mayode.me
ololadetife Aug 10, 2022
fe4a924
Add link to slides for presentation
eberre28 Aug 10, 2022
9b3e1eb
Update Pamela.md
eberre28 Aug 10, 2022
a256566
Create Mayode.me
ololadetife Aug 10, 2022
2a64843
Add links to template pages for blog and art portfolio
eberre28 Aug 10, 2022
3680c99
Update ukeme.md
Ukinyang Aug 10, 2022
da85a04
Update Mayode.me
ololadetife Aug 10, 2022
9a8233b
Update Mayode.me
ololadetife Aug 10, 2022
6e0a7dd
Delete Mayode.me
ololadetife Aug 10, 2022
a6c4aad
Add link to Sign in page
eberre28 Aug 10, 2022
d968828
Create Mayode.me
ololadetife Aug 10, 2022
603c515
Update Mayode.me
ololadetife Aug 10, 2022
d605efb
Create Mayode.md
ololadetife Aug 10, 2022
0bebec3
Add link to screener questions
eberre28 Aug 10, 2022
ac3b7c4
Update AbiolaGold.md
AbiolaGold Aug 10, 2022
bfc26f3
Update void-4.md
4PT3SR Aug 10, 2022
5a42733
Create Emmanuel.me
Icematics Aug 10, 2022
3262ddf
Add link to survey questions
eberre28 Aug 10, 2022
126e499
Update Emmanuel.me
Icematics Aug 10, 2022
ce84734
Add link to verification page
eberre28 Aug 10, 2022
34ea583
Update ukeme.md
Ukinyang Aug 10, 2022
b93158d
added my contributions
4PT3SR Aug 10, 2022
c76446c
Merge branch 'main' of https://github.com/zuri-training/Team_14_CMS
4PT3SR Aug 10, 2022
83f2b9a
Merge pull request #59 from void-4/main
4PT3SR Aug 10, 2022
2ad3975
Add link to resolved issues
eberre28 Aug 10, 2022
5d5ba40
Create Abdulbasit.me
Abdulbasit-123 Aug 10, 2022
3a40355
Add link to Sign in page (mobile version)
eberre28 Aug 10, 2022
576151c
Update ukeme.md
Ukinyang Aug 10, 2022
2b35db5
Update ukeme.md
Ukinyang Aug 10, 2022
d15be76
Update ukeme.md
Ukinyang Aug 10, 2022
82591bc
Create olokoaishat.md
Olokoaishat Aug 10, 2022
65d96fd
[Update]: Wrote the view function for the Template page
Ddilibe Aug 10, 2022
144c3d9
Create Abdulbasit.md
Abdulbasit-123 Aug 10, 2022
f7f3fc4
Merge pull request #60 from Ddilibe/main
Ddilibe Aug 10, 2022
75ffb63
Merge pull request #61 from Ddilibe/main
dprincecoder Aug 11, 2022
80c0adf
create the blog page
omofumike Aug 11, 2022
b8efec1
Merge branch 'main' of https://github.com/zuri-training/Team_14_CMS
omofumike Aug 11, 2022
306365e
update
omofumike Aug 11, 2022
0ebd9ac
fix
dprincecoder Aug 11, 2022
b22fd23
Add files via upload
Abdulbasit-123 Aug 11, 2022
8a91f0f
Add files via upload
Abdulbasit-123 Aug 11, 2022
469e391
[Update]: Updated the template page
Ddilibe Aug 11, 2022
80c56fc
Merge branch 'zuri-training:main' into main
Ddilibe Aug 11, 2022
5853729
[Update]: Updated the template page
Ddilibe Aug 11, 2022
fb2c967
error
nwokporochukwuebuka Aug 12, 2022
7d1ba1c
[fix]: Trying to fix
Ddilibe Aug 12, 2022
f0eb75c
Merge pull request #63 from Ddilibe/main
Ddilibe Aug 12, 2022
f86dc4b
Update style.css
Abdulbasit-123 Aug 12, 2022
c4d18d3
work on blog section
omofumike Aug 12, 2022
a783d26
update
omofumike Aug 12, 2022
16a7fb9
Create Okeycen
okeycen Aug 12, 2022
ddd2d59
Rename Okeycen to Okeycen.md
okeycen Aug 12, 2022
6a689f0
Create Lizzy_Orji.md
LizzyOrji123 Aug 12, 2022
ddda922
Rename contributions/Okeycen.md to Okeycen_14.md
okeycen Aug 12, 2022
e2a9fe5
changes
dprincecoder Aug 12, 2022
fed7e62
Create Victoria.md
danvictoria00 Aug 12, 2022
387dede
Create Okeycen.md
okeycen Aug 12, 2022
18870af
Update Lizzy_Orji.md
LizzyOrji123 Aug 12, 2022
ae49201
Create Ajenganyisolange.md
Ajengsolange Aug 12, 2022
20b3964
Delete Okeycen.md
okeycen Aug 12, 2022
7adb567
Create Okeycen.md
okeycen Aug 12, 2022
05f14da
Update Victoria.md
danvictoria00 Aug 12, 2022
c1ffed6
add issue
holayide Aug 12, 2022
88ed21b
Update style.css
Abdulbasit-123 Aug 12, 2022
f93f246
Update style.css
Abdulbasit-123 Aug 12, 2022
0086ff5
Delete template/templates_folder/portfolio/images directory
Abdulbasit-123 Aug 12, 2022
5d98486
Add files via upload
Abdulbasit-123 Aug 12, 2022
c2ddcd2
Update olokoaishat.md
Olokoaishat Aug 12, 2022
cdb21bb
Merge pull request #64 from holayide/main
dprincecoder Aug 13, 2022
d656a6e
update
omofumike Aug 13, 2022
2b66311
update
omofumike Aug 13, 2022
8c0e2d8
Update Ajenganyisolange.md
Ajengsolange Aug 13, 2022
76b5baf
Update Ajenganyisolange.md
Ajengsolange Aug 13, 2022
316e65d
Merge pull request #57 from zuri-training/team_14_assign_task
Ddilibe Aug 14, 2022
94b2ad8
restaurant page
4PT3SR Aug 14, 2022
710811a
Created views and urls for product and hire an expert pages
Amyy16 Aug 14, 2022
0f8f763
Update Amyy_.md
Amyy16 Aug 14, 2022
4824ed9
Add files via upload
Abdulbasit-123 Aug 14, 2022
56971d2
fixed error
Amyy16 Aug 15, 2022
d888fbb
Merge branch 'zuri-training:main' into main
Amyy16 Aug 15, 2022
89d2535
chnages
dprincecoder Aug 15, 2022
0afbd60
Merge pull request #66 from Amyy16/main
Amyy16 Aug 15, 2022
d8106d0
fix
dprincecoder Aug 15, 2022
8b2bbdc
Merge branches 'main' and 'main' of github.com:zuri-training/Team_14_CMS
dprincecoder Aug 15, 2022
55c393f
linked error template to some views
Amyy16 Aug 15, 2022
0870aca
Merge pull request #67 from Amyy16/main
dprincecoder Aug 15, 2022
71cb757
Merge pull request #65 from void-4/main
dprincecoder Aug 15, 2022
bcb513e
fix
dprincecoder Aug 15, 2022
12e0852
Update landingpage.html
dprincecoder Aug 15, 2022
b029fe1
Update landingpage.html
dprincecoder Aug 15, 2022
b55fcdd
Update landingpage.html
dprincecoder Aug 15, 2022
9b8b0ed
Update landingpage.html
dprincecoder Aug 15, 2022
190b9e1
Update index.html
dprincecoder Aug 15, 2022
bb6b13d
Update README.md
dprincecoder Aug 15, 2022
05e5cc9
Update README.md
dprincecoder Aug 15, 2022
ab0d3cf
Update README.md
dprincecoder Aug 15, 2022
0725b8b
Update Abdulbasit.md
Abdulbasit-123 Aug 15, 2022
38e8fd8
Update Amyy_.md
Amyy16 Aug 16, 2022
70f4a6c
add and edit templates
holayide Aug 16, 2022
0b6519f
Update Abidat.md
Abidamola Aug 16, 2022
bf64f3d
Update Abidat.md
Abidamola Aug 16, 2022
02aa52b
Merge pull request #69 from holayide/main
dprincecoder Aug 18, 2022
d36be2c
[Update]: Added a new app for updating and editing the template
Ddilibe Aug 18, 2022
bed7e8d
[Update]: Written the function for each website edit page
Ddilibe Aug 18, 2022
addb27c
[Update]: Added a folder for the template preview
Ddilibe Aug 18, 2022
8190689
[Update]: Mapped all the url to the created view functions
Ddilibe Aug 18, 2022
32050fd
[Feature]: Frontend editor has been implemented
Ddilibe Aug 19, 2022
4414ef9
[Fix]: Template css file fix
Ddilibe Aug 19, 2022
d2e3f3f
Merge pull request #70 from Ddilibe/main
Ddilibe Aug 19, 2022
d7353d6
[Update]: Linked up the feature page
Ddilibe Aug 19, 2022
f1d6fda
Merge branch 'zuri-training:main' into main
Ddilibe Aug 19, 2022
c0008ca
Merge pull request #71 from Ddilibe/main
Ddilibe Aug 19, 2022
e85ae19
[Update]: Removed the Pipfile
Ddilibe Aug 19, 2022
e7765a9
[Update]: Updated the Procfile
Ddilibe Aug 19, 2022
85ffbf5
Merge pull request #73 from Ddilibe/main
Ddilibe Aug 19, 2022
f6ac95b
update login
holayide Aug 19, 2022
10dc05f
Merge pull request #74 from holayide/main
holayide Aug 19, 2022
5141c26
update settings.py
holayide Aug 19, 2022
39f457b
Merge pull request #75 from holayide/main
holayide Aug 19, 2022
b8c8ac4
changes
dprincecoder Aug 19, 2022
68ced4f
added media queries to the style.css
Abdulbasit-123 Aug 20, 2022
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
Prev Previous commit
Next Next commit
[Feature]: Incorporated the landing page with django templates
  • Loading branch information
Ddilibe committed Aug 5, 2022
commit c736d80124c4a8f0cd269b4172b0f127d261b90e
7 changes: 0 additions & 7 deletions Team_14_CMS/README.md

This file was deleted.

Empty file.
3 changes: 0 additions & 3 deletions Team_14_CMS/cmsproject/cmsapp/admin.py

This file was deleted.

6 changes: 0 additions & 6 deletions Team_14_CMS/cmsproject/cmsapp/apps.py

This file was deleted.

Empty file.
18 changes: 0 additions & 18 deletions Team_14_CMS/cmsproject/cmsapp/models.py

This file was deleted.

1 change: 0 additions & 1 deletion Team_14_CMS/cmsproject/cmsapp/templates/cmsapp/index.html

This file was deleted.

3 changes: 0 additions & 3 deletions Team_14_CMS/cmsproject/cmsapp/tests.py

This file was deleted.

6 changes: 0 additions & 6 deletions Team_14_CMS/cmsproject/cmsapp/urls.py

This file was deleted.

8 changes: 0 additions & 8 deletions Team_14_CMS/cmsproject/cmsapp/views.py

This file was deleted.

Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
16 changes: 0 additions & 16 deletions Team_14_CMS/cmsproject/cmsproject/asgi.py

This file was deleted.

126 changes: 0 additions & 126 deletions Team_14_CMS/cmsproject/cmsproject/settings.py

This file was deleted.

22 changes: 0 additions & 22 deletions Team_14_CMS/cmsproject/cmsproject/urls.py

This file was deleted.

16 changes: 0 additions & 16 deletions Team_14_CMS/cmsproject/cmsproject/wsgi.py

This file was deleted.

Binary file removed Team_14_CMS/cmsproject/db.sqlite3
Binary file not shown.
22 changes: 0 additions & 22 deletions Team_14_CMS/cmsproject/manage.py

This file was deleted.

4 changes: 0 additions & 4 deletions Team_14_CMS/requirement.txt

This file was deleted.