diff --git a/.gitignore b/.gitignore index 8440398..a8ec2bb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,27 +1,89 @@ -# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. +# Django # +*.log +*.pot +*.pyc +__pycache__ +db.sqlite3 +media -# dependencies -/node_modules -/.pnp -.pnp.js +# Backup files # +*.bak -# testing -/coverage +# Python # +*.py[cod] +*$py.class -# production -/build +# Distribution / packaging +.Python build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +*.egg-info/ +.installed.cfg +*.egg +*.manifest +*.spec -# Database stuff -*.sqlite3 -db.sqlite3 +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +.pytest_cache/ +nosetests.xml +coverage.xml +*.cover +.hypothesis/ + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ + +# Sublime Text # +*.tmlanguage.cache +*.tmPreferences.cache +*.stTheme.cache +*.sublime-workspace +*.sublime-project + +# sftp configuration file +sftp-config.json -# misc -.DS_Store -.env.local -.env.development.local -.env.test.local -.env.production.local +# Package control specific files Package +Control.last-run +Control.ca-list +Control.ca-bundle +Control.system-ca-bundle +GitHub.sublime-settings -npm-debug.log* -yarn-debug.log* -yarn-error.log* \ No newline at end of file +# Visual Studio Code # +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +.history \ No newline at end of file diff --git a/UCAS_clear/__pycache__/urls.cpython-39.pyc b/UCAS_clear/__pycache__/urls.cpython-39.pyc index 975993b..e7ef5e2 100644 Binary files a/UCAS_clear/__pycache__/urls.cpython-39.pyc and b/UCAS_clear/__pycache__/urls.cpython-39.pyc differ diff --git a/UCAS_clear/__pycache__/views.cpython-39.pyc b/UCAS_clear/__pycache__/views.cpython-39.pyc index 1e35f13..66cc0e8 100644 Binary files a/UCAS_clear/__pycache__/views.cpython-39.pyc and b/UCAS_clear/__pycache__/views.cpython-39.pyc differ diff --git a/UCAS_clear/static/UCAS_clear/images/face.jpg b/UCAS_clear/static/UCAS_clear/images/face.jpg new file mode 100644 index 0000000..f696507 Binary files /dev/null and b/UCAS_clear/static/UCAS_clear/images/face.jpg differ diff --git a/UCAS_clear/static/UCAS_clear/images/logo.png b/UCAS_clear/static/UCAS_clear/images/logo.png new file mode 100644 index 0000000..e306f17 Binary files /dev/null and b/UCAS_clear/static/UCAS_clear/images/logo.png differ diff --git a/UCAS_clear/static/UCAS_clear/images/uni.jpg b/UCAS_clear/static/UCAS_clear/images/uni.jpg new file mode 100644 index 0000000..81e2dec Binary files /dev/null and b/UCAS_clear/static/UCAS_clear/images/uni.jpg differ diff --git a/UCAS_clear/static/UCAS_clear/styles.css b/UCAS_clear/static/UCAS_clear/styles.css index f92d1df..79395fa 100644 --- a/UCAS_clear/static/UCAS_clear/styles.css +++ b/UCAS_clear/static/UCAS_clear/styles.css @@ -42,8 +42,7 @@ a:hover { color: #6b7280; } -#login, -#logout { +#register { background-color: #6b7280; color: white; border-radius: 3px; @@ -53,10 +52,6 @@ a:hover { margin-left: 2rem; } -#logout { - height: 100%; -} - .nav-item a:hover { color: #111827; } @@ -289,3 +284,327 @@ footer .container { .searchbar input:focus { background-color: #dbeafe; } + +/* USERPAGE STYLES */ +.userpage-container { + min-height: 100vh; +} + +.user-details { + height: 90vh; + background-color: #212934; + padding: 5rem 8rem; + --webkit-clip-path: polygon(0% 0%, 100% 0%, 100% 40%, 0% 20%); + clip-path: polygon(0% 0%, 100% 0%, 100% 80vh, 0% 60vh); + + display: flex; + align-items: flex-start; + justify-content: space-between; +} + +.username h2 { + font-size: 2.4rem; + font-weight: 400; + color: #d1d5db; +} + +.username p { + font-weight: 300; + margin-top: -0.5rem; +} + +.username span { + font-size: 0.9rem; + color: #9ca3af; + letter-spacing: 1px; +} + +.current-preference { + display: flex; + align-items: center; + justify-content: flex-start; +} + +.current-preference h2 { + color: #d1d5db; + font-size: 1.6rem; + font-weight: 400; + margin-right: 2rem; +} + +.current-preference span { + color: #9ca3af; + font-size: 0.9rem; + font-weight: 300; + cursor: pointer; + transition: all 300ms ease; +} + +.current-preference span:hover { + text-decoration: underline; +} + +.course-details p { + margin: 0 !important; + padding-top: 5px; + color: #d1d5db; +} + +.user-details-right { + display: flex; + flex-direction: column; + align-items: center; +} + +.user-details-right a { + color: white; + margin-top: 1rem; + padding: 3px 8px; + border: 2px solid #d1d5db; + border-radius: 5rem; + font-size: 0.9rem; + color: #d1d5db; + + transition: all 100ms ease-in; +} + +.user-details-right a:hover { + color: #f9fafb; + border: 2px solid #f9fafb; +} + +.userimage { + width: 15rem; + height: 15rem; + border-radius: 50%; + margin-top: 3rem; + object-fit: cover; +} + +/* USER-APPLICATION DETAILS */ +.user-application-details { + padding: 0rem 8rem; +} + +.latest-updates h3, +.current-applications h3, +.previous-applications h3 { + font-size: 1.8rem; + font-weight: 400; + margin: 2rem 0rem; +} + +.latest-updates p { + padding: 1rem; + background-color: #fecaca; + border-radius: 5px; + font-size: 1.1rem; + font-weight: 300; + margin-top: -3px; +} + +#application-ul { + background: #f3f4f6; + border-radius: 5px; + border: 1px solid #e5e7eb; +} + +#application-ul li { + list-style: none; + display: flex; + align-items: center; + justify-content: space-evenly; + padding: 2rem 0rem; + color: #4b5563; +} + +#application-ul li:not(:last-child) { + border-bottom: 1px solid #e5e7eb; +} + +.pool .duration { + display: flex; + align-items: center; + justify-content: space-between; +} + +.duration { + margin-top: -8px; +} + +.status { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; +} + +.status a { + padding: 0.3rem 1rem; + border: 1px solid #9ca3af; + border-radius: 5rem; + color: #4b5563; + transition: all 200ms ease; +} + +.status a:hover { + border: 1px solid #374151; + color: #374151; +} + +/* COURSE DETAIL */ + +.header { + background: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 1)), + url("../../static/UCAS_clear/images/uni.jpg"); + background-position: center; + background-size: cover; + background-repeat: no-repeat; + height: 90vh; + --webkit-clip-path: polygon(0% 0%, 100% 0%, 100% 40%, 0% 20%); + clip-path: polygon(0% 0%, 100% 0%, 100% 80vh, 0% 70vh); + + color: #f3f4f6; + + display: flex; + flex-direction: column; + align-items: flex-start; + + padding: 6rem 8rem; +} + +.uni-detail { + /* width: 50%;*/ + display: flex; + align-items: center; + justify-content: space-evenly; +} + +.logo { + margin-right: 3rem; + color: #e5e7eb; +} + +.logo img { + width: 10rem; + height: 10rem; +} + +.uni-info h2 { + color: #d1d5db; + margin-bottom: 1rem; +} + +.uni-info p { + margin: 0 !important; + padding: 0.1rem 0rem; +} + +.course-detail { + margin-top: 2rem; +} + +.course-name { + font-size: 1.8rem; + font-weight: 500; + text-transform: uppercase; + color: #d1d5db; +} + +.pool-timeline { + width: 80vw; + display: flex; + align-items: center; + justify-content: space-between; + + border-bottom: 2px solid; +} + +.pool-timeline p:first-child { + margin-right: 3rem; + font-size: 1.2rem; + font-weight: 300; +} + +.pool-timeline p:last-child { + font-size: 1.2rem; +} + +.green { + color: #34d399; + font-weight: 500; +} + +.course-info { + display: flex; + align-items: center; + justify-content: space-between; +} + +.course-info-right { + display: flex; + align-items: center; + justify-content: flex-start; + margin-top: 2rem; +} + +.qualification h4, +.length h4, +.study-mode h4, +.start-date h4 { + font-size: 1.2rem; + font-weight: 400; + letter-spacing: 1px; +} + +.qualification p, +.length p, +.study-mode p, +.start-date p { + font-weight: 300; +} + +.course-info-right div:not(:last-child) { + margin-right: 4rem; +} + +.course-info-left a { + text-decoration: none; + padding: 0.3rem 1rem; + margin: 0rem 0.5rem; + color: #d1d5db; + border: 2px solid #d1d5db; + border-radius: 5rem; + transition: all 200ms ease; +} + +.course-info-left a:hover { + background-color: #3b82f6; +} + +.header-p { + font-weight: 300; + color: #d1d5db; +} + +.main { + padding: 2rem 8rem; +} + +.course-summary h3 { + font-size: 1.8rem; + font-weight: 500; + padding: 1rem 0rem; + color: #374151; +} + +.course-summary p { + font-size: 1.1rem; + font-weight: 300; +} + +.course-summary ul li { + margin-left: 2rem; + font-size: 1.1rem; + font-weight: 300; +} diff --git a/UCAS_clear/templates/UCAS_clear/course-detail.html b/UCAS_clear/templates/UCAS_clear/course-detail.html new file mode 100644 index 0000000..9080ee8 --- /dev/null +++ b/UCAS_clear/templates/UCAS_clear/course-detail.html @@ -0,0 +1,114 @@ +{% extends "UCAS_clear/layout.html" %} {% load static %} {% block body %} + +
+
+
+ +
+

