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.

Sign up for GitHub

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

Jump to bottom

Feature/student course show #73

Merged
merged 87 commits into from
Feb 11, 2024
Merged

Feature/student course show #73

merged 87 commits into from
Feb 11, 2024

Commits on Sep 8, 2023

  1. SIGI update

    @LiamThursfield
    LiamThursfield committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    522aead View commit details
    Browse the repository at this point in the history

  2. SIGI update

    @LiamThursfield
    LiamThursfield committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    e252580 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2023

  1. Spatie Permission Update 

    - Ensure caching is tenant aware
    @LiamThursfield
    LiamThursfield committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    2b75832 View commit details
    Browse the repository at this point in the history

  2. Spatie/Laravel-Settings implementation

    @LiamThursfield
    LiamThursfield committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    4685dd8 View commit details
    Browse the repository at this point in the history

  3. WIP - EDU Course work

    @dorusomcutean
    dorusomcutean committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    bfec2aa View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

  1. Merge pull request #1 from sigi-ro/feature/settings 

    Spatie/Laravel-Settings implementation
    @LiamThursfield
    LiamThursfield committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    fbf8d3b View commit details
    Browse the repository at this point in the history

  2. WIP - Clean up + programs

    @dorusomcutean
    dorusomcutean committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    c8aac01 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2023

  1. Fix sidemenu routes 

    - Sidebar EDU - Ensure route names are correct
- Admin routes - Fix namespace
    @LiamThursfield
    LiamThursfield committed Sep 16, 2023
    Configuration menu
    Copy the full SHA
    a14bc1d View commit details
    Browse the repository at this point in the history

  2. Rename settings to admin

    @LiamThursfield
    LiamThursfield committed Sep 16, 2023
    Configuration menu
    Copy the full SHA
    64412f1 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2023

  1. Update resources/js/layouts/customer/CustomerLayout.vue 

    Co-authored-by: LiamThursfield-NexusPoint <44166808+LiamThursfield-NexusPoint@users.noreply.github.com>
    @dorusomcutean @LiamThursfield-NexusPoint
    dorusomcutean and LiamThursfield-NexusPoint committed Sep 17, 2023
    Configuration menu
    Copy the full SHA
    b018241 View commit details
    Browse the repository at this point in the history

  2. WIP - More work on this feature

    @dorusomcutean
    dorusomcutean committed Sep 17, 2023
    Configuration menu
    Copy the full SHA
    3b876b3 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. WIP Course checkout

    @LiamThursfield
    LiamThursfield committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    0bc5818 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. WIP - More logic added

    @dorusomcutean
    dorusomcutean committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    d8f7d24 View commit details
    Browse the repository at this point in the history

  2. Course landing page template work

    @LiamThursfield
    LiamThursfield committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    9a98473 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. Merge pull request #3 from sigi-ro/feature/course-checkout 

    Feature/course checkout
    @dorusomcutean
    dorusomcutean committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    fa9831a View commit details
    Browse the repository at this point in the history

  2. WIP - More fixes and crud functionality

    @dorusomcutean
    dorusomcutean committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    7e40ddf View commit details
    Browse the repository at this point in the history

  3. Merged master

    @dorusomcutean
    dorusomcutean committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    3a1b3d5 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. WIP - CRUD working

    @dorusomcutean
    dorusomcutean committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    cce5b03 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. WIP - Adding extra things for courses

    @dorusomcutean
    dorusomcutean committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    e4f0362 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2023

  1. Merge pull request #2 from sigi-ro/feature/stage-2-edu-course 

    WIP - EDU Course work
    @dorusomcutean
    dorusomcutean committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    eb9bd5e View commit details
    Browse the repository at this point in the history

  2. WIP - Adding functionality

    @dorusomcutean
    dorusomcutean committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    ab0914e View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2023

  1. WIP - Added UX to add/edit course + sections + lectures

    @dorusomcutean
    dorusomcutean committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    f9caedf View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2023

  1. WIP - Sections + Lectures

    @dorusomcutean
    dorusomcutean committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    9e1e668 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2023

  1. WIP - Edit/Delete/Create Sections with Lectures working

    @dorusomcutean
    dorusomcutean committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    aff34b8 View commit details
    Browse the repository at this point in the history

  2. WIP - Added Ray + Vimeo

    @dorusomcutean
    dorusomcutean committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    1e3943c View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

  1. WIP Checkout Webhook

    @LiamThursfield
    LiamThursfield committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    fc5e165 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5 from sigi-ro/checkout-webhook 

    WIP Checkout Webhook
    @LiamThursfield
    LiamThursfield committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    5314386 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into feature/stage-2-edu-course

    @dorusomcutean
    dorusomcutean committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    6a845e6 View commit details
    Browse the repository at this point in the history

  4. WIP - Added seeder for course with sections with lectures with webina… 

    …rs + improvements
    @dorusomcutean
    dorusomcutean committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    2cd1ebf View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2023

  1. Removed dd

    @dorusomcutean
    dorusomcutean committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    3f876bf View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from sigi-ro/feature/stage-2-edu-course 

    Feature/stage 2 edu course
    @dorusomcutean
    dorusomcutean committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    7caed45 View commit details
    Browse the repository at this point in the history

  3. WIP - Announcements + icons + improvements + fixes

    @dorusomcutean
    dorusomcutean committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    f60a7ae View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. Announcement changes

    @dorusomcutean
    dorusomcutean committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    c800a22 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2023

  1. Add fallback to page controller

    @LiamThursfield
    LiamThursfield committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    33f394d View commit details
    Browse the repository at this point in the history

  2. Implement action to redeem user purchases 

    - Will be usable for student registration
- Attaches purchases to a user
- Adds models for course/programme user
- Add redeemed_at to purchases
- Rename programmes_users to programme_users
- Minor: namespace fix
    @LiamThursfield
    LiamThursfield committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    8a206ad View commit details
    Browse the repository at this point in the history

  3. Redeem users purchase on their actual purchase

    @LiamThursfield
    LiamThursfield committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    8d1a96c View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2023

  1. Announcements + Labels CRUD

    @dorusomcutean
    dorusomcutean committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    2311a79 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7 from sigi-ro/feature/redeem-user-purchases 

    Implement action to redeem user purchases
    @LiamThursfield
    LiamThursfield committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    cb3afd4 View commit details
    Browse the repository at this point in the history

  3. Implement Settings Edit 

    - Add Settings Permissions
- Add Settings edit routes/screens
- Update menus to allow for route params
    @LiamThursfield
    LiamThursfield committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    9949dcc View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. Merge pull request #8 from sigi-ro/feature/settings-edit 

    Implement Settings Edit
    @dorusomcutean
    dorusomcutean committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    5645f71 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/stage-2-edu-course

    @dorusomcutean
    dorusomcutean committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    bb95665 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #6 from sigi-ro/feature/stage-2-edu-course 

    WIP - Announcements + icons + improvements + fixes
    @dorusomcutean
    dorusomcutean committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    a87f38f View commit details
    Browse the repository at this point in the history

  4. WIP - Programme CRUD

    @dorusomcutean
    dorusomcutean committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    fc236b3 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2023

  1. WIP - Multiselect Programme Course

    @dorusomcutean
    dorusomcutean committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    59ff0ff View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

  1. WIP - Student Auth 

    - Initial student user roles/permissions
- Student register
- Student Admin Index
- Update sidemenu to allow for menu items to be passed as prop
    @LiamThursfield
    LiamThursfield committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    944e331 View commit details
    Browse the repository at this point in the history

  2. Enable auth middleware to differentiate admin user and student admin … 

    …user
    @LiamThursfield
    LiamThursfield committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    880997d View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. Add middleware middleware for authenticating students

    @LiamThursfield
    LiamThursfield committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    71630e9 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. Complete student auth flow 

    - Register
- Password forgot
- Password reset
    @LiamThursfield
    LiamThursfield committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    bf06a60 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. Merge pull request #10 from sigi-ro/feature/student-auth-admin 

    Feature/student auth admin
    @dorusomcutean
    dorusomcutean committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    542d497 View commit details
    Browse the repository at this point in the history

  2. merged master

    @dorusomcutean
    dorusomcutean committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    e4f195b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #9 from sigi-ro/feature/stage-2-edu-course 

    WIP - Programme CRUD
    @dorusomcutean
    dorusomcutean committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    b8fffe8 View commit details
    Browse the repository at this point in the history

  4. WIP

    @dorusomcutean
    dorusomcutean committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    684c216 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2023

  1. WIP - Course page

    @dorusomcutean
    dorusomcutean committed Oct 22, 2023
    Configuration menu
    Copy the full SHA
    8bbc6cc View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

  1. Update student layout

    @LiamThursfield
    LiamThursfield committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    0e9baf0 View commit details
    Browse the repository at this point in the history

  2. WIP - Ability to complete lecture by user and more

    @dorusomcutean
    dorusomcutean committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    dc5bec4 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. Merge branch 'feature/stage-2-student-page' of https://github.com/sig… 

    …i-ro/sigi into feature/stage-2-student-page
    @LiamThursfield
    LiamThursfield committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    6bb31e4 View commit details
    Browse the repository at this point in the history

  2. Implement seeding for purchases 

    Add refundable
    @LiamThursfield
    LiamThursfield committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    4fc3ddc View commit details
    Browse the repository at this point in the history

  3. PurchaseSeeder - ensure most are refundable

    @LiamThursfield
    LiamThursfield committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    dbb182e View commit details
    Browse the repository at this point in the history

  4. Purchases - Move is_refundable column order

    @LiamThursfield
    LiamThursfield committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    f489dbc View commit details
    Browse the repository at this point in the history

  5. Mark purchases as non-refundable

    @LiamThursfield
    LiamThursfield committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    e5e5c70 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. WIP - Improvements, fixes and working on pdf to lecture linking

    @dorusomcutean
    dorusomcutean committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    72fbc20 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. Create CourseCard 

    - Use course card on course index