University Name

+

Location, uni@website.com.uk

+

Degree Level: Undergraduate

+

Awarded By: University of London

+
+
+
+
Computer Science
+
+

+ 10 Openings, 40 applicants in pool — + You are eligible +

+

closes on 04/07

+
+
+
+
+

Qualification

+

Bachelor of Science Computing

+
+
+

Length

+

4 years

+
+
+

Study Mode

+

Full time

+
+
+

Start date

+

June-21st

+
+
+
+ Quick Apply + Apply with other documents +
+
+
+

+ Upon clicking Quick Apply, your application will be sent with the Personal + Statement and References you have attached in your User Area. +

+
+ +
+
+

Course Summary

+

+ A rational approach to the development of treatments for current and + emerging threats to human wellbeing depends upon a sound knowledge of + human health and disease. Biomedicine is at the interface between + molecular, cell and integrative biology and evolving disease therapies, + while biomedical research is pivotal in transferring advances in basic + science into both effective practices that promote human health and + treatments for human diseases.
+
+ Our BSc Biomedicine will provide you with the knowledge and skills for + participation in the biomedical community, either professionally or + personally. After gaining entry to this programme via UCAS and + completing Year 1, you can elect to decelerate your pace of study and + transfer to a four-year, part-time evening study version of this degree. + This course is also available for part-time evening study over six + years. This programme is accredited by the Royal Society of Biology for + the purpose of meeting in part the academic and experience requirement + for the Membership and Chartered Biologist (CBiol). +