- Implement CreatorResource
    @LiamThursfield
    LiamThursfield committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    6087a02 View commit details
    Browse the repository at this point in the history

  2. yarn prod

    @LiamThursfield
    LiamThursfield committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    cb4c243 View commit details
    Browse the repository at this point in the history

  3. yarn prod

    @LiamThursfield
    LiamThursfield committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    b4dd48b View commit details
    Browse the repository at this point in the history

  4. Updates to course cards

    @LiamThursfield
    LiamThursfield committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    30b732c View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2023

  1. Merge pull request #11 from sigi-ro/feature/stage-2-student-page 

    WIP - Student Platform to consume courses
    @LiamThursfield
    LiamThursfield committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    21a6561 View commit details
    Browse the repository at this point in the history

  2. WIP

    @dorusomcutean
    dorusomcutean committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    e26702a View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. WIP File uploads

    @dorusomcutean
    dorusomcutean committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    593f3bb View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2023

  1. WIP - Move edit of Lecture to its own page

    @dorusomcutean
    dorusomcutean committed Nov 11, 2023
    Configuration menu
    Copy the full SHA
    9914b13 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2023

  1. Merged Master + latest PDF changes Admin Side

    @dorusomcutean
    dorusomcutean committed Nov 12, 2023
    Configuration menu
    Copy the full SHA
    773c2f5 View commit details
    Browse the repository at this point in the history

  2. WIP

    @dorusomcutean
    dorusomcutean committed Nov 12, 2023
    Configuration menu
    Copy the full SHA
    c2d9826 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. Implement landlord homepage

    Liam Thursfield authored and Liam Thursfield committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    dfeee76 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Merge pull request #12 from sigi-ro/feature/stage-2-edu-course 

    Merged Master + latest PDF changes Admin Side
    @LiamThursfield
    LiamThursfield committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    c04fdaa View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/landlord-home' into conflict/landlord-home-to-m… 

    …aster

# Conflicts:
#	app/Actions/FileManager/FileManagerFileStoreAction.php
#	app/Http/Controllers/AdminApi/FileManager/FileManagerFileController.php
#	app/Models/EDU/Lecture/LectureFiles.php
#	public/js/app.js
#	public/mix-manifest.json
#	resources/js/components/admin/edu/sections/LectureItemModal.vue
#	resources/js/pages/admin/edu/lecture/Create.vue
#	resources/js/pages/admin/edu/lecture/Edit.vue
    @LiamThursfield
    LiamThursfield committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    eccae6d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #15 from sigi-ro/conflict/landlord-home-to-master 

    Conflict/landlord home to master
    @LiamThursfield
    LiamThursfield committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    17c8462 View commit details
    Browse the repository at this point in the history

  4. yarn prod

    @LiamThursfield
    LiamThursfield committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    d00e545 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #16 from sigi-ro/feature/landlord-yarn-prod 

    yarn prod
    @LiamThursfield
    LiamThursfield committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    c2cc2f1 View commit details
    Browse the repository at this point in the history

  6. WIP

    @dorusomcutean
    dorusomcutean committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    84c5ff3 View commit details
    Browse the repository at this point in the history

  7. Merge conflicts

    @dorusomcutean
    dorusomcutean committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    2af24d2 View commit details
    Browse the repository at this point in the history

  8. Show announcements to user + PReview page improvements

    @dorusomcutean
    dorusomcutean committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    6609748 View commit details
    Browse the repository at this point in the history

  9. Yarn prod

    @dorusomcutean
    dorusomcutean committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    b7c08fd View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2023

  1. Composer upgrade

    @LiamThursfield
    LiamThursfield committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    d4c56df View commit details
    Browse the repository at this point in the history

  2. Merge pull request #18 from sigi-ro/feature/composer-upgrade 

    Composer upgrade
    @LiamThursfield
    LiamThursfield committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    946453c View commit details
    Browse the repository at this point in the history

  3. Home page upgrade to add featured courses 

    - Ensure course show URL uses slug
- Add seeder to seed purchasable courses
- Replace home page boilerplate with a new page / featured courses
    @LiamThursfield
    LiamThursfield committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    daa4387 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #19 from sigi-ro/feature/tenant-home-featured-courses 

    Home page upgrade to add featured courses
    @LiamThursfield
    LiamThursfield committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    9a25730 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #17 from sigi-ro/feature/Announcements 

    Feature/announcements
    @dorusomcutean
    dorusomcutean committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    9bf36ce View commit details
    Browse the repository at this point in the history

  6. Update student course show

    @LiamThursfield
    LiamThursfield committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    83762e6 View commit details
    Browse the repository at this point in the history