+ After gaining entry to this programme via UCAS and completing Year 1, + you can elect to decelerate your pace of study and transfer to a + four-year, part-time evening study version of this degree. This course + is also available for part-time evening study over six years. This + programme is accredited by the Royal Society of Biology for the purpose + of meeting in part the academic and experience requirement for the + Membership and Chartered Biologist (CBiol). +

+
    +

    Highlights:

    +
  • + Birkbeck's Department of Biological Sciences provides + state-of-the-art, specialist laboratories and facilities at the heart + of academic London. +
    • +
  • + In the most recent Research Excellence Framework (REF), in a joint + submission with UCL, Biological Sciences at Birkbeck were ranked 11th + in the UK. +
    • +
  • + You will be taught by internationally distinguished experts who work + with governments and institutions around the globe to extend the + boundaries of knowledge. +
    • +
  • + Working in close collaboration with the Institute of Structural and + Molecular Biology, a joint institute between Birkbeck and UCL, our + Department is recognised for the excellence and international impact + of its research. +
    • +
+
+
+
+ +{% endblock %} diff --git a/UCAS_clear/templates/UCAS_clear/layout.html b/UCAS_clear/templates/UCAS_clear/layout.html index 2ce0a6e..777dc60 100644 --- a/UCAS_clear/templates/UCAS_clear/layout.html +++ b/UCAS_clear/templates/UCAS_clear/layout.html @@ -51,12 +51,14 @@
  • + + {% if user.is_authenticated %} Logout {% else %} {% endif %}
    • diff --git a/UCAS_clear/templates/UCAS_clear/userpage.html b/UCAS_clear/templates/UCAS_clear/userpage.html new file mode 100644 index 0000000..7e24d1f --- /dev/null +++ b/UCAS_clear/templates/UCAS_clear/userpage.html @@ -0,0 +1,196 @@ +{% extends "UCAS_clear/layout.html" %} {% load static %} {% block body %} + +
    +
    +
    +
    +

    Daniel Newton

    +

    + USC198, + 250 +

    +
    +
    +
    +

    Your current preference

    + Edit +
    +
    +

    Course : Computer Science

    +

    Level of Study : Undergraduate

    +

    Study Mode : Full-time

    +

    Course Length : 4 years

    +
    +
    +
    +
    + View/Edit Documents + +
    +
    +
    +
    +

    Latest update

    +

    + Unfortunately, your application for This University has been rejected. + This University has been added to the list of your rejections. +

    +
    +
    +

    Your current applications

    +
      +
    • +
      University Name
      +
      +

      Bio medical

      + BSc(Hons) +
      +
      +

      10 Openings, 40 in pool

      +
      + 4 years Full-time +
      +
      +
      10/2021
      +
      +

      Status: Pending

      + View application +
      +
      • +
    • +
      University Name
      +
      +

      Bio medical

      + BSc(Hons) +
      +
      +

      10 Openings, 40 in pool

      +
      + 4 years Full-time +
      +
      +
      10/2021
      +
      +

      Status: Pending

      + View application +
      +
      • +
    • +
      University Name
      +
      +

      Bio medical

      + BSc(Hons) +
      +
      +

      10 Openings, 40 in pool

      +
      + 4 years Full-time +
      +
      +
      10/2021
      +
      +

      Status: Pending

      + View application +
      +
      • +
    • +
      University Name
      +
      +

      Bio medical

      + BSc(Hons) +
      +
      +

      10 Openings, 40 in pool

      +
      + 4 years Full-time +
      +
      +
      10/2021
      +
      +

      Status: Pending

      + View application +
      +
      • +
    +
    +
    +

    Your previous rejections

    +
      +
    • +
      University Name
      +
      +

      Bio medical

      + BSc(Hons) +
      +
      +

      10 Openings, 40 in pool

      +
      + 4 years Full-time +
      +
      +
      10/2021
      +
      +

      Status: Rejected!!

      + View application +
      +
      • +
    • +
      University Name
      +
      +

      Bio medical

      + BSc(Hons) +
      +
      +

      10 Openings, 40 in pool

      +
      + 4 years Full-time +
      +
      +
      10/2021
      +
      +

      Status: Rejected!!

      + View application +
      +
      • +
    • +
      University Name
      +
      +

      Bio medical

      + BSc(Hons) +
      +
      +

      10 Openings, 40 in pool

      +
      + 4 years Full-time +
      +
      +
      10/2021
      +
      +

      Status: Rejected!!

      + View application +
      +
      • +
    • +
      University Name
      +
      +

      Bio medical

      + BSc(Hons) +
      +
      +

      10 Openings, 40 in pool

      +
      + 4 years Full-time +
      +
      +
      10/2021
      +
      +

      Status: Rejected!!

      + View application +
      +
      • +
    +
    +
    +
    + +{% endblock %} diff --git a/UCAS_clear/urls.py b/UCAS_clear/urls.py index 536265c..14999c7 100644 --- a/UCAS_clear/urls.py +++ b/UCAS_clear/urls.py @@ -8,4 +8,6 @@ path('login', views.login_view, name='login'), path('logout', views.logout_view, name='logout'), path('homepage', views.homepage, name='homepage'), + path('userpage', views.userpage, name='userpage'), + path('course-detail', views.coursedetail, name='course-detail'), ] \ No newline at end of file diff --git a/UCAS_clear/views.py b/UCAS_clear/views.py index ba1988c..d940593 100644 --- a/UCAS_clear/views.py +++ b/UCAS_clear/views.py @@ -68,4 +68,10 @@ def register(request): def homepage(request): - return render(request, "UCAS_clear/homepage.html") \ No newline at end of file + return render(request, "UCAS_clear/homepage.html") + +def userpage(request): + return render(request, "UCAS_clear/userpage.html") + +def coursedetail(request): + return render(request, "UCAS_clear/course-detail.html") \ No newline at end of file diff --git a/db.sqlite3 b/db.sqlite3 index 7b27363..97713b6 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